From fbb6e926d74cb431dbd8030c9488e41d6ae155cc Mon Sep 17 00:00:00 2001
From: webchick <drupal@webchick.net>
Date: Fri, 4 Sep 2015 12:41:47 -0700
Subject: [PATCH] Issue #2400407 by hussainweb: Update Zend Framework library
to latest version.
---
core/composer.json | 4 +-
core/composer.lock | 102 +++--
core/vendor/composer/autoload_psr4.php | 6 +-
core/vendor/composer/installed.json | 424 +++++++++---------
.../zendframework/zend-diactoros/CHANGELOG.md | 71 +++
.../zendframework/zend-diactoros/README.md | 2 +-
.../zend-diactoros/src/RequestTrait.php | 2 +-
.../src/Response/JsonResponse.php | 25 +-
.../zend-diactoros/src/Stream.php | 76 ++--
.../zend-diactoros/src/UploadedFile.php | 7 +-
.../zendframework/zend-diactoros/src/Uri.php | 43 +-
.../zend-escaper/CONTRIBUTING.md | 228 +++++++++-
.../zendframework/zend-escaper/LICENSE.md | 28 ++
.../zendframework/zend-escaper/README.md | 21 +-
.../zendframework/zend-escaper/composer.json | 21 +-
.../zend-escaper/{ => src}/Escaper.php | 0
.../Exception/ExceptionInterface.php | 0
.../Exception/InvalidArgumentException.php | 0
.../{ => src}/Exception/RuntimeException.php | 0
.../zendframework/zend-feed/CHANGELOG.md | 25 ++
.../zendframework/zend-feed/CONTRIBUTING.md | 228 +++++++++-
.../vendor/zendframework/zend-feed/LICENSE.md | 28 ++
core/vendor/zendframework/zend-feed/README.md | 20 +-
.../zendframework/zend-feed/composer.json | 35 +-
.../Exception/BadMethodCallException.php | 0
.../Exception/ExceptionInterface.php | 0
.../Exception/InvalidArgumentException.php | 0
.../{ => src}/Exception/RuntimeException.php | 0
.../PubSubHubbub/AbstractCallback.php | 0
.../PubSubHubbub/CallbackInterface.php | 0
.../Exception/ExceptionInterface.php | 0
.../Exception/InvalidArgumentException.php | 0
.../Exception/RuntimeException.php | 0
.../{ => src}/PubSubHubbub/HttpResponse.php | 8 +-
.../PubSubHubbub/Model/AbstractModel.php | 0
.../PubSubHubbub/Model/Subscription.php | 12 +-
.../SubscriptionPersistenceInterface.php | 0
.../{ => src}/PubSubHubbub/PubSubHubbub.php | 0
.../{ => src}/PubSubHubbub/Publisher.php | 20 +-
.../{ => src}/PubSubHubbub/Subscriber.php | 52 +--
.../PubSubHubbub/Subscriber/Callback.php | 10 +-
.../{ => src}/PubSubHubbub/Version.php | 0
.../{ => src}/Reader/AbstractEntry.php | 6 +-
.../{ => src}/Reader/AbstractFeed.php | 8 +-
.../zend-feed/{ => src}/Reader/Collection.php | 0
.../Reader/Collection/AbstractCollection.php | 0
.../{ => src}/Reader/Collection/Author.php | 2 +-
.../{ => src}/Reader/Collection/Category.php | 2 +-
.../Reader/Collection/Collection.php | 0
.../{ => src}/Reader/Entry/AbstractEntry.php | 6 +-
.../zend-feed/{ => src}/Reader/Entry/Atom.php | 2 +-
.../{ => src}/Reader/Entry/EntryInterface.php | 0
.../zend-feed/{ => src}/Reader/Entry/Rss.php | 24 +-
.../Exception/BadMethodCallException.php | 0
.../Reader/Exception/ExceptionInterface.php | 0
.../Exception/InvalidArgumentException.php | 0
.../Reader/Exception/RuntimeException.php | 0
.../Reader/Extension/AbstractEntry.php | 2 +-
.../Reader/Extension/AbstractFeed.php | 2 +-
.../{ => src}/Reader/Extension/Atom/Entry.php | 14 +-
.../{ => src}/Reader/Extension/Atom/Feed.php | 12 +-
.../Reader/Extension/Content/Entry.php | 0
.../Extension/CreativeCommons/Entry.php | 2 +-
.../Reader/Extension/CreativeCommons/Feed.php | 2 +-
.../Reader/Extension/DublinCore/Entry.php | 10 +-
.../Reader/Extension/DublinCore/Feed.php | 10 +-
.../Reader/Extension/Podcast/Entry.php | 0
.../Reader/Extension/Podcast/Feed.php | 4 +-
.../Reader/Extension/Slash/Entry.php | 2 +-
.../Reader/Extension/Syndication/Feed.php | 0
.../Reader/Extension/Thread/Entry.php | 0
.../Reader/Extension/WellFormedWeb/Entry.php | 0
.../{ => src}/Reader/ExtensionManager.php | 2 +-
.../Reader/ExtensionManagerInterface.php | 0
.../Reader/ExtensionPluginManager.php | 4 +-
.../{ => src}/Reader/Feed/AbstractFeed.php | 8 +-
.../zend-feed/{ => src}/Reader/Feed/Atom.php | 0
.../{ => src}/Reader/Feed/Atom/Source.php | 2 +-
.../{ => src}/Reader/Feed/FeedInterface.php | 0
.../zend-feed/{ => src}/Reader/Feed/Rss.php | 26 +-
.../zend-feed/{ => src}/Reader/FeedSet.php | 16 +-
.../{ => src}/Reader/Http/ClientInterface.php | 0
.../Reader/Http/ResponseInterface.php | 0
.../zend-feed/{ => src}/Reader/Reader.php | 32 +-
.../Reader/ReaderImportInterface.php | 0
.../Reader/StandaloneExtensionManager.php | 4 +-
.../zendframework/zend-feed/{ => src}/Uri.php | 4 +-
.../{ => src}/Writer/AbstractFeed.php | 16 +-
.../zend-feed/{ => src}/Writer/Deleted.php | 4 +-
.../zend-feed/{ => src}/Writer/Entry.php | 12 +-
.../Exception/BadMethodCallException.php | 0
.../Writer/Exception/ExceptionInterface.php | 0
.../Exception/InvalidArgumentException.php | 0
.../Writer/Exception/RuntimeException.php | 0
.../Writer/Extension/AbstractRenderer.php | 0
.../Writer/Extension/Atom/Renderer/Feed.php | 0
.../Extension/Content/Renderer/Entry.php | 0
.../Extension/DublinCore/Renderer/Entry.php | 0
.../Extension/DublinCore/Renderer/Feed.php | 0
.../Writer/Extension/ITunes/Entry.php | 6 +-
.../Writer/Extension/ITunes/Feed.php | 14 +-
.../Extension/ITunes/Renderer/Entry.php | 0
.../Writer/Extension/ITunes/Renderer/Feed.php | 0
.../Writer/Extension/RendererInterface.php | 0
.../Writer/Extension/Slash/Renderer/Entry.php | 0
.../Extension/Threading/Renderer/Entry.php | 0
.../WellFormedWeb/Renderer/Entry.php | 0
.../{ => src}/Writer/ExtensionManager.php | 2 +-
.../Writer/ExtensionManagerInterface.php | 0
.../Writer/ExtensionPluginManager.php | 4 +-
.../zend-feed/{ => src}/Writer/Feed.php | 4 +-
.../{ => src}/Writer/FeedFactory.php | 0
.../Writer/Renderer/AbstractRenderer.php | 4 +-
.../{ => src}/Writer/Renderer/Entry/Atom.php | 8 +-
.../Writer/Renderer/Entry/Atom/Deleted.php | 0
.../Writer/Renderer/Entry/AtomDeleted.php | 0
.../{ => src}/Writer/Renderer/Entry/Rss.php | 2 +-
.../Writer/Renderer/Feed/AbstractAtom.php | 0
.../{ => src}/Writer/Renderer/Feed/Atom.php | 0
.../Renderer/Feed/Atom/AbstractAtom.php | 0
.../Writer/Renderer/Feed/Atom/Source.php | 0
.../Writer/Renderer/Feed/AtomSource.php | 0
.../{ => src}/Writer/Renderer/Feed/Rss.php | 0
.../Writer/Renderer/RendererInterface.php | 0
.../zend-feed/{ => src}/Writer/Source.php | 0
.../zend-feed/{ => src}/Writer/Version.php | 0
.../zend-feed/{ => src}/Writer/Writer.php | 24 +-
.../zendframework/zend-stdlib/CHANGELOG.md | 66 +++
.../zendframework/zend-stdlib/CONTRIBUTING.md | 228 +++++++++-
.../PhpLegacyCompatibility.php | 28 --
.../zendframework/zend-stdlib/LICENSE.md | 28 ++
.../zendframework/zend-stdlib/README.md | 25 +-
.../zendframework/zend-stdlib/composer.json | 29 +-
.../zend-stdlib/{ => src}/AbstractOptions.php | 6 +-
.../zend-stdlib/{ => src}/ArrayObject.php | 2 +-
.../{ => src}/ArraySerializableInterface.php | 0
.../zend-stdlib/{ => src}/ArrayStack.php | 0
.../zend-stdlib/{ => src}/ArrayUtils.php | 8 +-
.../{ => src}/ArrayUtils/MergeRemoveKey.php | 0
.../{ => src}/ArrayUtils/MergeReplaceKey.php | 0
.../ArrayUtils/MergeReplaceKeyInterface.php | 0
.../zend-stdlib/{ => src}/CallbackHandler.php | 41 +-
.../zend-stdlib/{ => src}/DateTime.php | 0
.../{ => src}/DispatchableInterface.php | 0
.../zend-stdlib/{ => src}/ErrorHandler.php | 6 +-
.../Exception/BadMethodCallException.php | 0
.../{ => src}/Exception/DomainException.php | 0
.../Exception/ExceptionInterface.php | 0
.../Exception/ExtensionNotLoadedException.php | 0
.../Exception/InvalidArgumentException.php | 0
.../Exception/InvalidCallbackException.php | 0
.../{ => src}/Exception/LogicException.php | 0
.../{ => src}/Exception/RuntimeException.php | 0
.../Extractor/ExtractionInterface.php | 0
.../zend-stdlib/{ => src}/Glob.php | 6 +-
.../{ => src}/Guard/AllGuardsTrait.php | 0
.../Guard/ArrayOrTraversableGuardTrait.php | 0
.../{ => src}/Guard/EmptyGuardTrait.php | 0
.../{ => src}/Guard/GuardUtils.php | 0
.../{ => src}/Guard/NullGuardTrait.php | 0
.../{ => src}/Hydrator/AbstractHydrator.php | 0
.../Hydrator/Aggregate/AggregateHydrator.php | 2 +-
.../Hydrator/Aggregate/ExtractEvent.php | 2 +-
.../Hydrator/Aggregate/HydrateEvent.php | 0
.../Hydrator/Aggregate/HydratorListener.php | 4 +-
.../{ => src}/Hydrator/ArraySerializable.php | 8 +-
.../{ => src}/Hydrator/ClassMethods.php | 16 +-
.../{ => src}/Hydrator/DelegatingHydrator.php | 0
.../Hydrator/DelegatingHydratorFactory.php | 0
.../Hydrator/Filter/FilterComposite.php | 4 +-
.../Hydrator/Filter/FilterInterface.php | 0
.../Filter/FilterProviderInterface.php | 0
.../{ => src}/Hydrator/Filter/GetFilter.php | 0
.../{ => src}/Hydrator/Filter/HasFilter.php | 0
.../{ => src}/Hydrator/Filter/IsFilter.php | 0
.../Hydrator/Filter/MethodMatchFilter.php | 0
.../Filter/NumberOfParameterFilter.php | 0
.../Filter/OptionalParametersFilter.php | 2 +-
.../Hydrator/FilterEnabledInterface.php | 0
.../{ => src}/Hydrator/HydrationInterface.php | 0
.../Hydrator/HydratorAwareInterface.php | 0
.../{ => src}/Hydrator/HydratorAwareTrait.php | 0
.../{ => src}/Hydrator/HydratorInterface.php | 0
.../Hydrator/HydratorOptionsInterface.php | 0
.../Hydrator/HydratorPluginManager.php | 12 +-
.../Iterator/HydratingArrayIterator.php | 36 ++
.../Iterator/HydratingIteratorInterface.php | 33 ++
.../Iterator/HydratingIteratorIterator.php | 78 ++++
.../NamingStrategy/ArrayMapNamingStrategy.php | 4 +-
.../CompositeNamingStrategy.php | 2 +-
.../NamingStrategy/IdentityNamingStrategy.php | 0
.../NamingStrategy/MapNamingStrategy.php | 4 +-
.../NamingStrategyInterface.php | 0
.../UnderscoreNamingStrategy.php | 0
.../NamingStrategyEnabledInterface.php | 0
.../{ => src}/Hydrator/ObjectProperty.php | 2 +-
.../{ => src}/Hydrator/Reflection.php | 6 +-
.../Hydrator/Strategy/BooleanStrategy.php | 0
.../Hydrator/Strategy/ClosureStrategy.php | 0
.../Strategy/DateTimeFormatterStrategy.php | 0
.../Hydrator/Strategy/DefaultStrategy.php | 0
.../Strategy/Exception/ExceptionInterface.php | 0
.../Exception/InvalidArgumentException.php | 0
.../Hydrator/Strategy/ExplodeStrategy.php | 2 +-
.../Strategy/SerializableStrategy.php | 2 +-
.../Hydrator/Strategy/StrategyChain.php | 0
.../Hydrator/Strategy/StrategyInterface.php | 0
.../Hydrator/StrategyEnabledInterface.php | 0
.../{ => src}/InitializableInterface.php | 0
.../{ => src}/JsonSerializable.php | 14 -
.../zend-stdlib/{ => src}/Message.php | 2 +-
.../{ => src}/MessageInterface.php | 0
.../{ => src}/ParameterObjectInterface.php | 0
.../zend-stdlib/{ => src}/Parameters.php | 4 +-
.../{ => src}/ParametersInterface.php | 0
.../zend-stdlib/{ => src}/PriorityList.php | 15 +-
.../zend-stdlib/{ => src}/PriorityQueue.php | 6 +-
.../zend-stdlib/{ => src}/Request.php | 0
.../{ => src}/RequestInterface.php | 0
.../zend-stdlib/{ => src}/Response.php | 0
.../{ => src}/ResponseInterface.php | 0
.../{ => src}/SplPriorityQueue.php | 6 +-
.../zend-stdlib/{ => src}/SplQueue.php | 2 +-
.../zend-stdlib/{ => src}/SplStack.php | 2 +-
.../zend-stdlib/{ => src}/StringUtils.php | 6 +-
.../StringWrapper/AbstractStringWrapper.php | 0
.../{ => src}/StringWrapper/Iconv.php | 4 +-
.../{ => src}/StringWrapper/Intl.php | 2 +-
.../{ => src}/StringWrapper/MbString.php | 0
.../{ => src}/StringWrapper/Native.php | 0
.../StringWrapper/StringWrapperInterface.php | 0
.../{ => src}/compatibility/autoload.php | 0
232 files changed, 1825 insertions(+), 736 deletions(-)
create mode 100644 core/vendor/zendframework/zend-escaper/LICENSE.md
rename core/vendor/zendframework/zend-escaper/{ => src}/Escaper.php (100%)
rename core/vendor/zendframework/zend-escaper/{ => src}/Exception/ExceptionInterface.php (100%)
rename core/vendor/zendframework/zend-escaper/{ => src}/Exception/InvalidArgumentException.php (100%)
rename core/vendor/zendframework/zend-escaper/{ => src}/Exception/RuntimeException.php (100%)
create mode 100644 core/vendor/zendframework/zend-feed/CHANGELOG.md
create mode 100644 core/vendor/zendframework/zend-feed/LICENSE.md
rename core/vendor/zendframework/zend-feed/{ => src}/Exception/BadMethodCallException.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Exception/ExceptionInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Exception/InvalidArgumentException.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Exception/RuntimeException.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/AbstractCallback.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/CallbackInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/Exception/ExceptionInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/Exception/InvalidArgumentException.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/Exception/RuntimeException.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/HttpResponse.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/Model/AbstractModel.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/Model/Subscription.php (91%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/Model/SubscriptionPersistenceInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/PubSubHubbub.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/Publisher.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/Subscriber.php (96%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/Subscriber/Callback.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/PubSubHubbub/Version.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/AbstractEntry.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/AbstractFeed.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Collection.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Collection/AbstractCollection.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Collection/Author.php (96%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Collection/Category.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Collection/Collection.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Entry/AbstractEntry.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Entry/Atom.php (99%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Entry/EntryInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Entry/Rss.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Exception/BadMethodCallException.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Exception/ExceptionInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Exception/InvalidArgumentException.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Exception/RuntimeException.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/AbstractEntry.php (99%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/AbstractFeed.php (99%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/Atom/Entry.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/Atom/Feed.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/Content/Entry.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/CreativeCommons/Entry.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/CreativeCommons/Feed.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/DublinCore/Entry.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/DublinCore/Feed.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/Podcast/Entry.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/Podcast/Feed.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/Slash/Entry.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/Syndication/Feed.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/Thread/Entry.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Extension/WellFormedWeb/Entry.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/ExtensionManager.php (96%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/ExtensionManagerInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/ExtensionPluginManager.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Feed/AbstractFeed.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Feed/Atom.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Feed/Atom/Source.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Feed/FeedInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Feed/Rss.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/FeedSet.php (92%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Http/ClientInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Http/ResponseInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/Reader.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/ReaderImportInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Reader/StandaloneExtensionManager.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Uri.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/AbstractFeed.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Deleted.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Entry.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Exception/BadMethodCallException.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Exception/ExceptionInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Exception/InvalidArgumentException.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Exception/RuntimeException.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/AbstractRenderer.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/Atom/Renderer/Feed.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/Content/Renderer/Entry.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/DublinCore/Renderer/Entry.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/DublinCore/Renderer/Feed.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/ITunes/Entry.php (97%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/ITunes/Feed.php (96%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/ITunes/Renderer/Entry.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/ITunes/Renderer/Feed.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/RendererInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/Slash/Renderer/Entry.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/Threading/Renderer/Entry.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Extension/WellFormedWeb/Renderer/Entry.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/ExtensionManager.php (96%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/ExtensionManagerInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/ExtensionPluginManager.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Feed.php (99%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/FeedFactory.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/AbstractRenderer.php (98%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/Entry/Atom.php (99%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/Entry/Atom/Deleted.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/Entry/AtomDeleted.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/Entry/Rss.php (99%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/Feed/AbstractAtom.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/Feed/Atom.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/Feed/Atom/AbstractAtom.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/Feed/Atom/Source.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/Feed/AtomSource.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/Feed/Rss.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Renderer/RendererInterface.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Source.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Version.php (100%)
rename core/vendor/zendframework/zend-feed/{ => src}/Writer/Writer.php (93%)
create mode 100644 core/vendor/zendframework/zend-stdlib/CHANGELOG.md
delete mode 100644 core/vendor/zendframework/zend-stdlib/JsonSerializable/PhpLegacyCompatibility.php
create mode 100644 core/vendor/zendframework/zend-stdlib/LICENSE.md
rename core/vendor/zendframework/zend-stdlib/{ => src}/AbstractOptions.php (97%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/ArrayObject.php (98%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/ArraySerializableInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/ArrayStack.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/ArrayUtils.php (98%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/ArrayUtils/MergeRemoveKey.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/ArrayUtils/MergeReplaceKey.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/ArrayUtils/MergeReplaceKeyInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/CallbackHandler.php (78%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/DateTime.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/DispatchableInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/ErrorHandler.php (93%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Exception/BadMethodCallException.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Exception/DomainException.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Exception/ExceptionInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Exception/ExtensionNotLoadedException.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Exception/InvalidArgumentException.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Exception/InvalidCallbackException.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Exception/LogicException.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Exception/RuntimeException.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Extractor/ExtractionInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Glob.php (98%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Guard/AllGuardsTrait.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Guard/ArrayOrTraversableGuardTrait.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Guard/EmptyGuardTrait.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Guard/GuardUtils.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Guard/NullGuardTrait.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/AbstractHydrator.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Aggregate/AggregateHydrator.php (96%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Aggregate/ExtractEvent.php (98%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Aggregate/HydrateEvent.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Aggregate/HydratorListener.php (95%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/ArraySerializable.php (92%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/ClassMethods.php (95%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/DelegatingHydrator.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/DelegatingHydratorFactory.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Filter/FilterComposite.php (97%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Filter/FilterInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Filter/FilterProviderInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Filter/GetFilter.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Filter/HasFilter.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Filter/IsFilter.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Filter/MethodMatchFilter.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Filter/NumberOfParameterFilter.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Filter/OptionalParametersFilter.php (96%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/FilterEnabledInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/HydrationInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/HydratorAwareInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/HydratorAwareTrait.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/HydratorInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/HydratorOptionsInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/HydratorPluginManager.php (93%)
create mode 100644 core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingArrayIterator.php
create mode 100644 core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorInterface.php
create mode 100644 core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorIterator.php
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php (94%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/NamingStrategy/CompositeNamingStrategy.php (97%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/NamingStrategy/IdentityNamingStrategy.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/NamingStrategy/MapNamingStrategy.php (97%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/NamingStrategy/NamingStrategyInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/NamingStrategyEnabledInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/ObjectProperty.php (98%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Reflection.php (95%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Strategy/BooleanStrategy.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Strategy/ClosureStrategy.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Strategy/DateTimeFormatterStrategy.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Strategy/DefaultStrategy.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Strategy/Exception/ExceptionInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Strategy/Exception/InvalidArgumentException.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Strategy/ExplodeStrategy.php (99%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Strategy/SerializableStrategy.php (98%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Strategy/StrategyChain.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/Strategy/StrategyInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Hydrator/StrategyEnabledInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/InitializableInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/JsonSerializable.php (56%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Message.php (98%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/MessageInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/ParameterObjectInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Parameters.php (97%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/ParametersInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/PriorityList.php (95%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/PriorityQueue.php (98%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Request.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/RequestInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/Response.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/ResponseInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/SplPriorityQueue.php (94%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/SplQueue.php (97%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/SplStack.php (97%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/StringUtils.php (98%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/StringWrapper/AbstractStringWrapper.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/StringWrapper/Iconv.php (99%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/StringWrapper/Intl.php (97%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/StringWrapper/MbString.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/StringWrapper/Native.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/StringWrapper/StringWrapperInterface.php (100%)
rename core/vendor/zendframework/zend-stdlib/{ => src}/compatibility/autoload.php (100%)
diff --git a/core/composer.json b/core/composer.json
index 18bb90d79f6b..d217767db942 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -25,7 +25,7 @@
"symfony-cmf/routing": "1.3.*",
"easyrdf/easyrdf": "0.9.*",
"phpunit/phpunit": "4.8.*",
- "zendframework/zend-feed": "2.4.*",
+ "zendframework/zend-feed": "~2.4",
"mikey179/vfsStream": "~1.2",
"stack/builder": "1.0.*",
"egulias/email-validator": "1.2.*",
@@ -34,7 +34,7 @@
"fabpot/goutte": "~3.1",
"masterminds/html5": "~2.1",
"symfony/psr-http-message-bridge": "v0.2",
- "zendframework/zend-diactoros": "1.1.0"
+ "zendframework/zend-diactoros": "~1.1"
},
"replace": {
"drupal/action": "self.version",
diff --git a/core/composer.lock b/core/composer.lock
index e8495be7b109..15e8685435fb 100644
--- a/core/composer.lock
+++ b/core/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "98540c017d14f1cad9f0b1bc722600ad",
+ "hash": "32a7f1295f8f5ccdf8b5759f9eb6e626",
"packages": [
{
"name": "behat/mink",
@@ -3163,16 +3163,16 @@
},
{
"name": "zendframework/zend-diactoros",
- "version": "1.1.0",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8"
+ "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
- "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
+ "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/e2f5c12916c74da384058d0dfbc7fbc0b03d1181",
+ "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181",
"shasum": ""
},
"require": {
@@ -3209,73 +3209,79 @@
"psr",
"psr-7"
],
- "time": "2015-06-24 20:42:54"
+ "time": "2015-08-10 20:04:20"
},
{
"name": "zendframework/zend-escaper",
- "version": "2.4.0",
+ "version": "2.5.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-escaper.git",
- "reference": "65b3328627362b0be1d5e9067bc846511d1fbc96"
+ "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/15e5769e4fcdb4bf07ebd76500810e7070e23a97",
- "reference": "65b3328627362b0be1d5e9067bc846511d1fbc96",
+ "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73",
+ "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73",
"shasum": ""
},
"require": {
"php": ">=5.3.23"
},
+ "require-dev": {
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/phpunit": "~4.0"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
+ "dev-master": "2.5-dev",
+ "dev-develop": "2.6-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Escaper\\": ""
+ "Zend\\Escaper\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "homepage": "https://github.com/zendframework/zf2",
+ "homepage": "https://github.com/zendframework/zend-escaper",
"keywords": [
"escaper",
"zf2"
],
- "time": "2015-04-01 18:02:07"
+ "time": "2015-06-03 14:05:37"
},
{
"name": "zendframework/zend-feed",
- "version": "2.4.0",
+ "version": "2.5.2",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-feed.git",
- "reference": "aca2b42ecf06d94c621e3c3be8e95d61d3a79bf5"
+ "reference": "0661345b82b51428619e05d3aadd3de65b57fa54"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/0f59e560364f1f1fcb09a96874328ae3ff690db2",
- "reference": "aca2b42ecf06d94c621e3c3be8e95d61d3a79bf5",
+ "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/0661345b82b51428619e05d3aadd3de65b57fa54",
+ "reference": "0661345b82b51428619e05d3aadd3de65b57fa54",
"shasum": ""
},
"require": {
- "php": ">=5.3.23",
- "zendframework/zend-escaper": "self.version",
- "zendframework/zend-stdlib": "self.version"
+ "php": ">=5.5",
+ "zendframework/zend-escaper": "~2.5",
+ "zendframework/zend-stdlib": "~2.5"
},
"require-dev": {
- "zendframework/zend-cache": "self.version",
- "zendframework/zend-db": "self.version",
- "zendframework/zend-http": "self.version",
- "zendframework/zend-servicemanager": "self.version",
- "zendframework/zend-validator": "self.version"
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/phpunit": "~4.0",
+ "zendframework/zend-cache": "~2.5",
+ "zendframework/zend-db": "~2.5",
+ "zendframework/zend-http": "~2.5",
+ "zendframework/zend-servicemanager": "~2.5",
+ "zendframework/zend-validator": "~2.5"
},
"suggest": {
"zendframework/zend-cache": "Zend\\Cache component",
@@ -3287,13 +3293,13 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
+ "dev-master": "2.5-dev",
+ "dev-develop": "2.6-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Feed\\": ""
+ "Zend\\Feed\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3301,35 +3307,39 @@
"BSD-3-Clause"
],
"description": "provides functionality for consuming RSS and Atom feeds",
- "homepage": "https://github.com/zendframework/zf2",
+ "homepage": "https://github.com/zendframework/zend-feed",
"keywords": [
"feed",
"zf2"
],
- "time": "2015-04-01 18:09:25"
+ "time": "2015-08-04 21:39:18"
},
{
"name": "zendframework/zend-stdlib",
- "version": "2.4.0",
+ "version": "2.6.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-stdlib.git",
- "reference": "eab586f4c18af3fa63c977611939f1f4a3cf1030"
+ "reference": "a35758803fc9051ec1aff43989e679b6b451b1b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cf05c5ba75606e47ffee91cedc72778da46f74c3",
- "reference": "eab586f4c18af3fa63c977611939f1f4a3cf1030",
+ "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/a35758803fc9051ec1aff43989e679b6b451b1b4",
+ "reference": "a35758803fc9051ec1aff43989e679b6b451b1b4",
"shasum": ""
},
"require": {
- "php": ">=5.3.23"
+ "php": ">=5.5"
},
"require-dev": {
- "zendframework/zend-eventmanager": "self.version",
- "zendframework/zend-filter": "self.version",
- "zendframework/zend-serializer": "self.version",
- "zendframework/zend-servicemanager": "self.version"
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/phpunit": "~4.0",
+ "zendframework/zend-config": "~2.5",
+ "zendframework/zend-eventmanager": "~2.5",
+ "zendframework/zend-filter": "~2.5",
+ "zendframework/zend-inputfilter": "~2.5",
+ "zendframework/zend-serializer": "~2.5",
+ "zendframework/zend-servicemanager": "~2.5"
},
"suggest": {
"zendframework/zend-eventmanager": "To support aggregate hydrator usage",
@@ -3340,25 +3350,25 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
+ "dev-master": "2.6-dev",
+ "dev-develop": "2.7-dev"
}
},
"autoload": {
"psr-4": {
- "Zend\\Stdlib\\": ""
+ "Zend\\Stdlib\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
- "homepage": "https://github.com/zendframework/zf2",
+ "homepage": "https://github.com/zendframework/zend-stdlib",
"keywords": [
"stdlib",
"zf2"
],
- "time": "2015-04-01 18:09:29"
+ "time": "2015-07-21 17:08:05"
}
],
"packages-dev": [],
diff --git a/core/vendor/composer/autoload_psr4.php b/core/vendor/composer/autoload_psr4.php
index 1d8824afd4f3..bd3969e3ba73 100644
--- a/core/vendor/composer/autoload_psr4.php
+++ b/core/vendor/composer/autoload_psr4.php
@@ -6,9 +6,9 @@
$baseDir = dirname($vendorDir);
return array(
- 'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib'),
- 'Zend\\Feed\\' => array($vendorDir . '/zendframework/zend-feed'),
- 'Zend\\Escaper\\' => array($vendorDir . '/zendframework/zend-escaper'),
+ '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'),
'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
'Symfony\\Component\\Validator\\' => array($vendorDir . '/symfony/validator'),
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index 5cff108de557..4e1447f59856 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -430,161 +430,6 @@
"xml"
]
},
- {
- "name": "zendframework/zend-stdlib",
- "version": "2.4.0",
- "version_normalized": "2.4.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-stdlib.git",
- "reference": "eab586f4c18af3fa63c977611939f1f4a3cf1030"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cf05c5ba75606e47ffee91cedc72778da46f74c3",
- "reference": "eab586f4c18af3fa63c977611939f1f4a3cf1030",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.23"
- },
- "require-dev": {
- "zendframework/zend-eventmanager": "self.version",
- "zendframework/zend-filter": "self.version",
- "zendframework/zend-serializer": "self.version",
- "zendframework/zend-servicemanager": "self.version"
- },
- "suggest": {
- "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
- "zendframework/zend-filter": "To support naming strategy hydrator usage",
- "zendframework/zend-serializer": "Zend\\Serializer component",
- "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
- },
- "time": "2015-04-01 18:09:29",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Zend\\Stdlib\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "homepage": "https://github.com/zendframework/zf2",
- "keywords": [
- "stdlib",
- "zf2"
- ]
- },
- {
- "name": "zendframework/zend-escaper",
- "version": "2.4.0",
- "version_normalized": "2.4.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-escaper.git",
- "reference": "65b3328627362b0be1d5e9067bc846511d1fbc96"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/15e5769e4fcdb4bf07ebd76500810e7070e23a97",
- "reference": "65b3328627362b0be1d5e9067bc846511d1fbc96",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.23"
- },
- "time": "2015-04-01 18:02:07",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Zend\\Escaper\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "homepage": "https://github.com/zendframework/zf2",
- "keywords": [
- "escaper",
- "zf2"
- ]
- },
- {
- "name": "zendframework/zend-feed",
- "version": "2.4.0",
- "version_normalized": "2.4.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-feed.git",
- "reference": "aca2b42ecf06d94c621e3c3be8e95d61d3a79bf5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/0f59e560364f1f1fcb09a96874328ae3ff690db2",
- "reference": "aca2b42ecf06d94c621e3c3be8e95d61d3a79bf5",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.23",
- "zendframework/zend-escaper": "self.version",
- "zendframework/zend-stdlib": "self.version"
- },
- "require-dev": {
- "zendframework/zend-cache": "self.version",
- "zendframework/zend-db": "self.version",
- "zendframework/zend-http": "self.version",
- "zendframework/zend-servicemanager": "self.version",
- "zendframework/zend-validator": "self.version"
- },
- "suggest": {
- "zendframework/zend-cache": "Zend\\Cache component",
- "zendframework/zend-db": "Zend\\Db component",
- "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
- "zendframework/zend-validator": "Zend\\Validator component"
- },
- "time": "2015-04-01 18:09:25",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Zend\\Feed\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "provides functionality for consuming RSS and Atom feeds",
- "homepage": "https://github.com/zendframework/zf2",
- "keywords": [
- "feed",
- "zf2"
- ]
- },
{
"name": "sebastian/version",
"version": "1.0.5",
@@ -1346,58 +1191,6 @@
"psr-7"
]
},
- {
- "name": "zendframework/zend-diactoros",
- "version": "1.1.0",
- "version_normalized": "1.1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
- "reference": "df65f70fc36f24d51a90ad706a09cd9b74fc4dd8",
- "shasum": ""
- },
- "require": {
- "php": ">=5.4",
- "psr/http-message": "~1.0"
- },
- "provide": {
- "psr/http-message-implementation": "~1.0.0"
- },
- "require-dev": {
- "phpunit/phpunit": "~4.6",
- "squizlabs/php_codesniffer": "^2.3.1"
- },
- "time": "2015-06-24 20:42:54",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev",
- "dev-develop": "1.1-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "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"
- ]
- },
{
"name": "guzzlehttp/guzzle",
"version": "dev-master",
@@ -3472,5 +3265,222 @@
"rdfa",
"sparql"
]
+ },
+ {
+ "name": "zendframework/zend-stdlib",
+ "version": "2.6.0",
+ "version_normalized": "2.6.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/zend-stdlib.git",
+ "reference": "a35758803fc9051ec1aff43989e679b6b451b1b4"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/a35758803fc9051ec1aff43989e679b6b451b1b4",
+ "reference": "a35758803fc9051ec1aff43989e679b6b451b1b4",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5"
+ },
+ "require-dev": {
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/phpunit": "~4.0",
+ "zendframework/zend-config": "~2.5",
+ "zendframework/zend-eventmanager": "~2.5",
+ "zendframework/zend-filter": "~2.5",
+ "zendframework/zend-inputfilter": "~2.5",
+ "zendframework/zend-serializer": "~2.5",
+ "zendframework/zend-servicemanager": "~2.5"
+ },
+ "suggest": {
+ "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+ "zendframework/zend-filter": "To support naming strategy hydrator usage",
+ "zendframework/zend-serializer": "Zend\\Serializer component",
+ "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+ },
+ "time": "2015-07-21 17:08:05",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6-dev",
+ "dev-develop": "2.7-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Zend\\Stdlib\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "homepage": "https://github.com/zendframework/zend-stdlib",
+ "keywords": [
+ "stdlib",
+ "zf2"
+ ]
+ },
+ {
+ "name": "zendframework/zend-escaper",
+ "version": "2.5.1",
+ "version_normalized": "2.5.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/zend-escaper.git",
+ "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73",
+ "reference": "a4b227d8a477f4e7e9073f8e0a7ae7dbd3104a73",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.23"
+ },
+ "require-dev": {
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/phpunit": "~4.0"
+ },
+ "time": "2015-06-03 14:05:37",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.5-dev",
+ "dev-develop": "2.6-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Zend\\Escaper\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "homepage": "https://github.com/zendframework/zend-escaper",
+ "keywords": [
+ "escaper",
+ "zf2"
+ ]
+ },
+ {
+ "name": "zendframework/zend-feed",
+ "version": "2.5.2",
+ "version_normalized": "2.5.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/zend-feed.git",
+ "reference": "0661345b82b51428619e05d3aadd3de65b57fa54"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/0661345b82b51428619e05d3aadd3de65b57fa54",
+ "reference": "0661345b82b51428619e05d3aadd3de65b57fa54",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5",
+ "zendframework/zend-escaper": "~2.5",
+ "zendframework/zend-stdlib": "~2.5"
+ },
+ "require-dev": {
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/phpunit": "~4.0",
+ "zendframework/zend-cache": "~2.5",
+ "zendframework/zend-db": "~2.5",
+ "zendframework/zend-http": "~2.5",
+ "zendframework/zend-servicemanager": "~2.5",
+ "zendframework/zend-validator": "~2.5"
+ },
+ "suggest": {
+ "zendframework/zend-cache": "Zend\\Cache component",
+ "zendframework/zend-db": "Zend\\Db component",
+ "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
+ "zendframework/zend-validator": "Zend\\Validator component"
+ },
+ "time": "2015-08-04 21:39:18",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.5-dev",
+ "dev-develop": "2.6-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",
+ "homepage": "https://github.com/zendframework/zend-feed",
+ "keywords": [
+ "feed",
+ "zf2"
+ ]
+ },
+ {
+ "name": "zendframework/zend-diactoros",
+ "version": "1.1.3",
+ "version_normalized": "1.1.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/zend-diactoros.git",
+ "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/e2f5c12916c74da384058d0dfbc7fbc0b03d1181",
+ "reference": "e2f5c12916c74da384058d0dfbc7fbc0b03d1181",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4",
+ "psr/http-message": "~1.0"
+ },
+ "provide": {
+ "psr/http-message-implementation": "~1.0.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.6",
+ "squizlabs/php_codesniffer": "^2.3.1"
+ },
+ "time": "2015-08-10 20:04:20",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev",
+ "dev-develop": "1.1-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "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"
+ ]
}
]
diff --git a/core/vendor/zendframework/zend-diactoros/CHANGELOG.md b/core/vendor/zendframework/zend-diactoros/CHANGELOG.md
index 7fdf2106aef3..57b0a871779e 100644
--- a/core/vendor/zendframework/zend-diactoros/CHANGELOG.md
+++ b/core/vendor/zendframework/zend-diactoros/CHANGELOG.md
@@ -2,6 +2,77 @@
All notable changes to this project will be documented in this file, in reverse chronological order by release.
+## 1.1.3 - 2015-08-10
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#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
+ 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
+ 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
+ `UploadedFile` to ensure that `moveTo()` works correctly in non-SAPI
+ environments when the file provided to the constructor is a path.
+
+## 1.1.2 - 2015-07-12
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#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
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#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.
+
## 1.1.0 - 2015-06-24
### Added
diff --git a/core/vendor/zendframework/zend-diactoros/README.md b/core/vendor/zendframework/zend-diactoros/README.md
index 477ac6dcafe2..b25dc9b3078c 100644
--- a/core/vendor/zendframework/zend-diactoros/README.md
+++ b/core/vendor/zendframework/zend-diactoros/README.md
@@ -34,7 +34,7 @@ $ php -S 0.0.0.0:8080 -t doc/html/ # then browse to http://localhost:8080/
[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/zendframeowork/zend-diactoros/tree/develop
+ [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/core/vendor/zendframework/zend-diactoros/src/RequestTrait.php b/core/vendor/zendframework/zend-diactoros/src/RequestTrait.php
index 8a96762c9e0b..2ef15a9495d4 100644
--- a/core/vendor/zendframework/zend-diactoros/src/RequestTrait.php
+++ b/core/vendor/zendframework/zend-diactoros/src/RequestTrait.php
@@ -82,7 +82,7 @@ private function initialize($uri = null, $method = null, $body = 'php://memory',
$this->method = $method ?: '';
$this->uri = $uri ?: new Uri();
- $this->stream = ($body instanceof StreamInterface) ? $body : new Stream($body, 'r');
+ $this->stream = ($body instanceof StreamInterface) ? $body : new Stream($body, 'wb+');
list($this->headerNames, $headers) = $this->filterHeaders($headers);
$this->assertHeaders($headers);
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php b/core/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
index fc508089daf6..766c8665c92f 100644
--- a/core/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
+++ b/core/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
@@ -9,27 +9,23 @@
namespace Zend\Diactoros\Response;
-use ArrayObject;
use InvalidArgumentException;
use Zend\Diactoros\Response;
use Zend\Diactoros\Stream;
/**
- * HTML response.
+ * JSON response.
*
- * Allows creating a response by passing an HTML string to the constructor;
- * by default, sets a status code of 200 and sets the Content-Type header to
- * text/html.
+ * Allows creating a response by passing data to the constructor; by default,
+ * serializes the data to JSON, sets a status code of 200 and sets the
+ * Content-Type header to application/json.
*/
class JsonResponse extends Response
{
use InjectContentTypeTrait;
/**
- * Create a JSON response with the given array of data.
- *
- * If the data provided is null, an empty ArrayObject is used; if the data
- * is scalar, it is cast to an array prior to serialization.
+ * Create a JSON response with the given data.
*
* Default JSON encoding is performed with the following options, which
* produces RFC4627-compliant JSON, capable of embedding into HTML.
@@ -39,7 +35,7 @@ class JsonResponse extends Response
* - JSON_HEX_AMP
* - JSON_HEX_QUOT
*
- * @param string $data Data to convert to JSON.
+ * @param mixed $data Data to convert to JSON.
* @param int $status Integer status code for the response; 200 by default.
* @param array $headers Array of headers to use at initialization.
* @param int $encodingOptions JSON encoding options to use.
@@ -69,15 +65,6 @@ private function jsonEncode($data, $encodingOptions)
throw new InvalidArgumentException('Cannot JSON encode resources');
}
- if ($data === null) {
- // Use an ArrayObject to force an empty JSON object.
- $data = new ArrayObject();
- }
-
- if (is_scalar($data)) {
- $data = (array) $data;
- }
-
// Clear json_last_error()
json_encode(null);
diff --git a/core/vendor/zendframework/zend-diactoros/src/Stream.php b/core/vendor/zendframework/zend-diactoros/src/Stream.php
index d92211e53771..aca58d284cb5 100644
--- a/core/vendor/zendframework/zend-diactoros/src/Stream.php
+++ b/core/vendor/zendframework/zend-diactoros/src/Stream.php
@@ -35,23 +35,7 @@ class Stream implements StreamInterface
*/
public function __construct($stream, $mode = 'r')
{
- $this->stream = $stream;
-
- if (is_resource($stream)) {
- $this->resource = $stream;
- } elseif (is_string($stream)) {
- set_error_handler(function ($errno, $errstr) {
- throw new InvalidArgumentException(
- 'Invalid file provided for stream; must be a valid path with valid permissions'
- );
- }, E_WARNING);
- $this->resource = fopen($stream, $mode);
- restore_error_handler();
- } else {
- throw new InvalidArgumentException(
- 'Invalid stream provided; must be a string stream identifier or resource'
- );
- }
+ $this->setStream($stream, $mode);
}
/**
@@ -105,26 +89,7 @@ public function detach()
*/
public function attach($resource, $mode = 'r')
{
- $error = null;
- if (! is_resource($resource) && is_string($resource)) {
- set_error_handler(function ($e) use (&$error) {
- $error = $e;
- }, E_WARNING);
- $resource = fopen($resource, $mode);
- restore_error_handler();
- }
-
- if ($error) {
- throw new InvalidArgumentException('Invalid stream reference provided');
- }
-
- if (! is_resource($resource)) {
- throw new InvalidArgumentException(
- 'Invalid stream provided; must be a string stream identifier or resource'
- );
- }
-
- $this->resource = $resource;
+ $this->setStream($resource, $mode);
}
/**
@@ -323,4 +288,41 @@ public function getMetadata($key = null)
return $metadata[$key];
}
+
+ /**
+ * Set the internal stream resource.
+ *
+ * @param string|resource $stream String stream target or stream resource.
+ * @param string $mode Resource mode for stream target.
+ * @throws InvalidArgumentException for invalid streams or resources.
+ */
+ private function setStream($stream, $mode = 'r')
+ {
+ $error = null;
+ $resource = $stream;
+
+ if (is_string($stream)) {
+ set_error_handler(function ($e) use (&$error) {
+ $error = $e;
+ }, E_WARNING);
+ $resource = fopen($stream, $mode);
+ restore_error_handler();
+ }
+
+ if ($error) {
+ throw new InvalidArgumentException('Invalid stream reference provided');
+ }
+
+ if (! is_resource($resource) || 'stream' !== get_resource_type($resource)) {
+ throw new InvalidArgumentException(
+ 'Invalid stream provided; must be a string stream identifier or stream resource'
+ );
+ }
+
+ if ($stream !== $resource) {
+ $this->stream = $stream;
+ }
+
+ $this->resource = $resource;
+ }
}
diff --git a/core/vendor/zendframework/zend-diactoros/src/UploadedFile.php b/core/vendor/zendframework/zend-diactoros/src/UploadedFile.php
index 77d6559fb078..1aa083f012c9 100644
--- a/core/vendor/zendframework/zend-diactoros/src/UploadedFile.php
+++ b/core/vendor/zendframework/zend-diactoros/src/UploadedFile.php
@@ -223,9 +223,10 @@ private function writeFile($path)
throw new RuntimeException('Unable to write to designated path');
}
- $this->stream->rewind();
- while (! $this->stream->eof()) {
- fwrite($handle, $this->stream->read(4096));
+ $stream = $this->getStream();
+ $stream->rewind();
+ while (! $stream->eof()) {
+ fwrite($handle, $stream->read(4096));
}
fclose($handle);
diff --git a/core/vendor/zendframework/zend-diactoros/src/Uri.php b/core/vendor/zendframework/zend-diactoros/src/Uri.php
index 350bff1fb862..be3077a170e6 100644
--- a/core/vendor/zendframework/zend-diactoros/src/Uri.php
+++ b/core/vendor/zendframework/zend-diactoros/src/Uri.php
@@ -220,6 +220,14 @@ public function getFragment()
*/
public function withScheme($scheme)
{
+ if (! is_string($scheme)) {
+ throw new InvalidArgumentException(sprintf(
+ '%s expects a string argument; received %s',
+ __METHOD__,
+ (is_object($scheme) ? get_class($scheme) : gettype($scheme))
+ ));
+ }
+
$scheme = $this->filterScheme($scheme);
if ($scheme === $this->scheme) {
@@ -238,6 +246,21 @@ public function withScheme($scheme)
*/
public function withUserInfo($user, $password = null)
{
+ if (! is_string($user)) {
+ throw new InvalidArgumentException(sprintf(
+ '%s expects a string user argument; received %s',
+ __METHOD__,
+ (is_object($user) ? get_class($user) : gettype($user))
+ ));
+ }
+ if (null !== $password && ! is_string($password)) {
+ throw new InvalidArgumentException(sprintf(
+ '%s expects a string password argument; received %s',
+ __METHOD__,
+ (is_object($password) ? get_class($password) : gettype($password))
+ ));
+ }
+
$info = $user;
if ($password) {
$info .= ':' . $password;
@@ -259,6 +282,14 @@ public function withUserInfo($user, $password = null)
*/
public function withHost($host)
{
+ if (! is_string($host)) {
+ throw new InvalidArgumentException(sprintf(
+ '%s expects a string argument; received %s',
+ __METHOD__,
+ (is_object($host) ? get_class($host) : gettype($host))
+ ));
+ }
+
if ($host === $this->host) {
// Do nothing if no change was made.
return clone $this;
@@ -373,6 +404,14 @@ public function withQuery($query)
*/
public function withFragment($fragment)
{
+ if (! is_string($fragment)) {
+ throw new InvalidArgumentException(sprintf(
+ '%s expects a string argument; received %s',
+ __METHOD__,
+ (is_object($fragment) ? get_class($fragment) : gettype($fragment))
+ ));
+ }
+
$fragment = $this->filterFragment($fragment);
if ($fragment === $this->fragment) {
@@ -585,10 +624,6 @@ private function splitQueryValue($value)
*/
private function filterFragment($fragment)
{
- if (null === $fragment) {
- $fragment = '';
- }
-
if (! empty($fragment) && strpos($fragment, '#') === 0) {
$fragment = substr($fragment, 1);
}
diff --git a/core/vendor/zendframework/zend-escaper/CONTRIBUTING.md b/core/vendor/zendframework/zend-escaper/CONTRIBUTING.md
index e77f5d2d5b37..2b58aca399b5 100644
--- a/core/vendor/zendframework/zend-escaper/CONTRIBUTING.md
+++ b/core/vendor/zendframework/zend-escaper/CONTRIBUTING.md
@@ -1,3 +1,229 @@
# CONTRIBUTING
-Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
+## 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-escaper/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).
+
+## RUNNING TESTS
+
+> ### Note: testing versions prior to 2.4
+>
+> This component originates with Zend Framework 2. During the lifetime of ZF2,
+> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
+> changes were necessary. However, due to the migration, tests may not run on
+> versions < 2.4. As such, you may need to change the PHPUnit dependency if
+> attempting a fix on such a version.
+
+To run tests:
+
+- Clone the repository:
+
+ ```console
+ $ git clone git@github.com:zendframework/zend-escaper.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
+ ```
+
+You can turn on conditional tests with the phpunit.xml file.
+To do so:
+
+ - Copy `phpunit.xml.dist` file to `phpunit.xml`
+ - Edit `phpunit.xml` to enable any specific functionality you
+ want to test, as well as to provide test values to utilize.
+
+## Running Coding Standards Checks
+
+This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
+standards checks, and provides configuration for our selected checks.
+`php-cs-fixer` is installed by default via Composer.
+
+To run checks only:
+
+```console
+$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
+```
+
+To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
+flag:
+
+```console
+$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
+```
+
+If you allow php-cs-fixer 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-escaper)
+3. Clone the canonical repository locally and enter it.
+
+ ```console
+ $ git clone git://github.com:zendframework/zend-escaper.git
+ $ cd zend-escaper
+ ```
+
+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-escaper.git
+ $ git fetch {username}
+ ```
+
+### Keeping Up-to-Date
+
+Periodically, you should update your fork or personal repository to
+match the canonical ZF 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-escaper.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>
+ ```
diff --git a/core/vendor/zendframework/zend-escaper/LICENSE.md b/core/vendor/zendframework/zend-escaper/LICENSE.md
new file mode 100644
index 000000000000..dbb1b49c0142
--- /dev/null
+++ b/core/vendor/zendframework/zend-escaper/LICENSE.md
@@ -0,0 +1,28 @@
+Copyright (c) 2005-2015, 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/core/vendor/zendframework/zend-escaper/README.md b/core/vendor/zendframework/zend-escaper/README.md
index 83bd91628059..9ed284f0bfbf 100644
--- a/core/vendor/zendframework/zend-escaper/README.md
+++ b/core/vendor/zendframework/zend-escaper/README.md
@@ -1,15 +1,14 @@
-Escaper Component from ZF2
-==========================
+# zend-escaper
-This is the Escaper component for ZF2.
+[](https://secure.travis-ci.org/zendframework/zend-escaper)
+[](https://coveralls.io/r/zendframework/zend-escaper?branch=master)
-- File issues at https://github.com/zendframework/zf2/issues
-- Create pull requests against https://github.com/zendframework/zf2
-- Documentation is at http://framework.zend.com/docs
+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.
-LICENSE
--------
-
-The files in this archive are released under the [Zend Framework
-license](http://framework.zend.com/license), which is a 3-clause BSD license.
+- File issues at https://github.com/zendframework/zend-escaper/issues
+- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-escaper
diff --git a/core/vendor/zendframework/zend-escaper/composer.json b/core/vendor/zendframework/zend-escaper/composer.json
index 958f14a82c2d..faa4375d2b19 100644
--- a/core/vendor/zendframework/zend-escaper/composer.json
+++ b/core/vendor/zendframework/zend-escaper/composer.json
@@ -6,19 +6,30 @@
"zf2",
"escaper"
],
- "homepage": "https://github.com/zendframework/zf2",
+ "homepage": "https://github.com/zendframework/zend-escaper",
"autoload": {
"psr-4": {
- "Zend\\Escaper\\": ""
+ "Zend\\Escaper\\": "src/"
}
},
"require": {
"php": ">=5.3.23"
},
+ "minimum-stability": "dev",
+ "prefer-stable": true,
"extra": {
"branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
+ "dev-master": "2.5-dev",
+ "dev-develop": "2.6-dev"
}
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "ZendTest\\Escaper\\": "test/"
+ }
+ },
+ "require-dev": {
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/PHPUnit": "~4.0"
}
-}
+}
\ No newline at end of file
diff --git a/core/vendor/zendframework/zend-escaper/Escaper.php b/core/vendor/zendframework/zend-escaper/src/Escaper.php
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/Escaper.php
rename to core/vendor/zendframework/zend-escaper/src/Escaper.php
diff --git a/core/vendor/zendframework/zend-escaper/Exception/ExceptionInterface.php b/core/vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/Exception/ExceptionInterface.php
rename to core/vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-escaper/Exception/InvalidArgumentException.php b/core/vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/Exception/InvalidArgumentException.php
rename to core/vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-escaper/Exception/RuntimeException.php b/core/vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/Exception/RuntimeException.php
rename to core/vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php
diff --git a/core/vendor/zendframework/zend-feed/CHANGELOG.md b/core/vendor/zendframework/zend-feed/CHANGELOG.md
new file mode 100644
index 000000000000..426cab529513
--- /dev/null
+++ b/core/vendor/zendframework/zend-feed/CHANGELOG.md
@@ -0,0 +1,25 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 2.5.2 - TBD
+
+### Added
+
+- Nothing.
+
+### 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.
diff --git a/core/vendor/zendframework/zend-feed/CONTRIBUTING.md b/core/vendor/zendframework/zend-feed/CONTRIBUTING.md
index e77f5d2d5b37..e964373fc18b 100644
--- a/core/vendor/zendframework/zend-feed/CONTRIBUTING.md
+++ b/core/vendor/zendframework/zend-feed/CONTRIBUTING.md
@@ -1,3 +1,229 @@
# CONTRIBUTING
-Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
+## 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-feed/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).
+
+## RUNNING TESTS
+
+> ### Note: testing versions prior to 2.4
+>
+> This component originates with Zend Framework 2. During the lifetime of ZF2,
+> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
+> changes were necessary. However, due to the migration, tests may not run on
+> versions < 2.4. As such, you may need to change the PHPUnit dependency if
+> attempting a fix on such a version.
+
+To run tests:
+
+- Clone the repository:
+
+ ```console
+ $ git clone git@github.com:zendframework/zend-feed.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
+ ```
+
+You can turn on conditional tests with the phpunit.xml file.
+To do so:
+
+ - Copy `phpunit.xml.dist` file to `phpunit.xml`
+ - Edit `phpunit.xml` to enable any specific functionality you
+ want to test, as well as to provide test values to utilize.
+
+## Running Coding Standards Checks
+
+This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
+standards checks, and provides configuration for our selected checks.
+`php-cs-fixer` is installed by default via Composer.
+
+To run checks only:
+
+```console
+$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
+```
+
+To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
+flag:
+
+```console
+$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
+```
+
+If you allow php-cs-fixer 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-feed)
+3. Clone the canonical repository locally and enter it.
+
+ ```console
+ $ git clone git://github.com:zendframework/zend-feed.git
+ $ cd zend-feed
+ ```
+
+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-feed.git
+ $ git fetch {username}
+ ```
+
+### Keeping Up-to-Date
+
+Periodically, you should update your fork or personal repository to
+match the canonical ZF 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-feed.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>
+ ```
diff --git a/core/vendor/zendframework/zend-feed/LICENSE.md b/core/vendor/zendframework/zend-feed/LICENSE.md
new file mode 100644
index 000000000000..dbb1b49c0142
--- /dev/null
+++ b/core/vendor/zendframework/zend-feed/LICENSE.md
@@ -0,0 +1,28 @@
+Copyright (c) 2005-2015, 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/core/vendor/zendframework/zend-feed/README.md b/core/vendor/zendframework/zend-feed/README.md
index ffc73a9c262e..ba8b8726c3cf 100644
--- a/core/vendor/zendframework/zend-feed/README.md
+++ b/core/vendor/zendframework/zend-feed/README.md
@@ -1,15 +1,13 @@
-Feed Component from ZF2
-=======================
+# zend-feed
-This is the Feed component for ZF2.
+[](https://secure.travis-ci.org/zendframework/zend-feed)
+[](https://coveralls.io/r/zendframework/zend-feed?branch=master)
-- File issues at https://github.com/zendframework/zf2/issues
-- Create pull requests against https://github.com/zendframework/zf2
-- Documentation is at http://framework.zend.com/docs
+`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.
-LICENSE
--------
-
-The files in this archive are released under the [Zend Framework
-license](http://framework.zend.com/license), which is a 3-clause BSD license.
+- File issues at https://github.com/zendframework/zend-feed/issues
+- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-feed
diff --git a/core/vendor/zendframework/zend-feed/composer.json b/core/vendor/zendframework/zend-feed/composer.json
index 5541ae5d514d..2c29f0672c87 100644
--- a/core/vendor/zendframework/zend-feed/composer.json
+++ b/core/vendor/zendframework/zend-feed/composer.json
@@ -6,23 +6,25 @@
"zf2",
"feed"
],
- "homepage": "https://github.com/zendframework/zf2",
+ "homepage": "https://github.com/zendframework/zend-feed",
"autoload": {
"psr-4": {
- "Zend\\Feed\\": ""
+ "Zend\\Feed\\": "src/"
}
},
"require": {
- "php": ">=5.3.23",
- "zendframework/zend-escaper": "self.version",
- "zendframework/zend-stdlib": "self.version"
+ "php": ">=5.5",
+ "zendframework/zend-escaper": "~2.5",
+ "zendframework/zend-stdlib": "~2.5"
},
"require-dev": {
- "zendframework/zend-db": "self.version",
- "zendframework/zend-cache": "self.version",
- "zendframework/zend-http": "self.version",
- "zendframework/zend-servicemanager": "self.version",
- "zendframework/zend-validator": "self.version"
+ "zendframework/zend-db": "~2.5",
+ "zendframework/zend-cache": "~2.5",
+ "zendframework/zend-http": "~2.5",
+ "zendframework/zend-servicemanager": "~2.5",
+ "zendframework/zend-validator": "~2.5",
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/PHPUnit": "~4.0"
},
"suggest": {
"zendframework/zend-cache": "Zend\\Cache component",
@@ -31,10 +33,17 @@
"zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
"zendframework/zend-validator": "Zend\\Validator component"
},
+ "minimum-stability": "dev",
+ "prefer-stable": true,
"extra": {
"branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
+ "dev-master": "2.5-dev",
+ "dev-develop": "2.6-dev"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "ZendTest\\Feed\\": "test/"
}
}
-}
+}
\ No newline at end of file
diff --git a/core/vendor/zendframework/zend-feed/Exception/BadMethodCallException.php b/core/vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Exception/BadMethodCallException.php
rename to core/vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php
diff --git a/core/vendor/zendframework/zend-feed/Exception/ExceptionInterface.php b/core/vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Exception/ExceptionInterface.php
rename to core/vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Exception/InvalidArgumentException.php b/core/vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Exception/InvalidArgumentException.php
rename to core/vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-feed/Exception/RuntimeException.php b/core/vendor/zendframework/zend-feed/src/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Exception/RuntimeException.php
rename to core/vendor/zendframework/zend-feed/src/Exception/RuntimeException.php
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/AbstractCallback.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/AbstractCallback.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/CallbackInterface.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/CallbackInterface.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/Exception/ExceptionInterface.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/Exception/ExceptionInterface.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/Exception/InvalidArgumentException.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/Exception/InvalidArgumentException.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/Exception/RuntimeException.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/Exception/RuntimeException.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/HttpResponse.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/HttpResponse.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
index 0c1adf2ecb69..972296879ca6 100644
--- a/core/vendor/zendframework/zend-feed/PubSubHubbub/HttpResponse.php
+++ b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
@@ -23,7 +23,7 @@ class HttpResponse
*
* @var array
*/
- protected $headers = array();
+ protected $headers = [];
/**
* HTTP response code to use in headers
@@ -94,11 +94,11 @@ public function setHeader($name, $value, $replace = false)
}
}
}
- $this->headers[] = array(
+ $this->headers[] = [
'name' => $name,
'value' => $value,
'replace' => $replace,
- );
+ ];
return $this;
}
@@ -203,7 +203,7 @@ public function getContent()
*/
protected function _normalizeHeader($name)
{
- $filtered = str_replace(array('-', '_'), ' ', (string) $name);
+ $filtered = str_replace(['-', '_'], ' ', (string) $name);
$filtered = ucwords(strtolower($filtered));
$filtered = str_replace(' ', '-', $filtered);
return $filtered;
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/Model/AbstractModel.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/Model/AbstractModel.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/Model/Subscription.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
similarity index 91%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/Model/Subscription.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
index 46a5d82c80a7..a2086163d59f 100644
--- a/core/vendor/zendframework/zend-feed/PubSubHubbub/Model/Subscription.php
+++ b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
@@ -36,7 +36,7 @@ public function setSubscription(array $data)
'ID must be set before attempting a save'
);
}
- $result = $this->db->select(array('id' => $data['id']));
+ $result = $this->db->select(['id' => $data['id']]);
if ($result && (0 < count($result))) {
$data['created_time'] = $result->current()->created_time;
$now = $this->getNow();
@@ -48,7 +48,7 @@ public function setSubscription(array $data)
}
$this->db->update(
$data,
- array('id' => $data['id'])
+ ['id' => $data['id']]
);
return false;
}
@@ -70,7 +70,7 @@ public function getSubscription($key)
throw new PubSubHubbub\Exception\InvalidArgumentException('Invalid parameter "key"'
.' of "' . $key . '" must be a non-empty string');
}
- $result = $this->db->select(array('id' => $key));
+ $result = $this->db->select(['id' => $key]);
if (count($result)) {
return $result->current()->getArrayCopy();
}
@@ -90,7 +90,7 @@ public function hasSubscription($key)
throw new PubSubHubbub\Exception\InvalidArgumentException('Invalid parameter "key"'
.' of "' . $key . '" must be a non-empty string');
}
- $result = $this->db->select(array('id' => $key));
+ $result = $this->db->select(['id' => $key]);
if (count($result)) {
return true;
}
@@ -105,10 +105,10 @@ public function hasSubscription($key)
*/
public function deleteSubscription($key)
{
- $result = $this->db->select(array('id' => $key));
+ $result = $this->db->select(['id' => $key]);
if (count($result)) {
$this->db->delete(
- array('id' => $key)
+ ['id' => $key]
);
return true;
}
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/PubSubHubbub.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/PubSubHubbub.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/Publisher.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/Publisher.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
index 6130992bdc94..aed9c8fe2841 100644
--- a/core/vendor/zendframework/zend-feed/PubSubHubbub/Publisher.php
+++ b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
@@ -22,7 +22,7 @@ class Publisher
*
* @var array
*/
- protected $hubUrls = array();
+ protected $hubUrls = [];
/**
* An array of topic (Atom or RSS feed) URLs which have been updated and
@@ -30,7 +30,7 @@ class Publisher
*
* @var array
*/
- protected $updatedTopicUrls = array();
+ protected $updatedTopicUrls = [];
/**
* An array of any errors including keys for 'response', 'hubUrl'.
@@ -38,7 +38,7 @@ class Publisher
*
* @var array
*/
- protected $errors = array();
+ protected $errors = [];
/**
* An array of topic (Atom or RSS feed) URLs which have been updated and
@@ -46,7 +46,7 @@ class Publisher
*
* @var array
*/
- protected $parameters = array();
+ protected $parameters = [];
/**
* Constructor; accepts an array or Zend\Config\Config instance to preset
@@ -254,15 +254,15 @@ public function notifyAll()
throw new Exception\RuntimeException('No Hub Server URLs'
. ' have been set so no notifications can be sent');
}
- $this->errors = array();
+ $this->errors = [];
foreach ($hubs as $url) {
$client->setUri($url);
$response = $client->getResponse();
if ($response->getStatusCode() !== 204) {
- $this->errors[] = array(
+ $this->errors[] = [
'response' => $response,
'hubUrl' => $url
- );
+ ];
}
}
}
@@ -373,10 +373,10 @@ protected function _getHttpClient()
{
$client = PubSubHubbub::getHttpClient();
$client->setMethod(HttpRequest::METHOD_POST);
- $client->setOptions(array(
+ $client->setOptions([
'useragent' => 'Zend_Feed_Pubsubhubbub_Publisher/' . Version::VERSION,
- ));
- $params = array();
+ ]);
+ $params = [];
$params[] = 'hub.mode=publish';
$topics = $this->getUpdatedTopicUrls();
if (empty($topics)) {
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/Subscriber.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
similarity index 96%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/Subscriber.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
index d5db90850967..802a00192e61 100644
--- a/core/vendor/zendframework/zend-feed/PubSubHubbub/Subscriber.php
+++ b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
@@ -23,7 +23,7 @@ class Subscriber
*
* @var array
*/
- protected $hubUrls = array();
+ protected $hubUrls = [];
/**
* An array of optional parameters to be included in any
@@ -31,7 +31,7 @@ class Subscriber
*
* @var array
*/
- protected $parameters = array();
+ protected $parameters = [];
/**
* The URL of the topic (Rss or Atom feed) which is the subject of
@@ -76,7 +76,7 @@ class Subscriber
*
* @var array
*/
- protected $errors = array();
+ protected $errors = [];
/**
* An array of Hub Server URLs for Hubs operating at this time in
@@ -84,7 +84,7 @@ class Subscriber
*
* @var array
*/
- protected $asyncHubs = array();
+ protected $asyncHubs = [];
/**
* An instance of Zend\Feed\Pubsubhubbub\Model\SubscriptionPersistence used to background
@@ -101,7 +101,7 @@ class Subscriber
*
* @var array
*/
- protected $authentications = array();
+ protected $authentications = [];
/**
* Tells the Subscriber to append any subscription identifier to the path
@@ -610,8 +610,8 @@ protected function _doRequest($mode)
throw new Exception\RuntimeException('No Hub Server URLs'
. ' have been set so no subscriptions can be attempted');
}
- $this->errors = array();
- $this->asyncHubs = array();
+ $this->errors = [];
+ $this->asyncHubs = [];
foreach ($hubs as $url) {
if (array_key_exists($url, $this->authentications)) {
$auth = $this->authentications[$url];
@@ -623,10 +623,10 @@ protected function _doRequest($mode)
if ($response->getStatusCode() !== 204
&& $response->getStatusCode() !== 202
) {
- $this->errors[] = array(
+ $this->errors[] = [
'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
@@ -635,10 +635,10 @@ protected function _doRequest($mode)
* move these to asynchronous processes.
*/
} elseif ($response->getStatusCode() == 202) {
- $this->asyncHubs[] = array(
+ $this->asyncHubs[] = [
'response' => $response,
'hubUrl' => $url,
- );
+ ];
}
}
}
@@ -652,8 +652,8 @@ protected function _getHttpClient()
{
$client = PubSubHubbub::getHttpClient();
$client->setMethod(HttpRequest::METHOD_POST);
- $client->setOptions(array('useragent' => 'Zend_Feed_Pubsubhubbub_Subscriber/'
- . Version::VERSION));
+ $client->setOptions(['useragent' => 'Zend_Feed_Pubsubhubbub_Subscriber/'
+ . Version::VERSION]);
return $client;
}
@@ -668,30 +668,30 @@ protected function _getHttpClient()
*/
protected function _getRequestParameters($hubUrl, $mode)
{
- if (!in_array($mode, array('subscribe', 'unsubscribe'))) {
+ if (!in_array($mode, ['subscribe', 'unsubscribe'])) {
throw new Exception\InvalidArgumentException('Invalid mode specified: "'
. $mode . '" which should have been "subscribe" or "unsubscribe"');
}
- $params = array(
+ $params = [
'hub.mode' => $mode,
'hub.topic' => $this->getTopicUrl(),
- );
+ ];
if ($this->getPreferredVerificationMode()
== PubSubHubbub::VERIFICATION_MODE_SYNC
) {
- $vmodes = array(
+ $vmodes = [
PubSubHubbub::VERIFICATION_MODE_SYNC,
PubSubHubbub::VERIFICATION_MODE_ASYNC,
- );
+ ];
} else {
- $vmodes = array(
+ $vmodes = [
PubSubHubbub::VERIFICATION_MODE_ASYNC,
PubSubHubbub::VERIFICATION_MODE_SYNC,
- );
+ ];
}
- $params['hub.verify'] = array();
+ $params['hub.verify'] = [];
foreach ($vmodes as $vmode) {
$params['hub.verify'][] = $vmode;
}
@@ -729,7 +729,7 @@ protected function _getRequestParameters($hubUrl, $mode)
$expires = $now->add(new DateInterval('PT' . $params['hub.lease_seconds'] . 'S'))
->format('Y-m-d H:i:s');
}
- $data = array(
+ $data = [
'id' => $key,
'topic_url' => $params['hub.topic'],
'hub_url' => $hubUrl,
@@ -739,7 +739,7 @@ protected function _getRequestParameters($hubUrl, $mode)
'secret' => null,
'expiration_time' => $expires,
'subscription_state' => ($mode == 'unsubscribe')? PubSubHubbub::SUBSCRIPTION_TODELETE : PubSubHubbub::SUBSCRIPTION_NOTVERIFIED,
- );
+ ];
$this->getStorage()->setSubscription($data);
return $this->_toByteValueOrderedString(
@@ -786,11 +786,11 @@ protected function _generateSubscriptionKey(array $params, $hubUrl)
*/
protected function _urlEncode(array $params)
{
- $encoded = array();
+ $encoded = [];
foreach ($params as $key => $value) {
if (is_array($value)) {
$ekey = PubSubHubbub::urlencode($key);
- $encoded[$ekey] = array();
+ $encoded[$ekey] = [];
foreach ($value as $duplicateKey) {
$encoded[$ekey][]
= PubSubHubbub::urlencode($duplicateKey);
@@ -811,7 +811,7 @@ protected function _urlEncode(array $params)
*/
protected function _toByteValueOrderedString(array $params)
{
- $return = array();
+ $return = [];
uksort($params, 'strnatcmp');
foreach ($params as $key => $value) {
if (is_array($value)) {
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/Subscriber/Callback.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/Subscriber/Callback.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
index 5160259003b8..56c06c7dfe5b 100644
--- a/core/vendor/zendframework/zend-feed/PubSubHubbub/Subscriber/Callback.php
+++ b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
@@ -140,12 +140,12 @@ public function isValidHubVerification(array $httpGetData)
if (strtolower($_SERVER['REQUEST_METHOD']) !== 'get') {
return false;
}
- $required = array(
+ $required = [
'hub_mode',
'hub_topic',
'hub_challenge',
'hub_verify_token',
- );
+ ];
foreach ($required as $key) {
if (!array_key_exists($key, $httpGetData)) {
return false;
@@ -288,13 +288,13 @@ protected function _detectVerifyTokenKey(array $httpGetData = null)
*/
protected function _parseQueryString()
{
- $params = array();
+ $params = [];
$queryString = '';
if (isset($_SERVER['QUERY_STRING'])) {
$queryString = $_SERVER['QUERY_STRING'];
}
if (empty($queryString)) {
- return array();
+ return [];
}
$parts = explode('&', $queryString);
foreach ($parts as $kvpair) {
@@ -305,7 +305,7 @@ protected function _parseQueryString()
if (is_array($params[$key])) {
$params[$key][] = $value;
} else {
- $params[$key] = array($params[$key], $value);
+ $params[$key] = [$params[$key], $value];
}
} else {
$params[$key] = $value;
diff --git a/core/vendor/zendframework/zend-feed/PubSubHubbub/Version.php b/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/PubSubHubbub/Version.php
rename to core/vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/AbstractEntry.php b/core/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Reader/AbstractEntry.php
rename to core/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
index a5bcd4287ace..a706ff82ef6a 100644
--- a/core/vendor/zendframework/zend-feed/Reader/AbstractEntry.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
@@ -20,7 +20,7 @@ abstract class AbstractEntry
*
* @var array
*/
- protected $data = array();
+ protected $data = [];
/**
* DOM document object
@@ -55,7 +55,7 @@ abstract class AbstractEntry
*
* @var array
*/
- protected $extensions = array();
+ protected $extensions = [];
/**
* Constructor
@@ -195,7 +195,7 @@ public function __call($method, $args)
{
foreach ($this->extensions as $extension) {
if (method_exists($extension, $method)) {
- return call_user_func_array(array($extension, $method), $args);
+ return call_user_func_array([$extension, $method], $args);
}
}
throw new Exception\BadMethodCallException('Method: ' . $method
diff --git a/core/vendor/zendframework/zend-feed/Reader/AbstractFeed.php b/core/vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Reader/AbstractFeed.php
rename to core/vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php
index 1ded7441821d..8cc234717c10 100644
--- a/core/vendor/zendframework/zend-feed/Reader/AbstractFeed.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php
@@ -20,7 +20,7 @@ abstract class AbstractFeed implements Feed\FeedInterface
*
* @var array
*/
- protected $data = array();
+ protected $data = [];
/**
* Parsed feed data in the shape of a DOMDocument
@@ -34,7 +34,7 @@ abstract class AbstractFeed implements Feed\FeedInterface
*
* @var array
*/
- protected $entries = array();
+ protected $entries = [];
/**
* A pointer for the iterator to keep track of the entries array
@@ -55,7 +55,7 @@ abstract class AbstractFeed implements Feed\FeedInterface
*
* @var array
*/
- protected $extensions = array();
+ protected $extensions = [];
/**
* Original Source URI (set if imported from a URI)
@@ -248,7 +248,7 @@ public function __call($method, $args)
{
foreach ($this->extensions as $extension) {
if (method_exists($extension, $method)) {
- return call_user_func_array(array($extension, $method), $args);
+ return call_user_func_array([$extension, $method], $args);
}
}
throw new Exception\BadMethodCallException('Method: ' . $method
diff --git a/core/vendor/zendframework/zend-feed/Reader/Collection.php b/core/vendor/zendframework/zend-feed/src/Reader/Collection.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Collection.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Collection.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Collection/AbstractCollection.php b/core/vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Collection/AbstractCollection.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Collection/Author.php b/core/vendor/zendframework/zend-feed/src/Reader/Collection/Author.php
similarity index 96%
rename from core/vendor/zendframework/zend-feed/Reader/Collection/Author.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Collection/Author.php
index 82716db2a2b5..be956d47f290 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Collection/Author.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Collection/Author.php
@@ -19,7 +19,7 @@ class Author extends AbstractCollection
*/
public function getValues()
{
- $authors = array();
+ $authors = [];
foreach ($this->getIterator() as $element) {
$authors[] = $element['name'];
}
diff --git a/core/vendor/zendframework/zend-feed/Reader/Collection/Category.php b/core/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Reader/Collection/Category.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
index 57d056040d12..2f43a071828c 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Collection/Category.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
@@ -21,7 +21,7 @@ class Category extends AbstractCollection
*/
public function getValues()
{
- $categories = array();
+ $categories = [];
foreach ($this->getIterator() as $element) {
if (isset($element['label']) && !empty($element['label'])) {
$categories[] = $element['label'];
diff --git a/core/vendor/zendframework/zend-feed/Reader/Collection/Collection.php b/core/vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Collection/Collection.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Entry/AbstractEntry.php b/core/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Reader/Entry/AbstractEntry.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
index 7b006875b113..1342431a3f5b 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Entry/AbstractEntry.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
@@ -22,7 +22,7 @@ abstract class AbstractEntry
*
* @var array
*/
- protected $data = array();
+ protected $data = [];
/**
* DOM document object
@@ -57,7 +57,7 @@ abstract class AbstractEntry
*
* @var array
*/
- protected $extensions = array();
+ protected $extensions = [];
/**
* Constructor
@@ -200,7 +200,7 @@ public function __call($method, $args)
{
foreach ($this->extensions as $extension) {
if (method_exists($extension, $method)) {
- return call_user_func_array(array($extension, $method), $args);
+ return call_user_func_array([$extension, $method], $args);
}
}
throw new Exception\RuntimeException(sprintf(
diff --git a/core/vendor/zendframework/zend-feed/Reader/Entry/Atom.php b/core/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
similarity index 99%
rename from core/vendor/zendframework/zend-feed/Reader/Entry/Atom.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
index 543f45661709..c68f360f90c4 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Entry/Atom.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
@@ -37,7 +37,7 @@ public function __construct(DOMElement $entry, $entryKey, $type = null)
$this->xpathQuery = '//atom:entry[' . ($this->entryKey + 1) . ']';
$manager = Reader\Reader::getExtensionManager();
- $extensions = array('Atom\Entry', 'Thread\Entry', 'DublinCore\Entry');
+ $extensions = ['Atom\Entry', 'Thread\Entry', 'DublinCore\Entry'];
foreach ($extensions as $name) {
$extension = $manager->get($name);
diff --git a/core/vendor/zendframework/zend-feed/Reader/Entry/EntryInterface.php b/core/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Entry/EntryInterface.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Entry/Rss.php b/core/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Reader/Entry/Rss.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
index 409190450c1c..b55fdad4218a 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Entry/Rss.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
@@ -45,14 +45,14 @@ public function __construct(DOMElement $entry, $entryKey, $type = null)
$this->xpathQueryRdf = '//rss:item[' . ($this->entryKey+1) . ']';
$manager = Reader\Reader::getExtensionManager();
- $extensions = array(
+ $extensions = [
'DublinCore\Entry',
'Content\Entry',
'Atom\Entry',
'WellFormedWeb\Entry',
'Slash\Entry',
'Thread\Entry',
- );
+ ];
foreach ($extensions as $name) {
$extension = $manager->get($name);
$extension->setEntryElement($entry);
@@ -90,13 +90,13 @@ public function getAuthors()
return $this->data['authors'];
}
- $authors = array();
+ $authors = [];
$authorsDc = $this->getExtension('DublinCore')->getAuthors();
if (!empty($authorsDc)) {
foreach ($authorsDc as $author) {
- $authors[] = array(
+ $authors[] = [
'name' => $author['name']
- );
+ ];
}
}
@@ -109,7 +109,7 @@ public function getAuthors()
if ($list->length) {
foreach ($list as $author) {
$string = trim($author->nodeValue);
- $data = array();
+ $data = [];
// Pretty rough parsing - but it's a catchall
if (preg_match("/^.*@[^ ]*/", $string, $matches)) {
$data['email'] = trim($matches[0]);
@@ -197,14 +197,14 @@ public function getDateModified()
if ($dateModifiedParsed) {
$date = new DateTime('@' . $dateModifiedParsed);
} else {
- $dateStandards = array(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);
break;
} catch (\Exception $e) {
- if ($standard == null) {
+ if ($standard === null) {
throw new Exception\RuntimeException(
'Could not load date due to unrecognised'
.' format (should follow RFC 822 or 2822):'
@@ -377,7 +377,7 @@ public function getLinks()
return $this->data['links'];
}
- $links = array();
+ $links = [];
if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
$this->getType() !== Reader\Reader::TYPE_RSS_090) {
@@ -420,11 +420,11 @@ public function getCategories()
if ($list->length) {
$categoryCollection = new Reader\Collection\Category;
foreach ($list as $category) {
- $categoryCollection[] = array(
+ $categoryCollection[] = [
'term' => $category->nodeValue,
'scheme' => $category->getAttribute('domain'),
'label' => $category->nodeValue,
- );
+ ];
}
} else {
$categoryCollection = $this->getExtension('DublinCore')->getCategories();
diff --git a/core/vendor/zendframework/zend-feed/Reader/Exception/BadMethodCallException.php b/core/vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Exception/BadMethodCallException.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Exception/ExceptionInterface.php b/core/vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Exception/ExceptionInterface.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Exception/InvalidArgumentException.php b/core/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Exception/InvalidArgumentException.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Exception/RuntimeException.php b/core/vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Exception/RuntimeException.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/AbstractEntry.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
similarity index 99%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/AbstractEntry.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
index 72bd62ea3905..c589146ae64d 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Extension/AbstractEntry.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
@@ -21,7 +21,7 @@ abstract class AbstractEntry
*
* @var array
*/
- protected $data = array();
+ protected $data = [];
/**
* DOM document object
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/AbstractFeed.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php
similarity index 99%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/AbstractFeed.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php
index 94acea6e3584..d61414a210bc 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Extension/AbstractFeed.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php
@@ -20,7 +20,7 @@ abstract class AbstractFeed
*
* @var array
*/
- protected $data = array();
+ protected $data = [];
/**
* Parsed feed data in the shape of a DOMDocument
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/Atom/Entry.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/Atom/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
index 06e94a275554..9d06ad3b96e3 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Extension/Atom/Entry.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
@@ -48,7 +48,7 @@ public function getAuthors()
return $this->data['authors'];
}
- $authors = array();
+ $authors = [];
$list = $this->getXpath()->query($this->getXpathPrefix() . '//atom:author');
if (!$list->length) {
@@ -142,10 +142,10 @@ protected function collectXhtml($xhtml, $prefix)
if (!empty($prefix)) {
$prefix = $prefix . ':';
}
- $matches = array(
+ $matches = [
"/<\?xml[^<]*>[^<]*<" . $prefix . "div[^<]*/",
"/<\/" . $prefix . "div>\s*$/"
- );
+ ];
$xhtml = preg_replace($matches, '', $xhtml);
if (!empty($prefix)) {
$xhtml = preg_replace("/(<[\/]?)" . $prefix . "([a-zA-Z]+)/", '$1$2', $xhtml);
@@ -347,7 +347,7 @@ public function getLinks()
return $this->data['links'];
}
- $links = array();
+ $links = [];
$list = $this->getXpath()->query(
$this->getXpathPrefix() . '//atom:link[@rel="alternate"]/@href' . '|' .
@@ -505,11 +505,11 @@ public function getCategories()
if ($list->length) {
$categoryCollection = new Collection\Category;
foreach ($list as $category) {
- $categoryCollection[] = array(
+ $categoryCollection[] = [
'term' => $category->getAttribute('term'),
'scheme' => $category->getAttribute('scheme'),
'label' => $category->getAttribute('label')
- );
+ ];
}
} else {
return new Collection\Category;
@@ -573,7 +573,7 @@ protected function absolutiseUri($link)
*/
protected function getAuthorFromElement(DOMElement $element)
{
- $author = array();
+ $author = [];
$emailNode = $element->getElementsByTagName('email');
$nameNode = $element->getElementsByTagName('name');
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/Atom/Feed.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/Atom/Feed.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
index 19dbf5a56eeb..dc5a59f7ff1f 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Extension/Atom/Feed.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
@@ -48,7 +48,7 @@ public function getAuthors()
$list = $this->xpath->query('//atom:author');
- $authors = array();
+ $authors = [];
if ($list->length) {
foreach ($list as $author) {
@@ -276,7 +276,7 @@ public function getImage()
if (!$imageUrl) {
$image = null;
} else {
- $image = array('uri' => $imageUrl);
+ $image = ['uri' => $imageUrl];
}
$this->data['image'] = $image;
@@ -363,7 +363,7 @@ public function getHubs()
if (array_key_exists('hubs', $this->data)) {
return $this->data['hubs'];
}
- $hubs = array();
+ $hubs = [];
$list = $this->xpath->query($this->getXpathPrefix()
. '//atom:link[@rel="hub"]/@href');
@@ -429,11 +429,11 @@ public function getCategories()
if ($list->length) {
$categoryCollection = new Collection\Category;
foreach ($list as $category) {
- $categoryCollection[] = array(
+ $categoryCollection[] = [
'term' => $category->getAttribute('term'),
'scheme' => $category->getAttribute('scheme'),
'label' => $category->getAttribute('label')
- );
+ ];
}
} else {
return new Collection\Category;
@@ -452,7 +452,7 @@ public function getCategories()
*/
protected function getAuthorFromElement(DOMElement $element)
{
- $author = array();
+ $author = [];
$emailNode = $element->getElementsByTagName('email');
$nameNode = $element->getElementsByTagName('name');
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/Content/Entry.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/Content/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/CreativeCommons/Entry.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/CreativeCommons/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php
index 9194682f8892..a75a5c49a167 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Extension/CreativeCommons/Entry.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php
@@ -42,7 +42,7 @@ public function getLicenses()
return $this->data[$name];
}
- $licenses = array();
+ $licenses = [];
$list = $this->xpath->evaluate($this->getXpathPrefix() . '//cc:license');
if ($list->length) {
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/CreativeCommons/Feed.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/CreativeCommons/Feed.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php
index c833bbda9c5d..8532a88c0ab6 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Extension/CreativeCommons/Feed.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php
@@ -42,7 +42,7 @@ public function getLicenses()
return $this->data[$name];
}
- $licenses = array();
+ $licenses = [];
$list = $this->xpath->evaluate('channel/cc:license');
if ($list->length) {
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/DublinCore/Entry.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/DublinCore/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
index e23de8101ca8..1b42f581a2bb 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Extension/DublinCore/Entry.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
@@ -44,7 +44,7 @@ public function getAuthors()
return $this->data['authors'];
}
- $authors = array();
+ $authors = [];
$list = $this->getXpath()->evaluate($this->getXpathPrefix() . '//dc11:creator');
if (!$list->length) {
@@ -60,9 +60,9 @@ public function getAuthors()
if ($list->length) {
foreach ($list as $author) {
- $authors[] = array(
+ $authors[] = [
'name' => $author->nodeValue
- );
+ ];
}
$authors = new Collection\Author(
Reader\Reader::arrayUnique($authors)
@@ -96,11 +96,11 @@ public function getCategories()
if ($list->length) {
$categoryCollection = new Collection\Category;
foreach ($list as $category) {
- $categoryCollection[] = array(
+ $categoryCollection[] = [
'term' => $category->nodeValue,
'scheme' => null,
'label' => $category->nodeValue,
- );
+ ];
}
} else {
$categoryCollection = new Collection\Category;
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/DublinCore/Feed.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/DublinCore/Feed.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
index 6b54b081f2da..9e3395881dc3 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Extension/DublinCore/Feed.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
@@ -44,7 +44,7 @@ public function getAuthors()
return $this->data['authors'];
}
- $authors = array();
+ $authors = [];
$list = $this->getXpath()->query('//dc11:creator');
if (!$list->length) {
@@ -60,9 +60,9 @@ public function getAuthors()
if ($list->length) {
foreach ($list as $author) {
- $authors[] = array(
+ $authors[] = [
'name' => $author->nodeValue
- );
+ ];
}
$authors = new Collection\Author(
Reader\Reader::arrayUnique($authors)
@@ -249,11 +249,11 @@ public function getCategories()
if ($list->length) {
$categoryCollection = new Collection\Category;
foreach ($list as $category) {
- $categoryCollection[] = array(
+ $categoryCollection[] = [
'term' => $category->nodeValue,
'scheme' => null,
'label' => $category->nodeValue,
- );
+ ];
}
} else {
$categoryCollection = new Collection\Category;
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/Podcast/Entry.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/Podcast/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/Podcast/Feed.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/Podcast/Feed.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
index 9fb80de540c7..4ae7bf3ac308 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Extension/Podcast/Feed.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
@@ -73,14 +73,14 @@ public function getItunesCategories()
$categoryList = $this->xpath->query($this->getXpathPrefix() . '/itunes:category');
- $categories = array();
+ $categories = [];
if ($categoryList->length > 0) {
foreach ($categoryList as $node) {
$children = null;
if ($node->childNodes->length > 0) {
- $children = array();
+ $children = [];
foreach ($node->childNodes as $childNode) {
if (!($childNode instanceof DOMText)) {
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/Slash/Entry.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/Slash/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
index 786d894ea4a1..4bd01fe7fe59 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Extension/Slash/Entry.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
@@ -49,7 +49,7 @@ public function getHitParade()
}
$stringParade = $this->getData($name);
- $hitParade = array();
+ $hitParade = [];
if (!empty($stringParade)) {
$stringParade = explode(',', $stringParade);
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/Syndication/Feed.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/Syndication/Feed.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/Thread/Entry.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/Thread/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Extension/WellFormedWeb/Entry.php b/core/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Extension/WellFormedWeb/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/ExtensionManager.php b/core/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
similarity index 96%
rename from core/vendor/zendframework/zend-feed/Reader/ExtensionManager.php
rename to core/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
index bf694c8e2730..6740cc92bc56 100644
--- a/core/vendor/zendframework/zend-feed/Reader/ExtensionManager.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
@@ -53,7 +53,7 @@ public function __call($method, $args)
__CLASS__
));
}
- return call_user_func_array(array($this->pluginManager, $method), $args);
+ return call_user_func_array([$this->pluginManager, $method], $args);
}
/**
diff --git a/core/vendor/zendframework/zend-feed/Reader/ExtensionManagerInterface.php b/core/vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/ExtensionManagerInterface.php
rename to core/vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/ExtensionPluginManager.php b/core/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Reader/ExtensionPluginManager.php
rename to core/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
index 3e3308c29acb..431be124cff6 100644
--- a/core/vendor/zendframework/zend-feed/Reader/ExtensionPluginManager.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
@@ -25,7 +25,7 @@ class ExtensionPluginManager extends AbstractPluginManager
*
* @var array
*/
- protected $invokableClasses = array(
+ protected $invokableClasses = [
'atomentry' => 'Zend\Feed\Reader\Extension\Atom\Entry',
'atomfeed' => 'Zend\Feed\Reader\Extension\Atom\Feed',
'contententry' => 'Zend\Feed\Reader\Extension\Content\Entry',
@@ -39,7 +39,7 @@ class ExtensionPluginManager extends AbstractPluginManager
'syndicationfeed' => 'Zend\Feed\Reader\Extension\Syndication\Feed',
'threadentry' => 'Zend\Feed\Reader\Extension\Thread\Entry',
'wellformedwebentry' => 'Zend\Feed\Reader\Extension\WellFormedWeb\Entry',
- );
+ ];
/**
* Do not share instances
diff --git a/core/vendor/zendframework/zend-feed/Reader/Feed/AbstractFeed.php b/core/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Reader/Feed/AbstractFeed.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
index 9814967a62e9..78b671dd4e24 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Feed/AbstractFeed.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
@@ -24,7 +24,7 @@ abstract class AbstractFeed implements FeedInterface
*
* @var array
*/
- protected $data = array();
+ protected $data = [];
/**
* Parsed feed data in the shape of a DOMDocument
@@ -38,7 +38,7 @@ abstract class AbstractFeed implements FeedInterface
*
* @var array
*/
- protected $entries = array();
+ protected $entries = [];
/**
* A pointer for the iterator to keep track of the entries array
@@ -59,7 +59,7 @@ abstract class AbstractFeed implements FeedInterface
*
* @var array
*/
- protected $extensions = array();
+ protected $extensions = [];
/**
* Original Source URI (set if imported from a URI)
@@ -252,7 +252,7 @@ public function __call($method, $args)
{
foreach ($this->extensions as $extension) {
if (method_exists($extension, $method)) {
- return call_user_func_array(array($extension, $method), $args);
+ return call_user_func_array([$extension, $method], $args);
}
}
throw new Exception\BadMethodCallException('Method: ' . $method
diff --git a/core/vendor/zendframework/zend-feed/Reader/Feed/Atom.php b/core/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Feed/Atom.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Feed/Atom/Source.php b/core/vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Reader/Feed/Atom/Source.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php
index 2590de655571..4f15b55c4e88 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Feed/Atom/Source.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php
@@ -36,7 +36,7 @@ public function __construct(DOMElement $source, $xpathPrefix, $type = Reader\Rea
$this->loadExtensions();
$manager = Reader\Reader::getExtensionManager();
- $extensions = array('Atom\Feed', 'DublinCore\Feed');
+ $extensions = ['Atom\Feed', 'DublinCore\Feed'];
foreach ($extensions as $name) {
$extension = $manager->get($name);
diff --git a/core/vendor/zendframework/zend-feed/Reader/Feed/FeedInterface.php b/core/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Feed/FeedInterface.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Feed/Rss.php b/core/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Reader/Feed/Rss.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
index cb9f038bccaa..1a148b219baf 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Feed/Rss.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
@@ -83,13 +83,13 @@ public function getAuthors()
return $this->data['authors'];
}
- $authors = array();
+ $authors = [];
$authorsDc = $this->getExtension('DublinCore')->getAuthors();
if (!empty($authorsDc)) {
foreach ($authorsDc as $author) {
- $authors[] = array(
+ $authors[] = [
'name' => $author['name']
- );
+ ];
}
}
@@ -106,7 +106,7 @@ public function getAuthors()
if ($list->length) {
foreach ($list as $author) {
$string = trim($author->nodeValue);
- $data = array();
+ $data = [];
// Pretty rough parsing - but it's a catchall
if (preg_match("/^.*@[^ ]*/", $string, $matches)) {
$data['email'] = trim($matches[0]);
@@ -205,14 +205,14 @@ public function getDateModified()
if ($dateModifiedParsed) {
$date = new DateTime('@' . $dateModifiedParsed);
} else {
- $dateStandards = array(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);
break;
} catch (\Exception $e) {
- if ($standard == null) {
+ if ($standard === null) {
throw new Exception\RuntimeException(
'Could not load date due to unrecognised'
.' format (should follow RFC 822 or 2822):'
@@ -265,14 +265,14 @@ public function getLastBuildDate()
if ($lastBuildDateParsed) {
$date = new DateTime('@' . $lastBuildDateParsed);
} else {
- $dateStandards = array(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);
break;
} catch (\Exception $e) {
- if ($standard == null) {
+ if ($standard === null) {
throw new Exception\RuntimeException(
'Could not load date due to unrecognised'
.' format (should follow RFC 822 or 2822):'
@@ -391,7 +391,7 @@ public function getImage()
$prefix = '/rdf:RDF/rss:channel/rss:image[1]';
}
if ($list->length > 0) {
- $image = array();
+ $image = [];
$value = $this->xpath->evaluate('string(' . $prefix . '/url)');
if ($value) {
$image['uri'] = $value;
@@ -637,11 +637,11 @@ public function getCategories()
if ($list->length) {
$categoryCollection = new Collection\Category;
foreach ($list as $category) {
- $categoryCollection[] = array(
+ $categoryCollection[] = [
'term' => $category->nodeValue,
'scheme' => $category->getAttribute('domain'),
'label' => $category->nodeValue,
- );
+ ];
}
} else {
$categoryCollection = $this->getExtension('DublinCore')->getCategories();
diff --git a/core/vendor/zendframework/zend-feed/Reader/FeedSet.php b/core/vendor/zendframework/zend-feed/src/Reader/FeedSet.php
similarity index 92%
rename from core/vendor/zendframework/zend-feed/Reader/FeedSet.php
rename to core/vendor/zendframework/zend-feed/src/Reader/FeedSet.php
index 8fab2cbae8e0..d890532830c6 100644
--- a/core/vendor/zendframework/zend-feed/Reader/FeedSet.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/FeedSet.php
@@ -13,8 +13,6 @@
use DOMNodeList;
use Zend\Feed\Uri;
-/**
-*/
class FeedSet extends ArrayObject
{
public $rss = null;
@@ -53,11 +51,11 @@ public function addLinks(DOMNodeList $links, $uri)
} elseif (!isset($this->rdf) && $link->getAttribute('type') == 'application/rdf+xml') {
$this->rdf = $this->absolutiseUri(trim($link->getAttribute('href')), $uri);
}
- $this[] = new static(array(
+ $this[] = new static([
'rel' => 'alternate',
'type' => $link->getAttribute('type'),
'href' => $this->absolutiseUri(trim($link->getAttribute('href')), $uri),
- ));
+ ]);
}
}
@@ -75,7 +73,13 @@ protected function absolutiseUri($link, $uri = null)
$link = $uri->getPath() . '/' . $link;
}
- $link = $uri->getScheme() . '://' . $uri->getHost() . '/' . $this->canonicalizePath($link);
+ $link = sprintf(
+ '%s://%s/%s',
+ ($uri->getScheme() ?: 'http'),
+ $uri->getHost(),
+ $this->canonicalizePath($link)
+ );
+
if (!Uri::factory($link)->isValid()) {
$link = null;
}
@@ -90,7 +94,7 @@ protected function absolutiseUri($link, $uri = null)
protected function canonicalizePath($path)
{
$parts = array_filter(explode('/', $path));
- $absolutes = array();
+ $absolutes = [];
foreach ($parts as $part) {
if ('.' == $part) {
continue;
diff --git a/core/vendor/zendframework/zend-feed/Reader/Http/ClientInterface.php b/core/vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Http/ClientInterface.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Http/ResponseInterface.php b/core/vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/Http/ResponseInterface.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/Reader.php b/core/vendor/zendframework/zend-feed/src/Reader/Reader.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Reader/Reader.php
rename to core/vendor/zendframework/zend-feed/src/Reader/Reader.php
index c5eb3d454f43..09bdcf4b9556 100644
--- a/core/vendor/zendframework/zend-feed/Reader/Reader.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/Reader.php
@@ -72,24 +72,24 @@ class Reader implements ReaderImportInterface
protected static $extensionManager = null;
- protected static $extensions = array(
- 'feed' => array(
+ protected static $extensions = [
+ 'feed' => [
'DublinCore\Feed',
'Atom\Feed'
- ),
- 'entry' => array(
+ ],
+ 'entry' => [
'Content\Entry',
'DublinCore\Entry',
'Atom\Entry'
- ),
- 'core' => array(
+ ],
+ 'core' => [
'DublinCore\Feed',
'Atom\Feed',
'Content\Entry',
'DublinCore\Entry',
'Atom\Entry'
- )
- );
+ ]
+ ];
/**
* Get the Feed cache
@@ -619,24 +619,24 @@ public static function reset()
static::$httpMethodOverride = false;
static::$httpConditionalGet = false;
static::$extensionManager = null;
- static::$extensions = array(
- 'feed' => array(
+ static::$extensions = [
+ 'feed' => [
'DublinCore\Feed',
'Atom\Feed'
- ),
- 'entry' => array(
+ ],
+ 'entry' => [
'Content\Entry',
'DublinCore\Entry',
'Atom\Entry'
- ),
- 'core' => array(
+ ],
+ 'core' => [
'DublinCore\Feed',
'Atom\Feed',
'Content\Entry',
'DublinCore\Entry',
'Atom\Entry'
- )
- );
+ ]
+ ];
}
/**
diff --git a/core/vendor/zendframework/zend-feed/Reader/ReaderImportInterface.php b/core/vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Reader/ReaderImportInterface.php
rename to core/vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Reader/StandaloneExtensionManager.php b/core/vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Reader/StandaloneExtensionManager.php
rename to core/vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php
index ac85e8a74be8..9d9fcad9ff5b 100644
--- a/core/vendor/zendframework/zend-feed/Reader/StandaloneExtensionManager.php
+++ b/core/vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php
@@ -11,7 +11,7 @@
class StandaloneExtensionManager implements ExtensionManagerInterface
{
- private $extensions = array(
+ private $extensions = [
'Atom\Entry' => 'Zend\Feed\Reader\Extension\Atom\Entry',
'Atom\Feed' => 'Zend\Feed\Reader\Extension\Atom\Feed',
'Content\Entry' => 'Zend\Feed\Reader\Extension\Content\Entry',
@@ -25,7 +25,7 @@ class StandaloneExtensionManager implements ExtensionManagerInterface
'Syndication\Feed' => 'Zend\Feed\Reader\Extension\Syndication\Feed',
'Thread\Entry' => 'Zend\Feed\Reader\Extension\Thread\Entry',
'WellFormedWeb\Entry' => 'Zend\Feed\Reader\Extension\WellFormedWeb\Entry',
- );
+ ];
/**
* Do we have the extension?
diff --git a/core/vendor/zendframework/zend-feed/Uri.php b/core/vendor/zendframework/zend-feed/src/Uri.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Uri.php
rename to core/vendor/zendframework/zend-feed/src/Uri.php
index 9a4565e3584e..818433f668b0 100644
--- a/core/vendor/zendframework/zend-feed/Uri.php
+++ b/core/vendor/zendframework/zend-feed/src/Uri.php
@@ -59,11 +59,11 @@ class Uri
/**
* Valid schemes
*/
- protected $validSchemes = array(
+ protected $validSchemes = [
'http',
'https',
'file',
- );
+ ];
/**
* @param string $uri
diff --git a/core/vendor/zendframework/zend-feed/Writer/AbstractFeed.php b/core/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Writer/AbstractFeed.php
rename to core/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
index 26616b06d7b6..5659b47ea856 100644
--- a/core/vendor/zendframework/zend-feed/Writer/AbstractFeed.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
@@ -20,7 +20,7 @@ class AbstractFeed
*
* @var array
*/
- protected $data = array();
+ protected $data = [];
/**
* Holds the value "atom" or "rss" depending on the feed type set when
@@ -221,7 +221,7 @@ public function setGenerator($name, $version = null, $uri = null)
if (empty($data['name']) || !is_string($data['name'])) {
throw new Exception\InvalidArgumentException('Invalid parameter: "name" must be a non-empty string');
}
- $generator = array('name' => $data['name']);
+ $generator = ['name' => $data['name']];
if (isset($data['version'])) {
if (empty($data['version']) || !is_string($data['version'])) {
throw new Exception\InvalidArgumentException('Invalid parameter: "version" must be a non-empty string');
@@ -238,7 +238,7 @@ public function setGenerator($name, $version = null, $uri = null)
if (empty($name) || !is_string($name)) {
throw new Exception\InvalidArgumentException('Invalid parameter: "name" must be a non-empty string');
}
- $generator = array('name' => $name);
+ $generator = ['name' => $name];
if (isset($version)) {
if (empty($version) || !is_string($version)) {
throw new Exception\InvalidArgumentException('Invalid parameter: "version" must be a non-empty string');
@@ -377,7 +377,7 @@ public function setFeedLink($link, $type)
if (empty($link) || !is_string($link) || !Uri::factory($link)->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: "link"" must be a non-empty string and valid URI/IRI');
}
- if (!in_array(strtolower($type), array('rss', 'rdf', 'atom'))) {
+ if (!in_array(strtolower($type), ['rss', 'rdf', 'atom'])) {
throw new Exception\InvalidArgumentException('Invalid parameter: "type"; You must declare the type of feed the link points to, i.e. RSS, RDF or Atom');
}
$this->data['feedLinks'][strtolower($type)] = $link;
@@ -451,7 +451,7 @@ public function addHub($url)
. ' must be a non-empty string and valid URI/IRI');
}
if (!isset($this->data['hubs'])) {
- $this->data['hubs'] = array();
+ $this->data['hubs'] = [];
}
$this->data['hubs'][] = $url;
@@ -497,7 +497,7 @@ public function addCategory(array $category)
}
}
if (!isset($this->data['categories'])) {
- $this->data['categories'] = array();
+ $this->data['categories'] = [];
}
$this->data['categories'][] = $category;
@@ -762,7 +762,7 @@ public function getCategories()
*/
public function reset()
{
- $this->data = array();
+ $this->data = [];
}
/**
@@ -815,7 +815,7 @@ public function __call($method, $args)
{
foreach ($this->extensions as $extension) {
try {
- return call_user_func_array(array($extension, $method), $args);
+ return call_user_func_array([$extension, $method], $args);
} catch (Exception\BadMethodCallException $e) {
}
}
diff --git a/core/vendor/zendframework/zend-feed/Writer/Deleted.php b/core/vendor/zendframework/zend-feed/src/Writer/Deleted.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Writer/Deleted.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Deleted.php
index 1d72fc920db4..321102669802 100644
--- a/core/vendor/zendframework/zend-feed/Writer/Deleted.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/Deleted.php
@@ -21,7 +21,7 @@ class Deleted
*
* @var array
*/
- protected $data = array();
+ protected $data = [];
/**
* Holds the value "atom" or "rss" depending on the feed type set when
@@ -171,7 +171,7 @@ public function getWhen()
*/
public function setBy(array $by)
{
- $author = array();
+ $author = [];
if (!array_key_exists('name', $by)
|| empty($by['name'])
|| !is_string($by['name'])
diff --git a/core/vendor/zendframework/zend-feed/Writer/Entry.php b/core/vendor/zendframework/zend-feed/src/Writer/Entry.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Writer/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Entry.php
index 78b968dcbcd2..a802ffa05a01 100644
--- a/core/vendor/zendframework/zend-feed/Writer/Entry.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/Entry.php
@@ -21,14 +21,14 @@ class Entry
*
* @var array
*/
- protected $data = array();
+ protected $data = [];
/**
* Registered extensions
*
* @var array
*/
- protected $extensions = array();
+ protected $extensions = [];
/**
* Holds the value "atom" or "rss" depending on the feed type set when
@@ -311,12 +311,12 @@ public function setCommentFeedLink(array $link)
if (!isset($link['uri']) || !is_string($link['uri']) || !Uri::factory($link['uri'])->isValid()) {
throw new Exception\InvalidArgumentException('Invalid parameter: "link" must be a non-empty string and valid URI/IRI');
}
- if (!isset($link['type']) || !in_array($link['type'], array('atom', 'rss', 'rdf'))) {
+ 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"');
}
if (!isset($this->data['commentFeedLinks'])) {
- $this->data['commentFeedLinks'] = array();
+ $this->data['commentFeedLinks'] = [];
}
$this->data['commentFeedLinks'][] = $link;
@@ -552,7 +552,7 @@ public function addCategory(array $category)
}
}
if (!isset($this->data['categories'])) {
- $this->data['categories'] = array();
+ $this->data['categories'] = [];
}
$this->data['categories'][] = $category;
@@ -698,7 +698,7 @@ public function __call($method, $args)
{
foreach ($this->extensions as $extension) {
try {
- return call_user_func_array(array($extension, $method), $args);
+ return call_user_func_array([$extension, $method], $args);
} catch (\BadMethodCallException $e) {
}
}
diff --git a/core/vendor/zendframework/zend-feed/Writer/Exception/BadMethodCallException.php b/core/vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Exception/BadMethodCallException.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Exception/ExceptionInterface.php b/core/vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Exception/ExceptionInterface.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Exception/InvalidArgumentException.php b/core/vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Exception/InvalidArgumentException.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Exception/RuntimeException.php b/core/vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Exception/RuntimeException.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/AbstractRenderer.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/AbstractRenderer.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/Atom/Renderer/Feed.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/Atom/Renderer/Feed.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/Content/Renderer/Entry.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/Content/Renderer/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/DublinCore/Renderer/Entry.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/DublinCore/Renderer/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/DublinCore/Renderer/Feed.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/DublinCore/Renderer/Feed.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/ITunes/Entry.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
similarity index 97%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/ITunes/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
index c06e8a970218..595689a05585 100644
--- a/core/vendor/zendframework/zend-feed/Writer/Extension/ITunes/Entry.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
@@ -23,7 +23,7 @@ class Entry
*
* @var array
*/
- protected $data = array();
+ protected $data = [];
/**
* Encoding of all text values
@@ -116,7 +116,7 @@ public function addItunesAuthor($value)
. ' contain a maximum of 255 characters each');
}
if (!isset($this->data['authors'])) {
- $this->data['authors'] = array();
+ $this->data['authors'] = [];
}
$this->data['authors'][] = $value;
return $this;
@@ -152,7 +152,7 @@ public function setItunesDuration($value)
*/
public function setItunesExplicit($value)
{
- if (!in_array($value, array('yes', 'no', 'clean'))) {
+ if (!in_array($value, ['yes', 'no', 'clean'])) {
throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
. ' be one of "yes", "no" or "clean"');
}
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/ITunes/Feed.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
similarity index 96%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/ITunes/Feed.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
index 08a6b13fe6a4..0b21b3b0aed3 100644
--- a/core/vendor/zendframework/zend-feed/Writer/Extension/ITunes/Feed.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
@@ -23,7 +23,7 @@ class Feed
*
* @var array
*/
- protected $data = array();
+ protected $data = [];
/**
* Encoding of all text values
@@ -119,7 +119,7 @@ public function addItunesAuthor($value)
. ' contain a maximum of 255 characters each');
}
if (!isset($this->data['authors'])) {
- $this->data['authors'] = array();
+ $this->data['authors'] = [];
}
$this->data['authors'][] = $value;
return $this;
@@ -135,7 +135,7 @@ public function addItunesAuthor($value)
public function setItunesCategories(array $values)
{
if (!isset($this->data['categories'])) {
- $this->data['categories'] = array();
+ $this->data['categories'] = [];
}
foreach ($values as $key => $value) {
if (!is_array($value)) {
@@ -149,7 +149,7 @@ public function setItunesCategories(array $values)
throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "category" may only'
. ' contain a maximum of 255 characters each');
}
- $this->data['categories'][$key] = array();
+ $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'
@@ -175,7 +175,7 @@ public function setItunesImage($value)
throw new Writer\Exception\InvalidArgumentException('invalid parameter: "image" may only'
. ' be a valid URI/IRI');
}
- if (!in_array(substr($value, -3), array('jpg', 'png'))) {
+ 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)');
@@ -214,7 +214,7 @@ public function setItunesDuration($value)
*/
public function setItunesExplicit($value)
{
- if (!in_array($value, array('yes', 'no', 'clean'))) {
+ if (!in_array($value, ['yes', 'no', 'clean'])) {
throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
. ' be one of "yes", "no" or "clean"');
}
@@ -296,7 +296,7 @@ public function addItunesOwner(array $value)
. ' contain a maximum of 255 characters each for "name" and "email"');
}
if (!isset($this->data['owners'])) {
- $this->data['owners'] = array();
+ $this->data['owners'] = [];
}
$this->data['owners'][] = $value;
return $this;
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/ITunes/Renderer/Entry.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/ITunes/Renderer/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/ITunes/Renderer/Feed.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/ITunes/Renderer/Feed.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/RendererInterface.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/RendererInterface.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/Slash/Renderer/Entry.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/Slash/Renderer/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/Threading/Renderer/Entry.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/Threading/Renderer/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/core/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/ExtensionManager.php b/core/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
similarity index 96%
rename from core/vendor/zendframework/zend-feed/Writer/ExtensionManager.php
rename to core/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
index 89be41d88240..b0e0e3bf7aaa 100644
--- a/core/vendor/zendframework/zend-feed/Writer/ExtensionManager.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
@@ -53,7 +53,7 @@ public function __call($method, $args)
__CLASS__
));
}
- return call_user_func_array(array($this->pluginManager, $method), $args);
+ return call_user_func_array([$this->pluginManager, $method], $args);
}
/**
diff --git a/core/vendor/zendframework/zend-feed/Writer/ExtensionManagerInterface.php b/core/vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/ExtensionManagerInterface.php
rename to core/vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/ExtensionPluginManager.php b/core/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Writer/ExtensionPluginManager.php
rename to core/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
index 6763374cabb2..8586b48aaaf1 100644
--- a/core/vendor/zendframework/zend-feed/Writer/ExtensionPluginManager.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
@@ -23,7 +23,7 @@ class ExtensionPluginManager extends AbstractPluginManager
*
* @var array
*/
- protected $invokableClasses = array(
+ protected $invokableClasses = [
'atomrendererfeed' => 'Zend\Feed\Writer\Extension\Atom\Renderer\Feed',
'contentrendererentry' => 'Zend\Feed\Writer\Extension\Content\Renderer\Entry',
'dublincorerendererentry' => 'Zend\Feed\Writer\Extension\DublinCore\Renderer\Entry',
@@ -35,7 +35,7 @@ class ExtensionPluginManager extends AbstractPluginManager
'slashrendererentry' => 'Zend\Feed\Writer\Extension\Slash\Renderer\Entry',
'threadingrendererentry' => 'Zend\Feed\Writer\Extension\Threading\Renderer\Entry',
'wellformedwebrendererentry' => 'Zend\Feed\Writer\Extension\WellFormedWeb\Renderer\Entry',
- );
+ ];
/**
* Do not share instances
diff --git a/core/vendor/zendframework/zend-feed/Writer/Feed.php b/core/vendor/zendframework/zend-feed/src/Writer/Feed.php
similarity index 99%
rename from core/vendor/zendframework/zend-feed/Writer/Feed.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Feed.php
index d402bb8f6344..5d01232d5d5d 100644
--- a/core/vendor/zendframework/zend-feed/Writer/Feed.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/Feed.php
@@ -21,7 +21,7 @@ class Feed extends AbstractFeed implements Iterator, Countable
*
* @var array
*/
- protected $entries = array();
+ protected $entries = [];
/**
* A pointer for the iterator to keep track of the entries array
@@ -137,7 +137,7 @@ public function orderByDate()
* Could do with some improvement for performance perhaps
*/
$timestamp = time();
- $entries = array();
+ $entries = [];
foreach ($this->entries as $entry) {
if ($entry->getDateModified()) {
$timestamp = (int) $entry->getDateModified()->getTimestamp();
diff --git a/core/vendor/zendframework/zend-feed/Writer/FeedFactory.php b/core/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/FeedFactory.php
rename to core/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/AbstractRenderer.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
similarity index 98%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/AbstractRenderer.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
index 76b9a685a15a..a609ca785404 100644
--- a/core/vendor/zendframework/zend-feed/Writer/Renderer/AbstractRenderer.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
@@ -21,7 +21,7 @@ class AbstractRenderer
* Extensions
* @var array
*/
- protected $extensions = array();
+ protected $extensions = [];
/**
* @var Writer\AbstractFeed
@@ -41,7 +41,7 @@ class AbstractRenderer
/**
* @var array
*/
- protected $exceptions = array();
+ protected $exceptions = [];
/**
* Encoding of all text values
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/Entry/Atom.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
similarity index 99%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/Entry/Atom.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
index 31b0a9aca477..dced034caf42 100644
--- a/core/vendor/zendframework/zend-feed/Writer/Renderer/Entry/Atom.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
@@ -360,11 +360,11 @@ protected function _loadXhtml($content)
{
if (class_exists('tidy', false)) {
$tidy = new \tidy;
- $config = array(
+ $config = [
'output-xhtml' => true,
'show-body-only' => true,
'quote-nbsp' => false
- );
+ ];
$encoding = str_replace('-', '', $this->getEncoding());
$tidy->parseString($content, $config, $encoding);
$tidy->cleanRepair();
@@ -372,9 +372,9 @@ protected function _loadXhtml($content)
} else {
$xhtml = $content;
}
- $xhtml = preg_replace(array(
+ $xhtml = preg_replace([
"/(<[\/]?)([a-zA-Z]+)/"
- ), '$1xhtml:$2', $xhtml);
+ ], '$1xhtml:$2', $xhtml);
$dom = new DOMDocument('1.0', $this->getEncoding());
$dom->loadXML(
'<xhtml:div xmlns:xhtml="http://www.w3.org/1999/xhtml">'
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/Entry/Atom/Deleted.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/Entry/Atom/Deleted.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/Entry/AtomDeleted.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/Entry/AtomDeleted.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/Entry/Rss.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
similarity index 99%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/Entry/Rss.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
index aae2f46e2839..3edb4fd3b807 100644
--- a/core/vendor/zendframework/zend-feed/Writer/Renderer/Entry/Rss.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
@@ -222,7 +222,7 @@ protected function _setEnclosure(DOMDocument $dom, DOMElement $root)
return;
}
}
- if (isset($data['length']) && (int) $data['length'] <= 0) {
+ 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');
if (!$this->ignoreExceptions) {
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/AbstractAtom.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/AbstractAtom.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/Atom.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/Atom.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/Atom/AbstractAtom.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/Atom/Source.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/Atom/Source.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/AtomSource.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/AtomSource.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/Rss.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/Feed/Rss.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Renderer/RendererInterface.php b/core/vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Renderer/RendererInterface.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Source.php b/core/vendor/zendframework/zend-feed/src/Writer/Source.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Source.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Source.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Version.php b/core/vendor/zendframework/zend-feed/src/Writer/Version.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/Writer/Version.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Version.php
diff --git a/core/vendor/zendframework/zend-feed/Writer/Writer.php b/core/vendor/zendframework/zend-feed/src/Writer/Writer.php
similarity index 93%
rename from core/vendor/zendframework/zend-feed/Writer/Writer.php
rename to core/vendor/zendframework/zend-feed/src/Writer/Writer.php
index 8c5397892bfa..a4f95bfc8987 100644
--- a/core/vendor/zendframework/zend-feed/Writer/Writer.php
+++ b/core/vendor/zendframework/zend-feed/src/Writer/Writer.php
@@ -52,12 +52,12 @@ class Writer
*
* @var array
*/
- protected static $extensions = array(
- 'entry' => array(),
- 'feed' => array(),
- 'entryRenderer' => array(),
- 'feedRenderer' => array(),
- );
+ protected static $extensions = [
+ 'entry' => [],
+ 'feed' => [],
+ 'entryRenderer' => [],
+ 'feedRenderer' => [],
+ ];
/**
* Set plugin loader for use with Extensions
@@ -167,12 +167,12 @@ public static function getExtensions()
public static function reset()
{
static::$extensionManager = null;
- static::$extensions = array(
- 'entry' => array(),
- 'feed' => array(),
- 'entryRenderer' => array(),
- 'feedRenderer' => array(),
- );
+ static::$extensions = [
+ 'entry' => [],
+ 'feed' => [],
+ 'entryRenderer' => [],
+ 'feedRenderer' => [],
+ ];
}
/**
diff --git a/core/vendor/zendframework/zend-stdlib/CHANGELOG.md b/core/vendor/zendframework/zend-stdlib/CHANGELOG.md
new file mode 100644
index 000000000000..d594cc463452
--- /dev/null
+++ b/core/vendor/zendframework/zend-stdlib/CHANGELOG.md
@@ -0,0 +1,66 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 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/core/vendor/zendframework/zend-stdlib/CONTRIBUTING.md b/core/vendor/zendframework/zend-stdlib/CONTRIBUTING.md
index e77f5d2d5b37..b87ecf03935f 100644
--- a/core/vendor/zendframework/zend-stdlib/CONTRIBUTING.md
+++ b/core/vendor/zendframework/zend-stdlib/CONTRIBUTING.md
@@ -1,3 +1,229 @@
# CONTRIBUTING
-Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
+## 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-stdlib/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).
+
+## RUNNING TESTS
+
+> ### Note: testing versions prior to 2.4
+>
+> This component originates with Zend Framework 2. During the lifetime of ZF2,
+> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
+> changes were necessary. However, due to the migration, tests may not run on
+> versions < 2.4. As such, you may need to change the PHPUnit dependency if
+> attempting a fix on such a version.
+
+To run tests:
+
+- Clone the repository:
+
+ ```console
+ $ git clone git@github.com:zendframework/zend-stdlib.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
+ ```
+
+You can turn on conditional tests with the phpunit.xml file.
+To do so:
+
+ - Copy `phpunit.xml.dist` file to `phpunit.xml`
+ - Edit `phpunit.xml` to enable any specific functionality you
+ want to test, as well as to provide test values to utilize.
+
+## Running Coding Standards Checks
+
+This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
+standards checks, and provides configuration for our selected checks.
+`php-cs-fixer` is installed by default via Composer.
+
+To run checks only:
+
+```console
+$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
+```
+
+To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
+flag:
+
+```console
+$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
+```
+
+If you allow php-cs-fixer 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-stdlib)
+3. Clone the canonical repository locally and enter it.
+
+ ```console
+ $ git clone git://github.com:zendframework/zend-stdlib.git
+ $ cd zend-stdlib
+ ```
+
+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-stdlib.git
+ $ git fetch {username}
+ ```
+
+### Keeping Up-to-Date
+
+Periodically, you should update your fork or personal repository to
+match the canonical ZF 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-stdlib.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>
+ ```
diff --git a/core/vendor/zendframework/zend-stdlib/JsonSerializable/PhpLegacyCompatibility.php b/core/vendor/zendframework/zend-stdlib/JsonSerializable/PhpLegacyCompatibility.php
deleted file mode 100644
index ecc7525d4cd5..000000000000
--- a/core/vendor/zendframework/zend-stdlib/JsonSerializable/PhpLegacyCompatibility.php
+++ /dev/null
@@ -1,28 +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\JsonSerializable;
-
-/**
- * Interface compatible with the built-in JsonSerializable interface
- *
- * JsonSerializable was introduced in PHP 5.4.0.
- *
- * @see http://php.net/manual/class.jsonserializable.php
- */
-interface PhpLegacyCompatibility
-{
- /**
- * Returns data which can be serialized by json_encode().
- *
- * @return mixed
- * @see http://php.net/manual/jsonserializable.jsonserialize.php
- */
- public function jsonSerialize();
-}
diff --git a/core/vendor/zendframework/zend-stdlib/LICENSE.md b/core/vendor/zendframework/zend-stdlib/LICENSE.md
new file mode 100644
index 000000000000..dbb1b49c0142
--- /dev/null
+++ b/core/vendor/zendframework/zend-stdlib/LICENSE.md
@@ -0,0 +1,28 @@
+Copyright (c) 2005-2015, 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/core/vendor/zendframework/zend-stdlib/README.md b/core/vendor/zendframework/zend-stdlib/README.md
index a2dcb84191c2..9633b2ce50e6 100644
--- a/core/vendor/zendframework/zend-stdlib/README.md
+++ b/core/vendor/zendframework/zend-stdlib/README.md
@@ -1,15 +1,18 @@
-Stdlib Component from ZF2
-=========================
+# zend-stdlib
-This is the Stdlib component for ZF2.
+[](https://secure.travis-ci.org/zendframework/zend-stdlib)
+[](https://coveralls.io/r/zendframework/zend-stdlib?branch=master)
-- File issues at https://github.com/zendframework/zf2/issues
-- Create pull requests against https://github.com/zendframework/zf2
-- Documentation is at http://framework.zend.com/docs
+`Zend\Stdlib` is a set of components that implements general purpose utility
+class for different scopes like:
-LICENSE
--------
-
-The files in this archive are released under the [Zend Framework
-license](http://framework.zend.com/license), which is a 3-clause BSD license.
+- array utilities functions;
+- hydrators;
+- json serializable interfaces;
+- general messaging systems;
+- string wrappers;
+- etc.
+-
+- File issues at https://github.com/zendframework/zend-stdlib/issues
+- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-stdlib
diff --git a/core/vendor/zendframework/zend-stdlib/composer.json b/core/vendor/zendframework/zend-stdlib/composer.json
index dfe178bf9a33..056ce3f596dc 100644
--- a/core/vendor/zendframework/zend-stdlib/composer.json
+++ b/core/vendor/zendframework/zend-stdlib/composer.json
@@ -6,20 +6,24 @@
"zf2",
"stdlib"
],
- "homepage": "https://github.com/zendframework/zf2",
+ "homepage": "https://github.com/zendframework/zend-stdlib",
"autoload": {
"psr-4": {
- "Zend\\Stdlib\\": ""
+ "Zend\\Stdlib\\": "src/"
}
},
"require": {
- "php": ">=5.3.23"
+ "php": ">=5.5"
},
"require-dev": {
- "zendframework/zend-eventmanager": "self.version",
- "zendframework/zend-serializer": "self.version",
- "zendframework/zend-servicemanager": "self.version",
- "zendframework/zend-filter": "self.version"
+ "zendframework/zend-config": "~2.5",
+ "zendframework/zend-eventmanager": "~2.5",
+ "zendframework/zend-inputfilter": "~2.5",
+ "zendframework/zend-serializer": "~2.5",
+ "zendframework/zend-servicemanager": "~2.5",
+ "zendframework/zend-filter": "~2.5",
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/PHPUnit": "~4.0"
},
"suggest": {
"zendframework/zend-eventmanager": "To support aggregate hydrator usage",
@@ -27,10 +31,17 @@
"zendframework/zend-servicemanager": "To support hydrator plugin manager usage",
"zendframework/zend-filter": "To support naming strategy hydrator usage"
},
+ "minimum-stability": "dev",
+ "prefer-stable": true,
"extra": {
"branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
+ "dev-master": "2.6-dev",
+ "dev-develop": "2.7-dev"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "ZendTest\\Stdlib\\": "test/"
}
}
}
diff --git a/core/vendor/zendframework/zend-stdlib/AbstractOptions.php b/core/vendor/zendframework/zend-stdlib/src/AbstractOptions.php
similarity index 97%
rename from core/vendor/zendframework/zend-stdlib/AbstractOptions.php
rename to core/vendor/zendframework/zend-stdlib/src/AbstractOptions.php
index aaa1dd299509..812e1ca132da 100644
--- a/core/vendor/zendframework/zend-stdlib/AbstractOptions.php
+++ b/core/vendor/zendframework/zend-stdlib/src/AbstractOptions.php
@@ -72,7 +72,7 @@ public function setFromArray($options)
*/
public function toArray()
{
- $array = array();
+ $array = [];
$transform = function ($letters) {
$letter = array_shift($letters);
return '_' . strtolower($letter);
@@ -100,7 +100,7 @@ public function __set($key, $value)
{
$setter = 'set' . str_replace('_', '', $key);
- if (is_callable(array($this, $setter))) {
+ if (is_callable([$this, $setter])) {
$this->{$setter}($value);
return;
@@ -128,7 +128,7 @@ public function __get($key)
{
$getter = 'get' . str_replace('_', '', $key);
- if (is_callable(array($this, $getter))) {
+ if (is_callable([$this, $getter])) {
return $this->{$getter}();
}
diff --git a/core/vendor/zendframework/zend-stdlib/ArrayObject.php b/core/vendor/zendframework/zend-stdlib/src/ArrayObject.php
similarity index 98%
rename from core/vendor/zendframework/zend-stdlib/ArrayObject.php
rename to core/vendor/zendframework/zend-stdlib/src/ArrayObject.php
index 44145c8554eb..e890084d077e 100644
--- a/core/vendor/zendframework/zend-stdlib/ArrayObject.php
+++ b/core/vendor/zendframework/zend-stdlib/src/ArrayObject.php
@@ -59,7 +59,7 @@ class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Count
* @param int $flags
* @param string $iteratorClass
*/
- public function __construct($input = array(), $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
+ public function __construct($input = [], $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
{
$this->setFlags($flags);
$this->storage = $input;
diff --git a/core/vendor/zendframework/zend-stdlib/ArraySerializableInterface.php b/core/vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/ArraySerializableInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/ArrayStack.php b/core/vendor/zendframework/zend-stdlib/src/ArrayStack.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/ArrayStack.php
rename to core/vendor/zendframework/zend-stdlib/src/ArrayStack.php
diff --git a/core/vendor/zendframework/zend-stdlib/ArrayUtils.php b/core/vendor/zendframework/zend-stdlib/src/ArrayUtils.php
similarity index 98%
rename from core/vendor/zendframework/zend-stdlib/ArrayUtils.php
rename to core/vendor/zendframework/zend-stdlib/src/ArrayUtils.php
index 3545054ed848..17e3ae3cdc69 100644
--- a/core/vendor/zendframework/zend-stdlib/ArrayUtils.php
+++ b/core/vendor/zendframework/zend-stdlib/src/ArrayUtils.php
@@ -231,7 +231,7 @@ public static function iteratorToArray($iterator, $recursive = true)
return $iterator->toArray();
}
- $array = array();
+ $array = [];
foreach ($iterator as $key => $value) {
if (is_scalar($value)) {
$array[$key] = $value;
@@ -312,16 +312,16 @@ public static function filter(array $data, $callback, $flag = null)
return array_filter($data, $callback, $flag);
}
- $output = array();
+ $output = [];
foreach ($data as $key => $value) {
- $params = array($value);
+ $params = [$value];
if ($flag === static::ARRAY_FILTER_USE_BOTH) {
$params[] = $key;
}
if ($flag === static::ARRAY_FILTER_USE_KEY) {
- $params = array($key);
+ $params = [$key];
}
$response = call_user_func_array($callback, $params);
diff --git a/core/vendor/zendframework/zend-stdlib/ArrayUtils/MergeRemoveKey.php b/core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/ArrayUtils/MergeRemoveKey.php
rename to core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php
diff --git a/core/vendor/zendframework/zend-stdlib/ArrayUtils/MergeReplaceKey.php b/core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/ArrayUtils/MergeReplaceKey.php
rename to core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php
diff --git a/core/vendor/zendframework/zend-stdlib/ArrayUtils/MergeReplaceKeyInterface.php b/core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/ArrayUtils/MergeReplaceKeyInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/CallbackHandler.php b/core/vendor/zendframework/zend-stdlib/src/CallbackHandler.php
similarity index 78%
rename from core/vendor/zendframework/zend-stdlib/CallbackHandler.php
rename to core/vendor/zendframework/zend-stdlib/src/CallbackHandler.php
index 158b0c7d6474..dc6bc7469af6 100644
--- a/core/vendor/zendframework/zend-stdlib/CallbackHandler.php
+++ b/core/vendor/zendframework/zend-stdlib/src/CallbackHandler.php
@@ -31,19 +31,13 @@ class CallbackHandler
*/
protected $metadata;
- /**
- * PHP version is greater as 5.4rc1?
- * @var bool
- */
- protected static $isPhp54;
-
/**
* Constructor
*
* @param string|array|object|callable $callback PHP callback
* @param array $metadata Callback metadata
*/
- public function __construct($callback, array $metadata = array())
+ public function __construct($callback, array $metadata = [])
{
$this->metadata = $metadata;
$this->registerCallback($callback);
@@ -81,18 +75,12 @@ public function getCallback()
* @param array $args Arguments to pass to callback
* @return mixed
*/
- public function call(array $args = array())
+ public function call(array $args = [])
{
$callback = $this->getCallback();
-
- // Minor performance tweak, if the callback gets called more than once
- if (!isset(static::$isPhp54)) {
- static::$isPhp54 = version_compare(PHP_VERSION, '5.4.0rc1', '>=');
- }
-
$argCount = count($args);
- if (static::$isPhp54 && is_string($callback)) {
+ if (is_string($callback)) {
$result = $this->validateStringCallbackFor54($callback);
if ($result !== true && $argCount <= 3) {
@@ -107,30 +95,18 @@ public function call(array $args = array())
// reached
switch ($argCount) {
case 0:
- if (static::$isPhp54) {
- return $callback();
- }
- return call_user_func($callback);
+ return $callback();
case 1:
- if (static::$isPhp54) {
- return $callback(array_shift($args));
- }
- return call_user_func($callback, array_shift($args));
+ return $callback(array_shift($args));
case 2:
$arg1 = array_shift($args);
$arg2 = array_shift($args);
- if (static::$isPhp54) {
- return $callback($arg1, $arg2);
- }
- return call_user_func($callback, $arg1, $arg2);
+ return $callback($arg1, $arg2);
case 3:
$arg1 = array_shift($args);
$arg2 = array_shift($args);
$arg3 = array_shift($args);
- if (static::$isPhp54) {
- return $callback($arg1, $arg2, $arg3);
- }
- return call_user_func($callback, $arg1, $arg2, $arg3);
+ return $callback($arg1, $arg2, $arg3);
default:
return call_user_func_array($callback, $args);
}
@@ -173,7 +149,6 @@ public function getMetadatum($name)
/**
* Validate a static method call
*
- * Validates that a static method call in PHP 5.4 will actually work
*
* @param string $callback
* @return true|array
@@ -212,6 +187,6 @@ protected function validateStringCallbackFor54($callback)
// returning a non boolean value may not be nice for a validate method,
// but that allows the usage of a static string callback without using
// the call_user_func function.
- return array($class, $method);
+ return [$class, $method];
}
}
diff --git a/core/vendor/zendframework/zend-stdlib/DateTime.php b/core/vendor/zendframework/zend-stdlib/src/DateTime.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/DateTime.php
rename to core/vendor/zendframework/zend-stdlib/src/DateTime.php
diff --git a/core/vendor/zendframework/zend-stdlib/DispatchableInterface.php b/core/vendor/zendframework/zend-stdlib/src/DispatchableInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/DispatchableInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/DispatchableInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/ErrorHandler.php b/core/vendor/zendframework/zend-stdlib/src/ErrorHandler.php
similarity index 93%
rename from core/vendor/zendframework/zend-stdlib/ErrorHandler.php
rename to core/vendor/zendframework/zend-stdlib/src/ErrorHandler.php
index 01949d1efee1..a849620ab230 100644
--- a/core/vendor/zendframework/zend-stdlib/ErrorHandler.php
+++ b/core/vendor/zendframework/zend-stdlib/src/ErrorHandler.php
@@ -22,7 +22,7 @@ abstract class ErrorHandler
*
* @var array
*/
- protected static $stack = array();
+ protected static $stack = [];
/**
* Check if this error handler is active
@@ -52,7 +52,7 @@ public static function getNestedLevel()
public static function start($errorLevel = \E_WARNING)
{
if (!static::$stack) {
- set_error_handler(array(get_called_class(), 'addError'), $errorLevel);
+ set_error_handler([get_called_class(), 'addError'], $errorLevel);
}
static::$stack[] = null;
@@ -95,7 +95,7 @@ public static function clean()
restore_error_handler();
}
- static::$stack = array();
+ static::$stack = [];
}
/**
diff --git a/core/vendor/zendframework/zend-stdlib/Exception/BadMethodCallException.php b/core/vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Exception/BadMethodCallException.php
rename to core/vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php
diff --git a/core/vendor/zendframework/zend-stdlib/Exception/DomainException.php b/core/vendor/zendframework/zend-stdlib/src/Exception/DomainException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Exception/DomainException.php
rename to core/vendor/zendframework/zend-stdlib/src/Exception/DomainException.php
diff --git a/core/vendor/zendframework/zend-stdlib/Exception/ExceptionInterface.php b/core/vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Exception/ExceptionInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Exception/ExtensionNotLoadedException.php b/core/vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Exception/ExtensionNotLoadedException.php
rename to core/vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php
diff --git a/core/vendor/zendframework/zend-stdlib/Exception/InvalidArgumentException.php b/core/vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Exception/InvalidArgumentException.php
rename to core/vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-stdlib/Exception/InvalidCallbackException.php b/core/vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Exception/InvalidCallbackException.php
rename to core/vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php
diff --git a/core/vendor/zendframework/zend-stdlib/Exception/LogicException.php b/core/vendor/zendframework/zend-stdlib/src/Exception/LogicException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Exception/LogicException.php
rename to core/vendor/zendframework/zend-stdlib/src/Exception/LogicException.php
diff --git a/core/vendor/zendframework/zend-stdlib/Exception/RuntimeException.php b/core/vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Exception/RuntimeException.php
rename to core/vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php
diff --git a/core/vendor/zendframework/zend-stdlib/Extractor/ExtractionInterface.php b/core/vendor/zendframework/zend-stdlib/src/Extractor/ExtractionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Extractor/ExtractionInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Extractor/ExtractionInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Glob.php b/core/vendor/zendframework/zend-stdlib/src/Glob.php
similarity index 98%
rename from core/vendor/zendframework/zend-stdlib/Glob.php
rename to core/vendor/zendframework/zend-stdlib/src/Glob.php
index a4d0068a0915..5358740ed37d 100644
--- a/core/vendor/zendframework/zend-stdlib/Glob.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Glob.php
@@ -56,7 +56,7 @@ public static function glob($pattern, $flags = 0, $forceFallback = false)
protected static function systemGlob($pattern, $flags)
{
if ($flags) {
- $flagMap = array(
+ $flagMap = [
self::GLOB_MARK => GLOB_MARK,
self::GLOB_NOSORT => GLOB_NOSORT,
self::GLOB_NOCHECK => GLOB_NOCHECK,
@@ -64,7 +64,7 @@ protected static function systemGlob($pattern, $flags)
self::GLOB_BRACE => GLOB_BRACE,
self::GLOB_ONLYDIR => GLOB_ONLYDIR,
self::GLOB_ERR => GLOB_ERR,
- );
+ ];
$globFlags = 0;
@@ -102,7 +102,7 @@ protected static function fallbackGlob($pattern, $flags)
$flags &= ~self::GLOB_BRACE;
$length = strlen($pattern);
- $paths = array();
+ $paths = [];
if ($flags & self::GLOB_NOESCAPE) {
$begin = strpos($pattern, '{');
diff --git a/core/vendor/zendframework/zend-stdlib/Guard/AllGuardsTrait.php b/core/vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Guard/AllGuardsTrait.php
rename to core/vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php
diff --git a/core/vendor/zendframework/zend-stdlib/Guard/ArrayOrTraversableGuardTrait.php b/core/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Guard/ArrayOrTraversableGuardTrait.php
rename to core/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
diff --git a/core/vendor/zendframework/zend-stdlib/Guard/EmptyGuardTrait.php b/core/vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Guard/EmptyGuardTrait.php
rename to core/vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php
diff --git a/core/vendor/zendframework/zend-stdlib/Guard/GuardUtils.php b/core/vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Guard/GuardUtils.php
rename to core/vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php
diff --git a/core/vendor/zendframework/zend-stdlib/Guard/NullGuardTrait.php b/core/vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Guard/NullGuardTrait.php
rename to core/vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/AbstractHydrator.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/AbstractHydrator.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/AbstractHydrator.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/AbstractHydrator.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Aggregate/AggregateHydrator.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/AggregateHydrator.php
similarity index 96%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Aggregate/AggregateHydrator.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/AggregateHydrator.php
index 38a868e022e3..6bba864d2982 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/Aggregate/AggregateHydrator.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/AggregateHydrator.php
@@ -66,7 +66,7 @@ public function hydrate(array $data, $object)
*/
public function setEventManager(EventManagerInterface $eventManager)
{
- $eventManager->setIdentifiers(array(__CLASS__, get_class($this)));
+ $eventManager->setIdentifiers([__CLASS__, get_class($this)]);
$this->eventManager = $eventManager;
}
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Aggregate/ExtractEvent.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/ExtractEvent.php
similarity index 98%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Aggregate/ExtractEvent.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/ExtractEvent.php
index b13bc5c70b2c..a826710333b8 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/Aggregate/ExtractEvent.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/ExtractEvent.php
@@ -32,7 +32,7 @@ class ExtractEvent extends Event
/**
* @var array
*/
- protected $extractedData = array();
+ protected $extractedData = [];
/**
* @param object $target
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Aggregate/HydrateEvent.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydrateEvent.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Aggregate/HydrateEvent.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydrateEvent.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Aggregate/HydratorListener.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydratorListener.php
similarity index 95%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Aggregate/HydratorListener.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydratorListener.php
index 1c25ff3c4611..84c8c1289c54 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/Aggregate/HydratorListener.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Aggregate/HydratorListener.php
@@ -38,8 +38,8 @@ public function __construct(HydratorInterface $hydrator)
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
- $this->listeners[] = $events->attach(HydrateEvent::EVENT_HYDRATE, array($this, 'onHydrate'), $priority);
- $this->listeners[] = $events->attach(ExtractEvent::EVENT_EXTRACT, array($this, 'onExtract'), $priority);
+ $this->listeners[] = $events->attach(HydrateEvent::EVENT_HYDRATE, [$this, 'onHydrate'], $priority);
+ $this->listeners[] = $events->attach(ExtractEvent::EVENT_EXTRACT, [$this, 'onExtract'], $priority);
}
/**
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/ArraySerializable.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/ArraySerializable.php
similarity index 92%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/ArraySerializable.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/ArraySerializable.php
index 4f4ab2a1333d..eb75e22285d7 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/ArraySerializable.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/ArraySerializable.php
@@ -24,7 +24,7 @@ class ArraySerializable extends AbstractHydrator
*/
public function extract($object)
{
- if (!is_callable(array($object, 'getArrayCopy'))) {
+ if (!is_callable([$object, 'getArrayCopy'])) {
throw new Exception\BadMethodCallException(
sprintf('%s expects the provided object to implement getArrayCopy()', __METHOD__)
);
@@ -63,15 +63,15 @@ public function extract($object)
*/
public function hydrate(array $data, $object)
{
- $replacement = array();
+ $replacement = [];
foreach ($data as $key => $value) {
$name = $this->hydrateName($key, $data);
$replacement[$name] = $this->hydrateValue($name, $value, $data);
}
- if (is_callable(array($object, 'exchangeArray'))) {
+ if (is_callable([$object, 'exchangeArray'])) {
$object->exchangeArray($replacement);
- } elseif (is_callable(array($object, 'populate'))) {
+ } elseif (is_callable([$object, 'populate'])) {
$object->populate($replacement);
} else {
throw new Exception\BadMethodCallException(
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/ClassMethods.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/ClassMethods.php
similarity index 95%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/ClassMethods.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/ClassMethods.php
index 4edb1f4dcd61..f95b0d1e3819 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/ClassMethods.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/ClassMethods.php
@@ -30,7 +30,7 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
*
* @var string[]|bool[]
*/
- private $hydrationMethodsCache = array();
+ private $hydrationMethodsCache = [];
/**
* A map of extraction methods to property name to be used during extraction, indexed
@@ -38,7 +38,7 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
*
* @var string[][]
*/
- private $extractionMethodsCache = array();
+ private $extractionMethodsCache = [];
/**
* Flag defining whether array keys are underscore-separated (true) or camel case (false)
@@ -142,14 +142,14 @@ public function extract($object)
// pass 1 - finding out which properties can be extracted, with which methods (populate hydration cache)
if (! isset($this->extractionMethodsCache[$objectClass])) {
- $this->extractionMethodsCache[$objectClass] = array();
+ $this->extractionMethodsCache[$objectClass] = [];
$filter = $this->filterComposite;
$methods = get_class_methods($object);
if ($object instanceof FilterProviderInterface) {
$filter = new FilterComposite(
- array($object->getFilter()),
- array(new MethodMatchFilter('getFilter'))
+ [$object->getFilter()],
+ [new MethodMatchFilter('getFilter')]
);
}
@@ -173,7 +173,7 @@ public function extract($object)
}
}
- $values = array();
+ $values = [];
// pass 2 - actually extract data
foreach ($this->extractionMethodsCache[$objectClass] as $methodName => $attributeName) {
@@ -211,7 +211,7 @@ public function hydrate(array $data, $object)
if (! isset($this->hydrationMethodsCache[$propertyFqn])) {
$setterName = 'set' . ucfirst($this->hydrateName($property, $data));
- $this->hydrationMethodsCache[$propertyFqn] = is_callable(array($object, $setterName))
+ $this->hydrationMethodsCache[$propertyFqn] = is_callable([$object, $setterName])
? $setterName
: false;
}
@@ -269,6 +269,6 @@ public function removeNamingStrategy()
*/
private function resetCaches()
{
- $this->hydrationMethodsCache = $this->extractionMethodsCache = array();
+ $this->hydrationMethodsCache = $this->extractionMethodsCache = [];
}
}
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/DelegatingHydrator.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydrator.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/DelegatingHydrator.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydrator.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/DelegatingHydratorFactory.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydratorFactory.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/DelegatingHydratorFactory.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/DelegatingHydratorFactory.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Filter/FilterComposite.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterComposite.php
similarity index 97%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Filter/FilterComposite.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterComposite.php
index 000fc701e23b..f9d4c5642182 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/Filter/FilterComposite.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterComposite.php
@@ -36,9 +36,11 @@ class FilterComposite implements FilterInterface
/**
* Define default Filter
*
+ * @param array $orFilter
+ * @param array $andFilter
* @throws InvalidArgumentException
*/
- public function __construct($orFilter = array(), $andFilter = array())
+ public function __construct($orFilter = [], $andFilter = [])
{
array_walk(
$orFilter,
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Filter/FilterInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Filter/FilterInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Filter/FilterProviderInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterProviderInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Filter/FilterProviderInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/FilterProviderInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Filter/GetFilter.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/GetFilter.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Filter/GetFilter.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/GetFilter.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Filter/HasFilter.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/HasFilter.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Filter/HasFilter.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/HasFilter.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Filter/IsFilter.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/IsFilter.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Filter/IsFilter.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/IsFilter.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Filter/MethodMatchFilter.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/MethodMatchFilter.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Filter/MethodMatchFilter.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/MethodMatchFilter.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Filter/NumberOfParameterFilter.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/NumberOfParameterFilter.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Filter/NumberOfParameterFilter.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/NumberOfParameterFilter.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Filter/OptionalParametersFilter.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/OptionalParametersFilter.php
similarity index 96%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Filter/OptionalParametersFilter.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/OptionalParametersFilter.php
index ccd67ca54a4b..8204e786f37e 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/Filter/OptionalParametersFilter.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Filter/OptionalParametersFilter.php
@@ -25,7 +25,7 @@ class OptionalParametersFilter implements FilterInterface
*
* @var bool[]
*/
- protected static $propertiesCache = array();
+ protected static $propertiesCache = [];
/**
* {@inheritDoc}
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/FilterEnabledInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/FilterEnabledInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/FilterEnabledInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/FilterEnabledInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/HydrationInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/HydrationInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/HydrationInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/HydrationInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/HydratorAwareInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/HydratorAwareInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/HydratorAwareTrait.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/HydratorAwareTrait.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorAwareTrait.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/HydratorInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/HydratorInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/HydratorOptionsInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorOptionsInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/HydratorOptionsInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorOptionsInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/HydratorPluginManager.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorPluginManager.php
similarity index 93%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/HydratorPluginManager.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorPluginManager.php
index 1b238e7ccb5b..537202fc6f14 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/HydratorPluginManager.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/HydratorPluginManager.php
@@ -31,30 +31,30 @@ class HydratorPluginManager extends AbstractPluginManager
*
* @var array
*/
- protected $aliases = array(
+ protected $aliases = [
'delegatinghydrator' => 'Zend\Stdlib\Hydrator\DelegatingHydrator',
- );
+ ];
/**
* Default set of adapters
*
* @var array
*/
- protected $invokableClasses = array(
+ protected $invokableClasses = [
'arrayserializable' => 'Zend\Stdlib\Hydrator\ArraySerializable',
'classmethods' => 'Zend\Stdlib\Hydrator\ClassMethods',
'objectproperty' => 'Zend\Stdlib\Hydrator\ObjectProperty',
'reflection' => 'Zend\Stdlib\Hydrator\Reflection'
- );
+ ];
/**
* Default factory-based adapters
*
* @var array
*/
- protected $factories = array(
+ protected $factories = [
'Zend\Stdlib\Hydrator\DelegatingHydrator' => 'Zend\Stdlib\Hydrator\DelegatingHydratorFactory',
- );
+ ];
/**
* {@inheritDoc}
diff --git a/core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingArrayIterator.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingArrayIterator.php
new file mode 100644
index 000000000000..22bc81ab90f9
--- /dev/null
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingArrayIterator.php
@@ -0,0 +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
+ */
+
+namespace Zend\Stdlib\Hydrator\Iterator;
+
+use ArrayIterator;
+use Zend\Stdlib\Hydrator\HydratorInterface;
+
+class HydratingArrayIterator extends HydratingIteratorIterator
+{
+ /**
+ * @var HydratorInterface
+ */
+ protected $hydrator;
+
+ /**
+ * @var object
+ */
+ protected $prototype;
+
+ /**
+ * @param HydratorInterface $hydrator
+ * @param array $data
+ * @param string|object $prototype Object, or class name to use for prototype.
+ */
+ public function __construct(HydratorInterface $hydrator, array $data, $prototype)
+ {
+ parent::__construct($hydrator, new ArrayIterator($data), $prototype);
+ }
+}
diff --git a/core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorInterface.php
new file mode 100644
index 000000000000..ba8c5967bd74
--- /dev/null
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorInterface.php
@@ -0,0 +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
+ */
+
+namespace Zend\Stdlib\Hydrator\Iterator;
+
+use Iterator;
+use Zend\Stdlib\Hydrator\HydratorInterface;
+
+interface HydratingIteratorInterface extends Iterator
+{
+ /**
+ * This sets the prototype to hydrate.
+ *
+ * This prototype can be the name of the class or the object itself;
+ * iteration will clone the object.
+ *
+ * @param string|object $prototype
+ */
+ public function setPrototype($prototype);
+
+ /**
+ * Sets the hydrator to use during iteration.
+ *
+ * @param HydratorInterface $hydrator
+ */
+ public function setHydrator(HydratorInterface $hydrator);
+}
diff --git a/core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorIterator.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorIterator.php
new file mode 100644
index 000000000000..2cd1d65fa53b
--- /dev/null
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Iterator/HydratingIteratorIterator.php
@@ -0,0 +1,78 @@
+<?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\Hydrator\Iterator;
+
+use Iterator;
+use IteratorIterator;
+use Zend\Stdlib\Exception\InvalidArgumentException;
+use Zend\Stdlib\Hydrator\HydratorInterface;
+
+class HydratingIteratorIterator extends IteratorIterator implements HydratingIteratorInterface
+{
+ /**
+ * @var HydratorInterface
+ */
+ protected $hydrator;
+
+ /**
+ * @var object
+ */
+ protected $prototype;
+
+ /**
+ * @param HydratorInterface $hydrator
+ * @param Iterator $data
+ * @param string|object $prototype Object or class name to use for prototype.
+ */
+ public function __construct(HydratorInterface $hydrator, Iterator $data, $prototype)
+ {
+ $this->setHydrator($hydrator);
+ $this->setPrototype($prototype);
+ parent::__construct($data);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function setPrototype($prototype)
+ {
+ if (is_object($prototype)) {
+ $this->prototype = $prototype;
+ return;
+ }
+
+ if (!class_exists($prototype)) {
+ throw new InvalidArgumentException(
+ sprintf('Method %s was passed an invalid class name: %s', __METHOD__, $prototype)
+ );
+ }
+
+ $this->prototype = new $prototype;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function setHydrator(HydratorInterface $hydrator)
+ {
+ $this->hydrator = $hydrator;
+ }
+
+ /**
+ * @return object Returns hydrated clone of $prototype
+ */
+ public function current()
+ {
+ $currentValue = parent::current();
+ $object = clone $this->prototype;
+ $this->hydrator->hydrate($currentValue, $object);
+ return $object;
+ }
+}
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php
similarity index 94%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php
index 962303ae151d..6ca3711f3dff 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/ArrayMapNamingStrategy.php
@@ -14,12 +14,12 @@ final class ArrayMapNamingStrategy implements NamingStrategyInterface
/**
* @var string[]
*/
- private $extractionMap = array();
+ private $extractionMap = [];
/**
* @var string[]
*/
- private $hydrationMap = array();
+ private $hydrationMap = [];
/**
* Constructor
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/CompositeNamingStrategy.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/CompositeNamingStrategy.php
similarity index 97%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/CompositeNamingStrategy.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/CompositeNamingStrategy.php
index 0887e9288b85..76a3082bdb94 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/CompositeNamingStrategy.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/CompositeNamingStrategy.php
@@ -14,7 +14,7 @@ final class CompositeNamingStrategy implements NamingStrategyInterface
/**
* @var array
*/
- private $namingStrategies = array();
+ private $namingStrategies = [];
/**
* @var NamingStrategyInterface
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/IdentityNamingStrategy.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/IdentityNamingStrategy.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/IdentityNamingStrategy.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/IdentityNamingStrategy.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/MapNamingStrategy.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/MapNamingStrategy.php
similarity index 97%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/MapNamingStrategy.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/MapNamingStrategy.php
index 27fbf321874e..7d04e5787a53 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/MapNamingStrategy.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/MapNamingStrategy.php
@@ -18,14 +18,14 @@ class MapNamingStrategy implements NamingStrategyInterface
*
* @var array
*/
- protected $mapping = array();
+ protected $mapping = [];
/**
* Reversed map for extract name conversion.
*
* @var array
*/
- protected $reverse = array();
+ protected $reverse = [];
/**
* Initialize.
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/NamingStrategyInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/NamingStrategyInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/NamingStrategyInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/NamingStrategyInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategyEnabledInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategyEnabledInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/NamingStrategyEnabledInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/NamingStrategyEnabledInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/ObjectProperty.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/ObjectProperty.php
similarity index 98%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/ObjectProperty.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/ObjectProperty.php
index c9f5260a5e8e..8b886eb1ef3b 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/ObjectProperty.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/ObjectProperty.php
@@ -18,7 +18,7 @@ class ObjectProperty extends AbstractHydrator
/**
* @var array[] indexed by class name and then property name
*/
- private static $skippedPropertiesCache = array();
+ private static $skippedPropertiesCache = [];
/**
* {@inheritDoc}
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Reflection.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Reflection.php
similarity index 95%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Reflection.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Reflection.php
index ea8e2d215309..a963d1f60cc8 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/Reflection.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Reflection.php
@@ -18,7 +18,7 @@ class Reflection extends AbstractHydrator
* Simple in-memory array cache of ReflectionProperties used.
* @var \ReflectionProperty[]
*/
- protected static $reflProperties = array();
+ protected static $reflProperties = [];
/**
* Extract values from an object
@@ -28,7 +28,7 @@ class Reflection extends AbstractHydrator
*/
public function extract($object)
{
- $result = array();
+ $result = [];
foreach (self::getReflProperties($object) as $property) {
$propertyName = $this->extractName($property->getName(), $object);
if (!$this->filterComposite->filter($propertyName)) {
@@ -81,7 +81,7 @@ protected static function getReflProperties($input)
return static::$reflProperties[$input];
}
- static::$reflProperties[$input] = array();
+ static::$reflProperties[$input] = [];
$reflClass = new ReflectionClass($input);
$reflProperties = $reflClass->getProperties();
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/BooleanStrategy.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/BooleanStrategy.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/BooleanStrategy.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/BooleanStrategy.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/ClosureStrategy.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ClosureStrategy.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/ClosureStrategy.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ClosureStrategy.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/DateTimeFormatterStrategy.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DateTimeFormatterStrategy.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/DateTimeFormatterStrategy.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DateTimeFormatterStrategy.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/DefaultStrategy.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DefaultStrategy.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/DefaultStrategy.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/DefaultStrategy.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/Exception/ExceptionInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/Exception/ExceptionInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/Exception/InvalidArgumentException.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/Exception/InvalidArgumentException.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/ExplodeStrategy.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ExplodeStrategy.php
similarity index 99%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/ExplodeStrategy.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ExplodeStrategy.php
index 49ec9c24b550..97c790b0cac1 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/ExplodeStrategy.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/ExplodeStrategy.php
@@ -71,7 +71,7 @@ private function setValueDelimiter($delimiter)
public function hydrate($value)
{
if (null === $value) {
- return array();
+ return [];
}
if (!(is_string($value) || is_numeric($value))) {
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/SerializableStrategy.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/SerializableStrategy.php
similarity index 98%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/SerializableStrategy.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/SerializableStrategy.php
index 260efa3087b8..51549ddad800 100644
--- a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/SerializableStrategy.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/SerializableStrategy.php
@@ -23,7 +23,7 @@ class SerializableStrategy implements StrategyInterface
/**
* @var array
*/
- protected $serializerOptions = array();
+ protected $serializerOptions = [];
/**
*
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/StrategyChain.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyChain.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/StrategyChain.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyChain.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/StrategyInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/Strategy/StrategyInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/Strategy/StrategyInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Hydrator/StrategyEnabledInterface.php b/core/vendor/zendframework/zend-stdlib/src/Hydrator/StrategyEnabledInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Hydrator/StrategyEnabledInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/Hydrator/StrategyEnabledInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/InitializableInterface.php b/core/vendor/zendframework/zend-stdlib/src/InitializableInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/InitializableInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/InitializableInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/JsonSerializable.php b/core/vendor/zendframework/zend-stdlib/src/JsonSerializable.php
similarity index 56%
rename from core/vendor/zendframework/zend-stdlib/JsonSerializable.php
rename to core/vendor/zendframework/zend-stdlib/src/JsonSerializable.php
index 6d6c2abe873a..16cc24466157 100644
--- a/core/vendor/zendframework/zend-stdlib/JsonSerializable.php
+++ b/core/vendor/zendframework/zend-stdlib/src/JsonSerializable.php
@@ -9,20 +9,6 @@
namespace Zend\Stdlib;
-if (PHP_VERSION_ID < 50400) {
- class_alias(
- 'Zend\Stdlib\JsonSerializable\PhpLegacyCompatibility',
- 'JsonSerializable'
- );
-}
-
-/**
- * Polyfill for JsonSerializable
- *
- * JsonSerializable was introduced in PHP 5.4.0.
- *
- * @see http://php.net/manual/class.jsonserializable.php
- */
interface JsonSerializable extends \JsonSerializable
{
}
diff --git a/core/vendor/zendframework/zend-stdlib/Message.php b/core/vendor/zendframework/zend-stdlib/src/Message.php
similarity index 98%
rename from core/vendor/zendframework/zend-stdlib/Message.php
rename to core/vendor/zendframework/zend-stdlib/src/Message.php
index 63ba7c7303c7..12d5bb3d8c25 100644
--- a/core/vendor/zendframework/zend-stdlib/Message.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Message.php
@@ -16,7 +16,7 @@ class Message implements MessageInterface
/**
* @var array
*/
- protected $metadata = array();
+ protected $metadata = [];
/**
* @var string
diff --git a/core/vendor/zendframework/zend-stdlib/MessageInterface.php b/core/vendor/zendframework/zend-stdlib/src/MessageInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/MessageInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/MessageInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/ParameterObjectInterface.php b/core/vendor/zendframework/zend-stdlib/src/ParameterObjectInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/ParameterObjectInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/ParameterObjectInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Parameters.php b/core/vendor/zendframework/zend-stdlib/src/Parameters.php
similarity index 97%
rename from core/vendor/zendframework/zend-stdlib/Parameters.php
rename to core/vendor/zendframework/zend-stdlib/src/Parameters.php
index bef834a8a03a..ab5ada97a955 100644
--- a/core/vendor/zendframework/zend-stdlib/Parameters.php
+++ b/core/vendor/zendframework/zend-stdlib/src/Parameters.php
@@ -24,7 +24,7 @@ class Parameters extends PhpArrayObject implements ParametersInterface
public function __construct(array $values = null)
{
if (null === $values) {
- $values = array();
+ $values = [];
}
parent::__construct($values, ArrayObject::ARRAY_AS_PROPS);
}
@@ -48,7 +48,7 @@ public function fromArray(array $values)
*/
public function fromString($string)
{
- $array = array();
+ $array = [];
parse_str($string, $array);
$this->fromArray($array);
}
diff --git a/core/vendor/zendframework/zend-stdlib/ParametersInterface.php b/core/vendor/zendframework/zend-stdlib/src/ParametersInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/ParametersInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/ParametersInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/PriorityList.php b/core/vendor/zendframework/zend-stdlib/src/PriorityList.php
similarity index 95%
rename from core/vendor/zendframework/zend-stdlib/PriorityList.php
rename to core/vendor/zendframework/zend-stdlib/src/PriorityList.php
index 172af68d8139..b318f264e43e 100644
--- a/core/vendor/zendframework/zend-stdlib/PriorityList.php
+++ b/core/vendor/zendframework/zend-stdlib/src/PriorityList.php
@@ -22,7 +22,7 @@ class PriorityList implements Iterator, Countable
*
* @var array[]
*/
- protected $items = array();
+ protected $items = [];
/**
* Serial assigned to items to preserve LIFO.
@@ -62,14 +62,17 @@ class PriorityList implements Iterator, Countable
*/
public function insert($name, $value, $priority = 0)
{
+ if (!isset($this->items[$name])) {
+ $this->count++;
+ }
+
$this->sorted = false;
- $this->count++;
- $this->items[$name] = array(
+ $this->items[$name] = [
'data' => $value,
'priority' => (int) $priority,
'serial' => $this->serial++,
- );
+ ];
}
/**
@@ -114,7 +117,7 @@ public function remove($name)
*/
public function clear()
{
- $this->items = array();
+ $this->items = [];
$this->serial = 0;
$this->count = 0;
$this->sorted = false;
@@ -143,7 +146,7 @@ public function get($name)
protected function sort()
{
if (!$this->sorted) {
- uasort($this->items, array($this, 'compare'));
+ uasort($this->items, [$this, 'compare']);
$this->sorted = true;
}
}
diff --git a/core/vendor/zendframework/zend-stdlib/PriorityQueue.php b/core/vendor/zendframework/zend-stdlib/src/PriorityQueue.php
similarity index 98%
rename from core/vendor/zendframework/zend-stdlib/PriorityQueue.php
rename to core/vendor/zendframework/zend-stdlib/src/PriorityQueue.php
index 1baf44e895b6..eded6adfe69b 100644
--- a/core/vendor/zendframework/zend-stdlib/PriorityQueue.php
+++ b/core/vendor/zendframework/zend-stdlib/src/PriorityQueue.php
@@ -42,7 +42,7 @@ class PriorityQueue implements Countable, IteratorAggregate, Serializable
* with keys "data" and "priority".
* @var array
*/
- protected $items = array();
+ protected $items = [];
/**
* Inner queue object
@@ -62,10 +62,10 @@ class PriorityQueue implements Countable, IteratorAggregate, Serializable
public function insert($data, $priority = 1)
{
$priority = (int) $priority;
- $this->items[] = array(
+ $this->items[] = [
'data' => $data,
'priority' => $priority,
- );
+ ];
$this->getQueue()->insert($data, $priority);
return $this;
}
diff --git a/core/vendor/zendframework/zend-stdlib/Request.php b/core/vendor/zendframework/zend-stdlib/src/Request.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Request.php
rename to core/vendor/zendframework/zend-stdlib/src/Request.php
diff --git a/core/vendor/zendframework/zend-stdlib/RequestInterface.php b/core/vendor/zendframework/zend-stdlib/src/RequestInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/RequestInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/RequestInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/Response.php b/core/vendor/zendframework/zend-stdlib/src/Response.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/Response.php
rename to core/vendor/zendframework/zend-stdlib/src/Response.php
diff --git a/core/vendor/zendframework/zend-stdlib/ResponseInterface.php b/core/vendor/zendframework/zend-stdlib/src/ResponseInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/ResponseInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/ResponseInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/SplPriorityQueue.php b/core/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php
similarity index 94%
rename from core/vendor/zendframework/zend-stdlib/SplPriorityQueue.php
rename to core/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php
index 029d8e9f059a..28b365d854cd 100644
--- a/core/vendor/zendframework/zend-stdlib/SplPriorityQueue.php
+++ b/core/vendor/zendframework/zend-stdlib/src/SplPriorityQueue.php
@@ -37,7 +37,7 @@ class SplPriorityQueue extends \SplPriorityQueue implements Serializable
public function insert($datum, $priority)
{
if (!is_array($priority)) {
- $priority = array($priority, $this->serial--);
+ $priority = [$priority, $this->serial--];
}
parent::insert($datum, $priority);
}
@@ -51,7 +51,7 @@ public function insert($datum, $priority)
*/
public function toArray()
{
- $array = array();
+ $array = [];
foreach (clone $this as $item) {
$array[] = $item;
}
@@ -68,7 +68,7 @@ public function serialize()
$clone = clone $this;
$clone->setExtractFlags(self::EXTR_BOTH);
- $data = array();
+ $data = [];
foreach ($clone as $item) {
$data[] = $item;
}
diff --git a/core/vendor/zendframework/zend-stdlib/SplQueue.php b/core/vendor/zendframework/zend-stdlib/src/SplQueue.php
similarity index 97%
rename from core/vendor/zendframework/zend-stdlib/SplQueue.php
rename to core/vendor/zendframework/zend-stdlib/src/SplQueue.php
index 029bc9f12731..51d8daf7cce5 100644
--- a/core/vendor/zendframework/zend-stdlib/SplQueue.php
+++ b/core/vendor/zendframework/zend-stdlib/src/SplQueue.php
@@ -23,7 +23,7 @@ class SplQueue extends \SplQueue implements Serializable
*/
public function toArray()
{
- $array = array();
+ $array = [];
foreach ($this as $item) {
$array[] = $item;
}
diff --git a/core/vendor/zendframework/zend-stdlib/SplStack.php b/core/vendor/zendframework/zend-stdlib/src/SplStack.php
similarity index 97%
rename from core/vendor/zendframework/zend-stdlib/SplStack.php
rename to core/vendor/zendframework/zend-stdlib/src/SplStack.php
index fac77a5d0475..6ba27398d15a 100644
--- a/core/vendor/zendframework/zend-stdlib/SplStack.php
+++ b/core/vendor/zendframework/zend-stdlib/src/SplStack.php
@@ -23,7 +23,7 @@ class SplStack extends \SplStack implements Serializable
*/
public function toArray()
{
- $array = array();
+ $array = [];
foreach ($this as $item) {
$array[] = $item;
}
diff --git a/core/vendor/zendframework/zend-stdlib/StringUtils.php b/core/vendor/zendframework/zend-stdlib/src/StringUtils.php
similarity index 98%
rename from core/vendor/zendframework/zend-stdlib/StringUtils.php
rename to core/vendor/zendframework/zend-stdlib/src/StringUtils.php
index 9bbb4a46e31f..575cf2aab055 100644
--- a/core/vendor/zendframework/zend-stdlib/StringUtils.php
+++ b/core/vendor/zendframework/zend-stdlib/src/StringUtils.php
@@ -31,14 +31,14 @@ abstract class StringUtils
*
* @var string[]
*/
- protected static $singleByteEncodings = array(
+ protected static $singleByteEncodings = [
'ASCII', '7BIT', '8BIT',
'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4', 'ISO-8859-5',
'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9', 'ISO-8859-10',
'ISO-8859-11', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
'CP-1251', 'CP-1252',
// TODO
- );
+ ];
/**
* Is PCRE compiled with Unicode support?
@@ -55,7 +55,7 @@ abstract class StringUtils
public static function getRegisteredWrappers()
{
if (static::$wrapperRegistry === null) {
- static::$wrapperRegistry = array();
+ static::$wrapperRegistry = [];
if (extension_loaded('intl')) {
static::$wrapperRegistry[] = 'Zend\Stdlib\StringWrapper\Intl';
diff --git a/core/vendor/zendframework/zend-stdlib/StringWrapper/AbstractStringWrapper.php b/core/vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/StringWrapper/AbstractStringWrapper.php
rename to core/vendor/zendframework/zend-stdlib/src/StringWrapper/AbstractStringWrapper.php
diff --git a/core/vendor/zendframework/zend-stdlib/StringWrapper/Iconv.php b/core/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php
similarity index 99%
rename from core/vendor/zendframework/zend-stdlib/StringWrapper/Iconv.php
rename to core/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php
index 04930ff453d0..46413ab79e16 100644
--- a/core/vendor/zendframework/zend-stdlib/StringWrapper/Iconv.php
+++ b/core/vendor/zendframework/zend-stdlib/src/StringWrapper/Iconv.php
@@ -19,7 +19,7 @@ class Iconv extends AbstractStringWrapper
* @var string[]
* @link http://www.gnu.org/software/libiconv/
*/
- protected static $encodings = array(
+ protected static $encodings = [
// European languages
'ASCII',
'ISO-8859-1',
@@ -195,7 +195,7 @@ class Iconv extends AbstractStringWrapper
// Platform specifics
'ATARIST',
'RISCOS-LATIN1',
- );
+ ];
/**
* Get a list of supported character encodings
diff --git a/core/vendor/zendframework/zend-stdlib/StringWrapper/Intl.php b/core/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php
similarity index 97%
rename from core/vendor/zendframework/zend-stdlib/StringWrapper/Intl.php
rename to core/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php
index 1b0127736783..eaab28f88d89 100644
--- a/core/vendor/zendframework/zend-stdlib/StringWrapper/Intl.php
+++ b/core/vendor/zendframework/zend-stdlib/src/StringWrapper/Intl.php
@@ -18,7 +18,7 @@ class Intl extends AbstractStringWrapper
*
* @var string[]
*/
- protected static $encodings = array('UTF-8');
+ protected static $encodings = ['UTF-8'];
/**
* Get a list of supported character encodings
diff --git a/core/vendor/zendframework/zend-stdlib/StringWrapper/MbString.php b/core/vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/StringWrapper/MbString.php
rename to core/vendor/zendframework/zend-stdlib/src/StringWrapper/MbString.php
diff --git a/core/vendor/zendframework/zend-stdlib/StringWrapper/Native.php b/core/vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/StringWrapper/Native.php
rename to core/vendor/zendframework/zend-stdlib/src/StringWrapper/Native.php
diff --git a/core/vendor/zendframework/zend-stdlib/StringWrapper/StringWrapperInterface.php b/core/vendor/zendframework/zend-stdlib/src/StringWrapper/StringWrapperInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/StringWrapper/StringWrapperInterface.php
rename to core/vendor/zendframework/zend-stdlib/src/StringWrapper/StringWrapperInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/compatibility/autoload.php b/core/vendor/zendframework/zend-stdlib/src/compatibility/autoload.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/compatibility/autoload.php
rename to core/vendor/zendframework/zend-stdlib/src/compatibility/autoload.php
--
GitLab