From 2937db59eaf5defa800b9c85d2de4c6527cc829f Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Thu, 5 Feb 2015 14:27:47 -0500
Subject: [PATCH] Updated to Zend Framework 2.3.4
---
composer.json | 2 +-
composer.lock | 46 +-
vendor/autoload.php | 2 +-
vendor/composer/autoload_real.php | 8 +-
vendor/composer/installed.json | 340 +++----
vendor/vufind-org/vufindhttp/composer.json | 4 +-
.../zendframework/.coveralls.yml | 1 +
.../zendframework/zendframework/CHANGELOG.md | 703 +++++++++++++++
vendor/zendframework/zendframework/INSTALL.md | 4 +-
.../zendframework/zendframework/LICENSE.txt | 2 +-
vendor/zendframework/zendframework/README.md | 22 +-
.../zendframework/bin/check-cs.sh | 21 -
.../zendframework/bin/classmap_generator.php | 10 +-
.../zendframework/bin/pluginmap_generator.php | 3 +-
.../bin/templatemap_generator.php | 7 +-
.../zendframework/zendframework/composer.json | 42 +-
.../Adapter/AbstractAdapter.php | 3 +-
.../Adapter/AdapterInterface.php | 2 +-
.../Zend/Authentication/Adapter/DbTable.php | 2 +-
.../Adapter/DbTable/AbstractAdapter.php | 26 +-
.../Adapter/DbTable/CallbackCheckAdapter.php | 4 +-
.../DbTable/CredentialTreatmentAdapter.php | 4 +-
.../DbTable/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 6 +-
.../DbTable/Exception/RuntimeException.php | 2 +-
.../Zend/Authentication/Adapter/Digest.php | 13 +-
.../Adapter/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 6 +-
.../Adapter/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../Zend/Authentication/Adapter/Http.php | 54 +-
.../Adapter/Http/ApacheResolver.php | 4 +-
.../Http/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Http/Exception/RuntimeException.php | 2 +-
.../Adapter/Http/FileResolver.php | 12 +-
.../Adapter/Http/ResolverInterface.php | 2 +-
.../Zend/Authentication/Adapter/Ldap.php | 26 +-
.../Adapter/ValidatableAdapterInterface.php | 2 +-
.../Authentication/AuthenticationService.php | 4 +-
.../AuthenticationServiceInterface.php | 44 +
.../Zend/Authentication/CONTRIBUTING.md | 3 +
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../library/Zend/Authentication/Result.php | 2 +-
.../Zend/Authentication/Storage/Chain.php | 2 +-
.../Authentication/Storage/NonPersistent.php | 2 +-
.../Zend/Authentication/Storage/Session.php | 2 +-
.../Storage/StorageInterface.php | 2 +-
.../Validator/Authentication.php | 2 +-
.../library/Zend/Authentication/composer.json | 21 +-
.../library/Zend/Barcode/Barcode.php | 45 +-
.../library/Zend/Barcode/CONTRIBUTING.md | 3 +
.../Barcode/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 6 +-
.../Barcode/Exception/OutOfRangeException.php | 2 +-
.../Exception/RendererCreationException.php | 6 +-
.../Barcode/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 5 +-
.../Zend/Barcode/Object/AbstractObject.php | 182 ++--
.../library/Zend/Barcode/Object/Codabar.php | 6 +-
.../library/Zend/Barcode/Object/Code128.php | 13 +-
.../library/Zend/Barcode/Object/Code25.php | 2 +-
.../Zend/Barcode/Object/Code25interleaved.php | 4 +-
.../library/Zend/Barcode/Object/Code39.php | 2 +-
.../library/Zend/Barcode/Object/Ean13.php | 9 +-
.../library/Zend/Barcode/Object/Ean2.php | 3 +-
.../library/Zend/Barcode/Object/Ean5.php | 7 +-
.../library/Zend/Barcode/Object/Ean8.php | 6 +-
.../library/Zend/Barcode/Object/Error.php | 2 +-
.../Exception/BarcodeValidationException.php | 2 +-
.../Object/Exception/ExceptionInterface.php | 2 +-
.../Exception/ExtensionNotLoadedException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Object/Exception/OutOfRangeException.php | 2 +-
.../Object/Exception/RuntimeException.php | 2 +-
.../library/Zend/Barcode/Object/Identcode.php | 9 +-
.../library/Zend/Barcode/Object/Itf14.php | 3 +-
.../library/Zend/Barcode/Object/Leitcode.php | 7 +-
.../Zend/Barcode/Object/ObjectInterface.php | 2 +-
.../library/Zend/Barcode/Object/Planet.php | 3 +-
.../library/Zend/Barcode/Object/Postnet.php | 6 +-
.../library/Zend/Barcode/Object/Royalmail.php | 6 +-
.../library/Zend/Barcode/Object/Upca.php | 6 +-
.../library/Zend/Barcode/Object/Upce.php | 14 +-
.../Zend/Barcode/ObjectPluginManager.php | 2 +-
.../Barcode/Renderer/AbstractRenderer.php | 9 +-
.../Renderer/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/OutOfRangeException.php | 2 +-
.../Renderer/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../library/Zend/Barcode/Renderer/Image.php | 28 +-
.../library/Zend/Barcode/Renderer/Pdf.php | 4 +-
.../Barcode/Renderer/RendererInterface.php | 3 +-
.../library/Zend/Barcode/Renderer/Svg.php | 23 +-
.../Zend/Barcode/RendererPluginManager.php | 2 +-
.../library/Zend/Barcode/composer.json | 13 +-
.../library/Zend/Cache/CONTRIBUTING.md | 3 +
.../Exception/BadMethodCallException.php | 2 +-
.../Cache/Exception/ExceptionInterface.php | 2 +-
.../Exception/ExtensionNotLoadedException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Zend/Cache/Exception/LogicException.php | 2 +-
.../Exception/MissingDependencyException.php | 2 +-
.../Cache/Exception/MissingKeyException.php | 2 +-
.../Cache/Exception/OutOfSpaceException.php | 2 +-
.../Zend/Cache/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../UnsupportedMethodCallException.php | 2 +-
.../Zend/Cache/Pattern/AbstractPattern.php | 5 +-
.../Zend/Cache/Pattern/CallbackCache.php | 28 +-
.../Zend/Cache/Pattern/CaptureCache.php | 25 +-
.../library/Zend/Cache/Pattern/ClassCache.php | 2 +-
.../Zend/Cache/Pattern/ObjectCache.php | 4 +-
.../Zend/Cache/Pattern/OutputCache.php | 2 +-
.../Zend/Cache/Pattern/PatternInterface.php | 4 +-
.../Zend/Cache/Pattern/PatternOptions.php | 10 +-
.../library/Zend/Cache/PatternFactory.php | 2 +-
.../Zend/Cache/PatternPluginManager.php | 2 +-
.../StorageCacheAbstractServiceFactory.php | 2 +-
.../Cache/Service/StorageCacheFactory.php | 2 +-
.../Cache/Storage/Adapter/AbstractAdapter.php | 6 +-
.../Storage/Adapter/AbstractZendServer.php | 2 +-
.../Cache/Storage/Adapter/AdapterOptions.php | 7 +-
.../Zend/Cache/Storage/Adapter/Apc.php | 45 +-
.../Cache/Storage/Adapter/ApcIterator.php | 3 +-
.../Zend/Cache/Storage/Adapter/ApcOptions.php | 2 +-
.../Zend/Cache/Storage/Adapter/BlackHole.php | 502 +++++++++++
.../Zend/Cache/Storage/Adapter/Dba.php | 10 +-
.../Cache/Storage/Adapter/DbaIterator.php | 4 +-
.../Zend/Cache/Storage/Adapter/DbaOptions.php | 2 +-
.../Zend/Cache/Storage/Adapter/Filesystem.php | 89 +-
.../Storage/Adapter/FilesystemIterator.php | 3 +-
.../Storage/Adapter/FilesystemOptions.php | 3 +-
.../Cache/Storage/Adapter/KeyListIterator.php | 3 +-
.../Zend/Cache/Storage/Adapter/Memcache.php | 574 ++++++++++++
.../Cache/Storage/Adapter/MemcacheOptions.php | 284 ++++++
.../Adapter/MemcacheResourceManager.php | 646 ++++++++++++++
.../Zend/Cache/Storage/Adapter/Memcached.php | 7 +-
.../Storage/Adapter/MemcachedOptions.php | 4 +-
.../Adapter/MemcachedResourceManager.php | 178 ++--
.../Zend/Cache/Storage/Adapter/Memory.php | 58 +-
.../Cache/Storage/Adapter/MemoryOptions.php | 2 +-
.../Zend/Cache/Storage/Adapter/Redis.php | 12 +-
.../Cache/Storage/Adapter/RedisOptions.php | 2 +-
.../Storage/Adapter/RedisResourceManager.php | 341 ++++---
.../Zend/Cache/Storage/Adapter/Session.php | 5 +-
.../Cache/Storage/Adapter/SessionOptions.php | 2 +-
.../Zend/Cache/Storage/Adapter/WinCache.php | 3 +-
.../Cache/Storage/Adapter/WinCacheOptions.php | 3 +-
.../Zend/Cache/Storage/Adapter/XCache.php | 11 +-
.../Cache/Storage/Adapter/XCacheOptions.php | 2 +-
.../Cache/Storage/Adapter/ZendServerDisk.php | 3 +-
.../Cache/Storage/Adapter/ZendServerShm.php | 5 +-
.../Cache/Storage/AdapterPluginManager.php | 4 +-
.../AvailableSpaceCapableInterface.php | 2 +-
.../Zend/Cache/Storage/Capabilities.php | 58 +-
.../Storage/ClearByNamespaceInterface.php | 2 +-
.../Cache/Storage/ClearByPrefixInterface.php | 2 +-
.../Cache/Storage/ClearExpiredInterface.php | 2 +-
.../library/Zend/Cache/Storage/Event.php | 2 +-
.../Zend/Cache/Storage/ExceptionEvent.php | 2 +-
.../Zend/Cache/Storage/FlushableInterface.php | 2 +-
.../Zend/Cache/Storage/IterableInterface.php | 2 +-
.../Zend/Cache/Storage/IteratorInterface.php | 3 +-
.../Cache/Storage/OptimizableInterface.php | 2 +-
.../Cache/Storage/Plugin/AbstractPlugin.php | 2 +-
.../Storage/Plugin/ClearExpiredByFactor.php | 6 +-
.../Cache/Storage/Plugin/ExceptionHandler.php | 6 +-
.../Cache/Storage/Plugin/IgnoreUserAbort.php | 51 +-
.../Cache/Storage/Plugin/OptimizeByFactor.php | 4 +-
.../Cache/Storage/Plugin/PluginInterface.php | 2 +-
.../Cache/Storage/Plugin/PluginOptions.php | 6 +-
.../Zend/Cache/Storage/Plugin/Serializer.php | 12 +-
.../Zend/Cache/Storage/PluginManager.php | 2 +-
.../library/Zend/Cache/Storage/PostEvent.php | 2 +-
.../Zend/Cache/Storage/StorageInterface.php | 2 +-
.../Zend/Cache/Storage/TaggableInterface.php | 2 +-
.../Storage/TotalSpaceCapableInterface.php | 2 +-
.../library/Zend/Cache/StorageFactory.php | 13 +-
.../library/Zend/Cache/composer.json | 10 +-
.../library/Zend/Captcha/AbstractAdapter.php | 2 +-
.../library/Zend/Captcha/AbstractWord.php | 2 +-
.../library/Zend/Captcha/AdapterInterface.php | 2 +-
.../library/Zend/Captcha/CONTRIBUTING.md | 3 +
.../library/Zend/Captcha/Dumb.php | 2 +-
.../Captcha/Exception/DomainException.php | 2 +-
.../Captcha/Exception/ExceptionInterface.php | 2 +-
.../Exception/ExtensionNotLoadedException.php | 2 +-
.../Exception/ImageNotLoadableException.php | 2 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Exception/NoFontProvidedException.php | 2 +-
.../Captcha/Exception/RuntimeException.php | 5 +-
.../library/Zend/Captcha/Factory.php | 2 +-
.../library/Zend/Captcha/Figlet.php | 2 +-
.../library/Zend/Captcha/Image.php | 12 +-
.../library/Zend/Captcha/ReCaptcha.php | 2 +-
.../library/Zend/Captcha/composer.json | 17 +-
.../Code/Annotation/AnnotationCollection.php | 2 +-
.../Code/Annotation/AnnotationInterface.php | 3 +-
.../Code/Annotation/AnnotationManager.php | 4 +-
.../Parser/DoctrineAnnotationParser.php | 2 +-
.../Parser/GenericAnnotationParser.php | 2 +-
.../Annotation/Parser/ParserInterface.php | 2 +-
.../library/Zend/Code/CONTRIBUTING.md | 3 +
.../Code/Exception/BadMethodCallException.php | 5 +-
.../Code/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Zend/Code/Exception/RuntimeException.php | 5 +-
.../Zend/Code/Generator/AbstractGenerator.php | 2 +-
.../Generator/AbstractMemberGenerator.php | 3 +-
.../Zend/Code/Generator/BodyGenerator.php | 2 +-
.../Zend/Code/Generator/ClassGenerator.php | 29 +-
.../Zend/Code/Generator/DocBlock/Tag.php | 86 +-
.../DocBlock/Tag/AbstractTypeableTag.php | 96 ++
.../Code/Generator/DocBlock/Tag/AuthorTag.php | 80 +-
.../Generator/DocBlock/Tag/GenericTag.php | 88 ++
.../Generator/DocBlock/Tag/LicenseTag.php | 56 +-
.../Code/Generator/DocBlock/Tag/MethodTag.php | 98 ++
.../Code/Generator/DocBlock/Tag/ParamTag.php | 89 +-
.../Generator/DocBlock/Tag/PropertyTag.php | 71 ++
.../Code/Generator/DocBlock/Tag/ReturnTag.php | 47 +-
.../Generator/DocBlock/Tag/TagInterface.php | 16 +
.../Code/Generator/DocBlock/Tag/ThrowsTag.php | 33 +
.../Code/Generator/DocBlock/TagManager.php | 69 ++
.../Zend/Code/Generator/DocBlockGenerator.php | 40 +-
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Generator/Exception/RuntimeException.php | 5 +-
.../Zend/Code/Generator/FileGenerator.php | 138 ++-
.../Code/Generator/FileGeneratorRegistry.php | 2 +-
.../Code/Generator/GeneratorInterface.php | 2 +-
.../Zend/Code/Generator/MethodGenerator.php | 16 +-
.../Code/Generator/ParameterGenerator.php | 12 +-
.../Zend/Code/Generator/PropertyGenerator.php | 7 +-
.../Code/Generator/PropertyValueGenerator.php | 4 +-
.../Zend/Code/Generator/ValueGenerator.php | 48 +-
.../Prototype/PrototypeClassFactory.php | 121 +++
.../Prototype/PrototypeGenericInterface.php | 18 +
.../Generic/Prototype/PrototypeInterface.php | 18 +
.../library/Zend/Code/NameInformation.php | 3 +-
.../Zend/Code/Reflection/ClassReflection.php | 4 +-
.../Reflection/DocBlock/Tag/AuthorTag.php | 2 +-
.../Reflection/DocBlock/Tag/GenericTag.php | 6 +-
.../Reflection/DocBlock/Tag/LicenseTag.php | 2 +-
.../Reflection/DocBlock/Tag/MethodTag.php | 4 +-
.../Code/Reflection/DocBlock/Tag/ParamTag.php | 2 +-
.../DocBlock/Tag/PhpDocTypedTagInterface.php | 2 +-
.../Reflection/DocBlock/Tag/PropertyTag.php | 2 +-
.../Reflection/DocBlock/Tag/ReturnTag.php | 2 +-
.../Reflection/DocBlock/Tag/TagInterface.php | 11 +-
.../Reflection/DocBlock/Tag/ThrowsTag.php | 2 +-
.../Code/Reflection/DocBlock/TagManager.php | 110 +--
.../Code/Reflection/DocBlockReflection.php | 15 +-
.../Exception/BadMethodCallException.php | 5 +-
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Reflection/Exception/RuntimeException.php | 5 +-
.../Zend/Code/Reflection/FileReflection.php | 4 +-
.../Code/Reflection/FunctionReflection.php | 162 +++-
.../Zend/Code/Reflection/MethodReflection.php | 342 ++++++-
.../Code/Reflection/ParameterReflection.php | 2 +-
.../Code/Reflection/PropertyReflection.php | 4 +-
.../Code/Reflection/ReflectionInterface.php | 5 +-
.../Scanner/AggregateDirectoryScanner.php | 15 +-
.../Zend/Code/Scanner/AnnotationScanner.php | 19 +-
.../Zend/Code/Scanner/CachingFileScanner.php | 4 +-
.../Zend/Code/Scanner/ClassScanner.php | 33 +-
.../Zend/Code/Scanner/ConstantScanner.php | 5 +-
.../Zend/Code/Scanner/DerivedClassScanner.php | 2 +-
.../Zend/Code/Scanner/DirectoryScanner.php | 2 +-
.../Zend/Code/Scanner/DocBlockScanner.php | 8 +-
.../library/Zend/Code/Scanner/FileScanner.php | 4 +-
.../Zend/Code/Scanner/FunctionScanner.php | 2 +-
.../Zend/Code/Scanner/MethodScanner.php | 21 +-
.../Zend/Code/Scanner/ParameterScanner.php | 3 +-
.../Zend/Code/Scanner/PropertyScanner.php | 130 ++-
.../Zend/Code/Scanner/ScannerInterface.php | 2 +-
.../Zend/Code/Scanner/TokenArrayScanner.php | 18 +-
.../library/Zend/Code/Scanner/Util.php | 2 +-
.../Zend/Code/Scanner/ValueScanner.php | 2 +-
.../library/Zend/Code/composer.json | 13 +-
.../Zend/Config/AbstractConfigFactory.php | 172 ++++
.../library/Zend/Config/CONTRIBUTING.md | 3 +
.../library/Zend/Config/Config.php | 3 +-
.../Config/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Config/Exception/RuntimeException.php | 5 +-
.../library/Zend/Config/Factory.php | 51 +-
.../Zend/Config/Processor/Constant.php | 2 +-
.../library/Zend/Config/Processor/Filter.php | 2 +-
.../Config/Processor/ProcessorInterface.php | 2 +-
.../library/Zend/Config/Processor/Queue.php | 2 +-
.../library/Zend/Config/Processor/Token.php | 2 +-
.../Zend/Config/Processor/Translator.php | 4 +-
.../library/Zend/Config/Reader/Ini.php | 30 +-
.../Zend/Config/Reader/JavaProperties.php | 138 +++
.../library/Zend/Config/Reader/Json.php | 2 +-
.../Zend/Config/Reader/ReaderInterface.php | 2 +-
.../library/Zend/Config/Reader/Xml.php | 33 +-
.../library/Zend/Config/Reader/Yaml.php | 6 +-
.../Zend/Config/ReaderPluginManager.php | 11 +-
.../Zend/Config/Writer/AbstractWriter.php | 13 +-
.../library/Zend/Config/Writer/Ini.php | 2 +-
.../library/Zend/Config/Writer/Json.php | 2 +-
.../library/Zend/Config/Writer/PhpArray.php | 121 ++-
.../Zend/Config/Writer/WriterInterface.php | 2 +-
.../library/Zend/Config/Writer/Xml.php | 6 +-
.../library/Zend/Config/Writer/Yaml.php | 4 +-
.../Zend/Config/WriterPluginManager.php | 7 +-
.../library/Zend/Config/composer.json | 15 +-
.../Zend/Console/Adapter/AbstractAdapter.php | 79 +-
.../Zend/Console/Adapter/AdapterInterface.php | 21 +-
.../library/Zend/Console/Adapter/Posix.php | 10 +-
.../library/Zend/Console/Adapter/Virtual.php | 2 +-
.../library/Zend/Console/Adapter/Windows.php | 26 +-
.../Zend/Console/Adapter/WindowsAnsicon.php | 20 +-
.../library/Zend/Console/CONTRIBUTING.md | 3 +
.../library/Zend/Console/Charset/Ascii.php | 4 +-
.../Zend/Console/Charset/AsciiExtended.php | 3 +-
.../Zend/Console/Charset/CharsetInterface.php | 2 +-
.../library/Zend/Console/Charset/DECSG.php | 4 +-
.../library/Zend/Console/Charset/Utf8.php | 4 +-
.../Zend/Console/Charset/Utf8Heavy.php | 4 +-
.../library/Zend/Console/Color/Xterm256.php | 4 +-
.../library/Zend/Console/ColorInterface.php | 2 +-
.../library/Zend/Console/Console.php | 6 +-
.../Exception/BadMethodCallException.php | 3 +-
.../Console/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Console/Exception/RuntimeException.php | 2 +-
.../library/Zend/Console/Getopt.php | 141 +--
.../Zend/Console/Prompt/AbstractPrompt.php | 2 +-
.../library/Zend/Console/Prompt/Char.php | 3 +-
.../library/Zend/Console/Prompt/Confirm.php | 3 +-
.../library/Zend/Console/Prompt/Line.php | 4 +-
.../library/Zend/Console/Prompt/Number.php | 2 +-
.../Zend/Console/Prompt/PromptInterface.php | 3 +-
.../library/Zend/Console/Prompt/Select.php | 3 +-
.../library/Zend/Console/Request.php | 2 +-
.../library/Zend/Console/Response.php | 6 +-
.../RouteMatcher/DefaultRouteMatcher.php | 780 ++++++++++++++++
.../RouteMatcher/RouteMatcherInterface.php | 21 +
.../library/Zend/Console/composer.json | 11 +-
.../library/Zend/Crypt/BlockCipher.php | 100 ++-
.../library/Zend/Crypt/CONTRIBUTING.md | 3 +
.../Crypt/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 6 +-
.../Zend/Crypt/Exception/RuntimeException.php | 6 +-
.../zendframework/library/Zend/Crypt/Hash.php | 2 +-
.../zendframework/library/Zend/Crypt/Hmac.php | 3 +-
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Derivation/Exception/RuntimeException.php | 5 +-
.../Zend/Crypt/Key/Derivation/Pbkdf2.php | 2 +-
.../Zend/Crypt/Key/Derivation/SaltedS2k.php | 27 +-
.../Zend/Crypt/Key/Derivation/Scrypt.php | 7 +-
.../library/Zend/Crypt/Password/Apache.php | 25 +-
.../library/Zend/Crypt/Password/Bcrypt.php | 50 +-
.../Password/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Password/Exception/RuntimeException.php | 5 +-
.../Zend/Crypt/Password/PasswordInterface.php | 2 +-
.../Zend/Crypt/PublicKey/DiffieHellman.php | 20 +-
.../library/Zend/Crypt/PublicKey/Rsa.php | 2 +-
.../Zend/Crypt/PublicKey/Rsa/AbstractKey.php | 2 +-
.../Rsa/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Rsa/Exception/RuntimeException.php | 9 +-
.../Zend/Crypt/PublicKey/Rsa/PrivateKey.php | 2 +-
.../Zend/Crypt/PublicKey/Rsa/PublicKey.php | 3 +-
.../Zend/Crypt/PublicKey/RsaOptions.php | 65 +-
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Symmetric/Exception/RuntimeException.php | 5 +-
.../library/Zend/Crypt/Symmetric/Mcrypt.php | 21 +-
.../Symmetric/Padding/PaddingInterface.php | 2 +-
.../Zend/Crypt/Symmetric/Padding/Pkcs7.php | 3 +-
.../Crypt/Symmetric/PaddingPluginManager.php | 2 +-
.../Crypt/Symmetric/SymmetricInterface.php | 20 +-
.../Zend/Crypt/SymmetricPluginManager.php | 2 +-
.../library/Zend/Crypt/Utils.php | 2 +-
.../library/Zend/Crypt/composer.json | 10 +-
.../library/Zend/Db/Adapter/Adapter.php | 8 +-
.../Adapter/AdapterAbstractServiceFactory.php | 2 +-
.../Zend/Db/Adapter/AdapterAwareInterface.php | 2 +-
.../Zend/Db/Adapter/AdapterAwareTrait.php | 2 +-
.../Zend/Db/Adapter/AdapterInterface.php | 3 +-
.../Zend/Db/Adapter/AdapterServiceFactory.php | 2 +-
.../Db/Adapter/Driver/ConnectionInterface.php | 2 +-
.../Db/Adapter/Driver/DriverInterface.php | 2 +-
.../Driver/Feature/AbstractFeature.php | 4 +-
.../Driver/Feature/DriverFeatureInterface.php | 2 +-
.../Db/Adapter/Driver/IbmDb2/Connection.php | 126 ++-
.../Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php | 4 +-
.../Zend/Db/Adapter/Driver/IbmDb2/Result.php | 2 +-
.../Db/Adapter/Driver/IbmDb2/Statement.php | 2 +-
.../Db/Adapter/Driver/Mysqli/Connection.php | 17 +-
.../Zend/Db/Adapter/Driver/Mysqli/Mysqli.php | 3 +-
.../Zend/Db/Adapter/Driver/Mysqli/Result.php | 3 +-
.../Db/Adapter/Driver/Mysqli/Statement.php | 3 +-
.../Db/Adapter/Driver/Oci8/Connection.php | 4 +-
.../Zend/Db/Adapter/Driver/Oci8/Oci8.php | 18 +-
.../Zend/Db/Adapter/Driver/Oci8/Result.php | 4 +-
.../Zend/Db/Adapter/Driver/Oci8/Statement.php | 10 +-
.../Zend/Db/Adapter/Driver/Pdo/Connection.php | 55 +-
.../Driver/Pdo/Feature/OracleRowCounter.php | 10 +-
.../Driver/Pdo/Feature/SqliteRowCounter.php | 9 +-
.../Zend/Db/Adapter/Driver/Pdo/Pdo.php | 9 +-
.../Zend/Db/Adapter/Driver/Pdo/Result.php | 3 +-
.../Zend/Db/Adapter/Driver/Pdo/Statement.php | 7 +-
.../Db/Adapter/Driver/Pgsql/Connection.php | 69 +-
.../Zend/Db/Adapter/Driver/Pgsql/Pgsql.php | 2 +-
.../Zend/Db/Adapter/Driver/Pgsql/Result.php | 3 +-
.../Db/Adapter/Driver/Pgsql/Statement.php | 2 +-
.../Db/Adapter/Driver/ResultInterface.php | 2 +-
.../Db/Adapter/Driver/Sqlsrv/Connection.php | 49 +-
.../Sqlsrv/Exception/ErrorException.php | 3 +-
.../Sqlsrv/Exception/ExceptionInterface.php | 2 +-
.../Zend/Db/Adapter/Driver/Sqlsrv/Result.php | 3 +-
.../Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php | 3 +-
.../Db/Adapter/Driver/Sqlsrv/Statement.php | 52 +-
.../Db/Adapter/Driver/StatementInterface.php | 4 +-
.../Db/Adapter/Exception/ErrorException.php | 2 +-
.../Adapter/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../InvalidConnectionParametersException.php | 3 +-
.../Exception/InvalidQueryException.php | 2 +-
.../Db/Adapter/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../Zend/Db/Adapter/ParameterContainer.php | 6 +-
.../Zend/Db/Adapter/Platform/IbmDb2.php | 4 +-
.../Zend/Db/Adapter/Platform/Mysql.php | 2 +-
.../Zend/Db/Adapter/Platform/Oracle.php | 4 +-
.../Db/Adapter/Platform/PlatformInterface.php | 2 +-
.../Zend/Db/Adapter/Platform/Postgresql.php | 3 +-
.../Zend/Db/Adapter/Platform/Sql92.php | 3 +-
.../Zend/Db/Adapter/Platform/SqlServer.php | 8 +-
.../Zend/Db/Adapter/Platform/Sqlite.php | 4 +-
.../Zend/Db/Adapter/Profiler/Profiler.php | 2 +-
.../Profiler/ProfilerAwareInterface.php | 2 +-
.../Db/Adapter/Profiler/ProfilerInterface.php | 2 +-
.../Zend/Db/Adapter/StatementContainer.php | 3 +-
.../Adapter/StatementContainerInterface.php | 2 +-
.../library/Zend/Db/CONTRIBUTING.md | 3 +
.../Zend/Db/Exception/ErrorException.php | 2 +-
.../Zend/Db/Exception/ExceptionInterface.php | 2 +-
.../Db/Exception/InvalidArgumentException.php | 2 +-
.../Zend/Db/Exception/RuntimeException.php | 2 +-
.../Db/Exception/UnexpectedValueException.php | 2 +-
.../library/Zend/Db/Metadata/Metadata.php | 6 +-
.../Zend/Db/Metadata/MetadataInterface.php | 3 +-
.../Metadata/Object/AbstractTableObject.php | 3 +-
.../Zend/Db/Metadata/Object/ColumnObject.php | 3 +-
.../Metadata/Object/ConstraintKeyObject.php | 3 +-
.../Db/Metadata/Object/ConstraintObject.php | 2 +-
.../Zend/Db/Metadata/Object/TableObject.php | 2 +-
.../Zend/Db/Metadata/Object/TriggerObject.php | 2 +-
.../Zend/Db/Metadata/Object/ViewObject.php | 2 +-
.../Db/Metadata/Source/AbstractSource.php | 3 +-
.../Zend/Db/Metadata/Source/MysqlMetadata.php | 2 +-
.../Db/Metadata/Source/OracleMetadata.php | 256 ++++++
.../Db/Metadata/Source/PostgresqlMetadata.php | 5 +-
.../Db/Metadata/Source/SqlServerMetadata.php | 4 +-
.../Db/Metadata/Source/SqliteMetadata.php | 7 +-
.../Zend/Db/ResultSet/AbstractResultSet.php | 9 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../ResultSet/Exception/RuntimeException.php | 2 +-
.../Zend/Db/ResultSet/HydratingResultSet.php | 2 +-
.../library/Zend/Db/ResultSet/ResultSet.php | 2 +-
.../Zend/Db/ResultSet/ResultSetInterface.php | 2 +-
.../Zend/Db/RowGateway/AbstractRowGateway.php | 6 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../RowGateway/Exception/RuntimeException.php | 2 +-
.../Db/RowGateway/Feature/AbstractFeature.php | 3 +-
.../Zend/Db/RowGateway/Feature/FeatureSet.php | 2 +-
.../library/Zend/Db/RowGateway/RowGateway.php | 5 +-
.../Db/RowGateway/RowGatewayInterface.php | 2 +-
.../library/Zend/Db/Sql/AbstractSql.php | 23 +-
.../library/Zend/Db/Sql/Ddl/AlterTable.php | 4 +-
.../Zend/Db/Sql/Ddl/Column/BigInteger.php | 2 +-
.../library/Zend/Db/Sql/Ddl/Column/Blob.php | 12 +-
.../Zend/Db/Sql/Ddl/Column/Boolean.php | 2 +-
.../library/Zend/Db/Sql/Ddl/Column/Char.php | 2 +-
.../library/Zend/Db/Sql/Ddl/Column/Column.php | 2 +-
.../Db/Sql/Ddl/Column/ColumnInterface.php | 22 +-
.../library/Zend/Db/Sql/Ddl/Column/Date.php | 2 +-
.../Zend/Db/Sql/Ddl/Column/Decimal.php | 2 +-
.../library/Zend/Db/Sql/Ddl/Column/Float.php | 2 +-
.../Zend/Db/Sql/Ddl/Column/Integer.php | 2 +-
.../library/Zend/Db/Sql/Ddl/Column/Text.php | 2 +-
.../library/Zend/Db/Sql/Ddl/Column/Time.php | 2 +-
.../Zend/Db/Sql/Ddl/Column/Varchar.php | 2 +-
.../Sql/Ddl/Constraint/AbstractConstraint.php | 2 +-
.../Zend/Db/Sql/Ddl/Constraint/Check.php | 2 +-
.../Ddl/Constraint/ConstraintInterface.php | 2 +-
.../Zend/Db/Sql/Ddl/Constraint/ForeignKey.php | 2 +-
.../Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php | 2 +-
.../Zend/Db/Sql/Ddl/Constraint/UniqueKey.php | 8 +-
.../library/Zend/Db/Sql/Ddl/CreateTable.php | 2 +-
.../library/Zend/Db/Sql/Ddl/DropTable.php | 2 +-
.../library/Zend/Db/Sql/Ddl/SqlInterface.php | 2 +-
.../library/Zend/Db/Sql/Delete.php | 51 +-
.../Db/Sql/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Db/Sql/Exception/RuntimeException.php | 2 +-
.../library/Zend/Db/Sql/Expression.php | 2 +-
.../Zend/Db/Sql/ExpressionInterface.php | 7 +-
.../library/Zend/Db/Sql/Having.php | 3 +-
.../library/Zend/Db/Sql/Insert.php | 154 +++-
.../library/Zend/Db/Sql/Literal.php | 2 +-
.../Zend/Db/Sql/Platform/AbstractPlatform.php | 2 +-
.../Zend/Db/Sql/Platform/IbmDb2/IbmDb2.php | 23 +
.../Sql/Platform/IbmDb2/SelectDecorator.php | 192 ++++
.../Mysql/Ddl/CreateTableDecorator.php | 2 +-
.../Zend/Db/Sql/Platform/Mysql/Mysql.php | 2 +-
.../Db/Sql/Platform/Mysql/SelectDecorator.php | 15 +-
.../Zend/Db/Sql/Platform/Oracle/Oracle.php | 4 +-
.../Sql/Platform/Oracle/SelectDecorator.php | 4 +-
.../library/Zend/Db/Sql/Platform/Platform.php | 8 +-
.../Platform/PlatformDecoratorInterface.php | 2 +-
.../SqlServer/Ddl/CreateTableDecorator.php | 61 ++
.../Platform/SqlServer/SelectDecorator.php | 15 +-
.../Db/Sql/Platform/SqlServer/SqlServer.php | 4 +-
.../library/Zend/Db/Sql/Predicate/Between.php | 2 +-
.../Zend/Db/Sql/Predicate/Expression.php | 16 +-
.../library/Zend/Db/Sql/Predicate/In.php | 58 +-
.../Zend/Db/Sql/Predicate/IsNotNull.php | 2 +-
.../library/Zend/Db/Sql/Predicate/IsNull.php | 3 +-
.../library/Zend/Db/Sql/Predicate/Like.php | 3 +-
.../library/Zend/Db/Sql/Predicate/Literal.php | 3 +-
.../library/Zend/Db/Sql/Predicate/NotIn.php | 5 +-
.../library/Zend/Db/Sql/Predicate/NotLike.php | 2 +-
.../Zend/Db/Sql/Predicate/Operator.php | 2 +-
.../Zend/Db/Sql/Predicate/Predicate.php | 28 +-
.../Db/Sql/Predicate/PredicateInterface.php | 3 +-
.../Zend/Db/Sql/Predicate/PredicateSet.php | 60 +-
.../Zend/Db/Sql/PreparableSqlInterface.php | 3 +-
.../library/Zend/Db/Sql/Select.php | 153 +---
.../zendframework/library/Zend/Db/Sql/Sql.php | 16 +-
.../library/Zend/Db/Sql/SqlInterface.php | 7 +-
.../library/Zend/Db/Sql/TableIdentifier.php | 3 +-
.../library/Zend/Db/Sql/Update.php | 117 +--
.../library/Zend/Db/Sql/Where.php | 3 +-
.../Db/TableGateway/AbstractTableGateway.php | 39 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/RuntimeException.php | 2 +-
.../TableGateway/Feature/AbstractFeature.php | 4 +-
.../Db/TableGateway/Feature/EventFeature.php | 37 +-
.../EventFeature/TableGatewayEvent.php | 3 +-
.../Db/TableGateway/Feature/FeatureSet.php | 2 +-
.../Feature/GlobalAdapterFeature.php | 5 +-
.../Feature/MasterSlaveFeature.php | 4 +-
.../TableGateway/Feature/MetadataFeature.php | 5 +-
.../Feature/RowGatewayFeature.php | 3 +-
.../TableGateway/Feature/SequenceFeature.php | 15 +-
.../Zend/Db/TableGateway/TableGateway.php | 5 +-
.../Db/TableGateway/TableGatewayInterface.php | 2 +-
.../library/Zend/Db/composer.json | 16 +-
.../library/Zend/Debug/CONTRIBUTING.md | 3 +
.../library/Zend/Debug/Debug.php | 4 +-
.../library/Zend/Debug/composer.json | 9 +-
.../library/Zend/Di/CONTRIBUTING.md | 3 +
.../zendframework/library/Zend/Di/Config.php | 2 +-
.../Zend/Di/Definition/Annotation/Inject.php | 2 +-
.../Di/Definition/Annotation/Instantiator.php | 2 +-
.../Zend/Di/Definition/ArrayDefinition.php | 2 +-
.../Di/Definition/Builder/InjectionMethod.php | 4 +-
.../Zend/Di/Definition/Builder/PhpClass.php | 2 +-
.../Zend/Di/Definition/BuilderDefinition.php | 2 +-
.../Zend/Di/Definition/ClassDefinition.php | 7 +-
.../Zend/Di/Definition/CompilerDefinition.php | 9 +-
.../Di/Definition/DefinitionInterface.php | 2 +-
.../Di/Definition/IntrospectionStrategy.php | 2 +-
.../Zend/Di/Definition/PartialMarker.php | 2 +-
.../Zend/Di/Definition/RuntimeDefinition.php | 10 +-
.../library/Zend/Di/DefinitionList.php | 2 +-
.../Zend/Di/DependencyInjectionInterface.php | 2 +-
.../zendframework/library/Zend/Di/Di.php | 106 +--
.../library/Zend/Di/Display/Console.php | 10 +-
.../Exception/CircularDependencyException.php | 2 +-
.../Di/Exception/ClassNotFoundException.php | 2 +-
.../Zend/Di/Exception/ExceptionInterface.php | 2 +-
.../Di/Exception/InvalidArgumentException.php | 2 +-
.../Di/Exception/InvalidCallbackException.php | 2 +-
.../Exception/InvalidParamNameException.php | 2 +-
.../Di/Exception/InvalidPositionException.php | 2 +-
.../Di/Exception/MissingPropertyException.php | 2 +-
.../Zend/Di/Exception/RuntimeException.php | 2 +-
.../Exception/UndefinedReferenceException.php | 2 +-
.../library/Zend/Di/InstanceManager.php | 7 +-
.../library/Zend/Di/LocatorInterface.php | 2 +-
.../library/Zend/Di/ServiceLocator.php | 2 +-
.../DependencyInjectorProxy.php | 2 +-
.../Zend/Di/ServiceLocator/Generator.php | 2 +-
.../Di/ServiceLocator/GeneratorInstance.php | 2 +-
.../Zend/Di/ServiceLocatorInterface.php | 2 +-
.../library/Zend/Di/composer.json | 13 +-
.../library/Zend/Dom/CONTRIBUTING.md | 3 +
.../library/Zend/Dom/Css2Xpath.php | 112 +--
.../library/Zend/Dom/DOMXPath.php | 70 ++
.../library/Zend/Dom/Document.php | 310 +++++++
.../library/Zend/Dom/Document/NodeList.php | 160 ++++
.../library/Zend/Dom/Document/Query.php | 169 ++++
.../Dom/Exception/BadMethodCallException.php | 2 +-
.../Zend/Dom/Exception/ExceptionInterface.php | 2 +-
.../Zend/Dom/Exception/RuntimeException.php | 2 +-
.../library/Zend/Dom/NodeList.php | 8 +-
.../zendframework/library/Zend/Dom/Query.php | 18 +-
.../library/Zend/Dom/composer.json | 8 +-
.../library/Zend/Escaper/CONTRIBUTING.md | 3 +
.../library/Zend/Escaper/Escaper.php | 6 +-
.../Escaper/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Escaper/Exception/RuntimeException.php | 2 +-
.../library/Zend/Escaper/composer.json | 7 +-
.../AbstractListenerAggregate.php | 3 +-
.../library/Zend/EventManager/CONTRIBUTING.md | 3 +
.../library/Zend/EventManager/Event.php | 8 +-
.../Zend/EventManager/EventInterface.php | 2 +-
.../Zend/EventManager/EventManager.php | 4 +-
.../EventManagerAwareInterface.php | 2 +-
.../EventManager/EventManagerAwareTrait.php | 65 +-
.../EventManager/EventManagerInterface.php | 4 +-
.../EventManager/EventsCapableInterface.php | 2 +-
.../Exception/DomainException.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/InvalidCallbackException.php | 2 +-
.../EventManager/Filter/FilterInterface.php | 2 +-
.../EventManager/Filter/FilterIterator.php | 2 +-
.../library/Zend/EventManager/FilterChain.php | 2 +-
.../Zend/EventManager/GlobalEventManager.php | 2 +-
.../ListenerAggregateInterface.php | 2 +-
.../EventManager/ListenerAggregateTrait.php | 2 +-
.../Zend/EventManager/ProvidesEvents.php | 54 +-
.../Zend/EventManager/ResponseCollection.php | 2 +-
.../SharedEventAggregateAwareInterface.php | 3 +-
.../Zend/EventManager/SharedEventManager.php | 4 +-
.../SharedEventManagerAwareInterface.php | 2 +-
.../SharedEventManagerInterface.php | 4 +-
.../SharedListenerAggregateInterface.php | 4 +-
.../Zend/EventManager/StaticEventManager.php | 3 +-
.../library/Zend/EventManager/composer.json | 7 +-
.../library/Zend/Feed/CONTRIBUTING.md | 3 +
.../Feed/Exception/BadMethodCallException.php | 9 +-
.../Feed/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Zend/Feed/Exception/RuntimeException.php | 9 +-
.../Feed/PubSubHubbub/AbstractCallback.php | 2 +-
.../Feed/PubSubHubbub/CallbackInterface.php | 2 +-
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Exception/RuntimeException.php | 9 +-
.../Zend/Feed/PubSubHubbub/HttpResponse.php | 2 +-
.../Feed/PubSubHubbub/Model/AbstractModel.php | 2 +-
.../Feed/PubSubHubbub/Model/Subscription.php | 2 +-
.../SubscriptionPersistenceInterface.php | 4 +-
.../Zend/Feed/PubSubHubbub/PubSubHubbub.php | 4 +-
.../Zend/Feed/PubSubHubbub/Publisher.php | 2 +-
.../Zend/Feed/PubSubHubbub/Subscriber.php | 2 +-
.../Feed/PubSubHubbub/Subscriber/Callback.php | 2 +-
.../Zend/Feed/PubSubHubbub/Version.php | 2 +-
.../Zend/Feed/Reader/AbstractEntry.php | 2 +-
.../library/Zend/Feed/Reader/AbstractFeed.php | 8 +-
.../library/Zend/Feed/Reader/Collection.php | 3 +-
.../Reader/Collection/AbstractCollection.php | 4 +-
.../Zend/Feed/Reader/Collection/Author.php | 3 +-
.../Zend/Feed/Reader/Collection/Category.php | 3 +-
.../Feed/Reader/Collection/Collection.php | 3 +-
.../Zend/Feed/Reader/Entry/AbstractEntry.php | 2 +-
.../library/Zend/Feed/Reader/Entry/Atom.php | 2 +-
.../Zend/Feed/Reader/Entry/EntryInterface.php | 2 +-
.../library/Zend/Feed/Reader/Entry/Rss.php | 3 +-
.../Exception/BadMethodCallException.php | 9 +-
.../Reader/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Reader/Exception/RuntimeException.php | 9 +-
.../Feed/Reader/Extension/AbstractEntry.php | 2 +-
.../Feed/Reader/Extension/AbstractFeed.php | 3 +-
.../Zend/Feed/Reader/Extension/Atom/Entry.php | 6 +-
.../Zend/Feed/Reader/Extension/Atom/Feed.php | 2 +-
.../Feed/Reader/Extension/Content/Entry.php | 3 +-
.../Extension/CreativeCommons/Entry.php | 5 +-
.../Reader/Extension/CreativeCommons/Feed.php | 3 +-
.../Reader/Extension/DublinCore/Entry.php | 3 +-
.../Feed/Reader/Extension/DublinCore/Feed.php | 2 +-
.../Feed/Reader/Extension/Podcast/Entry.php | 2 +-
.../Feed/Reader/Extension/Podcast/Feed.php | 5 +-
.../Feed/Reader/Extension/Slash/Entry.php | 5 +-
.../Reader/Extension/Syndication/Feed.php | 12 +-
.../Feed/Reader/Extension/Thread/Entry.php | 2 +-
.../Reader/Extension/WellFormedWeb/Entry.php | 2 +-
.../Zend/Feed/Reader/ExtensionManager.php | 2 +-
.../Feed/Reader/ExtensionManagerInterface.php | 2 +-
.../Feed/Reader/ExtensionPluginManager.php | 2 +-
.../Zend/Feed/Reader/Feed/AbstractFeed.php | 8 +-
.../library/Zend/Feed/Reader/Feed/Atom.php | 4 +-
.../Zend/Feed/Reader/Feed/Atom/Source.php | 31 +-
.../Zend/Feed/Reader/Feed/FeedInterface.php | 3 +-
.../library/Zend/Feed/Reader/Feed/Rss.php | 5 +-
.../library/Zend/Feed/Reader/FeedSet.php | 3 +-
.../Zend/Feed/Reader/Http/ClientInterface.php | 2 +-
.../Feed/Reader/Http/ResponseInterface.php | 2 +-
.../library/Zend/Feed/Reader/Reader.php | 11 +-
.../zendframework/library/Zend/Feed/Uri.php | 2 +-
.../library/Zend/Feed/Writer/AbstractFeed.php | 4 +-
.../library/Zend/Feed/Writer/Deleted.php | 3 +-
.../library/Zend/Feed/Writer/Entry.php | 5 +-
.../Exception/BadMethodCallException.php | 9 +-
.../Writer/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Writer/Exception/RuntimeException.php | 9 +-
.../Writer/Extension/AbstractRenderer.php | 2 +-
.../Writer/Extension/Atom/Renderer/Feed.php | 3 +-
.../Extension/Content/Renderer/Entry.php | 3 +-
.../Extension/DublinCore/Renderer/Entry.php | 3 +-
.../Extension/DublinCore/Renderer/Feed.php | 3 +-
.../Feed/Writer/Extension/ITunes/Entry.php | 2 +-
.../Feed/Writer/Extension/ITunes/Feed.php | 2 +-
.../Extension/ITunes/Renderer/Entry.php | 2 +-
.../Writer/Extension/ITunes/Renderer/Feed.php | 3 +-
.../Writer/Extension/RendererInterface.php | 2 +-
.../Writer/Extension/Slash/Renderer/Entry.php | 3 +-
.../Extension/Threading/Renderer/Entry.php | 3 +-
.../WellFormedWeb/Renderer/Entry.php | 3 +-
.../Zend/Feed/Writer/ExtensionManager.php | 4 +-
.../Feed/Writer/ExtensionManagerInterface.php | 2 +-
.../Feed/Writer/ExtensionPluginManager.php | 2 +-
.../library/Zend/Feed/Writer/Feed.php | 3 +-
.../library/Zend/Feed/Writer/FeedFactory.php | 2 +-
.../Feed/Writer/Renderer/AbstractRenderer.php | 2 +-
.../Zend/Feed/Writer/Renderer/Entry/Atom.php | 9 +-
.../Writer/Renderer/Entry/Atom/Deleted.php | 4 +-
.../Writer/Renderer/Entry/AtomDeleted.php | 4 +-
.../Zend/Feed/Writer/Renderer/Entry/Rss.php | 2 +-
.../Writer/Renderer/Feed/AbstractAtom.php | 4 +-
.../Zend/Feed/Writer/Renderer/Feed/Atom.php | 2 +-
.../Renderer/Feed/Atom/AbstractAtom.php | 5 +-
.../Feed/Writer/Renderer/Feed/Atom/Source.php | 3 +-
.../Feed/Writer/Renderer/Feed/AtomSource.php | 3 +-
.../Zend/Feed/Writer/Renderer/Feed/Rss.php | 2 +-
.../Writer/Renderer/RendererInterface.php | 2 +-
.../library/Zend/Feed/Writer/Source.php | 2 +-
.../library/Zend/Feed/Writer/Version.php | 2 +-
.../library/Zend/Feed/Writer/Writer.php | 2 +-
.../library/Zend/Feed/composer.json | 16 +-
.../library/Zend/File/CONTRIBUTING.md | 3 +
.../library/Zend/File/ClassFileLocator.php | 7 +-
.../File/Exception/BadMethodCallException.php | 8 +-
.../File/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 6 +-
.../Zend/File/Exception/RuntimeException.php | 9 +-
.../library/Zend/File/PhpClassFile.php | 2 +-
.../File/Transfer/Adapter/AbstractAdapter.php | 20 +-
.../Transfer/Adapter/FilterPluginManager.php | 2 +-
.../Zend/File/Transfer/Adapter/Http.php | 3 +-
.../Adapter/ValidatorPluginManager.php | 2 +-
.../Exception/BadMethodCallException.php | 8 +-
.../Transfer/Exception/ExceptionInterface.php | 6 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../Exception/PhpEnvironmentException.php | 5 +-
.../Transfer/Exception/RuntimeException.php | 8 +-
.../library/Zend/File/Transfer/Transfer.php | 2 +-
.../library/Zend/File/composer.json | 17 +-
.../library/Zend/Filter/AbstractFilter.php | 14 +-
.../library/Zend/Filter/AbstractUnicode.php | 2 +-
.../library/Zend/Filter/BaseName.php | 18 +-
.../library/Zend/Filter/Boolean.php | 7 +-
.../library/Zend/Filter/CONTRIBUTING.md | 3 +
.../library/Zend/Filter/Callback.php | 4 +-
.../library/Zend/Filter/Compress.php | 6 +-
.../Compress/AbstractCompressionAlgorithm.php | 2 +-
.../library/Zend/Filter/Compress/Bz2.php | 2 +-
.../CompressionAlgorithmInterface.php | 2 +-
.../library/Zend/Filter/Compress/Gz.php | 2 +-
.../library/Zend/Filter/Compress/Lzf.php | 2 +-
.../library/Zend/Filter/Compress/Rar.php | 2 +-
.../library/Zend/Filter/Compress/Snappy.php | 2 +-
.../library/Zend/Filter/Compress/Tar.php | 20 +-
.../library/Zend/Filter/Compress/Zip.php | 53 +-
.../library/Zend/Filter/DateTimeFormatter.php | 20 +-
.../library/Zend/Filter/Decompress.php | 8 +-
.../library/Zend/Filter/Decrypt.php | 6 +-
.../library/Zend/Filter/Digits.php | 23 +-
.../zendframework/library/Zend/Filter/Dir.php | 9 +-
.../library/Zend/Filter/Encrypt.php | 18 +-
.../Zend/Filter/Encrypt/BlockCipher.php | 4 +-
.../Encrypt/EncryptionAlgorithmInterface.php | 2 +-
.../library/Zend/Filter/Encrypt/Openssl.php | 4 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Zend/Filter/Exception/DomainException.php | 2 +-
.../Filter/Exception/ExceptionInterface.php | 2 +-
.../Exception/ExtensionNotLoadedException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Filter/Exception/RuntimeException.php | 2 +-
.../library/Zend/Filter/File/Decrypt.php | 15 +-
.../library/Zend/Filter/File/Encrypt.php | 15 +-
.../library/Zend/Filter/File/LowerCase.php | 15 +-
.../library/Zend/Filter/File/Rename.php | 21 +-
.../library/Zend/Filter/File/RenameUpload.php | 18 +-
.../library/Zend/Filter/File/UpperCase.php | 15 +-
.../library/Zend/Filter/FilterChain.php | 7 +-
.../library/Zend/Filter/FilterInterface.php | 2 +-
.../Zend/Filter/FilterPluginManager.php | 3 +-
.../library/Zend/Filter/HtmlEntities.php | 25 +-
.../library/Zend/Filter/Inflector.php | 4 +-
.../zendframework/library/Zend/Filter/Int.php | 18 +-
.../library/Zend/Filter/Null.php | 2 +-
.../library/Zend/Filter/PregReplace.php | 10 +-
.../library/Zend/Filter/RealPath.php | 19 +-
.../library/Zend/Filter/StaticFilter.php | 2 +-
.../library/Zend/Filter/StringToLower.php | 20 +-
.../library/Zend/Filter/StringToUpper.php | 20 +-
.../library/Zend/Filter/StringTrim.php | 16 +-
.../library/Zend/Filter/StripNewlines.php | 10 +-
.../library/Zend/Filter/StripTags.php | 23 +-
.../library/Zend/Filter/UriNormalize.php | 8 +-
.../Zend/Filter/Word/AbstractSeparator.php | 3 +-
.../Zend/Filter/Word/CamelCaseToDash.php | 2 +-
.../Zend/Filter/Word/CamelCaseToSeparator.php | 10 +-
.../Filter/Word/CamelCaseToUnderscore.php | 2 +-
.../Zend/Filter/Word/DashToCamelCase.php | 2 +-
.../Zend/Filter/Word/DashToSeparator.php | 10 +-
.../Zend/Filter/Word/DashToUnderscore.php | 2 +-
.../Zend/Filter/Word/SeparatorToCamelCase.php | 10 +-
.../Zend/Filter/Word/SeparatorToDash.php | 2 +-
.../Zend/Filter/Word/SeparatorToSeparator.php | 10 +-
.../Filter/Word/UnderscoreToCamelCase.php | 2 +-
.../Zend/Filter/Word/UnderscoreToDash.php | 2 +-
.../Filter/Word/UnderscoreToSeparator.php | 2 +-
.../library/Zend/Filter/composer.json | 17 +-
.../AbstractAnnotationsListener.php | 2 +-
.../Annotation/AbstractArrayAnnotation.php | 2 +-
.../AbstractArrayOrStringAnnotation.php | 2 +-
.../Annotation/AbstractStringAnnotation.php | 2 +-
.../Zend/Form/Annotation/AllowEmpty.php | 2 +-
.../Form/Annotation/AnnotationBuilder.php | 19 +-
.../Zend/Form/Annotation/Attributes.php | 2 +-
.../Zend/Form/Annotation/ComposedObject.php | 27 +-
.../Annotation/ElementAnnotationsListener.php | 79 +-
.../Zend/Form/Annotation/ErrorMessage.php | 2 +-
.../library/Zend/Form/Annotation/Exclude.php | 2 +-
.../library/Zend/Form/Annotation/Filter.php | 2 +-
.../library/Zend/Form/Annotation/Flags.php | 2 +-
.../Annotation/FormAnnotationsListener.php | 2 +-
.../library/Zend/Form/Annotation/Hydrator.php | 2 +-
.../library/Zend/Form/Annotation/Input.php | 2 +-
.../Zend/Form/Annotation/InputFilter.php | 2 +-
.../library/Zend/Form/Annotation/Name.php | 2 +-
.../library/Zend/Form/Annotation/Object.php | 5 +-
.../library/Zend/Form/Annotation/Options.php | 2 +-
.../library/Zend/Form/Annotation/Required.php | 2 +-
.../library/Zend/Form/Annotation/Type.php | 2 +-
.../Zend/Form/Annotation/ValidationGroup.php | 4 +-
.../Zend/Form/Annotation/Validator.php | 2 +-
.../library/Zend/Form/CONTRIBUTING.md | 3 +
.../library/Zend/Form/Element.php | 150 +++-
.../library/Zend/Form/Element/Button.php | 2 +-
.../library/Zend/Form/Element/Captcha.php | 2 +-
.../library/Zend/Form/Element/Checkbox.php | 11 +-
.../library/Zend/Form/Element/Collection.php | 79 +-
.../library/Zend/Form/Element/Color.php | 4 +-
.../library/Zend/Form/Element/Csrf.php | 2 +-
.../library/Zend/Form/Element/Date.php | 5 +-
.../library/Zend/Form/Element/DateSelect.php | 19 +-
.../library/Zend/Form/Element/DateTime.php | 2 +-
.../Zend/Form/Element/DateTimeLocal.php | 2 +-
.../Zend/Form/Element/DateTimeSelect.php | 33 +-
.../library/Zend/Form/Element/Email.php | 3 +-
.../library/Zend/Form/Element/File.php | 2 +-
.../library/Zend/Form/Element/Hidden.php | 2 +-
.../library/Zend/Form/Element/Image.php | 2 +-
.../library/Zend/Form/Element/Month.php | 3 +-
.../library/Zend/Form/Element/MonthSelect.php | 15 +-
.../Zend/Form/Element/MultiCheckbox.php | 47 +-
.../library/Zend/Form/Element/Number.php | 12 +-
.../library/Zend/Form/Element/Password.php | 2 +-
.../library/Zend/Form/Element/Radio.php | 4 +-
.../library/Zend/Form/Element/Range.php | 3 +-
.../library/Zend/Form/Element/Select.php | 113 ++-
.../library/Zend/Form/Element/Submit.php | 2 +-
.../library/Zend/Form/Element/Text.php | 2 +-
.../library/Zend/Form/Element/Textarea.php | 2 +-
.../library/Zend/Form/Element/Time.php | 3 +-
.../library/Zend/Form/Element/Url.php | 2 +-
.../library/Zend/Form/Element/Week.php | 3 +-
.../Form/ElementAttributeRemovalInterface.php | 2 +-
.../library/Zend/Form/ElementInterface.php | 11 +-
.../Form/ElementPrepareAwareInterface.php | 2 +-
.../Form/Exception/BadMethodCallException.php | 9 +-
.../Zend/Form/Exception/DomainException.php | 5 +-
.../Form/Exception/ExceptionInterface.php | 5 +-
.../Exception/ExtensionNotLoadedException.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Exception/InvalidElementException.php | 5 +-
.../Exception/UnexpectedValueException.php | 5 +-
.../library/Zend/Form/Factory.php | 10 +-
.../library/Zend/Form/Fieldset.php | 73 +-
.../library/Zend/Form/FieldsetInterface.php | 2 +-
.../Form/FieldsetPrepareAwareInterface.php | 2 +-
.../zendframework/library/Zend/Form/Form.php | 66 +-
.../Zend/Form/FormAbstractServiceFactory.php | 2 +-
.../library/Zend/Form/FormElementManager.php | 23 +-
.../Zend/Form/FormFactoryAwareInterface.php | 2 +-
.../Zend/Form/FormFactoryAwareTrait.php | 3 +-
.../library/Zend/Form/FormInterface.php | 2 +-
.../Zend/Form/InputFilterProviderFieldset.php | 58 ++
.../library/Zend/Form/LabelAwareInterface.php | 108 +++
.../library/Zend/Form/LabelAwareTrait.php | 161 ++++
.../Zend/Form/View/Helper/AbstractHelper.php | 5 +-
.../Form/View/Helper/Captcha/AbstractWord.php | 2 +-
.../Zend/Form/View/Helper/Captcha/Dumb.php | 2 +-
.../Zend/Form/View/Helper/Captcha/Figlet.php | 2 +-
.../Zend/Form/View/Helper/Captcha/Image.php | 2 +-
.../Form/View/Helper/Captcha/ReCaptcha.php | 2 +-
.../View/Helper/File/FormFileApcProgress.php | 2 +-
.../Helper/File/FormFileSessionProgress.php | 2 +-
.../Helper/File/FormFileUploadProgress.php | 13 +-
.../library/Zend/Form/View/Helper/Form.php | 6 +-
.../Zend/Form/View/Helper/FormButton.php | 23 +-
.../Zend/Form/View/Helper/FormCaptcha.php | 2 +-
.../Zend/Form/View/Helper/FormCheckbox.php | 2 +-
.../Zend/Form/View/Helper/FormCollection.php | 153 +++-
.../Zend/Form/View/Helper/FormColor.php | 2 +-
.../Zend/Form/View/Helper/FormDate.php | 2 +-
.../Zend/Form/View/Helper/FormDateSelect.php | 2 +-
.../Zend/Form/View/Helper/FormDateTime.php | 2 +-
.../Form/View/Helper/FormDateTimeLocal.php | 2 +-
.../Form/View/Helper/FormDateTimeSelect.php | 5 +-
.../Zend/Form/View/Helper/FormElement.php | 287 +++---
.../Form/View/Helper/FormElementErrors.php | 8 +-
.../Zend/Form/View/Helper/FormEmail.php | 2 +-
.../Zend/Form/View/Helper/FormFile.php | 2 +-
.../Zend/Form/View/Helper/FormHidden.php | 2 +-
.../Zend/Form/View/Helper/FormImage.php | 2 +-
.../Zend/Form/View/Helper/FormInput.php | 2 +-
.../Zend/Form/View/Helper/FormLabel.php | 28 +-
.../Zend/Form/View/Helper/FormMonth.php | 2 +-
.../Zend/Form/View/Helper/FormMonthSelect.php | 2 +-
.../Form/View/Helper/FormMultiCheckbox.php | 27 +-
.../Zend/Form/View/Helper/FormNumber.php | 2 +-
.../Zend/Form/View/Helper/FormPassword.php | 2 +-
.../Zend/Form/View/Helper/FormRadio.php | 2 +-
.../Zend/Form/View/Helper/FormRange.php | 2 +-
.../Zend/Form/View/Helper/FormReset.php | 2 +-
.../library/Zend/Form/View/Helper/FormRow.php | 44 +-
.../Zend/Form/View/Helper/FormSearch.php | 2 +-
.../Zend/Form/View/Helper/FormSelect.php | 65 +-
.../Zend/Form/View/Helper/FormSubmit.php | 2 +-
.../library/Zend/Form/View/Helper/FormTel.php | 2 +-
.../Zend/Form/View/Helper/FormText.php | 2 +-
.../Zend/Form/View/Helper/FormTextarea.php | 27 +-
.../Zend/Form/View/Helper/FormTime.php | 2 +-
.../library/Zend/Form/View/Helper/FormUrl.php | 2 +-
.../Zend/Form/View/Helper/FormWeek.php | 2 +-
.../library/Zend/Form/View/HelperConfig.php | 4 +-
.../library/Zend/Form/composer.json | 24 +-
.../library/Zend/Http/AbstractMessage.php | 2 +-
.../library/Zend/Http/CONTRIBUTING.md | 3 +
.../library/Zend/Http/Client.php | 57 +-
.../Http/Client/Adapter/AdapterInterface.php | 2 +-
.../library/Zend/Http/Client/Adapter/Curl.php | 26 +-
.../Adapter/Exception/ExceptionInterface.php | 5 +-
.../Exception/InitializationException.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Adapter/Exception/OutOfRangeException.php | 5 +-
.../Adapter/Exception/RuntimeException.php | 5 +-
.../Adapter/Exception/TimeoutException.php | 2 +-
.../Zend/Http/Client/Adapter/Proxy.php | 24 +-
.../Zend/Http/Client/Adapter/Socket.php | 76 +-
.../Http/Client/Adapter/StreamInterface.php | 2 +-
.../library/Zend/Http/Client/Adapter/Test.php | 22 +-
.../library/Zend/Http/Client/Cookies.php | 499 -----------
.../Client/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Client/Exception/OutOfRangeException.php | 5 +-
.../Client/Exception/RuntimeException.php | 5 +-
.../library/Zend/Http/ClientStatic.php | 4 +-
.../library/Zend/Http/Cookies.php | 16 +-
.../Http/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Http/Exception/OutOfRangeException.php | 8 +-
.../Zend/Http/Exception/RuntimeException.php | 2 +-
.../Zend/Http/Header/AbstractAccept.php | 54 +-
.../library/Zend/Http/Header/AbstractDate.php | 2 +-
.../Zend/Http/Header/AbstractLocation.php | 10 +-
.../library/Zend/Http/Header/Accept.php | 2 +-
.../FieldValuePart/AbstractFieldValuePart.php | 5 +-
.../FieldValuePart/AcceptFieldValuePart.php | 3 +-
.../FieldValuePart/CharsetFieldValuePart.php | 3 +-
.../FieldValuePart/EncodingFieldValuePart.php | 5 +-
.../FieldValuePart/LanguageFieldValuePart.php | 3 +-
.../Zend/Http/Header/AcceptCharset.php | 2 +-
.../Zend/Http/Header/AcceptEncoding.php | 3 +-
.../Zend/Http/Header/AcceptLanguage.php | 3 +-
.../library/Zend/Http/Header/AcceptRanges.php | 14 +-
.../library/Zend/Http/Header/Age.php | 15 +-
.../library/Zend/Http/Header/Allow.php | 15 +-
.../Zend/Http/Header/AuthenticationInfo.php | 13 +-
.../Zend/Http/Header/Authorization.php | 13 +-
.../library/Zend/Http/Header/CacheControl.php | 13 +-
.../library/Zend/Http/Header/Connection.php | 4 +-
.../Zend/Http/Header/ContentDisposition.php | 13 +-
.../Zend/Http/Header/ContentEncoding.php | 13 +-
.../Zend/Http/Header/ContentLanguage.php | 13 +-
.../Zend/Http/Header/ContentLength.php | 13 +-
.../Zend/Http/Header/ContentLocation.php | 2 +-
.../library/Zend/Http/Header/ContentMD5.php | 13 +-
.../library/Zend/Http/Header/ContentRange.php | 13 +-
.../Http/Header/ContentSecurityPolicy.php | 150 ++++
.../Http/Header/ContentTransferEncoding.php | 14 +-
.../library/Zend/Http/Header/ContentType.php | 358 +++++++-
.../library/Zend/Http/Header/Cookie.php | 5 +-
.../library/Zend/Http/Header/Date.php | 2 +-
.../library/Zend/Http/Header/Etag.php | 13 +-
.../Http/Header/Exception/DomainException.php | 14 +
.../Header/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Header/Exception/RuntimeException.php | 2 +-
.../library/Zend/Http/Header/Expect.php | 13 +-
.../library/Zend/Http/Header/Expires.php | 2 +-
.../library/Zend/Http/Header/From.php | 13 +-
.../Zend/Http/Header/GenericHeader.php | 2 +-
.../Zend/Http/Header/GenericMultiHeader.php | 2 +-
.../Zend/Http/Header/HeaderInterface.php | 2 +-
.../library/Zend/Http/Header/Host.php | 13 +-
.../library/Zend/Http/Header/IfMatch.php | 13 +-
.../Zend/Http/Header/IfModifiedSince.php | 2 +-
.../library/Zend/Http/Header/IfNoneMatch.php | 13 +-
.../library/Zend/Http/Header/IfRange.php | 13 +-
.../Zend/Http/Header/IfUnmodifiedSince.php | 2 +-
.../library/Zend/Http/Header/KeepAlive.php | 13 +-
.../library/Zend/Http/Header/LastModified.php | 2 +-
.../library/Zend/Http/Header/Location.php | 3 +-
.../library/Zend/Http/Header/MaxForwards.php | 13 +-
.../Http/Header/MultipleHeaderInterface.php | 2 +-
.../library/Zend/Http/Header/Origin.php | 64 ++
.../library/Zend/Http/Header/Pragma.php | 13 +-
.../Zend/Http/Header/ProxyAuthenticate.php | 13 +-
.../Zend/Http/Header/ProxyAuthorization.php | 13 +-
.../library/Zend/Http/Header/Range.php | 13 +-
.../library/Zend/Http/Header/Referer.php | 2 +-
.../library/Zend/Http/Header/Refresh.php | 13 +-
.../library/Zend/Http/Header/RetryAfter.php | 2 +-
.../library/Zend/Http/Header/Server.php | 13 +-
.../library/Zend/Http/Header/SetCookie.php | 113 +--
.../library/Zend/Http/Header/TE.php | 13 +-
.../library/Zend/Http/Header/Trailer.php | 13 +-
.../Zend/Http/Header/TransferEncoding.php | 13 +-
.../library/Zend/Http/Header/Upgrade.php | 13 +-
.../library/Zend/Http/Header/UserAgent.php | 13 +-
.../library/Zend/Http/Header/Vary.php | 13 +-
.../library/Zend/Http/Header/Via.php | 13 +-
.../Zend/Http/Header/WWWAuthenticate.php | 13 +-
.../library/Zend/Http/Header/Warning.php | 13 +-
.../library/Zend/Http/HeaderLoader.php | 3 +-
.../library/Zend/Http/Headers.php | 6 +-
.../Http/PhpEnvironment/RemoteAddress.php | 3 +-
.../Zend/Http/PhpEnvironment/Request.php | 29 +-
.../Zend/Http/PhpEnvironment/Response.php | 2 +-
.../library/Zend/Http/Request.php | 4 +-
.../library/Zend/Http/Response.php | 46 +-
.../library/Zend/Http/Response/Stream.php | 7 +-
.../library/Zend/Http/composer.json | 7 +-
.../library/Zend/I18n/CONTRIBUTING.md | 3 +
.../I18n/Exception/ExceptionInterface.php | 5 +-
.../Exception/ExtensionNotLoadedException.php | 8 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../I18n/Exception/OutOfBoundsException.php | 8 +-
.../Zend/I18n/Exception/ParseException.php | 5 +-
.../Zend/I18n/Exception/RangeException.php | 5 +-
.../Zend/I18n/Exception/RuntimeException.php | 5 +-
.../Zend/I18n/Filter/AbstractLocale.php | 2 +-
.../library/Zend/I18n/Filter/Alnum.php | 12 +-
.../library/Zend/I18n/Filter/Alpha.php | 12 +-
.../library/Zend/I18n/Filter/NumberFormat.php | 144 +--
.../library/Zend/I18n/Filter/NumberParse.php | 162 ++++
.../Translator/Loader/AbstractFileLoader.php | 82 ++
.../Translator/Loader/FileLoaderInterface.php | 2 +-
.../Zend/I18n/Translator/Loader/Gettext.php | 15 +-
.../Zend/I18n/Translator/Loader/Ini.php | 14 +-
.../Zend/I18n/Translator/Loader/PhpArray.php | 12 +-
.../I18n/Translator/Loader/PhpMemoryArray.php | 74 ++
.../Loader/RemoteLoaderInterface.php | 2 +-
.../I18n/Translator/LoaderPluginManager.php | 35 +-
.../Zend/I18n/Translator/Plural/Parser.php | 11 +-
.../Zend/I18n/Translator/Plural/Rule.php | 9 +-
.../Zend/I18n/Translator/Plural/Symbol.php | 10 +-
.../Zend/I18n/Translator/TextDomain.php | 50 +-
.../Zend/I18n/Translator/Translator.php | 10 +-
.../Translator/TranslatorAwareInterface.php | 15 +-
.../I18n/Translator/TranslatorAwareTrait.php | 17 +-
.../I18n/Translator/TranslatorInterface.php | 44 +
.../Translator/TranslatorServiceFactory.php | 2 +-
.../library/Zend/I18n/Validator/Alnum.php | 2 +-
.../library/Zend/I18n/Validator/Alpha.php | 2 +-
.../library/Zend/I18n/Validator/DateTime.php | 62 +-
.../library/Zend/I18n/Validator/Float.php | 162 +++-
.../library/Zend/I18n/Validator/Int.php | 23 +-
.../Zend/I18n/Validator/PhoneNumber.php | 7 +-
.../Zend/I18n/Validator/PhoneNumber/AC.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AD.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AF.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AI.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AL.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AS.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AT.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AU.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AW.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AX.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/AZ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BB.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BD.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BF.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BH.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BI.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BJ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BL.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BN.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BQ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BS.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BT.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BW.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BY.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/BZ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CC.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CD.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CF.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CH.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CI.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CK.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CL.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CN.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CU.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CV.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CW.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CX.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CY.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/CZ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/DE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/DJ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/DK.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/DM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/DO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/DZ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/EC.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/EE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/EG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/EH.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/ER.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/ES.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/ET.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/FI.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/FJ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/FK.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/FM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/FO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/FR.php | 4 +-
.../Zend/I18n/Validator/PhoneNumber/GA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GB.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GD.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GF.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GH.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GI.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GL.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GN.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GP.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GQ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GT.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GU.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GW.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/GY.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/HK.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/HN.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/HR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/HT.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/HU.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/ID.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/IE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/IL.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/IM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/IN.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/IO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/IQ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/IR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/IS.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/IT.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/JE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/JM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/JO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/JP.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/KE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/KG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/KH.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/KI.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/KM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/KN.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/KP.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/KR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/KW.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/KY.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/KZ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/LA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/LB.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/LC.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/LI.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/LK.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/LR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/LS.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/LT.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/LU.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/LV.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/LY.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MC.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MD.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/ME.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MF.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MH.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MK.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/ML.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MN.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MP.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MQ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MS.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MT.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MU.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MV.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MW.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MX.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MY.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/MZ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/NA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/NC.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/NE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/NF.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/NG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/NI.php | 4 +-
.../Zend/I18n/Validator/PhoneNumber/NL.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/NO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/NP.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/NR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/NU.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/NZ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/OM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PF.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PH.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PK.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PL.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PS.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PT.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PW.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/PY.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/QA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/RE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/RO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/RS.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/RU.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/RW.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SB.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SC.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SD.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SH.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SI.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SJ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SK.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SL.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SN.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SS.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/ST.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SV.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SX.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SY.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/SZ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TC.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TD.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TH.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TJ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TK.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TL.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TN.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TO.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TR.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TT.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TV.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TW.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/TZ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/UA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/UG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/US.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/UY.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/UZ.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/VA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/VC.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/VE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/VG.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/VI.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/VN.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/VU.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/WF.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/WS.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/YE.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/YT.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/ZA.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/ZM.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber/ZW.php | 2 +-
.../library/Zend/I18n/Validator/PostCode.php | 2 +-
.../View/Helper/AbstractTranslatorHelper.php | 4 +-
.../Zend/I18n/View/Helper/CurrencyFormat.php | 11 +-
.../Zend/I18n/View/Helper/DateFormat.php | 11 +-
.../Zend/I18n/View/Helper/NumberFormat.php | 8 +-
.../library/Zend/I18n/View/Helper/Plural.php | 4 +-
.../Zend/I18n/View/Helper/Translate.php | 2 +-
.../Zend/I18n/View/Helper/TranslatePlural.php | 5 +-
.../library/Zend/I18n/View/HelperConfig.php | 2 +-
.../library/Zend/I18n/composer.json | 19 +-
.../library/Zend/InputFilter/ArrayInput.php | 7 +-
.../Zend/InputFilter/BaseInputFilter.php | 22 +-
.../library/Zend/InputFilter/CONTRIBUTING.md | 3 +
.../InputFilter/CollectionInputFilter.php | 119 +--
.../InputFilter/EmptyContextInterface.php | 2 +-
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../Exception/RuntimeException.php | 5 +-
.../library/Zend/InputFilter/Factory.php | 17 +-
.../library/Zend/InputFilter/FileInput.php | 2 +-
.../library/Zend/InputFilter/Input.php | 30 +-
.../library/Zend/InputFilter/InputFilter.php | 2 +-
.../InputFilter/InputFilterAwareInterface.php | 2 +-
.../InputFilter/InputFilterAwareTrait.php | 3 +-
.../Zend/InputFilter/InputFilterInterface.php | 2 +-
.../InputFilter/InputFilterPluginManager.php | 6 +-
.../InputFilterProviderInterface.php | 2 +-
.../Zend/InputFilter/InputInterface.php | 2 +-
.../InputFilter/InputProviderInterface.php | 2 +-
.../InputFilter/ReplaceableInputInterface.php | 2 +-
.../UnknownInputsCapableInterface.php | 2 +-
.../library/Zend/InputFilter/composer.json | 10 +-
.../library/Zend/Json/CONTRIBUTING.md | 3 +
.../library/Zend/Json/Decoder.php | 191 ++--
.../library/Zend/Json/Encoder.php | 82 +-
.../Json/Exception/BadMethodCallException.php | 5 +-
.../Json/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Json/Exception/RecursionException.php | 5 +-
.../Zend/Json/Exception/RuntimeException.php | 5 +-
.../zendframework/library/Zend/Json/Expr.php | 2 +-
.../zendframework/library/Zend/Json/Json.php | 15 +-
.../library/Zend/Json/Server/Cache.php | 13 +-
.../library/Zend/Json/Server/Client.php | 6 +-
.../library/Zend/Json/Server/Error.php | 36 +-
.../Json/Server/Exception/ErrorException.php | 7 +-
.../Server/Exception/ExceptionInterface.php | 5 +-
.../Json/Server/Exception/HttpException.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Server/Exception/RuntimeException.php | 5 +-
.../library/Zend/Json/Server/Request.php | 4 +-
.../library/Zend/Json/Server/Request/Http.php | 2 +-
.../library/Zend/Json/Server/Response.php | 8 +-
.../Zend/Json/Server/Response/Http.php | 2 +-
.../library/Zend/Json/Server/Server.php | 5 +-
.../library/Zend/Json/Server/Smd.php | 2 +-
.../library/Zend/Json/Server/Smd/Service.php | 46 +-
.../library/Zend/Json/composer.json | 15 +-
.../library/Zend/Ldap/Attribute.php | 24 +-
.../library/Zend/Ldap/CONTRIBUTING.md | 3 +
.../library/Zend/Ldap/Collection.php | 2 +-
.../Zend/Ldap/Collection/DefaultIterator.php | 2 +-
.../library/Zend/Ldap/Converter/Converter.php | 3 +-
.../Exception/ConverterException.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../zendframework/library/Zend/Ldap/Dn.php | 2 +-
.../Ldap/Exception/BadMethodCallException.php | 2 +-
.../Ldap/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Zend/Ldap/Exception/LdapException.php | 2 +-
.../library/Zend/Ldap/Filter.php | 2 +-
.../Zend/Ldap/Filter/AbstractFilter.php | 2 +-
.../Ldap/Filter/AbstractLogicalFilter.php | 3 +-
.../library/Zend/Ldap/Filter/AndFilter.php | 2 +-
.../Filter/Exception/ExceptionInterface.php | 2 +-
.../Ldap/Filter/Exception/FilterException.php | 2 +-
.../library/Zend/Ldap/Filter/MaskFilter.php | 2 +-
.../library/Zend/Ldap/Filter/NotFilter.php | 2 +-
.../library/Zend/Ldap/Filter/OrFilter.php | 2 +-
.../library/Zend/Ldap/Filter/StringFilter.php | 2 +-
.../zendframework/library/Zend/Ldap/Ldap.php | 9 +-
.../library/Zend/Ldap/Ldif/Encoder.php | 2 +-
.../zendframework/library/Zend/Ldap/Node.php | 2 +-
.../library/Zend/Ldap/Node/AbstractNode.php | 2 +-
.../Zend/Ldap/Node/ChildrenIterator.php | 2 +-
.../library/Zend/Ldap/Node/Collection.php | 2 +-
.../library/Zend/Ldap/Node/RootDse.php | 2 +-
.../Ldap/Node/RootDse/ActiveDirectory.php | 2 +-
.../Zend/Ldap/Node/RootDse/OpenLdap.php | 2 +-
.../Zend/Ldap/Node/RootDse/eDirectory.php | 2 +-
.../library/Zend/Ldap/Node/Schema.php | 2 +-
.../Zend/Ldap/Node/Schema/AbstractItem.php | 2 +-
.../Zend/Ldap/Node/Schema/ActiveDirectory.php | 2 +-
.../Schema/AttributeType/ActiveDirectory.php | 7 +-
.../AttributeType/AttributeTypeInterface.php | 2 +-
.../Node/Schema/AttributeType/OpenLdap.php | 2 +-
.../Schema/ObjectClass/ActiveDirectory.php | 8 +-
.../ObjectClass/ObjectClassInterface.php | 2 +-
.../Ldap/Node/Schema/ObjectClass/OpenLdap.php | 3 +-
.../Zend/Ldap/Node/Schema/OpenLdap.php | 9 +-
.../library/Zend/Ldap/composer.json | 13 +-
.../library/Zend/Loader/AutoloaderFactory.php | 21 +-
.../library/Zend/Loader/CONTRIBUTING.md | 3 +
.../Zend/Loader/ClassMapAutoloader.php | 4 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Zend/Loader/Exception/DomainException.php | 5 +-
.../Loader/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../Loader/Exception/InvalidPathException.php | 5 +-
.../MissingResourceNamespaceException.php | 8 +-
.../Exception/PluginLoaderException.php | 2 +-
.../Loader/Exception/RuntimeException.php | 5 +-
.../Loader/Exception/SecurityException.php | 5 +-
.../library/Zend/Loader/ModuleAutoloader.php | 7 +-
.../library/Zend/Loader/PluginClassLoader.php | 2 +-
.../Zend/Loader/PluginClassLocator.php | 2 +-
.../library/Zend/Loader/ShortNameLocator.php | 2 +-
.../library/Zend/Loader/SplAutoloader.php | 6 +-
.../Zend/Loader/StandardAutoloader.php | 3 +-
.../library/Zend/Loader/composer.json | 7 +-
.../library/Zend/Log/CONTRIBUTING.md | 3 +
.../Zend/Log/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Zend/Log/Exception/RuntimeException.php | 9 +-
.../Zend/Log/Filter/FilterInterface.php | 2 +-
.../library/Zend/Log/Filter/Mock.php | 2 +-
.../library/Zend/Log/Filter/Priority.php | 8 +-
.../library/Zend/Log/Filter/Regex.php | 4 +-
.../library/Zend/Log/Filter/Sample.php | 56 ++
.../Zend/Log/Filter/SuppressFilter.php | 8 +-
.../library/Zend/Log/Filter/Validator.php | 2 +-
.../library/Zend/Log/Formatter/Base.php | 2 +-
.../library/Zend/Log/Formatter/ChromePhp.php | 2 +-
.../library/Zend/Log/Formatter/Db.php | 2 +-
.../Zend/Log/Formatter/ErrorHandler.php | 2 +-
.../Zend/Log/Formatter/ExceptionHandler.php | 8 +-
.../library/Zend/Log/Formatter/FirePhp.php | 2 +-
.../Zend/Log/Formatter/FormatterInterface.php | 2 +-
.../library/Zend/Log/Formatter/Simple.php | 2 +-
.../library/Zend/Log/Formatter/Xml.php | 2 +-
.../zendframework/library/Zend/Log/Logger.php | 79 +-
.../Zend/Log/LoggerAbstractServiceFactory.php | 31 +-
.../library/Zend/Log/LoggerAwareInterface.php | 17 +-
.../library/Zend/Log/LoggerAwareTrait.php | 13 +-
.../library/Zend/Log/LoggerInterface.php | 2 +-
.../library/Zend/Log/LoggerServiceFactory.php | 2 +-
.../library/Zend/Log/Processor/Backtrace.php | 12 +-
.../Zend/Log/Processor/ProcessorInterface.php | 3 +-
.../library/Zend/Log/Processor/RequestId.php | 6 +-
.../Zend/Log/ProcessorPluginManager.php | 6 +-
.../Zend/Log/Writer/AbstractWriter.php | 45 +-
.../library/Zend/Log/Writer/ChromePhp.php | 2 +-
.../Log/Writer/ChromePhp/ChromePhpBridge.php | 2 +-
.../Writer/ChromePhp/ChromePhpInterface.php | 2 +-
.../library/Zend/Log/Writer/Db.php | 12 +-
.../Zend/Log/Writer/FilterPluginManager.php | 2 +-
.../Zend/Log/Writer/FingersCrossed.php | 15 +-
.../library/Zend/Log/Writer/FirePhp.php | 3 +-
.../Zend/Log/Writer/FirePhp/FirePhpBridge.php | 2 +-
.../Log/Writer/FirePhp/FirePhpInterface.php | 2 +-
.../Log/Writer/FormatterPluginManager.php | 2 +-
.../library/Zend/Log/Writer/Mail.php | 11 +-
.../library/Zend/Log/Writer/Mock.php | 2 +-
.../library/Zend/Log/Writer/MongoDB.php | 10 +-
.../library/Zend/Log/Writer/Null.php | 5 +-
.../library/Zend/Log/Writer/Stream.php | 2 +-
.../library/Zend/Log/Writer/Syslog.php | 2 +-
.../Zend/Log/Writer/WriterInterface.php | 2 +-
.../library/Zend/Log/Writer/ZendMonitor.php | 2 +-
.../library/Zend/Log/WriterPluginManager.php | 2 +-
.../library/Zend/Log/composer.json | 16 +-
.../library/Zend/Mail/Address.php | 2 +-
.../Zend/Mail/Address/AddressInterface.php | 2 +-
.../library/Zend/Mail/AddressList.php | 2 +-
.../library/Zend/Mail/CONTRIBUTING.md | 3 +
.../Mail/Exception/BadMethodCallException.php | 2 +-
.../Zend/Mail/Exception/DomainException.php | 2 +-
.../Mail/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Mail/Exception/OutOfBoundsException.php | 2 +-
.../Zend/Mail/Exception/RuntimeException.php | 2 +-
.../Zend/Mail/Header/AbstractAddressList.php | 9 +-
.../library/Zend/Mail/Header/Bcc.php | 2 +-
.../library/Zend/Mail/Header/Cc.php | 2 +-
.../Mail/Header/ContentTransferEncoding.php | 8 +-
.../library/Zend/Mail/Header/ContentType.php | 5 +-
.../library/Zend/Mail/Header/Date.php | 2 +-
.../Exception/BadMethodCallException.php | 5 +-
.../Header/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../Header/Exception/RuntimeException.php | 8 +-
.../library/Zend/Mail/Header/From.php | 2 +-
.../Zend/Mail/Header/GenericHeader.php | 2 +-
.../Zend/Mail/Header/GenericMultiHeader.php | 3 +-
.../Zend/Mail/Header/HeaderInterface.php | 3 +-
.../library/Zend/Mail/Header/HeaderLoader.php | 2 +-
.../library/Zend/Mail/Header/HeaderWrap.php | 2 +-
.../library/Zend/Mail/Header/MessageId.php | 4 +-
.../library/Zend/Mail/Header/MimeVersion.php | 2 +-
.../Mail/Header/MultipleHeadersInterface.php | 2 +-
.../library/Zend/Mail/Header/Received.php | 2 +-
.../library/Zend/Mail/Header/ReplyTo.php | 2 +-
.../library/Zend/Mail/Header/Sender.php | 2 +-
.../Zend/Mail/Header/StructuredInterface.php | 2 +-
.../library/Zend/Mail/Header/Subject.php | 2 +-
.../library/Zend/Mail/Header/To.php | 2 +-
.../Mail/Header/UnstructuredInterface.php | 2 +-
.../library/Zend/Mail/Headers.php | 26 +-
.../library/Zend/Mail/Message.php | 4 +-
.../Zend/Mail/Protocol/AbstractProtocol.php | 28 +-
.../Protocol/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../Protocol/Exception/RuntimeException.php | 8 +-
.../library/Zend/Mail/Protocol/Imap.php | 7 +-
.../library/Zend/Mail/Protocol/Pop3.php | 16 +-
.../library/Zend/Mail/Protocol/Smtp.php | 16 +-
.../Zend/Mail/Protocol/Smtp/Auth/Crammd5.php | 5 +-
.../Zend/Mail/Protocol/Smtp/Auth/Login.php | 5 +-
.../Zend/Mail/Protocol/Smtp/Auth/Plain.php | 5 +-
.../Zend/Mail/Protocol/SmtpPluginManager.php | 2 +-
.../library/Zend/Mail/Storage.php | 2 +-
.../Zend/Mail/Storage/AbstractStorage.php | 193 ++--
.../Storage/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../Exception/OutOfBoundsException.php | 8 +-
.../Storage/Exception/RuntimeException.php | 8 +-
.../library/Zend/Mail/Storage/Folder.php | 2 +-
.../Mail/Storage/Folder/FolderInterface.php | 3 +-
.../Zend/Mail/Storage/Folder/Maildir.php | 10 +-
.../library/Zend/Mail/Storage/Folder/Mbox.php | 9 +-
.../library/Zend/Mail/Storage/Imap.php | 5 +-
.../library/Zend/Mail/Storage/Maildir.php | 25 +-
.../library/Zend/Mail/Storage/Mbox.php | 5 +-
.../library/Zend/Mail/Storage/Message.php | 2 +-
.../Zend/Mail/Storage/Message/File.php | 2 +-
.../Mail/Storage/Message/MessageInterface.php | 2 +-
.../library/Zend/Mail/Storage/Part.php | 3 +-
.../Part/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../Part/Exception/RuntimeException.php | 8 +-
.../library/Zend/Mail/Storage/Part/File.php | 4 +-
.../Zend/Mail/Storage/Part/PartInterface.php | 5 +-
.../library/Zend/Mail/Storage/Pop3.php | 3 +-
.../Zend/Mail/Storage/Writable/Maildir.php | 12 +-
.../Storage/Writable/WritableInterface.php | 2 +-
.../Transport/Exception/DomainException.php | 19 +
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../Transport/Exception/RuntimeException.php | 8 +-
.../library/Zend/Mail/Transport/Factory.php | 83 ++
.../library/Zend/Mail/Transport/File.php | 10 +-
.../Zend/Mail/Transport/FileOptions.php | 4 +-
.../library/Zend/Mail/Transport/Null.php | 46 +
.../library/Zend/Mail/Transport/Sendmail.php | 6 +-
.../library/Zend/Mail/Transport/Smtp.php | 9 +-
.../Zend/Mail/Transport/SmtpOptions.php | 2 +-
.../Mail/Transport/TransportInterface.php | 2 +-
.../library/Zend/Mail/composer.json | 14 +-
.../BigInteger/Adapter/AdapterInterface.php | 2 +-
.../Zend/Math/BigInteger/Adapter/Bcmath.php | 2 +-
.../Zend/Math/BigInteger/Adapter/Gmp.php | 4 +-
.../Math/BigInteger/AdapterPluginManager.php | 2 +-
.../Zend/Math/BigInteger/BigInteger.php | 2 +-
.../Exception/DivisionByZeroException.php | 5 +-
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../BigInteger/Exception/RuntimeException.php | 5 +-
.../library/Zend/Math/CONTRIBUTING.md | 3 +
.../Zend/Math/Exception/DomainException.php | 5 +-
.../Math/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Zend/Math/Exception/RuntimeException.php | 5 +-
.../zendframework/library/Zend/Math/Rand.php | 22 +-
.../library/Zend/Math/Source/HashTiming.php | 9 +-
.../library/Zend/Math/composer.json | 7 +-
.../library/Zend/Memory/CONTRIBUTING.md | 3 +
.../Memory/Container/AbstractContainer.php | 2 +-
.../Memory/Container/AccessController.php | 5 +-
.../Memory/Container/ContainerInterface.php | 2 +-
.../library/Zend/Memory/Container/Locked.php | 3 +-
.../library/Zend/Memory/Container/Movable.php | 2 +-
.../Memory/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Memory/Exception/RuntimeException.php | 2 +-
.../library/Zend/Memory/MemoryManager.php | 26 +-
.../library/Zend/Memory/Value.php | 4 +-
.../library/Zend/Memory/composer.json | 10 +-
.../library/Zend/Mime/CONTRIBUTING.md | 3 +
.../library/Zend/Mime/Decode.php | 2 +-
.../Mime/Exception/ExceptionInterface.php | 5 +-
.../Zend/Mime/Exception/RuntimeException.php | 6 +-
.../library/Zend/Mime/Message.php | 10 +-
.../zendframework/library/Zend/Mime/Mime.php | 2 +-
.../zendframework/library/Zend/Mime/Part.php | 16 +-
.../library/Zend/Mime/composer.json | 13 +-
.../Zend/ModuleManager/CONTRIBUTING.md | 3 +
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../MissingDependencyModuleException.php | 2 +-
.../Exception/RuntimeException.php | 2 +-
.../Feature/AutoloaderProviderInterface.php | 2 +-
.../Feature/BootstrapListenerInterface.php | 2 +-
.../Feature/ConfigProviderInterface.php | 2 +-
.../ConsoleBannerProviderInterface.php | 2 +-
.../Feature/ConsoleUsageProviderInterface.php | 2 +-
.../ControllerPluginProviderInterface.php | 2 +-
.../Feature/ControllerProviderInterface.php | 2 +-
.../Feature/DependencyIndicatorInterface.php | 2 +-
.../Feature/FilterProviderInterface.php | 2 +-
.../Feature/FormElementProviderInterface.php | 2 +-
.../Feature/HydratorProviderInterface.php | 2 +-
.../Feature/InitProviderInterface.php | 2 +-
.../Feature/InputFilterProviderInterface.php | 2 +-
.../Feature/LocatorRegisteredInterface.php | 2 +-
.../Feature/LogProcessorProviderInterface.php | 21 +
.../Feature/LogWriterProviderInterface.php | 21 +
.../Feature/RouteProviderInterface.php | 2 +-
.../Feature/SerializerProviderInterface.php | 2 +-
.../Feature/ServiceProviderInterface.php | 2 +-
.../Feature/ValidatorProviderInterface.php | 2 +-
.../Feature/ViewHelperProviderInterface.php | 2 +-
.../Listener/AbstractListener.php | 2 +-
.../Listener/AutoloaderListener.php | 3 +-
.../ModuleManager/Listener/ConfigListener.php | 54 +-
.../Listener/ConfigMergerInterface.php | 2 +-
.../Listener/DefaultListenerAggregate.php | 2 +-
.../Listener/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Listener/Exception/RuntimeException.php | 2 +-
.../ModuleManager/Listener/InitTrigger.php | 2 +-
.../Listener/ListenerOptions.php | 50 +-
.../Listener/LocatorRegistrationListener.php | 8 +-
.../ModuleDependencyCheckerListener.php | 2 +-
.../Listener/ModuleLoaderListener.php | 2 +-
.../Listener/ModuleResolverListener.php | 2 +-
.../Listener/OnBootstrapListener.php | 7 +-
.../Listener/ServiceListener.php | 3 +-
.../Listener/ServiceListenerInterface.php | 2 +-
.../Zend/ModuleManager/ModuleEvent.php | 34 +-
.../Zend/ModuleManager/ModuleManager.php | 41 +-
.../ModuleManager/ModuleManagerInterface.php | 2 +-
.../library/Zend/ModuleManager/composer.json | 15 +-
.../library/Zend/Mvc/Application.php | 35 +-
.../library/Zend/Mvc/ApplicationInterface.php | 6 +-
.../library/Zend/Mvc/CONTRIBUTING.md | 3 +
.../Controller/AbstractActionController.php | 2 +-
.../Controller/AbstractConsoleController.php | 57 ++
.../Mvc/Controller/AbstractController.php | 3 +-
.../Controller/AbstractRestfulController.php | 10 +-
.../Zend/Mvc/Controller/ControllerManager.php | 6 +-
.../Mvc/Controller/Plugin/AbstractPlugin.php | 2 +-
.../Plugin/AcceptableViewModelSelector.php | 2 +-
.../Controller/Plugin/FilePostRedirectGet.php | 3 +-
.../Mvc/Controller/Plugin/FlashMessenger.php | 3 +-
.../Zend/Mvc/Controller/Plugin/Forward.php | 12 +-
.../Zend/Mvc/Controller/Plugin/Identity.php | 2 +-
.../Zend/Mvc/Controller/Plugin/Layout.php | 2 +-
.../Zend/Mvc/Controller/Plugin/Params.php | 2 +-
.../Mvc/Controller/Plugin/PluginInterface.php | 2 +-
.../Mvc/Controller/Plugin/PostRedirectGet.php | 8 +-
.../Zend/Mvc/Controller/Plugin/Redirect.php | 2 +-
.../Plugin/Service/ForwardFactory.php | 10 +-
.../Plugin/Service/IdentityFactory.php | 2 +-
.../Zend/Mvc/Controller/Plugin/Url.php | 2 +-
.../Zend/Mvc/Controller/PluginManager.php | 2 +-
.../library/Zend/Mvc/DispatchListener.php | 50 +-
.../Mvc/Exception/BadMethodCallException.php | 14 +
.../Zend/Mvc/Exception/DomainException.php | 2 +-
.../Zend/Mvc/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/InvalidControllerException.php | 2 +-
.../Mvc/Exception/InvalidPluginException.php | 2 +-
.../Mvc/Exception/MissingLocatorException.php | 2 +-
.../Zend/Mvc/Exception/RuntimeException.php | 2 +-
.../library/Zend/Mvc/I18n/DummyTranslator.php | 25 +
.../library/Zend/Mvc/I18n/Translator.php | 79 +-
.../Mvc/InjectApplicationEventInterface.php | 2 +-
.../library/Zend/Mvc/ModuleRouteListener.php | 2 +-
.../library/Zend/Mvc/MvcEvent.php | 2 +-
.../ResponseSender/AbstractResponseSender.php | 2 +-
.../ResponseSender/ConsoleResponseSender.php | 2 +-
.../Mvc/ResponseSender/HttpResponseSender.php | 2 +-
.../PhpEnvironmentResponseSender.php | 2 +-
.../ResponseSenderInterface.php | 3 +-
.../Mvc/ResponseSender/SendResponseEvent.php | 2 +-
.../SimpleStreamResponseSender.php | 2 +-
.../library/Zend/Mvc/RouteListener.php | 9 +-
.../Zend/Mvc/Router/Console/Catchall.php | 1 -
.../Mvc/Router/Console/RouteInterface.php | 4 +-
.../Zend/Mvc/Router/Console/RouteMatch.php | 4 +-
.../Zend/Mvc/Router/Console/Simple.php | 714 +--------------
.../Mvc/Router/Console/SimpleRouteStack.php | 6 +-
.../Router/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Mvc/Router/Exception/RuntimeException.php | 2 +-
.../library/Zend/Mvc/Router/Http/Chain.php | 4 +-
.../library/Zend/Mvc/Router/Http/Hostname.php | 2 +-
.../library/Zend/Mvc/Router/Http/Literal.php | 2 +-
.../library/Zend/Mvc/Router/Http/Method.php | 2 +-
.../library/Zend/Mvc/Router/Http/Part.php | 10 +-
.../library/Zend/Mvc/Router/Http/Query.php | 2 +-
.../library/Zend/Mvc/Router/Http/Regex.php | 2 +-
.../Zend/Mvc/Router/Http/RouteInterface.php | 2 +-
.../Zend/Mvc/Router/Http/RouteMatch.php | 2 +-
.../library/Zend/Mvc/Router/Http/Scheme.php | 2 +-
.../library/Zend/Mvc/Router/Http/Segment.php | 4 +-
.../Http/TranslatorAwareTreeRouteStack.php | 5 +-
.../Zend/Mvc/Router/Http/TreeRouteStack.php | 2 +-
.../library/Zend/Mvc/Router/Http/Wildcard.php | 2 +-
.../library/Zend/Mvc/Router/PriorityList.php | 198 +----
.../Zend/Mvc/Router/RouteInterface.php | 2 +-
.../library/Zend/Mvc/Router/RouteMatch.php | 2 +-
.../Zend/Mvc/Router/RoutePluginManager.php | 2 +-
.../Zend/Mvc/Router/RouteStackInterface.php | 2 +-
.../Zend/Mvc/Router/SimpleRouteStack.php | 2 +-
.../library/Zend/Mvc/SendResponseListener.php | 4 +-
.../Service/AbstractPluginManagerFactory.php | 7 +-
.../Zend/Mvc/Service/ApplicationFactory.php | 2 +-
.../Zend/Mvc/Service/ConfigFactory.php | 2 +-
.../Mvc/Service/ConsoleAdapterFactory.php | 2 +-
.../Mvc/Service/ConsoleViewManagerFactory.php | 2 +-
.../Mvc/Service/ControllerLoaderFactory.php | 2 +-
.../ControllerPluginManagerFactory.php | 2 +-
.../DiAbstractServiceFactoryFactory.php | 2 +-
.../library/Zend/Mvc/Service/DiFactory.php | 2 +-
.../Service/DiServiceInitializerFactory.php | 3 +-
.../DiStrictAbstractServiceFactory.php | 3 +-
.../DiStrictAbstractServiceFactoryFactory.php | 2 +-
.../Zend/Mvc/Service/EventManagerFactory.php | 2 +-
.../Zend/Mvc/Service/FilterManagerFactory.php | 2 +-
.../Mvc/Service/FormElementManagerFactory.php | 2 +-
.../Mvc/Service/HttpViewManagerFactory.php | 2 +-
.../Mvc/Service/HydratorManagerFactory.php | 3 +-
.../Mvc/Service/InputFilterManagerFactory.php | 3 +-
.../Service/LogProcessorManagerFactory.php | 15 +
.../Mvc/Service/LogWriterManagerFactory.php | 15 +
.../Zend/Mvc/Service/ModuleManagerFactory.php | 14 +-
.../Service/PaginatorPluginManagerFactory.php | 2 +-
.../Zend/Mvc/Service/RequestFactory.php | 2 +-
.../Zend/Mvc/Service/ResponseFactory.php | 2 +-
.../Mvc/Service/RoutePluginManagerFactory.php | 2 +-
.../Zend/Mvc/Service/RouterFactory.php | 3 +-
.../SerializerAdapterPluginManagerFactory.php | 2 +-
.../Mvc/Service/ServiceListenerFactory.php | 5 +-
.../Zend/Mvc/Service/ServiceManagerConfig.php | 144 ++-
.../Mvc/Service/TranslatorServiceFactory.php | 53 +-
.../Mvc/Service/ValidatorManagerFactory.php | 2 +-
.../Mvc/Service/ViewFeedStrategyFactory.php | 2 +-
.../Mvc/Service/ViewHelperManagerFactory.php | 8 +-
.../Mvc/Service/ViewJsonStrategyFactory.php | 2 +-
.../Zend/Mvc/Service/ViewManagerFactory.php | 2 +-
.../Zend/Mvc/Service/ViewResolverFactory.php | 2 +-
.../ViewTemplateMapResolverFactory.php | 2 +-
.../Service/ViewTemplatePathStackFactory.php | 4 +-
.../View/Console/CreateViewModelListener.php | 2 +-
.../View/Console/DefaultRenderingStrategy.php | 16 +-
.../Mvc/View/Console/ExceptionStrategy.php | 4 +-
.../InjectNamedConsoleParamsListener.php | 2 +-
.../View/Console/InjectViewModelListener.php | 5 +-
.../View/Console/RouteNotFoundStrategy.php | 22 +-
.../Zend/Mvc/View/Console/ViewManager.php | 2 +-
.../Mvc/View/Http/CreateViewModelListener.php | 2 +-
.../View/Http/DefaultRenderingStrategy.php | 5 +-
.../Zend/Mvc/View/Http/ExceptionStrategy.php | 2 +-
.../Http/InjectRoutematchParamsListener.php | 2 +-
.../Mvc/View/Http/InjectTemplateListener.php | 97 +-
.../Mvc/View/Http/InjectViewModelListener.php | 2 +-
.../Mvc/View/Http/RouteNotFoundStrategy.php | 2 +-
.../Zend/Mvc/View/Http/ViewManager.php | 39 +-
.../Zend/Mvc/View/SendResponseListener.php | 2 +-
.../library/Zend/Mvc/composer.json | 32 +-
.../Zend/Navigation/AbstractContainer.php | 34 +-
.../library/Zend/Navigation/CONTRIBUTING.md | 3 +
.../Exception/BadMethodCallException.php | 5 +-
.../Navigation/Exception/DomainException.php | 5 +-
.../Exception/ExceptionInterface.php | 3 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Exception/OutOfBoundsException.php | 5 +-
.../library/Zend/Navigation/Navigation.php | 2 +-
.../Zend/Navigation/Page/AbstractPage.php | 61 +-
.../library/Zend/Navigation/Page/Mvc.php | 44 +-
.../library/Zend/Navigation/Page/Uri.php | 57 +-
.../Service/AbstractNavigationFactory.php | 25 +-
.../Service/ConstructedNavigationFactory.php | 2 +-
.../Service/DefaultNavigationFactory.php | 2 +-
.../Zend/Navigation/View/HelperConfig.php | 8 +-
.../library/Zend/Navigation/composer.json | 16 +-
.../Paginator/Adapter/AdapterInterface.php | 4 +-
.../Zend/Paginator/Adapter/ArrayAdapter.php | 2 +-
.../Zend/Paginator/Adapter/Callback.php | 75 ++
.../Zend/Paginator/Adapter/DbSelect.php | 3 +-
.../Zend/Paginator/Adapter/DbTableGateway.php | 26 +-
.../Adapter/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Adapter/Exception/RuntimeException.php | 5 +-
.../Exception/UnexpectedValueException.php | 5 +-
.../Zend/Paginator/Adapter/Iterator.php | 4 +-
.../library/Zend/Paginator/Adapter/Null.php | 2 +-
.../Adapter/Service/CallbackFactory.php | 44 +
.../Adapter/Service/DbSelectFactory.php | 4 +-
.../Adapter/Service/DbTableGatewayFactory.php | 50 ++
.../Paginator/AdapterAggregateInterface.php | 2 +-
.../Zend/Paginator/AdapterPluginManager.php | 6 +-
.../library/Zend/Paginator/CONTRIBUTING.md | 3 +
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Paginator/Exception/RuntimeException.php | 9 +-
.../Exception/UnexpectedValueException.php | 9 +-
.../library/Zend/Paginator/Factory.php | 2 +-
.../library/Zend/Paginator/Paginator.php | 8 +-
.../Zend/Paginator/ScrollingStyle/All.php | 2 +-
.../Zend/Paginator/ScrollingStyle/Elastic.php | 2 +-
.../Zend/Paginator/ScrollingStyle/Jumping.php | 2 +-
.../ScrollingStyleInterface.php | 2 +-
.../Zend/Paginator/ScrollingStyle/Sliding.php | 2 +-
.../Paginator/ScrollingStylePluginManager.php | 2 +-
.../Paginator/SerializableLimitIterator.php | 5 +-
.../library/Zend/Paginator/composer.json | 22 +-
.../library/Zend/Permissions/Acl/Acl.php | 30 +-
.../Zend/Permissions/Acl/AclInterface.php | 2 +-
.../Acl/Assertion/AssertionAggregate.php | 173 ++++
.../Acl/Assertion/AssertionInterface.php | 2 +-
.../Acl/Assertion/AssertionManager.php | 41 +
.../Exception/InvalidAssertionException.php | 8 +
.../Zend/Permissions/Acl/CONTRIBUTING.md | 3 +
.../Acl/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Acl/Exception/RuntimeException.php | 3 +-
.../Acl/Resource/GenericResource.php | 2 +-
.../Acl/Resource/ResourceInterface.php | 2 +-
.../Zend/Permissions/Acl/Role/GenericRole.php | 2 +-
.../Zend/Permissions/Acl/Role/Registry.php | 2 +-
.../Permissions/Acl/Role/RoleInterface.php | 2 +-
.../Zend/Permissions/Acl/composer.json | 10 +-
.../Permissions/Rbac/AbstractIterator.php | 10 +-
.../Zend/Permissions/Rbac/AbstractRole.php | 2 +-
.../Permissions/Rbac/AssertionInterface.php | 2 +-
.../Zend/Permissions/Rbac/CONTRIBUTING.md | 3 +
.../Rbac/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../library/Zend/Permissions/Rbac/Rbac.php | 12 +-
.../library/Zend/Permissions/Rbac/Role.php | 2 +-
.../Zend/Permissions/Rbac/RoleInterface.php | 2 +-
.../Zend/Permissions/Rbac/composer.json | 7 +-
.../ProgressBar/Adapter/AbstractAdapter.php | 2 +-
.../Zend/ProgressBar/Adapter/Console.php | 7 +-
.../Adapter/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../Adapter/Exception/RuntimeException.php | 8 +-
.../Zend/ProgressBar/Adapter/JsPull.php | 2 +-
.../Zend/ProgressBar/Adapter/JsPush.php | 2 +-
.../library/Zend/ProgressBar/CONTRIBUTING.md | 3 +
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../Exception/OutOfRangeException.php | 2 +-
.../Exception/PhpEnvironmentException.php | 5 +-
.../Exception/RuntimeException.php | 5 +-
.../library/Zend/ProgressBar/ProgressBar.php | 2 +-
.../Upload/AbstractUploadHandler.php | 6 +-
.../Zend/ProgressBar/Upload/ApcProgress.php | 2 +-
.../ProgressBar/Upload/SessionProgress.php | 2 +-
.../Upload/UploadHandlerInterface.php | 3 +-
.../ProgressBar/Upload/UploadProgress.php | 2 +-
.../library/Zend/ProgressBar/composer.json | 11 +-
.../Serializer/Adapter/AbstractAdapter.php | 2 +-
.../Serializer/Adapter/AdapterInterface.php | 2 +-
.../Serializer/Adapter/AdapterOptions.php | 5 +-
.../Zend/Serializer/Adapter/IgBinary.php | 2 +-
.../library/Zend/Serializer/Adapter/Json.php | 2 +-
.../Zend/Serializer/Adapter/JsonOptions.php | 2 +-
.../Zend/Serializer/Adapter/MsgPack.php | 2 +-
.../Zend/Serializer/Adapter/PhpCode.php | 3 +-
.../Zend/Serializer/Adapter/PhpSerialize.php | 6 +-
.../Zend/Serializer/Adapter/PythonPickle.php | 15 +-
.../Adapter/PythonPickleOptions.php | 2 +-
.../library/Zend/Serializer/Adapter/Wddx.php | 2 +-
.../Zend/Serializer/Adapter/WddxOptions.php | 3 +-
.../Zend/Serializer/AdapterPluginManager.php | 2 +-
.../library/Zend/Serializer/CONTRIBUTING.md | 3 +
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/ExtensionNotLoadedException.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Serializer/Exception/RuntimeException.php | 5 +-
.../library/Zend/Serializer/Serializer.php | 4 +-
.../library/Zend/Serializer/composer.json | 10 +-
.../library/Zend/Server/AbstractServer.php | 2 +-
.../library/Zend/Server/CONTRIBUTING.md | 3 +
.../library/Zend/Server/Cache.php | 11 +-
.../library/Zend/Server/Client.php | 2 +-
.../library/Zend/Server/Definition.php | 2 +-
.../Exception/BadMethodCallException.php | 9 +-
.../Server/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Server/Exception/RuntimeException.php | 9 +-
.../library/Zend/Server/Method/Callback.php | 4 +-
.../library/Zend/Server/Method/Definition.php | 2 +-
.../library/Zend/Server/Method/Parameter.php | 2 +-
.../library/Zend/Server/Method/Prototype.php | 2 +-
.../library/Zend/Server/Reflection.php | 2 +-
.../Server/Reflection/AbstractFunction.php | 8 +-
.../Exception/BadMethodCallException.php | 9 +-
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Reflection/Exception/RuntimeException.php | 9 +-
.../library/Zend/Server/Reflection/Node.php | 6 +-
.../Zend/Server/Reflection/Prototype.php | 2 +-
.../Server/Reflection/ReflectionClass.php | 2 +-
.../Server/Reflection/ReflectionFunction.php | 2 +-
.../Server/Reflection/ReflectionMethod.php | 2 +-
.../Server/Reflection/ReflectionParameter.php | 2 +-
.../Reflection/ReflectionReturnValue.php | 2 +-
.../library/Zend/Server/Server.php | 2 +-
.../library/Zend/Server/composer.json | 7 +-
.../AbstractFactoryInterface.php | 2 +-
.../ServiceManager/AbstractPluginManager.php | 22 +-
.../Zend/ServiceManager/CONTRIBUTING.md | 3 +
.../library/Zend/ServiceManager/Config.php | 2 +-
.../Zend/ServiceManager/ConfigInterface.php | 2 +-
.../DelegatorFactoryInterface.php | 2 +-
.../Di/DiAbstractServiceFactory.php | 16 +-
.../Di/DiInstanceManagerProxy.php | 2 +-
.../ServiceManager/Di/DiServiceFactory.php | 6 +-
.../Di/DiServiceInitializer.php | 2 +-
.../CircularDependencyFoundException.php | 2 +-
.../Exception/CircularReferenceException.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/InvalidServiceNameException.php | 2 +-
.../Exception/RuntimeException.php | 2 +-
.../Exception/ServiceNotCreatedException.php | 2 +-
.../Exception/ServiceNotFoundException.php | 2 +-
.../Zend/ServiceManager/FactoryInterface.php | 2 +-
.../ServiceManager/InitializerInterface.php | 3 +-
.../MutableCreationOptionsInterface.php | 2 +-
.../Proxy/LazyServiceFactory.php | 2 +-
.../Proxy/LazyServiceFactoryFactory.php | 23 +-
.../ServiceLocatorAwareInterface.php | 2 +-
.../ServiceLocatorAwareTrait.php | 3 +-
.../ServiceLocatorInterface.php | 2 +-
.../Zend/ServiceManager/ServiceManager.php | 217 +++--
.../ServiceManagerAwareInterface.php | 2 +-
.../library/Zend/ServiceManager/composer.json | 11 +-
.../Zend/Session/AbstractContainer.php | 6 +-
.../library/Zend/Session/AbstractManager.php | 2 +-
.../library/Zend/Session/CONTRIBUTING.md | 3 +
.../Zend/Session/Config/ConfigInterface.php | 2 +-
.../Zend/Session/Config/SessionConfig.php | 12 +-
.../Zend/Session/Config/StandardConfig.php | 5 +-
.../library/Zend/Session/Container.php | 28 +-
.../Container/PhpReferenceCompatibility.php | 37 -
.../Exception/BadMethodCallException.php | 5 +-
.../Session/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Session/Exception/RuntimeException.php | 5 +-
.../library/Zend/Session/ManagerInterface.php | 2 +-
.../Zend/Session/SaveHandler/Cache.php | 2 +-
.../Session/SaveHandler/DbTableGateway.php | 14 +-
.../SaveHandler/DbTableGatewayOptions.php | 3 +-
.../Zend/Session/SaveHandler/MongoDB.php | 8 +-
.../Session/SaveHandler/MongoDBOptions.php | 17 +-
.../SaveHandler/SaveHandlerInterface.php | 2 +-
.../ContainerAbstractServiceFactory.php | 2 +-
.../Session/Service/SessionConfigFactory.php | 4 +-
.../Session/Service/SessionManagerFactory.php | 11 +-
.../Zend/Session/Service/StorageFactory.php | 4 +-
.../library/Zend/Session/SessionManager.php | 8 +-
.../Storage/AbstractSessionArrayStorage.php | 9 +-
.../Zend/Session/Storage/ArrayStorage.php | 20 +-
.../library/Zend/Session/Storage/Factory.php | 2 +-
.../Session/Storage/SessionArrayStorage.php | 31 +-
.../PhpReferenceCompatibility.php | 40 -
.../Zend/Session/Storage/SessionStorage.php | 2 +-
.../StorageInitializationInterface.php | 2 +-
.../Zend/Session/Storage/StorageInterface.php | 2 +-
.../Zend/Session/Validator/HttpUserAgent.php | 2 +-
.../Zend/Session/Validator/RemoteAddr.php | 2 +-
.../Session/Validator/ValidatorInterface.php | 2 +-
.../library/Zend/Session/ValidatorChain.php | 2 +-
.../Zend/Session/compatibility/autoload.php | 2 +-
.../library/Zend/Session/composer.json | 18 +-
.../library/Zend/Soap/AutoDiscover.php | 8 +-
.../DiscoveryStrategyInterface.php | 2 +-
.../DiscoveryStrategy/ReflectionDiscovery.php | 2 +-
.../library/Zend/Soap/CONTRIBUTING.md | 3 +
.../library/Zend/Soap/Client.php | 2 +-
.../library/Zend/Soap/Client/Common.php | 8 +-
.../library/Zend/Soap/Client/DotNet.php | 7 +-
.../library/Zend/Soap/Client/Local.php | 2 +-
.../Soap/Exception/BadMethodCallException.php | 5 +-
.../Soap/Exception/ExceptionInterface.php | 5 +-
.../Exception/ExtensionNotLoadedException.php | 5 +-
.../Exception/InvalidArgumentException.php | 5 +-
.../Zend/Soap/Exception/RuntimeException.php | 5 +-
.../Exception/UnexpectedValueException.php | 5 +-
.../library/Zend/Soap/Server.php | 86 +-
.../Soap/Server/DocumentLiteralWrapper.php | 2 +-
.../zendframework/library/Zend/Soap/Wsdl.php | 11 +-
.../AbstractComplexTypeStrategy.php | 3 +-
.../Soap/Wsdl/ComplexTypeStrategy/AnyType.php | 2 +-
.../ArrayOfTypeComplex.php | 3 +-
.../ArrayOfTypeSequence.php | 3 +-
.../ComplexTypeStrategyInterface.php | 2 +-
.../Wsdl/ComplexTypeStrategy/Composite.php | 2 +-
.../DefaultComplexType.php | 15 +-
.../library/Zend/Soap/composer.json | 13 +-
.../library/Zend/Stdlib/AbstractOptions.php | 60 +-
.../library/Zend/Stdlib/ArrayObject.php | 430 ++++++++-
.../ArrayObject/PhpLegacyCompatibility.php | 35 -
.../ArrayObject/PhpReferenceCompatibility.php | 433 ---------
.../Stdlib/ArraySerializableInterface.php | 2 +-
.../library/Zend/Stdlib/ArrayStack.php | 2 +-
.../library/Zend/Stdlib/ArrayUtils.php | 6 +-
.../library/Zend/Stdlib/CONTRIBUTING.md | 3 +
.../library/Zend/Stdlib/CallbackHandler.php | 4 +-
.../library/Zend/Stdlib/DateTime.php | 2 +-
.../Zend/Stdlib/DispatchableInterface.php | 2 +-
.../library/Zend/Stdlib/ErrorHandler.php | 4 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Zend/Stdlib/Exception/DomainException.php | 2 +-
.../Stdlib/Exception/ExceptionInterface.php | 2 +-
.../Exception/ExtensionNotLoadedException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/InvalidCallbackException.php | 2 +-
.../Zend/Stdlib/Exception/LogicException.php | 2 +-
.../Stdlib/Exception/RuntimeException.php | 2 +-
.../Stdlib/Extractor/ExtractionInterface.php | 21 +
.../library/Zend/Stdlib/Glob.php | 3 +-
.../Zend/Stdlib/Guard/AllGuardsTrait.php | 20 +
.../Guard/ArrayOrTraversableGuardTrait.php | 41 +
.../Zend/Stdlib/Guard/EmptyGuardTrait.php | 35 +
.../library/Zend/Stdlib/Guard/GuardUtils.php | 85 ++
.../Zend/Stdlib/Guard/NullGuardTrait.php | 35 +
.../Zend/Stdlib/Hydrator/AbstractHydrator.php | 96 +-
.../Hydrator/Aggregate/AggregateHydrator.php | 2 +-
.../Hydrator/Aggregate/ExtractEvent.php | 3 +-
.../Hydrator/Aggregate/HydrateEvent.php | 3 +-
.../Hydrator/Aggregate/HydratorListener.php | 3 +-
.../Stdlib/Hydrator/ArraySerializable.php | 40 +-
.../Zend/Stdlib/Hydrator/ClassMethods.php | 53 +-
.../Hydrator/Filter/FilterComposite.php | 18 +-
.../Hydrator/Filter/FilterInterface.php | 2 +-
.../Filter/FilterProviderInterface.php | 2 +-
.../Zend/Stdlib/Hydrator/Filter/GetFilter.php | 2 +-
.../Zend/Stdlib/Hydrator/Filter/HasFilter.php | 2 +-
.../Zend/Stdlib/Hydrator/Filter/IsFilter.php | 2 +-
.../Hydrator/Filter/MethodMatchFilter.php | 2 +-
.../Filter/NumberOfParameterFilter.php | 10 +-
.../Filter/OptionalParametersFilter.php | 4 +-
.../Hydrator/FilterEnabledInterface.php | 63 ++
.../Stdlib/Hydrator/HydrationInterface.php | 22 +
.../Hydrator/HydratorAwareInterface.php | 2 +-
.../Stdlib/Hydrator/HydratorAwareTrait.php | 47 +
.../Stdlib/Hydrator/HydratorInterface.php | 22 +-
.../Hydrator/HydratorOptionsInterface.php | 2 +-
.../Stdlib/Hydrator/HydratorPluginManager.php | 2 +-
.../NamingStrategyInterface.php | 37 +
.../UnderscoreNamingStrategy.php | 72 ++
.../NamingStrategyEnabledInterface.php | 44 +
.../Zend/Stdlib/Hydrator/ObjectProperty.php | 77 +-
.../Zend/Stdlib/Hydrator/Reflection.php | 13 +-
.../Hydrator/Strategy/ClosureStrategy.php | 16 +-
.../Hydrator/Strategy/DefaultStrategy.php | 2 +-
.../Strategy/SerializableStrategy.php | 2 +-
.../Hydrator/Strategy/StrategyInterface.php | 2 +-
.../Hydrator/StrategyEnabledInterface.php | 2 +-
.../Zend/Stdlib/InitializableInterface.php | 2 +-
.../library/Zend/Stdlib/JsonSerializable.php | 28 +
.../PhpLegacyCompatibility.php | 28 +
.../library/Zend/Stdlib/Message.php | 2 +-
.../library/Zend/Stdlib/MessageInterface.php | 3 +-
.../Zend/Stdlib/ParameterObjectInterface.php | 2 +-
.../library/Zend/Stdlib/Parameters.php | 6 +-
.../Zend/Stdlib/ParametersInterface.php | 2 +-
.../library/Zend/Stdlib/PriorityList.php | 261 ++++++
.../library/Zend/Stdlib/PriorityQueue.php | 2 +-
.../library/Zend/Stdlib/Request.php | 2 +-
.../library/Zend/Stdlib/RequestInterface.php | 2 +-
.../library/Zend/Stdlib/Response.php | 2 +-
.../library/Zend/Stdlib/ResponseInterface.php | 3 +-
.../library/Zend/Stdlib/SplPriorityQueue.php | 4 +-
.../library/Zend/Stdlib/SplQueue.php | 2 +-
.../library/Zend/Stdlib/SplStack.php | 2 +-
.../library/Zend/Stdlib/StringUtils.php | 3 +-
.../StringWrapper/AbstractStringWrapper.php | 5 +-
.../Zend/Stdlib/StringWrapper/Iconv.php | 2 +-
.../Zend/Stdlib/StringWrapper/Intl.php | 2 +-
.../Zend/Stdlib/StringWrapper/MbString.php | 2 +-
.../Zend/Stdlib/StringWrapper/Native.php | 2 +-
.../StringWrapper/StringWrapperInterface.php | 2 +-
.../Zend/Stdlib/compatibility/autoload.php | 2 +-
.../library/Zend/Stdlib/composer.json | 21 +-
.../library/Zend/Tag/CONTRIBUTING.md | 3 +
.../zendframework/library/Zend/Tag/Cloud.php | 2 +-
.../Tag/Cloud/Decorator/AbstractCloud.php | 2 +-
.../Tag/Cloud/Decorator/AbstractDecorator.php | 2 +-
.../Zend/Tag/Cloud/Decorator/AbstractTag.php | 2 +-
.../Cloud/Decorator/DecoratorInterface.php | 2 +-
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Zend/Tag/Cloud/Decorator/HtmlCloud.php | 4 +-
.../Zend/Tag/Cloud/Decorator/HtmlTag.php | 2 +-
.../Zend/Tag/Cloud/DecoratorPluginManager.php | 4 +-
.../Zend/Tag/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../InvalidAttributeNameException.php | 5 +-
.../Exception/InvalidElementNameException.php | 5 +-
.../Tag/Exception/OutOfBoundsException.php | 9 +-
.../zendframework/library/Zend/Tag/Item.php | 2 +-
.../library/Zend/Tag/ItemList.php | 2 +-
.../library/Zend/Tag/TaggableInterface.php | 2 +-
.../library/Zend/Tag/composer.json | 13 +-
.../library/Zend/Test/CONTRIBUTING.md | 3 +
.../AbstractConsoleControllerTestCase.php | 13 +-
.../Controller/AbstractControllerTestCase.php | 241 ++---
.../AbstractHttpControllerTestCase.php | 39 +-
.../library/Zend/Test/Util/ModuleLoader.php | 11 +-
.../library/Zend/Test/composer.json | 13 +-
.../library/Zend/Text/CONTRIBUTING.md | 3 +
.../Text/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Text/Exception/OutOfBoundsException.php | 11 +-
.../Zend/Text/Exception/OverflowException.php | 11 +-
.../Zend/Text/Exception/RuntimeException.php | 9 +-
.../Exception/UnexpectedValueException.php | 6 +-
.../Figlet/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Figlet/Exception/RuntimeException.php | 9 +-
.../Exception/UnexpectedValueException.php | 9 +-
.../library/Zend/Text/Figlet/Figlet.php | 27 +-
.../library/Zend/Text/MultiByte.php | 2 +-
.../library/Zend/Text/Table/Column.php | 3 +-
.../Zend/Text/Table/Decorator/Ascii.php | 2 +-
.../Zend/Text/Table/Decorator/Blank.php | 2 +-
.../Table/Decorator/DecoratorInterface.php | 2 +-
.../Zend/Text/Table/Decorator/Unicode.php | 2 +-
.../Zend/Text/Table/DecoratorManager.php | 2 +-
.../Table/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 6 +-
.../Exception/InvalidDecoratorException.php | 5 +-
.../Table/Exception/OutOfBoundsException.php | 9 +-
.../Table/Exception/OverflowException.php | 9 +-
.../Exception/UnexpectedValueException.php | 9 +-
.../library/Zend/Text/Table/Row.php | 13 +-
.../library/Zend/Text/Table/Table.php | 15 +-
.../library/Zend/Text/composer.json | 7 +-
.../library/Zend/Uri/CONTRIBUTING.md | 3 +
.../Zend/Uri/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 9 +-
.../Uri/Exception/InvalidUriException.php | 5 +-
.../Uri/Exception/InvalidUriPartException.php | 2 +-
.../zendframework/library/Zend/Uri/File.php | 2 +-
.../zendframework/library/Zend/Uri/Http.php | 2 +-
.../zendframework/library/Zend/Uri/Mailto.php | 2 +-
.../zendframework/library/Zend/Uri/Uri.php | 8 +-
.../library/Zend/Uri/UriFactory.php | 12 +-
.../library/Zend/Uri/UriInterface.php | 5 +-
.../library/Zend/Uri/composer.json | 7 +-
.../Zend/Validator/AbstractValidator.php | 31 +-
.../library/Zend/Validator/Barcode.php | 13 +-
.../Validator/Barcode/AbstractAdapter.php | 2 +-
.../Validator/Barcode/AdapterInterface.php | 2 +-
.../Zend/Validator/Barcode/Codabar.php | 2 +-
.../Zend/Validator/Barcode/Code128.php | 148 +--
.../library/Zend/Validator/Barcode/Code25.php | 2 +-
.../Validator/Barcode/Code25interleaved.php | 2 +-
.../library/Zend/Validator/Barcode/Code39.php | 2 +-
.../Zend/Validator/Barcode/Code39ext.php | 2 +-
.../library/Zend/Validator/Barcode/Code93.php | 2 +-
.../Zend/Validator/Barcode/Code93ext.php | 2 +-
.../library/Zend/Validator/Barcode/Ean12.php | 2 +-
.../library/Zend/Validator/Barcode/Ean13.php | 2 +-
.../library/Zend/Validator/Barcode/Ean14.php | 2 +-
.../library/Zend/Validator/Barcode/Ean18.php | 2 +-
.../library/Zend/Validator/Barcode/Ean2.php | 2 +-
.../library/Zend/Validator/Barcode/Ean5.php | 2 +-
.../library/Zend/Validator/Barcode/Ean8.php | 2 +-
.../library/Zend/Validator/Barcode/Gtin12.php | 2 +-
.../library/Zend/Validator/Barcode/Gtin13.php | 2 +-
.../library/Zend/Validator/Barcode/Gtin14.php | 2 +-
.../Zend/Validator/Barcode/Identcode.php | 2 +-
.../Validator/Barcode/Intelligentmail.php | 2 +-
.../library/Zend/Validator/Barcode/Issn.php | 2 +-
.../library/Zend/Validator/Barcode/Itf14.php | 2 +-
.../Zend/Validator/Barcode/Leitcode.php | 2 +-
.../library/Zend/Validator/Barcode/Planet.php | 2 +-
.../Zend/Validator/Barcode/Postnet.php | 2 +-
.../Zend/Validator/Barcode/Royalmail.php | 2 +-
.../library/Zend/Validator/Barcode/Sscc.php | 2 +-
.../library/Zend/Validator/Barcode/Upca.php | 2 +-
.../library/Zend/Validator/Barcode/Upce.php | 2 +-
.../library/Zend/Validator/Between.php | 4 +-
.../library/Zend/Validator/Bitwise.php | 192 ++++
.../library/Zend/Validator/CONTRIBUTING.md | 3 +
.../library/Zend/Validator/Callback.php | 2 +-
.../library/Zend/Validator/CreditCard.php | 6 +-
.../library/Zend/Validator/Csrf.php | 97 +-
.../library/Zend/Validator/Date.php | 159 ++--
.../library/Zend/Validator/DateStep.php | 288 ++++--
.../library/Zend/Validator/Db/AbstractDb.php | 10 +-
.../Zend/Validator/Db/NoRecordExists.php | 2 +-
.../Zend/Validator/Db/RecordExists.php | 2 +-
.../library/Zend/Validator/Digits.php | 2 +-
.../library/Zend/Validator/EmailAddress.php | 4 +-
.../Exception/BadMethodCallException.php | 8 +-
.../Exception/ExceptionInterface.php | 5 +-
.../Exception/ExtensionNotLoadedException.php | 5 +-
.../Exception/InvalidArgumentException.php | 8 +-
.../InvalidMagicMimeFileException.php | 5 +-
.../Validator/Exception/RuntimeException.php | 8 +-
.../library/Zend/Validator/Explode.php | 13 +-
.../library/Zend/Validator/File/Count.php | 16 +-
.../library/Zend/Validator/File/Crc32.php | 2 +-
.../Zend/Validator/File/ExcludeExtension.php | 2 +-
.../Zend/Validator/File/ExcludeMimeType.php | 2 +-
.../library/Zend/Validator/File/Exists.php | 2 +-
.../library/Zend/Validator/File/Extension.php | 3 +-
.../library/Zend/Validator/File/FilesSize.php | 2 +-
.../library/Zend/Validator/File/Hash.php | 2 +-
.../library/Zend/Validator/File/ImageSize.php | 28 +-
.../Zend/Validator/File/IsCompressed.php | 4 +-
.../library/Zend/Validator/File/IsImage.php | 7 +-
.../library/Zend/Validator/File/Md5.php | 2 +-
.../library/Zend/Validator/File/MimeType.php | 2 +-
.../library/Zend/Validator/File/NotExists.php | 2 +-
.../library/Zend/Validator/File/Sha1.php | 2 +-
.../library/Zend/Validator/File/Size.php | 18 +-
.../library/Zend/Validator/File/Upload.php | 4 +-
.../Zend/Validator/File/UploadFile.php | 11 +-
.../library/Zend/Validator/File/WordCount.php | 12 +-
.../library/Zend/Validator/GreaterThan.php | 2 +-
.../library/Zend/Validator/Hex.php | 2 +-
.../library/Zend/Validator/Hostname.php | 840 ++++++++++++++++--
.../library/Zend/Validator/Hostname/Biz.php | 2 +-
.../library/Zend/Validator/Hostname/Cn.php | 2 +-
.../library/Zend/Validator/Hostname/Com.php | 4 +-
.../library/Zend/Validator/Hostname/Jp.php | 2 +-
.../library/Zend/Validator/Iban.php | 2 +-
.../library/Zend/Validator/Identical.php | 2 +-
.../library/Zend/Validator/InArray.php | 7 +-
.../library/Zend/Validator/Ip.php | 8 +-
.../library/Zend/Validator/IsInstanceOf.php | 2 +-
.../library/Zend/Validator/Isbn.php | 2 +-
.../library/Zend/Validator/LessThan.php | 2 +-
.../library/Zend/Validator/NotEmpty.php | 55 +-
.../library/Zend/Validator/Regex.php | 8 +-
.../Zend/Validator/Sitemap/Changefreq.php | 2 +-
.../Zend/Validator/Sitemap/Lastmod.php | 2 +-
.../library/Zend/Validator/Sitemap/Loc.php | 2 +-
.../Zend/Validator/Sitemap/Priority.php | 2 +-
.../Zend/Validator/StaticValidator.php | 2 +-
.../library/Zend/Validator/Step.php | 2 +-
.../library/Zend/Validator/StringLength.php | 12 +-
.../Translator/TranslatorAwareInterface.php | 2 +-
.../Translator/TranslatorInterface.php | 2 +-
.../library/Zend/Validator/Uri.php | 2 +-
.../library/Zend/Validator/ValidatorChain.php | 12 +-
.../Zend/Validator/ValidatorInterface.php | 2 +-
.../Zend/Validator/ValidatorPluginManager.php | 3 +-
.../ValidatorPluginManagerAwareInterface.php | 2 +-
.../library/Zend/Validator/composer.json | 13 +-
.../library/Zend/Version/CONTRIBUTING.md | 3 +
.../library/Zend/Version/Version.php | 175 +++-
.../library/Zend/Version/composer.json | 11 +-
.../library/Zend/View/CONTRIBUTING.md | 3 +
.../View/Exception/BadMethodCallException.php | 6 +-
.../Zend/View/Exception/DomainException.php | 6 +-
.../View/Exception/ExceptionInterface.php | 5 +-
.../Exception/InvalidArgumentException.php | 6 +-
.../View/Exception/InvalidHelperException.php | 6 +-
.../Zend/View/Exception/RuntimeException.php | 6 +-
.../Exception/UnexpectedValueException.php | 17 +
.../Zend/View/Helper/AbstractHelper.php | 2 +-
.../Zend/View/Helper/AbstractHtmlElement.php | 2 +-
.../library/Zend/View/Helper/BasePath.php | 2 +-
.../library/Zend/View/Helper/Cycle.php | 23 +-
.../library/Zend/View/Helper/DeclareVars.php | 4 +-
.../library/Zend/View/Helper/Doctype.php | 2 +-
.../library/Zend/View/Helper/EscapeCss.php | 3 +-
.../library/Zend/View/Helper/EscapeHtml.php | 3 +-
.../Zend/View/Helper/EscapeHtmlAttr.php | 3 +-
.../library/Zend/View/Helper/EscapeJs.php | 3 +-
.../library/Zend/View/Helper/EscapeUrl.php | 3 +-
.../View/Helper/Escaper/AbstractHelper.php | 10 +-
.../Zend/View/Helper/FlashMessenger.php | 63 +-
.../library/Zend/View/Helper/Gravatar.php | 4 +-
.../library/Zend/View/Helper/HeadLink.php | 58 +-
.../library/Zend/View/Helper/HeadMeta.php | 25 +-
.../library/Zend/View/Helper/HeadScript.php | 60 +-
.../library/Zend/View/Helper/HeadStyle.php | 13 +-
.../library/Zend/View/Helper/HeadTitle.php | 8 +-
.../Zend/View/Helper/HelperInterface.php | 3 +-
.../library/Zend/View/Helper/HtmlFlash.php | 2 +-
.../library/Zend/View/Helper/HtmlList.php | 2 +-
.../library/Zend/View/Helper/HtmlObject.php | 16 +-
.../library/Zend/View/Helper/HtmlPage.php | 2 +-
.../Zend/View/Helper/HtmlQuicktime.php | 2 +-
.../library/Zend/View/Helper/Identity.php | 2 +-
.../library/Zend/View/Helper/InlineScript.php | 11 +-
.../library/Zend/View/Helper/Json.php | 2 +-
.../library/Zend/View/Helper/Layout.php | 2 +-
.../library/Zend/View/Helper/Navigation.php | 21 +-
.../View/Helper/Navigation/AbstractHelper.php | 62 +-
.../View/Helper/Navigation/Breadcrumbs.php | 27 +-
.../Helper/Navigation/HelperInterface.php | 2 +-
.../Zend/View/Helper/Navigation/Links.php | 19 +-
.../Navigation/Listener/AclListener.php | 2 +-
.../Zend/View/Helper/Navigation/Menu.php | 188 ++--
.../View/Helper/Navigation/PluginManager.php | 2 +-
.../Zend/View/Helper/Navigation/Sitemap.php | 18 +-
.../Zend/View/Helper/PaginationControl.php | 15 +-
.../library/Zend/View/Helper/Partial.php | 7 +-
.../library/Zend/View/Helper/PartialLoop.php | 108 ++-
.../library/Zend/View/Helper/Placeholder.php | 6 +-
.../View/Helper/Placeholder/Container.php | 2 +-
.../Container/AbstractContainer.php | 2 +-
.../Container/AbstractStandalone.php | 10 +-
.../Zend/View/Helper/Placeholder/Registry.php | 12 +-
.../Zend/View/Helper/RenderChildModel.php | 2 +-
.../Zend/View/Helper/RenderToPlaceholder.php | 2 +-
.../library/Zend/View/Helper/ServerUrl.php | 2 +-
.../Helper/Service/FlashMessengerFactory.php | 2 +-
.../View/Helper/Service/IdentityFactory.php | 2 +-
.../library/Zend/View/Helper/Url.php | 4 +-
.../library/Zend/View/Helper/ViewModel.php | 2 +-
.../library/Zend/View/HelperPluginManager.php | 32 +-
.../View/Model/ClearableModelInterface.php | 2 +-
.../library/Zend/View/Model/ConsoleModel.php | 3 +-
.../library/Zend/View/Model/FeedModel.php | 2 +-
.../library/Zend/View/Model/JsonModel.php | 2 +-
.../Zend/View/Model/ModelInterface.php | 3 +-
.../Model/RetrievableChildrenInterface.php | 27 +
.../library/Zend/View/Model/ViewModel.php | 29 +-
.../Zend/View/Renderer/ConsoleRenderer.php | 7 +-
.../Zend/View/Renderer/FeedRenderer.php | 4 +-
.../Zend/View/Renderer/JsonRenderer.php | 2 +-
.../Zend/View/Renderer/PhpRenderer.php | 16 +-
.../Zend/View/Renderer/RendererInterface.php | 4 +-
.../View/Renderer/TreeRendererInterface.php | 2 +-
.../Zend/View/Resolver/AggregateResolver.php | 2 +-
.../Zend/View/Resolver/ResolverInterface.php | 2 +-
.../View/Resolver/TemplateMapResolver.php | 2 +-
.../Zend/View/Resolver/TemplatePathStack.php | 2 +-
.../Zend/View/Strategy/FeedStrategy.php | 3 +-
.../Zend/View/Strategy/JsonStrategy.php | 2 +-
.../View/Strategy/PhpRendererStrategy.php | 2 +-
.../library/Zend/View/Stream.php | 10 +-
.../library/Zend/View/Variables.php | 7 +-
.../zendframework/library/Zend/View/View.php | 2 +-
.../library/Zend/View/ViewEvent.php | 2 +-
.../library/Zend/View/composer.json | 35 +-
.../library/Zend/XmlRpc/AbstractValue.php | 20 +-
.../library/Zend/XmlRpc/CONTRIBUTING.md | 3 +
.../library/Zend/XmlRpc/Client.php | 18 +-
.../Client/Exception/ExceptionInterface.php | 2 +-
.../Client/Exception/FaultException.php | 2 +-
.../XmlRpc/Client/Exception/HttpException.php | 2 +-
.../Client/Exception/IntrospectException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Client/Exception/RuntimeException.php | 2 +-
.../XmlRpc/Client/ServerIntrospection.php | 2 +-
.../Zend/XmlRpc/Client/ServerProxy.php | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../XmlRpc/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../XmlRpc/Exception/RuntimeException.php | 2 +-
.../Zend/XmlRpc/Exception/ValueException.php | 2 +-
.../library/Zend/XmlRpc/Fault.php | 2 +-
.../XmlRpc/Generator/AbstractGenerator.php | 2 +-
.../Zend/XmlRpc/Generator/DomDocument.php | 4 +-
.../XmlRpc/Generator/GeneratorInterface.php | 2 +-
.../Zend/XmlRpc/Generator/XmlWriter.php | 4 +-
.../library/Zend/XmlRpc/Request.php | 2 +-
.../library/Zend/XmlRpc/Request/Http.php | 2 +-
.../library/Zend/XmlRpc/Request/Stdin.php | 2 +-
.../library/Zend/XmlRpc/Response.php | 2 +-
.../library/Zend/XmlRpc/Response/Http.php | 2 +-
.../library/Zend/XmlRpc/Server.php | 25 +-
.../library/Zend/XmlRpc/Server/Cache.php | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Server/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Server/Exception/RuntimeException.php | 2 +-
.../library/Zend/XmlRpc/Server/Fault.php | 6 +-
.../library/Zend/XmlRpc/Server/System.php | 4 +-
.../Zend/XmlRpc/Value/AbstractCollection.php | 3 +-
.../Zend/XmlRpc/Value/AbstractScalar.php | 2 +-
.../library/Zend/XmlRpc/Value/ArrayValue.php | 2 +-
.../library/Zend/XmlRpc/Value/Base64.php | 3 +-
.../library/Zend/XmlRpc/Value/BigInteger.php | 2 +-
.../library/Zend/XmlRpc/Value/Boolean.php | 5 +-
.../library/Zend/XmlRpc/Value/DateTime.php | 2 +-
.../library/Zend/XmlRpc/Value/Double.php | 3 +-
.../library/Zend/XmlRpc/Value/Integer.php | 3 +-
.../library/Zend/XmlRpc/Value/Nil.php | 3 +-
.../library/Zend/XmlRpc/Value/String.php | 3 +-
.../library/Zend/XmlRpc/Value/Struct.php | 4 +-
.../library/Zend/XmlRpc/composer.json | 13 +-
.../resources/ZendFramework-logo.png | Bin 0 -> 37536 bytes
.../zendframework/resources/composer.json | 2 +-
.../resources/languages/ar/Zend_Captcha.php | 2 +-
.../resources/languages/ar/Zend_Validate.php | 2 +-
.../resources/languages/bg/Zend_Captcha.php | 6 +-
.../resources/languages/bg/Zend_Validate.php | 226 ++---
.../resources/languages/ca/Zend_Captcha.php | 2 +-
.../resources/languages/ca/Zend_Validate.php | 17 +-
.../resources/languages/cs/Zend_Captcha.php | 2 +-
.../resources/languages/cs/Zend_Validate.php | 2 +-
.../resources/languages/de/Zend_Captcha.php | 2 +-
.../resources/languages/de/Zend_Validate.php | 95 +-
.../resources/languages/en/Zend_Captcha.php | 2 +-
.../resources/languages/en/Zend_Validate.php | 10 +-
.../resources/languages/es/Zend_Captcha.php | 23 +
.../resources/languages/es/Zend_Validate.php | 445 +++++-----
.../resources/languages/fi/Zend_Validate.php | 2 +-
.../resources/languages/fr/Zend_Captcha.php | 2 +-
.../resources/languages/fr/Zend_Validate.php | 2 +-
.../resources/languages/hr/Zend_Validate.php | 2 +-
.../resources/languages/hu/Zend_Captcha.php | 2 +-
.../resources/languages/hu/Zend_Validate.php | 2 +-
.../resources/languages/id/Zend_Captcha.php | 23 +
.../resources/languages/id/Zend_Validate.php | 251 ++++++
.../resources/languages/it/Zend_Captcha.php | 2 +-
.../resources/languages/it/Zend_Validate.php | 2 +-
.../resources/languages/ja/Zend_Captcha.php | 2 +-
.../resources/languages/ja/Zend_Validate.php | 2 +-
.../resources/languages/nl/Zend_Validate.php | 2 +-
.../resources/languages/no/Zend_Captcha.php | 2 +-
.../resources/languages/no/Zend_Validate.php | 2 +-
.../resources/languages/pl/Zend_Captcha.php | 2 +-
.../resources/languages/pl/Zend_Validate.php | 8 +-
.../languages/pt_BR/Zend_Captcha.php | 2 +-
.../languages/pt_BR/Zend_Validate.php | 2 +-
.../resources/languages/ru/Zend_Captcha.php | 23 +
.../resources/languages/ru/Zend_Validate.php | 2 +-
.../resources/languages/se/Zend_Captcha.php | 2 +-
.../resources/languages/se/Zend_Validate.php | 2 +-
.../resources/languages/sk/Zend_Captcha.php | 2 +-
.../resources/languages/sk/Zend_Validate.php | 2 +-
.../resources/languages/sl/Zend_Captcha.php | 2 +-
.../resources/languages/sl/Zend_Validate.php | 2 +-
.../resources/languages/sr/Zend_Validate.php | 6 +-
.../resources/languages/tr/Zend_Captcha.php | 2 +-
.../resources/languages/tr/Zend_Validate.php | 2 +-
.../resources/languages/uk/Zend_Captcha.php | 2 +-
.../resources/languages/uk/Zend_Validate.php | 2 +-
.../resources/languages/zh/Zend_Captcha.php | 2 +-
.../resources/languages/zh/Zend_Validate.php | 2 +-
.../languages/zh_TW/Zend_Captcha.php | 2 +-
.../languages/zh_TW/Zend_Validate.php | 2 +-
2501 files changed, 23741 insertions(+), 11397 deletions(-)
create mode 100644 vendor/zendframework/zendframework/.coveralls.yml
delete mode 100644 vendor/zendframework/zendframework/bin/check-cs.sh
create mode 100644 vendor/zendframework/zendframework/library/Zend/Authentication/AuthenticationServiceInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Authentication/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Barcode/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Cache/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/BlackHole.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcache.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcacheOptions.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcacheResourceManager.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Captcha/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Code/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/AbstractTypeableTag.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/GenericTag.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/MethodTag.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/PropertyTag.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/TagInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ThrowsTag.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/TagManager.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeClassFactory.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeGenericInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Config/AbstractConfigFactory.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Config/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Config/Reader/JavaProperties.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Console/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Console/RouteMatcher/DefaultRouteMatcher.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Console/RouteMatcher/RouteMatcherInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Crypt/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Db/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/OracleMetadata.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/IbmDb2/IbmDb2.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/IbmDb2/SelectDecorator.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Debug/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Di/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Dom/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Dom/DOMXPath.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Dom/Document.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Dom/Document/NodeList.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Dom/Document/Query.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Escaper/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/EventManager/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Feed/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/File/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Filter/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Form/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Form/InputFilterProviderFieldset.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Form/LabelAwareInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Form/LabelAwareTrait.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Http/CONTRIBUTING.md
delete mode 100644 vendor/zendframework/zendframework/library/Zend/Http/Client/Cookies.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Http/Header/ContentSecurityPolicy.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/DomainException.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Http/Header/Origin.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/I18n/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberParse.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/AbstractFileLoader.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/PhpMemoryArray.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/InputFilter/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Json/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Ldap/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Loader/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Log/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Log/Filter/Sample.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Mail/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/DomainException.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Mail/Transport/Factory.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Mail/Transport/Null.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Math/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Memory/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Mime/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/ModuleManager/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Mvc/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractConsoleController.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Mvc/Exception/BadMethodCallException.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Mvc/I18n/DummyTranslator.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Mvc/Service/LogProcessorManagerFactory.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Mvc/Service/LogWriterManagerFactory.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Navigation/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Callback.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/CallbackFactory.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/DbTableGatewayFactory.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Paginator/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionAggregate.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionManager.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/Exception/InvalidAssertionException.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Permissions/Acl/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/ProgressBar/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Serializer/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Server/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/ServiceManager/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Session/CONTRIBUTING.md
delete mode 100644 vendor/zendframework/zendframework/library/Zend/Session/Container/PhpReferenceCompatibility.php
delete mode 100644 vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage/PhpReferenceCompatibility.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Soap/CONTRIBUTING.md
delete mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpLegacyCompatibility.php
delete mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Extractor/ExtractionInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/AllGuardsTrait.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/ArrayOrTraversableGuardTrait.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/EmptyGuardTrait.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/GuardUtils.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/NullGuardTrait.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/FilterEnabledInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydrationInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareTrait.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategy/NamingStrategyInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategyEnabledInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/JsonSerializable.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/JsonSerializable/PhpLegacyCompatibility.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Stdlib/PriorityList.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Tag/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Test/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Text/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Uri/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Validator/Bitwise.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/Validator/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/Version/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/View/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/library/Zend/View/Exception/UnexpectedValueException.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/View/Model/RetrievableChildrenInterface.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/XmlRpc/CONTRIBUTING.md
create mode 100644 vendor/zendframework/zendframework/resources/ZendFramework-logo.png
create mode 100644 vendor/zendframework/zendframework/resources/languages/es/Zend_Captcha.php
create mode 100644 vendor/zendframework/zendframework/resources/languages/id/Zend_Captcha.php
create mode 100644 vendor/zendframework/zendframework/resources/languages/id/Zend_Validate.php
create mode 100644 vendor/zendframework/zendframework/resources/languages/ru/Zend_Captcha.php
diff --git a/composer.json b/composer.json
index 83952c81ab0..4c274aab89b 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
"symfony/yaml": "*",
"vufind-org/vufindcode": "*",
"vufind-org/vufindhttp": "*",
- "zendframework/zendframework": "2.2.9",
+ "zendframework/zendframework": "2.3.4",
"zendframework/zendrest": "2.*",
"zendframework/zendservice-amazon": "2.*",
"zendframework/zendservice-recaptcha": "2.*"
diff --git a/composer.lock b/composer.lock
index 9af22c26856..6729efdc822 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "0bcf71e8265164107ab6c874a47f118d",
+ "hash": "fcc3247c05b04451214d193fe0c08e4f",
"packages": [
{
"name": "aferrandini/phpqrcode",
@@ -595,23 +595,23 @@
},
{
"name": "vufind-org/vufindhttp",
- "version": "v1.0.1",
+ "version": "v1.0.2",
"source": {
"type": "git",
"url": "https://github.com/vufind-org/vufindhttp.git",
- "reference": "ddedf7636f7e8d3fff529157dbc9aa8a2d0ea210"
+ "reference": "2cd2f92cf2b43eb6a79bec0e895cb9c3d6e273d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vufind-org/vufindhttp/zipball/ddedf7636f7e8d3fff529157dbc9aa8a2d0ea210",
- "reference": "ddedf7636f7e8d3fff529157dbc9aa8a2d0ea210",
+ "url": "https://api.github.com/repos/vufind-org/vufindhttp/zipball/2cd2f92cf2b43eb6a79bec0e895cb9c3d6e273d9",
+ "reference": "2cd2f92cf2b43eb6a79bec0e895cb9c3d6e273d9",
"shasum": ""
},
"require": {
- "zendframework/zend-http": "2.2.*"
+ "zendframework/zend-http": ">=2.2"
},
"require-dev": {
- "zendframework/zend-uri": "2.2.*"
+ "zendframework/zend-uri": ">=2.2"
},
"type": "library",
"autoload": {
@@ -637,24 +637,24 @@
],
"description": "VuFind 2.x HTTP service library",
"homepage": "http://vufind.org/",
- "time": "2015-02-05 17:26:35"
+ "time": "2015-02-05 19:25:26"
},
{
"name": "zendframework/zendframework",
- "version": "2.2.9",
+ "version": "2.3.4",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf2.git",
- "reference": "351279d669cf16eb5c640f86e944fe8f84c8b181"
+ "reference": "c878e047ab1c5dcfb201974bdff607be54ccb54b"
},
"dist": {
"type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-351279d669cf16eb5c640f86e944fe8f84c8b181-zip-14eaac.zip",
- "reference": "2.2.9",
- "shasum": "022a1c0d5b3e54c3bd0333f1fedf79020ba57eea"
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-c878e047ab1c5dcfb201974bdff607be54ccb54b-zip-991680.zip",
+ "reference": "2.3.4",
+ "shasum": "45535093807295917206dd98173a704c8eaa5da9"
},
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zendxml": "~1.0-dev"
},
"replace": {
@@ -712,17 +712,19 @@
},
"require-dev": {
"doctrine/annotations": ">=1.0",
- "fabpot/php-cs-fixer": "*@dev",
+ "fabpot/php-cs-fixer": "1.*",
"ircmaxell/random-lib": "dev-master",
"ircmaxell/security-lib": "dev-master",
- "ocramius/proxy-manager": "0.4.*",
- "phpunit/phpunit": "3.7.*"
+ "mikey179/vfsstream": "1.2.*",
+ "phpunit/phpunit": "3.7.*",
+ "satooshi/php-coveralls": "dev-master",
+ "sebastianbergmann/phpcov": "1.1.0"
},
"suggest": {
"doctrine/annotations": "Doctrine Annotations >=1.0 for annotation features",
"ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
"ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
- "ocramius/proxy-manager": "ProxyManager to handle lazy initialization of services",
+ "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
"zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
"zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
},
@@ -734,8 +736,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
},
"autoload": {
@@ -753,10 +755,10 @@
"zf2"
],
"support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.2.9",
+ "source": "https://github.com/zendframework/zf2/tree/release-2.3.4",
"issues": "https://github.com/zendframework/zf2/issues"
},
- "time": "2015-01-14 16:28:50"
+ "time": "2015-01-14 16:44:17"
},
{
"name": "zendframework/zendrest",
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 1dcb625cf88..e9168e0af41 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit66b0b660d01ce78c00a4156c126432d3::getLoader();
+return ComposerAutoloaderInitdb3b970d4f9b2549098ef1857fc2f1dd::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 9d32c3e9002..13453f5b59b 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit66b0b660d01ce78c00a4156c126432d3
+class ComposerAutoloaderInitdb3b970d4f9b2549098ef1857fc2f1dd
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit66b0b660d01ce78c00a4156c126432d3
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit66b0b660d01ce78c00a4156c126432d3', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitdb3b970d4f9b2549098ef1857fc2f1dd', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit66b0b660d01ce78c00a4156c126432d3', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitdb3b970d4f9b2549098ef1857fc2f1dd', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
array_push($includePaths, get_include_path());
@@ -48,7 +48,7 @@ class ComposerAutoloaderInit66b0b660d01ce78c00a4156c126432d3
}
}
-function composerRequire66b0b660d01ce78c00a4156c126432d3($file)
+function composerRequiredb3b970d4f9b2549098ef1857fc2f1dd($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index c7f607258cf..28b21eb02e9 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -832,127 +832,6 @@
"service proxies"
]
},
- {
- "name": "zendframework/zendframework",
- "version": "2.2.9",
- "version_normalized": "2.2.9.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zf2.git",
- "reference": "351279d669cf16eb5c640f86e944fe8f84c8b181"
- },
- "dist": {
- "type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-351279d669cf16eb5c640f86e944fe8f84c8b181-zip-14eaac.zip",
- "reference": "2.2.9",
- "shasum": "022a1c0d5b3e54c3bd0333f1fedf79020ba57eea"
- },
- "require": {
- "php": ">=5.3.3",
- "zendframework/zendxml": "~1.0-dev"
- },
- "replace": {
- "zendframework/zend-authentication": "self.version",
- "zendframework/zend-barcode": "self.version",
- "zendframework/zend-cache": "self.version",
- "zendframework/zend-captcha": "self.version",
- "zendframework/zend-code": "self.version",
- "zendframework/zend-config": "self.version",
- "zendframework/zend-console": "self.version",
- "zendframework/zend-crypt": "self.version",
- "zendframework/zend-db": "self.version",
- "zendframework/zend-debug": "self.version",
- "zendframework/zend-di": "self.version",
- "zendframework/zend-dom": "self.version",
- "zendframework/zend-escaper": "self.version",
- "zendframework/zend-eventmanager": "self.version",
- "zendframework/zend-feed": "self.version",
- "zendframework/zend-file": "self.version",
- "zendframework/zend-filter": "self.version",
- "zendframework/zend-form": "self.version",
- "zendframework/zend-http": "self.version",
- "zendframework/zend-i18n": "self.version",
- "zendframework/zend-inputfilter": "self.version",
- "zendframework/zend-json": "self.version",
- "zendframework/zend-ldap": "self.version",
- "zendframework/zend-loader": "self.version",
- "zendframework/zend-log": "self.version",
- "zendframework/zend-mail": "self.version",
- "zendframework/zend-math": "self.version",
- "zendframework/zend-memory": "self.version",
- "zendframework/zend-mime": "self.version",
- "zendframework/zend-modulemanager": "self.version",
- "zendframework/zend-mvc": "self.version",
- "zendframework/zend-navigation": "self.version",
- "zendframework/zend-paginator": "self.version",
- "zendframework/zend-permissions-acl": "self.version",
- "zendframework/zend-permissions-rbac": "self.version",
- "zendframework/zend-progressbar": "self.version",
- "zendframework/zend-resources": "self.version",
- "zendframework/zend-serializer": "self.version",
- "zendframework/zend-server": "self.version",
- "zendframework/zend-servicemanager": "self.version",
- "zendframework/zend-session": "self.version",
- "zendframework/zend-soap": "self.version",
- "zendframework/zend-stdlib": "self.version",
- "zendframework/zend-tag": "self.version",
- "zendframework/zend-test": "self.version",
- "zendframework/zend-text": "self.version",
- "zendframework/zend-uri": "self.version",
- "zendframework/zend-validator": "self.version",
- "zendframework/zend-version": "self.version",
- "zendframework/zend-view": "self.version",
- "zendframework/zend-xmlrpc": "self.version"
- },
- "require-dev": {
- "doctrine/annotations": ">=1.0",
- "fabpot/php-cs-fixer": "*@dev",
- "ircmaxell/random-lib": "dev-master",
- "ircmaxell/security-lib": "dev-master",
- "ocramius/proxy-manager": "0.4.*",
- "phpunit/phpunit": "3.7.*"
- },
- "suggest": {
- "doctrine/annotations": "Doctrine Annotations >=1.0 for annotation features",
- "ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
- "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
- "ocramius/proxy-manager": "ProxyManager to handle lazy initialization of services",
- "zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
- "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
- },
- "time": "2015-01-14 16:28:50",
- "bin": [
- "bin/classmap_generator.php",
- "bin/pluginmap_generator.php",
- "bin/templatemap_generator.php"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Zend\\": "library/"
- }
- },
- "license": [
- "BSD-3-Clause"
- ],
- "description": "Zend Framework 2",
- "homepage": "http://framework.zend.com/",
- "keywords": [
- "framework",
- "zf2"
- ],
- "support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.2.9",
- "issues": "https://github.com/zendframework/zf2/issues"
- }
- },
{
"name": "symfony/yaml",
"version": "v2.6.4",
@@ -1002,54 +881,6 @@
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com"
},
- {
- "name": "vufind-org/vufindhttp",
- "version": "v1.0.1",
- "version_normalized": "1.0.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/vufind-org/vufindhttp.git",
- "reference": "ddedf7636f7e8d3fff529157dbc9aa8a2d0ea210"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/vufind-org/vufindhttp/zipball/ddedf7636f7e8d3fff529157dbc9aa8a2d0ea210",
- "reference": "ddedf7636f7e8d3fff529157dbc9aa8a2d0ea210",
- "shasum": ""
- },
- "require": {
- "zendframework/zend-http": "2.2.*"
- },
- "require-dev": {
- "zendframework/zend-uri": "2.2.*"
- },
- "time": "2015-02-05 17:26:35",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "VuFindHttp\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "GPL-2.0"
- ],
- "authors": [
- {
- "name": "David Maus",
- "email": "maus@hab.de",
- "role": "Developer"
- },
- {
- "name": "Demian Katz",
- "email": "demian.katz@villanova.edu",
- "role": "Maintainer"
- }
- ],
- "description": "VuFind 2.x HTTP service library",
- "homepage": "http://vufind.org/"
- },
{
"name": "symfony/css-selector",
"version": "v2.6.4",
@@ -1208,5 +1039,176 @@
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com"
+ },
+ {
+ "name": "zendframework/zendframework",
+ "version": "2.3.4",
+ "version_normalized": "2.3.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/zf2.git",
+ "reference": "c878e047ab1c5dcfb201974bdff607be54ccb54b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-c878e047ab1c5dcfb201974bdff607be54ccb54b-zip-991680.zip",
+ "reference": "2.3.4",
+ "shasum": "45535093807295917206dd98173a704c8eaa5da9"
+ },
+ "require": {
+ "php": ">=5.3.23",
+ "zendframework/zendxml": "~1.0-dev"
+ },
+ "replace": {
+ "zendframework/zend-authentication": "self.version",
+ "zendframework/zend-barcode": "self.version",
+ "zendframework/zend-cache": "self.version",
+ "zendframework/zend-captcha": "self.version",
+ "zendframework/zend-code": "self.version",
+ "zendframework/zend-config": "self.version",
+ "zendframework/zend-console": "self.version",
+ "zendframework/zend-crypt": "self.version",
+ "zendframework/zend-db": "self.version",
+ "zendframework/zend-debug": "self.version",
+ "zendframework/zend-di": "self.version",
+ "zendframework/zend-dom": "self.version",
+ "zendframework/zend-escaper": "self.version",
+ "zendframework/zend-eventmanager": "self.version",
+ "zendframework/zend-feed": "self.version",
+ "zendframework/zend-file": "self.version",
+ "zendframework/zend-filter": "self.version",
+ "zendframework/zend-form": "self.version",
+ "zendframework/zend-http": "self.version",
+ "zendframework/zend-i18n": "self.version",
+ "zendframework/zend-inputfilter": "self.version",
+ "zendframework/zend-json": "self.version",
+ "zendframework/zend-ldap": "self.version",
+ "zendframework/zend-loader": "self.version",
+ "zendframework/zend-log": "self.version",
+ "zendframework/zend-mail": "self.version",
+ "zendframework/zend-math": "self.version",
+ "zendframework/zend-memory": "self.version",
+ "zendframework/zend-mime": "self.version",
+ "zendframework/zend-modulemanager": "self.version",
+ "zendframework/zend-mvc": "self.version",
+ "zendframework/zend-navigation": "self.version",
+ "zendframework/zend-paginator": "self.version",
+ "zendframework/zend-permissions-acl": "self.version",
+ "zendframework/zend-permissions-rbac": "self.version",
+ "zendframework/zend-progressbar": "self.version",
+ "zendframework/zend-resources": "self.version",
+ "zendframework/zend-serializer": "self.version",
+ "zendframework/zend-server": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-session": "self.version",
+ "zendframework/zend-soap": "self.version",
+ "zendframework/zend-stdlib": "self.version",
+ "zendframework/zend-tag": "self.version",
+ "zendframework/zend-test": "self.version",
+ "zendframework/zend-text": "self.version",
+ "zendframework/zend-uri": "self.version",
+ "zendframework/zend-validator": "self.version",
+ "zendframework/zend-version": "self.version",
+ "zendframework/zend-view": "self.version",
+ "zendframework/zend-xmlrpc": "self.version"
+ },
+ "require-dev": {
+ "doctrine/annotations": ">=1.0",
+ "fabpot/php-cs-fixer": "1.*",
+ "ircmaxell/random-lib": "dev-master",
+ "ircmaxell/security-lib": "dev-master",
+ "mikey179/vfsstream": "1.2.*",
+ "phpunit/phpunit": "3.7.*",
+ "satooshi/php-coveralls": "dev-master",
+ "sebastianbergmann/phpcov": "1.1.0"
+ },
+ "suggest": {
+ "doctrine/annotations": "Doctrine Annotations >=1.0 for annotation features",
+ "ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
+ "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
+ "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
+ "zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
+ "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
+ },
+ "time": "2015-01-14 16:44:17",
+ "bin": [
+ "bin/classmap_generator.php",
+ "bin/pluginmap_generator.php",
+ "bin/templatemap_generator.php"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Zend\\": "library/"
+ }
+ },
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "Zend Framework 2",
+ "homepage": "http://framework.zend.com/",
+ "keywords": [
+ "framework",
+ "zf2"
+ ],
+ "support": {
+ "source": "https://github.com/zendframework/zf2/tree/release-2.3.4",
+ "issues": "https://github.com/zendframework/zf2/issues"
+ }
+ },
+ {
+ "name": "vufind-org/vufindhttp",
+ "version": "v1.0.2",
+ "version_normalized": "1.0.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/vufind-org/vufindhttp.git",
+ "reference": "2cd2f92cf2b43eb6a79bec0e895cb9c3d6e273d9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/vufind-org/vufindhttp/zipball/2cd2f92cf2b43eb6a79bec0e895cb9c3d6e273d9",
+ "reference": "2cd2f92cf2b43eb6a79bec0e895cb9c3d6e273d9",
+ "shasum": ""
+ },
+ "require": {
+ "zendframework/zend-http": ">=2.2"
+ },
+ "require-dev": {
+ "zendframework/zend-uri": ">=2.2"
+ },
+ "time": "2015-02-05 19:25:26",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "VuFindHttp\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "GPL-2.0"
+ ],
+ "authors": [
+ {
+ "name": "David Maus",
+ "email": "maus@hab.de",
+ "role": "Developer"
+ },
+ {
+ "name": "Demian Katz",
+ "email": "demian.katz@villanova.edu",
+ "role": "Maintainer"
+ }
+ ],
+ "description": "VuFind 2.x HTTP service library",
+ "homepage": "http://vufind.org/"
}
]
diff --git a/vendor/vufind-org/vufindhttp/composer.json b/vendor/vufind-org/vufindhttp/composer.json
index c082536b960..72110859c5e 100644
--- a/vendor/vufind-org/vufindhttp/composer.json
+++ b/vendor/vufind-org/vufindhttp/composer.json
@@ -19,10 +19,10 @@
"issues": "http://vufind.org/jira"
},
"require": {
- "zendframework/zend-http": "2.2.*"
+ "zendframework/zend-http": ">=2.2"
},
"require-dev": {
- "zendframework/zend-uri": "2.2.*"
+ "zendframework/zend-uri": ">=2.2"
},
"autoload": {
"psr-0": {
diff --git a/vendor/zendframework/zendframework/.coveralls.yml b/vendor/zendframework/zendframework/.coveralls.yml
new file mode 100644
index 00000000000..2067cef8ecc
--- /dev/null
+++ b/vendor/zendframework/zendframework/.coveralls.yml
@@ -0,0 +1 @@
+src_dir: library
diff --git a/vendor/zendframework/zendframework/CHANGELOG.md b/vendor/zendframework/zendframework/CHANGELOG.md
index e5242456c88..f9606e29dd9 100644
--- a/vendor/zendframework/zendframework/CHANGELOG.md
+++ b/vendor/zendframework/zendframework/CHANGELOG.md
@@ -1,5 +1,708 @@
# CHANGELOG
+## 2.3.4 (2015-01-14)
+
+- [3758: partialLoop/partial View Helper can not be nested when using setObjectKey](https://github.com/zendframework/zf2/issues/3758)
+- [4517: Incompatible with RecursiveIterator::hasChildren() Zend\Navigation\AbstractContainer](https://github.com/zendframework/zf2/issues/4517)
+- [4960: DateTime form element weird DateInterval step!?](https://github.com/zendframework/zf2/issues/4960)
+- [5992: Bug fix: Removes length limit (of TLD) when validating a hostname](https://github.com/zendframework/zf2/pull/5992)
+- [6231: fixing http query parameters](https://github.com/zendframework/zf2/pull/6231)
+- [6263: Collection attempts to access `object` property on `$this->targetElement`](https://github.com/zendframework/zf2/issues/6263)
+- [6279: Return the text value in _ array key](https://github.com/zendframework/zf2/pull/6279)
+- [6298: Handle regular form elements as target elements of `Zend\Form\Element\Collection`.](https://github.com/zendframework/zf2/pull/6298)
+- [6312: [Zend\I18n\ php.ini setting "intl.use_exceptions" on true](https://github.com/zendframework/zf2/issues/6312)
+- [6324: Redis::setItems - the last item is overwritten](https://github.com/zendframework/zf2/issues/6324)
+- [6358: Wrong datetime format in Atom 1.0 date constructs](https://github.com/zendframework/zf2/issues/6358)
+- [6398: Preserve the fluent interface](https://github.com/zendframework/zf2/pull/6398)
+- [6435: Race Condition in Zend\Cache\Storage\Adapter\Filesystem::prepareDirectoryStructure](https://github.com/zendframework/zf2/issues/6435)
+- [6492: [Http\ Add body support for DELETE/OPTIONS request](https://github.com/zendframework/zf2/pull/6492)
+- [6518: Suggested workaround for #6263](https://github.com/zendframework/zf2/pull/6518)
+- [6526: [Http\ Rationalize timeout behavior between adapters](https://github.com/zendframework/zf2/pull/6526)
+- [6537: Mime Part class rewind fix](https://github.com/zendframework/zf2/pull/6537)
+- [6539: PHPCS fixes for Zend\Captcha](https://github.com/zendframework/zf2/pull/6539)
+- [6548: ServiceManager peering does not respect shared flag ](https://github.com/zendframework/zf2/pull/6548)
+- [6561: Remove old component fork origins](https://github.com/zendframework/zf2/issues/6561)
+- [6562: replacing array_key_exists with faster isset calls](https://github.com/zendframework/zf2/pull/6562)
+- [6569: Should we use constant for events in Zend\Db\TableGateway\Feature\EventFeature?](https://github.com/zendframework/zf2/issues/6569)
+- [6573: fixes #6435: Race Condition in filesystem cache on prepare dir structure](https://github.com/zendframework/zf2/pull/6573)
+- [6575: fixed #6324: Redis::setItems: the last item is overwritten](https://github.com/zendframework/zf2/pull/6575)
+- [6577: added missing register services at Zend\Paginator\AdapterPluginManager](https://github.com/zendframework/zf2/pull/6577)
+- [6585: Form Collection `No element by the name of [2\ found in form`](https://github.com/zendframework/zf2/issues/6585)
+- [6586: Fixes typo](https://github.com/zendframework/zf2/pull/6586)
+- [6594: Update classmap_generator.php](https://github.com/zendframework/zf2/pull/6594)
+- [6598: add try/catch around statements that execute intl_is_failure()](https://github.com/zendframework/zf2/pull/6598)
+- [6614: fixes #6585](https://github.com/zendframework/zf2/pull/6614)
+- [6625: Create Zend_Captcha.php translation for spanish.](https://github.com/zendframework/zf2/pull/6625)
+- [6628: added missing "JavaProperties" into Zend\Config\ReaderPluginManager and register the extension into Factory](https://github.com/zendframework/zf2/pull/6628)
+- [6629: Fixes CS : unused use](https://github.com/zendframework/zf2/pull/6629)
+- [6630: Use 2.* in require-dev zendframework/zend-escaper in Zend\Debug\composer.json](https://github.com/zendframework/zf2/pull/6630)
+- [6631: Added zendframework/zend-servicemanager into suggest at Zend\Permissions\Acl's composer.json](https://github.com/zendframework/zf2/pull/6631)
+- [6634: Allow `crossorigin` attribute in headScript](https://github.com/zendframework/zf2/pull/6634)
+- [6635: Allow `sizes` attribute in headLink (used with rel="icon")](https://github.com/zendframework/zf2/pull/6635)
+- [6636: AbstractControllerTestCase fails with multidimensional params array](https://github.com/zendframework/zf2/issues/6636)
+- [6637: Allow multidimensional params in AbstractControllerTestCase](https://github.com/zendframework/zf2/pull/6637)
+- [6643: change !is_null to $value !== null for consistency](https://github.com/zendframework/zf2/pull/6643)
+- [6644: The /e modifier of preg_replace() deprecated as of PHP 5.5.0](https://github.com/zendframework/zf2/pull/6644)
+- [6645: isValid sets up old values?](https://github.com/zendframework/zf2/issues/6645)
+- [6647: Zend\I18n\Validator\Float does not set error message on NOT_FLOAT.](https://github.com/zendframework/zf2/issues/6647)
+- [6648: Fixes #6647 : Zend\I18n\Validator\Float set error message for NOT_FLOAT](https://github.com/zendframework/zf2/pull/6648)
+- [6649: Exception thrown when value_options is empty in Form\View\ViewHelper\FormMultiCheckbox](https://github.com/zendframework/zf2/issues/6649)
+- [6655: 6649](https://github.com/zendframework/zf2/pull/6655)
+- [6660: prefer single quote](https://github.com/zendframework/zf2/pull/6660)
+- [6673: SetCookie: let it accept DateTime object](https://github.com/zendframework/zf2/issues/6673)
+- [6674: PHPCS fixes for Zend\View](https://github.com/zendframework/zf2/pull/6674)
+- [6684: PHPCS fixes for Zend\Text](https://github.com/zendframework/zf2/pull/6684)
+- [6685: PHPCS fixes for Zend\Tag](https://github.com/zendframework/zf2/pull/6685)
+- [6686: @return self correction](https://github.com/zendframework/zf2/pull/6686)
+- [6692: fix typo in form select view helper](https://github.com/zendframework/zf2/pull/6692)
+- [6698: PHPCS fixes for Zend\Di](https://github.com/zendframework/zf2/pull/6698)
+- [6699: PHPCS fixes for Zend\Dom](https://github.com/zendframework/zf2/pull/6699)
+- [6700: PHPCS fixes for Zend\Feed](https://github.com/zendframework/zf2/pull/6700)
+- [6701: PHPCS fixes for Zend\File](https://github.com/zendframework/zf2/pull/6701)
+- [6711: Fix for BC break #6645 where isValid() sets up old values](https://github.com/zendframework/zf2/pull/6711)
+- [6718: Zend\Db relies on Zend\Stdlib due to items in the Zend\Db\Sql package](https://github.com/zendframework/zf2/pull/6718)
+- [6719: Zend\Db\Sql\Select::order(): accept ExpressionInterface instead of Expression](https://github.com/zendframework/zf2/issues/6719)
+- [6722: Db order expressioninterface](https://github.com/zendframework/zf2/pull/6722)
+- [6726: Zend\Db\TableGateway: Alias for table](https://github.com/zendframework/zf2/issues/6726)
+- [6730: Zend\Config\Reader\Xml bug with close file after open](https://github.com/zendframework/zf2/issues/6730)
+- [6743: Fixes cs : space after if and elseif in deep conditional](https://github.com/zendframework/zf2/pull/6743)
+- [6750: yoda conditions in prg controller plugin](https://github.com/zendframework/zf2/pull/6750)
+- [6751: added ocramius/proxy-manager into suggest at Zend\ServiceManager's composer.json](https://github.com/zendframework/zf2/pull/6751)
+- [6760: pg_connect params encodings](https://github.com/zendframework/zf2/issues/6760)
+- [6761: Fixes #6730 : close() xml reader on fromFile() and fromString()](https://github.com/zendframework/zf2/pull/6761)
+- [6762: Issue in gettext file load, when plural part from one phrase exists as singular part in another](https://github.com/zendframework/zf2/issues/6762)
+- [6765: hotfix for issue with wrong gettext plural](https://github.com/zendframework/zf2/pull/6765)
+- [6768: Zend\Stdlib\PriorityList cannot contain false values](https://github.com/zendframework/zf2/issues/6768)
+- [6773: Fixes #6768 : boolean false values at priority list should be valid](https://github.com/zendframework/zf2/pull/6773)
+- [6778: added zendframework/zendxml into suggest at Zend\Json's composer.json](https://github.com/zendframework/zf2/pull/6778)
+- [6779: added zendframework/zend-validator and zendframework/zend-filter into suggest at Zend\Console's composer.json](https://github.com/zendframework/zf2/pull/6779)
+- [6781: Added some missing hash constants in Zend/Crypt/Key/Derivation/SaltedS2k](https://github.com/zendframework/zf2/pull/6781)
+- [6785: remove PHP_VERSION_ID check before 50323](https://github.com/zendframework/zf2/pull/6785)
+- [6787: Fixes #6760 : decode http_build_query on connection string at Pgsql Connection](https://github.com/zendframework/zf2/pull/6787)
+- [6789: detach() is now inherited from AbstractListenerAgregate.](https://github.com/zendframework/zf2/pull/6789)
+- [6797: Fixed the call to addBranch() to include $branchName](https://github.com/zendframework/zf2/pull/6797)
+- [6798: Fix annotations on zend db](https://github.com/zendframework/zf2/pull/6798)
+- [6814: Invalid behaviour of classmap_generator_php for PHP >=5.5 ::class constant ](https://github.com/zendframework/zf2/issues/6814)
+- [6815: Update AbstractAdapter.php](https://github.com/zendframework/zf2/pull/6815)
+- [6818: Add event manager to session for it is needed.](https://github.com/zendframework/zf2/pull/6818)
+- [6820: Broken behavior for SET in SQL update](https://github.com/zendframework/zf2/issues/6820)
+- [6825: Incompatible with RecursiveIterator](https://github.com/zendframework/zf2/pull/6825)
+- [6826: removed navigation helper menu unused use statement](https://github.com/zendframework/zf2/pull/6826)
+- [6834: Zend\Db\Sql\Update building update statement](https://github.com/zendframework/zf2/issues/6834)
+- [6837: [Zend\Test\ Provide fix when 2 mandatory strings are used in route console](https://github.com/zendframework/zf2/pull/6837)
+- [6845: Problem iterating buffered ResultSet](https://github.com/zendframework/zf2/issues/6845)
+- [6847: Fix iterating over buffered ResultSet](https://github.com/zendframework/zf2/pull/6847)
+- [6849: Db/Sql/Predicate/Expression: Fix method argument handling](https://github.com/zendframework/zf2/pull/6849)
+- [6854: Added "autocomplete" to the list of valid attributes for textarea and select view helpers.](https://github.com/zendframework/zf2/pull/6854)
+- [6858: Allow Session\Container names to start with numbers](https://github.com/zendframework/zf2/pull/6858)
+- [6861: Fixes #6828 move zend\serializer deps how required](https://github.com/zendframework/zf2/pull/6861)
+- [6867: Update EventManagerInterface.php](https://github.com/zendframework/zf2/pull/6867)
+- [6869: ObjectProperty Hydrator should only hydrate public properties (fix + new test)](https://github.com/zendframework/zf2/pull/6869)
+- [6871: Memcached returns FALSE on failure](https://github.com/zendframework/zf2/pull/6871)
+- [6872: Update PHP-CS-Fixer and restrict .php_cs](https://github.com/zendframework/zf2/pull/6872)
+- [6873: CS Fix: string access and guard clauses](https://github.com/zendframework/zf2/pull/6873)
+- [6877: Fixed #6818](https://github.com/zendframework/zf2/pull/6877)
+- [6878: Cache: fixed 'Undefined index' error in memory adapter on access tags of...](https://github.com/zendframework/zf2/pull/6878)
+- [6879: Rebased and cleaned up #6279](https://github.com/zendframework/zf2/pull/6879)
+- [6880: Fix for #6263 (replaces PR #6518)](https://github.com/zendframework/zf2/pull/6880)
+- [6881: Bug in Zend\Stdlib\PriorityList->valid() ](https://github.com/zendframework/zf2/issues/6881)
+- [6891: Fixes Zend\Json\Json's composer.json containing single backslash](https://github.com/zendframework/zf2/pull/6891)
+- [6893: Zend\Code\ClassScanner cannot scan abstract method when class has properties and other methods.](https://github.com/zendframework/zf2/issues/6893)
+- [6895: Fix documentation](https://github.com/zendframework/zf2/pull/6895)
+- [6896: Fix for https cases for Apache on IBM i](https://github.com/zendframework/zf2/pull/6896)
+- [6897: Fix minor documentation typo](https://github.com/zendframework/zf2/pull/6897)
+- [6900: ArrayUtils performance tweak](https://github.com/zendframework/zf2/pull/6900)
+- [6901: Added a failing test for #6893](https://github.com/zendframework/zf2/pull/6901)
+- [6902: Throw an ServiceNotFoundException in AbstractPluginManager when the invokable does not exist.](https://github.com/zendframework/zf2/pull/6902)
+- [6904: Patch test case on Stdlib/PriorityListTest](https://github.com/zendframework/zf2/pull/6904)
+- [6907: allow header field value of "0"](https://github.com/zendframework/zf2/pull/6907)
+- [6914: Fix: Remove unused parameter and class property](https://github.com/zendframework/zf2/pull/6914)
+- [6915: Fix: More unused local variables](https://github.com/zendframework/zf2/pull/6915)
+- [6916: Fix: Yet another unused local variable](https://github.com/zendframework/zf2/pull/6916)
+- [6917: Fix: Unnecessary FCQN](https://github.com/zendframework/zf2/pull/6917)
+- [6918: Fix: Add missing return tag](https://github.com/zendframework/zf2/pull/6918)
+- [6919: Code improvement - removed unused variable](https://github.com/zendframework/zf2/pull/6919)
+- [6921: Improvement - removed some unnecessary variable assignment](https://github.com/zendframework/zf2/pull/6921)
+- [6923: PR for #6673. Allow to set DateTimeObject for SetCookie Expires ](https://github.com/zendframework/zf2/pull/6923)
+- [6927: Hotfix/6278](https://github.com/zendframework/zf2/pull/6927)
+- [6928: Hydrator naming strategy zend filter dependency](https://github.com/zendframework/zf2/pull/6928)
+- [6932: added zendframework/zend-cache into suggest at Zend\XmlRpc's composer.json](https://github.com/zendframework/zf2/pull/6932)
+- [6933: Remove dependency of Zend\ModuleManager on Zend\Mvc](https://github.com/zendframework/zf2/issues/6933)
+- [6935: bugfix wrong atom datetime format in updated](https://github.com/zendframework/zf2/pull/6935)
+- [6937: Update Hostname.php](https://github.com/zendframework/zf2/pull/6937)
+- [6939: Fixes CS on latest build on master : trailing_spaces](https://github.com/zendframework/zf2/pull/6939)
+- [6941: Zend\Validator tests refactoring](https://github.com/zendframework/zf2/issues/6941)
+- [6943: Fixed #6941](https://github.com/zendframework/zf2/pull/6943)
+- [6946: fix #6814: ignore php 5.5 scalar class name resolution](https://github.com/zendframework/zf2/pull/6946)
+- [6948: Improve type hints](https://github.com/zendframework/zf2/pull/6948)
+- [6949: Use hydrator variable only when hydrator variable is assigned](https://github.com/zendframework/zf2/pull/6949)
+- [6953: Little code improvements](https://github.com/zendframework/zf2/pull/6953)
+- [6958: Encoding Type is not set when sending Request object set as POST](https://github.com/zendframework/zf2/issues/6958)
+- [6959: Bug #6958 Make sure encoding type is set when sending Request](https://github.com/zendframework/zf2/pull/6959)
+- [6964: fixes #6952 / phpdoc Zend/Http/Request](https://github.com/zendframework/zf2/pull/6964)
+- [6967: PHPCS: Zend\View](https://github.com/zendframework/zf2/pull/6967)
+- [6968: Removed query method from mocks after issue 6798](https://github.com/zendframework/zf2/pull/6968)
+- [6971: PHPCS fixes for Zend\Http](https://github.com/zendframework/zf2/pull/6971)
+- [6972: PHPCS fixes for Zend\Json](https://github.com/zendframework/zf2/pull/6972)
+- [6973: PHPCS fixes for Zend\InputFilter](https://github.com/zendframework/zf2/pull/6973)
+- [6974: PHPCS fixes for Zend\Form](https://github.com/zendframework/zf2/pull/6974)
+- [6975: PHPCS fixes for Zend\I18n](https://github.com/zendframework/zf2/pull/6975)
+- [6976: PHPCS fixes for Zend\Filter](https://github.com/zendframework/zf2/pull/6976)
+- [6978: fix PHPCS errors for Zend\Test](https://github.com/zendframework/zf2/pull/6978)
+- [6979: fix PHPCS errors for Zend\Text](https://github.com/zendframework/zf2/pull/6979)
+- [6980: fix PHPCS errors for Zend\Uri](https://github.com/zendframework/zf2/pull/6980)
+- [6981: fix PHPCS errors for Zend\XmlRpc](https://github.com/zendframework/zf2/pull/6981)
+- [6982: fix PHPCS errors for Zend\Validator](https://github.com/zendframework/zf2/pull/6982)
+- [6984: PHPCS fixes for Zend\Log](https://github.com/zendframework/zf2/pull/6984)
+- [6985: PHPCS fixes for Zend\Mvc](https://github.com/zendframework/zf2/pull/6985)
+- [6986: PHPCS fixes for Zend\Ldap](https://github.com/zendframework/zf2/pull/6986)
+- [6987: PHPCS fixes for Zend\Mail](https://github.com/zendframework/zf2/pull/6987)
+- [6988: PHPCS fixes for Zend\Server](https://github.com/zendframework/zf2/pull/6988)
+- [6989: PHPCS fixes for Zend\Stdlib](https://github.com/zendframework/zf2/pull/6989)
+- [6990: PHPCS fixes for Zend\Serializer](https://github.com/zendframework/zf2/pull/6990)
+- [6991: PHPCS fixes for Zend\Session](https://github.com/zendframework/zf2/pull/6991)
+- [6992: PHPCS fixes for Zend\Memory](https://github.com/zendframework/zf2/pull/6992)
+- [6993: PHPCS fixes for Zend\Paginator](https://github.com/zendframework/zf2/pull/6993)
+- [6994: PHPCS fixes for Zend\ProgressBar](https://github.com/zendframework/zf2/pull/6994)
+- [6995: PHPCS fixes for Zend\ServiceManager](https://github.com/zendframework/zf2/pull/6995)
+- [6996: PHPCS fixes for Zend\Permissions](https://github.com/zendframework/zf2/pull/6996)
+- [6997: PHPCS fixes for Zend\Soap](https://github.com/zendframework/zf2/pull/6997)
+- [6998: PHPCS fixes for Zend\Mime](https://github.com/zendframework/zf2/pull/6998)
+- [6999: PHPCS fixes for Zend\Loader](https://github.com/zendframework/zf2/pull/6999)
+- [7000: PHPCS fixes for Zend\ModuleManager](https://github.com/zendframework/zf2/pull/7000)
+- [7001: PHPCS fixes for Zend\Test](https://github.com/zendframework/zf2/pull/7001)
+- [7002: Changing encode from View Helper is not passed to EscapeHtmlAttrHelper](https://github.com/zendframework/zf2/pull/7002)
+- [7006: optimized performance of Zend\Stdlib\AbstractOptions](https://github.com/zendframework/zf2/pull/7006)
+- [7008: Bug in PriorityList](https://github.com/zendframework/zf2/pull/7008)
+- [7011: .php_cs - sort fixers](https://github.com/zendframework/zf2/pull/7011)
+- [7012: PHP >=5.4 Syntax in AbstractHelperTest](https://github.com/zendframework/zf2/issues/7012)
+- [7013: Hotfix/#7012 zend view php 5.4 syntax removal](https://github.com/zendframework/zf2/pull/7013)
+- [7018: [Validator\ Hostname: disallowed Unicode code point](https://github.com/zendframework/zf2/issues/7018)
+- [7019: fixed #7018 : Hostname validator used disallowed unicode code points](https://github.com/zendframework/zf2/pull/7019)
+- [7022: [Zend\Http\ check if costant TESTS_ZEND_HTTP_CLIENT_ONLINE is defined](https://github.com/zendframework/zf2/issues/7022)
+- [7023: Fixes #7022 TESTS_ZEND_HTTP_CLIENT_ONLINE check](https://github.com/zendframework/zf2/pull/7023)
+- [7030: #6414-Add a condition for captcha element](https://github.com/zendframework/zf2/pull/7030)
+- [7033: Cache: fixed some minor documentation issues](https://github.com/zendframework/zf2/pull/7033)
+- [7036: PhpDoc fixes for Zend\Mvc](https://github.com/zendframework/zf2/pull/7036)
+- [7047: cs fixes for Zend\Cache](https://github.com/zendframework/zf2/pull/7047)
+- [7048: cs fixes for Zend\Code](https://github.com/zendframework/zf2/pull/7048)
+- [7060: Removed hard coded dependency to Zend\Mvc from Zend\ModuleManager](https://github.com/zendframework/zf2/pull/7060)
+- [7061: remove unused imports](https://github.com/zendframework/zf2/pull/7061)
+- [7062: remove unused variables](https://github.com/zendframework/zf2/pull/7062)
+- [7063: PhpDoc: fix return types and other incompatibilities](https://github.com/zendframework/zf2/pull/7063)
+- [7064: Need update dependencies in zendframework/zend-db](https://github.com/zendframework/zf2/issues/7064)
+- [7065: Cache: fixed CAS-Feature broken for APC adapter since 2.3.0](https://github.com/zendframework/zf2/pull/7065)
+- [7066: Use constant for events in Zend\Db\TableGateway\Feature\EventFeature](https://github.com/zendframework/zf2/pull/7066)
+- [7068: Cache: better compatibility with APCu](https://github.com/zendframework/zf2/pull/7068)
+- [7070: Travis optimizations](https://github.com/zendframework/zf2/pull/7070)
+- [7074: PSR2/PHPDoc fix for Zend\Http\Client](https://github.com/zendframework/zf2/pull/7074)
+- [7078: Fixes CS latest build on travis : master](https://github.com/zendframework/zf2/pull/7078)
+- [7080: Filter\Encrypt can't filter numbers](https://github.com/zendframework/zf2/pull/7080)
+- [7083: Hotfix/encrypt numbers](https://github.com/zendframework/zf2/pull/7083)
+- [7086: Honor returned status code for HEAD requests](https://github.com/zendframework/zf2/pull/7086)
+- [7087: Happy new year 2015 : master](https://github.com/zendframework/zf2/pull/7087)
+- [7089: Correct docblock](https://github.com/zendframework/zf2/pull/7089)
+- [7093: Scope objectKey in nested partialLoop call](https://github.com/zendframework/zf2/pull/7093)
+- [7101: Fixes DocBlocks in Zend\Barcode\Object\AbstractObject](https://github.com/zendframework/zf2/pull/7101)
+- [7108: Fix form annotation options](https://github.com/zendframework/zf2/pull/7108)
+- [7109: Improved disabled inputs testing when binding values into fieldset object](https://github.com/zendframework/zf2/pull/7109)
+- [7110: Fix for validation timeouts, issue #4960](https://github.com/zendframework/zf2/pull/7110)
+- [7112: Updated the readme with the logo](https://github.com/zendframework/zf2/pull/7112)
+- [7114: added missing return $this to setValue method.](https://github.com/zendframework/zf2/pull/7114)
+- [7117: Updated german translation file](https://github.com/zendframework/zf2/pull/7117)
+
+### SECURITY UPDATES
+
+- **ZF2015-01:** Session validators were not run if set before session start.
+ Essentially, the validators were writing to the `$_SESSION` superglobal before
+ session start, which meant the data was overwritten once the session began.
+ This meant on subsequent calls, the validators had no data to compare against,
+ making the sessions automatically valid. We have provided patches to ensure
+ that validators are run only after the session has begun, which will ensure
+ they validate sessions correctly going forward. If you use `Zend\Session`
+ validators, we recommend upgrading immediately.
+
+## 2.3.3 (2014-09-17)
+
+- [6576: Custom barcode adapter wasn't being set in options](https://github.com/zendframework/zf2/pull/6576)
+- [6664: Use is_file to check for an uploaded file](https://github.com/zendframework/zf2/pull/6664)
+
+### SECURITY UPDATES
+
+- **ZF2014-05:** Due to an issue that existed in PHP's LDAP extension, it is
+ possible to perform an unauthenticated simple bind against a LDAP server by
+ using a null byte for the password, regardless of whether or not the user
+ normally requires a password. We have provided a patch in order to protect
+ users of unpatched PHP versions (PHP 5.5 <= 5.5.11, PHP 5.4 <= 5.4.27, all
+ versions of PHP 5.3 and below). If you use `Zend\Ldap` and are on an affected
+ version of PHP, we recommend upgrading immediately.
+- **ZF2014-06:** A potential SQL injection vector existed when using a SQL
+ Server adapter to manually quote values due to the fact that it was not
+ escaping null bytes. Code was added to ensure null bytes are escaped, and
+ thus mitigate the SQLi vector. We do not recommend manually quoting values,
+ but if you do, and use the SQL Server adapter without PDO, we recommend
+ upgrading immediately.
+
+## 2.3.2 (2014-08-11)
+
+- [4747: Zend\Code\Generator\FileGenerator problem](https://github.com/zendframework/zf2/issues/4747)
+- [5144: Unit tests get failed occasionaly](https://github.com/zendframework/zf2/issues/5144)
+- [5794: Oracle incorrect SELECT FROM decoration with table alias when using nested selects](https://github.com/zendframework/zf2/pull/5794)
+- [5851: Sqlsrv fixes - cursor type fix, utf8 support, transaction support, varbinary update support](https://github.com/zendframework/zf2/pull/5851)
+- [5962: Fatal Error on /Mime/Message.php on line 111](https://github.com/zendframework/zf2/issues/5962)
+- [6033: Fixed charset support for Pdo_Pgsql.](https://github.com/zendframework/zf2/pull/6033)
+- [6038: fix HeadLink docblock method declaration hints](https://github.com/zendframework/zf2/pull/6038)
+- [6119: Allow OCI8 Statment to Handle LOB data type](https://github.com/zendframework/zf2/pull/6119)
+- [6141: Fix: Indentation of method arguments](https://github.com/zendframework/zf2/pull/6141)
+- [6143: Form - Ignore user values for disabled elements on bind](https://github.com/zendframework/zf2/issues/6143)
+- [6144: Support shorthand Priority filter in Log\AbstractWriter](https://github.com/zendframework/zf2/pull/6144)
+- [6146: Collection validation with element as target element](https://github.com/zendframework/zf2/pull/6146)
+- [6147: Session validation listeners may return `null`, erroneously causing validation to fail](https://github.com/zendframework/zf2/pull/6147)
+- [6149: Update Collection.php](https://github.com/zendframework/zf2/pull/6149)
+- [6157: Fixes #5962](https://github.com/zendframework/zf2/pull/6157)
+- [6158: fix misspelling of 'preferred'](https://github.com/zendframework/zf2/pull/6158)
+- [6159: add support number of string in __construct of Priority](https://github.com/zendframework/zf2/pull/6159)
+- [6160: CollectionInputFilter->getCount() gives wrong count on consecutive setData() calls](https://github.com/zendframework/zf2/pull/6160)
+- [6163: remove duplicate registered "zendframework/zend-session" in composer.json](https://github.com/zendframework/zf2/pull/6163)
+- [6164: Fix: Add missing throws tags](https://github.com/zendframework/zf2/pull/6164)
+- [6165: ZF2 Paginator Does Not Work with DB2](https://github.com/zendframework/zf2/issues/6165)
+- [6168: Math\Rand::getInteger returns no values for the given range](https://github.com/zendframework/zf2/pull/6168)
+- [6170: [BUGFIX\ missing Zend XML-RPC support library](https://github.com/zendframework/zf2/pull/6170)
+- [6176: Fix: C/P error when creating ProcessorPluginManager](https://github.com/zendframework/zf2/pull/6176)
+- [6177: Fix: Indentation of array initialization, missing trailing comma](https://github.com/zendframework/zf2/pull/6177)
+- [6179: Fix: Indentation, missing trailing commas, extra empty lines in Log\Logger](https://github.com/zendframework/zf2/pull/6179)
+- [6180: Fix: Fix PHP-CS-Fixer to a working version](https://github.com/zendframework/zf2/pull/6180)
+- [6184: Fix mongo handler](https://github.com/zendframework/zf2/pull/6184)
+- [6186: Fix: Update fabpot/php-cs-fixer, remove optional path argument from command](https://github.com/zendframework/zf2/pull/6186)
+- [6187: Add links to main repo in each composer.json](https://github.com/zendframework/zf2/issues/6187)
+- [6188: Add CONTRIBUTE.md files in each component](https://github.com/zendframework/zf2/issues/6188)
+- [6191: Fixes Typo](https://github.com/zendframework/zf2/pull/6191)
+- [6192: Fixes #6187](https://github.com/zendframework/zf2/pull/6192)
+- [6200: Fix: Exceptions raised in Soap/Server can leave XML entity loader disabled.](https://github.com/zendframework/zf2/pull/6200)
+- [6205: Use composer's autoload-dev feature](https://github.com/zendframework/zf2/pull/6205)
+- [6207: Hotfix for UnderscoreNamingStrategy](https://github.com/zendframework/zf2/pull/6207)
+- [6213: Fixes typo algorihtm -> algorithm](https://github.com/zendframework/zf2/pull/6213)
+- [6214: Added hostname for OCI8 integration tests (required on linux)](https://github.com/zendframework/zf2/pull/6214)
+- [6215: Console Adapter typo](https://github.com/zendframework/zf2/pull/6215)
+- [6217: Fixes typo : contructor -> constructor](https://github.com/zendframework/zf2/pull/6217)
+- [6218: `iconv.internal_encoding` is deprecated](https://github.com/zendframework/zf2/issues/6218)
+- [6219: #6218 - applying hotfix for `iconv.internal_encoding` deprecation](https://github.com/zendframework/zf2/pull/6219)
+- [6222: Fix a sequence name with double quotes for PostgreSQL to preserve name registry](https://github.com/zendframework/zf2/pull/6222)
+- [6223: Fix double registration of a complex type](https://github.com/zendframework/zf2/pull/6223)
+- [6228: Fix parameter format causing duplicate mails](https://github.com/zendframework/zf2/pull/6228)
+- [6237: Fixes typos](https://github.com/zendframework/zf2/pull/6237)
+- [6238: Fix: CS of closure](https://github.com/zendframework/zf2/pull/6238)
+- [6245: Fix invalid step error caused by DST](https://github.com/zendframework/zf2/pull/6245)
+- [6250: Db\Sql\Update use sortable set](https://github.com/zendframework/zf2/pull/6250)
+- [6253: Zend code doesn't generate heredoc correctly ](https://github.com/zendframework/zf2/issues/6253)
+- [6254: Fixes #6188](https://github.com/zendframework/zf2/pull/6254)
+- [6255: Zend code generator eats last brace](https://github.com/zendframework/zf2/issues/6255)
+- [6261: Update StringTrim to allow '0' as charlist](https://github.com/zendframework/zf2/pull/6261)
+- [6266: Fix delegators config with Mvc\Application](https://github.com/zendframework/zf2/pull/6266)
+- [6277: Digit filter should ignore boolean input](https://github.com/zendframework/zf2/pull/6277)
+- [6281: SessionHandler - MongoDbOptions default saveOptions not valid for pre-1.3 mongo driver](https://github.com/zendframework/zf2/issues/6281)
+- [6283: Fixes #6253 updated regex to properly respect heredoc](https://github.com/zendframework/zf2/pull/6283)
+- [6286: Fixes #6255 - removed regex for token parsing](https://github.com/zendframework/zf2/pull/6286)
+- [6292: Created russian translation for Zend_Captcha.](https://github.com/zendframework/zf2/pull/6292)
+- [6293: zend-barcode without zend-servicemanager and zend-validator](https://github.com/zendframework/zf2/issues/6293)
+- [6295: Fieldset ignore disabled elements](https://github.com/zendframework/zf2/pull/6295)
+- [6297: DateTime (I18n) uses a wrong function in "isValid" function](https://github.com/zendframework/zf2/issues/6297)
+- [6300: Float (I18n) parsing trouble](https://github.com/zendframework/zf2/issues/6300)
+- [6302: Fixes issue #4747 - FileGenerator now properly generates files.](https://github.com/zendframework/zf2/pull/6302)
+- [6303: fixes #5144: Cache: wait for full second before start TTL tests](https://github.com/zendframework/zf2/pull/6303)
+- [6306: Console\RouteNotFoundStrategy throws invalid index exception](https://github.com/zendframework/zf2/issues/6306)
+- [6307: Closes #6306 - Console\RouteNotFoundStrategy invalid index](https://github.com/zendframework/zf2/pull/6307)
+- [6310: Fix Zend/Barcode composer.json to require zendframework/zend-validator.](https://github.com/zendframework/zf2/pull/6310)
+- [6311: Fixes #6297: Fixes logic that checks if IntlDateFormatter parsed the string properly.](https://github.com/zendframework/zf2/pull/6311)
+- [6315: Zend\Http\Client\Adapter\Curl does not send a proper DELETE request when request body is provided, hangs](https://github.com/zendframework/zf2/issues/6315)
+- [6318: Add body to curl DELETE request if one is specified.](https://github.com/zendframework/zf2/pull/6318)
+- [6321: I18n/Validator/DateTime should use mb_strlen() instead of strlen()](https://github.com/zendframework/zf2/issues/6321)
+- [6325: Fixes typo](https://github.com/zendframework/zf2/pull/6325)
+- [6326: Bugfix/thousand separator in number validator](https://github.com/zendframework/zf2/pull/6326)
+- [6330: Bugfix/merging inputs with allow empty](https://github.com/zendframework/zf2/pull/6330)
+- [6333: Fix for performance issue in Http\Response](https://github.com/zendframework/zf2/pull/6333)
+- [6335: Fix and test case for: RowGateway primary key not null constraint do not fail with empty string](https://github.com/zendframework/zf2/pull/6335)
+- [6336: Fixes link media type list for iana and wikipedia](https://github.com/zendframework/zf2/pull/6336)
+- [6351: update DE translation header](https://github.com/zendframework/zf2/pull/6351)
+- [6361: Fixes #6281 - mongodb saveOptions not checked correctly](https://github.com/zendframework/zf2/pull/6361)
+- [6373: Fix for #6300 - I18n float validator rewrite](https://github.com/zendframework/zf2/pull/6373)
+- [6382: Fix for #6377 - Zend\Session\Service\SessionConfigFactory: Wrong placeholder in Exception string](https://github.com/zendframework/zf2/pull/6382)
+- [6391: UrlTest : missing private properties $url and $router](https://github.com/zendframework/zf2/pull/6391)
+- [6393: unused parameters $sm for plugins factory](https://github.com/zendframework/zf2/pull/6393)
+- [6400: Fix / tests for #6363](https://github.com/zendframework/zf2/pull/6400)
+- [6401: Fixes @return docblock for Zend\Paginator\Adapter\Service\DbSelectFactory::createService()](https://github.com/zendframework/zf2/pull/6401)
+- [6402: Fixes grammar](https://github.com/zendframework/zf2/pull/6402)
+- [6412: Fix nested CollectionInputFilter not valid if count not specified](https://github.com/zendframework/zf2/pull/6412)
+- [6423: Validate uploaded filename only if no upload error occured.](https://github.com/zendframework/zf2/pull/6423)
+- [6427: Zend Session fatal error in get array copy](https://github.com/zendframework/zf2/pull/6427)
+- [6429: Update Zend_Validate.php](https://github.com/zendframework/zf2/pull/6429)
+- [6430: Method setObject on Zend/Form/Element/Collection overrides count of target element](https://github.com/zendframework/zf2/issues/6430)
+- [6440: Fixed typo](https://github.com/zendframework/zf2/pull/6440)
+- [6443: Change method to set count fixes #6430](https://github.com/zendframework/zf2/pull/6443)
+- [6446: Fix for #6445, adding pagination and transaction to IBM DB2 for Zend\Db](https://github.com/zendframework/zf2/pull/6446)
+- [6452: Fix + tests for #5969](https://github.com/zendframework/zf2/pull/6452)
+- [6462: Fix for odd php-cs-fixer finds](https://github.com/zendframework/zf2/pull/6462)
+- [6472: Clear values on CollectionInputFilter before adding new data](https://github.com/zendframework/zf2/pull/6472)
+- [6480: Fix: Undefined field in Zend\Http\Header\Origin](https://github.com/zendframework/zf2/pull/6480)
+- [6484: fix #6480](https://github.com/zendframework/zf2/pull/6484)
+- [6487: Remove trailing whitespaces](https://github.com/zendframework/zf2/pull/6487)
+- [6490: PHPCS Fixes for Zend\Authentication](https://github.com/zendframework/zf2/pull/6490)
+- [6491: Header\ContentType: remove empty values from parsed header](https://github.com/zendframework/zf2/pull/6491)
+- [6494: CollectionInputFilter throws warning if invalid collection provided](https://github.com/zendframework/zf2/pull/6494)
+- [6495: Redis Server URI correct parsing](https://github.com/zendframework/zf2/pull/6495)
+- [6500: PHPCS fixes for Zend\Barcode](https://github.com/zendframework/zf2/pull/6500)
+- [6505: swap order of initalization](https://github.com/zendframework/zf2/pull/6505)
+- [6506: Missing dependency to zend-form in zend-mvc](https://github.com/zendframework/zf2/issues/6506)
+- [6510: Fix 6428 - authenticate() always fails on IBMi when using DB table-based authentication](https://github.com/zendframework/zf2/pull/6510)
+- [6511: conflicting PHPDoc @return values in SharedEventManager](https://github.com/zendframework/zf2/issues/6511)
+- [6512: fixed conflicted phpdoc return values (see #6511)](https://github.com/zendframework/zf2/pull/6512)
+- [6521: PHPCS fixes for Zend\\Cache](https://github.com/zendframework/zf2/pull/6521)
+- [6522: PHPCS fixes for Zend\Code](https://github.com/zendframework/zf2/pull/6522)
+- [6529: Update polish translation](https://github.com/zendframework/zf2/pull/6529)
+- [6531: PHPCS fixes for Zend\Config](https://github.com/zendframework/zf2/pull/6531)
+- [6532: PHPCS fixes for Zend\Console](https://github.com/zendframework/zf2/pull/6532)
+- [6533: PHPCS fixes for Zend\Crypt](https://github.com/zendframework/zf2/pull/6533)
+- [6535: PHPCS fixes for Zend\EventManager](https://github.com/zendframework/zf2/pull/6535)
+- [6536: PHPCS fixes for Zend\Navigation](https://github.com/zendframework/zf2/pull/6536)
+- [6541: Zend Db Query Builder Optimisation](https://github.com/zendframework/zf2/pull/6541)
+- [6549: Link to new version of the QuickStart user guide](https://github.com/zendframework/zf2/pull/6549)
+- [6551: Fixes CS : trailing spaces and unused use](https://github.com/zendframework/zf2/pull/6551)
+
+## 2.3.1 (2014-04-15)
+
+- [5392: Zend Db: Multiple nested selects - Zend Paginator with nested select bind parameters error](https://github.com/zendframework/zf2/pull/5392)
+- [5857: Fixes #4521](https://github.com/zendframework/zf2/pull/5857)
+- [5863: patch #5860 ](https://github.com/zendframework/zf2/pull/5863)
+- [5948: Circular dependency test for #5651](https://github.com/zendframework/zf2/pull/5948)
+- [5956: Prevent fatal error in JsonRpc-Client](https://github.com/zendframework/zf2/pull/5956)
+- [5957: php 5.6 compatibility](https://github.com/zendframework/zf2/pull/5957)
+- [5958: fix typo](https://github.com/zendframework/zf2/pull/5958)
+- [5959: Issue - AbstractDiServiceFactory ,MvcTranslatorFactory throws Exception](https://github.com/zendframework/zf2/pull/5959)
+- [5964: Upgrading branch aliases for components: 2.2-dev -> 2.3-dev, 2.3-dev -> 2.4-dev](https://github.com/zendframework/zf2/pull/5964)
+- [5968: Collection Input Filter fix messages](https://github.com/zendframework/zf2/pull/5968)
+- [5970: Adds disableInArrayValidator check to Radio](https://github.com/zendframework/zf2/pull/5970)
+- [5972: permissions : docBlock](https://github.com/zendframework/zf2/pull/5972)
+- [5973: Rbac::getRole() : check object->getName()](https://github.com/zendframework/zf2/pull/5973)
+- [5975: Update wrong DocBlock comment](https://github.com/zendframework/zf2/pull/5975)
+- [5978: ZF 2.3.0 BC break in MvcTranslator](https://github.com/zendframework/zf2/issues/5978)
+- [5979: Fix BC break in TranslatorServiceFactory](https://github.com/zendframework/zf2/pull/5979)
+- [5983: [cs-fixer\ Centralize configuration in a single file](https://github.com/zendframework/zf2/pull/5983)
+- [5985: Corrected placeholder token '%' for some translations](https://github.com/zendframework/zf2/pull/5985)
+- [5986: InputFilter\Factory can't handle config with null input](https://github.com/zendframework/zf2/pull/5986)
+- [5988: Fix patterns for mobile (allows 7 as fisrt number)](https://github.com/zendframework/zf2/pull/5988)
+- [5989: Allow aria-labelledby and aria-describedby attributes in form elements](https://github.com/zendframework/zf2/pull/5989)
+- [5991: ---removed---](https://github.com/zendframework/zf2/issues/5991)
+- [5997: Update segment route to TranslatorInterface](https://github.com/zendframework/zf2/pull/5997)
+- [5998: Add missing bitwise validator in pluginmanager](https://github.com/zendframework/zf2/pull/5998)
+- [6000: Blackhole cache adapter : docblock corrections](https://github.com/zendframework/zf2/pull/6000)
+- [6003: typo on comment fixed](https://github.com/zendframework/zf2/pull/6003)
+- [6004: InputFilterPluginManager needs to allow InputInterface retrieval](https://github.com/zendframework/zf2/issues/6004)
+- [6007: ZendMvc depends on ZendLog by default in 2.3.0, add it to composer](https://github.com/zendframework/zf2/pull/6007)
+- [6009: Form\Element\Select multiple is always required](https://github.com/zendframework/zf2/pull/6009)
+- [6012: Zend\ProgressBar\Adapter\Console::notify should use mb_substr](https://github.com/zendframework/zf2/issues/6012)
+- [6019: Fix for #6012 - Use wrapper for substr() in ProgressBar](https://github.com/zendframework/zf2/pull/6019)
+- [6021: Missed variable, renamed to one which exists.](https://github.com/zendframework/zf2/pull/6021)
+- [6022: Invalid instantiator of type "NULL" for "Zend\I18n\Translator\TranslatorInterface"](https://github.com/zendframework/zf2/issues/6022)
+- [6023: Parameter generator backslash escaping](https://github.com/zendframework/zf2/pull/6023)
+- [6024: Dispatch error should be preventable](https://github.com/zendframework/zf2/pull/6024)
+- [6026: decompress() Zend/Filter/Compress/Zip fix](https://github.com/zendframework/zf2/pull/6026)
+- [6027: Allow empty response strings in \Zend\Http\Response::fromStream](https://github.com/zendframework/zf2/pull/6027)
+- [6028: Method getValue should check the type of input inside InputFilter](https://github.com/zendframework/zf2/pull/6028)
+- [6030: Remove duplicate comment](https://github.com/zendframework/zf2/pull/6030)
+- [6031: remove double semicolon](https://github.com/zendframework/zf2/pull/6031)
+- [6032: fix comment on PhpMemoryArray loader](https://github.com/zendframework/zf2/pull/6032)
+- [6035: fix exception message. Must be Stdlib\Hydrator](https://github.com/zendframework/zf2/pull/6035)
+- [6037: Require PHP extension mcrypt in composer.json](https://github.com/zendframework/zf2/issues/6037)
+- [6041: Hotfix : Zend\Test trace error flag](https://github.com/zendframework/zf2/pull/6041)
+- [6042: Fix documentation](https://github.com/zendframework/zf2/pull/6042)
+- [6045: File Form Element don't works](https://github.com/zendframework/zf2/issues/6045)
+- [6046: Allow InputInterface retrieval from InputFilterPluginManager](https://github.com/zendframework/zf2/pull/6046)
+- [6047: Fix Zend\Test test](https://github.com/zendframework/zf2/pull/6047)
+- [6049: Fix for issue 6048](https://github.com/zendframework/zf2/pull/6049)
+- [6050: update copyright year that still using 2013 to 2014](https://github.com/zendframework/zf2/pull/6050)
+- [6051: 2.2.6 -> 2.3.0 causes DI to try to instantiate `Zend\I18n\Translator\TranslatorInterface` instead of `Zend\I18n\Translator\Translator`](https://github.com/zendframework/zf2/issues/6051)
+- [6056: Fixes a typo](https://github.com/zendframework/zf2/pull/6056)
+- [6061: added missing License header](https://github.com/zendframework/zf2/pull/6061)
+- [6062: fixed typo](https://github.com/zendframework/zf2/pull/6062)
+- [6070: code-to-explain-code test in MultiCheckboxTest to check multi selected ](https://github.com/zendframework/zf2/pull/6070)
+- [6071: Re enable zip compression tests on Travis](https://github.com/zendframework/zf2/pull/6071)
+- [6077: fix for issue 6076. avoid GlobIterator globbing to directories which it ...](https://github.com/zendframework/zf2/pull/6077)
+- [6082: Using \Zend\Db\Sql\Expression as part of join name. Object of class Zend\Db\Sql\Expression could not be converted to string](https://github.com/zendframework/zf2/issues/6082)
+- [6083: NumberOfParameterFilter correctly handles argument count greater than 0.](https://github.com/zendframework/zf2/pull/6083)
+- [6085: Fixes #5929 - Remove a page recursively](https://github.com/zendframework/zf2/pull/6085)
+- [6089: Problems with serializing Zend\Stdlib\ArrayObject](https://github.com/zendframework/zf2/issues/6089)
+- [6092: Hotfix for #6089 - ArrayObject serialization doesn't restore `protectedProperties`](https://github.com/zendframework/zf2/pull/6092)
+- [6093: Fix unused imports and local variables](https://github.com/zendframework/zf2/pull/6093)
+- [6094: Fix undefined classes, constants and methods](https://github.com/zendframework/zf2/pull/6094)
+- [6096: Prevent ArrayObject recursion in 5.6](https://github.com/zendframework/zf2/pull/6096)
+- [6100: More tests for nested form fieldsets](https://github.com/zendframework/zf2/pull/6100)
+- [6102: Zend\Filter\Compress\Tar::setMode() would not work](https://github.com/zendframework/zf2/issues/6102)
+- [6103: Zend\Filter\Compress\Tar::setMode() should work with case-insensitive](https://github.com/zendframework/zf2/pull/6103)
+- [6104: Validator\Ip should not allow newlines in any case.](https://github.com/zendframework/zf2/pull/6104)
+- [6105: add missing resource messages at en - Bitwize & Datestep](https://github.com/zendframework/zf2/pull/6105)
+- [6106: suggest ext-mcrypt](https://github.com/zendframework/zf2/pull/6106)
+- [6110: Allow session garbage collection to use an index](https://github.com/zendframework/zf2/pull/6110)
+- [6116: fixed typos](https://github.com/zendframework/zf2/pull/6116)
+- [6118: Extra fieldsets are created when calling form bind multiple times](https://github.com/zendframework/zf2/pull/6118)
+- [6123: Mail: Require Zend\Validator](https://github.com/zendframework/zf2/pull/6123)
+- [6125: added missing { and } after if](https://github.com/zendframework/zf2/pull/6125)
+- [6126: Tiny typo fix in docblock](https://github.com/zendframework/zf2/pull/6126)
+- [6128: Fix class description](https://github.com/zendframework/zf2/pull/6128)
+- [6129: change is_null($var) to (null === $var) for consistency](https://github.com/zendframework/zf2/pull/6129)
+- [6130: change docblocks and comments that still using "Zend_" to "Zend\"](https://github.com/zendframework/zf2/pull/6130)
+- [6132: FormElementManager: Only initialize a shared element once](https://github.com/zendframework/zf2/pull/6132)
+- [6136: Fix: No need to prefix imports](https://github.com/zendframework/zf2/pull/6136)
+- [6139: Fix: Test name](https://github.com/zendframework/zf2/pull/6139)
+- [6140: Fix: Indentation in array initialization, trailing commas](https://github.com/zendframework/zf2/pull/6140)
+
+### SECURITY UPDATES
+
+- **ZF2014-03:** Potential XSS vector in multiple view helpers due to
+ inappropriate HTML attribute escaping. Many view helpers were using the
+ `escapeHtml()` view helper in order to escape HTML attributes. This release
+ patches them to use the `escapeHtmlAttr()` view helper in these situations.
+ If you use form or navigation view helpers, or "HTML element" view helpers
+ (such as `gravatar()`, `htmlFlash()`, `htmlPage()`, or `htmlQuicktime()`), we
+ recommend upgrading immediately.
+
+## 2.3.0 (2014-03-12)
+
+- [3015: $escapeHtmlHelper is not optional, in case you want real HTML as a label](https://github.com/zendframework/zf2/issues/3015)
+- [3198: Limit/offset doesn't work properly when using parameters and SQL Server drivers](https://github.com/zendframework/zf2/pull/3198)
+- [4021: Mysqli driver raise a lot of warning about Undefined property after connection closed](https://github.com/zendframework/zf2/pull/4021)
+- [4280: begin,commit and rollback methods for PostgreSQL have been implemented](https://github.com/zendframework/zf2/pull/4280)
+- [4290: Zend\Db\Sql setTable method ommit array](https://github.com/zendframework/zf2/pull/4290)
+- [4304: Add support for dblib PDO driver in quoteValue()](https://github.com/zendframework/zf2/pull/4304)
+- [4348: Add isActive method Navigation Page Uri.](https://github.com/zendframework/zf2/pull/4348)
+- [4397: Add coveralls support and fix a few testing bugs related to coverage](https://github.com/zendframework/zf2/pull/4397)
+- [4400: Ability to get an element with creation options from the FormElementManager](https://github.com/zendframework/zf2/pull/4400)
+- [4401: add flag for fallback value](https://github.com/zendframework/zf2/pull/4401)
+- [4427: add group and having ability to Paginator\Adapter\DbTableGateway](https://github.com/zendframework/zf2/pull/4427)
+- [4443: Translator\Loader\PhpArray can't load from the include path](https://github.com/zendframework/zf2/issues/4443)
+- [4449: Console route improvements](https://github.com/zendframework/zf2/pull/4449)
+- [4455: Need way to specify in the logger configuration the factory for the own writer](https://github.com/zendframework/zf2/pull/4455)
+- [4489: Replacing the magic number for a list of constants in Validator\NotEmpty](https://github.com/zendframework/zf2/pull/4489)
+- [4505: Give modules the ability to modify application config after their own co...](https://github.com/zendframework/zf2/pull/4505)
+- [4510: Introduce Zend\I18n\Filter\NumberParse based on Zend\I18n\Filter\NumberFormat](https://github.com/zendframework/zf2/pull/4510)
+- [4512: blackhole cache storage adapter](https://github.com/zendframework/zf2/pull/4512)
+- [4515: Issue #4443 - Zend\I18n\Translator\Loader\PhpArray can now load files from include path](https://github.com/zendframework/zf2/pull/4515)
+- [4534: Introduce JsonSerializable polyfill and support in Zend\Json\Encoder](https://github.com/zendframework/zf2/pull/4534)
+- [4574: Config\Factory can read from include_path](https://github.com/zendframework/zf2/pull/4574)
+- [4584: Composer dependencies fixed](https://github.com/zendframework/zf2/pull/4584)
+- [4606: Supports the encoding of the console and encodes the text to display if needed](https://github.com/zendframework/zf2/pull/4606)
+- [4610: Version warning http:// wrapper is disabled in the server configuration by allow_url_fopen=0](https://github.com/zendframework/zf2/issues/4610)
+- [4625: Use Zend\Http\Client in Zend\Version](https://github.com/zendframework/zf2/pull/4625)
+- [4653: Zend\Authentication\Adapter\Http::_challengeClient() should be public](https://github.com/zendframework/zf2/pull/4653)
+- [4662: Zend\Db PDO adapter ignoring charset](https://github.com/zendframework/zf2/issues/4662)
+- [4677: Add Form\Element labelOptions property w/ implemented use case](https://github.com/zendframework/zf2/pull/4677)
+- [4679: !IE support for conditional comments powered viewhelper](https://github.com/zendframework/zf2/pull/4679)
+- [4742: LoggerAwareInterface and its Trait](https://github.com/zendframework/zf2/pull/4742)
+- [4751: Hydrator aware trait](https://github.com/zendframework/zf2/pull/4751)
+- [4752: Hydrator refactoring](https://github.com/zendframework/zf2/pull/4752)
+- [4756: getValue() for MonthSelect, DateSelect and DateTimeSelect Form Elements ](https://github.com/zendframework/zf2/pull/4756)
+- [4764: Add interface `FilterEnabledInterface`](https://github.com/zendframework/zf2/pull/4764)
+- [4767: Make include_path functionality of Config and Translator opt-in](https://github.com/zendframework/zf2/pull/4767)
+- [4781: Adding missing "NOT IN" predicate](https://github.com/zendframework/zf2/pull/4781)
+- [4785: CSRF element naming conflicts](https://github.com/zendframework/zf2/issues/4785)
+- [4813: Zend log filter sample](https://github.com/zendframework/zf2/pull/4813)
+- [4815: Make HTTP auth adapter's challengeClient() method public](https://github.com/zendframework/zf2/pull/4815)
+- [4822: Simplification of the HTML class name in Tag\Cloud\Decorator\HtmlCloud](https://github.com/zendframework/zf2/pull/4822)
+- [4824: Add Config Reader for Java-style .properties files and strings](https://github.com/zendframework/zf2/pull/4824)
+- [4831: Zend\Mvc\Application::run returns ResponseInterface.](https://github.com/zendframework/zf2/pull/4831)
+- [4836: Adding warning namespace](https://github.com/zendframework/zf2/pull/4836)
+- [4844: Add cas operation for apc adapter](https://github.com/zendframework/zf2/pull/4844)
+- [4846: DisableInArrayValidator for Multicheckbox](https://github.com/zendframework/zf2/pull/4846)
+- [4849: Fix Application::run() return values](https://github.com/zendframework/zf2/pull/4849)
+- [4852: ArrayObject::offsetExists - Fix check on offsetExists](https://github.com/zendframework/zf2/pull/4852)
+- [4860: abstract factory for configs reading keys from merged config](https://github.com/zendframework/zf2/pull/4860)
+- [4864: enhancement of ProvidesEvents trait](https://github.com/zendframework/zf2/pull/4864)
+- [4871: Use .eml extensions for emails stored with Zend\Mail\Transport\File](https://github.com/zendframework/zf2/pull/4871)
+- [4884: Allow replacing elements within a form collection](https://github.com/zendframework/zf2/pull/4884)
+- [4903: Update MemoryManager.php](https://github.com/zendframework/zf2/pull/4903)
+- [4904: Update Feed.php](https://github.com/zendframework/zf2/pull/4904)
+- [4907: Changed self::SPECIFICATION_* to static::SPECIFICATION_* in non declarat...](https://github.com/zendframework/zf2/pull/4907)
+- [4908: Segregation HydratorInterface](https://github.com/zendframework/zf2/pull/4908)
+- [4912: Fix spelling of "marshall"](https://github.com/zendframework/zf2/pull/4912)
+- [4913: make use of mickey179/vfsStream in unit tests: Zend\Test](https://github.com/zendframework/zf2/pull/4913)
+- [4927: Nested Fieldset value can be a Traversable](https://github.com/zendframework/zf2/pull/4927)
+- [4931: Mime\Message: createFromString: really ignore unknown headers](https://github.com/zendframework/zf2/pull/4931)
+- [4940: New Zend\Validator\Bitwise](https://github.com/zendframework/zf2/pull/4940)
+- [4946: Add assertTemplateName and assertNotTemplateName](https://github.com/zendframework/zf2/pull/4946)
+- [4950: Add matching capabilities to the Content-Type header](https://github.com/zendframework/zf2/pull/4950)
+- [4962: added "ControllerManager" Manager, and make "ControllerLoader" as alias of it](https://github.com/zendframework/zf2/pull/4962)
+- [4969: PartialLoop helper: prevent convert traversable model to array recursive...](https://github.com/zendframework/zf2/pull/4969)
+- [4971: Form\Factory can handle config with null elements](https://github.com/zendframework/zf2/pull/4971)
+- [4973: Issue 4662 - Zend\Db\PDO adapter driver ignores charset option](https://github.com/zendframework/zf2/pull/4973)
+- [4979: Add multiple translation text domains to Zend\Navigation](https://github.com/zendframework/zf2/pull/4979)
+- [4980: change of version checks to use PHP_VERSION_ID constant.](https://github.com/zendframework/zf2/pull/4980)
+- [4989: [Zend-Code\ Find php 5.4 traits with TokenArrayScanner](https://github.com/zendframework/zf2/pull/4989)
+- [4995: [SessionManagerFactory\ Configuration of validators in SessionManagerFactory](https://github.com/zendframework/zf2/pull/4995)
+- [5019: added role attribute](https://github.com/zendframework/zf2/pull/5019)
+- [5024: [BC Break\ Added the set /getPbkdf2HashAlgorithm() in BlockCipher](https://github.com/zendframework/zf2/pull/5024)
+- [5025: Support for 'origin' header value?](https://github.com/zendframework/zf2/issues/5025)
+- [5029: Support for Origin header](https://github.com/zendframework/zf2/pull/5029)
+- [5032: Added metadata for oracle](https://github.com/zendframework/zf2/pull/5032)
+- [5034: Locale aware fix](https://github.com/zendframework/zf2/pull/5034)
+- [5043: DocBlock Reflection not returning correct tags](https://github.com/zendframework/zf2/pull/5043)
+- [5064: Added optional charset to pdo dsn](https://github.com/zendframework/zf2/pull/5064)
+- [5069: Fixed bug that caused the PDO to throw an invalid keyword error](https://github.com/zendframework/zf2/pull/5069)
+- [5072: PSR-2 : add space before and after between (if and foreach) and parenthesis](https://github.com/zendframework/zf2/pull/5072)
+- [5080: Added separator to model in renderPartial function](https://github.com/zendframework/zf2/pull/5080)
+- [5082: Simplification](https://github.com/zendframework/zf2/pull/5082)
+- [5089: Test for the getArrayCopy method in AbstractRestultSet](https://github.com/zendframework/zf2/pull/5089)
+- [5101: Update label view helper to have html escape by default](https://github.com/zendframework/zf2/pull/5101)
+- [5106: Fix CollectionInputFilter validation when empty data is being processed](https://github.com/zendframework/zf2/pull/5106)
+- [5108: Hotfix/4879](https://github.com/zendframework/zf2/pull/5108)
+- [5136: Zend\Navigation - add to AbstractPage static factories](https://github.com/zendframework/zf2/pull/5136)
+- [5138: Zend/Navigation/Page/Mvc add default route name](https://github.com/zendframework/zf2/pull/5138)
+- [5139: Zend/Navigation/View/HelperConfig - configurable view helper](https://github.com/zendframework/zf2/pull/5139)
+- [5209: increase consistency : call $this->events, $this->event, $this->response, and $this->request directly at Zend\Mvc\Application.php](https://github.com/zendframework/zf2/pull/5209)
+- [5211: Get the connected dsn string that is now stored when the pdo connection is made](https://github.com/zendframework/zf2/pull/5211)
+- [5226: Fix/form label options](https://github.com/zendframework/zf2/pull/5226)
+- [5237: ServiceManager - fix AbstractFactories performance and service waiting](https://github.com/zendframework/zf2/pull/5237)
+- [5238: allow empty fieldset labels in formCollection view helper](https://github.com/zendframework/zf2/pull/5238)
+- [5242: form collection attributes](https://github.com/zendframework/zf2/pull/5242)
+- [5245: Fix code reflection - getBody/getContents method](https://github.com/zendframework/zf2/pull/5245)
+- [5255: Get ViewModel children by capture](https://github.com/zendframework/zf2/pull/5255)
+- [5260: Zend/Db/Sql/Insert - implement insert into select construction](https://github.com/zendframework/zf2/pull/5260)
+- [5261: DevelopThis is a new PR since the base branch has changed. Please see #5017](https://github.com/zendframework/zf2/pull/5261)
+- [5262: Zend code method prototype](https://github.com/zendframework/zf2/pull/5262)
+- [5266: Throw an exception in PhpRenderer when the resolved file path is not rea...](https://github.com/zendframework/zf2/pull/5266)
+- [5272: Create Callback adapter for Zend\Paginator](https://github.com/zendframework/zf2/pull/5272)
+- [5283: Deprecate ProvidesEvents trait](https://github.com/zendframework/zf2/pull/5283)
+- [5289: Abstract Factories handling is inconsistent with normal Factories](https://github.com/zendframework/zf2/issues/5289)
+- [5304: [psr-2\ Add whitespace for anonymous functions.](https://github.com/zendframework/zf2/pull/5304)
+- [5308: Zend\Db\Resultset fix buffering](https://github.com/zendframework/zf2/pull/5308)
+- [5312: Locale aware fix](https://github.com/zendframework/zf2/pull/5312)
+- [5313: [http\ fix many header issues](https://github.com/zendframework/zf2/pull/5313)
+- [5316: Added Content Security Policy 1.0 header class](https://github.com/zendframework/zf2/pull/5316)
+- [5321: Zend\Db\Adapter alow to use the temporary ResultSetPrototype](https://github.com/zendframework/zf2/pull/5321)
+- [5329: change self:: with static:: in call-ing static property/method](https://github.com/zendframework/zf2/pull/5329)
+- [5338: ZendTest - added tearDown for Netbeans tests](https://github.com/zendframework/zf2/pull/5338)
+- [5341: Missing notIn predicate](https://github.com/zendframework/zf2/pull/5341)
+- [5354: Can't inherit abstract function Zend\Validator\Translator\TranslatorInterface::translate()](https://github.com/zendframework/zf2/issues/5354)
+- [5355: Handle 'disable_html_escape' option in FormButton helper](https://github.com/zendframework/zf2/pull/5355)
+- [5356: Deprecate Zend\Dom\Query in favor of more logical OO approach](https://github.com/zendframework/zf2/pull/5356)
+- [5358: [Zend\Navigation\ Extracting the translation from "htmlify"-method into ...](https://github.com/zendframework/zf2/pull/5358)
+- [5364: Add Naming strategy for Hydrators](https://github.com/zendframework/zf2/pull/5364)
+- [5365: [stdlib\ Add guard utils and traits](https://github.com/zendframework/zf2/pull/5365)
+- [5377: [http\ Allow headers without whitespace after ":"](https://github.com/zendframework/zf2/pull/5377)
+- [5380: Zf hydrator strategy context](https://github.com/zendframework/zf2/pull/5380)
+- [5390: Add regression test for #5237](https://github.com/zendframework/zf2/pull/5390)
+- [5391: CS fix for #5245](https://github.com/zendframework/zf2/pull/5391)
+- [5393: Properly set only specified methods](https://github.com/zendframework/zf2/pull/5393)
+- [5394: use namespaces in versiontest](https://github.com/zendframework/zf2/pull/5394)
+- [5395: ServiceManager::has() when assigned non String or Array causes Undefine Notice errors](https://github.com/zendframework/zf2/issues/5395)
+- [5396: Fix for issue #5395](https://github.com/zendframework/zf2/pull/5396)
+- [5398: fixed typo](https://github.com/zendframework/zf2/pull/5398)
+- [5400: fixes #5384 - getValue now returns metadata of the value, added getValueType](https://github.com/zendframework/zf2/pull/5400)
+- [5403: README fix of Zend\Dom\Query (#5356)](https://github.com/zendframework/zf2/pull/5403)
+- [5406: Make I18n component completely optional for Mvc](https://github.com/zendframework/zf2/pull/5406)
+- [5408: Fixes for #5356](https://github.com/zendframework/zf2/pull/5408)
+- [5420: Added ability to compose collections via Zend Form annotations](https://github.com/zendframework/zf2/pull/5420)
+- [5436: [WIP\ Zend\Filter harmonization (Issue 5119)](https://github.com/zendframework/zf2/pull/5436)
+- [5456: Enable input filter config from annotations to be passed on via composed collections](https://github.com/zendframework/zf2/pull/5456)
+- [5458: [Validator\ Refactor Date](https://github.com/zendframework/zf2/pull/5458)
+- [5459: fix docblock and exception that still use "Zend_" prefix](https://github.com/zendframework/zf2/pull/5459)
+- [5469: Abstract console controller](https://github.com/zendframework/zf2/pull/5469)
+- [5470: Add Zend\Mail\Transport\Factory](https://github.com/zendframework/zf2/pull/5470)
+- [5484: Db\Sql\Select use functions without table](https://github.com/zendframework/zf2/pull/5484)
+- [5496: Oracle hotfix for #5488 (casing in sequence helper)](https://github.com/zendframework/zf2/pull/5496)
+- [5533: [WIP\ Added option to ensure form element will be rendered inside label tag ev...](https://github.com/zendframework/zf2/pull/5533)
+- [5538: Zend\Db\Sql\Ddl\CreateTable - fix create temporary tables](https://github.com/zendframework/zf2/pull/5538)
+- [5557: Fixed non-working Spanish validator translation](https://github.com/zendframework/zf2/pull/5557)
+- [5562: Add unsetValueOption() to the Form\Element\Select and Form\Element\MultiCheckbox](https://github.com/zendframework/zf2/pull/5562)
+- [5569: Fixed boolean/integer BC break in Zend\Config\Writer\PhpArray](https://github.com/zendframework/zf2/pull/5569)
+- [5587: Changed the default cost of bcrypt to 10](https://github.com/zendframework/zf2/pull/5587)
+- [5593: Added resources/languages/id for Indonesian translation](https://github.com/zendframework/zf2/pull/5593)
+- [5602: Update minimum required PHP version to 5.3.23](https://github.com/zendframework/zf2/pull/5602)
+- [5604: [2.3.0\ change php require version from 5.3.3 to 5.3.23 in all resources and update tests that no longer support 5.3.3](https://github.com/zendframework/zf2/pull/5604)
+- [5605: Fixed session_cache_limiter available options](https://github.com/zendframework/zf2/pull/5605)
+- [5611: Adding HHVM to build matrix](https://github.com/zendframework/zf2/pull/5611)
+- [5612: make 'listeners' key can be configured outside application.config.php](https://github.com/zendframework/zf2/pull/5612)
+- [5616: Prettify the output of Zend\Code\Generator\ValueGenerator for multi line arrays](https://github.com/zendframework/zf2/pull/5616)
+- [5628: Acl assertions enhancement](https://github.com/zendframework/zf2/pull/5628)
+- [5638: BaseInputFilter handles missing data properly](https://github.com/zendframework/zf2/pull/5638)
+- [5642: Offset may be specified without a limit. Causes syntax error in mysql, sqlite and maybe others](https://github.com/zendframework/zf2/issues/5642)
+- [5643: Fixes #5642](https://github.com/zendframework/zf2/pull/5643)
+- [5649: Added a assertion method for the response phrase of a http response.](https://github.com/zendframework/zf2/pull/5649)
+- [5650: Set custom class name for active li element](https://github.com/zendframework/zf2/pull/5650)
+- [5651: Allow modules to load their own dependencies](https://github.com/zendframework/zf2/pull/5651)
+- [5664: [Minor BC\ Remove translation of validator keys](https://github.com/zendframework/zf2/pull/5664)
+- [5665: [http\ Normalize Content-Transfer-Encoding](https://github.com/zendframework/zf2/issues/5665)
+- [5666: Remove translations in Zend\Form\View\Helper\FormElementErrors #5646](https://github.com/zendframework/zf2/pull/5666)
+- [5670: Add controller namespace prefix to template mapping](https://github.com/zendframework/zf2/pull/5670)
+- [5689: Fix BC break with skeleton for Translator Service](https://github.com/zendframework/zf2/pull/5689)
+- [5692: Additional MVC Translator BC fixes](https://github.com/zendframework/zf2/pull/5692)
+- [5698: #5665 Normalize Http Content-Transfer-Encoding](https://github.com/zendframework/zf2/pull/5698)
+- [5702: Stdlib - PriorityList move from Zend\Mvc\Router to Stdlib](https://github.com/zendframework/zf2/pull/5702)
+- [5711: Implemented writeTextBlock method in Zend\Console\Adapter\AbstractAdapter](https://github.com/zendframework/zf2/pull/5711)
+- [5713: Adding Zend\Console\Getopt option callback hooks](https://github.com/zendframework/zf2/pull/5713)
+- [5717: Hotfix/various fixes](https://github.com/zendframework/zf2/pull/5717)
+- [5719: Feature/make collection configurable](https://github.com/zendframework/zf2/pull/5719)
+- [5720: Fix #5671 - console routing not correct](https://github.com/zendframework/zf2/pull/5720)
+- [5724: 5.3.3 -> 5.3.23 missing dump](https://github.com/zendframework/zf2/pull/5724)
+- [5730: Zend\Test Fix persistence with multi dispatch](https://github.com/zendframework/zf2/pull/5730)
+- [5731: Zend\Test Provide dispatch like a XmlHttpRequest](https://github.com/zendframework/zf2/pull/5731)
+- [5732: Fix for issue #5629](https://github.com/zendframework/zf2/pull/5732)
+- [5736: fix strange exception message in Mysqli connection](https://github.com/zendframework/zf2/pull/5736)
+- [5741: Make allowObjectBinding configurable for Fieldsets](https://github.com/zendframework/zf2/pull/5741)
+- [5747: Implementation of inTransaction() in all Zend\Db\Adapter\Drivers](https://github.com/zendframework/zf2/pull/5747)
+- [5748: added a submodule loading to testCanLoadMultipleModules](https://github.com/zendframework/zf2/pull/5748)
+- [5751: Updated Bulgarian translation](https://github.com/zendframework/zf2/pull/5751)
+- [5757: Zend\Config\Writer\PhpArray needs to use var_export for strings, not addslahes()](https://github.com/zendframework/zf2/pull/5757)
+- [5759: Update FlashMessenger.php](https://github.com/zendframework/zf2/pull/5759)
+- [5780: Allow specifying "break chain on failure" flag as Validator option](https://github.com/zendframework/zf2/pull/5780)
+- [5783: Do not exit from loadClass() early](https://github.com/zendframework/zf2/pull/5783)
+- [5792: [Soap/Server\ add debug mode](https://github.com/zendframework/zf2/pull/5792)
+- [5793: [Soap\Client\DotNet\[FIX\ Undefined property in void return](https://github.com/zendframework/zf2/pull/5793)
+- [5795: ServiceManager::canCreateFromAbstractFactory() missing foreach break after valid abstract factory found](https://github.com/zendframework/zf2/pull/5795)
+- [5803: Hide sub menus if all pages in the sub menu is hidden.](https://github.com/zendframework/zf2/pull/5803)
+- [5810: [Zend\Soap\Server\ Add getException to get caught exceptions](https://github.com/zendframework/zf2/pull/5810)
+- [5811: [Zend\Soap\Server\[NEW\ add a getSoap method, return the internal instance](https://github.com/zendframework/zf2/pull/5811)
+- [5825: New class Translator\Loader\PhpMemoryArray ](https://github.com/zendframework/zf2/pull/5825)
+- [5829: Zend\Cache\Storage\Adapter\Memcache](https://github.com/zendframework/zf2/pull/5829)
+- [5840: Removed Zend\Http\Client\Cookies](https://github.com/zendframework/zf2/pull/5840)
+- [5853: Fixes #4943](https://github.com/zendframework/zf2/pull/5853)
+- [5854: Multiple identifiers in `In`](https://github.com/zendframework/zf2/pull/5854)
+- [5855: Fixes #5162](https://github.com/zendframework/zf2/pull/5855)
+- [5856: #5665 Fix in test for JsonStrategy](https://github.com/zendframework/zf2/pull/5856)
+- [5858: Deprecate Proxy auto-generation](https://github.com/zendframework/zf2/pull/5858)
+- [5864: patch #5860 barcode analyzer fixes](https://github.com/zendframework/zf2/pull/5864)
+- [5869: remove TYPE_SELECT deprecated Constant that marked will go away in 2.1](https://github.com/zendframework/zf2/pull/5869)
+- [5875: Logger register shut down](https://github.com/zendframework/zf2/pull/5875)
+- [5877: Optional ProxyManager in builds](https://github.com/zendframework/zf2/pull/5877)
+- [5880: Updated PhpArray to expand paths using __DIR__](https://github.com/zendframework/zf2/pull/5880)
+- [5882: Allow setting formatter for Zend\Log\Writer\Db via config options](https://github.com/zendframework/zf2/pull/5882)
+- [5885: parametrized-locale-aware routing](https://github.com/zendframework/zf2/pull/5885)
+- [5897: Add get decode json data on params controller plugin](https://github.com/zendframework/zf2/pull/5897)
+- [5901: Add AuthenticationServiceInterface](https://github.com/zendframework/zf2/pull/5901)
+- [5902: Added testcase for BlockCipher using 0 values](https://github.com/zendframework/zf2/pull/5902)
+- [5907: [#5616\ Adapt array indentation to PSR-2 guidelines by default](https://github.com/zendframework/zf2/pull/5907)
+- [5908: Allow merging text domains without plural rules](https://github.com/zendframework/zf2/pull/5908)
+- [5910: minor improvements to form labels](https://github.com/zendframework/zf2/pull/5910)
+- [5917: Fixes #5192](https://github.com/zendframework/zf2/pull/5917)
+- [5918: Hotfix/4785 csrf name conflicts](https://github.com/zendframework/zf2/pull/5918)
+- [5919: Default value for labelAttributes](https://github.com/zendframework/zf2/pull/5919)
+- [5920: FormRow generetes invalid HTML for MonthSelect](https://github.com/zendframework/zf2/pull/5920)
+- [5921: Nicaraguan phone numbering plan once again](https://github.com/zendframework/zf2/pull/5921)
+- [5922: Updated catalan Zend/Validate translations](https://github.com/zendframework/zf2/pull/5922)
+- [5923: Fix/5906 collection count is ignored when data empty](https://github.com/zendframework/zf2/pull/5923)
+- [5925: Update DateStep.php](https://github.com/zendframework/zf2/pull/5925)
+- [5926: Fix for missing required option for CollectionInputFilter](https://github.com/zendframework/zf2/pull/5926)
+- [5928: Fixed notice on binding entity to form](https://github.com/zendframework/zf2/pull/5928)
+- [5930: Fix @cover at travis build from #5853](https://github.com/zendframework/zf2/pull/5930)
+- [5931: Disable <label> for input hidden](https://github.com/zendframework/zf2/pull/5931)
+- [5933: Allow arbitrary error codes in JSON RPC server](https://github.com/zendframework/zf2/pull/5933)
+- [5936: Fix for issue #4267](https://github.com/zendframework/zf2/pull/5936)
+- [5937: Fix Zend\Mail\Headers::removeHeader is not removing every header matching header name](https://github.com/zendframework/zf2/pull/5937)
+- [5939: Fix annotation on Zend\Mail\Message::getHeaderByName](https://github.com/zendframework/zf2/pull/5939)
+- [5940: Zend\Db\Sql Allow MySQL to use limit when only offset was provided](https://github.com/zendframework/zf2/pull/5940)
+- [5941: no cast to (int) on limit&offset at Zend\Db\Sql\Select.php](https://github.com/zendframework/zf2/pull/5941)
+- [5942: Mvc\I18n\Translator -> setLocale](https://github.com/zendframework/zf2/pull/5942)
+- [5943: Fixed route matcher test](https://github.com/zendframework/zf2/pull/5943)
+- [5951: Fix console mixed case optional value params](https://github.com/zendframework/zf2/pull/5951)
+
## 2.2.9 (2015-01-14)
### SECURITY UPDATES
diff --git a/vendor/zendframework/zendframework/INSTALL.md b/vendor/zendframework/zendframework/INSTALL.md
index 370c5bf0cee..3f6de26a0dc 100644
--- a/vendor/zendframework/zendframework/INSTALL.md
+++ b/vendor/zendframework/zendframework/INSTALL.md
@@ -8,7 +8,7 @@ and add the library directory to your PHP `include_path`.
## SYSTEM REQUIREMENTS
-------------------
-Zend Framework 2 requires PHP 5.3.3 or later.
+Zend Framework 2 requires PHP 5.3.23 or later.
## DEVELOPMENT VERSIONS
@@ -55,7 +55,7 @@ http://www.php.net/manual/en/configuration.changes.php
A great place to get up-to-speed quickly is the Zend Framework
QuickStart:
-http://framework.zend.com/manual/2.2/en/user-guide/overview.html
+http://framework.zend.com/manual/2.3/en/user-guide/overview.html
The QuickStart covers some of the most commonly used components of ZF.
Since Zend Framework is designed with a use-at-will architecture and
diff --git a/vendor/zendframework/zendframework/LICENSE.txt b/vendor/zendframework/zendframework/LICENSE.txt
index 5ad81e922d5..6eab5aa14fd 100644
--- a/vendor/zendframework/zendframework/LICENSE.txt
+++ b/vendor/zendframework/zendframework/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2014, Zend Technologies USA, Inc.
+Copyright (c) 2005-2015, Zend Technologies USA, Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
diff --git a/vendor/zendframework/zendframework/README.md b/vendor/zendframework/zendframework/README.md
index 64fe80470f3..ff05fcbbd2e 100644
--- a/vendor/zendframework/zendframework/README.md
+++ b/vendor/zendframework/zendframework/README.md
@@ -1,19 +1,25 @@
-### Welcome to the *Zend Framework 2.2* Release!
+
-Master: [](http://travis-ci.org/zendframework/zf2)
-Develop: [](http://travis-ci.org/zendframework/zf2)
+# Welcome to the *Zend Framework 2.3* Release!
+
+Master:
+[](http://travis-ci.org/zendframework/zf2)
+[](https://coveralls.io/r/zendframework/zf2)
+Develop:
+[](http://travis-ci.org/zendframework/zf2)
+[](https://coveralls.io/r/zendframework/zf2)
## RELEASE INFORMATION
-*Zend Framework 2.2.9*
+*Zend Framework 2.3.4*
-This is the ninth maintenance release for the 2.2 series.
+This is the fourth maintenance release for the version 2.3 series.
14 Jan 2015
-### UPDATES IN 2.2.9
+### UPDATES IN 2.3.4
-**This release contains security updates:**
+This release contains important security fixes:
- **ZF2015-01:** Session validators were not run if set before session start.
Essentially, the validators were writing to the `$_SESSION` superglobal before
@@ -28,7 +34,7 @@ Please see [CHANGELOG.md](CHANGELOG.md).
### SYSTEM REQUIREMENTS
-Zend Framework 2 requires PHP 5.3.3 or later; we recommend using the
+Zend Framework 2 requires PHP 5.3.23 or later; we recommend using the
latest PHP version whenever possible.
### INSTALLATION
diff --git a/vendor/zendframework/zendframework/bin/check-cs.sh b/vendor/zendframework/zendframework/bin/check-cs.sh
deleted file mode 100644
index e2e9709f591..00000000000
--- a/vendor/zendframework/zendframework/bin/check-cs.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-FIXER_PATH="`dirname $0`/../vendor/fabpot/php-cs-fixer/php-cs-fixer"
-
-libraryCS=$(php $FIXER_PATH fix -v --dry-run --level=psr2 ./library --fixers=unused_use)
-testsCS=$(php $FIXER_PATH fix -v --dry-run --level=psr2 ./tests)
-
-if [[ "$libraryCS" || "$testsCS" ]];
-then
- echo -en '\E[31m'"$libraryCS
-$testsCS\033[1m\033[0m";
- printf "\n";
- echo -en '\E[31;47m'"\033[1mCoding standards check failed!\033[0m" # Red
- printf "\n";
- exit 2;
-fi
-
-echo -en '\E[32m'"\033[1mCoding standards check passed!\033[0m" # Green
-printf "\n";
-
-echo $libraryCS$testsCS;
diff --git a/vendor/zendframework/zendframework/bin/classmap_generator.php b/vendor/zendframework/zendframework/bin/classmap_generator.php
index cb6f0086384..39ebab5ab4a 100755
--- a/vendor/zendframework/zendframework/bin/classmap_generator.php
+++ b/vendor/zendframework/zendframework/bin/classmap_generator.php
@@ -4,7 +4,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -228,13 +228,7 @@ foreach ($matches as $match) {
$maxWidth = max($maxWidth, strlen($match[1]));
}
-$content = preg_replace_callback(
- '(\n\s+([^=]+)=>)',
- function ($match) use ($maxWidth) {
- return "\n " . $match[1] . str_repeat(" ", $maxWidth - strlen($match[1])) . '=>';
- },
- $content
-);
+$content = preg_replace('(\n\s+([^=]+)=>)e', "'\n \\1' . str_repeat(' ', " . $maxWidth . " - strlen('\\1')) . '=>'", $content);
// Make the file end by EOL
$content = rtrim($content, "\n") . "\n";
diff --git a/vendor/zendframework/zendframework/bin/pluginmap_generator.php b/vendor/zendframework/zendframework/bin/pluginmap_generator.php
index fc20622bfe7..fc12921a722 100755
--- a/vendor/zendframework/zendframework/bin/pluginmap_generator.php
+++ b/vendor/zendframework/zendframework/bin/pluginmap_generator.php
@@ -7,7 +7,7 @@
* @category Zend
* @package Zend_Loader
* @subpackage Exception
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -139,7 +139,6 @@ foreach ($l as $file) {
}
if ($appending) {
-
$content = var_export((array) $map, true) . ';';
// Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
diff --git a/vendor/zendframework/zendframework/bin/templatemap_generator.php b/vendor/zendframework/zendframework/bin/templatemap_generator.php
index d56832fdaf3..6399d9c4369 100755
--- a/vendor/zendframework/zendframework/bin/templatemap_generator.php
+++ b/vendor/zendframework/zendframework/bin/templatemap_generator.php
@@ -4,7 +4,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -182,7 +182,6 @@ foreach ($l as $file) {
$map->{$mapName} = $filename;
}
-
if ($appending) {
$content = var_export((array) $map, true) . ';';
@@ -230,7 +229,9 @@ foreach ($matches as $match) {
$maxWidth = max($maxWidth, strlen($match[1]));
}
-$content = preg_replace('(\n\s+([^=]+)=>)e', "'\n \\1' . str_repeat(' ', " . $maxWidth . " - strlen('\\1')) . '=>'", $content);
+$content = preg_replace_callback('(\n\s+([^=]+)=>)', function ($matches) use ($maxWidth) {
+ return PHP_EOL . ' ' . $matches[1] . str_repeat(' ', $maxWidth - strlen($matches[1])) . '=>';
+}, $content);
// Make the file end by EOL
$content = rtrim($content, "\n") . "\n";
diff --git a/vendor/zendframework/zendframework/composer.json b/vendor/zendframework/zendframework/composer.json
index b8abf6a46ff..ba1c687a933 100644
--- a/vendor/zendframework/zendframework/composer.json
+++ b/vendor/zendframework/zendframework/composer.json
@@ -8,23 +8,46 @@
],
"homepage": "http://framework.zend.com/",
"license": "BSD-3-Clause",
+ "repositories": [
+ {
+ "type": "package",
+ "package": {
+ "name": "sebastianbergmann/phpcov",
+ "version": "1.1.0",
+ "dist": {
+ "url": "https://github.com/sebastianbergmann/phpcov/archive/1.1.0.zip",
+ "type": "zip"
+ },
+ "source": {
+ "url": "https://github.com/sebastianbergmann/phpcov.git",
+ "type": "git",
+ "reference": "1.1.0"
+ },
+ "bin": [
+ "phpcov.php"
+ ]
+ }
+ }
+ ],
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zendxml": "~1.0-dev"
},
"require-dev": {
"doctrine/annotations": ">=1.0",
"ircmaxell/random-lib": "dev-master",
"ircmaxell/security-lib": "dev-master",
- "ocramius/proxy-manager": "0.4.*",
- "fabpot/php-cs-fixer": "*@dev",
- "phpunit/PHPUnit": "3.7.*"
+ "mikey179/vfsStream": "1.2.*",
+ "fabpot/php-cs-fixer": "1.*",
+ "phpunit/PHPUnit": "3.7.*",
+ "satooshi/php-coveralls": "dev-master",
+ "sebastianbergmann/phpcov": "1.1.0"
},
"suggest": {
"ext-intl": "ext/intl for i18n features (included in default builds of PHP)",
"doctrine/annotations": "Doctrine Annotations >=1.0 for annotation features",
"ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
- "ocramius/proxy-manager": "ProxyManager to handle lazy initialization of services",
+ "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
"zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
"zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
},
@@ -33,6 +56,11 @@
"Zend\\": "library/"
}
},
+ "autoload-dev": {
+ "psr-0": {
+ "ZendTest\\": "tests/"
+ }
+ },
"bin": [
"bin/classmap_generator.php",
"bin/pluginmap_generator.php",
@@ -93,8 +121,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/AbstractAdapter.php
index e57910de848..5ca7457af8e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Authentication\Adapter;
abstract class AbstractAdapter implements ValidatableAdapterInterface
{
-
/**
* @var mixed
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/AdapterInterface.php
index d23d0793668..a741dd6107f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable.php
index 917fa3fd43f..0edfbf2b220 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php
index 7b99d16a00b..11a07ef9b3f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/AbstractAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -105,7 +105,7 @@ abstract class AbstractAdapter extends BaseAdapter
* setTableName() - set the table name to be used in the select query
*
* @param string $tableName
- * @return DbTable Provides a fluent interface
+ * @return self Provides a fluent interface
*/
public function setTableName($tableName)
{
@@ -117,7 +117,7 @@ abstract class AbstractAdapter extends BaseAdapter
* setIdentityColumn() - set the column name to be used as the identity column
*
* @param string $identityColumn
- * @return DbTable Provides a fluent interface
+ * @return self Provides a fluent interface
*/
public function setIdentityColumn($identityColumn)
{
@@ -129,7 +129,7 @@ abstract class AbstractAdapter extends BaseAdapter
* setCredentialColumn() - set the column name to be used as the credential column
*
* @param string $credentialColumn
- * @return DbTable Provides a fluent interface
+ * @return self Provides a fluent interface
*/
public function setCredentialColumn($credentialColumn)
{
@@ -143,7 +143,7 @@ abstract class AbstractAdapter extends BaseAdapter
* false) parameters. Default is false.
*
* @param int|bool $flag
- * @return DbTable Provides a fluent interface
+ * @return self Provides a fluent interface
*/
public function setAmbiguityIdentity($flag)
{
@@ -195,7 +195,6 @@ abstract class AbstractAdapter extends BaseAdapter
$returnObject = new stdClass();
if (null !== $returnColumns) {
-
$availableColumns = array_keys($this->resultRow);
foreach ((array) $returnColumns as $returnColumn) {
if (in_array($returnColumn, $availableColumns)) {
@@ -203,9 +202,7 @@ abstract class AbstractAdapter extends BaseAdapter
}
}
return $returnObject;
-
} elseif (null !== $omitColumns) {
-
$omitColumns = (array) $omitColumns;
foreach ($this->resultRow as $resultColumn => $resultValue) {
if (!in_array($resultColumn, $omitColumns)) {
@@ -213,7 +210,6 @@ abstract class AbstractAdapter extends BaseAdapter
}
}
return $returnObject;
-
}
foreach ($this->resultRow as $resultColumn => $resultValue) {
@@ -324,13 +320,20 @@ abstract class AbstractAdapter extends BaseAdapter
$resultIdentities = array();
// iterate result, most cross platform way
foreach ($result as $row) {
+ // ZF-6428 - account for db engines that by default return uppercase column names
+ if (isset($row['ZEND_AUTH_CREDENTIAL_MATCH'])) {
+ $row['zend_auth_credential_match'] = $row['ZEND_AUTH_CREDENTIAL_MATCH'];
+ unset($row['ZEND_AUTH_CREDENTIAL_MATCH']);
+ }
$resultIdentities[] = $row;
}
} catch (\Exception $e) {
throw new Exception\RuntimeException(
'The supplied parameters to DbTable failed to '
- . 'produce a valid sql statement, please check table and column names '
- . 'for validity.', 0, $e
+ . 'produce a valid sql statement, please check table and column names '
+ . 'for validity.',
+ 0,
+ $e
);
}
return $resultIdentities;
@@ -345,7 +348,6 @@ abstract class AbstractAdapter extends BaseAdapter
*/
protected function authenticateValidateResultSet(array $resultIdentities)
{
-
if (count($resultIdentities) < 1) {
$this->authenticateResultInfo['code'] = AuthenticationResult::FAILURE_IDENTITY_NOT_FOUND;
$this->authenticateResultInfo['messages'][] = 'A record with the supplied identity could not be found.';
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php
index 9527569a8f2..48b9ebd7b1b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -56,7 +56,7 @@ class CallbackCheckAdapter extends AbstractAdapter
* credential.
*
* @param callable $validationCallback
- * @return DbTable
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setCredentialValidationCallback($validationCallback)
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php
index 8b7cbd3a44d..a3da997221c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -62,7 +62,7 @@ class CredentialTreatmentAdapter extends AbstractAdapter
* 'MD5(?)'
*
* @param string $treatment
- * @return DbTable Provides a fluent interface
+ * @return self Provides a fluent interface
*/
public function setCredentialTreatment($treatment)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php
index 615645732bc..913784aea45 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Authentication\Adapter\DbTable\Exception;
use Zend\Authentication\Adapter\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php
index 87bf01401b7..bcba5644408 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,8 +11,6 @@ namespace Zend\Authentication\Adapter\DbTable\Exception;
use Zend\Authentication\Adapter\Exception;
-class InvalidArgumentException
- extends Exception\InvalidArgumentException
- implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php
index bf4cc273b3a..54e90241602 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Digest.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Digest.php
index 5c3c838a13c..a1a0414e5e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Digest.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Digest.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -180,17 +180,14 @@ class Digest extends AbstractAdapter
}
if (substr($line, 0, $idLength) === $id) {
if (CryptUtils::compareStrings(substr($line, -32), md5("$this->identity:$this->realm:$this->credential"))) {
- $result['code'] = AuthenticationResult::SUCCESS;
- } else {
- $result['code'] = AuthenticationResult::FAILURE_CREDENTIAL_INVALID;
- $result['messages'][] = 'Password incorrect';
+ return new AuthenticationResult(AuthenticationResult::SUCCESS, $result['identity'], $result['messages']);
}
- return new AuthenticationResult($result['code'], $result['identity'], $result['messages']);
+ $result['messages'][] = 'Password incorrect';
+ return new AuthenticationResult(AuthenticationResult::FAILURE_CREDENTIAL_INVALID, $result['identity'], $result['messages']);
}
}
- $result['code'] = AuthenticationResult::FAILURE_IDENTITY_NOT_FOUND;
$result['messages'][] = "Username '$this->identity' and realm '$this->realm' combination not found";
- return new AuthenticationResult($result['code'], $result['identity'], $result['messages']);
+ return new AuthenticationResult(AuthenticationResult::FAILURE_IDENTITY_NOT_FOUND, $result['identity'], $result['messages']);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php
index b8da27fad08..e64b410c88e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Authentication\Adapter\Exception;
use Zend\Authentication\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/InvalidArgumentException.php
index c2f0105d5d9..2d0452d4383 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,8 +11,6 @@ namespace Zend\Authentication\Adapter\Exception;
use Zend\Authentication\Exception;
-class InvalidArgumentException
- extends Exception\InvalidArgumentException
- implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/RuntimeException.php
index 79109367a9a..8cf08495c16 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php
index 962403dabaf..1f2a5227dea 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php
index 636043000c8..7f8517fe788 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -324,8 +324,9 @@ class Http implements AdapterInterface
public function authenticate()
{
if (empty($this->request) || empty($this->response)) {
- throw new Exception\RuntimeException('Request and Response objects must be set before calling '
- . 'authenticate()');
+ throw new Exception\RuntimeException(
+ 'Request and Response objects must be set before calling authenticate()'
+ );
}
if ($this->imaProxy) {
@@ -336,11 +337,11 @@ class Http implements AdapterInterface
$headers = $this->request->getHeaders();
if (!$headers->has($getHeader)) {
- return $this->_challengeClient();
+ return $this->challengeClient();
}
$authHeader = $headers->get($getHeader)->getFieldValue();
if (!$authHeader) {
- return $this->_challengeClient();
+ return $this->challengeClient();
}
list($clientScheme) = explode(' ', $authHeader);
@@ -360,7 +361,7 @@ class Http implements AdapterInterface
// client sent a scheme that is not the one required
if (!in_array($clientScheme, $this->acceptSchemes)) {
// challenge again the client
- return $this->_challengeClient();
+ return $this->challengeClient();
}
switch ($clientScheme) {
@@ -377,6 +378,23 @@ class Http implements AdapterInterface
return $result;
}
+ /**
+ * @deprecated
+ * @see Http::challengeClient()
+ * @return Authentication\Result Always returns a non-identity Auth result
+ */
+ protected function _challengeClient()
+ {
+ trigger_error(sprintf(
+ 'The method "%s" is deprecated and will be removed in the future; '
+ . 'please use the public method "%s::challengeClient()" instead',
+ __METHOD__,
+ __CLASS__
+ ), E_USER_DEPRECATED);
+
+ return $this->challengeClient();
+ }
+
/**
* Challenge Client
*
@@ -385,7 +403,7 @@ class Http implements AdapterInterface
*
* @return Authentication\Result Always returns a non-identity Auth result
*/
- protected function _challengeClient()
+ public function challengeClient()
{
if ($this->imaProxy) {
$statusCode = 407;
@@ -459,8 +477,8 @@ class Http implements AdapterInterface
}
if (empty($this->basicResolver)) {
throw new Exception\RuntimeException(
- 'A basicResolver object must be set before doing Basic '
- . 'authentication');
+ 'A basicResolver object must be set before doing Basic authentication'
+ );
}
// Decode the Authorization header
@@ -474,12 +492,12 @@ class Http implements AdapterInterface
// implementation does. If invalid credentials are detected,
// re-challenge the client.
if (!ctype_print($auth)) {
- return $this->_challengeClient();
+ return $this->challengeClient();
}
// Fix for ZF-1515: Now re-challenges on empty username or password
$creds = array_filter(explode(':', $auth));
if (count($creds) != 2) {
- return $this->_challengeClient();
+ return $this->challengeClient();
}
$result = $this->basicResolver->resolve($creds[0], $this->realm, $creds[1]);
@@ -498,7 +516,7 @@ class Http implements AdapterInterface
return new Authentication\Result(Authentication\Result::SUCCESS, $result);
}
- return $this->_challengeClient();
+ return $this->challengeClient();
}
/**
@@ -530,17 +548,17 @@ class Http implements AdapterInterface
// See ZF-1052. This code was a bit too unforgiving of invalid
// usernames. Now, if the username is bad, we re-challenge the client.
if ('::invalid::' == $data['username']) {
- return $this->_challengeClient();
+ return $this->challengeClient();
}
// Verify that the client sent back the same nonce
if ($this->_calcNonce() != $data['nonce']) {
- return $this->_challengeClient();
+ return $this->challengeClient();
}
// The opaque value is also required to match, but of course IE doesn't
// play ball.
if (!$this->ieNoOpaque && $this->_calcOpaque() != $data['opaque']) {
- return $this->_challengeClient();
+ return $this->challengeClient();
}
// Look up the user's password hash. If not found, deny access.
@@ -549,7 +567,7 @@ class Http implements AdapterInterface
// to be recreatable with the current settings of this object.
$ha1 = $this->digestResolver->resolve($data['username'], $data['realm']);
if ($ha1 === false) {
- return $this->_challengeClient();
+ return $this->challengeClient();
}
// If MD5-sess is used, a1 value is made of the user's password
@@ -575,7 +593,6 @@ class Http implements AdapterInterface
// easier
$ha2 = hash('md5', $a2);
-
// Calculate the server's version of the request-digest. This must
// match $data['response']. See RFC 2617, section 3.2.2.1
$message = $data['nonce'] . ':' . $data['nc'] . ':' . $data['cnonce'] . ':' . $data['qop'] . ':' . $ha2;
@@ -588,7 +605,7 @@ class Http implements AdapterInterface
return new Authentication\Result(Authentication\Result::SUCCESS, $identity);
}
- return $this->_challengeClient();
+ return $this->challengeClient();
}
/**
@@ -745,7 +762,6 @@ class Http implements AdapterInterface
if ($this->useOpaque) {
$ret = preg_match('/opaque="([^"]+)"/', $header, $temp);
if (!$ret || empty($temp[1])) {
-
// Big surprise: IE isn't RFC 2617-compliant.
$headers = $this->request->getHeaders();
if (!$headers->has('User-Agent')) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ApacheResolver.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ApacheResolver.php
index 58bcb46f5f0..cd916e7d5b1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ApacheResolver.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ApacheResolver.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -50,7 +50,7 @@ class ApacheResolver implements ResolverInterface
* Set the path to the credentials file
*
* @param string $path
- * @return FileResolver Provides a fluent interface
+ * @return self Provides a fluent interface
* @throws Exception\InvalidArgumentException if path is not readable
*/
public function setFile($path)
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php
index 0bfa484f25b..cd849a07d5a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use Zend\Authentication\Adapter\Exception\ExceptionInterface as Exception;
* HTTP Auth Resolver Exception
*/
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php
index 5e8fe751f8f..80bad62b36d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php
index 94a9f9e141c..f3ced1dd9c5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/FileResolver.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/FileResolver.php
index 2bb58567455..bdcfb99b3f6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/FileResolver.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/FileResolver.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -88,14 +88,16 @@ class FileResolver implements ResolverInterface
if (empty($username)) {
throw new Exception\InvalidArgumentException('Username is required');
} elseif (!ctype_print($username) || strpos($username, ':') !== false) {
- throw new Exception\InvalidArgumentException('Username must consist only of printable characters, '
- . 'excluding the colon');
+ throw new Exception\InvalidArgumentException(
+ 'Username must consist only of printable characters, excluding the colon'
+ );
}
if (empty($realm)) {
throw new Exception\InvalidArgumentException('Realm is required');
} elseif (!ctype_print($realm) || strpos($realm, ':') !== false) {
- throw new Exception\InvalidArgumentException('Realm must consist only of printable characters, '
- . 'excluding the colon.');
+ throw new Exception\InvalidArgumentException(
+ 'Realm must consist only of printable characters, excluding the colon.'
+ );
}
// Open file, read through looking for matching credentials
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ResolverInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ResolverInterface.php
index b236f845881..f36c1941e81 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ResolverInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ResolverInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Ldap.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Ldap.php
index 320e6c58157..a4c8e331515 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Ldap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Ldap.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Ldap\Exception\LdapException;
class Ldap extends AbstractAdapter
{
-
/**
* The Zend\Ldap\Ldap context.
*
@@ -168,8 +167,10 @@ class Ldap extends AbstractAdapter
{
$options = $this->getLdap()->getOptions();
$name = $options['accountDomainName'];
- if (!$name)
+ if (!$name) {
$name = $options['accountDomainNameShort'];
+ }
+
return $name ? $name : '';
}
@@ -212,7 +213,6 @@ class Ldap extends AbstractAdapter
* credentials against it.
*/
foreach ($this->options as $options) {
-
if (!is_array($options)) {
throw new Exception\InvalidArgumentException('Adapter options array not an array');
}
@@ -220,8 +220,10 @@ class Ldap extends AbstractAdapter
$dname = '';
try {
- if ($messages[1])
+ if ($messages[1]) {
$messages[] = $messages[1];
+ }
+
$messages[1] = '';
$messages[] = $this->optionsToString($options);
@@ -273,7 +275,6 @@ class Ldap extends AbstractAdapter
$failedAuthorities[$dname] = $groupResult;
}
} catch (LdapException $zle) {
-
/* LDAP based authentication is notoriously difficult to diagnose. Therefore
* we bend over backwards to capture and record every possible bit of
* information when something goes wrong.
@@ -341,9 +342,16 @@ class Ldap extends AbstractAdapter
switch ($key) {
case 'groupScope':
$value = (int) $value;
- if (in_array($value, array(ZendLdap\Ldap::SEARCH_SCOPE_BASE,
- ZendLdap\Ldap::SEARCH_SCOPE_ONE, ZendLdap\Ldap::SEARCH_SCOPE_SUB), true)) {
- $adapterOptions[$key] = $value;
+ if (in_array(
+ $value,
+ array(
+ ZendLdap\Ldap::SEARCH_SCOPE_BASE,
+ ZendLdap\Ldap::SEARCH_SCOPE_ONE,
+ ZendLdap\Ldap::SEARCH_SCOPE_SUB,
+ ),
+ true
+ )) {
+ $adapterOptions[$key] = $value;
}
break;
case 'memberIsDn':
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/ValidatableAdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/ValidatableAdapterInterface.php
index 3c4f01b2c7d..9c711d2e8b4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/ValidatableAdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/ValidatableAdapterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/AuthenticationService.php b/vendor/zendframework/zendframework/library/Zend/Authentication/AuthenticationService.php
index 212747db80f..d95fc366d40 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/AuthenticationService.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/AuthenticationService.php
@@ -3,13 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Authentication;
-class AuthenticationService
+class AuthenticationService implements AuthenticationServiceInterface
{
/**
* Persistent storage handler
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/AuthenticationServiceInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/AuthenticationServiceInterface.php
new file mode 100644
index 00000000000..d3e347b6f3c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/AuthenticationServiceInterface.php
@@ -0,0 +1,44 @@
+<?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\Authentication;
+
+/**
+ * Provides an API for authentication and identity management
+ */
+interface AuthenticationServiceInterface
+{
+ /**
+ * Authenticates and provides an authentication result
+ *
+ * @return Result
+ */
+ public function authenticate();
+
+ /**
+ * Returns true if and only if an identity is available
+ *
+ * @return bool
+ */
+ public function hasIdentity();
+
+ /**
+ * Returns the authenticated identity or null if no identity is available
+ *
+ * @return mixed|null
+ */
+ public function getIdentity();
+
+ /**
+ * Clears the identity
+ *
+ * @return void
+ */
+ public function clearIdentity();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Authentication/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/ExceptionInterface.php
index d995a645388..87b39c4d436 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Authentication\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/InvalidArgumentException.php
index 851fb73c017..e837be44999 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/RuntimeException.php
index 78bc6730810..cf8fc4b8623 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/UnexpectedValueException.php
index e126929080b..0b04b8e9649 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php
index 00f23f6cc55..68cb49f58c5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Result.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Chain.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Chain.php
index 8d995a2c0ab..f32916e3827 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Chain.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Chain.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/NonPersistent.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/NonPersistent.php
index 8d12049390c..13aa7868176 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/NonPersistent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/NonPersistent.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Session.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Session.php
index 6c66bec8f67..a91d8f22caf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Session.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Session.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/StorageInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/StorageInterface.php
index 4a9d41b9e64..f97520861dd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/StorageInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/StorageInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Validator/Authentication.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Validator/Authentication.php
index d8bb0a84dd3..5c834e5df56 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Validator/Authentication.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Validator/Authentication.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json b/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json
index bdcc937935a..fd6d242b990 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/composer.json
@@ -6,6 +6,7 @@
"zf2",
"authentication"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Authentication\\": ""
@@ -13,19 +14,31 @@
},
"target-dir": "Zend/Authentication",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-db": "self.version",
+ "zendframework/zend-crypt": "self.version",
+ "zendframework/zend-http": "self.version",
+ "zendframework/zend-ldap": "self.version",
+ "zendframework/zend-session": "self.version",
+ "zendframework/zend-validator": "self.version",
+ "zendframework/zend-uri": "self.version"
+ },
"suggest": {
"zendframework/zend-db": "Zend\\Db component",
"zendframework/zend-crypt": "Zend\\Crypt component",
+ "zendframework/zend-http": "Zend\\Http component",
+ "zendframework/zend-ldap": "Zend\\Ldap component",
+ "zendframework/zend-session": "Zend\\Session component",
"zendframework/zend-uri": "Zend\\Uri component",
- "zendframework/zend-session": "Zend\\Session component"
+ "zendframework/zend-validator": "Zend\\Validator component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php
index 20516db3e37..ecd7df6ebc3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -74,7 +74,7 @@ abstract class Barcode
* Factory for Zend\Barcode classes.
*
* First argument may be a string containing the base of the adapter class
- * name, e.g. 'int25' corresponds to class Object\Int25. This
+ * name, e.g. 'code25' corresponds to class Object\Code25. This
* is case-insensitive.
*
* First argument may alternatively be an object of type Traversable.
@@ -95,12 +95,13 @@ abstract class Barcode
* @return Barcode
* @throws Exception\ExceptionInterface
*/
- public static function factory($barcode,
- $renderer = 'image',
- $barcodeConfig = array(),
- $rendererConfig = array(),
- $automaticRenderError = true)
- {
+ public static function factory(
+ $barcode,
+ $renderer = 'image',
+ $barcodeConfig = array(),
+ $rendererConfig = array(),
+ $automaticRenderError = true
+ ) {
/*
* Convert Traversable argument to plain string
* barcode name and separate config object.
@@ -145,7 +146,7 @@ abstract class Barcode
* @param mixed $barcode String name of barcode class, or Traversable object, or barcode object.
* @param mixed $barcodeConfig OPTIONAL; an array or Traversable object with barcode parameters.
* @throws Exception\InvalidArgumentException
- * @return Object
+ * @return Object\ObjectInterface
*/
public static function makeBarcode($barcode, $barcodeConfig = array())
{
@@ -182,7 +183,7 @@ abstract class Barcode
}
/*
- * Verify that an barcode name has been specified.
+ * Verify that a barcode name has been specified.
*/
if (!is_string($barcode) || empty($barcode)) {
throw new Exception\InvalidArgumentException(
@@ -234,7 +235,7 @@ abstract class Barcode
}
/*
- * Verify that an barcode name has been specified.
+ * Verify that a barcode name has been specified.
*/
if (!is_string($renderer) || empty($renderer)) {
throw new Exception\RendererCreationException(
@@ -253,11 +254,12 @@ abstract class Barcode
* @param array | Traversable $barcodeConfig
* @param array | Traversable $rendererConfig
*/
- public static function render($barcode,
- $renderer,
- $barcodeConfig = array(),
- $rendererConfig = array())
- {
+ public static function render(
+ $barcode,
+ $renderer,
+ $barcodeConfig = array(),
+ $rendererConfig = array()
+ ) {
static::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->render();
}
@@ -270,11 +272,12 @@ abstract class Barcode
* @param array | Traversable $rendererConfig
* @return mixed
*/
- public static function draw($barcode,
- $renderer,
- $barcodeConfig = array(),
- $rendererConfig = array())
- {
+ public static function draw(
+ $barcode,
+ $renderer,
+ $barcodeConfig = array(),
+ $rendererConfig = array()
+ ) {
return static::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->draw();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Barcode/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/ExceptionInterface.php
index f421ceb947a..4325f0f1b59 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/InvalidArgumentException.php
index 284818e925a..1b263914088 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,6 @@ namespace Zend\Barcode\Exception;
/**
* Exception for Zend\Barcode component.
*/
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/OutOfRangeException.php
index 0227ed6c933..4a78781dfb1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RendererCreationException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RendererCreationException.php
index a4136856f7b..b9d06e7df67 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RendererCreationException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RendererCreationException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,6 @@ namespace Zend\Barcode\Exception;
/**
* Exception for Zend\Barcode component.
*/
-class RendererCreationException
- extends \InvalidArgumentException
- implements ExceptionInterface
+class RendererCreationException extends \InvalidArgumentException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RuntimeException.php
index 36ac0148f85..f09d1aa4e51 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/UnexpectedValueException.php
index df3495840c3..32b8523f374 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,7 +12,6 @@ namespace Zend\Barcode\Exception;
/**
* Exception for Zend\Barcode component.
*/
-class UnexpectedValueException extends \UnexpectedValueException implements
- ExceptionInterface
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/AbstractObject.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/AbstractObject.php
index 0fcf7723f85..a74c1dc774e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/AbstractObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/AbstractObject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -21,48 +21,56 @@ abstract class AbstractObject implements ObjectInterface
{
/**
* Namespace of the barcode for autoloading
+ *
* @var string
*/
protected $barcodeNamespace = 'Zend\Barcode\Object';
/**
* Set of drawing instructions
+ *
* @var array
*/
protected $instructions = array();
/**
* Barcode type
+ *
* @var string
*/
protected $type = null;
/**
* Height of the object
+ *
* @var int
*/
protected $height = null;
/**
* Width of the object
+ *
* @var int
*/
protected $width = null;
/**
* Height of the bar
+ *
* @var int
*/
protected $barHeight = 50;
/**
* Width of a thin bar
+ *
* @var int
*/
protected $barThinWidth = 1;
/**
* Width of a thick bar
+ *
* @var int
*/
protected $barThickWidth = 3;
@@ -70,42 +78,49 @@ abstract class AbstractObject implements ObjectInterface
/**
* Factor to multiply bar and font measure
* (barHeight, barThinWidth, barThickWidth & fontSize)
+ *
* @var int
*/
protected $factor = 1;
/**
* Font and bars color of the object
+ *
* @var int
*/
protected $foreColor = 0x000000;
/**
* Background color of the object
+ *
* @var int
*/
protected $backgroundColor = 0xFFFFFF;
/**
* Activate/deactivate border of the object
+ *
* @var bool
*/
protected $withBorder = false;
/**
* Activate/deactivate drawing of quiet zones
+ *
* @var bool
*/
protected $withQuietZones = true;
/**
* Force quiet zones even if
+ *
* @var bool
*/
protected $mandatoryQuietZones = false;
/**
* Orientation of the barcode in degrees
+ *
* @var float
*/
protected $orientation = 0;
@@ -113,6 +128,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Offset from the top the object
* (calculated from the orientation)
+ *
* @var int
*/
protected $offsetTop = null;
@@ -120,24 +136,28 @@ abstract class AbstractObject implements ObjectInterface
/**
* Offset from the left the object
* (calculated from the orientation)
+ *
* @var int
*/
protected $offsetLeft = null;
/**
* Text to display
+ *
* @var string
*/
protected $text = null;
/**
* Display (or not) human readable text
+ *
* @var bool
*/
protected $drawText = true;
/**
* Adjust (or not) position of human readable characters with barcode
+ *
* @var bool
*/
protected $stretchText = false;
@@ -146,30 +166,35 @@ abstract class AbstractObject implements ObjectInterface
* Font resource
* - integer (1 to 5): corresponds to GD included fonts
* - string: corresponds to path of a TTF font
+ *
* @var int|string
*/
protected $font = null;
/**
* Font size
+ *
* @var float
*/
protected $fontSize = 10;
/**
* Drawing of checksum
+ *
* @var bool
*/
protected $withChecksum = false;
/**
* Drawing of checksum inside text
+ *
* @var bool
*/
protected $withChecksumInText = false;
/**
* Fix barcode length (numeric or string like 'even')
+ *
* @var int | string
*/
protected $barcodeLength = null;
@@ -177,6 +202,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Activate automatic addition of leading zeros
* if barcode length is fixed
+ *
* @var bool
*/
protected $addLeadingZeros = true;
@@ -184,18 +210,21 @@ abstract class AbstractObject implements ObjectInterface
/**
* Activation of mandatory checksum
* to deactivate unauthorized modification
+ *
* @var bool
*/
protected $mandatoryChecksum = false;
/**
* Character used to substitute checksum character for validation
+ *
* @var mixed
*/
protected $substituteChecksumCharacter = 0;
/**
* Constructor
+ *
* @param array|Traversable $options
*/
public function __construct($options = null)
@@ -217,7 +246,6 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set default options for particular object
- * @return void
*/
protected function getDefaultOptions()
{
@@ -225,6 +253,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set barcode state from options array
+ *
* @param array $options
* @return \Zend\Barcode\Object\ObjectInterface
*/
@@ -263,6 +292,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve type of barcode
+ *
* @return string
*/
public function getType()
@@ -272,6 +302,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set height of the barcode bar
+ *
* @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -289,6 +320,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get height of the barcode bar
+ *
* @return int
*/
public function getBarHeight()
@@ -298,6 +330,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set thickness of thin bar
+ *
* @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -315,6 +348,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get thickness of thin bar
+ *
* @return int
*/
public function getBarThinWidth()
@@ -324,6 +358,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set thickness of thick bar
+ *
* @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -341,6 +376,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get thickness of thick bar
+ *
* @return int
*/
public function getBarThickWidth()
@@ -351,7 +387,8 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set factor applying to
* thinBarWidth - thickBarWidth - barHeight - fontSize
- * @param float $value
+ *
+ * @param int|float|string|bool $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
@@ -369,6 +406,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get factor applying to
* thinBarWidth - thickBarWidth - barHeight - fontSize
+ *
* @return int
*/
public function getFactor()
@@ -378,6 +416,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set color of the barcode and text
+ *
* @param string $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -398,6 +437,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve color of the barcode and text
+ *
* @return int
*/
public function getForeColor()
@@ -407,6 +447,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set the color of the background
+ *
* @param int $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -427,6 +468,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve background color of the image
+ *
* @return int
*/
public function getBackgroundColor()
@@ -436,6 +478,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Activate/deactivate drawing of the bar
+ *
* @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
*/
@@ -447,6 +490,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve if border are draw or not
+ *
* @return bool
*/
public function getWithBorder()
@@ -456,6 +500,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Activate/deactivate drawing of the quiet zones
+ *
* @param bool $value
* @return AbstractObject
*/
@@ -467,6 +512,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve if quiet zones are draw or not
+ *
* @return bool
*/
public function getWithQuietZones()
@@ -476,6 +522,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Allow fast inversion of font/bars color and background color
+ *
* @return \Zend\Barcode\Object\ObjectInterface
*/
public function setReverseColor()
@@ -488,7 +535,8 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set orientation of barcode and text
- * @param float $value
+ *
+ * @param int|float|string|bool $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
@@ -500,6 +548,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve orientation of barcode and text
+ *
* @return float
*/
public function getOrientation()
@@ -509,6 +558,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set text to encode
+ *
* @param string $value
* @return \Zend\Barcode\Object\ObjectInterface
*/
@@ -520,6 +570,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve text to encode
+ *
* @return string
*/
public function getText()
@@ -533,8 +584,9 @@ abstract class AbstractObject implements ObjectInterface
/**
* Automatically add leading zeros if barcode length is fixed
- * @param string $text
- * @param bool $withoutChecksum
+ *
+ * @param string $text
+ * @param bool $withoutChecksum
* @return string
*/
protected function addLeadingZeros($text, $withoutChecksum = false)
@@ -557,6 +609,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve text to encode
+ *
* @return string
*/
public function getRawText()
@@ -566,6 +619,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve text to display
+ *
* @return string
*/
public function getTextToDisplay()
@@ -579,6 +633,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Activate/deactivate drawing of text to encode
+ *
* @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
*/
@@ -590,6 +645,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve if drawing of text to encode is enabled
+ *
* @return bool
*/
public function getDrawText()
@@ -600,6 +656,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Activate/deactivate the adjustment of the position
* of the characters to the position of the bars
+ *
* @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -613,6 +670,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve if the adjustment of the position of the characters
* to the position of the bars is enabled
+ *
* @return bool
*/
public function getStretchText()
@@ -624,6 +682,7 @@ abstract class AbstractObject implements ObjectInterface
* Activate/deactivate the automatic generation
* of the checksum character
* added to the barcode text
+ *
* @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
*/
@@ -638,6 +697,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve if the checksum character is automatically
* added to the barcode text
+ *
* @return bool
*/
public function getWithChecksum()
@@ -649,6 +709,7 @@ abstract class AbstractObject implements ObjectInterface
* Activate/deactivate the automatic generation
* of the checksum character
* added to the barcode text
+ *
* @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -664,6 +725,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve if the checksum character is automatically
* added to the barcode text
+ *
* @return bool
*/
public function getWithChecksumInText()
@@ -675,6 +737,7 @@ abstract class AbstractObject implements ObjectInterface
* Set the font:
* - if integer between 1 and 5, use gd built-in fonts
* - if string, $value is assumed to be the path to a TTF font
+ *
* @param int|string $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -706,6 +769,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve the font
+ *
* @return int|string
*/
public function getFont()
@@ -715,6 +779,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Set the size of the font in case of TTF
+ *
* @param float $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
@@ -748,6 +813,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Quiet zone before first bar
* and after the last bar
+ *
* @return int
*/
public function getQuietZone()
@@ -761,6 +827,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Add an instruction in the array of instructions
+ *
* @param array $instruction
*/
protected function addInstruction(array $instruction)
@@ -770,6 +837,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Retrieve the set of drawing instructions
+ *
* @return array
*/
public function getInstructions()
@@ -779,9 +847,10 @@ abstract class AbstractObject implements ObjectInterface
/**
* Add a polygon drawing instruction in the set of instructions
+ *
* @param array $points
- * @param int $color
- * @param bool $filled
+ * @param int $color
+ * @param bool $filled
*/
protected function addPolygon(array $points, $color = null, $filled = true)
{
@@ -798,13 +867,14 @@ abstract class AbstractObject implements ObjectInterface
/**
* Add a text drawing instruction in the set of instructions
+ *
* @param string $text
- * @param float $size
- * @param array $position
+ * @param float $size
+ * @param int[] $position
* @param string $font
- * @param int $color
+ * @param int $color
* @param string $alignment
- * @param float $orientation
+ * @param float $orientation
*/
protected function addText(
$text,
@@ -832,6 +902,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Checking of parameters after all settings
+ *
* @return bool
*/
public function checkParams()
@@ -844,7 +915,8 @@ abstract class AbstractObject implements ObjectInterface
/**
* Check if a text is really provided to barcode
- * @return void
+ *
+ * @param string|null $value
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
protected function checkText($value = null)
@@ -862,9 +934,9 @@ abstract class AbstractObject implements ObjectInterface
/**
* Check the ratio between the thick and the thin bar
+ *
* @param int $min
* @param int $max
- * @return void
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
protected function checkRatio($min = 2, $max = 3)
@@ -882,7 +954,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Drawing with an angle is just allow TTF font
- * @return void
+ *
* @throws \Zend\Barcode\Object\Exception\ExceptionInterface
*/
protected function checkFontAndOrientation()
@@ -897,6 +969,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Width of the result image
* (before any rotation)
+ *
* @return int
*/
protected function calculateWidth()
@@ -908,12 +981,14 @@ abstract class AbstractObject implements ObjectInterface
/**
* Calculate the width of the barcode
+ *
* @return int
*/
abstract protected function calculateBarcodeWidth();
/**
* Height of the result object
+ *
* @return int
*/
protected function calculateHeight()
@@ -925,6 +1000,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Height of the barcode
+ *
* @return int
*/
protected function calculateBarcodeHeight()
@@ -940,6 +1016,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get height of the result object
+ *
* @param bool $recalculate
* @return int
*/
@@ -955,6 +1032,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Get width of the result object
+ *
* @param bool $recalculate
* @return int
*/
@@ -971,26 +1049,21 @@ abstract class AbstractObject implements ObjectInterface
/**
* Calculate the offset from the left of the object
* if an orientation is activated
+ *
* @param bool $recalculate
* @return float
*/
public function getOffsetLeft($recalculate = false)
{
if ($this->offsetLeft === null || $recalculate) {
- $this->offsetLeft = - min(array(
- 0 * cos(
- $this->orientation / 180 * pi()) - 0 * sin(
- $this->orientation / 180 * pi()),
- 0 * cos(
- $this->orientation / 180 * pi()) - $this->calculateBarcodeHeight() * sin(
- $this->orientation / 180 * pi()),
- $this->calculateBarcodeWidth() * cos(
- $this->orientation / 180 * pi()) - $this->calculateBarcodeHeight() * sin(
- $this->orientation / 180 * pi()),
- $this->calculateBarcodeWidth() * cos(
- $this->orientation / 180 * pi()) - 0 * sin(
- $this->orientation / 180 * pi()),
- ));
+ $this->offsetLeft = - min(
+ array(
+ 0 * cos($this->orientation / 180 * pi()) - 0 * sin($this->orientation / 180 * pi()),
+ 0 * cos($this->orientation / 180 * pi()) - $this->calculateBarcodeHeight() * sin($this->orientation / 180 * pi()),
+ $this->calculateBarcodeWidth() * cos($this->orientation / 180 * pi()) - $this->calculateBarcodeHeight() * sin($this->orientation / 180 * pi()),
+ $this->calculateBarcodeWidth() * cos($this->orientation / 180 * pi()) - 0 * sin($this->orientation / 180 * pi()),
+ )
+ );
}
return $this->offsetLeft;
}
@@ -998,35 +1071,31 @@ abstract class AbstractObject implements ObjectInterface
/**
* Calculate the offset from the top of the object
* if an orientation is activated
+ *
* @param bool $recalculate
* @return float
*/
public function getOffsetTop($recalculate = false)
{
if ($this->offsetTop === null || $recalculate) {
- $this->offsetTop = - min(array(
- 0 * cos(
- $this->orientation / 180 * pi()) + 0 * sin(
- $this->orientation / 180 * pi()),
- $this->calculateBarcodeHeight() * cos(
- $this->orientation / 180 * pi()) + 0 * sin(
- $this->orientation / 180 * pi()),
- $this->calculateBarcodeHeight() * cos(
- $this->orientation / 180 * pi()) + $this->calculateBarcodeWidth() * sin(
- $this->orientation / 180 * pi()),
- 0 * cos(
- $this->orientation / 180 * pi()) + $this->calculateBarcodeWidth() * sin(
- $this->orientation / 180 * pi()),
- ));
+ $this->offsetTop = - min(
+ array(
+ 0 * cos($this->orientation / 180 * pi()) + 0 * sin($this->orientation / 180 * pi()),
+ $this->calculateBarcodeHeight() * cos($this->orientation / 180 * pi()) + 0 * sin($this->orientation / 180 * pi()),
+ $this->calculateBarcodeHeight() * cos($this->orientation / 180 * pi()) + $this->calculateBarcodeWidth() * sin($this->orientation / 180 * pi()),
+ 0 * cos($this->orientation / 180 * pi()) + $this->calculateBarcodeWidth() * sin($this->orientation / 180 * pi()),
+ )
+ );
}
return $this->offsetTop;
}
/**
* Apply rotation on a point in X/Y dimensions
- * @param float $x1 x-position before rotation
- * @param float $y1 y-position before rotation
- * @return array Array of two elements corresponding to the new XY point
+ *
+ * @param float $x1 x-position before rotation
+ * @param float $y1 y-position before rotation
+ * @return array Array of two elements corresponding to the new XY point
*/
protected function rotate($x1, $y1)
{
@@ -1041,6 +1110,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Complete drawing of the barcode
+ *
* @return array Table of instructions
*/
public function draw()
@@ -1054,7 +1124,6 @@ abstract class AbstractObject implements ObjectInterface
/**
* Draw the barcode
- * @return void
*/
protected function drawBarcode()
{
@@ -1111,7 +1180,6 @@ abstract class AbstractObject implements ObjectInterface
/**
* Partial function to draw border
- * @return void
*/
protected function drawBorder()
{
@@ -1135,7 +1203,6 @@ abstract class AbstractObject implements ObjectInterface
/**
* Partial function to draw text
- * @return void
*/
protected function drawText()
{
@@ -1151,8 +1218,7 @@ abstract class AbstractObject implements ObjectInterface
$this->fontSize * $this->factor,
$this->rotate(
$leftPosition,
- (int) $this->withBorder * 2
- + $this->factor * ($this->barHeight + $this->fontSize) + 1
+ (int) $this->withBorder * 2 + $this->factor * ($this->barHeight + $this->fontSize) + 1
),
$this->font,
$this->foreColor,
@@ -1166,8 +1232,7 @@ abstract class AbstractObject implements ObjectInterface
$this->fontSize * $this->factor,
$this->rotate(
$this->calculateWidth() / 2,
- (int) $this->withBorder * 2
- + $this->factor * ($this->barHeight + $this->fontSize) + 1
+ (int) $this->withBorder * 2 + $this->factor * ($this->barHeight + $this->fontSize) + 1
),
$this->font,
$this->foreColor,
@@ -1180,8 +1245,8 @@ abstract class AbstractObject implements ObjectInterface
/**
* Check for invalid characters
- * @param string $value Text to be checked
- * @return void
+ *
+ * @param string $value Text to be checked
*/
public function validateText($value)
{
@@ -1190,6 +1255,7 @@ abstract class AbstractObject implements ObjectInterface
/**
* Standard validation for most of barcode objects
+ *
* @param string $value
* @param array $options
*/
@@ -1235,15 +1301,11 @@ abstract class AbstractObject implements ObjectInterface
/**
* Checking of parameters after all settings
- *
- * @return void
*/
abstract protected function checkSpecificParams();
/**
* Allow each child to draw something else
- *
- * @return void
*/
protected function preDrawBarcode()
{
@@ -1252,8 +1314,6 @@ abstract class AbstractObject implements ObjectInterface
/**
* Allow each child to draw something else
* (ex: bearer bars in interleaved 2 of 5 code)
- *
- * @return void
*/
protected function postDrawBarcode()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Codabar.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Codabar.php
index 56a2b9ea30c..e9766788384 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Codabar.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Codabar.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -53,7 +53,8 @@ class Codabar extends AbstractObject
* @return void
*/
protected function checkSpecificParams()
- {}
+ {
+ }
/**
* Prepare array to draw barcode
@@ -62,6 +63,7 @@ class Codabar extends AbstractObject
protected function prepareBarcode()
{
$text = str_split($this->getText());
+ $barcodeTable = array();
foreach ($text as $char) {
$barcodeChar = str_split($this->codingMap[$char]);
foreach ($barcodeChar as $c) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code128.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code128.php
index 2961c2ba912..c4e8916f821 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code128.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code128.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -178,13 +178,13 @@ class Code128 extends AbstractObject
protected static function _isDigit($string, $pos, $length = 2)
{
if ($pos + $length > strlen($string)) {
- return false;
+ return false;
}
for ($i = $pos; $i < $pos + $length; $i++) {
- if (!is_numeric($string[$i])) {
- return false;
- }
+ if (!is_numeric($string[$i])) {
+ return false;
+ }
}
return true;
}
@@ -211,7 +211,6 @@ class Code128 extends AbstractObject
$strlen = strlen($string);
for ($pos = 0; $pos < $strlen; $pos++) {
$char = $string[$pos];
- $code = null;
if (static::_isDigit($string, $pos, 4) && $currentCharset != 'C'
|| static::_isDigit($string, $pos, 2) && $currentCharset == 'C') {
@@ -248,7 +247,7 @@ class Code128 extends AbstractObject
if ($pos == 0) {
$code = array_search("START A", $this->charSets['A']);
} else {
- $code =array_search("Code A", $this->charSets[$currentCharset]);
+ $code = array_search("Code A", $this->charSets[$currentCharset]);
}
$result[] = $code;
$currentCharset = 'A';
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25.php
index 2f32ca7af05..8d0af026e08 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25interleaved.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25interleaved.php
index ec8624d9449..766a8433e8b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25interleaved.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25interleaved.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -73,6 +73,8 @@ class Code25interleaved extends Code25
$this->withBorder = false;
}
+ $barcodeTable = array();
+
// Start character (0000)
$barcodeTable[] = array(1, $this->barThinWidth, 0, 1);
$barcodeTable[] = array(0, $this->barThinWidth, 0, 1);
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code39.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code39.php
index c70e289eb58..54b85534914 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code39.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code39.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean13.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean13.php
index d2920e61f57..25bcc892c4f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean13.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean13.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Barcode\Object;
*/
class Ean13 extends AbstractObject
{
-
/**
* Coding map
* - 0 = narrow bar
@@ -78,7 +77,8 @@ class Ean13 extends AbstractObject
* @return void
*/
protected function checkSpecificParams()
- {}
+ {
+ }
/**
* Prepare array to draw barcode
@@ -174,8 +174,7 @@ class Ean13 extends AbstractObject
$this->fontSize * $this->factor,
$this->rotate(
$leftPosition,
- (int) $this->withBorder * 2
- + $this->factor * ($this->barHeight + $this->fontSize) + 1
+ (int) $this->withBorder * 2 + $this->factor * ($this->barHeight + $this->fontSize) + 1
),
$this->font,
$this->foreColor,
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean2.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean2.php
index ac632c03d55..94db63f44e6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean2.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean2.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Barcode\Object;
*/
class Ean2 extends Ean5
{
-
protected $parities = array(
0 => array('A','A'),
1 => array('A','B'),
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean5.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean5.php
index a285ef565f3..7ec26c04615 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean5.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean5.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Barcode\Object;
*/
class Ean5 extends Ean13
{
-
protected $parities = array(
0 => array('B','B','A','A','A'),
1 => array('B','A','B','A','A'),
@@ -104,6 +103,10 @@ class Ean5 extends Ean13
return ($checksum % 10);
}
+ /**
+ * @param int $i
+ * @return string
+ */
protected function getParity($i)
{
$checksum = $this->getChecksum($this->getText());
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean8.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean8.php
index 4798a11c883..d3d7c9fe11c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean8.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean8.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Validator\Barcode as BarcodeValidator;
*/
class Ean8 extends Ean13
{
-
/**
* Default options for Postnet barcode
* @return void
@@ -103,8 +102,7 @@ class Ean8 extends Ean13
$this->fontSize * $this->factor,
$this->rotate(
$leftPosition,
- (int) $this->withBorder * 2
- + $this->factor * ($this->barHeight + $this->fontSize) + 1
+ (int) $this->withBorder * 2 + $this->factor * ($this->barHeight + $this->fontSize) + 1
),
$this->font,
$this->foreColor,
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Error.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Error.php
index 15c36bcab2e..2f5ddefde95 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Error.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Error.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
index 64f3ea56e0e..d0071d16dc3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExceptionInterface.php
index d0488d79903..87260822113 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
index 340b724ea47..a219a49f255 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
index be38887c7d1..e5f31ddc9c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
index f56edfedf5d..95f952c7ca1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/RuntimeException.php
index 735c7d56c28..2909f082e4a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Identcode.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Identcode.php
index 14d50e6d59b..f8512302559 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Identcode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Identcode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Barcode\Object;
*/
class Identcode extends Code25interleaved
{
-
/**
* Default options for Identcode barcode
* @return void
@@ -31,16 +30,14 @@ class Identcode extends Code25interleaved
*/
public function getTextToDisplay()
{
- return preg_replace('/([0-9]{2})([0-9]{3})([0-9]{3})([0-9]{3})([0-9])/',
- '$1.$2 $3.$4 $5',
- $this->getText());
+ return preg_replace('/([0-9]{2})([0-9]{3})([0-9]{3})([0-9]{3})([0-9])/', '$1.$2 $3.$4 $5', $this->getText());
}
/**
* Check allowed characters
* @param string $value
* @return string
- * @throws Exception
+ * @throws Exception\BarcodeValidationException
*/
public function validateText($value)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Itf14.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Itf14.php
index 8fed5f554ff..226f17a9ada 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Itf14.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Itf14.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Barcode\Object;
*/
class Itf14 extends Code25interleaved
{
-
/**
* Default options for Identcode barcode
* @return void
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Leitcode.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Leitcode.php
index 800567b94cf..06f6d202b3a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Leitcode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Leitcode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Barcode\Object;
*/
class Leitcode extends Identcode
{
-
/**
* Default options for Leitcode barcode
* @return void
@@ -31,8 +30,6 @@ class Leitcode extends Identcode
*/
public function getTextToDisplay()
{
- return preg_replace('/([0-9]{5})([0-9]{3})([0-9]{3})([0-9]{2})([0-9])/',
- '$1.$2.$3.$4 $5',
- $this->getText());
+ return preg_replace('/([0-9]{5})([0-9]{3})([0-9]{3})([0-9]{2})([0-9])/', '$1.$2.$3.$4 $5', $this->getText());
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/ObjectInterface.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/ObjectInterface.php
index 836e0138ee6..c1844c1e10c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/ObjectInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/ObjectInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Planet.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Planet.php
index 0fd2a52f145..7da86f16e9d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Planet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Planet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Barcode\Object;
*/
class Planet extends Postnet
{
-
/**
* Coding map
* - 0 = half bar
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Postnet.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Postnet.php
index 46c777a3ed6..fc55fb7a016 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Postnet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Postnet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Barcode\Object;
*/
class Postnet extends AbstractObject
{
-
/**
* Coding map
* - 0 = half bar
@@ -65,7 +64,8 @@ class Postnet extends AbstractObject
* @return void
*/
protected function checkSpecificParams()
- {}
+ {
+ }
/**
* Prepare array to draw barcode
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Royalmail.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Royalmail.php
index fe85257dd2c..7828dad921b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Royalmail.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Royalmail.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Barcode\Object;
*/
class Royalmail extends AbstractObject
{
-
/**
* Coding map
* - 0 = Tracker, Ascender and Descender
@@ -81,7 +80,8 @@ class Royalmail extends AbstractObject
* @return void
*/
protected function checkSpecificParams()
- {}
+ {
+ }
/**
* Prepare array to draw barcode
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upca.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upca.php
index ff3469651a2..6b9e50e8003 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upca.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upca.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Barcode\Object;
*/
class Upca extends Ean13
{
-
/**
* Default options for Postnet barcode
* @return void
@@ -118,8 +117,7 @@ class Upca extends Ean13
$fontSize * $this->factor,
$this->rotate(
$leftPosition,
- (int) $this->withBorder * 2
- + $this->factor * ($this->barHeight + $fontSize) + 1
+ (int) $this->withBorder * 2 + $this->factor * ($this->barHeight + $fontSize) + 1
),
$this->font,
$this->foreColor,
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upce.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upce.php
index 679fc698eed..696fc7f2b75 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upce.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upce.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Validator\Barcode as BarcodeValidator;
*/
class Upce extends Ean13
{
-
protected $parities = array(
0 => array(
0 => array('B','B','B','A','A','A'),
@@ -60,8 +59,8 @@ class Upce extends Ean13
public function getText()
{
$text = parent::getText();
- if ($text{0} != 1) {
- $text{0} = 0;
+ if ($text[0] != 1) {
+ $text[0] = 0;
}
return $text;
}
@@ -138,8 +137,7 @@ class Upce extends Ean13
$fontSize * $this->factor,
$this->rotate(
$leftPosition,
- (int) $this->withBorder * 2
- + $this->factor * ($this->barHeight + $fontSize) + 1
+ (int) $this->withBorder * 2 + $this->factor * ($this->barHeight + $fontSize) + 1
),
$this->font,
$this->foreColor,
@@ -193,8 +191,8 @@ class Upce extends Ean13
public function getChecksum($text)
{
$text = $this->addLeadingZeros($text, true);
- if ($text{0} != 1) {
- $text{0} = 0;
+ if ($text[0] != 1) {
+ $text[0] = 0;
}
return parent::getChecksum($text);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/ObjectPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Barcode/ObjectPluginManager.php
index 40345f83bfb..80af078b792 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/ObjectPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/ObjectPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/AbstractRenderer.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/AbstractRenderer.php
index df65748dc81..3dfc1a85ee4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/AbstractRenderer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/AbstractRenderer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -304,7 +304,6 @@ abstract class AbstractRenderer implements RendererInterface
return $this;
}
-
/**
* Set the size of a module
* @return float
@@ -382,8 +381,7 @@ abstract class AbstractRenderer implements RendererInterface
if ($barcodeHeight != $supportHeight && $this->topOffset == 0) {
switch ($this->verticalPosition) {
case 'middle':
- $this->topOffset = floor(
- ($supportHeight - $barcodeHeight) / 2);
+ $this->topOffset = floor(($supportHeight - $barcodeHeight) / 2);
break;
case 'bottom':
$this->topOffset = $supportHeight - $barcodeHeight;
@@ -398,8 +396,7 @@ abstract class AbstractRenderer implements RendererInterface
if ($barcodeWidth != $supportWidth && $this->leftOffset == 0) {
switch ($this->horizontalPosition) {
case 'center':
- $this->leftOffset = floor(
- ($supportWidth - $barcodeWidth) / 2);
+ $this->leftOffset = floor(($supportWidth - $barcodeWidth) / 2);
break;
case 'right':
$this->leftOffset = $supportWidth - $barcodeWidth;
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php
index f7f4d44547e..5ae1e5b1506 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
index bbdb502b1b0..b58c2e67409 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
index 2d3d7ce8d80..3a218d39aaf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
index 2eb1c34596f..5873436f71c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
index 8fa8d64fd8f..ea86988fd69 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Image.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Image.php
index c0323dc1fc8..182c81bcbe0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Image.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Image.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -194,7 +194,7 @@ class Image extends AbstractRenderer
$barcodeWidth = $this->barcode->getWidth(true);
$barcodeHeight = $this->barcode->getHeight(true);
- if (is_null($this->resource)) {
+ if (null === $this->resource) {
$width = $barcodeWidth;
$height = $barcodeHeight;
if ($this->userWidth && $this->barcode->getType() != 'error') {
@@ -228,7 +228,7 @@ class Image extends AbstractRenderer
// JPEG does not support transparency, if transparentBackground is true and
// image type is JPEG, ignore transparency
- if($this->getImageType() != "jpeg" && $this->transparentBackground) {
+ if ($this->getImageType() != "jpeg" && $this->transparentBackground) {
imagecolortransparent($this->resource, $this->imageBackgroundColor);
}
@@ -335,10 +335,12 @@ class Image extends AbstractRenderer
$points[3][0] + $this->leftOffset,
$points[3][1] + $this->topOffset, );
- $allocatedColor = imagecolorallocate($this->resource,
+ $allocatedColor = imagecolorallocate(
+ $this->resource,
($color & 0xFF0000) >> 16,
($color & 0x00FF00) >> 8,
- $color & 0x0000FF );
+ $color & 0x0000FF
+ );
if ($filled) {
imagefilledpolygon($this->resource, $newPoints, 4, $allocatedColor);
@@ -361,10 +363,12 @@ class Image extends AbstractRenderer
*/
protected function drawText($text, $size, $position, $font, $color, $alignment = 'center', $orientation = 0)
{
- $allocatedColor = imagecolorallocate($this->resource,
+ $allocatedColor = imagecolorallocate(
+ $this->resource,
($color & 0xFF0000) >> 16,
($color & 0x00FF00) >> 8,
- $color & 0x0000FF );
+ $color & 0x0000FF
+ );
if ($font == null) {
$font = 3;
@@ -400,10 +404,10 @@ class Image extends AbstractRenderer
}
imagestring($this->resource, $font, $positionX, $positionY, $text, $color);
} else {
-
if (!function_exists('imagettfbbox')) {
throw new Exception\RuntimeException(
- 'A font was provided, but this instance of PHP does not have TTF (FreeType) support');
+ 'A font was provided, but this instance of PHP does not have TTF (FreeType) support'
+ );
}
$box = imagettfbbox($size, 0, $font, $text);
@@ -418,14 +422,16 @@ class Image extends AbstractRenderer
$width = ($box[2] - $box[0]);
break;
}
- imagettftext($this->resource,
+ imagettftext(
+ $this->resource,
$size,
$orientation,
$position[0] - ($width * cos(pi() * $orientation / 180)),
$position[1] + ($width * sin(pi() * $orientation / 180)),
$allocatedColor,
$font,
- $text);
+ $text
+ );
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Pdf.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Pdf.php
index b44cadfed04..5e83dc25454 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Pdf.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Pdf.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -104,6 +104,8 @@ class Pdf extends AbstractRenderer
protected function drawPolygon($points, $color, $filled = true)
{
$page = $this->resource->pages[$this->page];
+ $x = array();
+ $y = array();
foreach ($points as $point) {
$x[] = $point[0] * $this->moduleSize + $this->leftOffset;
$y[] = $page->getHeight() - $point[1] * $this->moduleSize - $this->topOffset;
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/RendererInterface.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/RendererInterface.php
index db162dfbd07..0d77ce7bb92 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/RendererInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/RendererInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -79,6 +79,7 @@ interface RendererInterface
/**
* Activate/Deactivate the automatic rendering of exception
* @param bool $value
+ * @return self
*/
public function setAutomaticRenderError($value);
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Svg.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Svg.php
index 8562a57dabb..3906d425922 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Svg.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Svg.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,6 @@ use DOMText;
*/
class Svg extends AbstractRenderer
{
-
/**
* Resource for the image
* @var DOMDocument
@@ -43,7 +42,6 @@ class Svg extends AbstractRenderer
*/
protected $userWidth = 0;
-
/**
* Flag to determime if drawPolygon has been run once already
* @var bool
@@ -149,9 +147,11 @@ class Svg extends AbstractRenderer
$this->rootElement->setAttribute('width', $width);
$this->rootElement->setAttribute('height', $height);
- $this->appendRootElement('title',
- array(),
- "Barcode " . strtoupper($this->barcode->getType()) . " " . $this->barcode->getText());
+ $this->appendRootElement(
+ 'title',
+ array(),
+ "Barcode " . strtoupper($this->barcode->getType()) . " " . $this->barcode->getText()
+ );
} else {
$this->readRootElement();
$width = $this->rootElement->getAttribute('width');
@@ -165,7 +165,7 @@ class Svg extends AbstractRenderer
'height' => ($this->topOffset + $barcodeHeight - 1),
'fill' => $imageBackgroundColor);
- if($this->transparentBackground) {
+ if ($this->transparentBackground) {
$rect['fill-opacity'] = 0;
}
@@ -274,7 +274,7 @@ class Svg extends AbstractRenderer
/**
* Draw the barcode in the rendering resource
- * @return mixed
+ * @return DOMDocument
*/
public function draw()
{
@@ -319,14 +319,14 @@ class Svg extends AbstractRenderer
$points[3][1] + $this->topOffset - sin($orientation),
);
$newPoints = implode(' ', $newPoints);
+ $attributes = array();
$attributes['points'] = $newPoints;
$attributes['fill'] = $color;
// SVG passes a rect in as the first call to drawPolygon, we'll need to intercept
// this and set transparency if necessary.
- $objId = spl_object_hash($this);
- if(!$this->drawPolygonExecuted) {
- if($this->transparentBackground) {
+ if (!$this->drawPolygonExecuted) {
+ if ($this->transparentBackground) {
$attributes['fill-opacity'] = '0';
}
$this->drawPolygonExecuted = true;
@@ -351,6 +351,7 @@ class Svg extends AbstractRenderer
$color = 'rgb(' . implode(', ', array(($color & 0xFF0000) >> 16,
($color & 0x00FF00) >> 8,
($color & 0x0000FF))) . ')';
+ $attributes = array();
$attributes['x'] = $position[0] + $this->leftOffset;
$attributes['y'] = $position[1] + $this->topOffset;
//$attributes['font-family'] = $font;
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/RendererPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Barcode/RendererPluginManager.php
index 0c8c2f8aee0..d81b84d2d16 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/RendererPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/RendererPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/composer.json b/vendor/zendframework/zendframework/library/Zend/Barcode/composer.json
index 798049be296..f351302ebb3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Barcode/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Barcode/composer.json
@@ -6,6 +6,7 @@
"zf2",
"barcode"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Barcode\\": ""
@@ -13,20 +14,22 @@
},
"target-dir": "Zend/Barcode",
"require": {
- "php": ">=5.3.3",
- "zendframework/zend-stdlib": "self.version"
+ "php": ">=5.3.23",
+ "zendframework/zend-stdlib": "self.version",
+ "zendframework/zend-validator": "self.version"
},
"require-dev": {
+ "zendframework/zend-servicemanager": "self.version",
"zendframework/zendpdf": "*"
},
"suggest": {
- "zendframework/zend-validator": "Zend\\Validator component",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component, required when using the factory methods of Zend\\Barcode.",
"zendframework/zendpdf": "ZendPdf component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Cache/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/BadMethodCallException.php
index dc8af1fc5f6..c851fc8b4d5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/ExceptionInterface.php
index 1457349d5a0..4119228dfaf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/ExtensionNotLoadedException.php
index 17621c5aec7..94ec19dbd54 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/InvalidArgumentException.php
index b3b8eeb33e9..57a72630806 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/LogicException.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/LogicException.php
index f0fbf67b252..0832f41c3ee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/LogicException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/LogicException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/MissingDependencyException.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/MissingDependencyException.php
index 94f6ec0f95d..4ce85ff81ee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/MissingDependencyException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/MissingDependencyException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/MissingKeyException.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/MissingKeyException.php
index 24564ef67d2..8ddf128ff9f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/MissingKeyException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/MissingKeyException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/OutOfSpaceException.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/OutOfSpaceException.php
index a8a3c198f49..7cbbe18bd07 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/OutOfSpaceException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/OutOfSpaceException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/RuntimeException.php
index a72f506854a..dd6aec3e6c7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/UnexpectedValueException.php
index 9b168bee26e..af3c5bf996a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/UnsupportedMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/UnsupportedMethodCallException.php
index 92855748f8c..28af6a540bc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Exception/UnsupportedMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/UnsupportedMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/AbstractPattern.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/AbstractPattern.php
index 5e769bae409..2818c41eff1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/AbstractPattern.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/AbstractPattern.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Cache\Pattern;
-use Traversable;
use Zend\Cache\Exception;
abstract class AbstractPattern implements PatternInterface
@@ -22,7 +21,7 @@ abstract class AbstractPattern implements PatternInterface
/**
* Set pattern options
*
- * @param array|Traversable|PatternOptions $options
+ * @param PatternOptions $options
* @return AbstractPattern
* @throws Exception\InvalidArgumentException
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CallbackCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CallbackCache.php
index a01cbe2c8e6..4359924b6d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CallbackCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CallbackCache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -148,17 +148,16 @@ class CallbackCache extends AbstractPattern
$serializedObject = serialize($object);
} catch (\Exception $e) {
ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "Can't serialize callback: see previous exception", 0, $e
- );
+ throw new Exception\RuntimeException("Can't serialize callback: see previous exception", 0, $e);
}
$error = ErrorHandler::stop();
if (!$serializedObject) {
- throw new Exception\RuntimeException(sprintf(
- 'Cannot serialize callback%s',
- ($error ? ': ' . $error->getMessage() : '')
- ), 0, $error);
+ throw new Exception\RuntimeException(
+ sprintf('Cannot serialize callback%s', ($error ? ': ' . $error->getMessage() : '')),
+ 0,
+ $error
+ );
}
$callbackKey.= $serializedObject;
}
@@ -184,17 +183,16 @@ class CallbackCache extends AbstractPattern
$serializedArgs = serialize(array_values($args));
} catch (\Exception $e) {
ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "Can't serialize arguments: see previous exception"
- , 0, $e);
+ throw new Exception\RuntimeException("Can't serialize arguments: see previous exception", 0, $e);
}
$error = ErrorHandler::stop();
if (!$serializedArgs) {
- throw new Exception\RuntimeException(sprintf(
- 'Cannot serialize arguments%s',
- ($error ? ': ' . $error->getMessage() : '')
- ), 0, $error);
+ throw new Exception\RuntimeException(
+ sprintf('Cannot serialize arguments%s', ($error ? ': ' . $error->getMessage() : '')),
+ 0,
+ $error
+ );
}
return md5($serializedArgs);
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CaptureCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CaptureCache.php
index b0c13633def..f74b2161999 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CaptureCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CaptureCache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -67,7 +67,7 @@ class CaptureCache extends AbstractPattern
* Get from cache
*
* @param null|string $pageId
- * @return bool|string
+ * @return string|null
* @throws Exception\LogicException
* @throws Exception\RuntimeException
*/
@@ -91,9 +91,7 @@ class CaptureCache extends AbstractPattern
$content = file_get_contents($file);
$error = ErrorHandler::stop();
if ($content === false) {
- throw new Exception\RuntimeException(
- "Failed to read cached pageId '{$pageId}'", 0, $error
- );
+ throw new Exception\RuntimeException("Failed to read cached pageId '{$pageId}'", 0, $error);
}
return $content;
}
@@ -152,9 +150,7 @@ class CaptureCache extends AbstractPattern
$res = unlink($file);
$err = ErrorHandler::stop();
if (!$res) {
- throw new Exception\RuntimeException(
- "Failed to remove cached pageId '{$pageId}'", 0, $err
- );
+ throw new Exception\RuntimeException("Failed to remove cached pageId '{$pageId}'", 0, $err);
}
return true;
}
@@ -266,9 +262,7 @@ class CaptureCache extends AbstractPattern
if ($rs === false) {
$err = ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "Error writing file '{$file}'", 0, $err
- );
+ throw new Exception\RuntimeException("Error writing file '{$file}'", 0, $err);
}
if ($perm !== false && !chmod($file, $perm)) {
@@ -316,19 +310,14 @@ class CaptureCache extends AbstractPattern
if (!$res) {
$oct = ($perm === false) ? '777' : decoct($perm);
$err = ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "mkdir('{$pathname}', 0{$oct}, true) failed", 0, $err
- );
+ throw new Exception\RuntimeException("mkdir('{$pathname}', 0{$oct}, true) failed", 0, $err);
}
if ($perm !== false && !chmod($pathname, $perm)) {
$oct = decoct($perm);
$err = ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "chmod('{$pathname}', 0{$oct}) failed", 0, $err
- );
+ throw new Exception\RuntimeException("chmod('{$pathname}', 0{$oct}) failed", 0, $err);
}
-
} else {
// build-in mkdir function sets permission together with current umask
// which doesn't work well on multo threaded webservers
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/ClassCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/ClassCache.php
index 238feed5ef2..d6c9335b3f5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/ClassCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/ClassCache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/ObjectCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/ObjectCache.php
index 07e137dd7ef..6ca6a15bef9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/ObjectCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/ObjectCache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -89,7 +89,7 @@ class ObjectCache extends CallbackCache
array_unshift($args, $property);
return parent::call(array($object, '__get'), $args);
- case '__isset':
+ case '__isset':
$property = array_shift($args);
if (!$options->getObjectCacheMagicProperties()
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/OutputCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/OutputCache.php
index 549e17122b8..9aa2e7e366b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/OutputCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/OutputCache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternInterface.php
index 7c4be85ebde..53505706a88 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,7 +22,7 @@ interface PatternInterface
/**
* Get all pattern options
*
- * @return array
+ * @return PatternOptions
*/
public function getOptions();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternOptions.php
index 07ed2106b9e..33f243fe90c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -497,9 +497,9 @@ class PatternOptions extends AbstractOptions
public function setObject($object)
{
if (!is_object($object)) {
- throw new Exception\InvalidArgumentException(sprintf(
- '%s expects an object; received "%s"', __METHOD__, gettype($object)
- ));
+ throw new Exception\InvalidArgumentException(
+ sprintf('%s expects an object; received "%s"', __METHOD__, gettype($object))
+ );
}
$this->object = $object;
return $this;
@@ -593,7 +593,7 @@ class PatternOptions extends AbstractOptions
* Used by:
* - ObjectCache
*
- * @return mixed
+ * @return string
*/
public function getObjectKey()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/PatternFactory.php b/vendor/zendframework/zendframework/library/Zend/Cache/PatternFactory.php
index dceed0032f0..0f6db572789 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/PatternFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/PatternFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/PatternPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/PatternPluginManager.php
index 7d5d0e1a697..5a77b7c8f44 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/PatternPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/PatternPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php
index 66eb6505e52..36e7d789ade 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheFactory.php b/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheFactory.php
index f2c20499367..faae59608ff 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
index 2487415e215..5b7a177bd1a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -194,7 +194,7 @@ abstract class AbstractAdapter implements StorageInterface, EventsCapableInterfa
}
/**
- * Trigger an pre event and return the event response collection
+ * Trigger a pre event and return the event response collection
*
* @param string $eventName
* @param ArrayObject $args
@@ -1537,7 +1537,7 @@ abstract class AbstractAdapter implements StorageInterface, EventsCapableInterfa
);
} elseif (($p = $this->getOptions()->getKeyPattern()) && !preg_match($p, $key)) {
throw new Exception\InvalidArgumentException(
- "The key '{$key}' doesn't match agains pattern '{$p}'"
+ "The key '{$key}' doesn't match against pattern '{$p}'"
);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
index 22933beb0c7..5caeb9675d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AdapterOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AdapterOptions.php
index 8a6ebd7dcd7..b49e6957859 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AdapterOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AdapterOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,11 +22,10 @@ use Zend\Stdlib\ErrorHandler;
*/
class AdapterOptions extends AbstractOptions
{
-
/**
* The adapter using these options
*
- * @var null|Filesystem
+ * @var null|StorageInterface
*/
protected $adapter;
@@ -259,7 +258,7 @@ class AdapterOptions extends AbstractOptions
}
if ($ttl < 0) {
- throw new Exception\InvalidArgumentException("TTL can't be negative");
+ throw new Exception\InvalidArgumentException("TTL can't be negative");
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Apc.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Apc.php
index f99223cd1a5..eb442cef4d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Apc.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Apc.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -717,20 +717,35 @@ class Apc extends AbstractAdapter implements
*/
protected function normalizeMetadata(array & $metadata)
{
- $metadata['internal_key'] = $metadata['key'];
- $metadata['ctime'] = $metadata['creation_time'];
- $metadata['atime'] = $metadata['access_time'];
- $metadata['rtime'] = $metadata['deletion_time'];
- $metadata['size'] = $metadata['mem_size'];
- $metadata['hits'] = $metadata['num_hits'];
-
- unset(
- $metadata['key'],
- $metadata['creation_time'],
- $metadata['access_time'],
- $metadata['deletion_time'],
- $metadata['mem_size'],
- $metadata['num_hits']
+ $apcMetadata = $metadata;
+ $metadata = array(
+ 'internal_key' => isset($metadata['key']) ? $metadata['key'] : $metadata['info'],
+ 'atime' => isset($metadata['access_time']) ? $metadata['access_time'] : $metadata['atime'],
+ 'ctime' => isset($metadata['creation_time']) ? $metadata['creation_time'] : $metadata['ctime'],
+ 'mtime' => isset($metadata['modified_time']) ? $metadata['modified_time'] : $metadata['mtime'],
+ 'rtime' => isset($metadata['deletion_time']) ? $metadata['deletion_time'] : $metadata['dtime'],
+ 'size' => $metadata['mem_size'],
+ 'hits' => isset($metadata['nhits']) ? $metadata['nhits'] : $metadata['num_hits'],
+ 'ttl' => $metadata['ttl'],
);
}
+
+ /**
+ * Internal method to set an item only if token matches
+ *
+ * @param mixed $token
+ * @param string $normalizedKey
+ * @param mixed $value
+ * @return bool
+ * @see getItem()
+ * @see setItem()
+ */
+ protected function internalCheckAndSetItem(& $token, & $normalizedKey, & $value)
+ {
+ if (is_int($token) && is_int($value)) {
+ return apc_cas($normalizedKey, $token, $value);
+ }
+
+ return parent::internalCheckAndSetItem($token, $normalizedKey, $value);
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ApcIterator.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ApcIterator.php
index 2454d7439f7..41ff833636b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ApcIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ApcIterator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Cache\Storage\IteratorInterface;
class ApcIterator implements IteratorInterface
{
-
/**
* The apc storage instance
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ApcOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ApcOptions.php
index 0299d9446c2..969bbfbcf45 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ApcOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ApcOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/BlackHole.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/BlackHole.php
new file mode 100644
index 00000000000..1b860a06d0c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/BlackHole.php
@@ -0,0 +1,502 @@
+<?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\Cache\Storage\Adapter;
+
+use stdClass;
+use Zend\Cache\Storage\AvailableSpaceCapableInterface;
+use Zend\Cache\Storage\Capabilities;
+use Zend\Cache\Storage\ClearByNamespaceInterface;
+use Zend\Cache\Storage\ClearByPrefixInterface;
+use Zend\Cache\Storage\ClearExpiredInterface;
+use Zend\Cache\Storage\FlushableInterface;
+use Zend\Cache\Storage\IterableInterface;
+use Zend\Cache\Storage\OptimizableInterface;
+use Zend\Cache\Storage\StorageInterface;
+use Zend\Cache\Storage\TaggableInterface;
+use Zend\Cache\Storage\TotalSpaceCapableInterface;
+
+class BlackHole implements
+ StorageInterface,
+ AvailableSpaceCapableInterface,
+ ClearByNamespaceInterface,
+ ClearByPrefixInterface,
+ ClearExpiredInterface,
+ FlushableInterface,
+ IterableInterface,
+ OptimizableInterface,
+ TaggableInterface,
+ TotalSpaceCapableInterface
+{
+ /**
+ * Capabilities of this adapter
+ *
+ * @var null|Capabilities
+ */
+ protected $capabilities = null;
+
+ /**
+ * Marker to change capabilities
+ *
+ * @var null|object
+ */
+ protected $capabilityMarker;
+
+ /**
+ * options
+ *
+ * @var null|AdapterOptions
+ */
+ protected $options;
+
+ /**
+ * Constructor
+ *
+ * @param null|array|\Traversable|AdapterOptions $options
+ */
+ public function __construct($options = null)
+ {
+ if ($options) {
+ $this->setOptions($options);
+ }
+ }
+
+ /**
+ * Set options.
+ *
+ * @param array|\Traversable|AdapterOptions $options
+ * @return StorageInterface Fluent interface
+ */
+ public function setOptions($options)
+ {
+ if ($this->options !== $options) {
+ if (!$options instanceof AdapterOptions) {
+ $options = new AdapterOptions($options);
+ }
+
+ if ($this->options) {
+ $this->options->setAdapter(null);
+ }
+ $options->setAdapter($this);
+ $this->options = $options;
+ }
+ return $this;
+ }
+
+ /**
+ * Get options
+ *
+ * @return AdapterOptions
+ */
+ public function getOptions()
+ {
+ if (!$this->options) {
+ $this->setOptions(new AdapterOptions());
+ }
+ return $this->options;
+ }
+
+ /**
+ * Get an item.
+ *
+ * @param string $key
+ * @param bool $success
+ * @param mixed $casToken
+ * @return mixed Data on success, null on failure
+ */
+ public function getItem($key, & $success = null, & $casToken = null)
+ {
+ $success = false;
+ return null;
+ }
+
+ /**
+ * Get multiple items.
+ *
+ * @param array $keys
+ * @return array Associative array of keys and values
+ */
+ public function getItems(array $keys)
+ {
+ return array();
+ }
+
+ /**
+ * Test if an item exists.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasItem($key)
+ {
+ return false;
+ }
+
+ /**
+ * Test multiple items.
+ *
+ * @param array $keys
+ * @return array Array of found keys
+ */
+ public function hasItems(array $keys)
+ {
+ return array();
+ }
+
+ /**
+ * Get metadata of an item.
+ *
+ * @param string $key
+ * @return array|bool Metadata on success, false on failure
+ */
+ public function getMetadata($key)
+ {
+ return false;
+ }
+
+ /**
+ * Get multiple metadata
+ *
+ * @param array $keys
+ * @return array Associative array of keys and metadata
+ */
+ public function getMetadatas(array $keys)
+ {
+ return array();
+ }
+
+ /**
+ * Store an item.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return bool
+ */
+ public function setItem($key, $value)
+ {
+ return false;
+ }
+
+ /**
+ * Store multiple items.
+ *
+ * @param array $keyValuePairs
+ * @return array Array of not stored keys
+ */
+ public function setItems(array $keyValuePairs)
+ {
+ return array_keys($keyValuePairs);
+ }
+
+ /**
+ * Add an item.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return bool
+ */
+ public function addItem($key, $value)
+ {
+ return false;
+ }
+
+ /**
+ * Add multiple items.
+ *
+ * @param array $keyValuePairs
+ * @return array Array of not stored keys
+ */
+ public function addItems(array $keyValuePairs)
+ {
+ return array_keys($keyValuePairs);
+ }
+
+ /**
+ * Replace an existing item.
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return bool
+ */
+ public function replaceItem($key, $value)
+ {
+ return false;
+ }
+
+ /**
+ * Replace multiple existing items.
+ *
+ * @param array $keyValuePairs
+ * @return array Array of not stored keys
+ */
+ public function replaceItems(array $keyValuePairs)
+ {
+ return array_keys($keyValuePairs);
+ }
+
+ /**
+ * Set an item only if token matches
+ *
+ * It uses the token received from getItem() to check if the item has
+ * changed before overwriting it.
+ *
+ * @param mixed $token
+ * @param string $key
+ * @param mixed $value
+ * @return bool
+ */
+ public function checkAndSetItem($token, $key, $value)
+ {
+ return false;
+ }
+
+ /**
+ * Reset lifetime of an item
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function touchItem($key)
+ {
+ return false;
+ }
+
+ /**
+ * Reset lifetime of multiple items.
+ *
+ * @param array $keys
+ * @return array Array of not updated keys
+ */
+ public function touchItems(array $keys)
+ {
+ return $keys;
+ }
+
+ /**
+ * Remove an item.
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function removeItem($key)
+ {
+ return false;
+ }
+
+ /**
+ * Remove multiple items.
+ *
+ * @param array $keys
+ * @return array Array of not removed keys
+ */
+ public function removeItems(array $keys)
+ {
+ return $keys;
+ }
+
+ /**
+ * Increment an item.
+ *
+ * @param string $key
+ * @param int $value
+ * @return int|bool The new value on success, false on failure
+ */
+ public function incrementItem($key, $value)
+ {
+ return false;
+ }
+
+ /**
+ * Increment multiple items.
+ *
+ * @param array $keyValuePairs
+ * @return array Associative array of keys and new values
+ */
+ public function incrementItems(array $keyValuePairs)
+ {
+ return array();
+ }
+
+ /**
+ * Decrement an item.
+ *
+ * @param string $key
+ * @param int $value
+ * @return int|bool The new value on success, false on failure
+ */
+ public function decrementItem($key, $value)
+ {
+ return false;
+ }
+
+ /**
+ * Decrement multiple items.
+ *
+ * @param array $keyValuePairs
+ * @return array Associative array of keys and new values
+ */
+ public function decrementItems(array $keyValuePairs)
+ {
+ return array();
+ }
+
+ /**
+ * Capabilities of this storage
+ *
+ * @return Capabilities
+ */
+ public function getCapabilities()
+ {
+ if ($this->capabilities === null) {
+ // use default capabilities only
+ $this->capabilityMarker = new stdClass();
+ $this->capabilities = new Capabilities($this, $this->capabilityMarker);
+ }
+ return $this->capabilities;
+ }
+
+ /* AvailableSpaceCapableInterface */
+
+ /**
+ * Get available space in bytes
+ *
+ * @return int|float
+ */
+ public function getAvailableSpace()
+ {
+ return 0;
+ }
+
+ /* ClearByNamespaceInterface */
+
+ /**
+ * Remove items of given namespace
+ *
+ * @param string $namespace
+ * @return bool
+ */
+ public function clearByNamespace($namespace)
+ {
+ return false;
+ }
+
+ /* ClearByPrefixInterface */
+
+ /**
+ * Remove items matching given prefix
+ *
+ * @param string $prefix
+ * @return bool
+ */
+ public function clearByPrefix($prefix)
+ {
+ return false;
+ }
+
+ /* ClearExpiredInterface */
+
+ /**
+ * Remove expired items
+ *
+ * @return bool
+ */
+ public function clearExpired()
+ {
+ return false;
+ }
+
+ /* FlushableInterface */
+
+ /**
+ * Flush the whole storage
+ *
+ * @return bool
+ */
+ public function flush()
+ {
+ return false;
+ }
+
+ /* IterableInterface */
+
+ /**
+ * Get the storage iterator
+ *
+ * @return KeyListIterator
+ */
+ public function getIterator()
+ {
+ return new KeyListIterator($this, array());
+ }
+
+ /* OptimizableInterface */
+
+ /**
+ * Optimize the storage
+ *
+ * @return bool
+ */
+ public function optimize()
+ {
+ return false;
+ }
+
+ /* TaggableInterface */
+
+ /**
+ * Set tags to an item by given key.
+ * An empty array will remove all tags.
+ *
+ * @param string $key
+ * @param string[] $tags
+ * @return bool
+ */
+ public function setTags($key, array $tags)
+ {
+ return false;
+ }
+
+ /**
+ * Get tags of an item by given key
+ *
+ * @param string $key
+ * @return string[]|FALSE
+ */
+ public function getTags($key)
+ {
+ return false;
+ }
+
+ /**
+ * Remove items matching given tags.
+ *
+ * If $disjunction only one of the given tags must match
+ * else all given tags must match.
+ *
+ * @param string[] $tags
+ * @param bool $disjunction
+ * @return bool
+ */
+ public function clearByTags(array $tags, $disjunction = false)
+ {
+ return false;
+ }
+
+ /* TotalSpaceCapableInterface */
+
+ /**
+ * Get total space in bytes
+ *
+ * @return int|float
+ */
+ public function getTotalSpace()
+ {
+ return 0;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Dba.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Dba.php
index 2c80783888f..128410d0c89 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Dba.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Dba.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -189,7 +189,6 @@ class Dba extends AbstractAdapter implements
}
if (file_exists($pathname)) {
-
// close the dba file before delete
// and reopen (create) on next use
$this->_close();
@@ -226,7 +225,8 @@ class Dba extends AbstractAdapter implements
$this->_open();
- do { // Workaround for PHP-Bug #62491 & #62492
+ do {
+ // Workaround for PHP-Bug #62491 & #62492
$recheck = false;
$internalKey = dba_firstkey($this->handle);
while ($internalKey !== false && $internalKey !== null) {
@@ -516,7 +516,9 @@ class Dba extends AbstractAdapter implements
$err = ErrorHandler::stop();
if (!$dba) {
throw new Exception\RuntimeException(
- "dba_open('{$pathname}', '{$mode}', '{$handler}') failed", 0, $err
+ "dba_open('{$pathname}', '{$mode}', '{$handler}') failed",
+ 0,
+ $err
);
}
$this->handle = $dba;
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/DbaIterator.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/DbaIterator.php
index a895ce545b8..a4d46e2a0d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/DbaIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/DbaIterator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,7 @@ class DbaIterator implements IteratorInterface
/**
* The apc storage instance
*
- * @var Apc
+ * @var Dba
*/
protected $storage;
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/DbaOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/DbaOptions.php
index 13172b74984..588141d8764 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/DbaOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/DbaOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Filesystem.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Filesystem.php
index aee3f835ce0..8f0f17e1227 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Filesystem.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Filesystem.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -25,6 +25,7 @@ use Zend\Cache\Storage\OptimizableInterface;
use Zend\Cache\Storage\TaggableInterface;
use Zend\Cache\Storage\TotalSpaceCapableInterface;
use Zend\Stdlib\ErrorHandler;
+use ArrayObject;
class Filesystem extends AbstractAdapter implements
AvailableSpaceCapableInterface,
@@ -37,7 +38,6 @@ class Filesystem extends AbstractAdapter implements
TaggableInterface,
TotalSpaceCapableInterface
{
-
/**
* Buffered total space in bytes
*
@@ -131,6 +131,8 @@ class Filesystem extends AbstractAdapter implements
* Remove expired items
*
* @return bool
+ *
+ * @triggers clearExpired.exception(ExceptionEvent)
*/
public function clearExpired()
{
@@ -161,7 +163,13 @@ class Filesystem extends AbstractAdapter implements
}
$error = ErrorHandler::stop();
if ($error) {
- throw new Exception\RuntimeException("Failed to clear expired items", 0, $error);
+ $result = false;
+ return $this->triggerException(
+ __FUNCTION__,
+ new ArrayObject(),
+ $result,
+ new Exception\RuntimeException('Failed to clear expired items', 0, $error)
+ );
}
return true;
@@ -189,7 +197,7 @@ class Filesystem extends AbstractAdapter implements
$flags = GlobIterator::SKIP_DOTS | GlobIterator::CURRENT_AS_PATHNAME;
$path = $options->getCacheDir()
. str_repeat(DIRECTORY_SEPARATOR . $prefix . '*', $options->getDirLevel())
- . DIRECTORY_SEPARATOR . $prefix . '*';
+ . DIRECTORY_SEPARATOR . $prefix . '*.*';
$glob = new GlobIterator($path, $flags);
ErrorHandler::start();
@@ -227,7 +235,7 @@ class Filesystem extends AbstractAdapter implements
$flags = GlobIterator::SKIP_DOTS | GlobIterator::CURRENT_AS_PATHNAME;
$path = $options->getCacheDir()
. str_repeat(DIRECTORY_SEPARATOR . $nsPrefix . '*', $options->getDirLevel())
- . DIRECTORY_SEPARATOR . $nsPrefix . $prefix . '*';
+ . DIRECTORY_SEPARATOR . $nsPrefix . $prefix . '*.*';
$glob = new GlobIterator($path, $flags);
ErrorHandler::start();
@@ -520,7 +528,6 @@ class Filesystem extends AbstractAdapter implements
}
$success = true;
return $data;
-
} catch (BaseException $e) {
$success = false;
throw $e;
@@ -539,7 +546,6 @@ class Filesystem extends AbstractAdapter implements
$keys = $normalizedKeys; // Don't change argument passed by reference
$result = array();
while ($keys) {
-
// LOCK_NB if more than one items have to read
$nonBlocking = count($keys) > 1;
$wouldblock = null;
@@ -631,9 +637,7 @@ class Filesystem extends AbstractAdapter implements
$mtime = filemtime($file);
$error = ErrorHandler::stop();
if (!$mtime) {
- throw new Exception\RuntimeException(
- "Error getting mtime of file '{$file}'", 0, $error
- );
+ throw new Exception\RuntimeException("Error getting mtime of file '{$file}'", 0, $error);
}
if (time() >= ($mtime + $ttl)) {
@@ -1055,9 +1059,7 @@ class Filesystem extends AbstractAdapter implements
$touch = touch($filespec . '.dat');
$error = ErrorHandler::stop();
if (!$touch) {
- throw new Exception\RuntimeException(
- "Error touching file '{$filespec}.dat'", 0, $error
- );
+ throw new Exception\RuntimeException("Error touching file '{$filespec}.dat'", 0, $error);
}
return true;
@@ -1297,9 +1299,7 @@ class Filesystem extends AbstractAdapter implements
$ifo = unserialize($content);
$err = ErrorHandler::stop();
if (!is_array($ifo)) {
- throw new Exception\RuntimeException(
- "Corrupted info file '{$file}'", 0, $err
- );
+ throw new Exception\RuntimeException("Corrupted info file '{$file}'", 0, $err);
}
return $ifo;
@@ -1326,9 +1326,7 @@ class Filesystem extends AbstractAdapter implements
$fp = fopen($file, 'rb');
if ($fp === false) {
$err = ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "Error opening file '{$file}'", 0, $err
- );
+ throw new Exception\RuntimeException("Error opening file '{$file}'", 0, $err);
}
if ($nonBlocking) {
@@ -1345,9 +1343,7 @@ class Filesystem extends AbstractAdapter implements
if (!$lock) {
fclose($fp);
$err = ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "Error locking file '{$file}'", 0, $err
- );
+ throw new Exception\RuntimeException("Error locking file '{$file}'", 0, $err);
}
$res = stream_get_contents($fp);
@@ -1355,9 +1351,7 @@ class Filesystem extends AbstractAdapter implements
flock($fp, LOCK_UN);
fclose($fp);
$err = ErrorHandler::stop();
- throw new Exception\RuntimeException(
- 'Error getting stream contents', 0, $err
- );
+ throw new Exception\RuntimeException('Error getting stream contents', 0, $err);
}
flock($fp, LOCK_UN);
@@ -1368,9 +1362,7 @@ class Filesystem extends AbstractAdapter implements
$res = file_get_contents($file, false);
if ($res === false) {
$err = ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "Error getting file contents for file '{$file}'", 0, $err
- );
+ throw new Exception\RuntimeException("Error getting file contents for file '{$file}'", 0, $err);
}
}
@@ -1421,21 +1413,24 @@ class Filesystem extends AbstractAdapter implements
}
if (!$res) {
- $oct = ($perm === false) ? '777' : decoct($perm);
$err = ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "mkdir('{$pathname}', 0{$oct}, true) failed", 0, $err
- );
+
+ // Issue 6435:
+ // mkdir could fail because of a race condition it was already created by another process
+ // after the first file_exists above
+ if (file_exists($pathname)) {
+ return;
+ }
+
+ $oct = ($perm === false) ? '777' : decoct($perm);
+ throw new Exception\RuntimeException("mkdir('{$pathname}', 0{$oct}, true) failed", 0, $err);
}
if ($perm !== false && !chmod($pathname, $perm)) {
$oct = decoct($perm);
$err = ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "chmod('{$pathname}', 0{$oct}) failed", 0, $err
- );
+ throw new Exception\RuntimeException("chmod('{$pathname}', 0{$oct}) failed", 0, $err);
}
-
} else {
// build-in mkdir function sets permission together with current umask
// which doesn't work well on multo threaded webservers
@@ -1465,6 +1460,13 @@ class Filesystem extends AbstractAdapter implements
}
if (!$res) {
+ // Issue 6435:
+ // mkdir could fail because of a race condition it was already created by another process
+ // after the first file_exists above ... go to the next path part.
+ if (file_exists($path)) {
+ continue;
+ }
+
$oct = ($perm === false) ? '777' : decoct($perm);
ErrorHandler::stop();
throw new Exception\RuntimeException(
@@ -1512,7 +1514,6 @@ class Filesystem extends AbstractAdapter implements
// if locking and non blocking is enabled -> file_put_contents can't used
if ($locking && $nonBlocking) {
-
$umask = ($umask !== false) ? umask($umask) : false;
$fp = fopen($file, 'cb');
@@ -1523,9 +1524,7 @@ class Filesystem extends AbstractAdapter implements
if (!$fp) {
$err = ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "Error opening file '{$file}'", 0, $err
- );
+ throw new Exception\RuntimeException("Error opening file '{$file}'", 0, $err);
}
if ($perm !== false && !chmod($file, $perm)) {
@@ -1579,9 +1578,7 @@ class Filesystem extends AbstractAdapter implements
if ($rs === false) {
$err = ErrorHandler::stop();
- throw new Exception\RuntimeException(
- "Error writing file '{$file}'", 0, $err
- );
+ throw new Exception\RuntimeException("Error writing file '{$file}'", 0, $err);
}
if ($perm !== false && !chmod($file, $perm)) {
@@ -1599,7 +1596,7 @@ class Filesystem extends AbstractAdapter implements
*
* @param string $file
* @return void
- * @throws RuntimeException
+ * @throws Exception\RuntimeException
*/
protected function unlink($file)
{
@@ -1610,7 +1607,9 @@ class Filesystem extends AbstractAdapter implements
// only throw exception if file still exists after deleting
if (!$res && file_exists($file)) {
throw new Exception\RuntimeException(
- "Error unlinking file '{$file}'; file still exists", 0, $err
+ "Error unlinking file '{$file}'; file still exists",
+ 0,
+ $err
);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php
index 4ab0f93f3e9..b615104fc62 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemIterator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Cache\Storage\IteratorInterface;
class FilesystemIterator implements IteratorInterface
{
-
/**
* The Filesystem storage instance
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
index bfafb1a5d8b..7034d4d30da 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Cache\Exception;
*/
class FilesystemOptions extends AdapterOptions
{
-
/**
* Directory to store cache files
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/KeyListIterator.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/KeyListIterator.php
index b16a32ae0f6..d67c7035ebd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/KeyListIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/KeyListIterator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,7 +15,6 @@ use Zend\Cache\Storage\StorageInterface;
class KeyListIterator implements IteratorInterface, Countable
{
-
/**
* The storage instance
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcache.php
new file mode 100644
index 00000000000..d9722a6694a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcache.php
@@ -0,0 +1,574 @@
+<?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\Cache\Storage\Adapter;
+
+use Memcache as MemcacheResource;
+use stdClass;
+use Traversable;
+use Zend\Cache\Exception;
+use Zend\Cache\Storage\AvailableSpaceCapableInterface;
+use Zend\Cache\Storage\Capabilities;
+use Zend\Cache\Storage\FlushableInterface;
+use Zend\Cache\Storage\TotalSpaceCapableInterface;
+
+class Memcache extends AbstractAdapter implements
+ AvailableSpaceCapableInterface,
+ FlushableInterface,
+ TotalSpaceCapableInterface
+{
+ /**
+ * Has this instance been initialized
+ *
+ * @var bool
+ */
+ protected $initialized = false;
+
+ /**
+ * The memcache resource manager
+ *
+ * @var null|MemcacheResourceManager
+ */
+ protected $resourceManager;
+
+ /**
+ * The memcache resource id
+ *
+ * @var null|string
+ */
+ protected $resourceId;
+
+ /**
+ * The namespace prefix
+ *
+ * @var string
+ */
+ protected $namespacePrefix = '';
+
+ /**
+ * Constructor
+ *
+ * @param null|array|Traversable|MemcacheOptions $options
+ * @throws Exception\ExceptionInterface
+ */
+ public function __construct($options = null)
+ {
+ if (version_compare('2.0.0', phpversion('memcache')) > 0) {
+ throw new Exception\ExtensionNotLoadedException("Missing ext/memcache version >= 2.0.0");
+ }
+
+ parent::__construct($options);
+
+ // reset initialized flag on update option(s)
+ $initialized = & $this->initialized;
+ $this->getEventManager()->attach('option', function ($event) use (& $initialized) {
+ $initialized = false;
+ });
+ }
+
+ /**
+ * Initialize the internal memcache resource
+ *
+ * @return MemcacheResource
+ */
+ protected function getMemcacheResource()
+ {
+ if ($this->initialized) {
+ return $this->resourceManager->getResource($this->resourceId);
+ }
+
+ $options = $this->getOptions();
+
+ // get resource manager and resource id
+ $this->resourceManager = $options->getResourceManager();
+ $this->resourceId = $options->getResourceId();
+
+ // init namespace prefix
+ $this->namespacePrefix = '';
+ $namespace = $options->getNamespace();
+ if ($namespace !== '') {
+ $this->namespacePrefix = $namespace . $options->getNamespaceSeparator();
+ }
+
+ // update initialized flag
+ $this->initialized = true;
+
+ return $this->resourceManager->getResource($this->resourceId);
+ }
+
+ /* options */
+
+ /**
+ * Set options.
+ *
+ * @param array|Traversable|MemcacheOptions $options
+ * @return Memcache
+ * @see getOptions()
+ */
+ public function setOptions($options)
+ {
+ if (!$options instanceof MemcacheOptions) {
+ $options = new MemcacheOptions($options);
+ }
+
+ return parent::setOptions($options);
+ }
+
+ /**
+ * Get options.
+ *
+ * @return MemcacheOptions
+ * @see setOptions()
+ */
+ public function getOptions()
+ {
+ if (!$this->options) {
+ $this->setOptions(new MemcacheOptions());
+ }
+ return $this->options;
+ }
+
+ /**
+ * @param mixed $value
+ * @return int
+ */
+ protected function getWriteFlag(& $value)
+ {
+ if (!$this->getOptions()->getCompression()) {
+ return 0;
+ }
+ // Don't compress numeric or boolean types
+ return (is_bool($value) || is_int($value) || is_float($value)) ? 0 : MEMCACHE_COMPRESSED;
+ }
+
+ /* FlushableInterface */
+
+ /**
+ * Flush the whole storage
+ *
+ * @return bool
+ */
+ public function flush()
+ {
+ $memc = $this->getMemcacheResource();
+ if (!$memc->flush()) {
+ return new Exception\RuntimeException("Memcache flush failed");
+ }
+ return true;
+ }
+
+ /* TotalSpaceCapableInterface */
+
+ /**
+ * Get total space in bytes
+ *
+ * @return int|float
+ */
+ public function getTotalSpace()
+ {
+ $memc = $this->getMemcacheResource();
+ $stats = $memc->getExtendedStats();
+ if ($stats === false) {
+ return new Exception\RuntimeException("Memcache getStats failed");
+ }
+
+ $mem = array_pop($stats);
+ return $mem['limit_maxbytes'];
+ }
+
+ /* AvailableSpaceCapableInterface */
+
+ /**
+ * Get available space in bytes
+ *
+ * @return int|float
+ */
+ public function getAvailableSpace()
+ {
+ $memc = $this->getMemcacheResource();
+ $stats = $memc->getExtendedStats();
+ if ($stats === false) {
+ throw new Exception\RuntimeException('Memcache getStats failed');
+ }
+
+ $mem = array_pop($stats);
+ return $mem['limit_maxbytes'] - $mem['bytes'];
+ }
+
+ /* reading */
+
+ /**
+ * Internal method to get an item.
+ *
+ * @param string $normalizedKey
+ * @param bool $success
+ * @param mixed $casToken
+ * @return mixed Data on success, null on failure
+ * @throws Exception\ExceptionInterface
+ */
+ protected function internalGetItem(& $normalizedKey, & $success = null, & $casToken = null)
+ {
+ $memc = $this->getMemcacheResource();
+ $internalKey = $this->namespacePrefix . $normalizedKey;
+
+ $result = $memc->get($internalKey);
+ $success = ($result !== false);
+ if ($result === false) {
+ return null;
+ }
+
+ $casToken = $result;
+ return $result;
+ }
+
+ /**
+ * Internal method to get multiple items.
+ *
+ * @param array $normalizedKeys
+ * @return array Associative array of keys and values
+ * @throws Exception\ExceptionInterface
+ */
+ protected function internalGetItems(array & $normalizedKeys)
+ {
+ $memc = $this->getMemcacheResource();
+
+ foreach ($normalizedKeys as & $normalizedKey) {
+ $normalizedKey = $this->namespacePrefix . $normalizedKey;
+ }
+
+ $result = $memc->get($normalizedKeys);
+ if ($result === false) {
+ return array();
+ }
+
+ // remove namespace prefix from result
+ if ($this->namespacePrefix !== '') {
+ $tmp = array();
+ $nsPrefixLength = strlen($this->namespacePrefix);
+ foreach ($result as $internalKey => & $value) {
+ $tmp[substr($internalKey, $nsPrefixLength)] = & $value;
+ }
+ $result = $tmp;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Internal method to test if an item exists.
+ *
+ * @param string $normalizedKey
+ * @return bool
+ * @throws Exception\ExceptionInterface
+ */
+ protected function internalHasItem(& $normalizedKey)
+ {
+ $memc = $this->getMemcacheResource();
+ $value = $memc->get($this->namespacePrefix . $normalizedKey);
+ return ($value !== false);
+ }
+
+ /**
+ * Internal method to test multiple items.
+ *
+ * @param array $normalizedKeys
+ * @return array Array of found keys
+ * @throws Exception\ExceptionInterface
+ */
+ protected function internalHasItems(array & $normalizedKeys)
+ {
+ $memc = $this->getMemcacheResource();
+
+ foreach ($normalizedKeys as & $normalizedKey) {
+ $normalizedKey = $this->namespacePrefix . $normalizedKey;
+ }
+
+ $result = $memc->get($normalizedKeys);
+ if ($result === false) {
+ return array();
+ }
+
+ // Convert to a single list
+ $result = array_keys($result);
+
+ // remove namespace prefix
+ if ($result && $this->namespacePrefix !== '') {
+ $nsPrefixLength = strlen($this->namespacePrefix);
+ foreach ($result as & $internalKey) {
+ $internalKey = substr($internalKey, $nsPrefixLength);
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Get metadata of multiple items
+ *
+ * @param array $normalizedKeys
+ * @return array Associative array of keys and metadata
+ * @throws Exception\ExceptionInterface
+ */
+ protected function internalGetMetadatas(array & $normalizedKeys)
+ {
+ $memc = $this->getMemcacheResource();
+
+ foreach ($normalizedKeys as & $normalizedKey) {
+ $normalizedKey = $this->namespacePrefix . $normalizedKey;
+ }
+
+ $result = $memc->get($normalizedKeys);
+ if ($result === false) {
+ return array();
+ }
+
+ // remove namespace prefix and use an empty array as metadata
+ if ($this->namespacePrefix === '') {
+ foreach ($result as & $value) {
+ $value = array();
+ }
+ return $result;
+ }
+
+ $final = array();
+ $nsPrefixLength = strlen($this->namespacePrefix);
+ foreach (array_keys($result) as $internalKey) {
+ $final[substr($internalKey, $nsPrefixLength)] = array();
+ }
+ return $final;
+ }
+
+ /* writing */
+
+ /**
+ * Internal method to store an item.
+ *
+ * @param string $normalizedKey
+ * @param mixed $value
+ * @return bool
+ * @throws Exception\ExceptionInterface
+ */
+ protected function internalSetItem(& $normalizedKey, & $value)
+ {
+ $memc = $this->getMemcacheResource();
+ $expiration = $this->expirationTime();
+ $flag = $this->getWriteFlag($value);
+
+ if (!$memc->set($this->namespacePrefix . $normalizedKey, $value, $flag, $expiration)) {
+ throw new Exception\RuntimeException('Memcache set value failed');
+ }
+
+ return true;
+ }
+
+ /**
+ * Add an item.
+ *
+ * @param string $normalizedKey
+ * @param mixed $value
+ * @return bool
+ * @throws Exception\ExceptionInterface
+ */
+ protected function internalAddItem(& $normalizedKey, & $value)
+ {
+ $memc = $this->getMemcacheResource();
+ $expiration = $this->expirationTime();
+ $flag = $this->getWriteFlag($value);
+
+ return $memc->add($this->namespacePrefix . $normalizedKey, $value, $flag, $expiration);
+ }
+
+ /**
+ * Internal method to replace an existing item.
+ *
+ * @param string $normalizedKey
+ * @param mixed $value
+ * @return bool
+ * @throws Exception\ExceptionInterface
+ */
+ protected function internalReplaceItem(& $normalizedKey, & $value)
+ {
+ $memc = $this->getMemcacheResource();
+ $expiration = $this->expirationTime();
+ $flag = $this->getWriteFlag($value);
+
+ return $memc->replace($this->namespacePrefix . $normalizedKey, $value, $flag, $expiration);
+ }
+
+ /**
+ * Internal method to remove an item.
+ *
+ * @param string $normalizedKey
+ * @return bool
+ * @throws Exception\ExceptionInterface
+ */
+ protected function internalRemoveItem(& $normalizedKey)
+ {
+ $memc = $this->getMemcacheResource();
+ // Delete's second parameter (timeout) is deprecated and not supported.
+ // Values other than 0 may cause delete to fail.
+ // http://www.php.net/manual/memcache.delete.php
+ return $memc->delete($this->namespacePrefix . $normalizedKey, 0);
+ }
+
+ /**
+ * Internal method to increment an item.
+ *
+ * @param string $normalizedKey
+ * @param int $value
+ * @return int|bool The new value on success, false on failure
+ * @throws Exception\ExceptionInterface
+ */
+ protected function internalIncrementItem(& $normalizedKey, & $value)
+ {
+ $memc = $this->getMemcacheResource();
+ $internalKey = $this->namespacePrefix . $normalizedKey;
+ $value = (int) $value;
+ $newValue = $memc->increment($internalKey, $value);
+
+ if ($newValue !== false) {
+ return $newValue;
+ }
+
+ // Set initial value. Don't use compression!
+ // http://www.php.net/manual/memcache.increment.php
+ $newValue = $value;
+ if (!$memc->add($internalKey, $newValue, 0, $this->expirationTime())) {
+ throw new Exception\RuntimeException('Memcache unable to add increment value');
+ }
+
+ return $newValue;
+ }
+
+ /**
+ * Internal method to decrement an item.
+ *
+ * @param string $normalizedKey
+ * @param int $value
+ * @return int|bool The new value on success, false on failure
+ * @throws Exception\ExceptionInterface
+ */
+ protected function internalDecrementItem(& $normalizedKey, & $value)
+ {
+ $memc = $this->getMemcacheResource();
+ $internalKey = $this->namespacePrefix . $normalizedKey;
+ $value = (int) $value;
+ $newValue = $memc->decrement($internalKey, $value);
+
+ if ($newValue !== false) {
+ return $newValue;
+ }
+
+ // Set initial value. Don't use compression!
+ // http://www.php.net/manual/memcache.decrement.php
+ $newValue = -$value;
+ if (!$memc->add($internalKey, $newValue, 0, $this->expirationTime())) {
+ throw new Exception\RuntimeException('Memcache unable to add decrement value');
+ }
+
+ return $newValue;
+ }
+
+ /* status */
+
+ /**
+ * Internal method to get capabilities of this adapter
+ *
+ * @return Capabilities
+ */
+ protected function internalGetCapabilities()
+ {
+ if ($this->capabilities !== null) {
+ return $this->capabilities;
+ }
+
+ if (version_compare('3.0.3', phpversion('memcache')) <= 0) {
+ // In ext/memcache v3.0.3:
+ // Scalar data types (int, bool, double) are preserved by get/set.
+ // http://pecl.php.net/package/memcache/3.0.3
+ //
+ // This effectively removes support for `boolean` types since
+ // "not found" return values are === false.
+ $supportedDatatypes = array(
+ 'NULL' => true,
+ 'boolean' => false,
+ 'integer' => true,
+ 'double' => true,
+ 'string' => true,
+ 'array' => true,
+ 'object' => 'object',
+ 'resource' => false,
+ );
+ } else {
+ // In stable 2.x ext/memcache versions, scalar data types are
+ // converted to strings and must be manually cast back to original
+ // types by the user.
+ //
+ // ie. It is impossible to know if the saved value: (string)"1"
+ // was previously: (bool)true, (int)1, or (string)"1".
+ // Similarly, the saved value: (string)""
+ // might have previously been: (bool)false or (string)""
+ $supportedDatatypes = array(
+ 'NULL' => true,
+ 'boolean' => 'boolean',
+ 'integer' => 'integer',
+ 'double' => 'double',
+ 'string' => true,
+ 'array' => true,
+ 'object' => 'object',
+ 'resource' => false,
+ );
+ }
+
+ $this->capabilityMarker = new stdClass();
+ $this->capabilities = new Capabilities(
+ $this,
+ $this->capabilityMarker,
+ array(
+ 'supportedDatatypes' => $supportedDatatypes,
+ 'supportedMetadata' => array(),
+ 'minTtl' => 1,
+ 'maxTtl' => 0,
+ 'staticTtl' => true,
+ 'ttlPrecision' => 1,
+ 'useRequestTime' => false,
+ 'expiredRead' => false,
+ 'maxKeyLength' => 255,
+ 'namespaceIsPrefix' => true,
+ )
+ );
+
+ return $this->capabilities;
+ }
+
+ /* internal */
+
+ /**
+ * Get expiration time by ttl
+ *
+ * Some storage commands involve sending an expiration value (relative to
+ * an item or to an operation requested by the client) to the server. In
+ * all such cases, the actual value sent may either be Unix time (number of
+ * seconds since January 1, 1970, as an integer), or a number of seconds
+ * starting from current time. In the latter case, this number of seconds
+ * may not exceed 60*60*24*30 (number of seconds in 30 days); if the
+ * expiration value is larger than that, the server will consider it to be
+ * real Unix time value rather than an offset from current time.
+ *
+ * @return int
+ */
+ protected function expirationTime()
+ {
+ $ttl = $this->getOptions()->getTtl();
+ if ($ttl > 2592000) {
+ return time() + $ttl;
+ }
+ return $ttl;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcacheOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcacheOptions.php
new file mode 100644
index 00000000000..b12730ccadf
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcacheOptions.php
@@ -0,0 +1,284 @@
+<?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\Cache\Storage\Adapter;
+
+use Zend\Cache\Exception;
+
+/**
+ * These are options specific to the Memcache adapter
+ */
+class MemcacheOptions extends AdapterOptions
+{
+ /**
+ * The namespace separator
+ * @var string
+ */
+ protected $namespaceSeparator = ':';
+
+ /**
+ * The memcache resource manager
+ *
+ * @var null|MemcacheResourceManager
+ */
+ protected $resourceManager;
+
+ /**
+ * The resource id of the resource manager
+ *
+ * @var string
+ */
+ protected $resourceId = 'default';
+
+ /**
+ * Enable compression when data is written
+ *
+ * @var bool
+ */
+ protected $compression = false;
+
+ /**
+ * Set namespace.
+ *
+ * It can't be longer than 128 characters.
+ *
+ * @see AdapterOptions::setNamespace()
+ * @see MemcacheOptions::setPrefixKey()
+ */
+ public function setNamespace($namespace)
+ {
+ $namespace = (string) $namespace;
+
+ if (128 < strlen($namespace)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects a prefix key of no longer than 128 characters',
+ __METHOD__
+ ));
+ }
+
+ return parent::setNamespace($namespace);
+ }
+
+ /**
+ * Set namespace separator
+ *
+ * @param string $namespaceSeparator
+ * @return MemcacheOptions
+ */
+ public function setNamespaceSeparator($namespaceSeparator)
+ {
+ $namespaceSeparator = (string) $namespaceSeparator;
+ if ($this->namespaceSeparator !== $namespaceSeparator) {
+ $this->triggerOptionEvent('namespace_separator', $namespaceSeparator);
+ $this->namespaceSeparator = $namespaceSeparator;
+ }
+ return $this;
+ }
+
+ /**
+ * Get namespace separator
+ *
+ * @return string
+ */
+ public function getNamespaceSeparator()
+ {
+ return $this->namespaceSeparator;
+ }
+
+ /**
+ * Set the memcache resource manager to use
+ *
+ * @param null|MemcacheResourceManager $resourceManager
+ * @return MemcacheOptions
+ */
+ public function setResourceManager(MemcacheResourceManager $resourceManager = null)
+ {
+ if ($this->resourceManager !== $resourceManager) {
+ $this->triggerOptionEvent('resource_manager', $resourceManager);
+ $this->resourceManager = $resourceManager;
+ }
+ return $this;
+ }
+
+ /**
+ * Get the memcache resource manager
+ *
+ * @return MemcacheResourceManager
+ */
+ public function getResourceManager()
+ {
+ if (!$this->resourceManager) {
+ $this->resourceManager = new MemcacheResourceManager();
+ }
+ return $this->resourceManager;
+ }
+
+ /**
+ * Get the memcache resource id
+ *
+ * @return string
+ */
+ public function getResourceId()
+ {
+ return $this->resourceId;
+ }
+
+ /**
+ * Set the memcache resource id
+ *
+ * @param string $resourceId
+ * @return MemcacheOptions
+ */
+ public function setResourceId($resourceId)
+ {
+ $resourceId = (string) $resourceId;
+ if ($this->resourceId !== $resourceId) {
+ $this->triggerOptionEvent('resource_id', $resourceId);
+ $this->resourceId = $resourceId;
+ }
+ return $this;
+ }
+
+ /**
+ * Is compressed writes turned on?
+ *
+ * @return boolean
+ */
+ public function getCompression()
+ {
+ return $this->compression;
+ }
+
+ /**
+ * Set whether compressed writes are turned on or not
+ *
+ * @param boolean $compression
+ * @return $this
+ */
+ public function setCompression($compression)
+ {
+ $compression = (bool) $compression;
+ if ($this->compression !== $compression) {
+ $this->triggerOptionEvent('compression', $compression);
+ $this->compression = $compression;
+ }
+ return $this;
+ }
+
+ /**
+ * Sets a list of memcache servers to add on initialize
+ *
+ * @param string|array $servers list of servers
+ * @return MemcacheOptions
+ * @throws Exception\InvalidArgumentException
+ */
+ public function setServers($servers)
+ {
+ $this->getResourceManager()->addServers($this->getResourceId(), $servers);
+ return $this;
+ }
+
+ /**
+ * Get Servers
+ *
+ * @return array
+ */
+ public function getServers()
+ {
+ return $this->getResourceManager()->getServers($this->getResourceId());
+ }
+
+ /**
+ * Set compress threshold
+ *
+ * @param int|string|array|\ArrayAccess|null $threshold
+ * @return MemcacheOptions
+ */
+ public function setAutoCompressThreshold($threshold)
+ {
+ $this->getResourceManager()->setAutoCompressThreshold($this->getResourceId(), $threshold);
+ return $this;
+ }
+
+ /**
+ * Get compress threshold
+ *
+ * @return int|null
+ */
+ public function getAutoCompressThreshold()
+ {
+ return $this->getResourceManager()->getAutoCompressThreshold($this->getResourceId());
+ }
+
+ /**
+ * Set compress min savings option
+ *
+ * @param float|string|null $minSavings
+ * @return MemcacheOptions
+ */
+ public function setAutoCompressMinSavings($minSavings)
+ {
+ $this->getResourceManager()->setAutoCompressMinSavings($this->getResourceId(), $minSavings);
+ return $this;
+ }
+
+ /**
+ * Get compress min savings
+ *
+ * @return Exception\RuntimeException
+ */
+ public function getAutoCompressMinSavings()
+ {
+ return $this->getResourceManager()->getAutoCompressMinSavings($this->getResourceId());
+ }
+
+ /**
+ * Set default server values
+ *
+ * @param array $serverDefaults
+ * @return MemcacheOptions
+ */
+ public function setServerDefaults(array $serverDefaults)
+ {
+ $this->getResourceManager()->setServerDefaults($this->getResourceId(), $serverDefaults);
+ return $this;
+ }
+
+ /**
+ * Get default server values
+ *
+ * @return array
+ */
+ public function getServerDefaults()
+ {
+ return $this->getResourceManager()->getServerDefaults($this->getResourceId());
+ }
+
+ /**
+ * Set callback for server connection failures
+ *
+ * @param callable $callback
+ * @return $this
+ */
+ public function setFailureCallback($callback)
+ {
+ $this->getResourceManager()->setFailureCallback($this->getResourceId(), $callback);
+ return $this;
+ }
+
+ /**
+ * Get callback for server connection failures
+ *
+ * @return callable
+ */
+ public function getFailureCallback()
+ {
+ return $this->getResourceManager()->getFailureCallback($this->getResourceId());
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcacheResourceManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcacheResourceManager.php
new file mode 100644
index 00000000000..81670a30bfe
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcacheResourceManager.php
@@ -0,0 +1,646 @@
+<?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\Cache\Storage\Adapter;
+
+use ArrayAccess;
+use Memcache as MemcacheResource;
+use Traversable;
+use Zend\Cache\Exception;
+use Zend\Stdlib\ArrayUtils;
+
+/**
+ * This is a resource manager for memcache
+ */
+class MemcacheResourceManager
+{
+ /**
+ * Registered resources
+ *
+ * @var array
+ */
+ protected $resources = array();
+
+ /**
+ * Default server values per resource
+ *
+ * @var array
+ */
+ protected $serverDefaults = array();
+
+ /**
+ * Failure callback per resource
+ *
+ * @var callable[]
+ */
+ protected $failureCallbacks = array();
+
+ /**
+ * Check if a resource exists
+ *
+ * @param string $id
+ * @return bool
+ */
+ public function hasResource($id)
+ {
+ return isset($this->resources[$id]);
+ }
+
+ /**
+ * Gets a memcache resource
+ *
+ * @param string $id
+ * @return MemcacheResource
+ * @throws Exception\RuntimeException
+ */
+ public function getResource($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = $this->resources[$id];
+ if ($resource instanceof MemcacheResource) {
+ return $resource;
+ }
+
+ $memc = new MemcacheResource();
+ $this->setResourceAutoCompressThreshold(
+ $memc,
+ $resource['auto_compress_threshold'],
+ $resource['auto_compress_min_savings']
+ );
+ foreach ($resource['servers'] as $server) {
+ $this->addServerToResource(
+ $memc,
+ $server,
+ $this->serverDefaults[$id],
+ $this->failureCallbacks[$id]
+ );
+ }
+
+ // buffer and return
+ $this->resources[$id] = $memc;
+ return $memc;
+ }
+
+ /**
+ * Set a resource
+ *
+ * @param string $id
+ * @param array|Traversable|MemcacheResource $resource
+ * @return MemcacheResourceManager
+ */
+ public function setResource($id, $resource, $failureCallback = null, $serverDefaults = array())
+ {
+ $id = (string) $id;
+
+ if ($serverDefaults instanceof Traversable) {
+ $serverDefaults = ArrayUtils::iteratorToArray($serverDefaults);
+ } elseif (!is_array($serverDefaults)) {
+ throw new Exception\InvalidArgumentException(
+ 'ServerDefaults must be an instance Traversable or an array'
+ );
+ }
+
+ if (!($resource instanceof MemcacheResource)) {
+ if ($resource instanceof Traversable) {
+ $resource = ArrayUtils::iteratorToArray($resource);
+ } elseif (!is_array($resource)) {
+ throw new Exception\InvalidArgumentException(
+ 'Resource must be an instance of Memcache or an array or Traversable'
+ );
+ }
+
+ if (isset($resource['server_defaults'])) {
+ $serverDefaults = array_merge($serverDefaults, $resource['server_defaults']);
+ unset($resource['server_defaults']);
+ }
+
+ $resourceOptions = array(
+ 'servers' => array(),
+ 'auto_compress_threshold' => null,
+ 'auto_compress_min_savings' => null,
+ );
+ $resource = array_merge($resourceOptions, $resource);
+
+ // normalize and validate params
+ $this->normalizeAutoCompressThreshold(
+ $resource['auto_compress_threshold'],
+ $resource['auto_compress_min_savings']
+ );
+ $this->normalizeServers($resource['servers']);
+ }
+
+ $this->normalizeServerDefaults($serverDefaults);
+
+ $this->resources[$id] = $resource;
+ $this->failureCallbacks[$id] = $failureCallback;
+ $this->serverDefaults[$id] = $serverDefaults;
+
+ return $this;
+ }
+
+ /**
+ * Remove a resource
+ *
+ * @param string $id
+ * @return MemcacheResourceManager
+ */
+ public function removeResource($id)
+ {
+ unset($this->resources[$id]);
+ return $this;
+ }
+
+ /**
+ * Normalize compress threshold options
+ *
+ * @param int|string|array|ArrayAccess $threshold
+ * @param float|string $minSavings
+ */
+ protected function normalizeAutoCompressThreshold(& $threshold, & $minSavings)
+ {
+ if (is_array($threshold) || ($threshold instanceof ArrayAccess)) {
+ $tmpThreshold = (isset($threshold['threshold'])) ? $threshold['threshold'] : null;
+ $minSavings = (isset($threshold['min_savings'])) ? $threshold['min_savings'] : $minSavings;
+ $threshold = $tmpThreshold;
+ }
+ if (isset($threshold)) {
+ $threshold = (int) $threshold;
+ }
+ if (isset($minSavings)) {
+ $minSavings = (float) $minSavings;
+ }
+ }
+
+ /**
+ * Set compress threshold on a Memcache resource
+ *
+ * @param MemcacheResource $resource
+ * @param array $libOptions
+ */
+ protected function setResourceAutoCompressThreshold(MemcacheResource $resource, $threshold, $minSavings)
+ {
+ if (!isset($threshold)) {
+ return;
+ }
+ if (isset($minSavings)) {
+ $resource->setCompressThreshold($threshold, $minSavings);
+ } else {
+ $resource->setCompressThreshold($threshold);
+ }
+ }
+
+ /**
+ * Get compress threshold
+ *
+ * @param string $id
+ * @return int|null
+ * @throws \Zend\Cache\Exception\RuntimeException
+ */
+ public function getAutoCompressThreshold($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ if ($resource instanceof MemcacheResource) {
+ // Cannot get options from Memcache resource once created
+ throw new Exception\RuntimeException("Cannot get compress threshold once resource is created");
+ }
+ return $resource['auto_compress_threshold'];
+ }
+
+ /**
+ * Set compress threshold
+ *
+ * @param string $id
+ * @param int|string|array|ArrayAccess|null $threshold
+ * @param float|string|bool $minSavings
+ * @return MemcacheResourceManager
+ */
+ public function setAutoCompressThreshold($id, $threshold, $minSavings = false)
+ {
+ if (!$this->hasResource($id)) {
+ return $this->setResource($id, array(
+ 'auto_compress_threshold' => $threshold,
+ ));
+ }
+
+ $this->normalizeAutoCompressThreshold($threshold, $minSavings);
+
+ $resource = & $this->resources[$id];
+ if ($resource instanceof MemcacheResource) {
+ $this->setResourceAutoCompressThreshold($resource, $threshold, $minSavings);
+ } else {
+ $resource['auto_compress_threshold'] = $threshold;
+ if ($minSavings !== false) {
+ $resource['auto_compress_min_savings'] = $minSavings;
+ }
+ }
+ return $this;
+ }
+
+ /**
+ * Get compress min savings
+ *
+ * @param string $id
+ * @return float|null
+ * @throws Exception\RuntimeException
+ */
+ public function getAutoCompressMinSavings($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ if ($resource instanceof MemcacheResource) {
+ // Cannot get options from Memcache resource once created
+ throw new Exception\RuntimeException("Cannot get compress min savings once resource is created");
+ }
+ return $resource['auto_compress_min_savings'];
+ }
+
+ /**
+ * Set compress min savings
+ *
+ * @param string $id
+ * @param float|string|null $minSavings
+ * @return MemcacheResourceManager
+ * @throws \Zend\Cache\Exception\RuntimeException
+ */
+ public function setAutoCompressMinSavings($id, $minSavings)
+ {
+ if (!$this->hasResource($id)) {
+ return $this->setResource($id, array(
+ 'auto_compress_min_savings' => $minSavings,
+ ));
+ }
+
+ $minSavings = (float) $minSavings;
+
+ $resource = & $this->resources[$id];
+ if ($resource instanceof MemcacheResource) {
+ throw new Exception\RuntimeException(
+ "Cannot set compress min savings without a threshold value once a resource is created"
+ );
+ } else {
+ $resource['auto_compress_min_savings'] = $minSavings;
+ }
+ return $this;
+ }
+
+ /**
+ * Set default server values
+ * array(
+ * 'persistent' => <persistent>, 'weight' => <weight>,
+ * 'timeout' => <timeout>, 'retry_interval' => <retryInterval>,
+ * )
+ * @param string $id
+ * @param array $serverDefaults
+ * @return MemcacheResourceManager
+ */
+ public function setServerDefaults($id, array $serverDefaults)
+ {
+ if (!$this->hasResource($id)) {
+ return $this->setResource($id, array(
+ 'server_defaults' => $serverDefaults
+ ));
+ }
+
+ $this->normalizeServerDefaults($serverDefaults);
+ $this->serverDefaults[$id] = $serverDefaults;
+
+ return $this;
+ }
+
+ /**
+ * Get default server values
+ *
+ * @param string $id
+ * @return array
+ * @throws Exception\RuntimeException
+ */
+ public function getServerDefaults($id)
+ {
+ if (!isset($this->serverDefaults[$id])) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+ return $this->serverDefaults[$id];
+ }
+
+ /**
+ * @param array $serverDefaults
+ * @throws Exception\InvalidArgumentException
+ */
+ protected function normalizeServerDefaults(& $serverDefaults)
+ {
+ if (!is_array($serverDefaults) && !($serverDefaults instanceof Traversable)) {
+ throw new Exception\InvalidArgumentException(
+ "Server defaults must be an array or an instance of Traversable"
+ );
+ }
+
+ // Defaults
+ $result = array(
+ 'persistent' => true,
+ 'weight' => 1,
+ 'timeout' => 1, // seconds
+ 'retry_interval' => 15, // seconds
+ );
+
+ foreach ($serverDefaults as $key => $value) {
+ switch ($key) {
+ case 'persistent':
+ $value = (bool) $value;
+ break;
+ case 'weight':
+ case 'timeout':
+ case 'retry_interval':
+ $value = (int) $value;
+ break;
+ }
+ $result[$key] = $value;
+ }
+
+ $serverDefaults = $result;
+ }
+
+ /**
+ * Set callback for server connection failures
+ *
+ * @param string $id
+ * @param callable|null $failureCallback
+ * @return MemcacheResourceManager
+ */
+ public function setFailureCallback($id, $failureCallback)
+ {
+ if (!$this->hasResource($id)) {
+ return $this->setResource($id, array(), $failureCallback);
+ }
+
+ $this->failureCallbacks[$id] = $failureCallback;
+ return $this;
+ }
+
+ /**
+ * Get callback for server connection failures
+ *
+ * @param string $id
+ * @return callable|null
+ * @throws Exception\RuntimeException
+ */
+ public function getFailureCallback($id)
+ {
+ if (!isset($this->failureCallbacks[$id])) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+ return $this->failureCallbacks[$id];
+ }
+
+ /**
+ * Get servers
+ *
+ * @param string $id
+ * @throws Exception\RuntimeException
+ * @return array array('host' => <host>, 'port' => <port>, 'weight' => <weight>)
+ */
+ public function getServers($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ if ($resource instanceof MemcacheResource) {
+ throw new Exception\RuntimeException("Cannot get server list once resource is created");
+ }
+ return $resource['servers'];
+ }
+
+ /**
+ * Add servers
+ *
+ * @param string $id
+ * @param string|array $servers
+ * @return MemcacheResourceManager
+ */
+ public function addServers($id, $servers)
+ {
+ if (!$this->hasResource($id)) {
+ return $this->setResource($id, array(
+ 'servers' => $servers
+ ));
+ }
+
+ $this->normalizeServers($servers);
+
+ $resource = & $this->resources[$id];
+ if ($resource instanceof MemcacheResource) {
+ foreach ($servers as $server) {
+ $this->addServerToResource(
+ $resource,
+ $server,
+ $this->serverDefaults[$id],
+ $this->failureCallbacks[$id]
+ );
+ }
+ } else {
+ // don't add servers twice
+ $resource['servers'] = array_merge(
+ $resource['servers'],
+ array_udiff($servers, $resource['servers'], array($this, 'compareServers'))
+ );
+ }
+
+ return $this;
+ }
+
+ /**
+ * Add one server
+ *
+ * @param string $id
+ * @param string|array $server
+ * @return MemcacheResourceManager
+ */
+ public function addServer($id, $server)
+ {
+ return $this->addServers($id, array($server));
+ }
+
+ /**
+ * @param MemcacheResource $resource
+ * @param array $server
+ * @param array $serverDefaults
+ * @param callable|null $failureCallback
+ */
+ protected function addServerToResource(
+ MemcacheResource $resource,
+ array $server,
+ array $serverDefaults,
+ $failureCallback
+ ) {
+ // Apply server defaults
+ $server = array_merge($serverDefaults, $server);
+
+ // Reorder parameters
+ $params = array(
+ $server['host'],
+ $server['port'],
+ $server['persistent'],
+ $server['weight'],
+ $server['timeout'],
+ $server['retry_interval'],
+ $server['status'],
+ );
+ if (isset($failureCallback)) {
+ $params[] = $failureCallback;
+ }
+ call_user_func_array(array($resource, 'addServer'), $params);
+ }
+
+ /**
+ * Normalize a list of servers into the following format:
+ * array(array('host' => <host>, 'port' => <port>, 'weight' => <weight>)[, ...])
+ *
+ * @param string|array $servers
+ */
+ protected function normalizeServers(& $servers)
+ {
+ if (is_string($servers)) {
+ // Convert string into a list of servers
+ $servers = explode(',', $servers);
+ }
+
+ $result = array();
+ foreach ($servers as $server) {
+ $this->normalizeServer($server);
+ $result[$server['host'] . ':' . $server['port']] = $server;
+ }
+
+ $servers = array_values($result);
+ }
+
+ /**
+ * Normalize one server into the following format:
+ * array(
+ * 'host' => <host>, 'port' => <port>, 'weight' => <weight>,
+ * 'status' => <status>, 'persistent' => <persistent>,
+ * 'timeout' => <timeout>, 'retry_interval' => <retryInterval>,
+ * )
+ *
+ * @param string|array $server
+ * @throws Exception\InvalidArgumentException
+ */
+ protected function normalizeServer(& $server)
+ {
+ // WARNING: The order of this array is important.
+ // Used for converting an ordered array to a keyed array.
+ // Append new options, do not insert or you will break BC.
+ $sTmp = array(
+ 'host' => null,
+ 'port' => 11211,
+ 'weight' => null,
+ 'status' => true,
+ 'persistent' => null,
+ 'timeout' => null,
+ 'retry_interval' => null,
+ );
+
+ // convert a single server into an array
+ if ($server instanceof Traversable) {
+ $server = ArrayUtils::iteratorToArray($server);
+ }
+
+ if (is_array($server)) {
+ if (isset($server[0])) {
+ // Convert ordered array to keyed array
+ // array(<host>[, <port>[, <weight>[, <status>[, <persistent>[, <timeout>[, <retryInterval>]]]]]])
+ $server = array_combine(
+ array_slice(array_keys($sTmp), 0, count($server)),
+ $server
+ );
+ }
+ $sTmp = array_merge($sTmp, $server);
+ } elseif (is_string($server)) {
+ // parse server from URI host{:?port}{?weight}
+ $server = trim($server);
+ if (strpos($server, '://') === false) {
+ $server = 'tcp://' . $server;
+ }
+
+ $urlParts = parse_url($server);
+ if (!$urlParts) {
+ throw new Exception\InvalidArgumentException("Invalid server given");
+ }
+
+ $sTmp = array_merge($sTmp, array_intersect_key($urlParts, $sTmp));
+ if (isset($urlParts['query'])) {
+ $query = null;
+ parse_str($urlParts['query'], $query);
+ $sTmp = array_merge($sTmp, array_intersect_key($query, $sTmp));
+ }
+ }
+
+ if (!$sTmp['host']) {
+ throw new Exception\InvalidArgumentException('Missing required server host');
+ }
+
+ // Filter values
+ foreach ($sTmp as $key => $value) {
+ if (isset($value)) {
+ switch ($key) {
+ case 'host':
+ $value = (string) $value;
+ break;
+ case 'status':
+ case 'persistent':
+ $value = (bool) $value;
+ break;
+ case 'port':
+ case 'weight':
+ case 'timeout':
+ case 'retry_interval':
+ $value = (int) $value;
+ break;
+ }
+ }
+ $sTmp[$key] = $value;
+ }
+ $sTmp = array_filter(
+ $sTmp,
+ function ($val) {
+ return isset($val);
+ }
+ );
+
+ $server = $sTmp;
+ }
+
+ /**
+ * Compare 2 normalized server arrays
+ * (Compares only the host and the port)
+ *
+ * @param array $serverA
+ * @param array $serverB
+ * @return int
+ */
+ protected function compareServers(array $serverA, array $serverB)
+ {
+ $keyA = $serverA['host'] . ':' . $serverA['port'];
+ $keyB = $serverB['host'] . ':' . $serverB['port'];
+ if ($keyA === $keyB) {
+ return 0;
+ }
+ return $keyA > $keyB ? 1 : -1;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcached.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcached.php
index a07257c28ce..f7fab63d5b8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcached.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcached.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -222,7 +222,7 @@ class Memcached extends AbstractAdapter implements
}
$success = true;
- if ($result === false || $result === null) {
+ if ($result === false) {
$rsCode = $memc->getResultCode();
if ($rsCode == MemcachedResource::RES_NOTFOUND) {
$result = null;
@@ -280,7 +280,7 @@ class Memcached extends AbstractAdapter implements
{
$memc = $this->getMemcachedResource();
$value = $memc->get($this->namespacePrefix . $normalizedKey);
- if ($value === false || $value === null) {
+ if ($value === false) {
$rsCode = $memc->getResultCode();
if ($rsCode == MemcachedResource::RES_SUCCESS) {
return true;
@@ -479,7 +479,6 @@ class Memcached extends AbstractAdapter implements
}
}
-
return $result;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
index ceff8c4363d..5a2b6a1dbcd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,7 @@ use Memcached as MemcachedResource;
use Zend\Cache\Exception;
/**
- * These are options specific to the APC adapter
+ * These are options specific to the Memcached adapter
*/
class MemcachedOptions extends AdapterOptions
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php
index 8f4370222ea..b3bf810182c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedResourceManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -20,7 +20,6 @@ use Zend\Stdlib\ArrayUtils;
*/
class MemcachedResourceManager
{
-
/**
* Registered resources
*
@@ -28,6 +27,93 @@ class MemcachedResourceManager
*/
protected $resources = array();
+ /**
+ * Get servers
+ * @param string $id
+ * @throws Exception\RuntimeException
+ * @return array array('host' => <host>, 'port' => <port>, 'weight' => <weight>)
+ */
+ public function getServers($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+
+ if ($resource instanceof MemcachedResource) {
+ return $resource->getServerList();
+ }
+ return $resource['servers'];
+ }
+
+ /**
+ * Normalize one server into the following format:
+ * array('host' => <host>, 'port' => <port>, 'weight' => <weight>)
+ *
+ * @param string|array &$server
+ * @throws Exception\InvalidArgumentException
+ */
+ protected function normalizeServer(&$server)
+ {
+ $host = null;
+ $port = 11211;
+ $weight = 0;
+
+ // convert a single server into an array
+ if ($server instanceof Traversable) {
+ $server = ArrayUtils::iteratorToArray($server);
+ }
+
+ if (is_array($server)) {
+ // array(<host>[, <port>[, <weight>]])
+ if (isset($server[0])) {
+ $host = (string) $server[0];
+ $port = isset($server[1]) ? (int) $server[1] : $port;
+ $weight = isset($server[2]) ? (int) $server[2] : $weight;
+ }
+
+ // array('host' => <host>[, 'port' => <port>[, 'weight' => <weight>]])
+ if (!isset($server[0]) && isset($server['host'])) {
+ $host = (string) $server['host'];
+ $port = isset($server['port']) ? (int) $server['port'] : $port;
+ $weight = isset($server['weight']) ? (int) $server['weight'] : $weight;
+ }
+ } else {
+ // parse server from URI host{:?port}{?weight}
+ $server = trim($server);
+ if (strpos($server, '://') === false) {
+ $server = 'tcp://' . $server;
+ }
+
+ $server = parse_url($server);
+ if (!$server) {
+ throw new Exception\InvalidArgumentException("Invalid server given");
+ }
+
+ $host = $server['host'];
+ $port = isset($server['port']) ? (int) $server['port'] : $port;
+
+ if (isset($server['query'])) {
+ $query = null;
+ parse_str($server['query'], $query);
+ if (isset($query['weight'])) {
+ $weight = (int) $query['weight'];
+ }
+ }
+ }
+
+ if (!$host) {
+ throw new Exception\InvalidArgumentException('Missing required server host');
+ }
+
+ $server = array(
+ 'host' => $host,
+ 'port' => $port,
+ 'weight' => $weight,
+ );
+ }
+
/**
* Check if a resource exists
*
@@ -372,26 +458,6 @@ class MemcachedResourceManager
return $this;
}
- /**
- * Get servers
- * @param string $id
- * @throws Exception\RuntimeException
- * @return array array('host' => <host>, 'port' => <port>, 'weight' => <weight>)
- */
- public function getServers($id)
- {
- if (!$this->hasResource($id)) {
- throw new Exception\RuntimeException("No resource with id '{$id}'");
- }
-
- $resource = & $this->resources[$id];
-
- if ($resource instanceof MemcachedResource) {
- return $resource->getServerList();
- }
- return $resource['servers'];
- }
-
/**
* Add servers
*
@@ -461,74 +527,6 @@ class MemcachedResourceManager
$servers = array_values($result);
}
- /**
- * Normalize one server into the following format:
- * array('host' => <host>, 'port' => <port>, 'weight' => <weight>)
- *
- * @param string|array $server
- * @throws Exception\InvalidArgumentException
- */
- protected function normalizeServer(& $server)
- {
- $host = null;
- $port = 11211;
- $weight = 0;
-
- // convert a single server into an array
- if ($server instanceof Traversable) {
- $server = ArrayUtils::iteratorToArray($server);
- }
-
- if (is_array($server)) {
- // array(<host>[, <port>[, <weight>]])
- if (isset($server[0])) {
- $host = (string) $server[0];
- $port = isset($server[1]) ? (int) $server[1] : $port;
- $weight = isset($server[2]) ? (int) $server[2] : $weight;
- }
-
- // array('host' => <host>[, 'port' => <port>[, 'weight' => <weight>]])
- if (!isset($server[0]) && isset($server['host'])) {
- $host = (string) $server['host'];
- $port = isset($server['port']) ? (int) $server['port'] : $port;
- $weight = isset($server['weight']) ? (int) $server['weight'] : $weight;
- }
-
- } else {
- // parse server from URI host{:?port}{?weight}
- $server = trim($server);
- if (strpos($server, '://') === false) {
- $server = 'tcp://' . $server;
- }
-
- $server = parse_url($server);
- if (!$server) {
- throw new Exception\InvalidArgumentException("Invalid server given");
- }
-
- $host = $server['host'];
- $port = isset($server['port']) ? (int) $server['port'] : $port;
-
- if (isset($server['query'])) {
- $query = null;
- parse_str($server['query'], $query);
- if (isset($query['weight'])) {
- $weight = (int) $query['weight'];
- }
- }
- }
-
- if (!$host) {
- throw new Exception\InvalidArgumentException('Missing required server host');
- }
-
- $server = array(
- 'host' => $host,
- 'port' => $port,
- 'weight' => $weight,
- );
- }
-
/**
* Compare 2 normalized server arrays
* (Compares only the host and the port)
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memory.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memory.php
index 9301363312c..b54c03f2352 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -227,17 +227,12 @@ class Memory extends AbstractAdapter implements
public function setTags($key, array $tags)
{
$ns = $this->getOptions()->getNamespace();
- if (!$this->data[$ns]) {
+ if (!isset($this->data[$ns][$key])) {
return false;
}
- $data = & $this->data[$ns];
- if (isset($data[$key])) {
- $data[$key]['tags'] = $tags;
- return true;
- }
-
- return false;
+ $this->data[$ns][$key]['tags'] = $tags;
+ return true;
}
/**
@@ -249,16 +244,11 @@ class Memory extends AbstractAdapter implements
public function getTags($key)
{
$ns = $this->getOptions()->getNamespace();
- if (!$this->data[$ns]) {
- return false;
- }
-
- $data = & $this->data[$ns];
- if (!isset($data[$key])) {
+ if (!isset($this->data[$ns][$key])) {
return false;
}
- return isset($data[$key]['tags']) ? $data[$key]['tags'] : array();
+ return isset($this->data[$ns][$key]['tags']) ? $this->data[$ns][$key]['tags'] : array();
}
/**
@@ -274,7 +264,7 @@ class Memory extends AbstractAdapter implements
public function clearByTags(array $tags, $disjunction = false)
{
$ns = $this->getOptions()->getNamespace();
- if (!$this->data[$ns]) {
+ if (!isset($this->data[$ns])) {
return true;
}
@@ -654,16 +644,16 @@ class Memory extends AbstractAdapter implements
*/
protected function internalIncrementItem(& $normalizedKey, & $value)
{
- $ns = $this->getOptions()->getNamespace();
- $data = & $this->data[$ns];
- if (isset($data[$normalizedKey])) {
- $data[$normalizedKey][0]+= $value;
- $data[$normalizedKey][1] = microtime(true);
- $newValue = $data[$normalizedKey][0];
+ $ns = $this->getOptions()->getNamespace();
+ if (isset($this->data[$ns][$normalizedKey])) {
+ $data = & $this->data[$ns][$normalizedKey];
+ $data[0]+= $value;
+ $data[1] = microtime(true);
+ $newValue = $data[0];
} else {
// initial value
- $newValue = $value;
- $data[$normalizedKey] = array($newValue, microtime(true));
+ $newValue = $value;
+ $this->data[$ns][$normalizedKey] = array($newValue, microtime(true));
}
return $newValue;
@@ -679,16 +669,16 @@ class Memory extends AbstractAdapter implements
*/
protected function internalDecrementItem(& $normalizedKey, & $value)
{
- $ns = $this->getOptions()->getNamespace();
- $data = & $this->data[$ns];
- if (isset($data[$normalizedKey])) {
- $data[$normalizedKey][0]-= $value;
- $data[$normalizedKey][1] = microtime(true);
- $newValue = $data[$normalizedKey][0];
+ $ns = $this->getOptions()->getNamespace();
+ if (isset($this->data[$ns][$normalizedKey])) {
+ $data = & $this->data[$ns][$normalizedKey];
+ $data[0]-= $value;
+ $data[1] = microtime(true);
+ $newValue = $data[0];
} else {
// initial value
- $newValue = -$value;
- $data[$normalizedKey] = array($newValue, microtime(true));
+ $newValue = -$value;
+ $this->data[$ns][$normalizedKey] = array($newValue, microtime(true));
}
return $newValue;
@@ -705,7 +695,7 @@ class Memory extends AbstractAdapter implements
{
if ($this->capabilities === null) {
$this->capabilityMarker = new stdClass();
- $this->capabilities = new Capabilities(
+ $this->capabilities = new Capabilities(
$this,
$this->capabilityMarker,
array(
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemoryOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemoryOptions.php
index be48418c645..a10088d99c5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemoryOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemoryOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php
index 2ce9062c43b..ba40ffa7057 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Redis.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,6 +12,7 @@ namespace Zend\Cache\Storage\Adapter;
use Redis as RedisResource;
use RedisException as RedisResourceException;
use stdClass;
+use Traversable;
use Zend\Cache\Exception;
use Zend\Cache\Storage\Capabilities;
use Zend\Cache\Storage\FlushableInterface;
@@ -21,7 +22,6 @@ class Redis extends AbstractAdapter implements
FlushableInterface,
TotalSpaceCapableInterface
{
-
/**
* Has this instance be initialized
*
@@ -172,7 +172,7 @@ class Redis extends AbstractAdapter implements
$redis = $this->getRedisResource();
$namespacedKeys = array();
- foreach ($normalizedKeys as & $normalizedKey) {
+ foreach ($normalizedKeys as $normalizedKey) {
$namespacedKeys[] = $this->namespacePrefix . $normalizedKey;
}
@@ -252,8 +252,8 @@ class Redis extends AbstractAdapter implements
$ttl = $this->getOptions()->getTtl();
$namespacedKeyValuePairs = array();
- foreach ($normalizedKeyValuePairs as $normalizedKey => & $value) {
- $namespacedKeyValuePairs[$this->namespacePrefix . $normalizedKey] = & $value;
+ foreach ($normalizedKeyValuePairs as $normalizedKey => $value) {
+ $namespacedKeyValuePairs[$this->namespacePrefix . $normalizedKey] = $value;
}
try {
if ($ttl > 0) {
@@ -270,7 +270,6 @@ class Redis extends AbstractAdapter implements
} else {
$success = $redis->mSet($namespacedKeyValuePairs);
}
-
} catch (RedisResourceException $e) {
throw new Exception\RuntimeException($redis->getLastError(), $e->getCode(), $e);
}
@@ -386,7 +385,6 @@ class Redis extends AbstractAdapter implements
}
return $info['used_memory'];
-
}
/* status */
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php
index f5e67487503..256cb265bd1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
index b19b833894f..772bd3c79aa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -20,7 +20,6 @@ use Zend\Stdlib\ArrayUtils;
*/
class RedisResourceManager
{
-
/**
* Registered resources
*
@@ -39,6 +38,69 @@ class RedisResourceManager
return isset($this->resources[$id]);
}
+ /**
+ * Get redis server version
+ *
+ * @param string $id
+ * @return int
+ * @throws Exception\RuntimeException
+ */
+ public function getMajorVersion($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ return (int) $resource['version'];
+ }
+
+ /**
+ * Get redis server version
+ *
+ * @deprecated 2.2.2 Use getMajorVersion instead
+ *
+ * @param string $id
+ * @return int
+ * @throws Exception\RuntimeException
+ */
+ public function getMayorVersion($id)
+ {
+ return $this->getMajorVersion($id);
+ }
+
+ /**
+ * Get redis resource database
+ *
+ * @param string $id
+ * @return string
+ */
+ public function getDatabase($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ return $resource['database'];
+ }
+
+ /**
+ * Get redis resource password
+ *
+ * @param string $id
+ * @return string
+ */
+ public function getPassword($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ return $resource['password'];
+ }
+
/**
* Gets a redis resource
*
@@ -78,6 +140,115 @@ class RedisResourceManager
return $redis;
}
+ /**
+ * Get server
+ * @param string $id
+ * @throws Exception\RuntimeException
+ * @return array array('host' => <host>[, 'port' => <port>[, 'timeout' => <timeout>]])
+ */
+ public function getServer($id)
+ {
+ if (!$this->hasResource($id)) {
+ throw new Exception\RuntimeException("No resource with id '{$id}'");
+ }
+
+ $resource = & $this->resources[$id];
+ return $resource['server'];
+ }
+
+ /**
+ * Normalize one server into the following format:
+ * array('host' => <host>[, 'port' => <port>[, 'timeout' => <timeout>]])
+ *
+ * @param string|array $server
+ *
+ * @throws Exception\InvalidArgumentException
+ */
+ protected function normalizeServer(&$server)
+ {
+ $host = null;
+ $port = null;
+ $timeout = 0;
+
+ // convert a single server into an array
+ if ($server instanceof Traversable) {
+ $server = ArrayUtils::iteratorToArray($server);
+ }
+
+ if (is_array($server)) {
+ // array(<host>[, <port>[, <timeout>]])
+ if (isset($server[0])) {
+ $host = (string) $server[0];
+ $port = isset($server[1]) ? (int) $server[1] : $port;
+ $timeout = isset($server[2]) ? (int) $server[2] : $timeout;
+ }
+
+ // array('host' => <host>[, 'port' => <port>, ['timeout' => <timeout>]])
+ if (!isset($server[0]) && isset($server['host'])) {
+ $host = (string) $server['host'];
+ $port = isset($server['port']) ? (int) $server['port'] : $port;
+ $timeout = isset($server['timeout']) ? (int) $server['timeout'] : $timeout;
+ }
+ } else {
+ // parse server from URI host{:?port}
+ $server = trim($server);
+ if (strpos($server, '/') !== 0) {
+ //non unix domain socket connection
+ $server = parse_url($server);
+ } else {
+ $server = array('host' => $server);
+ }
+ if (!$server) {
+ throw new Exception\InvalidArgumentException("Invalid server given");
+ }
+
+ $host = $server['host'];
+ $port = isset($server['port']) ? (int) $server['port'] : $port;
+ $timeout = isset($server['timeout']) ? (int) $server['timeout'] : $timeout;
+ }
+
+ if (!$host) {
+ throw new Exception\InvalidArgumentException('Missing required server host');
+ }
+
+ $server = array(
+ 'host' => $host,
+ 'port' => $port,
+ 'timeout' => $timeout,
+ );
+ }
+
+ /**
+ * Extract password to be used on connection
+ *
+ * @param mixed $resource
+ * @param mixed $serverUri
+ *
+ * @return string|null
+ */
+ protected function extractPassword($resource, $serverUri)
+ {
+ if (! empty($resource['password'])) {
+ return $resource['password'];
+ }
+
+ if (! is_string($serverUri)) {
+ return null;
+ }
+
+ // parse server from URI host{:?port}
+ $server = trim($serverUri);
+
+ if (strpos($server, '/') === 0) {
+ return null;
+ }
+
+ //non unix domain socket connection
+ $server = parse_url($server);
+
+ return isset($server['pass']) ? $server['pass'] : null;
+ }
+
/**
* Connects to redis server
*
@@ -148,14 +319,21 @@ class RedisResourceManager
// normalize and validate params
$this->normalizePersistentId($resource['persistent_id']);
$this->normalizeLibOptions($resource['lib_options']);
+
+ // #6495 note: order is important here, as `normalizeServer` applies destructive
+ // transformations on $resource['server']
+ $resource['password'] = $this->extractPassword($resource, $resource['server']);
+
$this->normalizeServer($resource['server']);
} else {
//there are two ways of determining if redis is already initialized
//with connect function:
//1) pinging server
- //2) checking undocummented property socket which is available only
- //after successfull connect
- $resource = array_merge($defaults, array(
+ //2) checking undocumented property socket which is available only
+ //after successful connect
+ $resource = array_merge(
+ $defaults,
+ array(
'resource' => $resource,
'initialized' => isset($resource->socket),
)
@@ -405,29 +583,22 @@ class RedisResourceManager
$this->normalizeServer($server);
- $resource = & $this->resources[$id];
+ $resource = & $this->resources[$id];
+ $resource['password'] = $this->extractPassword($resource, $server);
+
if ($resource['resource'] instanceof RedisResource) {
- $this->setResource($id, array('server' => $server));
+ $resourceParams = array('server' => $server);
+
+ if (! empty($resource['password'])) {
+ $resourceParams['password'] = $resource['password'];
+ }
+
+ $this->setResource($id, $resourceParams);
} else {
$resource['server'] = $server;
}
- return $this;
- }
-
- /**
- * Get server
- * @param string $id
- * @throws Exception\RuntimeException
- * @return array array('host' => <host>[, 'port' => <port>[, 'timeout' => <timeout>]])
- */
- public function getServer($id)
- {
- if (!$this->hasResource($id)) {
- throw new Exception\RuntimeException("No resource with id '{$id}'");
- }
- $resource = & $this->resources[$id];
- return $resource['server'];
+ return $this;
}
/**
@@ -451,22 +622,6 @@ class RedisResourceManager
return $this;
}
- /**
- * Get redis resource password
- *
- * @param string $id
- * @return string
- */
- public function getPassword($id)
- {
- if (!$this->hasResource($id)) {
- throw new Exception\RuntimeException("No resource with id '{$id}'");
- }
-
- $resource = & $this->resources[$id];
- return $resource['password'];
- }
-
/**
* Set redis database number
*
@@ -487,112 +642,4 @@ class RedisResourceManager
$resource['initialized'] = false;
return $this;
}
-
- /**
- * Get redis resource database
- *
- * @param string $id
- * @return string
- */
- public function getDatabase($id)
- {
- if (!$this->hasResource($id)) {
- throw new Exception\RuntimeException("No resource with id '{$id}'");
- }
-
- $resource = & $this->resources[$id];
- return $resource['database'];
- }
-
- /**
- * Get redis server version
- *
- * @deprecated 2.2.2 Use getMajorVersion instead
- *
- * @param string $id
- * @return int
- * @throws Exception\RuntimeException
- */
- public function getMayorVersion($id)
- {
- return $this->getMajorVersion($id);
- }
-
- /**
- * Get redis server version
- *
- * @param string $id
- * @return int
- * @throws Exception\RuntimeException
- */
- public function getMajorVersion($id)
- {
- if (!$this->hasResource($id)) {
- throw new Exception\RuntimeException("No resource with id '{$id}'");
- }
-
- $resource = & $this->resources[$id];
- return (int) $resource['version'];
- }
-
- /**
- * Normalize one server into the following format:
- * array('host' => <host>[, 'port' => <port>[, 'timeout' => <timeout>]])
- *
- * @param string|array $server
- * @throws Exception\InvalidArgumentException
- */
- protected function normalizeServer(& $server)
- {
- $host = null;
- $port = null;
- $timeout = 0;
- // convert a single server into an array
- if ($server instanceof Traversable) {
- $server = ArrayUtils::iteratorToArray($server);
- }
-
- if (is_array($server)) {
- // array(<host>[, <port>[, <timeout>]])
- if (isset($server[0])) {
- $host = (string) $server[0];
- $port = isset($server[1]) ? (int) $server[1] : $port;
- $timeout = isset($server[2]) ? (int) $server[2] : $timeout;
- }
-
- // array('host' => <host>[, 'port' => <port>, ['timeout' => <timeout>]])
- if (!isset($server[0]) && isset($server['host'])) {
- $host = (string) $server['host'];
- $port = isset($server['port']) ? (int) $server['port'] : $port;
- $timeout = isset($server['timeout']) ? (int) $server['timeout'] : $timeout;
- }
-
- } else {
- // parse server from URI host{:?port}
- $server = trim($server);
- if (!strpos($server, '/') === 0) {
- //non unix domain socket connection
- $server = parse_url($server);
- } else {
- $server = array('host' => $server);
- }
- if (!$server) {
- throw new Exception\InvalidArgumentException("Invalid server given");
- }
-
- $host = $server['host'];
- $port = isset($server['port']) ? (int) $server['port'] : $port;
- $timeout = isset($server['timeout']) ? (int) $server['timeout'] : $timeout;
- }
-
- if (!$host) {
- throw new Exception\InvalidArgumentException('Missing required server host');
- }
-
- $server = array(
- 'host' => $host,
- 'port' => $port,
- 'timeout' => $timeout,
- );
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Session.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Session.php
index bf6f45d3fb9..2be5cc2db72 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Session.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Session.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,7 +22,6 @@ class Session extends AbstractAdapter implements
FlushableInterface,
IterableInterface
{
-
/**
* Set options.
*
@@ -519,7 +518,7 @@ class Session extends AbstractAdapter implements
{
if ($this->capabilities === null) {
$this->capabilityMarker = new stdClass();
- $this->capabilities = new Capabilities(
+ $this->capabilities = new Capabilities(
$this,
$this->capabilityMarker,
array(
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/SessionOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/SessionOptions.php
index 8e4c6d5c90b..2dbfddeca07 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/SessionOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/SessionOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php
index 85ea5bda34f..42d4c9d4f1b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,7 +22,6 @@ class WinCache extends AbstractAdapter implements
FlushableInterface,
TotalSpaceCapableInterface
{
-
/**
* Constructor
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
index 43ef9c2e16d..9b8dbbd4a59 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Cache\Storage\Adapter;
-
/**
* These are options specific to the APC adapter
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCache.php
index f0aa52062b3..57ac50fc5ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -28,7 +28,6 @@ class XCache extends AbstractAdapter implements
IterableInterface,
TotalSpaceCapableInterface
{
-
/**
* Backup HTTP authentication properties of $_SERVER array
*
@@ -46,7 +45,7 @@ class XCache extends AbstractAdapter implements
/**
* Constructor
*
- * @param null|array|Traversable|ApcOptions $options
+ * @param null|array|Traversable|XCacheOptions $options
* @throws Exception\ExceptionInterface
*/
public function __construct($options = null)
@@ -75,7 +74,7 @@ class XCache extends AbstractAdapter implements
/**
* Set options.
*
- * @param array|Traversable|ApcOptions $options
+ * @param array|Traversable|XCacheOptions $options
* @return XCache
* @see getOptions()
*/
@@ -148,7 +147,6 @@ class XCache extends AbstractAdapter implements
return $availableSpace;
}
-
/* ClearByNamespaceInterface */
/**
@@ -222,7 +220,6 @@ class XCache extends AbstractAdapter implements
*/
public function getIterator()
{
-
$options = $this->getOptions();
$namespace = $options->getNamespace();
$keys = array();
@@ -238,7 +235,6 @@ class XCache extends AbstractAdapter implements
}
}
} else {
-
$prefix = $namespace . $options->getNamespaceSeparator();
$prefixL = strlen($prefix);
@@ -314,7 +310,6 @@ class XCache extends AbstractAdapter implements
$internalKey = $prefix . $normalizedKey;
if (xcache_isset($internalKey)) {
-
$this->initAdminAuth();
$cnt = xcache_count(XC_TYPE_VAR);
for ($i=0; $i < $cnt; $i++) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCacheOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCacheOptions.php
index 4c97136b755..9c5b17c904e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCacheOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCacheOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
index 7ee8a32c99d..95dd9008a86 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,7 +22,6 @@ class ZendServerDisk extends AbstractZendServer implements
FlushableInterface,
TotalSpaceCapableInterface
{
-
/**
* Buffered total space in bytes
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ZendServerShm.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ZendServerShm.php
index e312b2480df..3c5d5e90de1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ZendServerShm.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ZendServerShm.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -19,7 +19,6 @@ class ZendServerShm extends AbstractZendServer implements
FlushableInterface,
TotalSpaceCapableInterface
{
-
/**
* Constructor
*
@@ -72,7 +71,7 @@ class ZendServerShm extends AbstractZendServer implements
/**
* Get total space in bytes
*
- * @return int|float
+ * @return int
*/
public function getTotalSpace()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AdapterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AdapterPluginManager.php
index ee7db4f6539..6278d3c1f4c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AdapterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AdapterPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -28,8 +28,10 @@ class AdapterPluginManager extends AbstractPluginManager
*/
protected $invokableClasses = array(
'apc' => 'Zend\Cache\Storage\Adapter\Apc',
+ 'blackhole' => 'Zend\Cache\Storage\Adapter\BlackHole',
'dba' => 'Zend\Cache\Storage\Adapter\Dba',
'filesystem' => 'Zend\Cache\Storage\Adapter\Filesystem',
+ 'memcache' => 'Zend\Cache\Storage\Adapter\Memcache',
'memcached' => 'Zend\Cache\Storage\Adapter\Memcached',
'memory' => 'Zend\Cache\Storage\Adapter\Memory',
'redis' => 'Zend\Cache\Storage\Adapter\Redis',
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php
index 5088fe255a9..0576c6a7087 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Capabilities.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Capabilities.php
index c81e08cbdff..b09922d274a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Capabilities.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Capabilities.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -40,8 +40,8 @@ class Capabilities
/**
* Expire read
*
- * If it's NULL the capability isn't set and the getter
- * returns the base capability or the default value.
+ * If it's NULL the capability isn't set and the getter
+ * returns the base capability or the default value.
*
* @var null|bool
*/
@@ -50,8 +50,8 @@ class Capabilities
/**
* Max. key length
*
- * If it's NULL the capability isn't set and the getter
- * returns the base capability or the default value.
+ * If it's NULL the capability isn't set and the getter
+ * returns the base capability or the default value.
*
* @var null|int
*/
@@ -60,8 +60,8 @@ class Capabilities
/**
* Min. TTL (0 means items never expire)
*
- * If it's NULL the capability isn't set and the getter
- * returns the base capability or the default value.
+ * If it's NULL the capability isn't set and the getter
+ * returns the base capability or the default value.
*
* @var null|int
*/
@@ -70,8 +70,8 @@ class Capabilities
/**
* Max. TTL (0 means infinite)
*
- * If it's NULL the capability isn't set and the getter
- * returns the base capability or the default value.
+ * If it's NULL the capability isn't set and the getter
+ * returns the base capability or the default value.
*
* @var null|int
*/
@@ -80,8 +80,8 @@ class Capabilities
/**
* Namespace is prefix
*
- * If it's NULL the capability isn't set and the getter
- * returns the base capability or the default value.
+ * If it's NULL the capability isn't set and the getter
+ * returns the base capability or the default value.
*
* @var null|bool
*/
@@ -90,8 +90,8 @@ class Capabilities
/**
* Namespace separator
*
- * If it's NULL the capability isn't set and the getter
- * returns the base capability or the default value.
+ * If it's NULL the capability isn't set and the getter
+ * returns the base capability or the default value.
*
* @var null|string
*/
@@ -100,28 +100,28 @@ class Capabilities
/**
* Static ttl
*
- * If it's NULL the capability isn't set and the getter
- * returns the base capability or the default value.
+ * If it's NULL the capability isn't set and the getter
+ * returns the base capability or the default value.
*
* @var null|bool
*/
protected $staticTtl;
- /**
- * Supported datatypes
- *
- * If it's NULL the capability isn't set and the getter
- * returns the base capability or the default value.
- *
- * @var null|array
- */
+ /**
+ * Supported datatypes
+ *
+ * If it's NULL the capability isn't set and the getter
+ * returns the base capability or the default value.
+ *
+ * @var null|array
+ */
protected $supportedDatatypes;
/**
* Supported metdata
*
- * If it's NULL the capability isn't set and the getter
- * returns the base capability or the default value.
+ * If it's NULL the capability isn't set and the getter
+ * returns the base capability or the default value.
*
* @var null|array
*/
@@ -130,8 +130,8 @@ class Capabilities
/**
* TTL precision
*
- * If it's NULL the capability isn't set and the getter
- * returns the base capability or the default value.
+ * If it's NULL the capability isn't set and the getter
+ * returns the base capability or the default value.
*
* @var null|int
*/
@@ -140,8 +140,8 @@ class Capabilities
/**
* Use request time
*
- * If it's NULL the capability isn't set and the getter
- * returns the base capability or the default value.
+ * If it's NULL the capability isn't set and the getter
+ * returns the base capability or the default value.
*
* @var null|bool
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearByNamespaceInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearByNamespaceInterface.php
index 15fb4e75660..ed2aac94f5c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearByNamespaceInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearByNamespaceInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearByPrefixInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearByPrefixInterface.php
index eb2fb5e0b9f..f1279576c08 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearByPrefixInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearByPrefixInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearExpiredInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearExpiredInterface.php
index 6f7b0a36a7a..264e7eb2f98 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearExpiredInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearExpiredInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Event.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Event.php
index 62c32f4f827..b82cbb127c8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Event.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Event.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ExceptionEvent.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ExceptionEvent.php
index e9ffb4a0c20..1882c6ad0f5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ExceptionEvent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ExceptionEvent.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/FlushableInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/FlushableInterface.php
index 6c72541e6bf..2fe060538b6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/FlushableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/FlushableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/IterableInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/IterableInterface.php
index 68c4ba2cad4..af24b7f80b1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/IterableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/IterableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/IteratorInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/IteratorInterface.php
index c08381e7a58..e60f52f893a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/IteratorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/IteratorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use Iterator;
interface IteratorInterface extends Iterator
{
-
const CURRENT_AS_SELF = 0;
const CURRENT_AS_KEY = 1;
const CURRENT_AS_VALUE = 2;
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/OptimizableInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/OptimizableInterface.php
index 0f57022fbe1..f7ce2984b9d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/OptimizableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/OptimizableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
index 0e1ab90cb44..cc918f5a7c7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
index ae4d0ede285..5fc1bcb00dc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,9 +22,9 @@ class ClearExpiredByFactor extends AbstractPlugin
{
$callback = array($this, 'clearExpiredByFactor');
- $this->listeners[] = $events->attach('setItem.post', $callback, $priority);
+ $this->listeners[] = $events->attach('setItem.post', $callback, $priority);
$this->listeners[] = $events->attach('setItems.post', $callback, $priority);
- $this->listeners[] = $events->attach('addItem.post', $callback, $priority);
+ $this->listeners[] = $events->attach('addItem.post', $callback, $priority);
$this->listeners[] = $events->attach('addItems.post', $callback, $priority);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
index 2b0d705590f..11e0abdab70 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Cache\Storage\Plugin;
-use Zend\Cache\Exception;
use Zend\Cache\Storage\ExceptionEvent;
use Zend\EventManager\EventManagerInterface;
@@ -56,6 +55,9 @@ class ExceptionHandler extends AbstractPlugin
$this->listeners[] = $events->attach('decrementItem.exception', $callback, $priority);
$this->listeners[] = $events->attach('decrementItems.exception', $callback, $priority);
+
+ // utility
+ $this->listeners[] = $events->attach('clearExpired.exception', $callback, $priority);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
index 107f6788d14..64f0d990264 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Cache\Storage\Plugin;
-use Zend\Cache\Exception;
use Zend\Cache\Storage\Event;
use Zend\EventManager\EventManagerInterface;
@@ -30,49 +29,49 @@ class IgnoreUserAbort extends AbstractPlugin
$cbOnBefore = array($this, 'onBefore');
$cbOnAfter = array($this, 'onAfter');
- $this->listeners[] = $events->attach('setItem.pre', $cbOnBefore, $priority);
- $this->listeners[] = $events->attach('setItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('setItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('setItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('setItem.exception', $cbOnAfter, $priority);
- $this->listeners[] = $events->attach('setItems.pre', $cbOnBefore, $priority);
- $this->listeners[] = $events->attach('setItems.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('setItems.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('setItems.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('setItems.exception', $cbOnAfter, $priority);
- $this->listeners[] = $events->attach('addItem.pre', $cbOnBefore, $priority);
- $this->listeners[] = $events->attach('addItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('addItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('addItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('addItem.exception', $cbOnAfter, $priority);
- $this->listeners[] = $events->attach('addItems.pre', $cbOnBefore, $priority);
- $this->listeners[] = $events->attach('addItems.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('addItems.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('addItems.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('addItems.exception', $cbOnAfter, $priority);
- $this->listeners[] = $events->attach('replaceItem.pre', $cbOnBefore, $priority);
- $this->listeners[] = $events->attach('replaceItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('replaceItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('replaceItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('replaceItem.exception', $cbOnAfter, $priority);
- $this->listeners[] = $events->attach('replaceItems.pre', $cbOnBefore, $priority);
- $this->listeners[] = $events->attach('replaceItems.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('replaceItems.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('replaceItems.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('replaceItems.exception', $cbOnAfter, $priority);
- $this->listeners[] = $events->attach('checkAndSetItem.pre', $cbOnBefore, $priority);
- $this->listeners[] = $events->attach('checkAndSetItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('checkAndSetItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('checkAndSetItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('checkAndSetItem.exception', $cbOnAfter, $priority);
// increment / decrement item(s)
- $this->listeners[] = $events->attach('incrementItem.pre', $cbOnBefore, $priority);
- $this->listeners[] = $events->attach('incrementItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('incrementItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('incrementItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('incrementItem.exception', $cbOnAfter, $priority);
- $this->listeners[] = $events->attach('incrementItems.pre', $cbOnBefore, $priority);
- $this->listeners[] = $events->attach('incrementItems.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('incrementItems.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('incrementItems.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('incrementItems.exception', $cbOnAfter, $priority);
- $this->listeners[] = $events->attach('decrementItem.pre', $cbOnBefore, $priority);
- $this->listeners[] = $events->attach('decrementItem.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('decrementItem.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('decrementItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('decrementItem.exception', $cbOnAfter, $priority);
- $this->listeners[] = $events->attach('decrementItems.pre', $cbOnBefore, $priority);
- $this->listeners[] = $events->attach('decrementItems.post', $cbOnAfter, $priority);
+ $this->listeners[] = $events->attach('decrementItems.pre', $cbOnBefore, $priority);
+ $this->listeners[] = $events->attach('decrementItems.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('decrementItems.exception', $cbOnAfter, $priority);
}
@@ -86,7 +85,7 @@ class IgnoreUserAbort extends AbstractPlugin
public function onBefore(Event $event)
{
if ($this->activatedTarget === null && !ignore_user_abort(true)) {
- $this->activatedTarget = $event->getTarget();
+ $this->activatedTarget = $event->getStorage();
}
}
@@ -102,7 +101,7 @@ class IgnoreUserAbort extends AbstractPlugin
*/
public function onAfter(Event $event)
{
- if ($this->activatedTarget === $event->getTarget()) {
+ if ($this->activatedTarget === $event->getStorage()) {
// exit if connection aborted
if ($this->getOptions()->getExitOnAbort() && connection_aborted()) {
exit;
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
index f870d85eb5d..9d432048fea 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -21,7 +21,7 @@ class OptimizeByFactor extends AbstractPlugin
public function attach(EventManagerInterface $events, $priority = 1)
{
$callback = array($this, 'optimizeByFactor');
- $this->listeners[] = $events->attach('removeItem.post', $callback, $priority);
+ $this->listeners[] = $events->attach('removeItem.post', $callback, $priority);
$this->listeners[] = $events->attach('removeItems.post', $callback, $priority);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/PluginInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/PluginInterface.php
index af3d007ca4c..cad0b455f3b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/PluginInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/PluginInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/PluginOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/PluginOptions.php
index a1db1661b11..59ea170aa65 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/PluginOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/PluginOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -118,7 +118,7 @@ class PluginOptions extends AbstractOptions
* Used by:
* - ExceptionHandler
*
- * @return null|callable
+ * @return callable
*/
public function getExceptionCallback()
{
@@ -183,7 +183,7 @@ class PluginOptions extends AbstractOptions
*
* @param string|SerializerAdapter $serializer
* @throws Exception\InvalidArgumentException
- * @return Serializer
+ * @return self
*/
public function setSerializer($serializer)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/Serializer.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/Serializer.php
index c0e71b4bee1..d79f221a06b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/Serializer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/Serializer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -33,17 +33,17 @@ class Serializer extends AbstractPlugin
$postPriority = -$priority;
// read
- $this->listeners[] = $events->attach('getItem.post', array($this, 'onReadItemPost'), $postPriority);
+ $this->listeners[] = $events->attach('getItem.post', array($this, 'onReadItemPost'), $postPriority);
$this->listeners[] = $events->attach('getItems.post', array($this, 'onReadItemsPost'), $postPriority);
// write
- $this->listeners[] = $events->attach('setItem.pre', array($this, 'onWriteItemPre'), $prePriority);
+ $this->listeners[] = $events->attach('setItem.pre', array($this, 'onWriteItemPre'), $prePriority);
$this->listeners[] = $events->attach('setItems.pre', array($this, 'onWriteItemsPre'), $prePriority);
- $this->listeners[] = $events->attach('addItem.pre', array($this, 'onWriteItemPre'), $prePriority);
+ $this->listeners[] = $events->attach('addItem.pre', array($this, 'onWriteItemPre'), $prePriority);
$this->listeners[] = $events->attach('addItems.pre', array($this, 'onWriteItemsPre'), $prePriority);
- $this->listeners[] = $events->attach('replaceItem.pre', array($this, 'onWriteItemPre'), $prePriority);
+ $this->listeners[] = $events->attach('replaceItem.pre', array($this, 'onWriteItemPre'), $prePriority);
$this->listeners[] = $events->attach('replaceItems.pre', array($this, 'onWriteItemsPre'), $prePriority);
$this->listeners[] = $events->attach('checkAndSetItem.pre', array($this, 'onWriteItemPre'), $prePriority);
@@ -56,7 +56,7 @@ class Serializer extends AbstractPlugin
$this->listeners[] = $events->attach('decrementItems.pre', array($this, 'onDecrementItemsPre'), $prePriority);
// overwrite capabilities
- $this->listeners[] = $events->attach('getCapabilities.post', array($this, 'onGetCapabilitiesPost'), $postPriority);
+ $this->listeners[] = $events->attach('getCapabilities.post', array($this, 'onGetCapabilitiesPost'), $postPriority);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/PluginManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/PluginManager.php
index a799a37d345..ebdaa67c083 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/PluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/PluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/PostEvent.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/PostEvent.php
index 9302b0814ea..8ca7877ffa8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/PostEvent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/PostEvent.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/StorageInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/StorageInterface.php
index c89ca5bef21..2b0910fe54b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/StorageInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/StorageInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/TaggableInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/TaggableInterface.php
index 3917b0e41ca..1bf63bd0a07 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/TaggableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/TaggableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php
index be543e82f61..737a0333587 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/TotalSpaceCapableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/StorageFactory.php b/vendor/zendframework/zendframework/library/Zend/Cache/StorageFactory.php
index db4946d700f..8023bc9a1a8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/StorageFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/StorageFactory.php
@@ -3,13 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Cache;
use Traversable;
+use Zend\EventManager\EventsCapableInterface;
use Zend\Stdlib\ArrayUtils;
abstract class StorageFactory
@@ -71,6 +72,14 @@ abstract class StorageFactory
// add plugins
if (isset($cfg['plugins'])) {
+ if (!$adapter instanceof EventsCapableInterface) {
+ throw new Exception\RuntimeException(sprintf(
+ "The adapter '%s' doesn't implement '%s' and therefore can't handle plugins",
+ get_class($adapter),
+ 'Zend\EventManager\EventsCapableInterface'
+ ));
+ }
+
if (!is_array($cfg['plugins'])) {
throw new Exception\InvalidArgumentException(
'Plugins needs to be an array'
@@ -185,7 +194,7 @@ abstract class StorageFactory
public static function pluginFactory($pluginName, $options = array())
{
if ($pluginName instanceof Storage\Plugin\PluginInterface) {
- // $pluginName is already an plugin object
+ // $pluginName is already a plugin object
$plugin = $pluginName;
} else {
$plugin = static::getPluginManager()->get($pluginName);
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/composer.json b/vendor/zendframework/zendframework/library/Zend/Cache/composer.json
index 1d9089ac5eb..3d20dff9a3d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/composer.json
@@ -6,6 +6,7 @@
"zf2",
"cache"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Cache\\": ""
@@ -13,13 +14,14 @@
},
"target-dir": "Zend/Cache",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-serializer": "self.version",
"zendframework/zend-eventmanager": "self.version"
},
"require-dev": {
- "zendframework/zend-serializer": "self.version"
+ "zendframework/zend-session": "self.version"
},
"suggest": {
"zendframework/zend-serializer": "Zend\\Serializer component",
@@ -31,8 +33,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractAdapter.php
index 11784d69e7a..70642e650ae 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php b/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php
index 5ad8036611f..b0a3b0010ee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractWord.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Captcha/AdapterInterface.php
index 227daa5c768..4827952f090 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/AdapterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Captcha/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Dumb.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Dumb.php
index 9461adf0c29..975cb6f14d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Dumb.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Dumb.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/DomainException.php
index ac900097b4c..94e434389a8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/DomainException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExceptionInterface.php
index a42e6a86908..afb8edbd28b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
index 78c31911402..127c5d17085 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ImageNotLoadableException.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ImageNotLoadableException.php
index 718091a974a..c6533d67ef3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ImageNotLoadableException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/ImageNotLoadableException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/InvalidArgumentException.php
index 56dfeaddbb1..c8d7ff5e978 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/InvalidArgumentException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Captcha\Exception;
-class InvalidArgumentException extends \InvalidArgumentException implements
- ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/NoFontProvidedException.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/NoFontProvidedException.php
index eaf0447255c..28b2293c9d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/NoFontProvidedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/NoFontProvidedException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/RuntimeException.php
index d3b960980d5..bb03210d3eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/RuntimeException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Captcha\Exception;
class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Factory.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Factory.php
index 04f15d868d4..ff7e6b825a3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Factory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Figlet.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Figlet.php
index 002f5f3072d..a660549c8a7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Figlet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Figlet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/Image.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Image.php
index ce9183715af..b95550d07ac 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Image.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Image.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -495,7 +495,9 @@ class Image extends AbstractWord
$error = ErrorHandler::stop();
if (!$img || $error) {
throw new Exception\ImageNotLoadableException(
- "Can not load start image '{$this->startImage}'", 0, $error
+ "Can not load start image '{$this->startImage}'",
+ 0,
+ $error
);
}
$w = imagesx($img);
@@ -512,10 +514,10 @@ class Image extends AbstractWord
// generate noise
for ($i=0; $i < $this->dotNoiseLevel; $i++) {
- imagefilledellipse($img, mt_rand(0, $w), mt_rand(0, $h), 2, 2, $textColor);
+ imagefilledellipse($img, mt_rand(0, $w), mt_rand(0, $h), 2, 2, $textColor);
}
for ($i=0; $i < $this->lineNoiseLevel; $i++) {
- imageline($img, mt_rand(0, $w), mt_rand(0, $h), mt_rand(0, $w), mt_rand(0, $h), $textColor);
+ imageline($img, mt_rand(0, $w), mt_rand(0, $h), mt_rand(0, $w), mt_rand(0, $h), $textColor);
}
// transformed image
@@ -580,7 +582,7 @@ class Image extends AbstractWord
}
for ($i=0; $i<$this->lineNoiseLevel; $i++) {
- imageline($img2, mt_rand(0, $w), mt_rand(0, $h), mt_rand(0, $w), mt_rand(0, $h), $textColor);
+ imageline($img2, mt_rand(0, $w), mt_rand(0, $h), mt_rand(0, $w), mt_rand(0, $h), $textColor);
}
imagepng($img2, $imgFile);
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/ReCaptcha.php b/vendor/zendframework/zendframework/library/Zend/Captcha/ReCaptcha.php
index 7e5c019348f..d701b00d12d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/ReCaptcha.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/ReCaptcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json b/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json
index 35bbd0db503..fec1684fe5c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/composer.json
@@ -6,6 +6,7 @@
"zf2",
"captcha"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Captcha\\": ""
@@ -13,21 +14,27 @@
},
"target-dir": "Zend/Captcha",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-math": "self.version",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
+ "zendframework/zend-session": "self.version",
+ "zendframework/zend-text": "self.version",
+ "zendframework/zend-validator": "self.version",
"zendframework/zendservice-recaptcha": "*"
},
"suggest": {
- "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component",
- "zendframework/zend-resources": "Translations of captcha messages"
+ "zendframework/zend-resources": "Translations of captcha messages",
+ "zendframework/zend-session": "Zend\\Session component",
+ "zendframework/zend-text": "Zend\\Text component",
+ "zendframework/zend-validator": "Zend\\Validator component",
+ "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationCollection.php b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationCollection.php
index 7b9aa51da6c..48a71fc0359 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationCollection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationCollection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationInterface.php
index a8b23d3d9c4..f8fcc7ac3fa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,6 +15,7 @@ interface AnnotationInterface
* Initialize
*
* @param string $content
+ * @return void
*/
public function initialize($content);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationManager.php b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationManager.php
index 81676ed55a1..f49bef5df77 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -83,7 +83,7 @@ class AnnotationManager implements EventManagerAwareInterface
/**
* Create Annotation
*
- * @param array $annotationData
+ * @param string[] $annotationData
* @return false|\stdClass
*/
public function createAnnotation(array $annotationData)
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php
index 5168e3278cd..d462985ffff 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php
index b3f75662477..f142ac46624 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/GenericAnnotationParser.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/ParserInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/ParserInterface.php
index bb6746e80ca..9d84642f86b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/ParserInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/ParserInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Code/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Code/Exception/BadMethodCallException.php
index 921eefde3c8..03465969e95 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,4 +11,5 @@ namespace Zend\Code\Exception;
class BadMethodCallException extends \BadMethodCallException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Exception/ExceptionInterface.php
index de32f2498f2..cb3e15eecfe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Code/Exception/InvalidArgumentException.php
index 88469503a88..65fe03e6214 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,4 +11,5 @@ namespace Zend\Code\Exception;
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Code/Exception/RuntimeException.php
index afacbee68d9..fabca693188 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Exception/RuntimeException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Exception;
class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/AbstractGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/AbstractGenerator.php
index 3dc6de56751..ef6aa67d0ba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/AbstractGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/AbstractGenerator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/AbstractMemberGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/AbstractMemberGenerator.php
index ad981ed9111..10684a3e77e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/AbstractMemberGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/AbstractMemberGenerator.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Generator;
-
abstract class AbstractMemberGenerator extends AbstractGenerator
{
/**#@+
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/BodyGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/BodyGenerator.php
index 4851e5ca4d7..03e4f409aca 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/BodyGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/BodyGenerator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ClassGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ClassGenerator.php
index 843409c71d2..d0791d3321e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ClassGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ClassGenerator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -101,7 +101,7 @@ class ClassGenerator extends AbstractGenerator
}
$interfaceNames = array();
- foreach ($interfaces AS $interface) {
+ foreach ($interfaces as $interface) {
/* @var \Zend\Code\Reflection\ClassReflection $interface */
$interfaceNames[] = $interface->getName();
}
@@ -198,9 +198,16 @@ class ClassGenerator extends AbstractGenerator
* @param array $methods
* @param DocBlockGenerator $docBlock
*/
- public function __construct($name = null, $namespaceName = null, $flags = null, $extends = null,
- $interfaces = array(), $properties = array(), $methods = array(), $docBlock = null)
- {
+ public function __construct(
+ $name = null,
+ $namespaceName = null,
+ $flags = null,
+ $extends = null,
+ $interfaces = array(),
+ $properties = array(),
+ $methods = array(),
+ $docBlock = null
+ ) {
if ($name !== null) {
$this->setName($name);
}
@@ -459,7 +466,7 @@ class ClassGenerator extends AbstractGenerator
/**
* Add property from PropertyGenerator
*
- * @param string|PropertyGenerator $property
+ * @param PropertyGenerator $property
* @throws Exception\InvalidArgumentException
* @return ClassGenerator
*/
@@ -569,9 +576,13 @@ class ClassGenerator extends AbstractGenerator
* @throws Exception\InvalidArgumentException
* @return ClassGenerator
*/
- public function addMethod($name = null, array $parameters = array(), $flags = MethodGenerator::FLAG_PUBLIC,
- $body = null, $docBlock = null)
- {
+ public function addMethod(
+ $name = null,
+ array $parameters = array(),
+ $flags = MethodGenerator::FLAG_PUBLIC,
+ $body = null,
+ $docBlock = null
+ ) {
if (!is_string($name)) {
throw new Exception\InvalidArgumentException(sprintf(
'%s expects string for name',
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php
index 016070f628e..5901fb13d1d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php
@@ -3,100 +3,48 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Generator\DocBlock;
-use ReflectionClass;
-use ReflectionMethod;
-use Zend\Code\Generator\AbstractGenerator;
-use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionDocBlockTag;
+use Zend\Code\Generator\DocBlock\Tag\GenericTag;
+use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionTagInterface;
-class Tag extends AbstractGenerator
+/**
+ * @deprecated Deprecated in 2.3. Use GenericTag instead
+ */
+class Tag extends GenericTag
{
/**
- * @var string
- */
- protected $name = null;
-
- /**
- * @var string
- */
- protected $description = null;
-
- /**
- * Build a Tag generator object from a reflection object
- *
- * @param ReflectionDocBlockTag $reflectionTag
- * @return Tag
- */
- public static function fromReflection(ReflectionDocBlockTag $reflectionTag)
- {
- $tagName = $reflectionTag->getName();
-
- $codeGenDocBlockTag = new static();
- $codeGenDocBlockTag->setName($tagName);
-
- // transport any properties via accessors and mutators from reflection to codegen object
- $reflectionClass = new ReflectionClass($reflectionTag);
- foreach ($reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
- if (substr($method->getName(), 0, 3) == 'get') {
- $propertyName = substr($method->getName(), 3);
- if (method_exists($codeGenDocBlockTag, 'set' . $propertyName)) {
- $codeGenDocBlockTag->{'set' . $propertyName}($reflectionTag->{'get' . $propertyName}());
- }
- }
- }
-
- return $codeGenDocBlockTag;
- }
-
- /**
- * @param string $name
+ * @param ReflectionTagInterface $reflectionTag
* @return Tag
+ * @deprecated Deprecated in 2.3. Use TagManager::createTagFromReflection() instead
*/
- public function setName($name)
- {
- $this->name = ltrim($name, '@');
- return $this;
- }
-
- /**
- * @return string
- */
- public function getName()
+ public static function fromReflection(ReflectionTagInterface $reflectionTag)
{
- return $this->name;
+ $tagManager = new TagManager();
+ $tagManager->initializeDefaultTags();
+ return $tagManager->createTagFromReflection($reflectionTag);
}
/**
* @param string $description
* @return Tag
+ * @deprecated Deprecated in 2.3. Use GenericTag::setContent() instead
*/
public function setDescription($description)
{
- $this->description = $description;
- return $this;
+ return $this->setContent($description);
}
/**
* @return string
+ * @deprecated Deprecated in 2.3. Use GenericTag::getContent() instead
*/
public function getDescription()
{
- return $this->description;
- }
-
- /**
- * @return string
- */
- public function generate()
- {
- $output = '@' . $this->name
- . (($this->description != null) ? ' ' . $this->description : '');
-
- return $output;
+ return $this->getContent();
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/AbstractTypeableTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/AbstractTypeableTag.php
new file mode 100644
index 00000000000..3d95e9080cd
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/AbstractTypeableTag.php
@@ -0,0 +1,96 @@
+<?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\Code\Generator\DocBlock\Tag;
+
+use Zend\Code\Generator\AbstractGenerator;
+
+/**
+ * This abstract class can be used as parent for all tags
+ * that use a type part in their content.
+ * @see http://www.phpdoc.org/docs/latest/for-users/phpdoc/types.html
+ */
+abstract class AbstractTypeableTag extends AbstractGenerator
+{
+ /**
+ * @var string
+ */
+ protected $description = null;
+
+ /**
+ * @var array
+ */
+ protected $types = array();
+
+ /**
+ * @param array $types
+ * @param string $description
+ */
+ public function __construct($types = array(), $description = null)
+ {
+ if (!empty($types)) {
+ $this->setTypes($types);
+ }
+
+ if (!empty($description)) {
+ $this->setDescription($description);
+ }
+ }
+
+ /**
+ * @param string $description
+ * @return ReturnTag
+ */
+ public function setDescription($description)
+ {
+ $this->description = $description;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getDescription()
+ {
+ return $this->description;
+ }
+
+ /**
+ * Array of types or string with types delimited by pipe (|)
+ * e.g. array('int', 'null') or "int|null"
+ *
+ * @param array|string $types
+ * @return ReturnTag
+ */
+ public function setTypes($types)
+ {
+ if (is_string($types)) {
+ $types = explode('|', $types);
+ }
+ $this->types = $types;
+ return $this;
+ }
+
+ /**
+ * @return array
+ */
+ public function getTypes()
+ {
+ return $this->types;
+ }
+
+ /**
+ * @param string $delimiter
+ * @return string
+ */
+ public function getTypesAsString($delimiter = '|')
+ {
+ return implode($delimiter, $this->types);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/AuthorTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/AuthorTag.php
index a4b97c4d588..a6b54086750 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/AuthorTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/AuthorTag.php
@@ -3,77 +3,97 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Generator\DocBlock\Tag;
-use Zend\Code\Generator\DocBlock\Tag;
-use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionDocBlockTag;
+use Zend\Code\Generator\AbstractGenerator;
+use Zend\Code\Generator\DocBlock\TagManager;
+use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionTagInterface;
-class AuthorTag extends Tag
+class AuthorTag extends AbstractGenerator implements TagInterface
{
/**
* @var string
*/
- protected $datatype = null;
+ protected $authorName = null;
/**
* @var string
*/
- protected $paramName = null;
+ protected $authorEmail = null;
/**
- * @param ReflectionDocBlockTag $reflectionTagParam
- * @return AuthorTag
+ * @param string $authorName
+ * @param string $authorEmail
*/
- public static function fromReflection(ReflectionDocBlockTag $reflectionTagParam)
+ public function __construct($authorName = null, $authorEmail = null)
{
- $authorTag = new self();
- $authorTag
- ->setName('author')
- ->setAuthorName($reflectionTagParam->getType()) // @todo rename
- ->setAuthorEmail($reflectionTagParam->getVariableName())
- ->setDescription($reflectionTagParam->getDescription());
+ if (!empty($authorName)) {
+ $this->setAuthorName($authorName);
+ }
- return $authorTag;
+ if (!empty($authorEmail)) {
+ $this->setAuthorEmail($authorEmail);
+ }
}
/**
- * @param string $datatype
+ * @param ReflectionTagInterface $reflectionTag
+ * @return ReturnTag
+ * @deprecated Deprecated in 2.3. Use TagManager::createTagFromReflection() instead
+ */
+ public static function fromReflection(ReflectionTagInterface $reflectionTag)
+ {
+ $tagManager = new TagManager();
+ $tagManager->initializeDefaultTags();
+ return $tagManager->createTagFromReflection($reflectionTag);
+ }
+
+ /**
+ * @return string
+ */
+ public function getName()
+ {
+ return 'author';
+ }
+
+ /**
+ * @param string $authorEmail
* @return AuthorTag
*/
- public function setDatatype($datatype)
+ public function setAuthorEmail($authorEmail)
{
- $this->datatype = (string) $datatype;
+ $this->authorEmail = $authorEmail;
return $this;
}
/**
* @return string
*/
- public function getDatatype()
+ public function getAuthorEmail()
{
- return $this->datatype;
+ return $this->authorEmail;
}
/**
- * @param string $paramName
+ * @param string $authorName
* @return AuthorTag
*/
- public function setParamName($paramName)
+ public function setAuthorName($authorName)
{
- $this->paramName = (string) $paramName;
+ $this->authorName = $authorName;
return $this;
}
/**
* @return string
*/
- public function getParamName()
+ public function getAuthorName()
{
- return $this->paramName;
+ return $this->authorName;
}
/**
@@ -81,12 +101,10 @@ class AuthorTag extends Tag
*/
public function generate()
{
- $output = '@param '
- . (($this->datatype != null) ? $this->datatype : 'unknown')
- . (($this->paramName != null) ? ' $' . $this->paramName : '')
- . (($this->description != null) ? ' ' . $this->description : '');
+ $output = '@author'
+ . ((!empty($this->authorName)) ? ' ' . $this->authorName : '')
+ . ((!empty($this->authorEmail)) ? ' <' . $this->authorEmail . '>' : '');
return $output;
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/GenericTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/GenericTag.php
new file mode 100644
index 00000000000..d4ea1084952
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/GenericTag.php
@@ -0,0 +1,88 @@
+<?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\Code\Generator\DocBlock\Tag;
+
+use Zend\Code\Generator\AbstractGenerator;
+use Zend\Code\Generic\Prototype\PrototypeGenericInterface;
+
+class GenericTag extends AbstractGenerator implements TagInterface, PrototypeGenericInterface
+{
+ /**
+ * @var string
+ */
+ protected $name = null;
+
+ /**
+ * @var string
+ */
+ protected $content = null;
+
+ /**
+ * @param string $name
+ * @param string $content
+ */
+ public function __construct($name = null, $content = null)
+ {
+ if (!empty($name)) {
+ $this->setName($name);
+ }
+
+ if (!empty($content)) {
+ $this->setContent($content);
+ }
+ }
+
+ /**
+ * @param string $name
+ * @return GenericTag
+ */
+ public function setName($name)
+ {
+ $this->name = ltrim($name, '@');
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getName()
+ {
+ return $this->name;
+ }
+
+ /**
+ * @param string $content
+ * @return GenericTag
+ */
+ public function setContent($content)
+ {
+ $this->content = $content;
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getContent()
+ {
+ return $this->content;
+ }
+
+ /**
+ * @return string
+ */
+ public function generate()
+ {
+ $output = '@' . $this->name
+ . ((!empty($this->content)) ? ' ' . $this->content : '');
+
+ return $output;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
index b2e5993ab79..832d4346f2f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
@@ -3,16 +3,17 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Generator\DocBlock\Tag;
-use Zend\Code\Generator\DocBlock\Tag;
-use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionDocBlockTag;
+use Zend\Code\Generator\AbstractGenerator;
+use Zend\Code\Generator\DocBlock\TagManager;
+use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionTagInterface;
-class LicenseTag extends Tag
+class LicenseTag extends AbstractGenerator implements TagInterface
{
/**
* @var string
@@ -25,38 +26,42 @@ class LicenseTag extends Tag
protected $licenseName = null;
/**
- * @param array $options
+ * @param string $url
+ * @param string $licenseName
*/
- public function __construct(array $options = array())
+ public function __construct($url = null, $licenseName = null)
{
- parent::__construct($options);
-
- if (isset($options['url'])) {
- $this->setUrl($options['url']);
+ if (!empty($url)) {
+ $this->setUrl($url);
}
- if (empty($this->name)) {
- $this->setName('license');
+ if (!empty($licenseName)) {
+ $this->setLicenseName($licenseName);
}
}
/**
- * @param ReflectionDocBlockTag $reflectionTagLicense
- * @return LicenseTag
+ * @param ReflectionTagInterface $reflectionTag
+ * @return ReturnTag
+ * @deprecated Deprecated in 2.3. Use TagManager::createTagFromReflection() instead
*/
- public static function fromReflection(ReflectionDocBlockTag $reflectionTagLicense)
+ public static function fromReflection(ReflectionTagInterface $reflectionTag)
{
- $licenseTag = new static();
- $licenseTag
- ->setName('license')
- ->setUrl($reflectionTagLicense->getUrl())
- ->setLicenseName($reflectionTagLicense->getDescription());
+ $tagManager = new TagManager();
+ $tagManager->initializeDefaultTags();
+ return $tagManager->createTagFromReflection($reflectionTag);
+ }
- return $licenseTag;
+ /**
+ * @return string
+ */
+ public function getName()
+ {
+ return 'license';
}
/**
- * @param string $url
+ * @param string $url
* @return LicenseTag
*/
public function setUrl($url)
@@ -96,10 +101,9 @@ class LicenseTag extends Tag
*/
public function generate()
{
- $output = '@license '
- . (($this->url != null) ? $this->url : 'unknown')
- . (($this->licenseName != null) ? ' ' . $this->licenseName : '')
- . (($this->description != null) ? ' ' . $this->description : '');
+ $output = '@license'
+ . ((!empty($this->url)) ? ' ' . $this->url : '')
+ . ((!empty($this->licenseName)) ? ' ' . $this->licenseName : '');
return $output;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/MethodTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/MethodTag.php
new file mode 100644
index 00000000000..fc68c6d9705
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/MethodTag.php
@@ -0,0 +1,98 @@
+<?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\Code\Generator\DocBlock\Tag;
+
+class MethodTag extends AbstractTypeableTag implements TagInterface
+{
+ /**
+ * @var string
+ */
+ protected $methodName = null;
+
+ /**
+ * @var bool
+ */
+ protected $isStatic = false;
+
+ /**
+ * @param string $methodName
+ * @param array $types
+ * @param string $description
+ * @param bool $isStatic
+ */
+ public function __construct($methodName = null, $types = array(), $description = null, $isStatic = false)
+ {
+ if (!empty($methodName)) {
+ $this->setMethodName($methodName);
+ }
+
+ $this->setIsStatic((bool) $isStatic);
+
+ parent::__construct($types, $description);
+ }
+
+ /**
+ * @return string
+ */
+ public function getName()
+ {
+ return 'method';
+ }
+
+ /**
+ * @param boolean $isStatic
+ * @return MethodTag
+ */
+ public function setIsStatic($isStatic)
+ {
+ $this->isStatic = $isStatic;
+ return $this;
+ }
+
+ /**
+ * @return boolean
+ */
+ public function isStatic()
+ {
+ return $this->isStatic;
+ }
+
+ /**
+ * @param string $methodName
+ * @return MethodTag
+ */
+ public function setMethodName($methodName)
+ {
+ $this->methodName = rtrim($methodName, ')(');
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getMethodName()
+ {
+ return $this->methodName;
+ }
+
+ /**
+ * @return string
+ */
+ public function generate()
+ {
+ $output = '@method'
+ . (($this->isStatic) ? ' static' : '')
+ . ((!empty($this->types)) ? ' ' . $this->getTypesAsString() : '')
+ . ((!empty($this->methodName)) ? ' ' . $this->methodName . '()' : '')
+ . ((!empty($this->description)) ? ' ' . $this->description : '');
+
+ return $output;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
index 217d6a5230b..4753eee0781 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
@@ -3,77 +3,110 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Generator\DocBlock\Tag;
-use Zend\Code\Generator\DocBlock\Tag;
-use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionDocBlockTag;
+use Zend\Code\Generator\DocBlock\TagManager;
+use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionTagInterface;
-class ParamTag extends Tag
+class ParamTag extends AbstractTypeableTag implements TagInterface
{
/**
* @var string
*/
- protected $datatype = null;
+ protected $variableName = null;
/**
- * @var string
+ * @param string $variableName
+ * @param array $types
+ * @param string $description
*/
- protected $paramName = null;
+ public function __construct($variableName = null, $types = array(), $description = null)
+ {
+ if (!empty($variableName)) {
+ $this->setVariableName($variableName);
+ }
+
+ parent::__construct($types, $description);
+ }
/**
- * @param ReflectionDocBlockTag $reflectionTagParam
- * @return ParamTag
+ * @param ReflectionTagInterface $reflectionTag
+ * @return ReturnTag
+ * @deprecated Deprecated in 2.3. Use TagManager::createTagFromReflection() instead
*/
- public static function fromReflection(ReflectionDocBlockTag $reflectionTagParam)
+ public static function fromReflection(ReflectionTagInterface $reflectionTag)
{
- $paramTag = new static();
- $paramTag
- ->setName('param')
- ->setDatatype($reflectionTagParam->getType()) // @todo rename
- ->setParamName($reflectionTagParam->getVariableName())
- ->setDescription($reflectionTagParam->getDescription());
+ $tagManager = new TagManager();
+ $tagManager->initializeDefaultTags();
+ return $tagManager->createTagFromReflection($reflectionTag);
+ }
- return $paramTag;
+ /**
+ * @return string
+ */
+ public function getName()
+ {
+ return 'param';
}
/**
- * @param string $datatype
+ * @param string $variableName
* @return ParamTag
*/
- public function setDatatype($datatype)
+ public function setVariableName($variableName)
{
- $this->datatype = $datatype;
+ $this->variableName = ltrim($variableName, '$');
return $this;
}
/**
* @return string
*/
+ public function getVariableName()
+ {
+ return $this->variableName;
+ }
+
+ /**
+ * @param string $datatype
+ * @return ReturnTag
+ * @deprecated Deprecated in 2.3. Use setTypes() instead
+ */
+ public function setDatatype($datatype)
+ {
+ return $this->setTypes($datatype);
+ }
+
+ /**
+ * @return string
+ * @deprecated Deprecated in 2.3. Use getTypes() or getTypesAsString() instead
+ */
public function getDatatype()
{
- return $this->datatype;
+ return $this->getTypesAsString();
}
/**
* @param string $paramName
* @return ParamTag
+ * @deprecated Deprecated in 2.3. Use setVariableName() instead
*/
public function setParamName($paramName)
{
- $this->paramName = $paramName;
- return $this;
+ return $this->setVariableName($paramName);
}
/**
* @return string
+ * @deprecated Deprecated in 2.3. Use getVariableName() instead
*/
public function getParamName()
{
- return $this->paramName;
+ return $this->getVariableName();
}
/**
@@ -81,10 +114,10 @@ class ParamTag extends Tag
*/
public function generate()
{
- $output = '@param '
- . (($this->datatype != null) ? $this->datatype : 'unknown')
- . (($this->paramName != null) ? ' $' . $this->paramName : '')
- . (($this->description != null) ? ' ' . $this->description : '');
+ $output = '@param'
+ . ((!empty($this->types)) ? ' ' . $this->getTypesAsString() : '')
+ . ((!empty($this->variableName)) ? ' $' . $this->variableName : '')
+ . ((!empty($this->description)) ? ' ' . $this->description : '');
return $output;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/PropertyTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/PropertyTag.php
new file mode 100644
index 00000000000..6a1de98f856
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/PropertyTag.php
@@ -0,0 +1,71 @@
+<?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\Code\Generator\DocBlock\Tag;
+
+class PropertyTag extends AbstractTypeableTag implements TagInterface
+{
+ /**
+ * @var string
+ */
+ protected $propertyName = null;
+
+ /**
+ * @param string $propertyName
+ * @param array $types
+ * @param string $description
+ */
+ public function __construct($propertyName = null, $types = array(), $description = null)
+ {
+ if (!empty($propertyName)) {
+ $this->setPropertyName($propertyName);
+ }
+
+ parent::__construct($types, $description);
+ }
+
+ /**
+ * @return string
+ */
+ public function getName()
+ {
+ return 'property';
+ }
+
+ /**
+ * @param string $propertyName
+ * @return self
+ */
+ public function setPropertyName($propertyName)
+ {
+ $this->propertyName = ltrim($propertyName, '$');
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getPropertyName()
+ {
+ return $this->propertyName;
+ }
+
+ /**
+ * @return string
+ */
+ public function generate()
+ {
+ $output = '@property'
+ . ((!empty($this->types)) ? ' ' . $this->getTypesAsString() : '')
+ . ((!empty($this->propertyName)) ? ' $' . $this->propertyName : '')
+ . ((!empty($this->description)) ? ' ' . $this->description : '');
+
+ return $output;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
index dedac3fcb2f..d20155771c6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
@@ -3,53 +3,54 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Generator\DocBlock\Tag;
-use Zend\Code\Generator\DocBlock\Tag;
-use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionDocBlockTag;
+use Zend\Code\Generator\DocBlock\TagManager;
+use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionTagInterface;
-class ReturnTag extends Tag
+class ReturnTag extends AbstractTypeableTag implements TagInterface
{
/**
- * @var string
+ * @param ReflectionTagInterface $reflectionTag
+ * @return ReturnTag
+ * @deprecated Deprecated in 2.3. Use TagManager::createTagFromReflection() instead
*/
- protected $datatype = null;
+ public static function fromReflection(ReflectionTagInterface $reflectionTag)
+ {
+ $tagManager = new TagManager();
+ $tagManager->initializeDefaultTags();
+ return $tagManager->createTagFromReflection($reflectionTag);
+ }
/**
- * @param ReflectionDocBlockTag $reflectionTagReturn
- * @return ReturnTag
+ * @return string
*/
- public static function fromReflection(ReflectionDocBlockTag $reflectionTagReturn)
+ public function getName()
{
- $returnTag = new static();
- $returnTag
- ->setName('return')
- ->setDatatype($reflectionTagReturn->getType()) // @todo rename
- ->setDescription($reflectionTagReturn->getDescription());
-
- return $returnTag;
+ return 'return';
}
/**
- * @param string $datatype
+ * @param string $datatype
* @return ReturnTag
+ * @deprecated Deprecated in 2.3. Use setTypes() instead
*/
public function setDatatype($datatype)
{
- $this->datatype = $datatype;
- return $this;
+ return $this->setTypes($datatype);
}
/**
* @return string
+ * @deprecated Deprecated in 2.3. Use getTypes() or getTypesAsString() instead
*/
public function getDatatype()
{
- return $this->datatype;
+ return $this->getTypesAsString();
}
/**
@@ -57,6 +58,10 @@ class ReturnTag extends Tag
*/
public function generate()
{
- return '@return ' . $this->datatype . ' ' . $this->description;
+ $output = '@return '
+ . $this->getTypesAsString()
+ . ((!empty($this->description)) ? ' ' . $this->description : '');
+
+ return $output;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/TagInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/TagInterface.php
new file mode 100644
index 00000000000..70d46b9b05c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/TagInterface.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Code\Generator\DocBlock\Tag;
+
+use Zend\Code\Generic\Prototype\PrototypeInterface;
+
+interface TagInterface extends PrototypeInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ThrowsTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ThrowsTag.php
new file mode 100644
index 00000000000..20df0b4f1df
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ThrowsTag.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\Code\Generator\DocBlock\Tag;
+
+class ThrowsTag extends AbstractTypeableTag implements TagInterface
+{
+ /**
+ * @return string
+ */
+ public function getName()
+ {
+ return 'throws';
+ }
+
+ /**
+ * @return string
+ */
+ public function generate()
+ {
+ $output = '@throws'
+ . ((!empty($this->types)) ? ' ' . $this->getTypesAsString() : '')
+ . ((!empty($this->description)) ? ' ' . $this->description : '');
+
+ return $output;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/TagManager.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/TagManager.php
new file mode 100644
index 00000000000..00531f65586
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/TagManager.php
@@ -0,0 +1,69 @@
+<?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\Code\Generator\DocBlock;
+
+use Zend\Code\Generator\DocBlock\Tag\TagInterface;
+use Zend\Code\Generic\Prototype\PrototypeClassFactory;
+use Zend\Code\Reflection\DocBlock\Tag\TagInterface as ReflectionTagInterface;
+
+/**
+ * This class is used in DocBlockGenerator and creates the needed
+ * Tag classes depending on the tag. So for example an @author tag
+ * will trigger the creation of an AuthorTag class.
+ *
+ * If none of the classes is applicable, the GenericTag class will be
+ * created
+ */
+class TagManager extends PrototypeClassFactory
+{
+ /**
+ * @return void
+ */
+ public function initializeDefaultTags()
+ {
+ $this->addPrototype(new Tag\ParamTag());
+ $this->addPrototype(new Tag\ReturnTag());
+ $this->addPrototype(new Tag\MethodTag());
+ $this->addPrototype(new Tag\PropertyTag());
+ $this->addPrototype(new Tag\AuthorTag());
+ $this->addPrototype(new Tag\LicenseTag());
+ $this->addPrototype(new Tag\ThrowsTag());
+ $this->setGenericPrototype(new Tag\GenericTag());
+ }
+
+ /**
+ * @param ReflectionTagInterface $reflectionTag
+ * @return TagInterface
+ */
+ public function createTagFromReflection(ReflectionTagInterface $reflectionTag)
+ {
+ $tagName = $reflectionTag->getName();
+
+ /* @var TagInterface $newTag */
+ $newTag = $this->getClonedPrototype($tagName);
+
+ // transport any properties via accessors and mutators from reflection to codegen object
+ $reflectionClass = new \ReflectionClass($reflectionTag);
+ foreach ($reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
+ if (substr($method->getName(), 0, 3) == 'get') {
+ $propertyName = substr($method->getName(), 3);
+ if (method_exists($newTag, 'set' . $propertyName)) {
+ $newTag->{'set' . $propertyName}($reflectionTag->{'get' . $propertyName}());
+ }
+ } elseif (substr($method->getName(), 0, 2) == 'is') {
+ $propertyName = ucfirst($method->getName());
+ if (method_exists($newTag, 'set' . $propertyName)) {
+ $newTag->{'set' . $propertyName}($reflectionTag->{$method->getName()}());
+ }
+ }
+ }
+ return $newTag;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
index 2b7436dd426..1a84335c59f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
@@ -3,13 +3,15 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Generator;
-use Zend\Code\Generator\DocBlock\Tag as DocBlockTag;
+use Zend\Code\Generator\DocBlock\Tag;
+use Zend\Code\Generator\DocBlock\Tag\TagInterface;
+use Zend\Code\Generator\DocBlock\TagManager;
use Zend\Code\Reflection\DocBlockReflection;
class DocBlockGenerator extends AbstractGenerator
@@ -39,6 +41,8 @@ class DocBlockGenerator extends AbstractGenerator
*/
protected $wordwrap = true;
+ protected static $tagManager;
+
/**
* Build a DocBlock generator object from a reflection object
*
@@ -56,7 +60,7 @@ class DocBlockGenerator extends AbstractGenerator
$docBlock->setLongDescription($reflectionDocBlock->getLongDescription());
foreach ($reflectionDocBlock->getTags() as $tag) {
- $docBlock->setTag(DocBlockTag::fromReflection($tag));
+ $docBlock->setTag(self::getTagManager()->createTagFromReflection($tag));
}
return $docBlock;
@@ -82,6 +86,7 @@ class DocBlockGenerator extends AbstractGenerator
switch (strtolower(str_replace(array('.', '-', '_'), '', $name))) {
case 'shortdescription':
$docBlock->setShortDescription($value);
+ break;
case 'longdescription':
$docBlock->setLongDescription($value);
break;
@@ -94,6 +99,15 @@ class DocBlockGenerator extends AbstractGenerator
return $docBlock;
}
+ protected static function getTagManager()
+ {
+ if (!isset(static::$tagManager)) {
+ static::$tagManager = new TagManager();
+ static::$tagManager->initializeDefaultTags();
+ }
+ return static::$tagManager;
+ }
+
/**
* @param string $shortDescription
* @param string $longDescription
@@ -162,17 +176,20 @@ class DocBlockGenerator extends AbstractGenerator
}
/**
- * @param array|DocBlockTag $tag
+ * @param array|TagInterface $tag
* @throws Exception\InvalidArgumentException
* @return DocBlockGenerator
*/
public function setTag($tag)
{
if (is_array($tag)) {
- $tag = new DocBlockTag($tag);
- } elseif (!$tag instanceof DocBlockTag) {
+ // use deprecated Tag class for backward compatiblity to old array-keys
+ $genericTag = new Tag();
+ $genericTag->setOptions($tag);
+ $tag = $genericTag;
+ } elseif (!$tag instanceof TagInterface) {
throw new Exception\InvalidArgumentException(sprintf(
- '%s expects either an array of method options or an instance of %s\DocBlock\Tag',
+ '%s expects either an array of method options or an instance of %s\DocBlock\Tag\TagInterface',
__METHOD__,
__NAMESPACE__
));
@@ -183,7 +200,7 @@ class DocBlockGenerator extends AbstractGenerator
}
/**
- * @return DocBlockTag[]
+ * @return TagInterface[]
*/
public function getTags()
{
@@ -191,10 +208,8 @@ class DocBlockGenerator extends AbstractGenerator
}
/**
- * Set the word wrap
- *
* @param bool $value
- * @return \Zend\Code\Generator\DocBlockGenerator
+ * @return DocBlockGenerator
*/
public function setWordWrap($value)
{
@@ -203,8 +218,6 @@ class DocBlockGenerator extends AbstractGenerator
}
/**
- * Get the word wrap
- *
* @return bool
*/
public function getWordWrap()
@@ -229,6 +242,7 @@ class DocBlockGenerator extends AbstractGenerator
$output .= $ld . self::LINE_FEED . self::LINE_FEED;
}
+ /* @var $tag GeneratorInterface */
foreach ($this->getTags() as $tag) {
$output .= $tag->generate() . self::LINE_FEED;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/ExceptionInterface.php
index 3858c3ef571..226b37ca308 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Code\Generator\Exception;
use Zend\Code\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/InvalidArgumentException.php
index 29b270abb39..0b5cb4c2ee2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ use Zend\Code\Exception;
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/RuntimeException.php
index 698a496470f..7b95186fa2b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ use Zend\Code\Exception;
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php
index b5c112d6f12..27d6b4540f5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -90,8 +90,6 @@ class FileGenerator extends AbstractGenerator
$file->setSourceContent($fileReflection->getContents());
$file->setSourceDirty(false);
- $body = $fileReflection->getContents();
-
$uses = $fileReflection->getUses();
foreach ($fileReflection->getClasses() as $class) {
@@ -103,27 +101,6 @@ class FileGenerator extends AbstractGenerator
}
$file->setClass($phpClass);
-
- $classStartLine = $class->getStartLine(true);
- $classEndLine = $class->getEndLine();
-
- $bodyLines = explode("\n", $body);
- $bodyReturn = array();
- for ($lineNum = 1, $count = count($bodyLines); $lineNum <= $count; $lineNum++) {
- if ($lineNum == $classStartLine) {
- $bodyReturn[] = str_replace(
- '?',
- $class->getName(),
- '/* Zend_Code_Generator_Php_File-ClassMarker: {?} */'
- );
-
- $lineNum = $classEndLine;
- } else {
- $bodyReturn[] = $bodyLines[$lineNum - 1]; // adjust for index -> line conversion
- }
- }
- $body = implode("\n", $bodyReturn);
- unset($bodyLines, $bodyReturn, $classStartLine, $classEndLine);
}
$namespace = $fileReflection->getNamespace();
@@ -139,27 +116,8 @@ class FileGenerator extends AbstractGenerator
if (($fileReflection->getDocComment() != '')) {
$docBlock = $fileReflection->getDocBlock();
$file->setDocBlock(DocBlockGenerator::fromReflection($docBlock));
-
- $bodyLines = explode("\n", $body);
- $bodyReturn = array();
- for ($lineNum = 1, $count = count($bodyLines); $lineNum <= $count; $lineNum++) {
- if ($lineNum == $docBlock->getStartLine()) {
- $bodyReturn[] = str_replace(
- '?',
- $class->getName(),
- '/* Zend_Code_Generator_FileGenerator-DocBlockMarker */'
- );
- $lineNum = $docBlock->getEndLine();
- } else {
- $bodyReturn[] = $bodyLines[$lineNum - 1]; // adjust for index -> line conversion
- }
- }
- $body = implode("\n", $bodyReturn);
- unset($bodyLines, $bodyReturn, $classStartLine, $classEndLine);
}
- $file->setBody($body);
-
return $file;
}
@@ -244,19 +202,6 @@ class FileGenerator extends AbstractGenerator
return $this->requiredFiles;
}
- /**
- * @param array $classes
- * @return FileGenerator
- */
- public function setClasses(array $classes)
- {
- foreach ($classes as $class) {
- $this->setClass($class);
- }
-
- return $this;
- }
-
/**
* @return string
*/
@@ -338,6 +283,19 @@ class FileGenerator extends AbstractGenerator
return $this;
}
+ /**
+ * @param array $classes
+ * @return FileGenerator
+ */
+ public function setClasses(array $classes)
+ {
+ foreach ($classes as $class) {
+ $this->setClass($class);
+ }
+
+ return $this;
+ }
+
/**
* @param string $name
* @return ClassGenerator
@@ -453,14 +411,18 @@ class FileGenerator extends AbstractGenerator
$output = '';
- // start with the body (if there), or open tag
+ // @note body gets populated when FileGenerator created
+ // from a file. @see fromReflection and may also be set
+ // via FileGenerator::setBody
$body = $this->getBody();
+
+ // start with the body (if there), or open tag
if (preg_match('#(?:\s*)<\?php#', $body) == false) {
$output = '<?php' . self::LINE_FEED;
}
// if there are markers, put the body into the output
- if (preg_match('#/\* Zend_Code_Generator_FileGenerator-(.*?)Marker:#', $body)) {
+ if (preg_match('#/\* Zend_Code_Generator_Php_File-(.*?)Marker:#m', $body)) {
$tokens = token_get_all($body);
foreach ($tokens as $token) {
if (is_array($token) && in_array($token[0], array(T_OPEN_TAG, T_COMMENT, T_DOC_COMMENT, T_WHITESPACE))
@@ -475,9 +437,8 @@ class FileGenerator extends AbstractGenerator
if (null !== ($docBlock = $this->getDocBlock())) {
$docBlock->setIndentation('');
- if (preg_match('#/* Zend_Code_Generator_FileGenerator-DocBlockMarker */#', $output)) {
- $output = preg_replace('#/* Zend_CodeGenerator_Php_File-DocBlockMarker */#', $docBlock->generate(),
- $output, 1);
+ if (preg_match('#/\* Zend_Code_Generator_FileGenerator-DocBlockMarker \*/#m', $output)) {
+ $output = preg_replace('#/\* Zend_Code_Generator_FileGenerator-DocBlockMarker \*/#m', $docBlock->generate(), $output, 1);
} else {
$output .= $docBlock->generate() . self::LINE_FEED;
}
@@ -489,7 +450,17 @@ class FileGenerator extends AbstractGenerator
// namespace, if any
$namespace = $this->getNamespace();
if ($namespace) {
- $output .= sprintf('namespace %s;%s', $namespace, str_repeat(self::LINE_FEED, 2));
+ $namespace = sprintf('namespace %s;%s', $namespace, str_repeat(self::LINE_FEED, 2));
+ if (preg_match('#/\* Zend_Code_Generator_FileGenerator-NamespaceMarker \*/#m', $output)) {
+ $output = preg_replace(
+ '#/\* Zend_Code_Generator_FileGenerator-NamespaceMarker \*/#m',
+ $namespace,
+ $output,
+ 1
+ );
+ } else {
+ $output .= $namespace;
+ }
}
// process required files
@@ -503,28 +474,55 @@ class FileGenerator extends AbstractGenerator
$output .= self::LINE_FEED;
}
+ $classes = $this->getClasses();
+ $classUses = array();
+ //build uses array
+ foreach ($classes as $class) {
+ //check for duplicate use statements
+ $uses = $class->getUses();
+ if (!empty($uses) && is_array($uses)) {
+ $classUses = array_merge($classUses, $uses);
+ }
+ }
+
// process import statements
$uses = $this->getUses();
if (!empty($uses)) {
+ $useOutput = '';
+
foreach ($uses as $use) {
list($import, $alias) = $use;
if (null === $alias) {
- $output .= sprintf('use %s;%s', $import, self::LINE_FEED);
+ $tempOutput = sprintf('%s', $import);
} else {
- $output .= sprintf('use %s as %s;%s', $import, $alias, self::LINE_FEED);
+ $tempOutput = sprintf('%s as %s', $import, $alias);
+ }
+
+ //don't duplicate use statements
+ if (!in_array($tempOutput, $classUses)) {
+ $useOutput .= "use ". $tempOutput .";";
+ $useOutput .= self::LINE_FEED;
}
}
- $output .= self::LINE_FEED;
+ $useOutput .= self::LINE_FEED;
+
+ if (preg_match('#/\* Zend_Code_Generator_FileGenerator-UseMarker \*/#m', $output)) {
+ $output = preg_replace(
+ '#/\* Zend_Code_Generator_FileGenerator-UseMarker \*/#m',
+ $useOutput,
+ $output,
+ 1
+ );
+ } else {
+ $output .= $useOutput;
+ }
}
// process classes
- $classes = $this->getClasses();
if (!empty($classes)) {
foreach ($classes as $class) {
- $regex = str_replace('?', $class->getName(),
- '/* Zend_Code_Generator_FileGenerator-ClassMarker: {?} */');
- $regex = preg_quote($regex, '#');
- if (preg_match('#' . $regex . '#', $output)) {
+ $regex = str_replace('&', $class->getName(), '/\* Zend_Code_Generator_Php_File-ClassMarker: \{[A-Za-z0-9\\\]+?&\} \*/');
+ if (preg_match('#' . $regex . '#m', $output)) {
$output = preg_replace('#' . $regex . '#', $class->generate(), $output, 1);
} else {
if ($namespace) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGeneratorRegistry.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGeneratorRegistry.php
index 164cc525435..953cb6bf56e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGeneratorRegistry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGeneratorRegistry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/GeneratorInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/GeneratorInterface.php
index 77e1eb8c803..59e9d3a0e9f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/GeneratorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/GeneratorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/MethodGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/MethodGenerator.php
index a42ba5d00e1..24f67ead84f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/MethodGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/MethodGenerator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -129,13 +129,17 @@ class MethodGenerator extends AbstractMemberGenerator
/**
* @param string $name
* @param array $parameters
- * @param int|array $flags
+ * @param int $flags
* @param string $body
* @param DocBlockGenerator|string $docBlock
*/
- public function __construct($name = null, array $parameters = array(), $flags = self::FLAG_PUBLIC, $body = null,
- $docBlock = null)
- {
+ public function __construct(
+ $name = null,
+ array $parameters = array(),
+ $flags = self::FLAG_PUBLIC,
+ $body = null,
+ $docBlock = null
+ ) {
if ($name) {
$this->setName($name);
}
@@ -260,7 +264,7 @@ class MethodGenerator extends AbstractMemberGenerator
$output .= self::LINE_FEED . $indent . '{' . self::LINE_FEED;
if ($this->body) {
- $output .= preg_replace('#^(.+?)$#m', $indent . $indent . '$1', trim($this->body))
+ $output .= preg_replace('#^((?![a-zA-Z0-9_-]+;).+?)$#m', $indent . $indent . '$1', trim($this->body))
. self::LINE_FEED;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ParameterGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ParameterGenerator.php
index d27276c7e5f..3714565ce74 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ParameterGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ParameterGenerator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -144,9 +144,13 @@ class ParameterGenerator extends AbstractGenerator
* @param int $position
* @param bool $passByReference
*/
- public function __construct($name = null, $type = null, $defaultValue = null, $position = null,
- $passByReference = false)
- {
+ public function __construct(
+ $name = null,
+ $type = null,
+ $defaultValue = null,
+ $position = null,
+ $passByReference = false
+ ) {
if (null !== $name) {
$this->setName($name);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/PropertyGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/PropertyGenerator.php
index 748e58166a4..a5bd0bd7493 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/PropertyGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/PropertyGenerator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -120,9 +120,9 @@ class PropertyGenerator extends AbstractMemberGenerator
}
/**
- * @param string $name
+ * @param string $name
* @param PropertyValueGenerator|string|array $defaultValue
- * @param int|array $flags
+ * @param int $flags
*/
public function __construct($name = null, $defaultValue = null, $flags = self::FLAG_PUBLIC)
{
@@ -171,7 +171,6 @@ class PropertyGenerator extends AbstractMemberGenerator
public function setDefaultValue($defaultValue, $defaultValueType = PropertyValueGenerator::TYPE_AUTO, $defaultValueOutputMode = PropertyValueGenerator::OUTPUT_MULTIPLE_LINE)
{
if (!($defaultValue instanceof PropertyValueGenerator)) {
-
$defaultValue = new PropertyValueGenerator($defaultValue, $defaultValueType, $defaultValueOutputMode);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/PropertyValueGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/PropertyValueGenerator.php
index 91ace7b6b64..bf4156cb4e8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/PropertyValueGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/PropertyValueGenerator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,8 @@ namespace Zend\Code\Generator;
class PropertyValueGenerator extends ValueGenerator
{
+ protected $arrayDepth = 1;
+
/**
* @return string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php
index 1c2b226e2ab..d674023426f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -48,7 +48,7 @@ class ValueGenerator extends AbstractGenerator
/**
* @var int
*/
- protected $arrayDepth = 1;
+ protected $arrayDepth = 0;
/**
* @var string
@@ -73,7 +73,8 @@ class ValueGenerator extends AbstractGenerator
*/
public function __construct($value = null, $type = self::TYPE_AUTO, $outputMode = self::OUTPUT_MULTIPLE_LINE, ArrayObject $constants = null)
{
- if ($value !== null) { // strict check is important here if $type = AUTO
+ // strict check is important here if $type = AUTO
+ if ($value !== null) {
$this->setValue($value);
}
if ($type !== self::TYPE_AUTO) {
@@ -87,7 +88,6 @@ class ValueGenerator extends AbstractGenerator
} else {
$this->constants = new ArrayObject();
}
-
}
/**
@@ -310,22 +310,15 @@ class ValueGenerator extends AbstractGenerator
if ($type == self::TYPE_AUTO) {
$type = $this->getAutoDeterminedType($value);
+ }
- if ($type == self::TYPE_ARRAY) {
- $rii = new \RecursiveIteratorIterator(
- $it = new \RecursiveArrayIterator($value),
- \RecursiveIteratorIterator::SELF_FIRST
- );
- foreach ($rii as $curKey => $curValue) {
- if (!$curValue instanceof ValueGenerator) {
- $curValue = new self($curValue, self::TYPE_AUTO, self::OUTPUT_MULTIPLE_LINE, $this->getConstants());
- $rii->getSubIterator()->offsetSet($curKey, $curValue);
- }
- $curValue->setArrayDepth($rii->getDepth());
+ if ($type == self::TYPE_ARRAY) {
+ foreach ($value as &$curValue) {
+ if ($curValue instanceof self) {
+ continue;
}
- $value = $rii->getSubIterator()->getArrayCopy();
+ $curValue = new self($curValue, self::TYPE_AUTO, self::OUTPUT_MULTIPLE_LINE, $this->getConstants());
}
-
}
$output = '';
@@ -351,12 +344,8 @@ class ValueGenerator extends AbstractGenerator
break;
case self::TYPE_ARRAY:
$output .= 'array(';
- $curArrayMultiblock = false;
- if (count($value) > 1) {
- $curArrayMultiblock = true;
- if ($this->outputMode == self::OUTPUT_MULTIPLE_LINE) {
- $output .= self::LINE_FEED . str_repeat($this->indentation, $this->arrayDepth + 1);
- }
+ if ($this->outputMode == self::OUTPUT_MULTIPLE_LINE) {
+ $output .= self::LINE_FEED . str_repeat($this->indentation, $this->arrayDepth + 1);
}
$outputParts = array();
$noKeyIndex = 0;
@@ -384,17 +373,16 @@ class ValueGenerator extends AbstractGenerator
? self::LINE_FEED . str_repeat($this->indentation, $this->arrayDepth + 1)
: ' ';
$output .= implode(',' . $padding, $outputParts);
- if ($curArrayMultiblock == true && $this->outputMode == self::OUTPUT_MULTIPLE_LINE) {
- $output .= self::LINE_FEED . str_repeat($this->indentation, $this->arrayDepth + 1);
+ if ($this->outputMode == self::OUTPUT_MULTIPLE_LINE) {
+ $output .= self::LINE_FEED . str_repeat($this->indentation, $this->arrayDepth);
}
$output .= ')';
break;
case self::TYPE_OTHER:
default:
- throw new Exception\RuntimeException(sprintf(
- 'Type "%s" is unknown or cannot be used as property default value.',
- get_class($value)
- ));
+ throw new Exception\RuntimeException(
+ sprintf('Type "%s" is unknown or cannot be used as property default value.', get_class($value))
+ );
}
return $output;
@@ -409,7 +397,7 @@ class ValueGenerator extends AbstractGenerator
*/
public static function escape($input, $quote = true)
{
- $output = addcslashes($input, "'");
+ $output = addcslashes($input, "\\'");
// adds quoting strings
if ($quote) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeClassFactory.php b/vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeClassFactory.php
new file mode 100644
index 00000000000..2fcc5f77ad5
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeClassFactory.php
@@ -0,0 +1,121 @@
+<?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\Code\Generic\Prototype;
+
+use Zend\Code\Reflection\Exception;
+
+/**
+ * This is a factory for classes which are identified by name.
+ *
+ * All classes that this factory can supply need to
+ * be registered before (prototypes). This prototypes need to implement
+ * an interface which ensures every prototype has a name.
+ *
+ * If the factory can not supply the class someone is asking for
+ * it tries to fallback on a generic default prototype, which would
+ * have need to be set before.
+ */
+class PrototypeClassFactory
+{
+ /**
+ * @var array
+ */
+ protected $prototypes = array();
+
+ /**
+ * @var PrototypeGenericInterface
+ */
+ protected $genericPrototype = null;
+
+ /**
+ * @param PrototypeInterface[] $prototypes
+ * @param PrototypeGenericInterface $genericPrototype
+ */
+ public function __construct($prototypes = array(), PrototypeGenericInterface $genericPrototype = null)
+ {
+ foreach ((array)$prototypes as $prototype) {
+ $this->addPrototype($prototype);
+ }
+
+ if ($genericPrototype) {
+ $this->setGenericPrototype($genericPrototype);
+ }
+ }
+
+ /**
+ * @param PrototypeInterface $prototype
+ * @throws Exception\InvalidArgumentException
+ */
+ public function addPrototype(PrototypeInterface $prototype)
+ {
+ $prototypeName = $this->normalizeName($prototype->getName());
+
+ if (isset($this->prototypes[$prototypeName])) {
+ throw new Exception\InvalidArgumentException('A prototype with this name already exists in this manager');
+ }
+
+ $this->prototypes[$prototypeName] = $prototype;
+ }
+
+ /**
+ * @param PrototypeGenericInterface $prototype
+ * @throws Exception\InvalidArgumentException
+ */
+ public function setGenericPrototype(PrototypeGenericInterface $prototype)
+ {
+ if (isset($this->genericPrototype)) {
+ throw new Exception\InvalidArgumentException('A default prototype is already set');
+ }
+
+ $this->genericPrototype = $prototype;
+ }
+
+ /**
+ * @param string $name
+ * @return string
+ */
+ protected function normalizeName($name)
+ {
+ return str_replace(array('-', '_'), '', $name);
+ }
+
+ /**
+ * @param string $name
+ * @return bool
+ */
+ public function hasPrototype($name)
+ {
+ $name = $this->normalizeName($name);
+ return isset($this->prototypes[$name]);
+ }
+
+ /**
+ * @param string $prototypeName
+ * @return PrototypeInterface
+ * @throws Exception\RuntimeException
+ */
+ public function getClonedPrototype($prototypeName)
+ {
+ $prototypeName = $this->normalizeName($prototypeName);
+
+ if (!$this->hasPrototype($prototypeName) && !isset($this->genericPrototype)) {
+ throw new Exception\RuntimeException('This tag name is not supported by this tag manager');
+ }
+
+ if (!$this->hasPrototype($prototypeName)) {
+ $newPrototype = clone $this->genericPrototype;
+ $newPrototype->setName($prototypeName);
+ } else {
+ $newPrototype = clone $this->prototypes[$prototypeName];
+ }
+
+ return $newPrototype;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeGenericInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeGenericInterface.php
new file mode 100644
index 00000000000..06a41daef14
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeGenericInterface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Code\Generic\Prototype;
+
+interface PrototypeGenericInterface extends PrototypeInterface
+{
+ /**
+ * @param string $name
+ */
+ public function setName($name);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeInterface.php
new file mode 100644
index 00000000000..acbfb722071
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generic/Prototype/PrototypeInterface.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Code\Generic\Prototype;
+
+interface PrototypeInterface
+{
+ /**
+ * @return string
+ */
+ public function getName();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/NameInformation.php b/vendor/zendframework/zendframework/library/Zend/Code/NameInformation.php
index bae2fc36b8c..5a7166c12c5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/NameInformation.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/NameInformation.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -85,7 +85,6 @@ class NameInformation
} elseif (is_string($use)) {
$this->addUse($use, $as);
}
-
}
return $this;
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ClassReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ClassReflection.php
index 4bbc5b34902..2d7b4ae723d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ClassReflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ClassReflection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -163,7 +163,7 @@ class ClassReflection extends ReflectionClass implements ReflectionInterface
/**
* Get reflection objects of all methods
*
- * @param string $filter
+ * @param int $filter
* @return MethodReflection[]
*/
public function getMethods($filter = -1)
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/AuthorTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/AuthorTag.php
index 9afdee0878c..8b48fbe05ae 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/AuthorTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/AuthorTag.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
index 43473bd3882..6cd1bb62f86 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/GenericTag.php
@@ -3,13 +3,15 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Reflection\DocBlock\Tag;
-class GenericTag implements TagInterface
+use Zend\Code\Generic\Prototype\PrototypeGenericInterface;
+
+class GenericTag implements TagInterface, PrototypeGenericInterface
{
/**
* @var string
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/LicenseTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/LicenseTag.php
index d1148ef6213..ee7ec145083 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/LicenseTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/LicenseTag.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
index 1b002980a6f..7e80861e4b0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/MethodTag.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -108,8 +108,6 @@ class MethodTag implements TagInterface, PhpDocTypedTagInterface
}
/**
- * Is method static
- *
* @return bool
*/
public function isStatic()
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
index b11a16e4ef2..74b8a1d544c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/PhpDocTypedTagInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/PhpDocTypedTagInterface.php
index 01bea4b9d44..19b1119ab79 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/PhpDocTypedTagInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/PhpDocTypedTagInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
index a15ffd21502..9f5b4b92de4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/PropertyTag.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
index f43d7e2e3f9..c9294149c86 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ReturnTag.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/TagInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/TagInterface.php
index 6edc86d3974..653c8844650 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/TagInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/TagInterface.php
@@ -3,19 +3,16 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Reflection\DocBlock\Tag;
-interface TagInterface
-{
- /**
- * @return string
- */
- public function getName();
+use Zend\Code\Generic\Prototype\PrototypeInterface;
+interface TagInterface extends PrototypeInterface
+{
/**
* @param string $content
* @return void
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ThrowsTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ThrowsTag.php
index 25453460fa1..5b57dea52ee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ThrowsTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ThrowsTag.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/TagManager.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/TagManager.php
index 2c987e99842..3a5474db430 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/TagManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/TagManager.php
@@ -3,122 +3,46 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Reflection\DocBlock;
-use Zend\Code\Reflection\DocBlock\Tag\GenericTag;
+use Zend\Code\Generic\Prototype\PrototypeClassFactory;
use Zend\Code\Reflection\DocBlock\Tag\TagInterface;
-use Zend\Code\Reflection\Exception;
-class TagManager
+class TagManager extends PrototypeClassFactory
{
- const USE_DEFAULT_PROTOTYPES = 'default';
-
- /**
- * @var array
- */
- protected $tagNames = array();
-
- /**
- * @var array
- */
- protected $tags = array();
-
- /**
- * @var GenericTag
- */
- protected $genericTag = null;
-
- /**
- * @param TagInterface[] $prototypes
- */
- public function __construct($prototypes = null)
- {
- if (is_array($prototypes)) {
- foreach ($prototypes as $prototype) {
- $this->addTagPrototype($prototype);
- }
- } elseif ($prototypes === self::USE_DEFAULT_PROTOTYPES) {
- $this->useDefaultPrototypes();
- }
- }
-
/**
* @return void
*/
- public function useDefaultPrototypes()
+ public function initializeDefaultTags()
{
- $this->addTagPrototype(new Tag\ParamTag());
- $this->addTagPrototype(new Tag\ReturnTag());
- $this->addTagPrototype(new Tag\MethodTag());
- $this->addTagPrototype(new Tag\PropertyTag());
- $this->addTagPrototype(new Tag\AuthorTag());
- $this->addTagPrototype(new Tag\LicenseTag());
- $this->addTagPrototype(new Tag\ThrowsTag());
- $this->addTagPrototype(new Tag\GenericTag());
+ $this->addPrototype(new Tag\ParamTag());
+ $this->addPrototype(new Tag\ReturnTag());
+ $this->addPrototype(new Tag\MethodTag());
+ $this->addPrototype(new Tag\PropertyTag());
+ $this->addPrototype(new Tag\AuthorTag());
+ $this->addPrototype(new Tag\LicenseTag());
+ $this->addPrototype(new Tag\ThrowsTag());
+ $this->setGenericPrototype(new Tag\GenericTag());
}
/**
- * @param TagInterface $tag
- * @throws Exception\InvalidArgumentException
- */
- public function addTagPrototype(TagInterface $tag)
- {
- $tagName = str_replace(array('-', '_'), '', $tag->getName());
-
- if (in_array($tagName, $this->tagNames)) {
- throw new Exception\InvalidArgumentException('A tag with this name already exists in this manager');
- }
-
- $this->tagNames[] = $tagName;
- $this->tags[] = $tag;
-
- if ($tag instanceof GenericTag) {
- $this->genericTag = $tag;
- }
- }
-
- /**
- * @param string $tagName
- * @return bool
- */
- public function hasTag($tagName)
- {
- // otherwise, only if its name exists as a key
- return in_array(str_replace(array('-', '_'), '', $tagName), $this->tagNames);
- }
-
- /**
- * @param string $tagName
- * @param string $content
- * @return GenericTag
- * @throws Exception\RuntimeException
+ * @param string $tagName
+ * @param string $content
+ * @return TagInterface
*/
public function createTag($tagName, $content = null)
{
- $tagName = str_replace(array('-', '_'), '', $tagName);
-
- if (!$this->hasTag($tagName) && !isset($this->genericTag)) {
- throw new Exception\RuntimeException('This tag name is not supported by this tag manager');
- }
+ /* @var TagInterface $newTag */
+ $newTag = $this->getClonedPrototype($tagName);
- $index = array_search($tagName, $this->tagNames);
-
- /* @var TagInterface $tag */
- $tag = ($index !== false) ? $this->tags[$index] : $this->genericTag;
-
- $newTag = clone $tag;
if ($content) {
$newTag->initialize($content);
}
- if ($newTag instanceof GenericTag) {
- $newTag->setName($tagName);
- }
-
return $newTag;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlockReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlockReflection.php
index 15616da43ef..c43db8ddf9a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlockReflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlockReflection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -73,7 +73,6 @@ class DocBlockReflection implements ReflectionInterface
*/
public static function export()
{
-
}
/**
@@ -84,7 +83,11 @@ class DocBlockReflection implements ReflectionInterface
*/
public function __construct($commentOrReflector, DocBlockTagManager $tagManager = null)
{
- $this->tagManager = $tagManager ? : new DocBlockTagManager(DocBlockTagManager::USE_DEFAULT_PROTOTYPES);
+ if (!$tagManager) {
+ $tagManager = new DocBlockTagManager();
+ $tagManager->initializeDefaultTags();
+ }
+ $this->tagManager = $tagManager;
if ($commentOrReflector instanceof Reflector) {
$this->reflector = $commentOrReflector;
@@ -98,7 +101,6 @@ class DocBlockReflection implements ReflectionInterface
$lineCount = substr_count($this->docComment, "\n");
$this->startLine = $this->reflector->getStartLine() - $lineCount - 1;
$this->endLine = $this->reflector->getStartLine() - 1;
-
} elseif (is_string($commentOrReflector)) {
$this->docComment = $commentOrReflector;
} else {
@@ -249,8 +251,7 @@ class DocBlockReflection implements ReflectionInterface
// create a clean docComment
$this->cleanDocComment = preg_replace("#[ \t]*(?:/\*\*|\*/|\*)[ ]{0,1}(.*)?#", '$1', $docComment);
- $this->cleanDocComment = ltrim($this->cleanDocComment,
- "\r\n"); // @todo should be changed to remove first and last empty line
+ $this->cleanDocComment = ltrim($this->cleanDocComment, "\r\n"); // @todo should be changed to remove first and last empty line
$scanner = new DocBlockScanner($docComment);
$this->shortDescription = ltrim($scanner->getShortDescription());
@@ -268,7 +269,7 @@ class DocBlockReflection implements ReflectionInterface
$str = "DocBlock [ /* DocBlock */ ] {" . PHP_EOL . PHP_EOL;
$str .= " - Tags [" . count($this->tags) . "] {" . PHP_EOL;
- foreach ($this->tags AS $tag) {
+ foreach ($this->tags as $tag) {
$str .= " " . $tag;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/BadMethodCallException.php
index 3e6a93bc885..f40a1992a8c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ use Zend\Code\Exception;
class BadMethodCallException extends Exception\BadMethodCallException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/ExceptionInterface.php
index 9920957b2fd..a3574f839d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Code\Reflection\Exception;
use Zend\Code\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php
index 2a83d9a0bb7..bc816819e8c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ use Zend\Code\Exception;
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/RuntimeException.php
index 4e050bccf82..f538b65e541 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ use Zend\Code\Exception;
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FileReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FileReflection.php
index d48ab943261..d079ba71864 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FileReflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FileReflection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -49,7 +49,7 @@ class FileReflection implements ReflectionInterface
protected $requiredFiles = array();
/**
- * @var ReflectionClass[]
+ * @var ClassReflection[]
*/
protected $classes = array();
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FunctionReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FunctionReflection.php
index 3ef87303728..aed8d58476f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FunctionReflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FunctionReflection.php
@@ -3,17 +3,26 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Reflection;
use ReflectionFunction;
-use Zend\Code\Reflection\DocBlock\Tag\ReturnTag;
class FunctionReflection extends ReflectionFunction implements ReflectionInterface
{
+ /**
+ * Constant use in @MethodReflection to display prototype as an array
+ */
+ const PROTOTYPE_AS_ARRAY = 'prototype_as_array';
+
+ /**
+ * Constant use in @MethodReflection to display prototype as a string
+ */
+ const PROTOTYPE_AS_STRING = 'prototype_as_string';
+
/**
* Get function DocBlock
*
@@ -54,25 +63,102 @@ class FunctionReflection extends ReflectionFunction implements ReflectionInterfa
/**
* Get contents of function
*
- * @param bool $includeDocBlock
+ * @param bool $includeDocBlock
* @return string
*/
public function getContents($includeDocBlock = true)
{
$fileName = $this->getFileName();
-
- if (false === $fileName || ! file_exists($fileName)) {
+ if (false === $fileName) {
return '';
}
- return implode("\n",
- array_splice(
- file($fileName),
- $this->getStartLine($includeDocBlock),
- ($this->getEndLine() - $this->getStartLine()),
- true
- )
+ $startLine = $this->getStartLine();
+ $endLine = $this->getEndLine();
+
+ // eval'd protect
+ if (preg_match('#\((\d+)\) : eval\(\)\'d code$#', $fileName, $matches)) {
+ $fileName = preg_replace('#\(\d+\) : eval\(\)\'d code$#', '', $fileName);
+ $startLine = $endLine = $matches[1];
+ }
+
+ $lines = array_slice(
+ file($fileName, FILE_IGNORE_NEW_LINES),
+ $startLine - 1,
+ ($endLine - ($startLine - 1)),
+ true
);
+
+ $functionLine = implode("\n", $lines);
+
+ $content = '';
+ if ($this->isClosure()) {
+ preg_match('#function\s*\([^\)]*\)\s*(use\s*\([^\)]+\))?\s*\{(.*\;)?\s*\}#s', $functionLine, $matches);
+ if (isset($matches[0])) {
+ $content = $matches[0];
+ }
+ } else {
+ $name = substr($this->getName(), strrpos($this->getName(), '\\')+1);
+ preg_match('#function\s+' . preg_quote($name) . '\s*\([^\)]*\)\s*{([^{}]+({[^}]+})*[^}]+)?}#', $functionLine, $matches);
+ if (isset($matches[0])) {
+ $content = $matches[0];
+ }
+ }
+
+ $docComment = $this->getDocComment();
+
+ return $includeDocBlock && $docComment ? $docComment . "\n" . $content : $content;
+ }
+
+ /**
+ * Get method prototype
+ *
+ * @return array
+ */
+ public function getPrototype($format = FunctionReflection::PROTOTYPE_AS_ARRAY)
+ {
+ $returnType = 'mixed';
+ $docBlock = $this->getDocBlock();
+ if ($docBlock) {
+ $return = $docBlock->getTag('return');
+ $returnTypes = $return->getTypes();
+ $returnType = count($returnTypes) > 1 ? implode('|', $returnTypes) : $returnTypes[0];
+ }
+
+ $prototype = array(
+ 'namespace' => $this->getNamespaceName(),
+ 'name' => substr($this->getName(), strlen($this->getNamespaceName()) + 1),
+ 'return' => $returnType,
+ 'arguments' => array(),
+ );
+
+ $parameters = $this->getParameters();
+ foreach ($parameters as $parameter) {
+ $prototype['arguments'][$parameter->getName()] = array(
+ 'type' => $parameter->getType(),
+ 'required' => !$parameter->isOptional(),
+ 'by_ref' => $parameter->isPassedByReference(),
+ 'default' => $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null,
+ );
+ }
+
+ if ($format == FunctionReflection::PROTOTYPE_AS_STRING) {
+ $line = $prototype['return'] . ' ' . $prototype['name'] . '(';
+ $args = array();
+ foreach ($prototype['arguments'] as $name => $argument) {
+ $argsLine = ($argument['type'] ? $argument['type'] . ' ' : '') . ($argument['by_ref'] ? '&' : '') . '$' . $name;
+ if (!$argument['required']) {
+ $argsLine .= ' = ' . var_export($argument['default'], true);
+ }
+ $args[] = $argsLine;
+ }
+ $line .= implode(', ', $args);
+ $line .= ')';
+
+ return $line;
+ }
+
+ return $prototype;
}
/**
@@ -98,7 +184,7 @@ class FunctionReflection extends ReflectionFunction implements ReflectionInterfa
* Get return type tag
*
* @throws Exception\InvalidArgumentException
- * @return ReturnTag
+ * @return DocBlockReflection
*/
public function getReturn()
{
@@ -110,9 +196,59 @@ class FunctionReflection extends ReflectionFunction implements ReflectionInterfa
}
$tag = $docBlock->getTag('return');
+
return new DocBlockReflection('@return ' . $tag->getDescription());
}
+ /**
+ * Get method body
+ *
+ * @return string|bool
+ */
+ public function getBody()
+ {
+ $fileName = $this->getFileName();
+ if (false === $fileName) {
+ throw new Exception\InvalidArgumentException(
+ 'Cannot determine internals functions body'
+ );
+ }
+
+ $startLine = $this->getStartLine();
+ $endLine = $this->getEndLine();
+
+ // eval'd protect
+ if (preg_match('#\((\d+)\) : eval\(\)\'d code$#', $fileName, $matches)) {
+ $fileName = preg_replace('#\(\d+\) : eval\(\)\'d code$#', '', $fileName);
+ $startLine = $endLine = $matches[1];
+ }
+
+ $lines = array_slice(
+ file($fileName, FILE_IGNORE_NEW_LINES),
+ $startLine - 1,
+ ($endLine - ($startLine - 1)),
+ true
+ );
+
+ $functionLine = implode("\n", $lines);
+
+ $body = false;
+ if ($this->isClosure()) {
+ preg_match('#function\s*\([^\)]*\)\s*(use\s*\([^\)]+\))?\s*\{(.*\;)\s*\}#s', $functionLine, $matches);
+ if (isset($matches[2])) {
+ $body = $matches[2];
+ }
+ } else {
+ $name = substr($this->getName(), strrpos($this->getName(), '\\')+1);
+ preg_match('#function\s+' . $name . '\s*\([^\)]*\)\s*{([^{}]+({[^}]+})*[^}]+)}#', $functionLine, $matches);
+ if (isset($matches[1])) {
+ $body = $matches[1];
+ }
+ }
+
+ return $body;
+ }
+
public function toString()
{
return $this->__toString();
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/MethodReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/MethodReflection.php
index b9570c91187..051d59a4e20 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/MethodReflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/MethodReflection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,6 +16,16 @@ use Zend\Code\Scanner\CachingFileScanner;
class MethodReflection extends PhpReflectionMethod implements ReflectionInterface
{
+ /**
+ * Constant use in @MethodReflection to display prototype as an array
+ */
+ const PROTOTYPE_AS_ARRAY = 'prototype_as_array';
+
+ /**
+ * Constant use in @MethodReflection to display prototype as a string
+ */
+ const PROTOTYPE_AS_STRING = 'prototype_as_string';
+
/**
* @var AnnotationScanner
*/
@@ -94,6 +104,60 @@ class MethodReflection extends PhpReflectionMethod implements ReflectionInterfac
return $zendReflection;
}
+ /**
+ * Get method prototype
+ *
+ * @return array
+ */
+ public function getPrototype($format = MethodReflection::PROTOTYPE_AS_ARRAY)
+ {
+ $returnType = 'mixed';
+ $docBlock = $this->getDocBlock();
+ if ($docBlock) {
+ $return = $docBlock->getTag('return');
+ $returnTypes = $return->getTypes();
+ $returnType = count($returnTypes) > 1 ? implode('|', $returnTypes) : $returnTypes[0];
+ }
+
+ $declaringClass = $this->getDeclaringClass();
+ $prototype = array(
+ 'namespace' => $declaringClass->getNamespaceName(),
+ 'class' => substr($declaringClass->getName(), strlen($declaringClass->getNamespaceName()) + 1),
+ 'name' => $this->getName(),
+ 'visibility' => ($this->isPublic() ? 'public' : ($this->isPrivate() ? 'private' : 'protected')),
+ 'return' => $returnType,
+ 'arguments' => array(),
+ );
+
+ $parameters = $this->getParameters();
+ foreach ($parameters as $parameter) {
+ $prototype['arguments'][$parameter->getName()] = array(
+ 'type' => $parameter->getType(),
+ 'required' => !$parameter->isOptional(),
+ 'by_ref' => $parameter->isPassedByReference(),
+ 'default' => $parameter->isDefaultValueAvailable() ? $parameter->getDefaultValue() : null,
+ );
+ }
+
+ if ($format == MethodReflection::PROTOTYPE_AS_STRING) {
+ $line = $prototype['visibility'] . ' ' . $prototype['return'] . ' ' . $prototype['name'] . '(';
+ $args = array();
+ foreach ($prototype['arguments'] as $name => $argument) {
+ $argsLine = ($argument['type'] ? $argument['type'] . ' ' : '') . ($argument['by_ref'] ? '&' : '') . '$' . $name;
+ if (!$argument['required']) {
+ $argsLine .= ' = ' . var_export($argument['default'], true);
+ }
+ $args[] = $argsLine;
+ }
+ $line .= implode(', ', $args);
+ $line .= ')';
+
+ return $line;
+ }
+
+ return $prototype;
+ }
+
/**
* Get all method parameter reflection objects
*
@@ -104,9 +168,8 @@ class MethodReflection extends PhpReflectionMethod implements ReflectionInterfac
$phpReflections = parent::getParameters();
$zendReflections = array();
while ($phpReflections && ($phpReflection = array_shift($phpReflections))) {
- $instance = new ParameterReflection(array(
- $this->getDeclaringClass()->getName(),
- $this->getName()),
+ $instance = new ParameterReflection(
+ array($this->getDeclaringClass()->getName(), $this->getName()),
$phpReflection->getName()
);
$zendReflections[] = $instance;
@@ -121,57 +184,280 @@ class MethodReflection extends PhpReflectionMethod implements ReflectionInterfac
* Get method contents
*
* @param bool $includeDocBlock
- * @return string
+ * @return string|bool
*/
public function getContents($includeDocBlock = true)
{
- $fileName = $this->getFileName();
-
- if ((class_exists($this->class) && !$fileName) || ! file_exists($fileName)) {
- return ''; // probably from eval'd code, return empty
- }
-
- $fileContents = file($fileName);
- $startNum = $this->getStartLine($includeDocBlock);
- $endNum = ($this->getEndLine() - $this->getStartLine());
+ $docComment = $this->getDocComment();
+ $content = ($includeDocBlock && !empty($docComment)) ? $docComment . "\n" : '';
+ $content .= $this->extractMethodContents();
- return implode("\n", array_splice($fileContents, $startNum, $endNum, true));
+ return $content;
}
/**
* Get method body
*
- * @return string
+ * @return string|bool
*/
public function getBody()
+ {
+ return $this->extractMethodContents(true);
+ }
+
+ /**
+ * Tokenize method string and return concatenated body
+ *
+ * @param bool $bodyOnly
+ * @return string
+ */
+ protected function extractMethodContents($bodyOnly = false)
{
$fileName = $this->getDeclaringClass()->getFileName();
- if (false === $fileName || ! file_exists($fileName)) {
+ if ((class_exists($this->class) && false === $fileName) || ! file_exists($fileName)) {
return '';
}
$lines = array_slice(
file($fileName, FILE_IGNORE_NEW_LINES),
- $this->getStartLine(),
- ($this->getEndLine() - $this->getStartLine()),
+ $this->getStartLine() - 1,
+ ($this->getEndLine() - ($this->getStartLine() - 1)),
true
);
- $firstLine = array_shift($lines);
+ $functionLine = implode("\n", $lines);
+ $tokens = token_get_all("<?php ". $functionLine);
+
+ //remove first entry which is php open tag
+ array_shift($tokens);
- if (trim($firstLine) !== '{') {
- array_unshift($lines, $firstLine);
+ if (!count($tokens)) {
+ return '';
+ }
+
+ $capture = false;
+ $firstBrace = false;
+ $body = '';
+
+ foreach ($tokens as $key => $token) {
+ $tokenType = (is_array($token)) ? token_name($token[0]) : $token;
+ $tokenValue = (is_array($token)) ? $token[1] : $token;
+
+ switch ($tokenType) {
+ case "T_FINAL":
+ case "T_ABSTRACT":
+ case "T_PUBLIC":
+ case "T_PROTECTED":
+ case "T_PRIVATE":
+ case "T_STATIC":
+ case "T_FUNCTION":
+ // check to see if we have a valid function
+ // then check if we are inside function and have a closure
+ if ($this->isValidFunction($tokens, $key, $this->getName())) {
+ if ($bodyOnly === false) {
+ //if first instance of tokenType grab prefixed whitespace
+ //and append to body
+ if ($capture === false) {
+ $body .= $this->extractPrefixedWhitespace($tokens, $key);
+ }
+ $body .= $tokenValue;
+ }
+
+ $capture = true;
+ } else {
+ //closure test
+ if ($firstBrace && $tokenType == "T_FUNCTION") {
+ $body .= $tokenValue;
+ continue;
+ }
+ $capture = false;
+ continue;
+ }
+ break;
+
+ case "{":
+ if ($capture === false) {
+ continue;
+ }
+
+ if ($firstBrace === false) {
+ $firstBrace = true;
+ if ($bodyOnly === true) {
+ continue;
+ }
+ }
+
+ $body .= $tokenValue;
+ break;
+
+ case "}":
+ if ($capture === false) {
+ continue;
+ }
+
+ //check to see if this is the last brace
+ if ($this->isEndingBrace($tokens, $key)) {
+ //capture the end brace if not bodyOnly
+ if ($bodyOnly === false) {
+ $body .= $tokenValue;
+ }
+
+ break 2;
+ }
+
+ $body .= $tokenValue;
+ break;
+
+ default:
+ if ($capture === false) {
+ continue;
+ }
+
+ // if returning body only wait for first brace before capturing
+ if ($bodyOnly === true && $firstBrace !== true) {
+ continue;
+ }
+
+ $body .= $tokenValue;
+ break;
+ }
+ }
+
+ //remove ending whitespace and return
+ return rtrim($body);
+ }
+
+ /**
+ * Take current position and find any whitespace
+ *
+ * @param $haystack
+ * @param $position
+ * @return string
+ */
+ protected function extractPrefixedWhitespace($haystack, $position)
+ {
+ $content = '';
+ $count = count($haystack);
+ if ($position+1 == $count) {
+ return $content;
}
- $lastLine = array_pop($lines);
+ for ($i = $position-1;$i >= 0;$i--) {
+ $tokenType = (is_array($haystack[$i])) ? token_name($haystack[$i][0]) : $haystack[$i];
+ $tokenValue = (is_array($haystack[$i])) ? $haystack[$i][1] : $haystack[$i];
+
+ //search only for whitespace
+ if ($tokenType == "T_WHITESPACE") {
+ $content .= $tokenValue;
+ } else {
+ break;
+ }
+ }
+
+ return $content;
+ }
- if (trim($lastLine) !== '}') {
- array_push($lines, $lastLine);
+ /**
+ * Test for ending brace
+ *
+ * @param $haystack
+ * @param $position
+ * @return bool
+ */
+ protected function isEndingBrace($haystack, $position)
+ {
+ $count = count($haystack);
+
+ //advance one position
+ $position = $position+1;
+
+ if ($position == $count) {
+ return true;
+ }
+
+ for ($i = $position;$i < $count; $i++) {
+ $tokenType = (is_array($haystack[$i])) ? token_name($haystack[$i][0]) : $haystack[$i];
+ switch ($tokenType) {
+ case "T_FINAL":
+ case "T_ABSTRACT":
+ case "T_PUBLIC":
+ case "T_PROTECTED":
+ case "T_PRIVATE":
+ case "T_STATIC":
+ return true;
+
+ case "T_FUNCTION":
+ // If a function is encountered and that function is not a closure
+ // then return true. otherwise the function is a closure, return false
+ if ($this->isValidFunction($haystack, $i)) {
+ return true;
+ }
+ return false;
+
+ case "}":
+ case ";";
+ case "T_BREAK":
+ case "T_CATCH":
+ case "T_DO":
+ case "T_ECHO":
+ case "T_ELSE":
+ case "T_ELSEIF":
+ case "T_EVAL":
+ case "T_EXIT":
+ case "T_FINALLY":
+ case "T_FOR":
+ case "T_FOREACH":
+ case "T_GOTO":
+ case "T_IF":
+ case "T_INCLUDE":
+ case "T_INCLUDE_ONCE":
+ case "T_PRINT":
+ case "T_STRING":
+ case "T_STRING_VARNAME":
+ case "T_THROW":
+ case "T_USE":
+ case "T_VARIABLE":
+ case "T_WHILE":
+ case "T_YIELD":
+
+ return false;
+ }
+ }
+ }
+
+ /**
+ * Test to see if current position is valid function or
+ * closure. Returns true if it's a function and NOT a closure
+ *
+ * @param $haystack
+ * @param $position
+ * @return bool
+ */
+ protected function isValidFunction($haystack, $position, $functionName = null)
+ {
+ $isValid = false;
+ $count = count($haystack);
+ for ($i = $position+1; $i < $count; $i++) {
+ $tokenType = (is_array($haystack[$i])) ? token_name($haystack[$i][0]) : $haystack[$i];
+ $tokenValue = (is_array($haystack[$i])) ? $haystack[$i][1] : $haystack[$i];
+
+ //check for occurance of ( or
+ if ($tokenType == "T_STRING") {
+ //check to see if function name is passed, if so validate against that
+ if ($functionName !== null && $tokenValue != $functionName) {
+ $isValid = false;
+ break;
+ }
+
+ $isValid = true;
+ break;
+ } elseif ($tokenValue == "(") {
+ break;
+ }
}
- // just in case we had code on the bracket lines
- return rtrim(ltrim(implode("\n", $lines), '{'), '}');
+ return $isValid;
}
public function toString()
@@ -192,7 +478,7 @@ class MethodReflection extends PhpReflectionMethod implements ReflectionInterfac
*
* @param string $filename
*
- * @return FileScanner
+ * @return CachingFileScanner
*/
protected function createFileScanner($filename)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ParameterReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ParameterReflection.php
index e6239abce72..77e72c057ca 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ParameterReflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ParameterReflection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/PropertyReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/PropertyReflection.php
index cbf2dff13f1..8d9ce4975bc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/PropertyReflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/PropertyReflection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -102,7 +102,7 @@ class PropertyReflection extends PhpReflectionProperty implements ReflectionInte
*
* @param string $filename
*
- * @return FileScanner
+ * @return CachingFileScanner
*/
protected function createFileScanner($filename)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ReflectionInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ReflectionInterface.php
index 3298d4e6c44..a081cf71d26 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ReflectionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ReflectionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,5 +13,8 @@ use Reflector;
interface ReflectionInterface extends Reflector
{
+ /**
+ * @return string
+ */
public function toString();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/AggregateDirectoryScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/AggregateDirectoryScanner.php
index f7f1549f9d1..629d7f903ca 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/AggregateDirectoryScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/AggregateDirectoryScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -114,17 +114,4 @@ class AggregateDirectoryScanner extends DirectoryScanner
$scannerClass = new FunctionScanner();
// @todo
}
-
- /*
- public static function export()
- {
- // @todo
- }
-
- public function __toString()
- {
- // @todo
- }
- */
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/AnnotationScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/AnnotationScanner.php
index fdb0641c53e..5410c025682 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/AnnotationScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/AnnotationScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -46,9 +46,11 @@ class AnnotationScanner extends AnnotationCollection implements ScannerInterface
* @param NameInformation $nameInformation
* @return AnnotationScanner
*/
- public function __construct(AnnotationManager $annotationManager, $docComment,
- NameInformation $nameInformation = null)
- {
+ public function __construct(
+ AnnotationManager $annotationManager,
+ $docComment,
+ NameInformation $nameInformation = null
+ ) {
$this->annotationManager = $annotationManager;
$this->docComment = $docComment;
$this->nameInformation = $nameInformation;
@@ -87,10 +89,12 @@ class AnnotationScanner extends AnnotationCollection implements ScannerInterface
$class = $this->nameInformation->resolveName($class);
$annotations[$annotationIndex] = array($class, null);
goto SCANNER_CONTINUE;
+ // goto no break needed
case 'ANNOTATION_CONTENT_START':
$annotations[$annotationIndex][1] = '';
+ //fall-through
case 'ANNOTATION_CONTENT_END':
case 'ANNOTATION_CONTENT':
@@ -156,13 +160,11 @@ class AnnotationScanner extends AnnotationCollection implements ScannerInterface
}
$currentChar = $stream[$streamIndex];
$matches = array();
- $currentLine = (preg_match('#(.*)\n#', $stream, $matches, null,
- $streamIndex) === 1) ? $matches[1] : substr($stream, $streamIndex);
+ $currentLine = (preg_match('#(.*)\n#', $stream, $matches, null, $streamIndex) === 1) ? $matches[1] : substr($stream, $streamIndex);
if ($currentChar === ' ') {
$currentWord = (preg_match('#( +)#', $currentLine, $matches) === 1) ? $matches[1] : $currentLine;
} else {
- $currentWord = (($matches = strpos($currentLine, ' ')) !== false) ? substr($currentLine, 0,
- $matches) : $currentLine;
+ $currentWord = (($matches = strpos($currentLine, ' ')) !== false) ? substr($currentLine, 0, $matches) : $currentLine;
}
return $currentChar;
@@ -221,7 +223,6 @@ class AnnotationScanner extends AnnotationCollection implements ScannerInterface
}
goto TOKENIZER_TOP;
}
-
}
if ($currentChar === "\n") {
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/CachingFileScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/CachingFileScanner.php
index 9da4156a9c6..deef2440f51 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/CachingFileScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/CachingFileScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -26,7 +26,7 @@ class CachingFileScanner extends FileScanner
protected $fileScanner = null;
/**
- * @param array|null $file
+ * @param string $file
* @param AnnotationManager $annotationManager
* @throws Exception\InvalidArgumentException
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ClassScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ClassScanner.php
index b872ffeff25..8680c494821 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ClassScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ClassScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -401,7 +401,7 @@ class ClassScanner implements ScannerInterface
/**
* Return a list of properties
*
- * @return PropertyScanner
+ * @return PropertyScanner[]
*/
public function getProperties()
{
@@ -554,6 +554,7 @@ class ClassScanner implements ScannerInterface
// @todo find a way to test this
die('Massive Failure, test this');
}
+
$m = new MethodScanner(
array_slice($this->tokens, $info['tokenStart'], $info['tokenEnd'] - $info['tokenStart'] + 1),
$this->nameInformation
@@ -643,8 +644,10 @@ class ClassScanner implements ScannerInterface
if (is_string($token)) {
$tokenType = null;
$tokenContent = $token;
- $tokenLine = $tokenLine + substr_count($lastTokenArray[1],
- "\n"); // adjust token line by last known newline count
+ $tokenLine = $tokenLine + substr_count(
+ $lastTokenArray[1],
+ "\n"
+ ); // adjust token line by last known newline count
} else {
$lastTokenArray = $token;
list($tokenType, $tokenContent, $tokenLine) = $token;
@@ -675,6 +678,7 @@ class ClassScanner implements ScannerInterface
$this->docComment = $tokenContent;
goto SCANNER_CONTINUE;
+ //goto no break needed
case T_FINAL:
case T_ABSTRACT:
@@ -699,13 +703,16 @@ class ClassScanner implements ScannerInterface
case T_FINAL:
$this->isFinal = true;
goto SCANNER_CLASS_INFO_CONTINUE;
+ //goto no break needed
case T_ABSTRACT:
$this->isAbstract = true;
goto SCANNER_CLASS_INFO_CONTINUE;
+ //goto no break needed
case T_INTERFACE:
$this->isInterface = true;
+ //fall-through
case T_CLASS:
$this->shortName = $tokens[$tokenIndex + 2][1];
if ($this->nameInformation && $this->nameInformation->hasNamespace()) {
@@ -714,6 +721,7 @@ class ClassScanner implements ScannerInterface
$this->name = $this->shortName;
}
goto SCANNER_CLASS_INFO_CONTINUE;
+ //goto no break needed
case T_NS_SEPARATOR:
case T_STRING:
@@ -726,6 +734,7 @@ class ClassScanner implements ScannerInterface
break;
}
goto SCANNER_CLASS_INFO_CONTINUE;
+ //goto no break needed
case T_EXTENDS:
case T_IMPLEMENTS:
@@ -736,6 +745,7 @@ class ClassScanner implements ScannerInterface
$this->shortParentClass = '';
}
goto SCANNER_CLASS_INFO_CONTINUE;
+ //goto no break needed
case null:
if ($classContext == T_IMPLEMENTS && $tokenContent == ',') {
@@ -759,7 +769,6 @@ class ClassScanner implements ScannerInterface
}
if ($tokenType === null && $tokenContent === '{' && $braceCount === 0) {
-
$braceCount++;
if ($MACRO_TOKEN_ADVANCE() === false) {
goto SCANNER_END;
@@ -806,6 +815,7 @@ class ClassScanner implements ScannerInterface
$MACRO_INFO_ADVANCE();
goto SCANNER_CLASS_BODY_CONTINUE;
+ //goto no break needed
case T_DOC_COMMENT:
case T_PUBLIC:
@@ -836,9 +846,14 @@ class ClassScanner implements ScannerInterface
$methodBodyStarted = true;
$braceCount++;
goto SCANNER_CLASS_BODY_MEMBER_CONTINUE;
+ //goto no break needed
case '}':
$braceCount--;
goto SCANNER_CLASS_BODY_MEMBER_CONTINUE;
+
+ case ';':
+ $infos[$infoIndex]['tokenEnd'] = $tokenIndex;
+ goto SCANNER_CLASS_BODY_MEMBER_CONTINUE;
}
}
@@ -852,13 +867,13 @@ class ClassScanner implements ScannerInterface
}
}
-
switch ($tokenType) {
case T_CONST:
$memberContext = 'constant';
$infos[$infoIndex]['type'] = 'constant';
goto SCANNER_CLASS_BODY_CONST_CONTINUE;
+ //goto no break needed
case T_VARIABLE:
if ($memberContext === null) {
@@ -867,17 +882,20 @@ class ClassScanner implements ScannerInterface
$infos[$infoIndex]['name'] = ltrim($tokenContent, '$');
}
goto SCANNER_CLASS_BODY_MEMBER_CONTINUE;
+ //goto no break needed
case T_FUNCTION:
$memberContext = 'method';
$infos[$infoIndex]['type'] = 'method';
goto SCANNER_CLASS_BODY_MEMBER_CONTINUE;
+ //goto no break needed
case T_STRING:
if ($memberContext === 'method' && null === $infos[$infoIndex]['name']) {
$infos[$infoIndex]['name'] = $tokenContent;
}
goto SCANNER_CLASS_BODY_MEMBER_CONTINUE;
+ //goto no break needed
}
SCANNER_CLASS_BODY_MEMBER_CONTINUE:
@@ -892,6 +910,7 @@ class ClassScanner implements ScannerInterface
$memberContext = null;
$MACRO_INFO_ADVANCE();
goto SCANNER_CLASS_BODY_CONTINUE;
+ //goto no break needed
case null: // no type, is a string
@@ -899,6 +918,7 @@ class ClassScanner implements ScannerInterface
case '{':
$braceCount++;
goto SCANNER_CLASS_BODY_CONTINUE;
+ //fall-through
case '}':
$braceCount--;
goto SCANNER_CLASS_BODY_CONTINUE;
@@ -915,7 +935,6 @@ class ClassScanner implements ScannerInterface
SCANNER_CLASS_BODY_END:
goto SCANNER_CONTINUE;
-
}
SCANNER_CONTINUE:
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ConstantScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ConstantScanner.php
index ddff716ccf9..f2a81da5183 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ConstantScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ConstantScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -180,6 +180,7 @@ class ConstantScanner implements ScannerInterface
$this->docComment = $tokenContent;
}
goto SCANNER_CONTINUE;
+ // fall-through
case T_STRING:
$string = (is_string($token)) ? $token : $tokenContent;
@@ -201,6 +202,7 @@ class ConstantScanner implements ScannerInterface
}
goto SCANNER_CONTINUE;
+ // fall-through
case T_CONSTANT_ENCAPSED_STRING:
case T_DNUMBER:
@@ -213,6 +215,7 @@ class ConstantScanner implements ScannerInterface
$this->value = $string;
}
goto SCANNER_CONTINUE;
+ // fall-trough
default:
goto SCANNER_CONTINUE;
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DerivedClassScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DerivedClassScanner.php
index 6c8463ede28..a7c7f37fd8c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DerivedClassScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DerivedClassScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DirectoryScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DirectoryScanner.php
index b1a0223daa3..33120ff703a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DirectoryScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DirectoryScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DocBlockScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DocBlockScanner.php
index fd76728a987..b367849bc85 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DocBlockScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DocBlockScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -130,6 +130,7 @@ class DocBlockScanner implements ScannerInterface
$this->longDescription .= $token[1];
}
goto SCANNER_CONTINUE;
+ //goto no break needed
case 'DOCBLOCK_WHITESPACE':
case 'DOCBLOCK_TEXT':
@@ -144,6 +145,7 @@ class DocBlockScanner implements ScannerInterface
}
goto SCANNER_CONTINUE;
}
+ //gotos no break needed
case 'DOCBLOCK_TAG':
array_push($this->tags, array('name' => $token[1],
'value' => ''));
@@ -151,6 +153,7 @@ class DocBlockScanner implements ScannerInterface
$tagIndex = key($this->tags);
$mode = 3;
goto SCANNER_CONTINUE;
+ //goto no break needed
case 'DOCBLOCK_COMMENTEND':
goto SCANNER_END;
@@ -197,8 +200,7 @@ class DocBlockScanner implements ScannerInterface
}
$currentChar = $stream[$streamIndex];
$matches = array();
- $currentLine = (preg_match('#(.*?)\r?\n#', $stream, $matches, null,
- $streamIndex) === 1) ? $matches[1] : substr($stream, $streamIndex);
+ $currentLine = (preg_match('#(.*?)\r?\n#', $stream, $matches, null, $streamIndex) === 1) ? $matches[1] : substr($stream, $streamIndex);
if ($currentChar === ' ') {
$currentWord = (preg_match('#( +)#', $currentLine, $matches) === 1) ? $matches[1] : $currentLine;
} else {
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/FileScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/FileScanner.php
index 40d2182f04a..e462f727575 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/FileScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/FileScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -37,7 +37,7 @@ class FileScanner extends TokenArrayScanner implements ScannerInterface
}
/**
- * @return null|string
+ * @return string
*/
public function getFile()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/FunctionScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/FunctionScanner.php
index dbb082b23bc..d1fd2198cbd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/FunctionScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/FunctionScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/MethodScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/MethodScanner.php
index 6ff4f9be9b1..3724fa4713c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/MethodScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/MethodScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -387,8 +387,10 @@ class MethodScanner implements ScannerInterface
if (is_string($token)) {
$tokenType = null;
$tokenContent = $token;
- $tokenLine = $tokenLine + substr_count($lastTokenArray[1],
- "\n"); // adjust token line by last known newline count
+ $tokenLine = $tokenLine + substr_count(
+ $lastTokenArray[1],
+ "\n"
+ ); // adjust token line by last known newline count
} else {
list($tokenType, $tokenContent, $tokenLine) = $token;
}
@@ -432,32 +434,39 @@ class MethodScanner implements ScannerInterface
$this->docComment = $tokenContent;
}
goto SCANNER_CONTINUE_SIGNATURE;
+ //goto (no break needed);
case T_FINAL:
$this->isFinal = true;
goto SCANNER_CONTINUE_SIGNATURE;
+ //goto (no break needed);
case T_ABSTRACT:
$this->isAbstract = true;
goto SCANNER_CONTINUE_SIGNATURE;
+ //goto (no break needed);
case T_PUBLIC:
// use defaults
goto SCANNER_CONTINUE_SIGNATURE;
+ //goto (no break needed);
case T_PROTECTED:
$this->isProtected = true;
$this->isPublic = false;
goto SCANNER_CONTINUE_SIGNATURE;
+ //goto (no break needed);
case T_PRIVATE:
$this->isPrivate = true;
$this->isPublic = false;
goto SCANNER_CONTINUE_SIGNATURE;
+ //goto (no break needed);
case T_STATIC:
$this->isStatic = true;
goto SCANNER_CONTINUE_SIGNATURE;
+ //goto (no break needed);
case T_VARIABLE:
case T_STRING:
@@ -476,6 +485,7 @@ class MethodScanner implements ScannerInterface
}
goto SCANNER_CONTINUE_SIGNATURE;
+ //goto (no break needed);
case null:
@@ -485,12 +495,14 @@ class MethodScanner implements ScannerInterface
$MACRO_INFO_START();
}
goto SCANNER_CONTINUE_SIGNATURE;
+ //goto (no break needed);
case '(':
$parentCount++;
goto SCANNER_CONTINUE_SIGNATURE;
+ //goto (no break needed);
case ')':
$parentCount--;
- if($parentCount > 0) {
+ if ($parentCount > 0) {
goto SCANNER_CONTINUE_SIGNATURE;
}
if ($parentCount === 0) {
@@ -500,6 +512,7 @@ class MethodScanner implements ScannerInterface
$context = 'body';
}
goto SCANNER_CONTINUE_BODY;
+ //goto (no break needed);
case ',':
if ($parentCount === 1) {
$MACRO_INFO_ADVANCE();
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ParameterScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ParameterScanner.php
index caf485f1350..d61300605ca 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ParameterScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ParameterScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -192,7 +192,6 @@ class ParameterScanner
$this->name = ltrim($token[1], '$');
goto SCANNER_CONTINUE;
}
-
}
if ($this->name !== null) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/PropertyScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/PropertyScanner.php
index 2f832daa712..a5a08651f5b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/PropertyScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/PropertyScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,6 +15,12 @@ use Zend\Code\NameInformation;
class PropertyScanner implements ScannerInterface
{
+ const T_BOOLEAN = "boolean";
+ const T_INTEGER = "int";
+ const T_STRING = "string";
+ const T_ARRAY = "array";
+ const T_UNKNOWN = "unknown";
+
/**
* @var bool
*/
@@ -80,6 +86,11 @@ class PropertyScanner implements ScannerInterface
*/
protected $value;
+ /**
+ * @var string
+ */
+ protected $valueType;
+
/**
* Constructor
*
@@ -125,6 +136,14 @@ class PropertyScanner implements ScannerInterface
return $this->name;
}
+ /**
+ * @return string
+ */
+ public function getValueType()
+ {
+ return $this->valueType;
+ }
+
/**
* @return bool
*/
@@ -219,66 +238,79 @@ class PropertyScanner implements ScannerInterface
/**
* Variables & Setup
*/
- $tokens = &$this->tokens;
+ $value = '';
+ $concatenateValue = false;
+ $tokens = &$this->tokens;
reset($tokens);
- SCANNER_TOP:
+ foreach ($tokens as $token) {
+ $tempValue = $token;
+ if (!is_string($token)) {
+ list($tokenType, $tokenContent, $tokenLine) = $token;
- $token = current($tokens);
-
- if (!is_string($token)) {
- list($tokenType, $tokenContent, $tokenLine) = $token;
-
- switch ($tokenType) {
- case T_DOC_COMMENT:
- if ($this->docComment === null && $this->name === null) {
- $this->docComment = $tokenContent;
- }
- goto SCANNER_CONTINUE;
-
- case T_VARIABLE:
- $this->name = ltrim($tokenContent, '$');
- goto SCANNER_CONTINUE;
-
- case T_PUBLIC:
- // use defaults
- goto SCANNER_CONTINUE;
-
- case T_PROTECTED:
- $this->isProtected = true;
- $this->isPublic = false;
- goto SCANNER_CONTINUE;
+ switch ($tokenType) {
+ case T_DOC_COMMENT:
+ if ($this->docComment === null && $this->name === null) {
+ $this->docComment = $tokenContent;
+ }
+ break;
+
+ case T_VARIABLE:
+ $this->name = ltrim($tokenContent, '$');
+ break;
+
+ case T_PUBLIC:
+ // use defaults
+ break;
+
+ case T_PROTECTED:
+ $this->isProtected = true;
+ $this->isPublic = false;
+ break;
+
+ case T_PRIVATE:
+ $this->isPrivate = true;
+ $this->isPublic = false;
+ break;
+
+ case T_STATIC:
+ $this->isStatic = true;
+ break;
+ default:
+ $tempValue = trim($tokenContent);
+ break;
+ }
+ }
- case T_PRIVATE:
- $this->isPrivate = true;
- $this->isPublic = false;
- goto SCANNER_CONTINUE;
+ //end value concatenation
+ if (!is_array($token) && trim($token) == ";") {
+ $concatenateValue = false;
+ }
- case T_STATIC:
- $this->isStatic = true;
- goto SCANNER_CONTINUE;
+ if (true === $concatenateValue) {
+ $value .= $tempValue;
+ }
- default:
- if ($this->name !== null && trim($tokenContent) !== '') {
- $this->value .= (is_string($token)) ? $token : $tokenContent;
- if (substr($this->value, 0, 1) === '"' || substr($this->value, 0, 1) === "'") {
- $this->value = substr($this->value, 1, -1); // Remove quotes
- }
- }
- goto SCANNER_CONTINUE;
+ //start value concatenation
+ if (!is_array($token) && trim($token) == "=") {
+ $concatenateValue = true;
}
}
- SCANNER_CONTINUE:
-
- if (next($this->tokens) === false) {
- goto SCANNER_END;
+ $this->valueType = self::T_UNKNOWN;
+ if ($value == "false" || $value == "true") {
+ $this->valueType = self::T_BOOLEAN;
+ } elseif (is_numeric($value)) {
+ $this->valueType = self::T_INTEGER;
+ } elseif (0 === strpos($value, 'array') || 0 === strpos($value, "[")) {
+ $this->valueType = self::T_ARRAY;
+ } elseif (substr($value, 0, 1) === '"' || substr($value, 0, 1) === "'") {
+ $value = substr($value, 1, -1); // Remove quotes
+ $this->valueType = self::T_STRING;
}
- goto SCANNER_TOP;
-
- SCANNER_END:
+ $this->value = empty($value) ? null : $value;
$this->isScanned = true;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ScannerInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ScannerInterface.php
index 8acb04ecd46..f832edac492 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ScannerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ScannerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/TokenArrayScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/TokenArrayScanner.php
index 3bbf201b4fc..c04be33e394 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/TokenArrayScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/TokenArrayScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -298,6 +298,13 @@ class TokenArrayScanner implements ScannerInterface
throw new Exception\RuntimeException('No tokens were provided');
}
+ /**
+ * Define PHP 5.4 'trait' token constant.
+ */
+ if (!defined('T_TRAIT')) {
+ define('T_TRAIT', 42001);
+ }
+
/**
* Variables & Setup
*/
@@ -390,6 +397,7 @@ class TokenArrayScanner implements ScannerInterface
$MACRO_DOC_COMMENT_START();
goto SCANNER_CONTINUE;
+ //goto no break needed
case T_NAMESPACE:
@@ -434,6 +442,7 @@ class TokenArrayScanner implements ScannerInterface
$MACRO_INFO_ADVANCE();
goto SCANNER_CONTINUE;
+ //goto no break needed
case T_USE:
@@ -471,7 +480,6 @@ class TokenArrayScanner implements ScannerInterface
// ANALYZE
if ($tokenType !== null) {
-
if ($tokenType == T_AS) {
$useAsContext = true;
goto SCANNER_USE_CONTINUE;
@@ -484,7 +492,6 @@ class TokenArrayScanner implements ScannerInterface
$infos[$infoIndex]['statements'][$useStatementIndex]['as'] = $tokenContent;
}
}
-
}
SCANNER_USE_CONTINUE:
@@ -498,6 +505,7 @@ class TokenArrayScanner implements ScannerInterface
$MACRO_INFO_ADVANCE();
goto SCANNER_CONTINUE;
+ //goto no break needed
case T_INCLUDE:
case T_INCLUDE_ONCE:
@@ -546,12 +554,14 @@ class TokenArrayScanner implements ScannerInterface
$MACRO_INFO_ADVANCE();
goto SCANNER_CONTINUE;
+ //goto no break needed
case T_FUNCTION:
case T_FINAL:
case T_ABSTRACT:
case T_CLASS:
case T_INTERFACE:
+ case T_TRAIT:
$infos[$infoIndex] = array(
'type' => ($tokenType === T_FUNCTION) ? 'function' : 'class',
@@ -573,7 +583,7 @@ class TokenArrayScanner implements ScannerInterface
// process the name
if ($infos[$infoIndex]['shortName'] == ''
- && (($tokenType === T_CLASS || $tokenType === T_INTERFACE) && $infos[$infoIndex]['type'] === 'class'
+ && (($tokenType === T_CLASS || $tokenType === T_INTERFACE || $tokenType === T_TRAIT) && $infos[$infoIndex]['type'] === 'class'
|| ($tokenType === T_FUNCTION && $infos[$infoIndex]['type'] === 'function'))
) {
$infos[$infoIndex]['shortName'] = $tokens[$tokenIndex + 2][1];
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/Util.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/Util.php
index e54ae0b8833..dbd5bf7a4fa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/Util.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/Util.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ValueScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ValueScanner.php
index d0826cc2453..0a87cc01532 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ValueScanner.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ValueScanner.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/composer.json b/vendor/zendframework/zendframework/library/Zend/Code/composer.json
index b970e408f9c..5cc56413313 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Code/composer.json
@@ -6,6 +6,7 @@
"zf2",
"code"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Code\\": ""
@@ -13,19 +14,21 @@
},
"target-dir": "Zend/Code",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-eventmanager": "self.version"
},
"require-dev": {
- "doctrine/common": ">=2.1"
+ "doctrine/common": ">=2.1",
+ "zendframework/zend-stdlib": "self.version"
},
"suggest": {
- "doctrine/common": "Doctrine\\Common >=2.1 for annotation features"
+ "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
+ "zendframework/zend-stdlib": "Zend\\Stdlib component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/AbstractConfigFactory.php b/vendor/zendframework/zendframework/library/Zend/Config/AbstractConfigFactory.php
new file mode 100644
index 00000000000..2f19f392a72
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Config/AbstractConfigFactory.php
@@ -0,0 +1,172 @@
+<?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\Config;
+
+use Traversable;
+use Zend\ServiceManager;
+
+/**
+ * Class AbstractConfigFactory
+ */
+class AbstractConfigFactory implements ServiceManager\AbstractFactoryInterface
+{
+ /**
+ * @var array
+ */
+ protected $configs = array();
+
+ /**
+ * @var string[]
+ */
+ protected $defaultPatterns = array(
+ '#config[\._-](.*)$#i',
+ '#^(.*)[\\\\\._-]config$#i'
+ );
+
+ /**
+ * @var string[]
+ */
+ protected $patterns;
+
+ /**
+ * Determine if we can create a service with name
+ *
+ * @param ServiceManager\ServiceLocatorInterface $serviceLocator
+ * @param string $name
+ * @param string $requestedName
+ * @return bool
+ */
+ public function canCreateServiceWithName(ServiceManager\ServiceLocatorInterface $serviceLocator, $name, $requestedName)
+ {
+ if (isset($this->configs[$requestedName])) {
+ return true;
+ }
+
+ if (!$serviceLocator->has('Config')) {
+ return false;
+ }
+
+ $key = $this->match($requestedName);
+ if (null === $key) {
+ return false;
+ }
+
+ $config = $serviceLocator->get('Config');
+ return isset($config[$key]);
+ }
+
+ /**
+ * Create service with name
+ *
+ * @param ServiceManager\ServiceLocatorInterface $serviceLocator
+ * @param string $name
+ * @param string $requestedName
+ * @return string|mixed|array
+ */
+ public function createServiceWithName(ServiceManager\ServiceLocatorInterface $serviceLocator, $name, $requestedName)
+ {
+ if (isset($this->configs[$requestedName])) {
+ return $this->configs[$requestedName];
+ }
+
+ $key = $this->match($requestedName);
+ if (isset($this->configs[$key])) {
+ $this->configs[$requestedName] = $this->configs[$key];
+ return $this->configs[$key];
+ }
+
+ $config = $serviceLocator->get('Config');
+ $this->configs[$requestedName] = $this->configs[$key] = $config[$key];
+ return $config;
+ }
+
+ /**
+ * @param string $pattern
+ * @return self
+ * @throws Exception\InvalidArgumentException
+ */
+ public function addPattern($pattern)
+ {
+ if (!is_string($pattern)) {
+ throw new Exception\InvalidArgumentException('pattern must be string');
+ }
+
+ $patterns = $this->getPatterns();
+ array_unshift($patterns, $pattern);
+ $this->setPatterns($patterns);
+ return $this;
+ }
+
+ /**
+ * @param array|Traversable $patterns
+ * @return self
+ * @throws Exception\InvalidArgumentException
+ */
+ public function addPatterns($patterns)
+ {
+ if ($patterns instanceof Traversable) {
+ $patterns = iterator_to_array($patterns);
+ }
+
+ if (!is_array($patterns)) {
+ throw new Exception\InvalidArgumentException("patterns must be array or Traversable");
+ }
+
+ foreach ($patterns as $pattern) {
+ $this->addPattern($pattern);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param array|Traversable $patterns
+ * @return self
+ * @throws \InvalidArgumentException
+ */
+ public function setPatterns($patterns)
+ {
+ if ($patterns instanceof Traversable) {
+ $patterns = iterator_to_array($patterns);
+ }
+
+ if (!is_array($patterns)) {
+ throw new \InvalidArgumentException("patterns must be array or Traversable");
+ }
+
+ $this->patterns = $patterns;
+ return $this;
+ }
+
+ /**
+ * @return array
+ */
+ public function getPatterns()
+ {
+ if (null === $this->patterns) {
+ $this->setPatterns($this->defaultPatterns);
+ }
+ return $this->patterns;
+ }
+
+ /**
+ * @param string $requestedName
+ * @return null|string
+ */
+ protected function match($requestedName)
+ {
+ foreach ($this->getPatterns() as $pattern) {
+ if (preg_match($pattern, $requestedName, $matches)) {
+ return $matches[1];
+ }
+ }
+ return null;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Config/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Config/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Config.php b/vendor/zendframework/zendframework/library/Zend/Config/Config.php
index dd85f3d5535..402b6e42e4b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Config.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Config.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -117,7 +117,6 @@ class Config implements Countable, Iterator, ArrayAccess
public function __set($name, $value)
{
if ($this->allowModifications) {
-
if (is_array($value)) {
$value = new static($value, true);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Config/Exception/ExceptionInterface.php
index 5824f01f5c1..087bfe33ace 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Config\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Config/Exception/InvalidArgumentException.php
index ed733922f4b..0b9421eb023 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Exception/InvalidArgumentException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Config\Exception;
class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Config/Exception/RuntimeException.php
index d247775b754..b9e145c928d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Exception/RuntimeException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Config\Exception;
class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Factory.php b/vendor/zendframework/zendframework/library/Zend/Config/Factory.php
index ba7ef07427a..38256aca7b9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Factory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -34,10 +34,11 @@ class Factory
* @var array
*/
protected static $extensions = array(
- 'ini' => 'ini',
- 'json' => 'json',
- 'xml' => 'xml',
- 'yaml' => 'yaml',
+ 'ini' => 'ini',
+ 'json' => 'json',
+ 'xml' => 'xml',
+ 'yaml' => 'yaml',
+ 'properties' => 'javaproperties',
);
/**
@@ -59,13 +60,34 @@ class Factory
*
* @param string $filename
* @param bool $returnConfigObject
+ * @param bool $useIncludePath
* @return array|Config
* @throws Exception\InvalidArgumentException
* @throws Exception\RuntimeException
*/
- public static function fromFile($filename, $returnConfigObject = false)
+ public static function fromFile($filename, $returnConfigObject = false, $useIncludePath = false)
{
- $pathinfo = pathinfo($filename);
+ $filepath = $filename;
+ if (!file_exists($filename)) {
+ if (!$useIncludePath) {
+ throw new Exception\RuntimeException(sprintf(
+ 'Filename "%s" cannot be found relative to the working directory',
+ $filename
+ ));
+ }
+
+ $fromIncludePath = stream_resolve_include_path($filename);
+ if (!$fromIncludePath) {
+ throw new Exception\RuntimeException(sprintf(
+ 'Filename "%s" cannot be found relative to the working directory or the include_path ("%s")',
+ $filename,
+ get_include_path()
+ ));
+ }
+ $filepath = $fromIncludePath;
+ }
+
+ $pathinfo = pathinfo($filepath);
if (!isset($pathinfo['extension'])) {
throw new Exception\RuntimeException(sprintf(
@@ -77,14 +99,14 @@ class Factory
$extension = strtolower($pathinfo['extension']);
if ($extension === 'php') {
- if (!is_file($filename) || !is_readable($filename)) {
+ if (!is_file($filepath) || !is_readable($filepath)) {
throw new Exception\RuntimeException(sprintf(
"File '%s' doesn't exist or not readable",
$filename
));
}
- $config = include $filename;
+ $config = include $filepath;
} elseif (isset(static::$extensions[$extension])) {
$reader = static::$extensions[$extension];
if (!$reader instanceof Reader\ReaderInterface) {
@@ -93,7 +115,7 @@ class Factory
}
/** @var Reader\ReaderInterface $reader */
- $config = $reader->fromFile($filename);
+ $config = $reader->fromFile($filepath);
} else {
throw new Exception\RuntimeException(sprintf(
'Unsupported config file extension: .%s',
@@ -109,14 +131,15 @@ class Factory
*
* @param array $files
* @param bool $returnConfigObject
+ * @param bool $useIncludePath
* @return array|Config
*/
- public static function fromFiles(array $files, $returnConfigObject = false)
+ public static function fromFiles(array $files, $returnConfigObject = false, $useIncludePath = false)
{
$config = array();
foreach ($files as $file) {
- $config = ArrayUtils::merge($config, static::fromFile($file));
+ $config = ArrayUtils::merge($config, static::fromFile($file, false, $useIncludePath));
}
return ($returnConfigObject) ? new Config($config) : $config;
@@ -134,7 +157,7 @@ class Factory
public static function toFile($filename, $config)
{
if (
- (is_object($config) && !($config instanceOf Config)) ||
+ (is_object($config) && !($config instanceof Config)) ||
(!is_object($config) && !is_array($config))
) {
throw new Exception\InvalidArgumentException(
@@ -164,7 +187,7 @@ class Factory
}
$writer = static::$writerExtensions[$extension];
- if (($writer instanceOf Writer\AbstractWriter) === false) {
+ if (($writer instanceof Writer\AbstractWriter) === false) {
$writer = self::getWriterPluginManager()->get($writer);
static::$writerExtensions[$extension] = $writer;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Processor/Constant.php b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Constant.php
index 28f76b9a757..069b8a8d280 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Processor/Constant.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Constant.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Processor/Filter.php b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Filter.php
index 99909f289a9..3a2b1cb95e7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Processor/Filter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Filter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Processor/ProcessorInterface.php b/vendor/zendframework/zendframework/library/Zend/Config/Processor/ProcessorInterface.php
index 6aa28e91c03..2ee94f204c3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Processor/ProcessorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Processor/ProcessorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Processor/Queue.php b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Queue.php
index 9a7905f2190..2dddd42fb33 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Processor/Queue.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Queue.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Processor/Token.php b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Token.php
index 2af2e1b3f49..cf0ecab86c3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Processor/Token.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Token.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Processor/Translator.php b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Translator.php
index 62a25216922..f33a891ae2a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Processor/Translator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Translator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -130,7 +130,7 @@ class Translator implements ProcessorInterface
* Process a single value
*
* @param $value
- * @return mixed
+ * @return string
*/
public function processValue($value)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Reader/Ini.php b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Ini.php
index b44ab5380a1..b78a21d9ea2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Reader/Ini.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Ini.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -73,11 +73,12 @@ class Ini implements ReaderInterface
set_error_handler(
function ($error, $message = '', $file = '', $line = 0) use ($filename) {
- throw new Exception\RuntimeException(sprintf(
- 'Error reading INI file "%s": %s',
- $filename, $message
- ), $error);
- }, E_WARNING
+ throw new Exception\RuntimeException(
+ sprintf('Error reading INI file "%s": %s', $filename, $message),
+ $error
+ );
+ },
+ E_WARNING
);
$ini = parse_ini_file($filename, true);
restore_error_handler();
@@ -101,11 +102,12 @@ class Ini implements ReaderInterface
set_error_handler(
function ($error, $message = '', $file = '', $line = 0) {
- throw new Exception\RuntimeException(sprintf(
- 'Error reading INI string: %s',
- $message
- ), $error);
- }, E_WARNING
+ throw new Exception\RuntimeException(
+ sprintf('Error reading INI string: %s', $message),
+ $error
+ );
+ },
+ E_WARNING
);
$ini = parse_ini_string($string, true);
restore_error_handler();
@@ -200,9 +202,9 @@ class Ini implements ReaderInterface
$config[$pieces[0]] = array();
}
} elseif (!is_array($config[$pieces[0]])) {
- throw new Exception\RuntimeException(sprintf(
- 'Cannot create sub-key for "%s", as key already exists', $pieces[0]
- ));
+ throw new Exception\RuntimeException(
+ sprintf('Cannot create sub-key for "%s", as key already exists', $pieces[0])
+ );
}
$this->processKey($pieces[1], $value, $config[$pieces[0]]);
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Reader/JavaProperties.php b/vendor/zendframework/zendframework/library/Zend/Config/Reader/JavaProperties.php
new file mode 100644
index 00000000000..24613d97b39
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Reader/JavaProperties.php
@@ -0,0 +1,138 @@
+<?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\Config\Reader;
+
+use Zend\Config\Exception;
+
+/**
+ * Java-style properties config reader.
+ */
+class JavaProperties implements ReaderInterface
+{
+ /**
+ * Directory of the Java-style properties file
+ *
+ * @var string
+ */
+ protected $directory;
+
+ /**
+ * fromFile(): defined by Reader interface.
+ *
+ * @see ReaderInterface::fromFile()
+ * @param string $filename
+ * @return array
+ * @throws Exception\RuntimeException if the file cannot be read
+ */
+ public function fromFile($filename)
+ {
+ if (!is_file($filename) || !is_readable($filename)) {
+ throw new Exception\RuntimeException(sprintf(
+ "File '%s' doesn't exist or not readable",
+ $filename
+ ));
+ }
+
+ $this->directory = dirname($filename);
+
+ $config = $this->parse(file_get_contents($filename));
+
+ return $this->process($config);
+ }
+
+ /**
+ * fromString(): defined by Reader interface.
+ *
+ * @see ReaderInterface::fromString()
+ * @param string $string
+ * @return array
+ * @throws Exception\RuntimeException if an @include key is found
+ */
+ public function fromString($string)
+ {
+ if (empty($string)) {
+ return array();
+ }
+
+ $this->directory = null;
+
+ $config = $this->parse($string);
+
+ return $this->process($config);
+ }
+
+ /**
+ * Process the array for @include
+ *
+ * @param array $data
+ * @return array
+ * @throws Exception\RuntimeException if an @include key is found
+ */
+ protected function process(array $data)
+ {
+ foreach ($data as $key => $value) {
+ if (trim($key) === '@include') {
+ if ($this->directory === null) {
+ throw new Exception\RuntimeException('Cannot process @include statement for a string');
+ }
+ $reader = clone $this;
+ unset($data[$key]);
+ $data = array_replace_recursive($data, $reader->fromFile($this->directory . '/' . $value));
+ }
+ }
+ return $data;
+ }
+
+ /**
+ * Parse Java-style properties string
+ *
+ * @todo Support use of the equals sign "key=value" as key-value delimiter
+ * @todo Ignore whitespace that precedes text past the first line of multiline values
+ *
+ * @param string $string
+ * @return array
+ */
+ protected function parse($string)
+ {
+ $result = array();
+ $lines = explode("\n", $string);
+ $key = "";
+ $isWaitingOtherLine = false;
+ foreach ($lines as $i => $line) {
+ // Ignore empty lines and commented lines
+ if (empty($line)
+ || (!$isWaitingOtherLine && strpos($line, "#") === 0)
+ || (!$isWaitingOtherLine && strpos($line, "!") === 0)) {
+ continue;
+ }
+
+ // Add a new key-value pair or append value to a previous pair
+ if (!$isWaitingOtherLine) {
+ $key = substr($line, 0, strpos($line, ':'));
+ $value = substr($line, strpos($line, ':') + 1, strlen($line));
+ } else {
+ $value .= $line;
+ }
+
+ // Check if ends with single '\' (indicating another line is expected)
+ if (strrpos($value, "\\") === strlen($value) - strlen("\\")) {
+ $value = substr($value, 0, strlen($value) - 1);
+ $isWaitingOtherLine = true;
+ } else {
+ $isWaitingOtherLine = false;
+ }
+
+ $result[$key] = stripslashes($value);
+ unset($lines[$i]);
+ }
+
+ return $result;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Reader/Json.php b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Json.php
index 407e2aafa58..9e60d413bc2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Reader/Json.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Json.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Reader/ReaderInterface.php b/vendor/zendframework/zendframework/library/Zend/Config/Reader/ReaderInterface.php
index 0393fe0528a..1394943c7dc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Reader/ReaderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Reader/ReaderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Reader/Xml.php b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Xml.php
index 369b0b4f48d..b0cb4bb9faa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Reader/Xml.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Xml.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -59,7 +59,6 @@ class Xml implements ReaderInterface
$filename
));
}
-
$this->reader = new XMLReader();
$this->reader->open($filename, null, LIBXML_XINCLUDE);
@@ -67,14 +66,16 @@ class Xml implements ReaderInterface
set_error_handler(
function ($error, $message = '', $file = '', $line = 0) use ($filename) {
- throw new Exception\RuntimeException(sprintf(
- 'Error reading XML file "%s": %s',
- $filename, $message
- ), $error);
- }, E_WARNING
+ throw new Exception\RuntimeException(
+ sprintf('Error reading XML file "%s": %s', $filename, $message),
+ $error
+ );
+ },
+ E_WARNING
);
$return = $this->process();
restore_error_handler();
+ $this->reader->close();
return $return;
}
@@ -100,14 +101,16 @@ class Xml implements ReaderInterface
set_error_handler(
function ($error, $message = '', $file = '', $line = 0) {
- throw new Exception\RuntimeException(sprintf(
- 'Error reading XML string: %s',
- $message
- ), $error);
- }, E_WARNING
+ throw new Exception\RuntimeException(
+ sprintf('Error reading XML string: %s', $message),
+ $error
+ );
+ },
+ E_WARNING
);
$return = $this->process();
restore_error_handler();
+ $this->reader->close();
return $return;
}
@@ -148,7 +151,11 @@ class Xml implements ReaderInterface
}
if ($attributes) {
- if (!is_array($child)) {
+ if (is_string($child)) {
+ $child = array('_' => $child);
+ }
+
+ if (! is_array($child) ) {
$child = array();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Reader/Yaml.php b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Yaml.php
index 67fe6fcb1ab..41f33946cd2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Reader/Yaml.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Yaml.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -92,7 +92,7 @@ class Yaml implements ReaderInterface
}
if (null === $this->getYamlDecoder()) {
- throw new Exception\RuntimeException("You didn't specify a Yaml callback decoder");
+ throw new Exception\RuntimeException("You didn't specify a Yaml callback decoder");
}
$this->directory = dirname($filename);
@@ -116,7 +116,7 @@ class Yaml implements ReaderInterface
public function fromString($string)
{
if (null === $this->getYamlDecoder()) {
- throw new Exception\RuntimeException("You didn't specify a Yaml callback decoder");
+ throw new Exception\RuntimeException("You didn't specify a Yaml callback decoder");
}
if (empty($string)) {
return array();
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/ReaderPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Config/ReaderPluginManager.php
index 3e74a5640c0..4c350643fbf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/ReaderPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/ReaderPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -19,10 +19,11 @@ class ReaderPluginManager extends AbstractPluginManager
* @var array
*/
protected $invokableClasses = array(
- 'ini' => 'Zend\Config\Reader\Ini',
- 'json' => 'Zend\Config\Reader\Json',
- 'xml' => 'Zend\Config\Reader\Xml',
- 'yaml' => 'Zend\Config\Reader\Yaml',
+ 'ini' => 'Zend\Config\Reader\Ini',
+ 'json' => 'Zend\Config\Reader\Json',
+ 'xml' => 'Zend\Config\Reader\Xml',
+ 'yaml' => 'Zend\Config\Reader\Yaml',
+ 'javaproperties' => 'Zend\Config\Reader\JavaProperties',
);
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Writer/AbstractWriter.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/AbstractWriter.php
index fa94a6b8672..0acd8453ef7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Writer/AbstractWriter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Writer/AbstractWriter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -39,11 +39,12 @@ abstract class AbstractWriter implements WriterInterface
set_error_handler(
function ($error, $message = '', $file = '', $line = 0) use ($filename) {
- throw new Exception\RuntimeException(sprintf(
- 'Error writing to "%s": %s',
- $filename, $message
- ), $error);
- }, E_WARNING
+ throw new Exception\RuntimeException(
+ sprintf('Error writing to "%s": %s', $filename, $message),
+ $error
+ );
+ },
+ E_WARNING
);
try {
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Writer/Ini.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Ini.php
index 9244f73e62a..0372d712c6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Writer/Ini.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Ini.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Writer/Json.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Json.php
index 04548495b7d..78a68b3e461 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Writer/Json.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Json.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Writer/PhpArray.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/PhpArray.php
index fa33604d95c..f70c10b9470 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Writer/PhpArray.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Writer/PhpArray.php
@@ -3,14 +3,26 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Config\Writer;
+use Zend\Config\Exception;
+
class PhpArray extends AbstractWriter
{
+ /**
+ * @var string
+ */
+ const INDENT_STRING = ' ';
+
+ /**
+ * @var bool
+ */
+ protected $useBracketArraySyntax = false;
+
/**
* processConfig(): defined by AbstractWriter.
*
@@ -19,8 +31,111 @@ class PhpArray extends AbstractWriter
*/
public function processConfig(array $config)
{
- $arrayString = "<?php\n"
- . "return " . var_export($config, true) . ";\n";
+ $arraySyntax = array(
+ 'open' => $this->useBracketArraySyntax ? '[' : 'array(',
+ 'close' => $this->useBracketArraySyntax ? ']' : ')'
+ );
+
+ return "<?php\n" .
+ "return " . $arraySyntax['open'] . "\n" . $this->processIndented($config, $arraySyntax) .
+ $arraySyntax['close'] . ";\n";
+ }
+
+ /**
+ * Sets whether or not to use the PHP 5.4+ "[]" array syntax.
+ *
+ * @param bool $value
+ * @return self
+ */
+ public function setUseBracketArraySyntax($value)
+ {
+ $this->useBracketArraySyntax = $value;
+ return $this;
+ }
+
+ /**
+ * toFile(): defined by Writer interface.
+ *
+ * @see WriterInterface::toFile()
+ * @param string $filename
+ * @param mixed $config
+ * @param bool $exclusiveLock
+ * @return void
+ * @throws Exception\InvalidArgumentException
+ * @throws Exception\RuntimeException
+ */
+ public function toFile($filename, $config, $exclusiveLock = true)
+ {
+ if (empty($filename)) {
+ throw new Exception\InvalidArgumentException('No file name specified');
+ }
+
+ $flags = 0;
+ if ($exclusiveLock) {
+ $flags |= LOCK_EX;
+ }
+
+ set_error_handler(
+ function ($error, $message = '', $file = '', $line = 0) use ($filename) {
+ throw new Exception\RuntimeException(
+ sprintf('Error writing to "%s": %s', $filename, $message),
+ $error
+ );
+ },
+ E_WARNING
+ );
+
+ try {
+ // for Windows, paths are escaped.
+ $dirname = str_replace('\\', '\\\\', dirname($filename));
+
+ $string = $this->toString($config);
+ $string = str_replace("'" . $dirname, "__DIR__ . '", $string);
+
+ file_put_contents($filename, $string, $flags);
+ } catch (\Exception $e) {
+ restore_error_handler();
+ throw $e;
+ }
+
+ restore_error_handler();
+ }
+
+ /**
+ * Recursively processes a PHP config array structure into a readable format.
+ *
+ * @param array $config
+ * @param array $arraySyntax
+ * @param int $indentLevel
+ * @return string
+ */
+ protected function processIndented(array $config, array $arraySyntax, &$indentLevel = 1)
+ {
+ $arrayString = "";
+
+ foreach ($config as $key => $value) {
+ $arrayString .= str_repeat(self::INDENT_STRING, $indentLevel);
+ $arrayString .= (is_int($key) ? $key : "'" . addslashes($key) . "'") . ' => ';
+
+ if (is_array($value)) {
+ if ($value === array()) {
+ $arrayString .= $arraySyntax['open'] . $arraySyntax['close'] . ",\n";
+ } else {
+ $indentLevel++;
+ $arrayString .= $arraySyntax['open'] . "\n"
+ . $this->processIndented($value, $arraySyntax, $indentLevel)
+ . str_repeat(self::INDENT_STRING, --$indentLevel) . $arraySyntax['close'] . ",\n";
+ }
+ } elseif (is_object($value) || is_string($value)) {
+ $arrayString .= var_export($value, true) . ",\n";
+ } elseif (is_bool($value)) {
+ $arrayString .= ($value ? 'true' : 'false') . ",\n";
+ } elseif ($value === null) {
+ $arrayString .= "null,\n";
+ } else {
+ $arrayString .= $value . ",\n";
+ }
+ }
return $arrayString;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Writer/WriterInterface.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/WriterInterface.php
index afbecd104b1..92e821d45b8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Writer/WriterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Writer/WriterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Writer/Xml.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Xml.php
index 3f46c7d9f32..f388558f051 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Writer/Xml.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Xml.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,7 +22,7 @@ class Xml extends AbstractWriter
*/
public function processConfig(array $config)
{
- $writer = new XMLWriter('UTF-8');
+ $writer = new XMLWriter();
$writer->openMemory();
$writer->setIndent(true);
$writer->setIndentString(str_repeat(' ', 4));
@@ -71,7 +71,7 @@ class Xml extends AbstractWriter
if ($branchType === 'numeric') {
if (is_array($value)) {
- $this->addBranch($value, $value, $writer);
+ $this->addBranch($branchName, $value, $writer);
} else {
$writer->writeElement($branchName, (string) $value);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Writer/Yaml.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Yaml.php
index 7170841ce0e..e872d9b7636 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Writer/Yaml.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Yaml.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -72,7 +72,7 @@ class Yaml extends AbstractWriter
public function processConfig(array $config)
{
if (null === $this->getYamlEncoder()) {
- throw new Exception\RuntimeException("You didn't specify a Yaml callback encoder");
+ throw new Exception\RuntimeException("You didn't specify a Yaml callback encoder");
}
$config = call_user_func($this->getYamlEncoder(), $config);
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/WriterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Config/WriterPluginManager.php
index d6733452fd1..9b031ffabba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/WriterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/WriterPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -23,15 +23,14 @@ class WriterPluginManager extends AbstractPluginManager
public function validatePlugin($plugin)
{
- if ($plugin instanceOf Writer\AbstractWriter) {
+ if ($plugin instanceof Writer\AbstractWriter) {
return;
}
$type = is_object($plugin) ? get_class($plugin) : gettype($plugin);
throw new Exception\InvalidArgumentException(
- "Plugin of type {$type} is invalid. Plugin must extend ".
- __NAMESPACE__.'\Writer\AbstractWriter'
+ "Plugin of type {$type} is invalid. Plugin must extend ". __NAMESPACE__ . '\Writer\AbstractWriter'
);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/composer.json b/vendor/zendframework/zendframework/library/Zend/Config/composer.json
index f515b057a3e..6ea7fa11ef8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Config/composer.json
@@ -6,6 +6,7 @@
"zf2",
"config"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Config\\": ""
@@ -13,17 +14,25 @@
},
"target-dir": "Zend/Config",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-filter": "self.version",
+ "zendframework/zend-i18n": "self.version",
+ "zendframework/zend-json": "self.version",
+ "zendframework/zend-servicemanager": "self.version"
+ },
"suggest": {
+ "zendframework/zend-filter": "Zend\\Filter component",
+ "zendframework/zend-i18n": "Zend\\I18n component",
"zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
"zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AbstractAdapter.php
index d79a2815d51..c85e47d960f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -53,6 +53,9 @@ abstract class AbstractAdapter implements AdapterInterface
*/
public function write($text, $color = null, $bgColor = null)
{
+ //Encode text to match console encoding
+ $text = $this->encodeText($text);
+
if ($color !== null || $bgColor !== null) {
echo $this->colorize($text, $color, $bgColor);
} else {
@@ -191,7 +194,6 @@ abstract class AbstractAdapter implements AdapterInterface
// Draw vertical lines and fill
if (is_numeric($fillStyle)
&& $fillStyle !== static::FILL_NONE) {
-
switch ($fillStyle) {
case static::FILL_SHADE_LIGHT:
$fillChar = $charset::SHADE_LIGHT;
@@ -207,7 +209,6 @@ abstract class AbstractAdapter implements AdapterInterface
$fillChar = $charset::BLOCK;
break;
}
-
} elseif ($fillStyle) {
$fillChar = StringUtils::getWrapper()->substr($fillStyle, 0, 1);
} else {
@@ -241,7 +242,6 @@ abstract class AbstractAdapter implements AdapterInterface
}
}
-
// Draw corners
if ($lineStyle !== static::LINE_NONE) {
if ($color !== null) {
@@ -285,6 +285,7 @@ abstract class AbstractAdapter implements AdapterInterface
* @param int $y Block Y coordinate (row)
* @param null|int $color (optional) Text color
* @param null|int $bgColor (optional) Text background color
+ * @throws Exception\InvalidArgumentException
*/
public function writeTextBlock(
$text,
@@ -295,6 +296,43 @@ abstract class AbstractAdapter implements AdapterInterface
$color = null,
$bgColor = null
) {
+ if ($x < 0 || $y < 0) {
+ throw new Exception\InvalidArgumentException('Supplied X,Y coordinates are invalid.');
+ }
+
+ if ($width < 1) {
+ throw new Exception\InvalidArgumentException('Invalid width supplied.');
+ }
+
+ if (null !== $height && $height < 1) {
+ throw new Exception\InvalidArgumentException('Invalid height supplied.');
+ }
+
+ // ensure the text is not wider than the width
+ if (strlen($text) <= $width) {
+ // just write the line at the spec'd position
+ $this->setPos($x, $y);
+ $this->write($text, $color, $bgColor);
+ return;
+ }
+
+ $text = wordwrap($text, $width, PHP_EOL, true);
+
+ // convert to array of lines
+ $lines = explode(PHP_EOL, $text);
+
+ // truncate if height was specified
+ if (null !== $height && count($lines) > $height) {
+ $lines = array_slice($lines, 0, $height);
+ }
+
+ // write each line
+ $curY = $y;
+ foreach ($lines as $line) {
+ $this->setPos($x, $curY);
+ $this->write($line, $color, $bgColor);
+ $curY++;//next line
+ }
}
/**
@@ -320,7 +358,7 @@ abstract class AbstractAdapter implements AdapterInterface
/**
* Determine and return current console width and height.
*
- * @return array array($width, $height)
+ * @return int[] array($width, $height)
*/
public function getSize()
{
@@ -476,10 +514,10 @@ abstract class AbstractAdapter implements AdapterInterface
*/
public function readLine($maxLength = 2048)
{
- $f = fopen('php://stdin','r');
+ $f = fopen('php://stdin', 'r');
$line = stream_get_line($f, $maxLength, PHP_EOL);
fclose($f);
- return rtrim($line,"\n\r");
+ return rtrim($line, "\n\r");
}
/**
@@ -490,11 +528,34 @@ abstract class AbstractAdapter implements AdapterInterface
*/
public function readChar($mask = null)
{
- $f = fopen('php://stdin','r');
+ $f = fopen('php://stdin', 'r');
do {
- $char = fread($f,1);
+ $char = fread($f, 1);
} while ("" === $char || ($mask !== null && false === strstr($mask, $char)));
fclose($f);
return $char;
}
+
+ /**
+ * Encode a text to match console encoding
+ *
+ * @param string $text
+ * @return string the encoding text
+ */
+ public function encodeText($text)
+ {
+ if ($this->isUtf8()) {
+ if (StringUtils::isValidUtf8($text)) {
+ return $text;
+ }
+
+ return utf8_encode($text);
+ }
+
+ if (StringUtils::isValidUtf8($text)) {
+ return utf8_decode($text);
+ }
+
+ return $text;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AdapterInterface.php
index 2fa1eb870f7..60f631ee715 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -29,6 +29,7 @@ interface AdapterInterface
* @param string $text
* @param null|int $color
* @param null|int $bgColor
+ * @return void
*/
public function write($text, $color = null, $bgColor = null);
@@ -38,6 +39,7 @@ interface AdapterInterface
* @param string $text
* @param null|int $color
* @param null|int $bgColor
+ * @return void
*/
public function writeText($text, $color = null, $bgColor = null);
@@ -48,6 +50,7 @@ interface AdapterInterface
* @param string $text
* @param null|int $color
* @param null|int $bgColor
+ * @return void
*/
public function writeLine($text = "", $color = null, $bgColor = null);
@@ -59,6 +62,7 @@ interface AdapterInterface
* @param int $y Console Y coordinate (row)
* @param null|int $color
* @param null|int $bgColor
+ * @return void
*/
public function writeAt($text, $x, $y, $color = null, $bgColor = null);
@@ -77,6 +81,7 @@ interface AdapterInterface
* @param int $bgColor (optional) Background color
* @param null|int $fillColor (optional) Foreground color of box fill
* @param null|int $fillBgColor (optional) Background color of box fill
+ * @return void
*/
public function writeBox(
$x1,
@@ -103,6 +108,7 @@ interface AdapterInterface
* @param int $y Block Y coordinate (row)
* @param null|int $color (optional) Text color
* @param null|int $bgColor (optional) Text background color
+ * @return void
*/
public function writeTextBlock(
$text,
@@ -114,7 +120,6 @@ interface AdapterInterface
$bgColor = null
);
-
/**
* Determine and return current console width.
*
@@ -148,16 +153,19 @@ interface AdapterInterface
*
* @param int $x
* @param int $y
+ * @return void
*/
public function setPos($x, $y);
/**
* Hide console cursor
+ * @return void
*/
public function hideCursor();
/**
* Show console cursor
+ * @return void
*/
public function showCursor();
@@ -174,6 +182,7 @@ interface AdapterInterface
* @param string $string
* @param null|int $color Foreground color
* @param null|int $bgColor Background color
+ * @return string
*/
public function colorize($string, $color = null, $bgColor = null);
@@ -181,6 +190,7 @@ interface AdapterInterface
* Change current drawing color.
*
* @param int $color
+ * @return void
*/
public function setColor($color);
@@ -188,19 +198,21 @@ interface AdapterInterface
* Change current drawing background color
*
* @param int $color
+ * @return void
*/
public function setBgColor($color);
/**
* Reset color to console default.
+ * @return void
*/
public function resetColor();
-
/**
* Set Console charset to use.
*
* @param CharsetInterface $charset
+ * @return void
*/
public function setCharset(CharsetInterface $charset);
@@ -218,16 +230,19 @@ interface AdapterInterface
/**
* Clear console screen
+ * @return void
*/
public function clear();
/**
* Clear line at cursor position
+ * @return void
*/
public function clearLine();
/**
* Clear console screen
+ * @return void
*/
public function clearScreen();
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Posix.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Posix.php
index 5f07863c5d2..ee2a3376aa4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Posix.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Posix.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -358,7 +358,7 @@ class Posix extends AbstractAdapter
* Change TTY (Console) mode
*
* @link http://en.wikipedia.org/wiki/Stty
- * @param $mode
+ * @param string $mode
*/
protected function setTTYMode($mode)
{
@@ -373,6 +373,7 @@ class Posix extends AbstractAdapter
* Get the final color code and throw exception on error
*
* @param null|int|Xterm256 $color
+ * @param string $type (optional) Foreground 'fg' or background 'bg'.
* @throws Exception\BadMethodCallException
* @return string
*/
@@ -392,8 +393,9 @@ class Posix extends AbstractAdapter
if ($color !== null) {
if (!isset(static::$ansiColorMap[$type][$color])) {
throw new Exception\BadMethodCallException(sprintf(
- 'Unknown color "%s". Please use one of the Zend\Console\ColorInterface constants or use Zend\Console\Color\Xterm256::calculate',
- $color
+ 'Unknown color "%s". Please use one of the Zend\Console\ColorInterface constants '
+ . 'or use Zend\Console\Color\Xterm256::calculate',
+ $color
));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Virtual.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Virtual.php
index f1b1eb95e36..752a26d2875 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Virtual.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Virtual.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Windows.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Windows.php
index 22ef674b116..ce6d4c4f580 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Windows.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Windows.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -64,7 +64,7 @@ class Windows extends Virtual
/**
* Determine and return current console height.
*
- * @return false|int
+ * @return int
*/
public function getHeight()
{
@@ -261,9 +261,9 @@ class Windows extends Virtual
if ($mask === null) {
exec(
'powershell -NonInteractive -NoProfile -NoLogo -OutputFormat Text -Command "'
- . 'while ($Host.UI.RawUI.KeyAvailable) {$key = $Host.UI.RawUI.ReadKey(\'NoEcho,IncludeKeyDown\');}'
- . 'write $key.VirtualKeyCode;'
- . '"',
+ . 'while ($Host.UI.RawUI.KeyAvailable) {$key = $Host.UI.RawUI.ReadKey(\'NoEcho,IncludeKeyDown\');}'
+ . 'write $key.VirtualKeyCode;'
+ . '"',
$result,
$return
);
@@ -299,12 +299,12 @@ class Windows extends Virtual
exec(
'powershell -NonInteractive -NoProfile -NoLogo -OutputFormat Text -Command "'
- . '[int[]] $mask = ' . join(',', $asciiMask) . ';'
- . 'do {'
- . '$key = $Host.UI.RawUI.ReadKey(\'NoEcho,IncludeKeyDown\').VirtualKeyCode;'
- . '} while( !($mask -contains $key) );'
- . 'write $key;'
- . '"',
+ . '[int[]] $mask = ' . join(',', $asciiMask) . ';'
+ . 'do {'
+ . '$key = $Host.UI.RawUI.ReadKey(\'NoEcho,IncludeKeyDown\').VirtualKeyCode;'
+ . '} while ( !($mask -contains $key) );'
+ . 'write $key;'
+ . '"',
$result,
$return
);
@@ -347,8 +347,8 @@ class Windows extends Virtual
*/
public function readLine($maxLength = 2048)
{
- $f = fopen('php://stdin','r');
- $line = rtrim(fread($f, $maxLength),"\r\n");
+ $f = fopen('php://stdin', 'r');
+ $line = rtrim(fread($f, $maxLength), "\r\n");
fclose($f);
return $line;
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/WindowsAnsicon.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/WindowsAnsicon.php
index 591b3fd2183..3808ee8aa36 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Adapter/WindowsAnsicon.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/WindowsAnsicon.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -222,9 +222,9 @@ class WindowsAnsicon extends Posix
if ($mask === null) {
exec(
'powershell -NonInteractive -NoProfile -NoLogo -OutputFormat Text -Command "'
- . 'while ($Host.UI.RawUI.KeyAvailable) {$key = $Host.UI.RawUI.ReadKey(\'NoEcho,IncludeKeyDown\');}'
- . 'write $key.VirtualKeyCode;'
- . '"',
+ . 'while ($Host.UI.RawUI.KeyAvailable) {$key = $Host.UI.RawUI.ReadKey(\'NoEcho,IncludeKeyDown\');}'
+ . 'write $key.VirtualKeyCode;'
+ . '"',
$result,
$return
);
@@ -259,12 +259,12 @@ class WindowsAnsicon extends Posix
$result = $return = null;
exec(
'powershell -NonInteractive -NoProfile -NoLogo -OutputFormat Text -Command "'
- . '[int[]] $mask = '.join(',', $asciiMask).';'
- . 'do {'
- . '$key = $Host.UI.RawUI.ReadKey(\'NoEcho,IncludeKeyDown\').VirtualKeyCode;'
- . '} while( !($mask -contains $key) );'
- . 'write $key;'
- . '"',
+ . '[int[]] $mask = '.join(',', $asciiMask).';'
+ . 'do {'
+ . '$key = $Host.UI.RawUI.ReadKey(\'NoEcho,IncludeKeyDown\').VirtualKeyCode;'
+ . '} while ( !($mask -contains $key) );'
+ . 'write $key;'
+ . '"',
$result,
$return
);
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Console/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Console/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Charset/Ascii.php b/vendor/zendframework/zendframework/library/Zend/Console/Charset/Ascii.php
index 072c2d690a9..e6be409e4a3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Charset/Ascii.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Charset/Ascii.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Console\Charset;
*/
class Ascii implements CharsetInterface
{
-
const ACTIVATE = "";
const DEACTIVATE = "";
@@ -46,5 +45,4 @@ class Ascii implements CharsetInterface
const LINE_BLOCK_SE = "+";
const LINE_BLOCK_SW = "+";
const LINE_BLOCK_CROSS = "+";
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Charset/AsciiExtended.php b/vendor/zendframework/zendframework/library/Zend/Console/Charset/AsciiExtended.php
index e8e071fb008..7e4b6ac5540 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Charset/AsciiExtended.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Charset/AsciiExtended.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ namespace Zend\Console\Charset;
*/
class AsciiExtended implements CharsetInterface
{
-
const ACTIVATE = "";
const DEACTIVATE = "";
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Charset/CharsetInterface.php b/vendor/zendframework/zendframework/library/Zend/Console/Charset/CharsetInterface.php
index c64656c1d64..a34ccb44547 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Charset/CharsetInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Charset/CharsetInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Charset/DECSG.php b/vendor/zendframework/zendframework/library/Zend/Console/Charset/DECSG.php
index 3bb3d609836..2eada167ce7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Charset/DECSG.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Charset/DECSG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ namespace Zend\Console\Charset;
*/
class DECSG implements CharsetInterface
{
-
const ACTIVATE = "\x1b(0";
const DEACTIVATE = "\x1b(B";
@@ -48,5 +47,4 @@ class DECSG implements CharsetInterface
const LINE_BLOCK_SE = "\x61";
const LINE_BLOCK_SW = "\x61";
const LINE_BLOCK_CROSS = "\x61";
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Charset/Utf8.php b/vendor/zendframework/zendframework/library/Zend/Console/Charset/Utf8.php
index f8827934ab3..26a846b4a35 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Charset/Utf8.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Charset/Utf8.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ namespace Zend\Console\Charset;
*/
class Utf8 implements CharsetInterface
{
-
const ACTIVATE = "";
const DEACTIVATE = "";
@@ -48,5 +47,4 @@ class Utf8 implements CharsetInterface
const LINE_BLOCK_SE = "â–ˆ";
const LINE_BLOCK_SW = "â–ˆ";
const LINE_BLOCK_CROSS = "â–ˆ";
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Charset/Utf8Heavy.php b/vendor/zendframework/zendframework/library/Zend/Console/Charset/Utf8Heavy.php
index ca51452f233..3f0b736ac58 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Charset/Utf8Heavy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Charset/Utf8Heavy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ namespace Zend\Console\Charset;
*/
class Utf8Heavy extends Utf8
{
-
const LINE_SINGLE_EW = "â”";
const LINE_SINGLE_NS = "┃";
const LINE_SINGLE_NW = "â”";
@@ -24,5 +23,4 @@ class Utf8Heavy extends Utf8
const LINE_SINGLE_SE = "â”›";
const LINE_SINGLE_SW = "â”—";
const LINE_SINGLE_CROSS = "â•‹";
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Color/Xterm256.php b/vendor/zendframework/zendframework/library/Zend/Console/Color/Xterm256.php
index 1728014ede1..54870cd620b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Color/Xterm256.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Color/Xterm256.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -40,7 +40,7 @@ class Xterm256
* Calcluate the X11 color value of a hexadecimal color
*
* @param string $hexColor
- * @return string
+ * @return self
*/
public static function calculate($hexColor)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/ColorInterface.php b/vendor/zendframework/zendframework/library/Zend/Console/ColorInterface.php
index b2cc770b4e0..6fdc3a77b2d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/ColorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/ColorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Console.php b/vendor/zendframework/zendframework/library/Zend/Console/Console.php
index 20f4872fc35..1d380ddb48e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Console.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Console.php
@@ -3,14 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Console;
/**
- * An static, utility class for interacting with Console environment.
+ * A static, utility class for interacting with Console environment.
* Declared abstract to prevent from instantiating.
*/
abstract class Console
@@ -30,7 +30,7 @@ abstract class Console
/**
* Create and return Adapter\AdapterInterface instance.
*
- * @param null|string $forceAdapter Optional adapter class name. Ccan be absolute namespace or class name
+ * @param null|string $forceAdapter Optional adapter class name. Can be absolute namespace or class name
* relative to Zend\Console\Adapter\. If not provided, a best matching
* adapter will be automatically selected.
* @param null|string $forceCharset optional charset name can be absolute namespace or class name relative to
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Console/Exception/BadMethodCallException.php
index ac0d6fb6bad..65daaf4bd6c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,5 +11,4 @@ namespace Zend\Console\Exception;
class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
{
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Console/Exception/ExceptionInterface.php
index 70d8baf8150..9830733aec5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Console/Exception/InvalidArgumentException.php
index ad3b4e97b9f..c930f22332e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Console/Exception/RuntimeException.php
index 6551912c493..de79db526df 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Getopt.php b/vendor/zendframework/zendframework/library/Zend/Console/Getopt.php
index e7ecf91a3dc..77e830baef5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Getopt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Getopt.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -37,7 +37,7 @@ namespace Zend\Console;
* - Automatic generation of a helpful usage message.
* - Signal end of options with '--'; subsequent arguments are treated
* as non-option arguments, even if they begin with '-'.
- * - Raise exception Zend_Console_Getopt_Exception in several cases
+ * - Raise exception Zend\Console\Exception\* in several cases
* when invalid flags or parameters are given. Usage message is
* returned in the exception object.
*
@@ -66,21 +66,9 @@ namespace Zend\Console;
*
* Example: 'abc:' means options '-a', '-b', and '-c'
* are legal, and the latter requires a string parameter.
- *
- * @todo Handle flags that implicitly print usage message, e.g. --help
- *
- * @todo Enable user to specify header and footer content in the help message.
- *
- * @todo Feature request to handle option interdependencies.
- * e.g. if -b is specified, -a must be specified or else the
- * usage is invalid.
- *
- * @todo Feature request to implement callbacks.
- * e.g. if -a is specified, run function 'handleOptionA'().
*/
class Getopt
{
-
/**
* The options for a given application can be in multiple formats.
* modeGnu is for traditional 'ab:c:' style getopt format.
@@ -191,6 +179,13 @@ class Getopt
*/
protected $parsed = false;
+ /**
+ * A list of callbacks to call when a particular option is present.
+ *
+ * @var array
+ */
+ protected $optionCallbacks = array();
+
/**
* The constructor takes one to three parameters.
*
@@ -213,7 +208,7 @@ class Getopt
if (!isset($_SERVER['argv'])) {
$errorDescription = (ini_get('register_argc_argv') == false)
? "argv is not available, because ini option 'register_argc_argv' is set Off"
- : '$_SERVER["argv"] is not set, but Zend_Console_Getopt cannot work without this information.';
+ : '$_SERVER["argv"] is not set, but Zend\Console\Getopt cannot work without this information.';
throw new Exception\InvalidArgumentException($errorDescription);
}
@@ -266,7 +261,6 @@ class Getopt
*
* @param string $key
* @param string $value
- * @return void
*/
public function __set($key, $value)
{
@@ -291,7 +285,6 @@ class Getopt
* Unset an option.
*
* @param string $key
- * @return void
*/
public function __unset($key)
{
@@ -307,8 +300,8 @@ class Getopt
* These are appended to those defined when the constructor was called.
*
* @param array $argv
- * @throws \Zend\Console\Exception\InvalidArgumentException When not given an array as parameter
- * @return \Zend\Console\Getopt Provides a fluent interface
+ * @throws Exception\InvalidArgumentException When not given an array as parameter
+ * @return self
*/
public function addArguments($argv)
{
@@ -325,8 +318,8 @@ class Getopt
* These replace any currently defined.
*
* @param array $argv
- * @throws \Zend\Console\Exception\InvalidArgumentException When not given an array as parameter
- * @return \Zend\Console\Getopt Provides a fluent interface
+ * @throws Exception\InvalidArgumentException When not given an array as parameter
+ * @return self
*/
public function setArguments($argv)
{
@@ -344,7 +337,7 @@ class Getopt
* the behavior of Zend\Console\Getopt.
*
* @param array $getoptConfig
- * @return \Zend\Console\Getopt Provides a fluent interface
+ * @return self
*/
public function setOptions($getoptConfig)
{
@@ -363,7 +356,7 @@ class Getopt
*
* @param string $configKey
* @param string $configValue
- * @return \Zend\Console\Getopt Provides a fluent interface
+ * @return self
*/
public function setOption($configKey, $configValue)
{
@@ -378,7 +371,7 @@ class Getopt
* These are appended to the rules defined when the constructor was called.
*
* @param array $rules
- * @return \Zend\Console\Getopt Provides a fluent interface
+ * @return self
*/
public function addRules($rules)
{
@@ -389,7 +382,7 @@ class Getopt
$this->_addRulesModeZend($rules);
break;
}
- // intentional fallthrough
+ // intentional fallthrough
case self::MODE_GNU:
$this->_addRulesModeGnu($rules);
break;
@@ -590,9 +583,11 @@ class Getopt
$lines[] = $linepart;
}
foreach ($lines as $linepart) {
- $usage .= sprintf("%s %s\n",
- str_pad($linepart['name'], $maxLen),
- $linepart['help']);
+ $usage .= sprintf(
+ "%s %s\n",
+ str_pad($linepart['name'], $maxLen),
+ $linepart['help']
+ );
}
return $usage;
}
@@ -604,8 +599,8 @@ class Getopt
* mapping option name (short or long) to an alias.
*
* @param array $aliasMap
- * @throws \Zend\Console\Exception\ExceptionInterface
- * @return \Zend\Console\Getopt Provides a fluent interface
+ * @throws Exception\ExceptionInterface
+ * @return self
*/
public function setAliases($aliasMap)
{
@@ -635,7 +630,7 @@ class Getopt
* mapping option name (short or long) to the help string.
*
* @param array $helpMap
- * @return \Zend\Console\Getopt Provides a fluent interface
+ * @return self
*/
public function setHelp($helpMap)
{
@@ -656,13 +651,14 @@ class Getopt
* Also find option parameters, and remaining arguments after
* all options have been parsed.
*
- * @return \Zend\Console\Getopt|null Provides a fluent interface
+ * @return self
*/
public function parse()
{
if ($this->parsed === true) {
- return;
+ return $this;
}
+
$argv = $this->argv;
$this->options = array();
$this->remainingArgs = array();
@@ -676,7 +672,7 @@ class Getopt
}
if (substr($argv[0], 0, 2) == '--') {
$this->_parseLongOption($argv);
- } elseif (substr($argv[0], 0, 1) == '-' && ('-' != $argv[0] || count($argv) >1)) {
+ } elseif (substr($argv[0], 0, 1) == '-' && ('-' != $argv[0] || count($argv) >1)) {
$this->_parseShortOptionCluster($argv);
} elseif ($this->getoptConfig[self::CONFIG_PARSEALL]) {
$this->remainingArgs[] = array_shift($argv);
@@ -690,16 +686,58 @@ class Getopt
}
}
$this->parsed = true;
+
+ //go through parsed args and process callbacks
+ $this->triggerCallbacks();
+
return $this;
}
+ /**
+ * @param string $option The name of the property which, if present, will call the passed
+ * callback with the value of this parameter.
+ * @param callable $callback The callback that will be called for this option. The first
+ * parameter will be the value of getOption($option), the second
+ * parameter will be a reference to $this object. If the callback returns
+ * false then an Exception\RuntimeException will be thrown indicating that
+ * there is a parse issue with this option.
+ *
+ * @return self
+ */
+ public function setOptionCallback($option, \Closure $callback)
+ {
+ $this->optionCallbacks[$option] = $callback;
+
+ return $this;
+ }
+
+ /**
+ * Triggers all the registered callbacks.
+ */
+ protected function triggerCallbacks()
+ {
+ foreach ($this->optionCallbacks as $option => $callback) {
+ if (null === $this->getOption($option)) {
+ continue;
+ }
+ //make sure we've resolved the alias, if using one
+ if (isset($this->ruleMap[$option]) && $option = $this->ruleMap[$option]) {
+ if (false === $callback($this->getOption($option), $this)) {
+ throw new Exception\RuntimeException(
+ "The option $option is invalid. See usage.",
+ $this->getUsageMessage()
+ );
+ }
+ }
+ }
+ }
+
/**
* Parse command-line arguments for a single long option.
* A long option is preceded by a double '--' character.
* Long options may not be clustered.
*
* @param mixed &$argv
- * @return void
*/
protected function _parseLongOption(&$argv)
{
@@ -719,7 +757,6 @@ class Getopt
* Short options may be clustered.
*
* @param mixed &$argv
- * @return void
*/
protected function _parseShortOptionCluster(&$argv)
{
@@ -734,8 +771,7 @@ class Getopt
*
* @param string $flag
* @param mixed $argv
- * @throws \Zend\Console\Exception\ExceptionInterface
- * @return void
+ * @throws Exception\ExceptionInterface
*/
protected function _parseSingleOption($flag, &$argv)
{
@@ -754,7 +790,7 @@ class Getopt
throw new Exception\RuntimeException(
"Option \"$flag\" is not recognized.",
$this->getUsageMessage()
- );
+ );
}
// Magic methods in future will use this mark as real flag value
@@ -777,7 +813,7 @@ class Getopt
throw new Exception\RuntimeException(
"Option \"$flag\" requires a parameter.",
$this->getUsageMessage()
- );
+ );
}
break;
case 'optional':
@@ -795,7 +831,6 @@ class Getopt
$this->_setSingleOptionValue($realFlag, $param);
}
-
/**
* Set given value as value of numeric option
*
@@ -828,7 +863,6 @@ class Getopt
*
* @param string $flag
* @param string $value
- * @return null
*/
protected function _setSingleOptionValue($flag, $value)
{
@@ -859,13 +893,12 @@ class Getopt
* In other case increase value to show count of flags' usage
*
* @param string $flag
- * @return null
*/
protected function _setBooleanFlagValue($flag)
{
$this->options[$flag] = array_key_exists($flag, $this->options)
- ? (int) $this->options[$flag] + 1
- : true;
+ ? (int) $this->options[$flag] + 1
+ : true;
}
/**
@@ -875,7 +908,7 @@ class Getopt
*
* @param string $flag
* @param string $param
- * @throws \Zend\Console\Exception\ExceptionInterface
+ * @throws Exception\ExceptionInterface
* @return bool
*/
protected function _checkParameterType($flag, $param)
@@ -889,14 +922,16 @@ class Getopt
if (preg_match('/\W/', $param)) {
throw new Exception\RuntimeException(
"Option \"$flag\" requires a single-word parameter, but was given \"$param\".",
- $this->getUsageMessage());
+ $this->getUsageMessage()
+ );
}
break;
case 'integer':
if (preg_match('/\D/', $param)) {
throw new Exception\RuntimeException(
"Option \"$flag\" requires an integer parameter, but was given \"$param\".",
- $this->getUsageMessage());
+ $this->getUsageMessage()
+ );
}
break;
case 'string':
@@ -910,7 +945,6 @@ class Getopt
* Define legal options using the gnu-style format.
*
* @param string $rules
- * @return void
*/
protected function _addRulesModeGnu($rules)
{
@@ -944,8 +978,7 @@ class Getopt
* Define legal options using the Zend-style format.
*
* @param array $rules
- * @throws \Zend\Console\Exception\ExceptionInterface
- * @return void
+ * @throws Exception\ExceptionInterface
*/
protected function _addRulesModeZend($rules)
{
@@ -974,14 +1007,16 @@ class Getopt
if (strlen($flag) == 1) {
if (isset($this->ruleMap[$flag])) {
throw new Exception\InvalidArgumentException(
- "Option \"-$flag\" is being defined more than once.");
+ "Option \"-$flag\" is being defined more than once."
+ );
}
$this->ruleMap[$flag] = $mainFlag;
$rule['alias'][] = $flag;
} else {
if (isset($this->rules[$flag]) || isset($this->ruleMap[$flag])) {
throw new Exception\InvalidArgumentException(
- "Option \"--$flag\" is being defined more than once.");
+ "Option \"--$flag\" is being defined more than once."
+ );
}
$this->ruleMap[$flag] = $mainFlag;
$rule['alias'][] = $flag;
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/AbstractPrompt.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/AbstractPrompt.php
index cd717cf35ca..225533cef98 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/AbstractPrompt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/AbstractPrompt.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Char.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Char.php
index 7a7dde1f271..a16e3fc651f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Char.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Char.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -52,7 +52,6 @@ class Char extends AbstractPrompt
$allowEmpty = false,
$echo = true
) {
-
$this->setPromptText($promptText);
$this->setAllowEmpty($allowEmpty);
$this->setIgnoreCase($ignoreCase);
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Confirm.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Confirm.php
index 77db665d067..67465790311 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Confirm.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Confirm.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -77,7 +77,6 @@ class Confirm extends Char
return $this->lastResponse = $response;
}
-
/**
* @param string $noChar
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Line.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Line.php
index 4abcd5e9f9e..3b2bb784d5b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Line.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Line.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -51,7 +51,7 @@ class Line extends AbstractPrompt
/**
* Show the prompt to user and return the answer.
*
- * @return mixed
+ * @return string
*/
public function show()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Number.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Number.php
index 8ce53300532..7f096a7e13d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Number.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Number.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/PromptInterface.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/PromptInterface.php
index a4f1376f8b8..54e8615c18d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/PromptInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/PromptInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -38,6 +38,7 @@ interface PromptInterface
* Set console adapter to use when showing prompt.
*
* @param ConsoleAdapter $adapter
+ * @return void
*/
public function setConsole(ConsoleAdapter $adapter);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Select.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Select.php
index 896a8c10dd1..e31361cf204 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Select.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Select.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -62,7 +62,6 @@ class Select extends Char
if ($echo !== null) {
$this->setEcho($echo);
}
-
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Request.php b/vendor/zendframework/zendframework/library/Zend/Console/Request.php
index 57b48bb2cb1..1c885c4f3f9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Request.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Request.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/Response.php b/vendor/zendframework/zendframework/library/Zend/Console/Response.php
index 9ed1362947b..b6784257d96 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Response.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/Response.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Stdlib\ResponseInterface;
class Response extends Message implements ResponseInterface
{
-
/**
* @var bool
*/
@@ -75,8 +74,7 @@ class Response extends Message implements ResponseInterface
public function send()
{
$this->sendContent();
- $errorLevel = (int) $this->getMetadata('errorLevel',0);
+ $errorLevel = (int) $this->getMetadata('errorLevel', 0);
exit($errorLevel);
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/RouteMatcher/DefaultRouteMatcher.php b/vendor/zendframework/zendframework/library/Zend/Console/RouteMatcher/DefaultRouteMatcher.php
new file mode 100644
index 00000000000..07a65504e5a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Console/RouteMatcher/DefaultRouteMatcher.php
@@ -0,0 +1,780 @@
+<?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\Console\RouteMatcher;
+
+use Zend\Console\Exception;
+use Zend\Validator\ValidatorInterface;
+use Zend\Filter\FilterInterface;
+
+class DefaultRouteMatcher implements RouteMatcherInterface
+{
+ /**
+ * Parts of the route.
+ *
+ * @var array
+ */
+ protected $parts;
+
+ /**
+ * Default values.
+ *
+ * @var array
+ */
+ protected $defaults;
+
+ /**
+ * Parameters' name aliases.
+ *
+ * @var array
+ */
+ protected $aliases;
+
+ /**
+ * @var ValidatorInterface[]
+ */
+ protected $validators = array();
+
+ /**
+ * @var FilterInterface[]
+ */
+ protected $filters = array();
+
+ /**
+ * Class constructor
+ *
+ * @param string $route
+ * @param array $constraints
+ * @param array $defaults
+ * @param array $aliases
+ * @param array $filters
+ * @param ValidatorInterface[] $validators
+ * @throws Exception\InvalidArgumentException
+ */
+ public function __construct(
+ $route,
+ array $constraints = array(),
+ array $defaults = array(),
+ array $aliases = array(),
+ array $filters = null,
+ array $validators = null
+ ) {
+ $this->defaults = $defaults;
+ $this->constraints = $constraints;
+ $this->aliases = $aliases;
+
+ if ($filters !== null) {
+ foreach ($filters as $name => $filter) {
+ if (!$filter instanceof FilterInterface) {
+ throw new Exception\InvalidArgumentException('Cannot use ' . gettype($filters) . ' as filter for ' . __CLASS__);
+ }
+ $this->filters[$name] = $filter;
+ }
+ }
+
+ if ($validators !== null) {
+ foreach ($validators as $name => $validator) {
+ if (!$validator instanceof ValidatorInterface) {
+ throw new Exception\InvalidArgumentException('Cannot use ' . gettype($validator) . ' as validator for ' . __CLASS__);
+ }
+ $this->validators[$name] = $validator;
+ }
+ }
+
+ $this->parts = $this->parseDefinition($route);
+ }
+
+ /**
+ * Parse a route definition.
+ *
+ * @param string $def
+ * @return array
+ * @throws Exception\InvalidArgumentException
+ */
+ protected function parseDefinition($def)
+ {
+ $def = trim($def);
+ $pos = 0;
+ $length = strlen($def);
+ $parts = array();
+ $unnamedGroupCounter = 1;
+
+ while ($pos < $length) {
+ /**
+ * Optional value param, i.e.
+ * [SOMETHING]
+ */
+ if (preg_match('/\G\[(?P<name>[A-Z][A-Z0-9\_\-]*?)\](?: +|$)/s', $def, $m, 0, $pos)) {
+ $item = array(
+ 'name' => strtolower($m['name']),
+ 'literal' => false,
+ 'required' => false,
+ 'positional' => true,
+ 'hasValue' => true,
+ );
+ }
+ /**
+ * Mandatory value param, i.e.
+ * SOMETHING
+ */
+ elseif (preg_match('/\G(?P<name>[A-Z][A-Z0-9\_\-]*?)(?: +|$)/s', $def, $m, 0, $pos)) {
+ $item = array(
+ 'name' => strtolower($m['name']),
+ 'literal' => false,
+ 'required' => true,
+ 'positional' => true,
+ 'hasValue' => true,
+ );
+ }
+ /**
+ * Optional literal param, i.e.
+ * [something]
+ */
+ elseif (preg_match('/\G\[ *?(?P<name>[a-zA-Z][a-zA-Z0-9\_\-]*?) *?\](?: +|$)/s', $def, $m, 0, $pos)) {
+ $item = array(
+ 'name' => $m['name'],
+ 'literal' => true,
+ 'required' => false,
+ 'positional' => true,
+ 'hasValue' => false,
+ );
+ }
+ /**
+ * Optional value param, syntax 2, i.e.
+ * [<something>]
+ */
+ elseif (preg_match('/\G\[ *\<(?P<name>[a-zA-Z][a-zA-Z0-9\_\-]*?)\> *\](?: +|$)/s', $def, $m, 0, $pos)) {
+ $item = array(
+ 'name' => $m['name'],
+ 'literal' => false,
+ 'required' => false,
+ 'positional' => true,
+ 'hasValue' => true,
+ );
+ }
+ /**
+ * Mandatory value param, i.e.
+ * <something>
+ */
+ elseif (preg_match('/\G\< *(?P<name>[a-zA-Z][a-zA-Z0-9\_\-]*?) *\>(?: +|$)/s', $def, $m, 0, $pos)) {
+ $item = array(
+ 'name' => $m['name'],
+ 'literal' => false,
+ 'required' => true,
+ 'positional' => true,
+ 'hasValue' => true,
+ );
+ }
+ /**
+ * Mandatory literal param, i.e.
+ * something
+ */
+ elseif (preg_match('/\G(?P<name>[a-zA-Z][a-zA-Z0-9\_\-]*?)(?: +|$)/s', $def, $m, 0, $pos)) {
+ $item = array(
+ 'name' => $m['name'],
+ 'literal' => true,
+ 'required' => true,
+ 'positional' => true,
+ 'hasValue' => false,
+ );
+ }
+ /**
+ * Mandatory long param
+ * --param=
+ * --param=whatever
+ */
+ elseif (preg_match('/\G--(?P<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+)(?P<hasValue>=\S*?)?(?: +|$)/s', $def, $m, 0, $pos)) {
+ $item = array(
+ 'name' => $m['name'],
+ 'short' => false,
+ 'literal' => false,
+ 'required' => true,
+ 'positional' => false,
+ 'hasValue' => !empty($m['hasValue']),
+ );
+ }
+ /**
+ * Optional long flag
+ * [--param]
+ */
+ elseif (preg_match(
+ '/\G\[ *?--(?P<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+) *?\](?: +|$)/s', $def, $m, 0, $pos
+ )) {
+ $item = array(
+ 'name' => $m['name'],
+ 'short' => false,
+ 'literal' => false,
+ 'required' => false,
+ 'positional' => false,
+ 'hasValue' => false,
+ );
+ }
+ /**
+ * Optional long param
+ * [--param=]
+ * [--param=whatever]
+ */
+ elseif (preg_match(
+ '/\G\[ *?--(?P<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+)(?P<hasValue>=\S*?)? *?\](?: +|$)/s', $def, $m, 0, $pos
+ )) {
+ $item = array(
+ 'name' => $m['name'],
+ 'short' => false,
+ 'literal' => false,
+ 'required' => false,
+ 'positional' => false,
+ 'hasValue' => !empty($m['hasValue']),
+ );
+ }
+ /**
+ * Mandatory short param
+ * -a
+ * -a=i
+ * -a=s
+ * -a=w
+ */
+ elseif (preg_match('/\G-(?P<name>[a-zA-Z0-9])(?:=(?P<type>[ns]))?(?: +|$)/s', $def, $m, 0, $pos)) {
+ $item = array(
+ 'name' => $m['name'],
+ 'short' => true,
+ 'literal' => false,
+ 'required' => true,
+ 'positional' => false,
+ 'hasValue' => !empty($m['type']) ? $m['type'] : null,
+ );
+ }
+ /**
+ * Optional short param
+ * [-a]
+ * [-a=n]
+ * [-a=s]
+ */
+ elseif (preg_match('/\G\[ *?-(?P<name>[a-zA-Z0-9])(?:=(?P<type>[ns]))? *?\](?: +|$)/s', $def, $m, 0, $pos)) {
+ $item = array(
+ 'name' => $m['name'],
+ 'short' => true,
+ 'literal' => false,
+ 'required' => false,
+ 'positional' => false,
+ 'hasValue' => !empty($m['type']) ? $m['type'] : null,
+ );
+ }
+ /**
+ * Optional literal param alternative
+ * [ something | somethingElse | anotherOne ]
+ * [ something | somethingElse | anotherOne ]:namedGroup
+ */
+ elseif (preg_match('/
+ \G
+ \[
+ (?P<options>
+ (?:
+ \ *?
+ (?P<name>[a-zA-Z][a-zA-Z0-9_\-]*?)
+ \ *?
+ (?:\||(?=\]))
+ \ *?
+ )+
+ )
+ \]
+ (?:\:(?P<groupName>[a-zA-Z0-9]+))?
+ (?:\ +|$)
+ /sx', $def, $m, 0, $pos
+ )
+ ) {
+ // extract available options
+ $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
+
+ // remove dupes
+ array_unique($options);
+
+ // prepare item
+ $item = array(
+ 'name' => isset($m['groupName']) ? $m['groupName'] : 'unnamedGroup' . $unnamedGroupCounter++,
+ 'literal' => true,
+ 'required' => false,
+ 'positional' => true,
+ 'alternatives' => $options,
+ 'hasValue' => false,
+ );
+ }
+
+ /**
+ * Required literal param alternative
+ * ( something | somethingElse | anotherOne )
+ * ( something | somethingElse | anotherOne ):namedGroup
+ */
+ elseif (preg_match('/
+ \G
+ \(
+ (?P<options>
+ (?:
+ \ *?
+ (?P<name>[a-zA-Z][a-zA-Z0-9_\-]+)
+ \ *?
+ (?:\||(?=\)))
+ \ *?
+ )+
+ )
+ \)
+ (?:\:(?P<groupName>[a-zA-Z0-9]+))?
+ (?:\ +|$)
+ /sx', $def, $m, 0, $pos
+ )) {
+ // extract available options
+ $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
+
+ // remove dupes
+ array_unique($options);
+
+ // prepare item
+ $item = array(
+ 'name' => isset($m['groupName']) ? $m['groupName']:'unnamedGroupAt' . $unnamedGroupCounter++,
+ 'literal' => true,
+ 'required' => true,
+ 'positional' => true,
+ 'alternatives' => $options,
+ 'hasValue' => false,
+ );
+ }
+ /**
+ * Required long/short flag alternative
+ * ( --something | --somethingElse | --anotherOne | -s | -a )
+ * ( --something | --somethingElse | --anotherOne | -s | -a ):namedGroup
+ */
+ elseif (preg_match('/
+ \G
+ \(
+ (?P<options>
+ (?:
+ \ *?
+ \-+(?P<name>[a-zA-Z0-9][a-zA-Z0-9_\-]*?)
+ \ *?
+ (?:\||(?=\)))
+ \ *?
+ )+
+ )
+ \)
+ (?:\:(?P<groupName>[a-zA-Z0-9]+))?
+ (?:\ +|$)
+ /sx', $def, $m, 0, $pos
+ )) {
+ // extract available options
+ $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
+
+ // remove dupes
+ array_unique($options);
+
+ // remove prefix
+ array_walk($options, function (&$val, $key) {
+ $val = ltrim($val, '-');
+ });
+
+ // prepare item
+ $item = array(
+ 'name' => isset($m['groupName']) ? $m['groupName']:'unnamedGroupAt' . $unnamedGroupCounter++,
+ 'literal' => false,
+ 'required' => true,
+ 'positional' => false,
+ 'alternatives' => $options,
+ 'hasValue' => false,
+ );
+ }
+ /**
+ * Optional flag alternative
+ * [ --something | --somethingElse | --anotherOne | -s | -a ]
+ * [ --something | --somethingElse | --anotherOne | -s | -a ]:namedGroup
+ */
+ elseif (preg_match('/
+ \G
+ \[
+ (?P<options>
+ (?:
+ \ *?
+ \-+(?P<name>[a-zA-Z0-9][a-zA-Z0-9_\-]*?)
+ \ *?
+ (?:\||(?=\]))
+ \ *?
+ )+
+ )
+ \]
+ (?:\:(?P<groupName>[a-zA-Z0-9]+))?
+ (?:\ +|$)
+ /sx', $def, $m, 0, $pos
+ )) {
+ // extract available options
+ $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
+
+ // remove dupes
+ array_unique($options);
+
+ // remove prefix
+ array_walk($options, function (&$val, $key) {
+ $val = ltrim($val, '-');
+ });
+
+ // prepare item
+ $item = array(
+ 'name' => isset($m['groupName']) ? $m['groupName']:'unnamedGroupAt' . $unnamedGroupCounter++,
+ 'literal' => false,
+ 'required' => false,
+ 'positional' => false,
+ 'alternatives' => $options,
+ 'hasValue' => false,
+ );
+ } else {
+ throw new Exception\InvalidArgumentException(
+ 'Cannot understand Console route at "' . substr($def, $pos) . '"'
+ );
+ }
+
+ $pos += strlen($m[0]);
+ $parts[] = $item;
+ }
+
+ return $parts;
+ }
+
+ /**
+ * Returns list of names representing single parameter
+ *
+ * @param string $name
+ * @return string
+ */
+ private function getAliases($name)
+ {
+ $namesToMatch = array($name);
+ foreach ($this->aliases as $alias => $canonical) {
+ if ($name == $canonical) {
+ $namesToMatch[] = $alias;
+ }
+ }
+ return $namesToMatch;
+ }
+
+ /**
+ * Returns canonical name of a parameter
+ *
+ * @param string $name
+ * @return string
+ */
+ private function getCanonicalName($name)
+ {
+ if (isset($this->aliases[$name])) {
+ return $this->aliases[$name];
+ }
+ return $name;
+ }
+
+ /**
+ * Match parameters against route passed to constructor
+ *
+ * @param array $params
+ * @return array|null
+ */
+ public function match($params)
+ {
+ $matches = array();
+
+ /*
+ * Extract positional and named parts
+ */
+ $positional = $named = array();
+ foreach ($this->parts as &$part) {
+ if ($part['positional']) {
+ $positional[] = &$part;
+ } else {
+ $named[] = &$part;
+ }
+ }
+
+ /*
+ * Scan for named parts inside Console params
+ */
+ foreach ($named as &$part) {
+ /*
+ * Prepare match regex
+ */
+ if (isset($part['alternatives'])) {
+ // an alternative of flags
+ $regex = '/^\-+(?P<name>';
+
+ $alternativeAliases = array();
+ foreach ($part['alternatives'] as $alternative) {
+ $alternativeAliases[] = '(?:' . implode('|', $this->getAliases($alternative)) . ')';
+ }
+
+ $regex .= join('|', $alternativeAliases);
+
+ if ($part['hasValue']) {
+ $regex .= ')(?:\=(?P<value>.*?)$)?$/';
+ } else {
+ $regex .= ')$/i';
+ }
+ } else {
+ // a single named flag
+ $name = '(?:' . implode('|', $this->getAliases($part['name'])) . ')';
+
+ if ($part['short'] === true) {
+ // short variant
+ if ($part['hasValue']) {
+ $regex = '/^\-' . $name . '(?:\=(?P<value>.*?)$)?$/i';
+ } else {
+ $regex = '/^\-' . $name . '$/i';
+ }
+ } elseif ($part['short'] === false) {
+ // long variant
+ if ($part['hasValue']) {
+ $regex = '/^\-{2,}' . $name . '(?:\=(?P<value>.*?)$)?$/i';
+ } else {
+ $regex = '/^\-{2,}' . $name . '$/i';
+ }
+ }
+ }
+
+ /*
+ * Look for param
+ */
+ $value = $param = null;
+ for ($x = 0, $count = count($params); $x < $count; $x++) {
+ if (preg_match($regex, $params[$x], $m)) {
+ // found param
+ $param = $params[$x];
+
+ // prevent further scanning of this param
+ array_splice($params, $x, 1);
+
+ if (isset($m['value'])) {
+ $value = $m['value'];
+ }
+
+ if (isset($m['name'])) {
+ $matchedName = $this->getCanonicalName($m['name']);
+ }
+
+ break;
+ }
+ }
+
+
+ if (!$param) {
+ /*
+ * Drop out if that was a mandatory param
+ */
+ if ($part['required']) {
+ return null;
+ }
+
+ /*
+ * Continue to next positional param
+ */
+ else {
+ continue;
+ }
+ }
+
+
+ /*
+ * Value for flags is always boolean
+ */
+ if ($param && !$part['hasValue']) {
+ $value = true;
+ }
+
+ /*
+ * Try to retrieve value if it is expected
+ */
+ if ((null === $value || "" === $value) && $part['hasValue']) {
+ if ($x < count($params)+1 && isset($params[$x])) {
+ // retrieve value from adjacent param
+ $value = $params[$x];
+
+ // prevent further scanning of this param
+ array_splice($params, $x, 1);
+ } else {
+ // there are no more params available
+ return null;
+ }
+ }
+
+ /*
+ * Validate the value against constraints
+ */
+ if ($part['hasValue'] && isset($this->constraints[$part['name']])) {
+ if (
+ !preg_match($this->constraints[$part['name']], $value)
+ ) {
+ // constraint failed
+ return null;
+ }
+ }
+
+ /*
+ * Store the value
+ */
+ if ($part['hasValue']) {
+ $matches[$part['name']] = $value;
+ } else {
+ $matches[$part['name']] = true;
+ }
+
+ /*
+ * If there are alternatives, fill them
+ */
+ if (isset($part['alternatives'])) {
+ if ($part['hasValue']) {
+ foreach ($part['alternatives'] as $alt) {
+ if ($alt === $matchedName && !isset($matches[$alt])) {
+ $matches[$alt] = $value;
+ } elseif (!isset($matches[$alt])) {
+ $matches[$alt] = null;
+ }
+ }
+ } else {
+ foreach ($part['alternatives'] as $alt) {
+ if ($alt === $matchedName && !isset($matches[$alt])) {
+ $matches[$alt] = isset($this->defaults[$alt])? $this->defaults[$alt] : true;
+ } elseif (!isset($matches[$alt])) {
+ $matches[$alt] = false;
+ }
+ }
+ }
+ }
+ }
+
+ /*
+ * Scan for left-out flags that should result in a mismatch
+ */
+ foreach ($params as $param) {
+ if (preg_match('#^\-+#', $param)) {
+ return null; // there is an unrecognized flag
+ }
+ }
+
+ /*
+ * Go through all positional params
+ */
+ $argPos = 0;
+ foreach ($positional as &$part) {
+ /*
+ * Check if param exists
+ */
+ if (!isset($params[$argPos])) {
+ if ($part['required']) {
+ // cannot find required positional param
+ return null;
+ } else {
+ // stop matching
+ break;
+ }
+ }
+
+ $value = $params[$argPos];
+
+ /*
+ * Check if literal param matches
+ */
+ if ($part['literal']) {
+ if (
+ (isset($part['alternatives']) && !in_array($value, $part['alternatives'])) ||
+ (!isset($part['alternatives']) && $value != $part['name'])
+ ) {
+ return null;
+ }
+ }
+
+ /*
+ * Validate the value against constraints
+ */
+ if ($part['hasValue'] && isset($this->constraints[$part['name']])) {
+ if (
+ !preg_match($this->constraints[$part['name']], $value)
+ ) {
+ // constraint failed
+ return null;
+ }
+ }
+
+ /*
+ * Store the value
+ */
+ if ($part['hasValue']) {
+ $matches[$part['name']] = $value;
+ } elseif (isset($part['alternatives'])) {
+ // from all alternatives set matching parameter to TRUE and the rest to FALSE
+ foreach ($part['alternatives'] as $alt) {
+ if ($alt == $value) {
+ $matches[$alt] = isset($this->defaults[$alt])? $this->defaults[$alt] : true;
+ } else {
+ $matches[$alt] = false;
+ }
+ }
+
+ // set alternatives group value
+ $matches[$part['name']] = $value;
+ } elseif (!$part['required']) {
+ // set optional parameter flag
+ $name = $part['name'];
+ $matches[$name] = isset($this->defaults[$name])? $this->defaults[$name] : true;
+ }
+
+ /*
+ * Advance to next argument
+ */
+ $argPos++;
+ }
+
+ /*
+ * Check if we have consumed all positional parameters
+ */
+ if ($argPos < count($params)) {
+ return null; // there are extraneous params that were not consumed
+ }
+
+ /*
+ * Any optional flags that were not entered have value false
+ */
+ foreach ($this->parts as &$part) {
+ if (!$part['required'] && !$part['hasValue']) {
+ if (!isset($matches[$part['name']])) {
+ $matches[$part['name']] = false;
+ }
+ // unset alternatives also should be false
+ if (isset($part['alternatives'])) {
+ foreach ($part['alternatives'] as $alt) {
+ if (!isset($matches[$alt])) {
+ $matches[$alt] = false;
+ }
+ }
+ }
+ }
+ }
+
+ // run filters
+ foreach ($matches as $name => $value) {
+ if (isset($this->filters[$name])) {
+ $matches[$name] = $this->filters[$name]->filter($value);
+ }
+ }
+
+ // run validators
+ $valid = true;
+ foreach ($matches as $name => $value) {
+ if (isset($this->validators[$name])) {
+ $valid &= $this->validators[$name]->isValid($value);
+ }
+ }
+
+ if (!$valid) {
+ return null;
+ }
+
+ return array_replace($this->defaults, $matches);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/RouteMatcher/RouteMatcherInterface.php b/vendor/zendframework/zendframework/library/Zend/Console/RouteMatcher/RouteMatcherInterface.php
new file mode 100644
index 00000000000..b8d5bac79e9
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Console/RouteMatcher/RouteMatcherInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Console\RouteMatcher;
+
+interface RouteMatcherInterface
+{
+ /**
+ * Match parameters against route passed to constructor
+ *
+ * @param array $params
+ * @return array|null
+ */
+ public function match($params);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Console/composer.json b/vendor/zendframework/zendframework/library/Zend/Console/composer.json
index be5bbf50a91..8265ef2bdcc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Console/composer.json
@@ -6,6 +6,7 @@
"zf2",
"console"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Console\\": ""
@@ -13,13 +14,17 @@
},
"target-dir": "Zend/Console",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
+ "suggest": {
+ "zendframework/zend-validator": "To support DefaultRouteMatcher usage",
+ "zendframework/zend-filter": "To support DefaultRouteMatcher usage"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/BlockCipher.php b/vendor/zendframework/zendframework/library/Zend/Crypt/BlockCipher.php
index 03cc12da82e..4cba25617c3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/BlockCipher.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/BlockCipher.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,12 @@ use Zend\Math\Rand;
*/
class BlockCipher
{
- const KEY_DERIV_HMAC = 'sha256';
+ /**
+ * Hash algorithm for Pbkdf2
+ *
+ * @var string
+ */
+ protected $pbkdf2Hash = 'sha256';
/**
* Symmetric cipher
@@ -35,7 +40,7 @@ class BlockCipher
protected static $symmetricPlugins = null;
/**
- * Hash algorithm fot HMAC
+ * Hash algorithm for HMAC
*
* @var string
*/
@@ -72,7 +77,7 @@ class BlockCipher
/**
* Constructor
*
- * @param SymmetricInterface $cipher
+ * @param SymmetricInterface $cipher
*/
public function __construct(SymmetricInterface $cipher)
{
@@ -160,7 +165,7 @@ class BlockCipher
/**
* Set the number of iterations for Pbkdf2
*
- * @param int $num
+ * @param int $num
* @return BlockCipher
*/
public function setKeyIteration($num)
@@ -183,7 +188,7 @@ class BlockCipher
/**
* Set the salt (IV)
*
- * @param string $salt
+ * @param string $salt
* @return BlockCipher
* @throws Exception\InvalidArgumentException
*/
@@ -222,7 +227,7 @@ class BlockCipher
/**
* Enable/disable the binary output
*
- * @param bool $value
+ * @param bool $value
* @return BlockCipher
*/
public function setBinaryOutput($value)
@@ -272,7 +277,7 @@ class BlockCipher
/**
* Set algorithm of the symmetric cipher
*
- * @param string $algo
+ * @param string $algo
* @return BlockCipher
* @throws Exception\InvalidArgumentException
*/
@@ -321,7 +326,7 @@ class BlockCipher
/**
* Set the hash algorithm for HMAC authentication
*
- * @param string $hash
+ * @param string $hash
* @return BlockCipher
* @throws Exception\InvalidArgumentException
*/
@@ -347,19 +352,58 @@ class BlockCipher
return $this->hash;
}
+ /**
+ * Set the hash algorithm for the Pbkdf2
+ *
+ * @param string $hash
+ * @return BlockCipher
+ * @throws Exception\InvalidArgumentException
+ */
+ public function setPbkdf2HashAlgorithm($hash)
+ {
+ if (!Hash::isSupported($hash)) {
+ throw new Exception\InvalidArgumentException(
+ "The specified hash algorithm '{$hash}' is not supported by Zend\Crypt\Hash"
+ );
+ }
+ $this->pbkdf2Hash = $hash;
+
+ return $this;
+ }
+
+ /**
+ * Get the Pbkdf2 hash algorithm
+ *
+ * @return string
+ */
+ public function getPbkdf2HashAlgorithm()
+ {
+ return $this->pbkdf2Hash;
+ }
+
/**
* Encrypt then authenticate using HMAC
*
- * @param string $data
+ * @param string $data
* @return string
* @throws Exception\InvalidArgumentException
*/
public function encrypt($data)
{
// 0 (as integer), 0.0 (as float) & '0' (as string) will return false, though these should be allowed
- if (!is_string($data) || $data === '') {
+ // Must be a string, integer, or float in order to encrypt
+ if ((is_string($data) && $data === '')
+ || is_array($data)
+ || is_object($data)
+ ) {
throw new Exception\InvalidArgumentException('The data to encrypt cannot be empty');
}
+
+ // Cast to string prior to encrypting
+ if (!is_string($data)) {
+ $data = (string) $data;
+ }
+
if (empty($this->cipher)) {
throw new Exception\InvalidArgumentException('No symmetric cipher specified');
}
@@ -372,11 +416,13 @@ class BlockCipher
$this->cipher->setSalt(Rand::getBytes($this->cipher->getSaltSize(), true));
}
// generate the encryption key and the HMAC key for the authentication
- $hash = Pbkdf2::calc(self::KEY_DERIV_HMAC,
- $this->getKey(),
- $this->getSalt(),
- $this->keyIteration,
- $keySize * 2);
+ $hash = Pbkdf2::calc(
+ $this->getPbkdf2HashAlgorithm(),
+ $this->getKey(),
+ $this->getSalt(),
+ $this->keyIteration,
+ $keySize * 2
+ );
// set the encryption key
$this->cipher->setKey(substr($hash, 0, $keySize));
// set the key for HMAC
@@ -384,9 +430,7 @@ class BlockCipher
// encryption
$ciphertext = $this->cipher->encrypt($data);
// HMAC
- $hmac = Hmac::compute($keyHmac,
- $this->hash,
- $this->cipher->getAlgorithm() . $ciphertext);
+ $hmac = Hmac::compute($keyHmac, $this->hash, $this->cipher->getAlgorithm() . $ciphertext);
if (!$this->binaryOutput) {
$ciphertext = base64_encode($ciphertext);
}
@@ -397,7 +441,7 @@ class BlockCipher
/**
* Decrypt
*
- * @param string $data
+ * @param string $data
* @return string|bool
* @throws Exception\InvalidArgumentException
*/
@@ -424,18 +468,18 @@ class BlockCipher
$iv = substr($ciphertext, 0, $this->cipher->getSaltSize());
$keySize = $this->cipher->getKeySize();
// generate the encryption key and the HMAC key for the authentication
- $hash = Pbkdf2::calc(self::KEY_DERIV_HMAC,
- $this->getKey(),
- $iv,
- $this->keyIteration,
- $keySize * 2);
+ $hash = Pbkdf2::calc(
+ $this->getPbkdf2HashAlgorithm(),
+ $this->getKey(),
+ $iv,
+ $this->keyIteration,
+ $keySize * 2
+ );
// set the decryption key
$this->cipher->setKey(substr($hash, 0, $keySize));
// set the key for HMAC
$keyHmac = substr($hash, $keySize);
- $hmacNew = Hmac::compute($keyHmac,
- $this->hash,
- $this->cipher->getAlgorithm() . $ciphertext);
+ $hmacNew = Hmac::compute($keyHmac, $this->hash, $this->cipher->getAlgorithm() . $ciphertext);
if (!Utils::compareStrings($hmacNew, $hmac)) {
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Crypt/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/ExceptionInterface.php
index ef937436149..0748e326d39 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/InvalidArgumentException.php
index bb7f4e1e4fe..2e64150bf5c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,6 @@ namespace Zend\Crypt\Exception;
/**
* Invalid argument exception
*/
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/RuntimeException.php
index db07a4e6e07..037a448d418 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,6 @@ namespace Zend\Crypt\Exception;
/**
* Runtime argument exception
*/
-class RuntimeException
- extends \RuntimeException
- implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Hash.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Hash.php
index ccbd15d3bb0..826cc8888ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Hash.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Hash.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Hmac.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Hmac.php
index 54cce7bff2f..5e3ee975dbd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Hmac.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Hmac.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -38,7 +38,6 @@ class Hmac
*/
public static function compute($key, $hash, $data, $output = self::OUTPUT_STRING)
{
-
if (empty($key)) {
throw new Exception\InvalidArgumentException('Provided key is null or empty');
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php
index 31bdfff9871..b513962a5d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Crypt\Key\Derivation\Exception;
use Zend\Crypt\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php
index e4c2512743e..a82f9e3b748 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,4 +16,5 @@ use Zend\Crypt\Exception;
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php
index 9421317c5bb..85b8c1726e1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,4 +16,5 @@ use Zend\Crypt\Exception;
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Pbkdf2.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
index 8d216d646a9..af3835a4e68 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/SaltedS2k.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
index 9e3229b082e..4a01e19075c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/SaltedS2k.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,6 +15,7 @@ namespace Zend\Crypt\Key\Derivation;
class SaltedS2k
{
protected static $supportedMhashAlgos = array (
+ 'adler32' => MHASH_ADLER32,
'md2' => MHASH_MD2,
'md4' => MHASH_MD4,
'md5' => MHASH_MD5,
@@ -26,13 +27,21 @@ class SaltedS2k
'ripemd128' => MHASH_RIPEMD128,
'ripemd256' => MHASH_RIPEMD256,
'ripemd320' => MHASH_RIPEMD320,
- 'haval128,3' => MHASH_HAVAL128,
- 'haval160,3' => MHASH_HAVAL160,
- 'haval192,3' => MHASH_HAVAL192,
- 'haval224,3' => MHASH_HAVAL224,
- 'haval256,3' => MHASH_HAVAL256,
- 'tiger128,3' => MHASH_TIGER128,
- 'riger160,3' => MHASH_TIGER160,
+ 'haval128,3' => MHASH_HAVAL128, // @deprecated use haval128 instead
+ 'haval128' => MHASH_HAVAL128,
+ 'haval160,3' => MHASH_HAVAL160, // @deprecated use haval160 instead
+ 'haval160' => MHASH_HAVAL160,
+ 'haval192,3' => MHASH_HAVAL192, // @deprecated use haval192 instead
+ 'haval192' => MHASH_HAVAL192,
+ 'haval224,3' => MHASH_HAVAL224, // @deprecated use haval224 instead
+ 'haval224' => MHASH_HAVAL224,
+ 'haval256,3' => MHASH_HAVAL256, // @deprecated use haval256 instead
+ 'haval256' => MHASH_HAVAL256,
+ 'tiger' => MHASH_TIGER,
+ 'tiger128,3' => MHASH_TIGER128, // @deprecated use tiger128 instead
+ 'tiger128' => MHASH_TIGER128,
+ 'tiger160,3' => MHASH_TIGER160, // @deprecated use tiger160 instead
+ 'tiger160' => MHASH_TIGER160,
'whirpool' => MHASH_WHIRLPOOL,
'snefru256' => MHASH_SNEFRU256,
'gost' => MHASH_GOST,
@@ -53,7 +62,7 @@ class SaltedS2k
public static function calc($hash, $password, $salt, $bytes)
{
if (!in_array($hash, array_keys(static::$supportedMhashAlgos))) {
- throw new Exception\InvalidArgumentException("The hash algorihtm $hash is not supported by " . __CLASS__);
+ throw new Exception\InvalidArgumentException("The hash algorithm $hash is not supported by " . __CLASS__);
}
if (strlen($salt)<8) {
throw new Exception\InvalidArgumentException('The salt size must be at least of 8 bytes');
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Scrypt.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Scrypt.php
index 6140cb85d6f..a5923dea8e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Scrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Scrypt.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Crypt\Key\Derivation;
-
/**
* Scrypt key derivation function
*
@@ -125,7 +124,7 @@ abstract class Scrypt
{
$b32 = array();
for ($i = 0; $i < 16; $i++) {
- list(, $b32[$i]) = unpack("V", substr($b, $i * 4, 4));
+ list(, $b32[$i]) = unpack("V", substr($b, $i * 4, 4));
}
$x = $b32;
@@ -328,7 +327,7 @@ abstract class Scrypt
*/
protected static function hex2bin($hex)
{
- if (version_compare(PHP_VERSION, '5.4') >= 0) {
+ if (PHP_VERSION_ID >= 50400) {
return hex2bin($hex);
}
$len = strlen($hex);
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Apache.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Apache.php
index 3d907610a54..7bbb3dc65ea 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Apache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Apache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -19,8 +19,8 @@ use Zend\Math\Rand;
*/
class Apache implements PasswordInterface
{
- CONST BASE64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
- CONST ALPHA64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+ const BASE64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+ const ALPHA64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
/**
* @var array
@@ -93,13 +93,13 @@ class Apache implements PasswordInterface
);
}
switch ($this->format) {
- case 'crypt' :
+ case 'crypt':
$hash = crypt($password, Rand::getString(2, self::ALPHA64));
break;
- case 'sha1' :
+ case 'sha1':
$hash = '{SHA}' . base64_encode(sha1($password, true));
break;
- case 'md5' :
+ case 'md5':
$hash = $this->apr1Md5($password);
break;
case 'digest':
@@ -116,7 +116,7 @@ class Apache implements PasswordInterface
}
/**
- * Verify if a password is correct against an hash value
+ * Verify if a password is correct against a hash value
*
* @param string $password
* @param string $hash
@@ -163,12 +163,13 @@ class Apache implements PasswordInterface
if (!in_array($format, $this->supportedFormat)) {
throw new Exception\InvalidArgumentException(sprintf(
'The format %s specified is not valid. The supported formats are: %s',
- $format, implode(',', $this->supportedFormat)
+ $format,
+ implode(',', $this->supportedFormat)
));
}
- $this->format = $format;
+ $this->format = $format;
- return $this;
+ return $this;
}
/**
@@ -288,7 +289,9 @@ class Apache implements PasswordInterface
for ($i = 0; $i < 5; $i++) {
$k = $i + 6;
$j = $i + 12;
- if ($j == 16) $j = 5;
+ if ($j == 16) {
+ $j = 5;
+ }
$tmp = $bin[$i] . $bin[$k] . $bin[$j] . $tmp;
}
$tmp = chr(0) . chr(0) . $bin[11] . $tmp;
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
index 851f1091564..94e6e89fa57 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,19 +22,18 @@ class Bcrypt implements PasswordInterface
/**
* @var string
+ *
+ * Changed from 14 to 10 to prevent possibile DOS attacks
+ * due to the high computational time
+ * @see http://timoh6.github.io/2013/11/26/Aggressive-password-stretching.html
*/
- protected $cost = '14';
+ protected $cost = '10';
/**
* @var string
*/
protected $salt;
- /**
- * @var bool
- */
- protected $backwardCompatibility = false;
-
/**
* Constructor
*
@@ -83,19 +82,7 @@ class Bcrypt implements PasswordInterface
* Check for security flaw in the bcrypt implementation used by crypt()
* @see http://php.net/security/crypt_blowfish.php
*/
- if ((version_compare(PHP_VERSION, '5.3.7') >= 0) && !$this->backwardCompatibility) {
- $prefix = '$2y$';
- } else {
- $prefix = '$2a$';
- // check if the password contains 8-bit character
- if (preg_match('/[\x80-\xFF]/', $password)) {
- throw new Exception\RuntimeException(
- 'The bcrypt implementation used by PHP can contain a security flaw ' .
- 'using password with 8-bit character. ' .
- 'We suggest to upgrade to PHP 5.3.7+ or use passwords with only 7-bit characters'
- );
- }
- }
+ $prefix = '$2y$';
$hash = crypt($password, $prefix . $this->cost . '$' . $salt64);
if (strlen($hash) < 13) {
throw new Exception\RuntimeException('Error during the bcrypt generation');
@@ -104,7 +91,7 @@ class Bcrypt implements PasswordInterface
}
/**
- * Verify if a password is correct against an hash value
+ * Verify if a password is correct against a hash value
*
* @param string $password
* @param string $hash
@@ -117,22 +104,6 @@ class Bcrypt implements PasswordInterface
if ($result === $hash) {
return true;
}
- if (strlen($result) <= 13) {
- /* This should only happen if the algorithm that generated hash is
- * either unsupported by this version of crypt(), or is invalid.
- *
- * An example of when this can happen, is if you generate
- * non-backwards-compatible hashes on 5.3.7+, and then try to verify
- * them on < 5.3.7.
- *
- * This is needed, because version comparisons are not possible due
- * to back-ported functionality by some distributions.
- */
- throw new Exception\RuntimeException(
- 'The supplied password hash could not be verified. Please check ' .
- 'backwards compatibility settings.'
- );
- }
return false;
}
@@ -198,22 +169,23 @@ class Bcrypt implements PasswordInterface
/**
* Set the backward compatibility $2a$ instead of $2y$ for PHP 5.3.7+
*
+ * @deprecated since zf 2.3 requires PHP >= 5.3.23
* @param bool $value
* @return Bcrypt
*/
public function setBackwardCompatibility($value)
{
- $this->backwardCompatibility = (bool) $value;
return $this;
}
/**
* Get the backward compatibility
*
+ * @deprecated since zf 2.3 requires PHP >= 5.3.23
* @return bool
*/
public function getBackwardCompatibility()
{
- return $this->backwardCompatibility;
+ return false;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/ExceptionInterface.php
index 1ac342ba582..8a3f7229ab6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Crypt\Password\Exception;
use Zend\Crypt\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php
index b71b5ef291d..3011eb38dd5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,4 +16,5 @@ use Zend\Crypt\Exception;
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/RuntimeException.php
index d854046d11b..9adcf0d4aaf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,4 +16,5 @@ use Zend\Crypt\Exception;
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/PasswordInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/PasswordInterface.php
index 1f7683eacc8..ff106d93dc0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/PasswordInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/PasswordInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/DiffieHellman.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/DiffieHellman.php
index 3332886cb00..3ca593f2f03 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/DiffieHellman.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/DiffieHellman.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -135,7 +135,9 @@ class DiffieHellman
);
if ($this->hasPrivateKey()) {
$details['priv_key'] = $this->convert(
- $this->privateKey, self::FORMAT_NUMBER, self::FORMAT_BINARY
+ $this->privateKey,
+ self::FORMAT_NUMBER,
+ self::FORMAT_BINARY
);
$opensslKeyResource = openssl_pkey_new(array('dh' => $details));
} else {
@@ -222,9 +224,11 @@ class DiffieHellman
* @throws \Zend\Crypt\Exception\InvalidArgumentException
* @throws \Zend\Crypt\Exception\RuntimeException
*/
- public function computeSecretKey($publicKey, $publicKeyFormat = self::FORMAT_NUMBER,
- $secretKeyFormat = self::FORMAT_NUMBER)
- {
+ public function computeSecretKey(
+ $publicKey,
+ $publicKeyFormat = self::FORMAT_NUMBER,
+ $secretKeyFormat = self::FORMAT_NUMBER
+ ) {
if (function_exists('openssl_dh_compute_key') && static::$useOpenssl !== false) {
$publicKey = $this->convert($publicKey, $publicKeyFormat, self::FORMAT_BINARY);
$secretKey = openssl_dh_compute_key($publicKey, $this->opensslKeyResource);
@@ -301,7 +305,6 @@ class DiffieHellman
return $this->convert($this->prime, self::FORMAT_NUMBER, $format);
}
-
/**
* Setter for the value of the generator number
*
@@ -384,13 +387,12 @@ class DiffieHellman
/**
* Convert number between formats
*
- * @param $number
+ * @param string $number
* @param string $inputFormat
* @param string $outputFormat
* @return string
*/
- protected function convert($number, $inputFormat = self::FORMAT_NUMBER,
- $outputFormat = self::FORMAT_BINARY)
+ protected function convert($number, $inputFormat = self::FORMAT_NUMBER, $outputFormat = self::FORMAT_BINARY)
{
if ($inputFormat == $outputFormat) {
return $number;
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa.php
index 44faaa7d787..8561ea758e5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php
index 5051c771641..b87e84b1ba8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/AbstractKey.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php
index 3ad4156c167..7c8efca247f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Crypt\PublicKey\Rsa\Exception;
use Zend\Crypt\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php
index 03561e86830..ede577884be 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Crypt\Exception;
/**
* Invalid argument exception
*/
-class InvalidArgumentException
- extends Exception\InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php
index 3ac77fd43a4..09497448c85 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Crypt\Exception;
/**
* Runtime argument exception
*/
-class RuntimeException
- extends Exception\RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php
index 54ebd5f5ff5..164de31221b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php
index 82e8404f41f..b8e1e56dc64 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/PublicKey.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -90,7 +90,6 @@ class PublicKey extends AbstractKey
return $encrypted;
}
-
/**
* Decrypt using this key
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/RsaOptions.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/RsaOptions.php
index b268cfdc392..b8aca757454 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/RsaOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/RsaOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -188,34 +188,37 @@ class RsaOptions extends AbstractOptions
* @throws Rsa\Exception\RuntimeException
*/
public function generateKeys(array $opensslConfig = array())
- {
- $opensslConfig = array_replace(array(
- 'private_key_type' => OPENSSL_KEYTYPE_RSA,
- 'private_key_bits' => Rsa\PrivateKey::DEFAULT_KEY_SIZE,
- 'digest_alg' => $this->getHashAlgorithm()
- ), $opensslConfig);
-
- // generate
- $resource = openssl_pkey_new($opensslConfig);
- if (false === $resource) {
- throw new Exception\RuntimeException(
- 'Can not generate keys; openssl ' . openssl_error_string()
- );
- }
-
- // export key
- $passPhrase = $this->getPassPhrase();
- $result = openssl_pkey_export($resource, $private, $passPhrase, $opensslConfig);
- if (false === $result) {
- throw new Exception\RuntimeException(
- 'Can not export key; openssl ' . openssl_error_string()
- );
- }
-
- $details = openssl_pkey_get_details($resource);
- $this->privateKey = new Rsa\PrivateKey($private, $passPhrase);
- $this->publicKey = new Rsa\PublicKey($details['key']);
-
- return $this;
- }
+ {
+ $opensslConfig = array_replace(
+ array(
+ 'private_key_type' => OPENSSL_KEYTYPE_RSA,
+ 'private_key_bits' => Rsa\PrivateKey::DEFAULT_KEY_SIZE,
+ 'digest_alg' => $this->getHashAlgorithm()
+ ),
+ $opensslConfig
+ );
+
+ // generate
+ $resource = openssl_pkey_new($opensslConfig);
+ if (false === $resource) {
+ throw new Exception\RuntimeException(
+ 'Can not generate keys; openssl ' . openssl_error_string()
+ );
+ }
+
+ // export key
+ $passPhrase = $this->getPassPhrase();
+ $result = openssl_pkey_export($resource, $private, $passPhrase, $opensslConfig);
+ if (false === $result) {
+ throw new Exception\RuntimeException(
+ 'Can not export key; openssl ' . openssl_error_string()
+ );
+ }
+
+ $details = openssl_pkey_get_details($resource);
+ $this->privateKey = new Rsa\PrivateKey($private, $passPhrase);
+ $this->publicKey = new Rsa\PublicKey($details['key']);
+
+ return $this;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php
index c7ddf38d1a5..e78ede7586f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Crypt\Symmetric\Exception;
use Zend\Crypt\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php
index d157cfffd72..dcf71f99979 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,4 +16,5 @@ use Zend\Crypt\Exception;
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php
index 152634ca67d..1ce2b0c6471 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,4 +16,5 @@ use Zend\Crypt\Exception;
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Mcrypt.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Mcrypt.php
index 7410a8d8d7d..38fd8473357 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Mcrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Mcrypt.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -213,8 +213,7 @@ class Mcrypt implements SymmetricInterface
*/
public function getKeySize()
{
- return mcrypt_get_key_size($this->supportedAlgos[$this->algo],
- $this->supportedModes[$this->mode]);
+ return mcrypt_get_key_size($this->supportedAlgos[$this->algo], $this->supportedModes[$this->mode]);
}
/**
@@ -240,11 +239,10 @@ class Mcrypt implements SymmetricInterface
* the others are more picky.
*/
if (!empty($keySizes) && $keyLen < $maxKey) {
-
if (!in_array($keyLen, $keySizes)) {
- throw new Exception\InvalidArgumentException(
- "The size of the key must be one of "
- . implode(", ", $keySizes) . " bytes or longer");
+ throw new Exception\InvalidArgumentException(
+ "The size of the key must be one of " . implode(", ", $keySizes) . " bytes or longer"
+ );
}
}
$this->key = $key;
@@ -326,7 +324,8 @@ class Mcrypt implements SymmetricInterface
*/
public function encrypt($data)
{
- if (empty($data)) {
+ // Cannot encrypt empty string
+ if (!is_string($data) || $data === '') {
throw new Exception\InvalidArgumentException('The data to encrypt cannot be empty');
}
if (null === $this->getKey()) {
@@ -391,8 +390,7 @@ class Mcrypt implements SymmetricInterface
*/
public function getSaltSize()
{
- return mcrypt_get_iv_size($this->supportedAlgos[$this->algo],
- $this->supportedModes[$this->mode]);
+ return mcrypt_get_iv_size($this->supportedAlgos[$this->algo], $this->supportedModes[$this->mode]);
}
/**
@@ -505,7 +503,6 @@ class Mcrypt implements SymmetricInterface
*/
public function getBlockSize()
{
- return mcrypt_get_block_size($this->supportedAlgos[$this->algo],
- $this->supportedModes[$this->mode]);
+ return mcrypt_get_block_size($this->supportedAlgos[$this->algo], $this->supportedModes[$this->mode]);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php
index 24050c311c2..29e3155dcf5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Padding/PaddingInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php
index 1c8066b4bd7..3ce1478a4d7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Padding/Pkcs7.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ namespace Zend\Crypt\Symmetric\Padding;
*/
class Pkcs7 implements PaddingInterface
{
-
/**
* Pad the string to the specified size
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/PaddingPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/PaddingPluginManager.php
index 48ae0690d14..10f8c65381c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/PaddingPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/PaddingPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/SymmetricInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/SymmetricInterface.php
index 7e0ce06d921..ea4627e9c58 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/SymmetricInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/SymmetricInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,10 +11,19 @@ namespace Zend\Crypt\Symmetric;
interface SymmetricInterface
{
+ /**
+ * @param string $data
+ */
public function encrypt($data);
+ /**
+ * @param string $data
+ */
public function decrypt($data);
+ /**
+ * @param string $key
+ */
public function setKey($key);
public function getKey();
@@ -23,10 +32,16 @@ interface SymmetricInterface
public function getAlgorithm();
+ /**
+ * @param string $algo
+ */
public function setAlgorithm($algo);
public function getSupportedAlgorithms();
+ /**
+ * @param string|false $salt
+ */
public function setSalt($salt);
public function getSalt();
@@ -35,6 +50,9 @@ interface SymmetricInterface
public function getBlockSize();
+ /**
+ * @param string $mode
+ */
public function setMode($mode);
public function getMode();
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/SymmetricPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Crypt/SymmetricPluginManager.php
index 5f49cccc26b..261edd961ed 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/SymmetricPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/SymmetricPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Utils.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Utils.php
index ff013dcbcaf..7d4685fb41e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/Utils.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/Utils.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/composer.json b/vendor/zendframework/zendframework/library/Zend/Crypt/composer.json
index 172f46a0d45..fc8782f8bbc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/composer.json
@@ -6,6 +6,7 @@
"zf2",
"crypt"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Crypt\\": ""
@@ -13,15 +14,18 @@
},
"target-dir": "Zend/Crypt",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-math": "self.version",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-servicemanager": "self.version"
},
+ "suggest": {
+ "ext-mcrypt": "Required for most features of Zend\\Crypt"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Adapter.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Adapter.php
index 01d1edabfe5..1ad6fb1fd3e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Adapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Adapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -160,10 +160,11 @@ class Adapter implements AdapterInterface, Profiler\ProfilerAwareInterface
*
* @param string $sql
* @param string|array|ParameterContainer $parametersOrQueryMode
+ * @param \Zend\Db\ResultSet\ResultSetInterface $resultPrototype
* @throws Exception\InvalidArgumentException
* @return Driver\StatementInterface|ResultSet\ResultSet
*/
- public function query($sql, $parametersOrQueryMode = self::QUERY_MODE_PREPARE)
+ public function query($sql, $parametersOrQueryMode = self::QUERY_MODE_PREPARE, ResultSet\ResultSetInterface $resultPrototype = null)
{
if (is_string($parametersOrQueryMode) && in_array($parametersOrQueryMode, array(self::QUERY_MODE_PREPARE, self::QUERY_MODE_EXECUTE))) {
$mode = $parametersOrQueryMode;
@@ -190,7 +191,7 @@ class Adapter implements AdapterInterface, Profiler\ProfilerAwareInterface
}
if ($result instanceof Driver\ResultInterface && $result->isQueryResult()) {
- $resultSet = clone $this->queryResultSetPrototype;
+ $resultSet = clone ($resultPrototype ?: $this->queryResultSetPrototype);
$resultSet->initialize($result);
return $resultSet;
}
@@ -247,7 +248,6 @@ class Adapter implements AdapterInterface, Profiler\ProfilerAwareInterface
default:
throw new Exception\InvalidArgumentException('Invalid magic property on adapter');
}
-
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php
index 42800a2ce92..b40865e7ac6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAwareInterface.php
index 95443a9a0df..3013fd4ce85 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAwareTrait.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAwareTrait.php
index 3df7b36b110..be888d9f1e7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAwareTrait.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAwareTrait.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterInterface.php
index 0f51e8dd5f7..a9310671afd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -25,5 +25,4 @@ interface AdapterInterface
* @return Platform\PlatformInterface
*/
public function getPlatform();
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterServiceFactory.php
index f0619ad8e77..2f418ce64f0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterServiceFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ConnectionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
index 2e27fd68893..0ac8a399194 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ConnectionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/DriverInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/DriverInterface.php
index 98bbc835df7..3bddb193090 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/DriverInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/DriverInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php
index 699ba2af201..b30eb8eaee4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Feature/AbstractFeature.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use Zend\Db\Adapter\Driver\DriverInterface;
abstract class AbstractFeature
{
-
/**
* @var DriverInterface
*/
@@ -36,5 +35,4 @@ abstract class AbstractFeature
* @return string
*/
abstract public function getName();
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php
index 10c96f7731d..405f2f7136f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
index 50c161537d3..7d756e355bf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Connection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,7 +15,9 @@ use Zend\Db\Adapter\Profiler;
class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
{
- /** @var IbmDb2 */
+ /**
+ * @var IbmDb2
+ */
protected $driver = null;
/**
@@ -33,10 +35,31 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
*/
protected $profiler = null;
+ /**
+ * In transaction
+ *
+ * @var bool
+ */
+ protected $inTransaction = false;
+
+ /**
+ * i5 OS
+ *
+ * @var bool
+ */
+ protected $i5;
+
+ /**
+ * Previous autocommit set
+ *
+ * @var mixed
+ */
+ protected $prevAutocommit;
+
/**
* Constructor
*
- * @param array|resource|null $connectionParameters (ibm_db2 connection resource)
+ * @param array|resource|null $connectionParameters (ibm_db2 connection resource)
* @throws Exception\InvalidArgumentException
*/
public function __construct($connectionParameters = null)
@@ -55,7 +78,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
/**
* Set driver
*
- * @param IbmDb2 $driver
+ * @param IbmDb2 $driver
* @return Connection
*/
public function setDriver(IbmDb2 $driver)
@@ -65,7 +88,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
}
/**
- * @param Profiler\ProfilerInterface $profiler
+ * @param Profiler\ProfilerInterface $profiler
* @return Connection
*/
public function setProfiler(Profiler\ProfilerInterface $profiler)
@@ -83,7 +106,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
}
/**
- * @param array $connectionParameters
+ * @param array $connectionParameters
* @return Connection
*/
public function setConnectionParameters(array $connectionParameters)
@@ -101,7 +124,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
}
/**
- * @param resource $resource DB2 resource
+ * @param resource $resource DB2 resource
* @return Connection
*/
public function setResource($resource)
@@ -141,7 +164,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
/**
* Connect
*
- * @return ConnectionInterface
+ * @return self
*/
public function connect()
{
@@ -159,6 +182,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
return $p[$name];
}
}
+
return null;
};
@@ -167,12 +191,9 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
$password = $findParameterValue(array('password', 'pwd', 'PWD'));
$isPersistent = $findParameterValue(array('persistent', 'PERSISTENT', 'Persistent'));
$options = (isset($p['driver_options']) ? $p['driver_options'] : array());
+ $connect = ((bool) $isPersistent) ? 'db2_pconnect' : 'db2_connect';
- if ($isPersistent) {
- $this->resource = db2_pconnect($database, $username, $password, $options);
- } else {
- $this->resource = db2_connect($database, $username, $password, $options);
- }
+ $this->resource = $connect($database, $username, $password, $options);
if ($this->resource === false) {
throw new Exception\RuntimeException(sprintf(
@@ -180,6 +201,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
__METHOD__
));
}
+
return $this;
}
@@ -204,6 +226,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
db2_close($this->resource);
$this->resource = null;
}
+
return $this;
}
@@ -214,7 +237,30 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
*/
public function beginTransaction()
{
- // TODO: Implement beginTransaction() method.
+ if ($this->isI5() && !ini_get('ibm_db2.i5_allow_commit')) {
+ throw new Exception\RuntimeException(
+ 'DB2 transactions are not enabled, you need to set the ibm_db2.i5_allow_commit=1 in your php.ini'
+ );
+ }
+
+ if (!$this->isConnected()) {
+ $this->connect();
+ }
+
+ $this->prevAutocommit = db2_autocommit($this->resource);
+ db2_autocommit($this->resource, DB2_AUTOCOMMIT_OFF);
+ $this->inTransaction = true;
+ return $this;
+ }
+
+ /**
+ * In transaction
+ *
+ * @return bool
+ */
+ public function inTransaction()
+ {
+ return $this->inTransaction;
}
/**
@@ -224,7 +270,20 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
*/
public function commit()
{
- // TODO: Implement commit() method.
+ if (!$this->isConnected()) {
+ $this->connect();
+ }
+
+ if (!db2_commit($this->resource)) {
+ throw new Exception\RuntimeException("The commit has not been successful");
+ }
+
+ if ($this->prevAutocommit) {
+ db2_autocommit($this->resource, $this->prevAutocommit);
+ }
+
+ $this->inTransaction = false;
+ return $this;
}
/**
@@ -234,7 +293,24 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
*/
public function rollback()
{
- // TODO: Implement rollback() method.
+ if (!$this->resource) {
+ throw new Exception\RuntimeException('Must be connected before you can rollback.');
+ }
+
+ if (!$this->inTransaction) {
+ throw new Exception\RuntimeException('Must call beginTransaction() before you can rollback.');
+ }
+
+ if (!db2_rollback($this->resource)) {
+ throw new Exception\RuntimeException('The rollback has not been successful');
+ }
+
+ if ($this->prevAutocommit) {
+ db2_autocommit($this->resource, $this->prevAutocommit);
+ }
+
+ $this->inTransaction = false;
+ return $this;
}
/**
@@ -266,8 +342,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
throw new Exception\InvalidQueryException(db2_stmt_errormsg());
}
- $resultPrototype = $this->driver->createResult(($resultResource === true) ? $this->resource : $resultResource);
- return $resultPrototype;
+ return $this->driver->createResult(($resultResource === true) ? $this->resource : $resultResource);
}
/**
@@ -280,4 +355,19 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
{
return db2_last_insert_id($this->resource);
}
+
+ /**
+ * Determine if the OS is OS400 (AS400, IBM i)
+ *
+ * @return bool
+ */
+ protected function isI5()
+ {
+ if (isset($this->i5)) {
+ return $this->i5;
+ }
+
+ $this->i5 = php_uname('s') == 'OS400' ? true : false;
+ return $this->i5;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php
index 1f97bb8c010..783e0f40c8c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -156,7 +156,7 @@ class IbmDb2 implements DriverInterface, Profiler\ProfilerAwareInterface
$statement->setSql($sqlOrResource);
} elseif ($sqlOrResource !== null) {
throw new Exception\InvalidArgumentException(
- __FUNCTION__ . ' only accepts an SQL string or a ibm_db2 resource'
+ __FUNCTION__ . ' only accepts an SQL string or an ibm_db2 resource'
);
}
if (!$this->connection->isConnected()) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php
index add4e1e3f16..b425f248342 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
index 029a9ed276f..35c4243a10f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Statement.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
index fb7ddde3ee7..587d25f362d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,7 +15,6 @@ use Zend\Db\Adapter\Profiler;
class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
{
-
/**
* @var Mysqli
*/
@@ -237,7 +236,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
if ($this->resource instanceof \mysqli) {
$this->resource->close();
}
- unset($this->resource);
+ $this->resource = null;
}
/**
@@ -255,6 +254,16 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
$this->inTransaction = true;
}
+ /**
+ * In transaction
+ *
+ * @return bool
+ */
+ public function inTransaction()
+ {
+ return $this->inTransaction;
+ }
+
/**
* Commit
*
@@ -284,7 +293,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
}
if (!$this->inTransaction) {
- throw new Exception\RuntimeException('Must call commit() before you can rollback.');
+ throw new Exception\RuntimeException('Must call beginTransaction() before you can rollback.');
}
$this->resource->rollback();
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
index 8c1be74b1e0..4fcc55842a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Db\Adapter\Profiler;
class Mysqli implements DriverInterface, Profiler\ProfilerAwareInterface
{
-
/**
* @var Connection
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
index 7cd1118ceb8..d620ee15a51 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ class Result implements
Iterator,
ResultInterface
{
-
/**
* @var \mysqli|\mysqli_result|\mysqli_stmt
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
index 5d750adcf3e..1c68e37cd89 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Db\Adapter\Profiler;
class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
{
-
/**
* @var \mysqli
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
index 053afd44527..0bb3b2544b2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -57,7 +57,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
} elseif ($connectionInfo instanceof \oci8) {
$this->setResource($connectionInfo);
} elseif (null !== $connectionInfo) {
- throw new Exception\InvalidArgumentException('$connection must be an array of parameters, a oci8 resource or null');
+ throw new Exception\InvalidArgumentException('$connection must be an array of parameters, an oci8 resource or null');
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
index 0b074b2971f..c846df725d3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Oci8.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,7 +15,6 @@ use Zend\Db\Adapter\Profiler;
class Oci8 implements DriverInterface, Profiler\ProfilerAwareInterface
{
-
/**
* @var Connection
*/
@@ -36,27 +35,17 @@ class Oci8 implements DriverInterface, Profiler\ProfilerAwareInterface
*/
protected $profiler = null;
- /**
- * @var array
- */
- protected $options = array(
-
- );
-
/**
* @param array|Connection|\oci8 $connection
* @param null|Statement $statementPrototype
* @param null|Result $resultPrototype
- * @param array $options
*/
- public function __construct($connection, Statement $statementPrototype = null, Result $resultPrototype = null, array $options = array())
+ public function __construct($connection, Statement $statementPrototype = null, Result $resultPrototype = null)
{
if (!$connection instanceof Connection) {
$connection = new Connection($connection);
}
- $options = array_intersect_key(array_merge($this->options, $options), $this->options);
-
$this->registerConnection($connection);
$this->registerStatementPrototype(($statementPrototype) ?: new Statement());
$this->registerResultPrototype(($resultPrototype) ?: new Result());
@@ -183,7 +172,7 @@ class Oci8 implements DriverInterface, Profiler\ProfilerAwareInterface
$statement->setSql($sqlOrResource);
} elseif ($sqlOrResource !== null) {
throw new Exception\InvalidArgumentException(
- 'Oci8 only accepts an SQL string or a oci8 resource in ' . __FUNCTION__
+ 'Oci8 only accepts an SQL string or an oci8 resource in ' . __FUNCTION__
);
}
if (!$this->connection->isConnected()) {
@@ -231,5 +220,4 @@ class Oci8 implements DriverInterface, Profiler\ProfilerAwareInterface
{
return $this->getConnection()->getLastGeneratedValue();
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php
index 98217d8a34f..b993743f1d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,7 +15,6 @@ use Zend\Db\Adapter\Exception;
class Result implements Iterator, ResultInterface
{
-
/**
* @var resource
*/
@@ -222,5 +221,4 @@ class Result implements Iterator, ResultInterface
// @todo OCI8 generated value in Driver Result
return null;
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
index a9ebd0ca02f..15d5fb5b8c8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Db\Adapter\Profiler;
class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
{
-
/**
* @var resource
*/
@@ -291,6 +290,12 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
case ParameterContainer::TYPE_BINARY:
$type = SQLT_BIN;
break;
+ case ParameterContainer::TYPE_LOB:
+ $type = OCI_B_CLOB;
+ $clob = oci_new_descriptor($this->driver->getConnection()->getResource(), OCI_DTYPE_LOB);
+ $clob->writetemporary($value, OCI_TEMP_CLOB);
+ $value = $clob;
+ break;
case ParameterContainer::TYPE_STRING:
default:
$type = SQLT_CHR;
@@ -303,5 +308,4 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
oci_bind_by_name($this->resource, $name, $value, -1, $type);
}
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
index 127455a0484..7a8bff4ca8b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -45,6 +45,11 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
*/
protected $inTransaction = false;
+ /**
+ * @var string
+ */
+ protected $dsn = null;
+
/**
* Constructor
*
@@ -135,6 +140,20 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
return $this->connectionParameters;
}
+ /**
+ * Get the dsn string for this connection
+ * @throws \Zend\Db\Adapter\Exception\RunTimeException
+ * @return string
+ */
+ public function getDsn()
+ {
+ if (!$this->dsn) {
+ throw new Exception\RunTimeException("The DSN has not been set or constructed from parameters in connect() for this Connection");
+ }
+
+ return $this->dsn;
+ }
+
/**
* Get current schema
*
@@ -152,6 +171,10 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
break;
case 'sqlite':
return 'main';
+ case 'sqlsrv':
+ case 'dblib':
+ $sql = 'SELECT SCHEMA_NAME()';
+ break;
case 'pgsql':
default:
$sql = 'SELECT CURRENT_SCHEMA';
@@ -240,6 +263,9 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
case 'dbname':
$database = (string) $value;
break;
+ case 'charset':
+ $charset = (string) $value;
+ break;
case 'driver_options':
case 'options':
$value = (array) $value;
@@ -257,6 +283,14 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
case 'sqlite':
$dsn[] = $database;
break;
+ case 'sqlsrv':
+ if (isset($database)) {
+ $dsn[] = "database={$database}";
+ }
+ if (isset($hostname)) {
+ $dsn[] = "server={$hostname}";
+ }
+ break;
default:
if (isset($database)) {
$dsn[] = "dbname={$database}";
@@ -267,6 +301,9 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
if (isset($port)) {
$dsn[] = "port={$port}";
}
+ if (isset($charset) && $pdoDriver != 'pgsql') {
+ $dsn[] = "charset={$charset}";
+ }
break;
}
$dsn = $pdoDriver . ':' . implode(';', $dsn);
@@ -277,9 +314,14 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
);
}
+ $this->dsn = $dsn;
+
try {
$this->resource = new \PDO($dsn, $username, $password, $options);
$this->resource->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+ if (isset($charset) && $pdoDriver == 'pgsql') {
+ $this->resource->exec('SET NAMES ' . $this->resource->quote($charset));
+ }
$this->driverName = strtolower($this->resource->getAttribute(\PDO::ATTR_DRIVER_NAME));
} catch (\PDOException $e) {
$code = $e->getCode();
@@ -330,6 +372,16 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
return $this;
}
+ /**
+ * In transaction
+ *
+ * @return bool
+ */
+ public function inTransaction()
+ {
+ return $this->inTransaction;
+ }
+
/**
* Commit
*
@@ -396,7 +448,6 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
$result = $this->driver->createResult($resultResource, $sql);
return $result;
-
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Feature/OracleRowCounter.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Feature/OracleRowCounter.php
index 3ad4e9f62a1..1f62aa6ecb1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Feature/OracleRowCounter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Feature/OracleRowCounter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Db\Adapter\Driver\Pdo;
*/
class OracleRowCounter extends AbstractFeature
{
-
/**
* @return string
*/
@@ -51,12 +50,12 @@ class OracleRowCounter extends AbstractFeature
*/
public function getCountForSql($sql)
{
- if (!stripos($sql, 'select')) {
+ if (stripos($sql, 'select') === false) {
return null;
}
$countSql = 'SELECT COUNT(*) as count FROM (' . $sql . ')';
/** @var $pdo \PDO */
- $pdo = $this->pdoDriver->getConnection()->getResource();
+ $pdo = $this->driver->getConnection()->getResource();
$result = $pdo->query($countSql);
$countRow = $result->fetch(\PDO::FETCH_ASSOC);
return $countRow['count'];
@@ -64,7 +63,7 @@ class OracleRowCounter extends AbstractFeature
/**
* @param $context
- * @return closure
+ * @return \Closure
*/
public function getRowCountClosure($context)
{
@@ -76,5 +75,4 @@ class OracleRowCounter extends AbstractFeature
: $oracleRowCounter->getCountForSql($context);
};
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php
index 98bb2901bf4..2a73c663e87 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Db\Adapter\Driver\Pdo;
*/
class SqliteRowCounter extends AbstractFeature
{
-
/**
* @return string
*/
@@ -51,12 +50,12 @@ class SqliteRowCounter extends AbstractFeature
*/
public function getCountForSql($sql)
{
- if (!stripos($sql, 'select')) {
+ if (stripos($sql, 'select') === false) {
return null;
}
$countSql = 'SELECT COUNT(*) as count FROM (' . $sql . ')';
/** @var $pdo \PDO */
- $pdo = $this->pdoDriver->getConnection()->getResource();
+ $pdo = $this->driver->getConnection()->getResource();
$result = $pdo->query($countSql);
$countRow = $result->fetch(\PDO::FETCH_ASSOC);
return $countRow['count'];
@@ -64,7 +63,7 @@ class SqliteRowCounter extends AbstractFeature
/**
* @param $context
- * @return closure
+ * @return \Closure
*/
public function getRowCountClosure($context)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
index 1d0fb8a9842..6c8c0073ebd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -189,7 +189,9 @@ class Pdo implements DriverInterface, DriverFeatureInterface, Profiler\ProfilerA
return 'Postgresql';
case 'oci':
return 'Oracle';
-
+ case 'dblib':
+ case 'sqlsrv':
+ return 'SqlServer';
default:
return ucfirst($name);
}
@@ -203,6 +205,9 @@ class Pdo implements DriverInterface, DriverFeatureInterface, Profiler\ProfilerA
return 'PostgreSQL';
case 'oci':
return 'Oracle';
+ case 'dblib':
+ case 'sqlsrv':
+ return 'SQLServer';
default:
return ucfirst($name);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Result.php
index 8a6879d8546..613abb12b41 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Result.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Db\Adapter\Exception;
class Result implements Iterator, ResultInterface
{
-
const STATEMENT_MODE_SCROLLABLE = 'scrollable';
const STATEMENT_MODE_FORWARD = 'forward';
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Statement.php
index a52f94c6df7..244863984b8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Statement.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Statement.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Db\Adapter\Profiler;
class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
{
-
/**
* @var \PDO
*/
@@ -270,6 +269,8 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
foreach ($parameters as $name => &$value) {
if (is_bool($value)) {
$type = \PDO::PARAM_BOOL;
+ } elseif (is_int($value)) {
+ $type = \PDO::PARAM_INT;
} else {
$type = \PDO::PARAM_STR;
}
@@ -291,7 +292,6 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
$parameter = is_int($name) ? ($name + 1) : $name;
$this->resource->bindParam($parameter, $value, $type);
}
-
}
/**
@@ -306,6 +306,5 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
if ($this->parameterContainer) {
$this->parameterContainer = clone $this->parameterContainer;
}
-
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
index c6200e9c11b..8aa80819c92 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -155,30 +155,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
return $this;
}
- // localize
- $p = $this->connectionParameters;
-
- // given a list of key names, test for existence in $p
- $findParameterValue = function (array $names) use ($p) {
- foreach ($names as $name) {
- if (isset($p[$name])) {
- return $p[$name];
- }
- }
- return null;
- };
-
- $connection = array();
- $connection['host'] = $findParameterValue(array('hostname', 'host'));
- $connection['user'] = $findParameterValue(array('username', 'user'));
- $connection['password'] = $findParameterValue(array('password', 'passwd', 'pw'));
- $connection['dbname'] = $findParameterValue(array('database', 'dbname', 'db', 'schema'));
- $connection['port'] = (isset($p['port'])) ? (int) $p['port'] : null;
- $connection['socket'] = (isset($p['socket'])) ? $p['socket'] : null;
-
- $connection = array_filter($connection); // remove nulls
- $connection = http_build_query($connection, null, ' '); // @link http://php.net/pg_connect
-
+ $connection = $this->getConnectionString();
set_error_handler(function ($number, $string) {
throw new Exception\RuntimeException(
__METHOD__ . ': Unable to connect to database', null, new Exception\ErrorException($string, $number)
@@ -230,6 +207,16 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
$this->inTransaction = true;
}
+ /**
+ * In transaction
+ *
+ * @return bool
+ */
+ public function inTransaction()
+ {
+ return $this->inTransaction;
+ }
+
/**
* @return void
*/
@@ -298,4 +285,36 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
$result = pg_query($this->resource, 'SELECT CURRVAL(\'' . str_replace('\'', '\\\'', $name) . '\') as "currval"');
return pg_fetch_result($result, 0, 'currval');
}
+
+ /**
+ * Get Connection String
+ *
+ * @return string
+ */
+ private function getConnectionString()
+ {
+ // localize
+ $p = $this->connectionParameters;
+
+ // given a list of key names, test for existence in $p
+ $findParameterValue = function (array $names) use ($p) {
+ foreach ($names as $name) {
+ if (isset($p[$name])) {
+ return $p[$name];
+ }
+ }
+ return null;
+ };
+
+ $connectionParameters = array(
+ 'host' => $findParameterValue(array('hostname', 'host')),
+ 'user' => $findParameterValue(array('username', 'user')),
+ 'password' => $findParameterValue(array('password', 'passwd', 'pw')),
+ 'dbname' => $findParameterValue(array('database', 'dbname', 'db', 'schema')),
+ 'port' => isset($p['port']) ? (int) $p['port'] : null,
+ 'socket' => isset($p['socket']) ? $p['socket'] : null,
+ );
+
+ return urldecode(http_build_query(array_filter($connectionParameters), null, ' '));
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php
index 36e5e0f294f..b186fe8298a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Pgsql.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Result.php
index 9a7f5685f14..a3739146803 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Result.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Db\Adapter\Exception;
class Result implements ResultInterface
{
-
/**
* @var resource
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
index c105a6647ed..c58a70559cb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ResultInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ResultInterface.php
index cb1f4078499..fd83b9d7eaa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ResultInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/ResultInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
index 8ce6138a388..9fcd367544b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -187,6 +187,9 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
case 'dbname':
$params['Database'] = (string) $value;
break;
+ case 'charset':
+ $params['CharacterSet'] = (string) $value;
+ break;
case 'driver_options':
case 'options':
$params = array_merge($params, (array) $value);
@@ -231,11 +234,28 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
*/
public function beginTransaction()
{
- // http://msdn.microsoft.com/en-us/library/cc296151.aspx
- /*
- $this->resource->autocommit(false);
+ if (!$this->resource) {
+ $this->connect();
+ }
+ if (sqlsrv_begin_transaction($this->resource) === false) {
+ throw new Exception\RuntimeException(
+ 'Begin transaction failed',
+ null,
+ new ErrorException(sqlsrv_errors())
+ );
+ }
+
$this->inTransaction = true;
- */
+ }
+
+ /**
+ * In transaction
+ *
+ * @return bool
+ */
+ public function inTransaction()
+ {
+ return $this->inTransaction;
}
/**
@@ -244,15 +264,14 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
public function commit()
{
// http://msdn.microsoft.com/en-us/library/cc296194.aspx
- /*
+
if (!$this->resource) {
$this->connect();
}
- $this->resource->commit();
-
$this->inTransaction = false;
- */
+
+ return sqlsrv_commit($this->resource);
}
/**
@@ -261,18 +280,12 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
public function rollback()
{
// http://msdn.microsoft.com/en-us/library/cc296176.aspx
- /*
- if (!$this->resource) {
- throw new \Exception('Must be connected before you can rollback.');
- }
- if (!$this->_inCommit) {
- throw new \Exception('Must call commit() before you can rollback.');
+ if (!$this->resource) {
+ throw new Exception\RuntimeException('Must be connected before you can rollback.');
}
- $this->resource->rollback();
- return $this;
- */
+ return sqlsrv_rollback($this->resource);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ErrorException.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ErrorException.php
index 8330559fed0..40b15abec42 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ErrorException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ErrorException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use Zend\Db\Adapter\Exception;
class ErrorException extends Exception\ErrorException implements ExceptionInterface
{
-
/**
* Errors
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ExceptionInterface.php
index a7168e8d6e0..2a039d96bf2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
index f7fa0ffb8b4..dafefbfdea5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Db\Adapter\Driver\ResultInterface;
class Result implements Iterator, ResultInterface
{
-
/**
* @var resource
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
index bf8af428a70..dc917d4d986 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,7 +15,6 @@ use Zend\Db\Adapter\Profiler;
class Sqlsrv implements DriverInterface, Profiler\ProfilerAwareInterface
{
-
/**
* @var Connection
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
index e3e157d3bd1..c0b83ff117e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
@@ -1,9 +1,10 @@
<?php
+
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +17,6 @@ use Zend\Db\Adapter\Profiler;
class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
{
-
/**
* @var resource
*/
@@ -63,6 +63,16 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
*/
protected $isPrepared = false;
+ /**
+ * @var array
+ */
+ protected $prepareParams = array();
+
+ /**
+ * @var array
+ */
+ protected $prepareOptions = array();
+
/**
* Set driver
*
@@ -182,24 +192,31 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
/**
* @param string $sql
+ * @param array $options
* @throws Exception\RuntimeException
* @return Statement
*/
- public function prepare($sql = null)
+ public function prepare($sql = null, array $options = array())
{
if ($this->isPrepared) {
throw new Exception\RuntimeException('Already prepared');
}
$sql = ($sql) ?: $this->sql;
+ $options = ($options) ?: $this->prepareOptions;
$pRef = &$this->parameterReferences;
for ($position = 0, $count = substr_count($sql, '?'); $position < $count; $position++) {
- $pRef[$position] = array('', SQLSRV_PARAM_IN, null, null);
+ if (!isset($this->prepareParams[$position])) {
+ $pRef[$position] = array('', SQLSRV_PARAM_IN, null, null);
+ } else {
+ $pRef[$position] = &$this->prepareParams[$position];
+ }
}
- $this->resource = sqlsrv_prepare($this->sqlsrv, $sql, $pRef);
+ $this->resource = sqlsrv_prepare($this->sqlsrv, $sql, $pRef, $options);
$this->isPrepared = true;
+
return $this;
}
@@ -220,6 +237,7 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
*/
public function execute($parameters = null)
{
+ /** END Standard ParameterContainer Merging Block */
if (!$this->isPrepared) {
$this->prepare();
}
@@ -241,7 +259,6 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
if ($this->parameterContainer->count() > 0) {
$this->bindParametersFromContainer();
}
- /** END Standard ParameterContainer Merging Block */
if ($this->profiler) {
$this->profiler->profilerStart($this);
@@ -276,14 +293,21 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
foreach ($values as $value) {
$this->parameterReferences[$position++][0] = $value;
}
+ }
+
+ /**
+ * @param array $prepareParams
+ */
+ public function setPrepareParams(array $prepareParams)
+ {
+ $this->prepareParams = $prepareParams;
+ }
- // @todo bind errata
- //foreach ($this->parameterContainer as $name => &$value) {
- // $p[$position][0] = $value;
- // $position++;
- // if ($this->parameterContainer->offsetHasErrata($name)) {
- // $p[$position][3] = $this->parameterContainer->offsetGetErrata($name);
- // }
- //}
+ /**
+ * @param array $prepareOptions
+ */
+ public function setPrepareOptions(array $prepareOptions)
+ {
+ $this->prepareOptions = $prepareOptions;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/StatementInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/StatementInterface.php
index e6fab35726a..6c9e8858aab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/StatementInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/StatementInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use Zend\Db\Adapter\StatementContainerInterface;
interface StatementInterface extends StatementContainerInterface
{
-
/**
* Get resource
*
@@ -42,5 +41,4 @@ interface StatementInterface extends StatementContainerInterface
* @return ResultInterface
*/
public function execute($parameters = null);
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/ErrorException.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/ErrorException.php
index 125550a24ce..5704ad1a643 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/ErrorException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/ErrorException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/ExceptionInterface.php
index 3f3660d99e0..afd43b6adaa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php
index 5cf7a4bfa38..392677d7de3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php
index 152038a48ce..bb75d0c0e10 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidConnectionParametersException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Db\Adapter\Exception;
class InvalidConnectionParametersException extends RuntimeException implements ExceptionInterface
{
-
/**
* @var int
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidQueryException.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidQueryException.php
index 1372237fe17..f24c84c4b70 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidQueryException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidQueryException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/RuntimeException.php
index e1ff785998e..81b4fcd5454 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/UnexpectedValueException.php
index 46859f26d2f..1e73c668941 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php
index 491b4ad746f..e3e9228c7d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/ParameterContainer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,7 +15,6 @@ use Iterator;
class ParameterContainer implements Iterator, ArrayAccess, Countable
{
-
const TYPE_AUTO = 'auto';
const TYPE_NULL = 'null';
const TYPE_DOUBLE = 'double';
@@ -107,8 +106,7 @@ class ParameterContainer implements Iterator, ArrayAccess, Countable
}
} elseif (is_string($name)) {
// is a string:
- $currentNames = array_keys($this->data);
- $position = array_search($name, $currentNames, true);
+ $position = array_key_exists($name, $this->data);
} elseif ($name === null) {
$name = (string) count($this->data);
} else {
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/IbmDb2.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/IbmDb2.php
index a888cb6d26a..182600c2dc3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/IbmDb2.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/IbmDb2.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Db\Adapter\Platform;
class IbmDb2 implements PlatformInterface
{
-
protected $quoteValueAllowed = false;
/**
@@ -205,5 +204,4 @@ class IbmDb2 implements PlatformInterface
return implode('', $parts);
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Mysql.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Mysql.php
index 6e02f083abc..366901cd602 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Mysql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Mysql.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Oracle.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Oracle.php
index 828a2d64502..24390c8dd73 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Oracle.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Oracle.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Db\Adapter\Platform;
class Oracle implements PlatformInterface
{
-
/**
* @var bool
*/
@@ -185,5 +184,4 @@ class Oracle implements PlatformInterface
}
return implode('', $parts);
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/PlatformInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/PlatformInterface.php
index d8ec05b2be0..f0f39f989c2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/PlatformInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/PlatformInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Postgresql.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Postgresql.php
index e4d1ce59c87..07149febcfe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Postgresql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Postgresql.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -209,5 +209,4 @@ class Postgresql implements PlatformInterface
}
return implode('', $parts);
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Sql92.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Sql92.php
index e1e95ded5ba..181956c5547 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Sql92.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Sql92.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -158,5 +158,4 @@ class Sql92 implements PlatformInterface
return implode('', $parts);
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php
index 4485fdb8085..3a21b3c47a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,7 +15,6 @@ use Zend\Db\Adapter\Exception;
class SqlServer implements PlatformInterface
{
-
/** @var resource|\PDO */
protected $resource = null;
@@ -33,8 +32,8 @@ class SqlServer implements PlatformInterface
*/
public function setDriver($driver)
{
- // handle Zend_Db drivers
- if (($driver instanceof Pdo\Pdo && in_array($driver->getDatabasePlatformName(), array('Sqlsrv', 'Dblib')))
+ // handle Zend\Db drivers
+ if (($driver instanceof Pdo\Pdo && in_array($driver->getDatabasePlatformName(), array('SqlServer', 'Dblib')))
|| (($driver instanceof \PDO && in_array($driver->getAttribute(\PDO::ATTR_DRIVER_NAME), array('sqlsrv', 'dblib'))))
) {
$this->resource = $driver;
@@ -201,5 +200,4 @@ class SqlServer implements PlatformInterface
}
return implode('', $parts);
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Sqlite.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Sqlite.php
index 4b1877100ba..5ff195d9908 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Sqlite.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Sqlite.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,7 +15,6 @@ use Zend\Db\Adapter\Exception;
class Sqlite implements PlatformInterface
{
-
/** @var \PDO */
protected $resource = null;
@@ -208,5 +207,4 @@ class Sqlite implements PlatformInterface
}
return implode('', $parts);
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/Profiler.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/Profiler.php
index 5115e3f3f16..ca0cad05777 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/Profiler.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/Profiler.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/ProfilerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/ProfilerAwareInterface.php
index a0b631d94b6..d6473713c3e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/ProfilerAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/ProfilerAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/ProfilerInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/ProfilerInterface.php
index 5f8ee90e21f..ed0c6396adb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/ProfilerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Profiler/ProfilerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/StatementContainer.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/StatementContainer.php
index e1f033b07ec..59b7d506072 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/StatementContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/StatementContainer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Db\Adapter;
class StatementContainer implements StatementContainerInterface
{
-
/**
* @var string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/StatementContainerInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/StatementContainerInterface.php
index 098d6a6fdec..fc8964d1018 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/StatementContainerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/StatementContainerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Db/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Exception/ErrorException.php b/vendor/zendframework/zendframework/library/Zend/Db/Exception/ErrorException.php
index f6915a8c2b9..6a3d5a290ba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Exception/ErrorException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Exception/ErrorException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Exception/ExceptionInterface.php
index 9f480dd4e98..f8d23d2305c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Db/Exception/InvalidArgumentException.php
index efeba3a770f..52a6f6c01f6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Db/Exception/RuntimeException.php
index 57ed5847699..a95db6571fb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Db/Exception/UnexpectedValueException.php
index 9671d8a4663..febcd3303ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Metadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Metadata.php
index 06382f73858..1c4bc0ccb2f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Metadata.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Metadata.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -53,6 +53,8 @@ class Metadata implements MetadataInterface
return new Source\SqliteMetadata($adapter);
case 'PostgreSQL':
return new Source\PostgresqlMetadata($adapter);
+ case 'Oracle':
+ return new Source\OracleMetadata($adapter);
}
throw new \Exception('cannot create source from adapter');
@@ -184,7 +186,7 @@ class Metadata implements MetadataInterface
*/
public function getViewNames($schema = null)
{
- return $this->source->getTable($schema);
+ return $this->source->getViewNames($schema);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/MetadataInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/MetadataInterface.php
index cc82db2fefb..1a3772dcf1d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/MetadataInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/MetadataInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -32,5 +32,4 @@ interface MetadataInterface
public function getTriggerNames($schema = null);
public function getTriggers($schema = null);
public function getTrigger($triggerName, $schema = null);
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/AbstractTableObject.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/AbstractTableObject.php
index 17da65d1eb1..d51859e641c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/AbstractTableObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/AbstractTableObject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Db\Metadata\Object;
abstract class AbstractTableObject
{
-
/*
protected $catalogName = null;
protected $schemaName = null;
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ColumnObject.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ColumnObject.php
index 34ebb41dba4..ef529b67e57 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ColumnObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ColumnObject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Db\Metadata\Object;
class ColumnObject
{
-
/**
*
* @var string
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ConstraintKeyObject.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ConstraintKeyObject.php
index c0a4d265520..81147bf6b42 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ConstraintKeyObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ConstraintKeyObject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -246,5 +246,4 @@ class ConstraintKeyObject
{
return $this->foreignKeyDeleteRule;
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ConstraintObject.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ConstraintObject.php
index 089c5ea1fb5..4c10c296f29 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ConstraintObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ConstraintObject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/TableObject.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/TableObject.php
index 8735fbfc8c3..1a3ea409401 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/TableObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/TableObject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/TriggerObject.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/TriggerObject.php
index eece8c4f42c..d0e424ac038 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/TriggerObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/TriggerObject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ViewObject.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ViewObject.php
index 5130e9ecc62..a580d4808b1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ViewObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ViewObject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/AbstractSource.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/AbstractSource.php
index 6d3063781b9..7b57dc29b39 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/AbstractSource.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/AbstractSource.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -83,7 +83,6 @@ abstract class AbstractSource implements MetadataInterface
}
}
return $tableNames;
-
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/MysqlMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/MysqlMetadata.php
index ac9642f9c1f..4c28f3f2523 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/MysqlMetadata.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/MysqlMetadata.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/OracleMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/OracleMetadata.php
new file mode 100644
index 00000000000..3207dc6cc8e
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/OracleMetadata.php
@@ -0,0 +1,256 @@
+<?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\Db\Metadata\Source;
+
+use Zend\Db\Adapter\Adapter;
+
+/**
+ * Metadata source for Oracle
+ */
+class OracleMetadata extends AbstractSource
+{
+ /**
+ * @var array
+ */
+ protected $constraintTypeMap = array(
+ 'C' => 'CHECK',
+ 'P' => 'PRIMARY KEY',
+ 'R' => 'FOREIGN_KEY'
+ );
+
+ /**
+ * {@inheritdoc}
+ * @see \Zend\Db\Metadata\Source\AbstractSource::loadColumnData()
+ */
+ protected function loadColumnData($table, $schema)
+ {
+ if (isset($this->data['columns'][$schema][$table])) {
+ return;
+ }
+
+ $isColumns = array(
+ 'COLUMN_ID',
+ 'COLUMN_NAME',
+ 'DATA_DEFAULT',
+ 'NULLABLE',
+ 'DATA_TYPE',
+ 'DATA_LENGTH',
+ 'DATA_PRECISION',
+ 'DATA_SCALE'
+ );
+
+ $this->prepareDataHierarchy('columns', $schema, $table);
+ $parameters = array(
+ ':ownername' => $schema,
+ ':tablename' => $table
+ );
+
+ $sql = 'SELECT ' . implode(', ', $isColumns)
+ . ' FROM all_tab_columns'
+ . ' WHERE owner = :ownername AND table_name = :tablename';
+
+ $result = $this->adapter->query($sql)->execute($parameters);
+ $columns = array();
+
+ foreach ($result as $row) {
+ $columns[$row['COLUMN_NAME']] = array(
+ 'ordinal_position' => $row['COLUMN_ID'],
+ 'column_default' => $row['DATA_DEFAULT'],
+ 'is_nullable' => ('Y' == $row['NULLABLE']),
+ 'data_type' => $row['DATA_TYPE'],
+ 'character_maximum_length' => $row['DATA_LENGTH'],
+ 'character_octet_length' => null,
+ 'numeric_precision' => $row['DATA_PRECISION'],
+ 'numeric_scale' => $row['DATA_SCALE'],
+ 'numeric_unsigned' => false,
+ 'erratas' => array(),
+ );
+ }
+
+ $this->data['columns'][$schema][$table] = $columns;
+ return $this;
+ }
+
+ /**
+ * Constraint type
+ *
+ * @param string $type
+ * @return string
+ */
+ protected function getConstraintType($type)
+ {
+ if (isset($this->constraintTypeMap[$type])) {
+ return $this->constraintTypeMap[$type];
+ }
+
+ return $type;
+ }
+
+ /**
+ * {@inheritdoc}
+ * @see \Zend\Db\Metadata\Source\AbstractSource::loadConstraintData()
+ */
+ protected function loadConstraintData($table, $schema)
+ {
+ if (isset($this->data['constraints'][$schema][$table])) {
+ return;
+ }
+
+ $this->prepareDataHierarchy('constraints', $schema, $table);
+ $sql = '
+ SELECT
+ ac.owner,
+ ac.constraint_name,
+ ac.constraint_type,
+ ac.search_condition check_clause,
+ ac.table_name,
+ ac.delete_rule,
+ cc1.column_name,
+ cc2.table_name as ref_table,
+ cc2.column_name as ref_column,
+ cc2.owner as ref_owner
+ FROM all_constraints ac
+ INNER JOIN all_cons_columns cc1
+ ON cc1.constraint_name = ac.constraint_name
+ LEFT JOIN all_cons_columns cc2
+ ON cc2.constraint_name = ac.r_constraint_name
+ AND cc2.position = cc1.position
+
+ WHERE
+ ac.owner = :schema AND ac.table_name = :table
+
+ ORDER BY ac.constraint_name;
+ ';
+
+ $parameters = array(
+ ':schema' => $schema,
+ ':table' => $table
+ );
+
+ $results = $this->adapter->query($sql)->execute($parameters);
+ $isFK = false;
+ $name = null;
+ $constraints = array();
+
+ foreach ($results as $row) {
+ if ($row['CONSTRAINT_NAME'] !== $name) {
+ $name = $row['CONSTRAINT_NAME'];
+ $constraints[$name] = array(
+ 'constraint_name' => $name,
+ 'constraint_type' => $this->getConstraintType($row['CONSTRAINT_TYPE']),
+ 'table_name' => $row['TABLE_NAME'],
+ );
+
+ if ('C' == $row['CONSTRAINT_TYPE']) {
+ $constraints[$name]['CHECK_CLAUSE'] = $row['CHECK_CLAUSE'];
+ continue;
+ }
+
+ $constraints[$name]['columns'] = array();
+
+ $isFK = ('R' == $row['CONSTRAINT_TYPE']);
+ if ($isFK) {
+ $constraints[$name]['referenced_table_schema'] = $row['REF_OWNER'];
+ $constraints[$name]['referenced_table_name'] = $row['REF_TABLE'];
+ $constraints[$name]['referenced_columns'] = array();
+ $constraints[$name]['match_option'] = 'NONE';
+ $constraints[$name]['update_rule'] = null;
+ $constraints[$name]['delete_rule'] = $row['DELETE_RULE'];
+ }
+ }
+
+ $constraints[$name]['columns'][] = $row['COLUMN_NAME'];
+ if ($isFK) {
+ $constraints[$name]['referenced_columns'][] = $row['REF_COLUMN'];
+ }
+ }
+
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ * @see \Zend\Db\Metadata\Source\AbstractSource::loadSchemaData()
+ */
+ protected function loadSchemaData()
+ {
+ if (isset($this->data['schemas'])) {
+ return;
+ }
+
+ $this->prepareDataHierarchy('schemas');
+ $sql = 'SELECT USERNAME FROM ALL_USERS';
+ $results = $this->adapter->query($sql, Adapter::QUERY_MODE_EXECUTE);
+
+ $schemas = array();
+ foreach ($results->toArray() as $row) {
+ $schemas[] = $row['USERNAME'];
+ }
+
+ $this->data['schemas'] = $schemas;
+ }
+
+ /**
+ * {@inheritdoc}
+ * @see \Zend\Db\Metadata\Source\AbstractSource::loadTableNameData()
+ */
+ protected function loadTableNameData($schema)
+ {
+ if (isset($this->data['table_names'][$schema])) {
+ return $this;
+ }
+
+ $this->prepareDataHierarchy('table_names', $schema);
+ $tables = array();
+
+ // Tables
+ $bind = array(':OWNER' => strtoupper($schema));
+ $result = $this->adapter->query('SELECT TABLE_NAME FROM ALL_TABLES WHERE OWNER=:OWNER')->execute($bind);
+
+ foreach ($result as $row) {
+ $tables[$row['TABLE_NAME']] = array(
+ 'table_type' => 'BASE TABLE',
+ 'view_definition' => null,
+ 'check_option' => null,
+ 'is_updatable' => false,
+ );
+ }
+
+ // Views
+ $result = $this->adapter->query('SELECT VIEW_NAME, TEXT FROM ALL_VIEWS WHERE OWNER=:OWNER', $bind);
+ foreach ($result as $row) {
+ $tables[$row['VIEW_NAME']] = array(
+ 'table_type' => 'VIEW',
+ 'view_definition' => null,
+ 'check_option' => 'NONE',
+ 'is_updatable' => false,
+ );
+ }
+
+ $this->data['table_names'][$schema] = $tables;
+ return $this;
+ }
+
+ /**
+ * FIXME: load trigger data
+ *
+ * {@inheritdoc}
+ *
+ * @see \Zend\Db\Metadata\Source\AbstractSource::loadTriggerData()
+ */
+ protected function loadTriggerData($schema)
+ {
+ if (isset($this->data['triggers'][$schema])) {
+ return;
+ }
+
+ $this->prepareDataHierarchy('triggers', $schema);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
index 6fb731b4b55..ca58ce8d7f7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use Zend\Db\Adapter\Adapter;
class PostgresqlMetadata extends AbstractSource
{
-
protected function loadSchemaData()
{
if (isset($this->data['schemas'])) {
@@ -343,6 +342,4 @@ class PostgresqlMetadata extends AbstractSource
$this->data['triggers'][$schema] = $data;
}
-
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqlServerMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
index 16937bc5d9f..8c1fe7ef0f0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,8 +13,6 @@ use Zend\Db\Adapter\Adapter;
class SqlServerMetadata extends AbstractSource
{
-
-
protected function loadSchemaData()
{
if (isset($this->data['schemas'])) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqliteMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqliteMetadata.php
index 16589616973..0fc1e15bcac 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqliteMetadata.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqliteMetadata.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -78,9 +78,6 @@ class SqliteMetadata extends AbstractSource
$this->prepareDataHierarchy('columns', $schema, $table);
$this->prepareDataHierarchy('sqlite_columns', $schema, $table);
- $p = $this->adapter->getPlatform();
-
-
$results = $this->fetchPragma('table_info', $table, $schema);
$columns = array();
@@ -260,8 +257,6 @@ class SqliteMetadata extends AbstractSource
{
static $re = null;
if (null === $re) {
- $identifier = $this->getIdentifierRegularExpression();
- $identifierList = $this->getIdentifierListRegularExpression();
$identifierChain = $this->getIdentifierChainRegularExpression();
$re = $this->buildRegularExpression(array(
'CREATE',
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/AbstractResultSet.php b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/AbstractResultSet.php
index 0074ebfbfe3..a5cbb682225 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/AbstractResultSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/AbstractResultSet.php
@@ -3,14 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Db\ResultSet;
use ArrayIterator;
-use ArrayObject;
use Countable;
use Iterator;
use IteratorAggregate;
@@ -172,7 +171,9 @@ abstract class AbstractResultSet implements Iterator, ResultSetInterface
if ($this->buffer === null) {
$this->buffer = -2; // implicitly disable buffering from here on
}
- $this->dataSource->next();
+ if (!is_array($this->buffer) || $this->position == $this->dataSource->key()) {
+ $this->dataSource->next();
+ }
$this->position++;
}
@@ -268,7 +269,7 @@ abstract class AbstractResultSet implements Iterator, ResultSetInterface
$return[] = $row;
} elseif (method_exists($row, 'toArray')) {
$return[] = $row->toArray();
- } elseif ($row instanceof ArrayObject) {
+ } elseif (method_exists($row, 'getArrayCopy')) {
$return[] = $row->getArrayCopy();
} else {
throw new Exception\RuntimeException(
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/ExceptionInterface.php
index 7f7648b33fd..c4aa1aa8b85 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php
index 42f3c93ae35..32b6267706a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/RuntimeException.php
index f201ac10f7f..244c1d974e8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/HydratingResultSet.php b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/HydratingResultSet.php
index a4bd9162982..f7a44f13f76 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/HydratingResultSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/HydratingResultSet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSet.php b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSet.php
index 2286410c659..59bfac9d15c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSetInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSetInterface.php
index c2bbd73b273..63de36913db 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSetInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/ResultSetInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/AbstractRowGateway.php b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/AbstractRowGateway.php
index 4183bbf2c2e..ed3f60aea2c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/AbstractRowGateway.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/AbstractRowGateway.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Db\Sql\TableIdentifier;
abstract class AbstractRowGateway implements ArrayAccess, Countable, RowGatewayInterface
{
-
/**
* @var bool
*/
@@ -127,7 +126,6 @@ abstract class AbstractRowGateway implements ArrayAccess, Countable, RowGatewayI
$this->initialize();
if ($this->rowExistsInDatabase()) {
-
// UPDATE
$data = $this->data;
@@ -158,7 +156,6 @@ abstract class AbstractRowGateway implements ArrayAccess, Countable, RowGatewayI
}
}
} else {
-
// INSERT
$insert = $this->sql->insert();
$insert->values($this->data);
@@ -180,7 +177,6 @@ abstract class AbstractRowGateway implements ArrayAccess, Countable, RowGatewayI
foreach ($this->primaryKeyColumn as $pkColumn) {
$where[$pkColumn] = $this->primaryKeyData[$pkColumn];
}
-
}
// refresh data
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php
index 7bb37fc982c..54004999fdb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php
index 7db3117deea..1f820341211 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/RuntimeException.php
index 0b698c64585..acfa6b246c3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Feature/AbstractFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Feature/AbstractFeature.php
index c52e7fc2a92..d53a0ccb26d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Feature/AbstractFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Feature/AbstractFeature.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Db\RowGateway\Exception;
abstract class AbstractFeature extends AbstractRowGateway
{
-
/**
* @var AbstractRowGateway
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Feature/FeatureSet.php b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Feature/FeatureSet.php
index de3b2344fb0..424251c647b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Feature/FeatureSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Feature/FeatureSet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/RowGateway.php b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/RowGateway.php
index 1415d6995e7..97e7fdab318 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/RowGateway.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/RowGateway.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Db\Sql\Sql;
class RowGateway extends AbstractRowGateway
{
-
/**
* Constructor
*
@@ -26,7 +25,7 @@ class RowGateway extends AbstractRowGateway
public function __construct($primaryKeyColumn, $table, $adapterOrSql = null)
{
// setup primary key
- $this->primaryKeyColumn = (array) $primaryKeyColumn;
+ $this->primaryKeyColumn = empty($primaryKeyColumn) ? null : (array) $primaryKeyColumn;
// set table
$this->table = $table;
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/RowGatewayInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/RowGatewayInterface.php
index e0a20b554d4..7683e94bcb2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/RowGatewayInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/RowGatewayInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/AbstractSql.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/AbstractSql.php
index aad983d582e..7726af4272f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/AbstractSql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/AbstractSql.php
@@ -3,16 +3,18 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Db\Sql;
+use Zend\Db\Adapter\Adapter;
use Zend\Db\Adapter\Driver\DriverInterface;
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Platform\PlatformInterface;
use Zend\Db\Adapter\StatementContainer;
+use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
abstract class AbstractSql
{
@@ -54,7 +56,6 @@ abstract class AbstractSql
$expressionParamIndex = &$this->instanceParameterIndex[$namedParameterPrefix];
foreach ($parts as $part) {
-
// if it is a string, simply tack it onto the return sql "specification" string
if (is_string($part)) {
$sql .= $part;
@@ -86,7 +87,6 @@ abstract class AbstractSql
$parameterContainer->merge($innerStatementContainer->getParameterContainer());
}
} elseif (isset($types[$vIndex]) && $types[$vIndex] == ExpressionInterface::TYPE_VALUE) {
-
// if prepareType is set, it means that this particular value must be
// passed back to the statement in a way it can be used as a placeholder value
if ($driver) {
@@ -173,7 +173,14 @@ abstract class AbstractSql
$subselect->processInfo['paramPrefix'] = 'subselect' . $subselect->processInfo['subselectCount'];
// call subselect
- $subselect->prepareStatement(new \Zend\Db\Adapter\Adapter($driver, $platform), $stmtContainer);
+ if ($this instanceof PlatformDecoratorInterface) {
+ /** @var Select|PlatformDecoratorInterface $subselectDecorator */
+ $subselectDecorator = clone $this;
+ $subselectDecorator->setSubject($subselect);
+ $subselectDecorator->prepareStatement(new Adapter($driver, $platform), $stmtContainer);
+ } else {
+ $subselect->prepareStatement(new Adapter($driver, $platform), $stmtContainer);
+ }
// copy count
$this->processInfo['subselectCount'] = $subselect->processInfo['subselectCount'];
@@ -181,7 +188,13 @@ abstract class AbstractSql
$parameterContainer->merge($stmtContainer->getParameterContainer()->getNamedArray());
$sql = $stmtContainer->getSql();
} else {
- $sql = $subselect->getSqlString($platform);
+ if ($this instanceof PlatformDecoratorInterface) {
+ $subselectDecorator = clone $this;
+ $subselectDecorator->setSubject($subselect);
+ $sql = $subselectDecorator->getSqlString($platform);
+ } else {
+ $sql = $subselect->getSqlString($platform);
+ }
}
return $sql;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/AlterTable.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/AlterTable.php
index 0c9d630f9ee..6ab95a02b27 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/AlterTable.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/AlterTable.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -240,7 +240,7 @@ class AlterTable extends AbstractSql implements SqlInterface
{
$sqls = array();
foreach ($this->dropColumns as $column) {
- $sqls[] = $adapterPlatform->quoteIdentifier($column);
+ $sqls[] = $adapterPlatform->quoteIdentifier($column);
}
return array($sqls);
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/BigInteger.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/BigInteger.php
index d915a948f30..75ce21cc3e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/BigInteger.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/BigInteger.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Blob.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Blob.php
index 1892ca6039b..a171b8379f6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Blob.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Blob.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,11 +22,11 @@ class Blob extends Column
protected $type = 'BLOB';
/**
- * @param null $name
- * @param int $length
- * @param bool $nullable
- * @param null $default
- * @param array $options
+ * @param string $name
+ * @param int $length
+ * @param bool $nullable
+ * @param null $default
+ * @param array $options
*/
public function __construct($name, $length, $nullable = false, $default = null, array $options = array())
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Boolean.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Boolean.php
index 36c07187cbd..26f83f825e4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Boolean.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Boolean.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Char.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Char.php
index 507cfe2c609..8fb6552dfb6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Char.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Char.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Column.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Column.php
index de2f852b0d0..f24b3ab881c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Column.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Column.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/ColumnInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/ColumnInterface.php
index 331e5254f44..f21e11d98b2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/ColumnInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/ColumnInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,10 +11,30 @@ namespace Zend\Db\Sql\Ddl\Column;
use Zend\Db\Sql\ExpressionInterface;
+/**
+ * Interface ColumnInterface describes the protocol on how Column objects interact
+ *
+ * @package Zend\Db\Sql\Ddl\Column
+ */
interface ColumnInterface extends ExpressionInterface
{
+ /**
+ * @return string
+ */
public function getName();
+
+ /**
+ * @return bool
+ */
public function isNullable();
+
+ /**
+ * @return null|string|int
+ */
public function getDefault();
+
+ /**
+ * @return array
+ */
public function getOptions();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Date.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Date.php
index 489a11439e2..266e0699cfa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Date.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Date.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Decimal.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Decimal.php
index 8a0ff25e3c7..b272317400b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Decimal.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Decimal.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Float.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Float.php
index e866abcf558..5111b990225 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Float.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Float.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Integer.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Integer.php
index 5e424285c0d..b24466416a7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Integer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Integer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Text.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Text.php
index 3e407090937..ea63af9074c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Text.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Text.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Time.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Time.php
index 68d3c66484e..d7e85404cec 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Time.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Time.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Varchar.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Varchar.php
index 49a718c78cb..0f3496c69cf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Varchar.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Varchar.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/AbstractConstraint.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/AbstractConstraint.php
index 19909fadb22..d83e31230af 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/AbstractConstraint.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/AbstractConstraint.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/Check.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/Check.php
index 1afbeb39cbd..a739b9afcde 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/Check.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/Check.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ConstraintInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ConstraintInterface.php
index bcb96439432..667e560167b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ConstraintInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ConstraintInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ForeignKey.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ForeignKey.php
index 1d0c0cad473..e974e1f737d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ForeignKey.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/ForeignKey.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php
index 84124a4d0a1..b2501e0b916 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/PrimaryKey.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/UniqueKey.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/UniqueKey.php
index 8d871054e18..b983f2fb885 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/UniqueKey.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Constraint/UniqueKey.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,12 +17,12 @@ class UniqueKey extends AbstractConstraint
protected $specification = 'CONSTRAINT UNIQUE KEY %s(...)';
/**
- * @param string $column
+ * @param array $columns
* @param null|string $name
*/
- public function __construct($column, $name = null)
+ public function __construct($columns, $name = null)
{
- $this->setColumns($column);
+ $this->setColumns($columns);
$this->name = $name;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/CreateTable.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/CreateTable.php
index 45bfd982d9d..f331b232f1d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/CreateTable.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/CreateTable.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/DropTable.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/DropTable.php
index e38425c6bbb..bf355688377 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/DropTable.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/DropTable.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/SqlInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/SqlInterface.php
index 761312458a9..fb4dab05ca7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/SqlInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/SqlInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Delete.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Delete.php
index bc66e22f851..c9a387add87 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Delete.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Delete.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -103,47 +103,8 @@ class Delete extends AbstractSql implements SqlInterface, PreparableSqlInterface
{
if ($predicate instanceof Where) {
$this->where = $predicate;
- } elseif ($predicate instanceof \Closure) {
- $predicate($this->where);
} else {
-
- if (is_string($predicate)) {
- // String $predicate should be passed as an expression
- $predicate = new Predicate\Expression($predicate);
- $this->where->addPredicate($predicate, $combination);
- } elseif (is_array($predicate)) {
-
- foreach ($predicate as $pkey => $pvalue) {
- // loop through predicates
-
- if (is_string($pkey) && strpos($pkey, '?') !== false) {
- // First, process strings that the abstraction replacement character ?
- // as an Expression predicate
- $predicate = new Predicate\Expression($pkey, $pvalue);
-
- } elseif (is_string($pkey)) {
- // Otherwise, if still a string, do something intelligent with the PHP type provided
-
- if ($pvalue === null) {
- // map PHP null to SQL IS NULL expression
- $predicate = new Predicate\IsNull($pkey, $pvalue);
- } elseif (is_array($pvalue)) {
- // if the value is an array, assume IN() is desired
- $predicate = new Predicate\In($pkey, $pvalue);
- } else {
- // otherwise assume that array('foo' => 'bar') means "foo" = 'bar'
- $predicate = new Predicate\Operator($pkey, Predicate\Operator::OP_EQ, $pvalue);
- }
- } elseif ($pvalue instanceof Predicate\PredicateInterface) {
- // Predicate type is ok
- $predicate = $pvalue;
- } else {
- // must be an array of expressions (with int-indexed array)
- $predicate = new Predicate\Expression($pvalue);
- }
- $this->where->addPredicate($predicate, $combination);
- }
- }
+ $this->where->addPredicates($predicate, $combination);
}
return $this;
}
@@ -180,13 +141,13 @@ class Delete extends AbstractSql implements SqlInterface, PreparableSqlInterface
$table = $platform->quoteIdentifier($schema) . $platform->getIdentifierSeparator() . $table;
}
- $sql = sprintf($this->specifications[self::SPECIFICATION_DELETE], $table);
+ $sql = sprintf($this->specifications[static::SPECIFICATION_DELETE], $table);
// process where
if ($this->where->count() > 0) {
$whereParts = $this->processExpression($this->where, $platform, $driver, 'where');
$parameterContainer->merge($whereParts->getParameterContainer());
- $sql .= ' ' . sprintf($this->specifications[self::SPECIFICATION_WHERE], $whereParts->getSql());
+ $sql .= ' ' . sprintf($this->specifications[static::SPECIFICATION_WHERE], $whereParts->getSql());
}
$statementContainer->setSql($sql);
}
@@ -216,11 +177,11 @@ class Delete extends AbstractSql implements SqlInterface, PreparableSqlInterface
$table = $adapterPlatform->quoteIdentifier($schema) . $adapterPlatform->getIdentifierSeparator() . $table;
}
- $sql = sprintf($this->specifications[self::SPECIFICATION_DELETE], $table);
+ $sql = sprintf($this->specifications[static::SPECIFICATION_DELETE], $table);
if ($this->where->count() > 0) {
$whereParts = $this->processExpression($this->where, $adapterPlatform, null, 'where');
- $sql .= ' ' . sprintf($this->specifications[self::SPECIFICATION_WHERE], $whereParts->getSql());
+ $sql .= ' ' . sprintf($this->specifications[static::SPECIFICATION_WHERE], $whereParts->getSql());
}
return $sql;
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/ExceptionInterface.php
index 337266de87a..9e18dba2610 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/InvalidArgumentException.php
index 0892d68b7fa..19aef601eca 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/RuntimeException.php
index b6546b09083..5a7dea34738 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Expression.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Expression.php
index b9f935b409c..21b2649e57e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Expression.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Expression.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/ExpressionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/ExpressionInterface.php
index 5efa90308be..4781dad0689 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/ExpressionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/ExpressionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,6 @@ interface ExpressionInterface
const TYPE_VALUE = 'value';
const TYPE_LITERAL = 'literal';
- /**
- * @deprecated This will go away in 2.1
- */
- const TYPE_SELECT = 'select';
-
/**
* @abstract
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Having.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Having.php
index bf440f3d643..024f9d0f1b9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Having.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Having.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,5 +11,4 @@ namespace Zend\Db\Sql;
class Having extends Predicate\Predicate
{
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Insert.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Insert.php
index 63f94a54701..944a369ab24 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Insert.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Insert.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -23,6 +23,7 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
* @const
*/
const SPECIFICATION_INSERT = 'insert';
+ const SPECIFICATION_SELECT = 'select';
const VALUES_MERGE = 'merge';
const VALUES_SET = 'set';
/**#@-*/
@@ -31,7 +32,8 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
* @var array Specification array
*/
protected $specifications = array(
- self::SPECIFICATION_INSERT => 'INSERT INTO %1$s (%2$s) VALUES (%3$s)'
+ self::SPECIFICATION_INSERT => 'INSERT INTO %1$s (%2$s) VALUES (%3$s)',
+ self::SPECIFICATION_SELECT => 'INSERT INTO %1$s %2$s %3$s',
);
/**
@@ -41,9 +43,9 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
protected $columns = array();
/**
- * @var array
+ * @var array|Select
*/
- protected $values = array();
+ protected $values = null;
/**
* Constructor
@@ -58,7 +60,7 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
}
/**
- * Crete INTO clause
+ * Create INTO clause
*
* @param string|TableIdentifier $table
* @return Insert
@@ -84,15 +86,25 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
/**
* Specify values to insert
*
- * @param array $values
+ * @param array|Select $values
* @param string $flag one of VALUES_MERGE or VALUES_SET; defaults to VALUES_SET
* @throws Exception\InvalidArgumentException
* @return Insert
*/
- public function values(array $values, $flag = self::VALUES_SET)
+ public function values($values, $flag = self::VALUES_SET)
{
- if (!is_array($values)) {
- throw new Exception\InvalidArgumentException('values() expects an array of values');
+ if (!is_array($values) && !$values instanceof Select) {
+ throw new Exception\InvalidArgumentException('values() expects an array of values or Zend\Db\Sql\Select instance');
+ }
+
+ if ($values instanceof Select) {
+ if ($flag == self::VALUES_MERGE && (is_array($this->values) && !empty($this->values))) {
+ throw new Exception\InvalidArgumentException(
+ 'A Zend\Db\Sql\Select instance cannot be provided with the merge flag when values already exist.'
+ );
+ }
+ $this->values = $values;
+ return $this;
}
// determine if this is assoc or a set of values
@@ -102,6 +114,11 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
if ($flag == self::VALUES_SET) {
$this->columns = array();
$this->values = array();
+ } elseif ($this->values instanceof Select) {
+ throw new Exception\InvalidArgumentException(
+ 'An array of values cannot be provided with the merge flag when a Zend\Db\Sql\Select'
+ . ' instance already exists as the value source.'
+ );
}
if (is_string($firstKey)) {
@@ -121,6 +138,23 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
return $this;
}
+ /**
+ * Create INTO SELECT clause
+ *
+ * @param Select $select
+ * @return self
+ */
+ public function select(Select $select)
+ {
+ return $this->values($select);
+ }
+
+ /**
+ * Get raw state
+ *
+ * @param string $key
+ * @return mixed
+ */
public function getRawState($key = null)
{
$rawState = array(
@@ -166,29 +200,43 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
$columns = array();
$values = array();
- foreach ($this->columns as $cIndex => $column) {
- $columns[$cIndex] = $platform->quoteIdentifier($column);
- if (isset($this->values[$cIndex]) && $this->values[$cIndex] instanceof Expression) {
- $exprData = $this->processExpression($this->values[$cIndex], $platform, $driver);
- $values[$cIndex] = $exprData->getSql();
- $parameterContainer->merge($exprData->getParameterContainer());
- } else {
- $values[$cIndex] = $driver->formatParameterName($column);
- if (isset($this->values[$cIndex])) {
- $parameterContainer->offsetSet($column, $this->values[$cIndex]);
+ if (is_array($this->values)) {
+ foreach ($this->columns as $cIndex => $column) {
+ $columns[$cIndex] = $platform->quoteIdentifier($column);
+ if (isset($this->values[$cIndex]) && $this->values[$cIndex] instanceof Expression) {
+ $exprData = $this->processExpression($this->values[$cIndex], $platform, $driver);
+ $values[$cIndex] = $exprData->getSql();
+ $parameterContainer->merge($exprData->getParameterContainer());
} else {
- $parameterContainer->offsetSet($column, null);
+ $values[$cIndex] = $driver->formatParameterName($column);
+ if (isset($this->values[$cIndex])) {
+ $parameterContainer->offsetSet($column, $this->values[$cIndex]);
+ } else {
+ $parameterContainer->offsetSet($column, null);
+ }
}
}
+ $sql = sprintf(
+ $this->specifications[static::SPECIFICATION_INSERT],
+ $table,
+ implode(', ', $columns),
+ implode(', ', $values)
+ );
+ } elseif ($this->values instanceof Select) {
+ $this->values->prepareStatement($adapter, $statementContainer);
+
+ $columns = array_map(array($platform, 'quoteIdentifier'), $this->columns);
+ $columns = implode(', ', $columns);
+
+ $sql = sprintf(
+ $this->specifications[static::SPECIFICATION_SELECT],
+ $table,
+ $columns ? "($columns)" : "",
+ $statementContainer->getSql()
+ );
+ } else {
+ throw new Exception\InvalidArgumentException('values or select should be present');
}
-
- $sql = sprintf(
- $this->specifications[self::SPECIFICATION_INSERT],
- $table,
- implode(', ', $columns),
- implode(', ', $values)
- );
-
$statementContainer->setSql($sql);
}
@@ -218,21 +266,38 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
$columns = array_map(array($adapterPlatform, 'quoteIdentifier'), $this->columns);
$columns = implode(', ', $columns);
- $values = array();
- foreach ($this->values as $value) {
- if ($value instanceof Expression) {
- $exprData = $this->processExpression($value, $adapterPlatform);
- $values[] = $exprData->getSql();
- } elseif ($value === null) {
- $values[] = 'NULL';
- } else {
- $values[] = $adapterPlatform->quoteValue($value);
+ if (is_array($this->values)) {
+ $values = array();
+ foreach ($this->values as $value) {
+ if ($value instanceof Expression) {
+ $exprData = $this->processExpression($value, $adapterPlatform);
+ $values[] = $exprData->getSql();
+ } elseif ($value === null) {
+ $values[] = 'NULL';
+ } else {
+ $values[] = $adapterPlatform->quoteValue($value);
+ }
}
+ return sprintf(
+ $this->specifications[static::SPECIFICATION_INSERT],
+ $table,
+ $columns,
+ implode(', ', $values)
+ );
+ } elseif ($this->values instanceof Select) {
+ $selectString = $this->values->getSqlString($adapterPlatform);
+ if ($columns) {
+ $columns = "($columns)";
+ }
+ return sprintf(
+ $this->specifications[static::SPECIFICATION_SELECT],
+ $table,
+ $columns,
+ $selectString
+ );
+ } else {
+ throw new Exception\InvalidArgumentException('values or select should be present');
}
-
- $values = implode(', ', $values);
-
- return sprintf($this->specifications[self::SPECIFICATION_INSERT], $table, $columns, $values);
}
/**
@@ -267,7 +332,9 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
}
unset($this->columns[$position]);
- unset($this->values[$position]);
+ if (is_array($this->values)) {
+ unset($this->values[$position]);
+ }
}
/**
@@ -294,6 +361,9 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
*/
public function __get($name)
{
+ if (!is_array($this->values)) {
+ return null;
+ }
if (($position = array_search($name, $this->columns)) === false) {
throw new Exception\InvalidArgumentException('The key ' . $name . ' was not found in this objects column list');
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Literal.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Literal.php
index ba67415a3d4..1da410288ff 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Literal.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Literal.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/AbstractPlatform.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/AbstractPlatform.php
index c5ddd6ce608..1eec50e3430 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/AbstractPlatform.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/AbstractPlatform.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/IbmDb2/IbmDb2.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/IbmDb2/IbmDb2.php
new file mode 100644
index 00000000000..0effa78fc99
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/IbmDb2/IbmDb2.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Db\Sql\Platform\IbmDb2;
+
+use Zend\Db\Sql\Platform\AbstractPlatform;
+
+class IbmDb2 extends AbstractPlatform
+{
+ /**
+ * @param SelectDecorator $selectDecorator
+ */
+ public function __construct(SelectDecorator $selectDecorator = null)
+ {
+ $this->setTypeDecorator('Zend\Db\Sql\Select', ($selectDecorator) ?: new SelectDecorator());
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/IbmDb2/SelectDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/IbmDb2/SelectDecorator.php
new file mode 100644
index 00000000000..47c15ee3620
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/IbmDb2/SelectDecorator.php
@@ -0,0 +1,192 @@
+<?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\Db\Sql\Platform\IbmDb2;
+
+use Zend\Db\Adapter\AdapterInterface;
+use Zend\Db\Adapter\Driver\DriverInterface;
+use Zend\Db\Adapter\ParameterContainer;
+use Zend\Db\Adapter\Platform\PlatformInterface;
+use Zend\Db\Adapter\StatementContainerInterface;
+use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
+use Zend\Db\Sql\Select;
+
+class SelectDecorator extends Select implements PlatformDecoratorInterface
+{
+ /**
+ * @var bool
+ */
+ protected $isSelectContainDistinct= false;
+
+ /**
+ * @var Select
+ */
+ protected $select = null;
+
+ /**
+ * @return bool
+ */
+ public function getIsSelectContainDistinct()
+ {
+ return $this->isSelectContainDistinct;
+ }
+
+ /**
+ * @param boolean $isSelectContainDistinct
+ */
+ public function setIsSelectContainDistinct($isSelectContainDistinct)
+ {
+ $this->isSelectContainDistinct = $isSelectContainDistinct;
+ }
+
+ /**
+ * @param Select $select
+ */
+ public function setSubject($select)
+ {
+ $this->select = $select;
+ }
+
+ /**
+ * @see Select::renderTable
+ */
+ protected function renderTable($table, $alias = null)
+ {
+ return $table . ' ' . $alias;
+ }
+
+ /**
+ * @param AdapterInterface $adapter
+ * @param StatementContainerInterface $statementContainer
+ */
+ public function prepareStatement(AdapterInterface $adapter, StatementContainerInterface $statementContainer)
+ {
+ // localize variables
+ foreach (get_object_vars($this->select) as $name => $value) {
+ $this->{$name} = $value;
+ }
+ // set specifications
+ unset($this->specifications[self::LIMIT]);
+ unset($this->specifications[self::OFFSET]);
+
+ $this->specifications['LIMITOFFSET'] = null;
+ parent::prepareStatement($adapter, $statementContainer);
+ }
+
+ /**
+ * @param PlatformInterface $platform
+ * @return string
+ */
+ public function getSqlString(PlatformInterface $platform = null)
+ {
+ // localize variables
+ foreach (get_object_vars($this->select) as $name => $value) {
+ $this->{$name} = $value;
+ }
+
+ unset($this->specifications[self::LIMIT]);
+ unset($this->specifications[self::OFFSET]);
+ $this->specifications['LIMITOFFSET'] = null;
+
+ return parent::getSqlString($platform);
+ }
+
+ /**
+ * @param PlatformInterface $platform
+ * @param DriverInterface $driver
+ * @param ParameterContainer $parameterContainer
+ * @param array $sqls
+ * @param array $parameters
+ */
+ protected function processLimitOffset(PlatformInterface $platform, DriverInterface $driver = null, ParameterContainer $parameterContainer = null, &$sqls, &$parameters)
+ {
+ if ($this->limit === null && $this->offset === null) {
+ return;
+ }
+
+ $selectParameters = $parameters[self::SELECT];
+
+ $starSuffix = $platform->getIdentifierSeparator() . self::SQL_STAR;
+ foreach ($selectParameters[0] as $i => $columnParameters) {
+ if ($columnParameters[0] == self::SQL_STAR
+ || (isset($columnParameters[1]) && $columnParameters[1] == self::SQL_STAR)
+ || strpos($columnParameters[0], $starSuffix)
+ ) {
+ $selectParameters[0] = array(array(self::SQL_STAR));
+ break;
+ }
+
+ if (isset($columnParameters[1])) {
+ array_shift($columnParameters);
+ $selectParameters[0][$i] = $columnParameters;
+ }
+ }
+
+ // first, produce column list without compound names (using the AS portion only)
+ array_unshift($sqls, $this->createSqlFromSpecificationAndParameters(
+ array('SELECT %1$s FROM (' => current($this->specifications[self::SELECT])),
+ $selectParameters
+ ));
+
+ if (preg_match('/DISTINCT/i', $sqls[0])) {
+ $this->setIsSelectContainDistinct(true);
+ }
+
+ if ($parameterContainer) {
+ // create bottom part of query, with offset and limit using row_number
+ $limitParamName = $driver->formatParameterName('limit');
+ $offsetParamName = $driver->formatParameterName('offset');
+
+ array_push($sqls, sprintf(
+ ") AS ZEND_IBMDB2_SERVER_LIMIT_OFFSET_EMULATION WHERE ZEND_IBMDB2_SERVER_LIMIT_OFFSET_EMULATION.ZEND_DB_ROWNUM BETWEEN %s AND %s",
+ $offsetParamName,
+ $limitParamName
+ ));
+
+ if ((int) $this->offset > 0) {
+ $parameterContainer->offsetSet('offset', (int) $this->offset + 1);
+ } else {
+ $parameterContainer->offsetSet('offset', (int) $this->offset);
+ }
+
+ $parameterContainer->offsetSet('limit', (int) $this->limit + (int) $this->offset);
+ } else {
+ if ((int) $this->offset > 0) {
+ $offset = (int) $this->offset + 1;
+ } else {
+ $offset = (int) $this->offset;
+ }
+
+ array_push($sqls, sprintf(
+ ") AS ZEND_IBMDB2_SERVER_LIMIT_OFFSET_EMULATION WHERE ZEND_IBMDB2_SERVER_LIMIT_OFFSET_EMULATION.ZEND_DB_ROWNUM BETWEEN %d AND %d",
+ $offset,
+ (int) $this->limit + (int) $this->offset
+ ));
+ }
+
+ if (isset($sqls[self::ORDER])) {
+ $orderBy = $sqls[self::ORDER];
+ unset($sqls[self::ORDER]);
+ } else {
+ $orderBy = '';
+ }
+
+ // add a column for row_number() using the order specification //dense_rank()
+ if ($this->getIsSelectContainDistinct()) {
+ $parameters[self::SELECT][0][] = array('DENSE_RANK() OVER (' . $orderBy . ')', 'ZEND_DB_ROWNUM');
+ } else {
+ $parameters[self::SELECT][0][] = array('ROW_NUMBER() OVER (' . $orderBy . ')', 'ZEND_DB_ROWNUM');
+ }
+
+ $sqls[self::SELECT] = $this->createSqlFromSpecificationAndParameters(
+ $this->specifications[self::SELECT],
+ $parameters[self::SELECT]
+ );
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
index d9cfa15563f..4206c8736ad 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Mysql.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Mysql.php
index 80455869a41..5b3f2deeced 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Mysql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Mysql.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
index c2dda940abf..797be2c1304 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/SelectDecorator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -42,6 +42,9 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
foreach (get_object_vars($this->select) as $name => $value) {
$this->{$name} = $value;
}
+ if ($this->limit === null && $this->offset !== null) {
+ $this->specifications[self::LIMIT] = 'LIMIT 18446744073709551615';
+ }
parent::prepareStatement($adapter, $statementContainer);
}
@@ -55,17 +58,23 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
foreach (get_object_vars($this->select) as $name => $value) {
$this->{$name} = $value;
}
+ if ($this->limit === null && $this->offset !== null) {
+ $this->specifications[self::LIMIT] = 'LIMIT 18446744073709551615';
+ }
return parent::getSqlString($platform);
}
protected function processLimit(PlatformInterface $platform, DriverInterface $driver = null, ParameterContainer $parameterContainer = null)
{
+ if ($this->limit === null && $this->offset !== null) {
+ return array('');
+ }
if ($this->limit === null) {
return null;
}
if ($driver) {
$sql = $driver->formatParameterName('limit');
- $parameterContainer->offsetSet('limit', (int) $this->limit, ParameterContainer::TYPE_INTEGER);
+ $parameterContainer->offsetSet('limit', $this->limit, ParameterContainer::TYPE_INTEGER);
} else {
$sql = $this->limit;
}
@@ -79,7 +88,7 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
return null;
}
if ($driver) {
- $parameterContainer->offsetSet('offset', (int) $this->offset, ParameterContainer::TYPE_INTEGER);
+ $parameterContainer->offsetSet('offset', $this->offset, ParameterContainer::TYPE_INTEGER);
return array($driver->formatParameterName('offset'));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/Oracle.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/Oracle.php
index e8dee3ceb3b..e2f3f176997 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/Oracle.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/Oracle.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,10 +13,8 @@ use Zend\Db\Sql\Platform\AbstractPlatform;
class Oracle extends AbstractPlatform
{
-
public function __construct(SelectDecorator $selectDecorator = null)
{
$this->setTypeDecorator('Zend\Db\Sql\Select', ($selectDecorator) ?: new SelectDecorator());
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
index 69c1700978f..0fa9e4f1f2e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -20,7 +20,6 @@ use Zend\Db\Sql\Select;
class SelectDecorator extends Select implements PlatformDecoratorInterface
{
-
/**
* @var Select
*/
@@ -178,5 +177,4 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
return array($joinSpecArgArray);
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Platform.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Platform.php
index 1342c731a16..38132537769 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Platform.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Platform.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use Zend\Db\Adapter\AdapterInterface;
class Platform extends AbstractPlatform
{
-
/**
* @var AdapterInterface
*/
@@ -36,6 +35,11 @@ class Platform extends AbstractPlatform
$platform = new Oracle\Oracle();
$this->decorators = $platform->decorators;
break;
+ case 'ibm db2':
+ case 'ibm_db2':
+ case 'ibmdb2':
+ $platform = new IbmDb2\IbmDb2();
+ $this->decorators = $platform->decorators;
default:
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php
index 2ff7c97ce6d..d4384abaed4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php
new file mode 100644
index 00000000000..c05a18f641f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php
@@ -0,0 +1,61 @@
+<?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\Db\Sql\Platform\SqlServer\Ddl;
+
+use Zend\Db\Adapter\Platform\PlatformInterface;
+use Zend\Db\Sql\Ddl\CreateTable;
+use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
+
+class CreateTableDecorator extends CreateTable implements PlatformDecoratorInterface
+{
+ /**
+ * @var CreateTable
+ */
+ protected $createTable;
+
+ /**
+ * @param CreateTable $subject
+ * @return self
+ */
+ public function setSubject($subject)
+ {
+ $this->createTable = $subject;
+ return $this;
+ }
+
+ /**
+ * @param null|PlatformInterface $platform
+ * @return string
+ */
+ public function getSqlString(PlatformInterface $platform = null)
+ {
+ // localize variables
+ foreach (get_object_vars($this->createTable) as $name => $value) {
+ $this->{$name} = $value;
+ }
+ return parent::getSqlString($platform);
+ }
+
+ /**
+ * @param PlatformInterface $adapterPlatform
+ * @return array
+ */
+ protected function processTable(PlatformInterface $adapterPlatform = null)
+ {
+ $ret = array('');
+ if ($this->isTemporary) {
+ $table = '#';
+ } else {
+ $table = '';
+ }
+ $ret[] = $adapterPlatform->quoteIdentifier($table . ltrim($this->table, '#'));
+ return $ret;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
index 838ce588cf0..3b085c18340 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,6 +13,7 @@ use Zend\Db\Adapter\AdapterInterface;
use Zend\Db\Adapter\Driver\DriverInterface;
use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Platform\PlatformInterface;
+use Zend\Db\Adapter\Driver\Sqlsrv\Statement;
use Zend\Db\Adapter\StatementContainerInterface;
use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
use Zend\Db\Sql\Select;
@@ -49,6 +50,11 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
$this->specifications['LIMITOFFSET'] = null;
parent::prepareStatement($adapter, $statementContainer);
+
+ //set statement cursor type
+ if ($statementContainer instanceof Statement) {
+ $statementContainer->setPrepareOptions(array('Scrollable'=>\SQLSRV_CURSOR_STATIC));
+ }
}
/**
@@ -106,7 +112,11 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
if ($parameterContainer) {
// create bottom part of query, with offset and limit using row_number
- array_push($sqls, ') AS [ZEND_SQL_SERVER_LIMIT_OFFSET_EMULATION] WHERE [ZEND_SQL_SERVER_LIMIT_OFFSET_EMULATION].[__ZEND_ROW_NUMBER] BETWEEN ?+1 AND ?+?');
+ $limitParamName = $driver->formatParameterName('limit');
+ $offsetParamName = $driver->formatParameterName('offset');
+ $offsetForSumParamName = $driver->formatParameterName('offsetForSum');
+ array_push($sqls, ') AS [ZEND_SQL_SERVER_LIMIT_OFFSET_EMULATION] WHERE [ZEND_SQL_SERVER_LIMIT_OFFSET_EMULATION].[__ZEND_ROW_NUMBER] BETWEEN '
+ . $offsetParamName . '+1 AND ' . $limitParamName . '+' . $offsetForSumParamName);
$parameterContainer->offsetSet('offset', $this->offset);
$parameterContainer->offsetSet('limit', $this->limit);
$parameterContainer->offsetSetReference('offsetForSum', 'offset');
@@ -131,6 +141,5 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
$this->specifications[self::SELECT],
$parameters[self::SELECT]
);
-
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php
index 4ee2ec2fb2c..1bb500d466d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,9 +13,9 @@ use Zend\Db\Sql\Platform\AbstractPlatform;
class SqlServer extends AbstractPlatform
{
-
public function __construct(SelectDecorator $selectDecorator = null)
{
$this->setTypeDecorator('Zend\Db\Sql\Select', ($selectDecorator) ?: new SelectDecorator());
+ $this->setTypeDecorator('Zend\Db\Sql\Ddl\CreateTable', new Ddl\CreateTableDecorator());
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Between.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Between.php
index 686b65db58d..6c81b58ba79 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Between.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Between.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Expression.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Expression.php
index 58ceadbfc9e..ee54dd29110 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Expression.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Expression.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use Zend\Db\Sql\Expression as BaseExpression;
class Expression extends BaseExpression implements PredicateInterface
{
-
/**
* Constructor
*
@@ -26,17 +25,6 @@ class Expression extends BaseExpression implements PredicateInterface
$this->setExpression($expression);
}
- if (is_array($valueParameter)) {
- $this->setParameters($valueParameter);
- } else {
- $argNum = func_num_args();
- if ($argNum > 2 || is_scalar($valueParameter)) {
- $parameters = array();
- for ($i = 1; $i < $argNum; $i++) {
- $parameters[] = func_get_arg($i);
- }
- $this->setParameters($parameters);
- }
- }
+ $this->setParameters(is_array($valueParameter) ? $valueParameter : array_slice(func_get_args(), 1));
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/In.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/In.php
index 569d8dac0e5..b6697f59895 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/In.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/In.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,14 +17,13 @@ class In implements PredicateInterface
protected $identifier;
protected $valueSet;
- protected $selectSpecification = '%s IN %s';
- protected $valueSpecSpecification = '%%s IN (%s)';
+ protected $specification = '%s IN %s';
/**
* Constructor
*
- * @param null|string $identifier
- * @param array $valueSet
+ * @param null|string|array $identifier
+ * @param null|array|Select $valueSet
*/
public function __construct($identifier = null, $valueSet = null)
{
@@ -39,19 +38,20 @@ class In implements PredicateInterface
/**
* Set identifier for comparison
*
- * @param string $identifier
+ * @param string|array $identifier
* @return In
*/
public function setIdentifier($identifier)
{
$this->identifier = $identifier;
+
return $this;
}
/**
* Get identifier of comparison
*
- * @return null|string
+ * @return null|string|array
*/
public function getIdentifier()
{
@@ -61,7 +61,7 @@ class In implements PredicateInterface
/**
* Set set of values for IN comparison
*
- * @param array $valueSet
+ * @param array|Select $valueSet
* @throws Exception\InvalidArgumentException
* @return In
*/
@@ -73,9 +73,15 @@ class In implements PredicateInterface
);
}
$this->valueSet = $valueSet;
+
return $this;
}
+ /**
+ * Gets set of values in IN comparision
+ *
+ * @return array|Select
+ */
public function getValueSet()
{
return $this->valueSet;
@@ -88,23 +94,39 @@ class In implements PredicateInterface
*/
public function getExpressionData()
{
+ $identifier = $this->getIdentifier();
$values = $this->getValueSet();
- if ($values instanceof Select) {
- $specification = $this->selectSpecification;
- $types = array(self::TYPE_VALUE);
- $values = array($values);
+ $replacements = array();
+
+ if (is_array($identifier)) {
+ $identifierSpecFragment = '(' . implode(', ', array_fill(0, count($identifier), '%s')) . ')';
+ $types = array_fill(0, count($identifier), self::TYPE_IDENTIFIER);
+ $replacements = $identifier;
} else {
- $specification = sprintf($this->valueSpecSpecification, implode(', ', array_fill(0, count($values), '%s')));
- $types = array_fill(0, count($values), self::TYPE_VALUE);
+ $identifierSpecFragment = '%s';
+ $replacements[] = $identifier;
+ $types = array(self::TYPE_IDENTIFIER);
}
- $identifier = $this->getIdentifier();
- array_unshift($values, $identifier);
- array_unshift($types, self::TYPE_IDENTIFIER);
+ if ($values instanceof Select) {
+ $specification = vsprintf(
+ $this->specification,
+ array($identifierSpecFragment, '%s')
+ );
+ $replacements[] = $values;
+ $types[] = self::TYPE_VALUE;
+ } else {
+ $specification = vsprintf(
+ $this->specification,
+ array($identifierSpecFragment, '(' . implode(', ', array_fill(0, count($values), '%s')) . ')')
+ );
+ $replacements = array_merge($replacements, $values);
+ $types = array_merge($types, array_fill(0, count($values), self::TYPE_VALUE));
+ }
return array(array(
$specification,
- $values,
+ $replacements,
$types,
));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/IsNotNull.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/IsNotNull.php
index e09f34912a0..13dfa319575 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/IsNotNull.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/IsNotNull.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/IsNull.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/IsNull.php
index 007586d14f9..83931ba7376 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/IsNull.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/IsNull.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Db\Sql\Predicate;
class IsNull implements PredicateInterface
{
-
/**
* @var string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Like.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Like.php
index ba5e6479387..f4b143ab044 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Like.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Like.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Db\Sql\Predicate;
class Like implements PredicateInterface
{
-
/**
* @var string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Literal.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Literal.php
index cb4c080c833..8d88cf33dcc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Literal.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Literal.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,5 +13,4 @@ use Zend\Db\Sql\Literal as BaseLiteral;
class Literal extends BaseLiteral implements PredicateInterface
{
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/NotIn.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/NotIn.php
index ec04c186ac0..de32d23c807 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/NotIn.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/NotIn.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,5 @@ namespace Zend\Db\Sql\Predicate;
class NotIn extends In
{
- protected $selectSpecification = '%s NOT IN %s';
- protected $valueSpecSpecification = '%%s NOT IN (%s)';
+ protected $specification = '%s NOT IN %s';
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/NotLike.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/NotLike.php
index 329de23ed76..8f4726993a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/NotLike.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/NotLike.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Operator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Operator.php
index acd941406df..7efb89942dd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Operator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Operator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Predicate.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Predicate.php
index b3a02420ccb..d650938dc9c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Predicate.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Predicate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -60,9 +60,9 @@ class Predicate extends PredicateSet
if ($this->unnest == null) {
throw new RuntimeException('Not nested');
}
- $unnset = $this->unnest;
+ $unnest = $this->unnest;
$this->unnest = null;
- return $unnset;
+ return $unnest;
}
/**
@@ -322,7 +322,7 @@ class Predicate extends PredicateSet
}
/**
- * Create "in" predicate
+ * Create "IN" predicate
*
* Utilizes In predicate
*
@@ -341,6 +341,26 @@ class Predicate extends PredicateSet
return $this;
}
+ /**
+ * Create "NOT IN" predicate
+ *
+ * Utilizes NotIn predicate
+ *
+ * @param string $identifier
+ * @param array|\Zend\Db\Sql\Select $valueSet
+ * @return Predicate
+ */
+ public function notIn($identifier, $valueSet = null)
+ {
+ $this->addPredicate(
+ new NotIn($identifier, $valueSet),
+ ($this->nextPredicateCombineOperator) ?: $this->defaultCombination
+ );
+ $this->nextPredicateCombineOperator = null;
+
+ return $this;
+ }
+
/**
* Create "between" predicate
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/PredicateInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/PredicateInterface.php
index 5d4eac6d200..32b99c54220 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/PredicateInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/PredicateInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,5 +13,4 @@ use Zend\Db\Sql\ExpressionInterface;
interface PredicateInterface extends ExpressionInterface
{
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/PredicateSet.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/PredicateSet.php
index 59faf569e1e..bf62e8d4ca2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/PredicateSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/PredicateSet.php
@@ -3,13 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Db\Sql\Predicate;
use Countable;
+use Zend\Db\Sql\Exception;
class PredicateSet implements PredicateInterface, Countable
{
@@ -60,6 +61,62 @@ class PredicateSet implements PredicateInterface, Countable
return $this;
}
+ public function addPredicates($predicates, $combination = self::OP_AND)
+ {
+ if ($predicates === null) {
+ throw new Exception\InvalidArgumentException('Predicate cannot be null');
+ }
+ if ($predicates instanceof PredicateInterface) {
+ $this->addPredicate($predicates, $combination);
+ return $this;
+ }
+ if ($predicates instanceof \Closure) {
+ $predicates($this);
+ return $this;
+ }
+ if (is_string($predicates)) {
+ // String $predicate should be passed as an expression
+ $predicates = (strpos($predicates, Expression::PLACEHOLDER) !== false)
+ ? new Expression($predicates) : new Literal($predicates);
+ $this->addPredicate($predicates, $combination);
+ return $this;
+ }
+ if (is_array($predicates)) {
+ foreach ($predicates as $pkey => $pvalue) {
+ // loop through predicates
+ if (is_string($pkey)) {
+ if (strpos($pkey, '?') !== false) {
+ // First, process strings that the abstraction replacement character ?
+ // as an Expression predicate
+ $predicates = new Expression($pkey, $pvalue);
+ } elseif ($pvalue === null) { // Otherwise, if still a string, do something intelligent with the PHP type provided
+ // map PHP null to SQL IS NULL expression
+ $predicates = new IsNull($pkey, $pvalue);
+ } elseif (is_array($pvalue)) {
+ // if the value is an array, assume IN() is desired
+ $predicates = new In($pkey, $pvalue);
+ } elseif ($pvalue instanceof PredicateInterface) {
+ throw new Exception\InvalidArgumentException(
+ 'Using Predicate must not use string keys'
+ );
+ } else {
+ // otherwise assume that array('foo' => 'bar') means "foo" = 'bar'
+ $predicates = new Operator($pkey, Operator::OP_EQ, $pvalue);
+ }
+ } elseif ($pvalue instanceof PredicateInterface) {
+ // Predicate type is ok
+ $predicates = $pvalue;
+ } else {
+ // must be an array of expressions (with int-indexed array)
+ $predicates = (strpos($pvalue, Expression::PLACEHOLDER) !== false)
+ ? new Expression($pvalue) : new Literal($pvalue);
+ }
+ $this->addPredicate($predicates, $combination);
+ }
+ }
+ return $this;
+ }
+
/**
* Return the predicates
*
@@ -103,7 +160,6 @@ class PredicateSet implements PredicateInterface, Countable
{
$parts = array();
for ($i = 0, $count = count($this->predicates); $i < $count; $i++) {
-
/** @var $predicate PredicateInterface */
$predicate = $this->predicates[$i][1];
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/PreparableSqlInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/PreparableSqlInterface.php
index b8c3a50d9ce..dc66082cb4d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/PreparableSqlInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/PreparableSqlInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Db\Adapter\StatementContainerInterface;
interface PreparableSqlInterface
{
-
/**
* @param AdapterInterface $adapter
* @param StatementContainerInterface $statementContainer
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
index dad582f54e2..ccf1e414674 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -68,6 +68,9 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
array(1 => '%1$s', 2 => '%1$s AS %2$s', 'combinedby' => ', '),
null
),
+ 'SELECT %1$s' => array(
+ array(1 => '%1$s', 2 => '%1$s AS %2$s', 'combinedby' => ', '),
+ ),
),
self::JOINS => array(
'%1$s' => array(
@@ -204,9 +207,9 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
*/
public function quantifier($quantifier)
{
- if (!is_string($quantifier) && !$quantifier instanceof Expression) {
+ if (!is_string($quantifier) && !$quantifier instanceof ExpressionInterface) {
throw new Exception\InvalidArgumentException(
- 'Quantifier must be one of DISTINCT, ALL, or some platform specific Expression object'
+ 'Quantifier must be one of DISTINCT, ALL, or some platform specific object implementing ExpressionInterface'
);
}
$this->quantifier = $quantifier;
@@ -279,55 +282,8 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
{
if ($predicate instanceof Where) {
$this->where = $predicate;
- } elseif ($predicate instanceof Predicate\PredicateInterface) {
- $this->where->addPredicate($predicate, $combination);
- } elseif ($predicate instanceof \Closure) {
- $predicate($this->where);
} else {
- if (is_string($predicate)) {
- // String $predicate should be passed as an expression
- $predicate = (strpos($predicate, Expression::PLACEHOLDER) !== false)
- ? new Predicate\Expression($predicate) : new Predicate\Literal($predicate);
- $this->where->addPredicate($predicate, $combination);
- } elseif (is_array($predicate)) {
-
- foreach ($predicate as $pkey => $pvalue) {
- // loop through predicates
-
- if (is_string($pkey) && strpos($pkey, '?') !== false) {
- // First, process strings that the abstraction replacement character ?
- // as an Expression predicate
- $predicate = new Predicate\Expression($pkey, $pvalue);
-
- } elseif (is_string($pkey)) {
- // Otherwise, if still a string, do something intelligent with the PHP type provided
-
- if ($pvalue === null) {
- // map PHP null to SQL IS NULL expression
- $predicate = new Predicate\IsNull($pkey, $pvalue);
- } elseif (is_array($pvalue)) {
- // if the value is an array, assume IN() is desired
- $predicate = new Predicate\In($pkey, $pvalue);
- } elseif ($pvalue instanceof Predicate\PredicateInterface) {
- //
- throw new Exception\InvalidArgumentException(
- 'Using Predicate must not use string keys'
- );
- } else {
- // otherwise assume that array('foo' => 'bar') means "foo" = 'bar'
- $predicate = new Predicate\Operator($pkey, Predicate\Operator::OP_EQ, $pvalue);
- }
- } elseif ($pvalue instanceof Predicate\PredicateInterface) {
- // Predicate type is ok
- $predicate = $pvalue;
- } else {
- // must be an array of expressions (with int-indexed array)
- $predicate = (strpos($pvalue, Expression::PLACEHOLDER) !== false)
- ? new Predicate\Expression($pvalue) : new Predicate\Literal($pvalue);
- }
- $this->where->addPredicate($predicate, $combination);
- }
- }
+ $this->where->addPredicates($predicate, $combination);
}
return $this;
}
@@ -355,24 +311,8 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
{
if ($predicate instanceof Having) {
$this->having = $predicate;
- } elseif ($predicate instanceof \Closure) {
- $predicate($this->having);
} else {
- if (is_string($predicate)) {
- $predicate = new Predicate\Expression($predicate);
- $this->having->addPredicate($predicate, $combination);
- } elseif (is_array($predicate)) {
- foreach ($predicate as $pkey => $pvalue) {
- if (is_string($pkey) && strpos($pkey, '?') !== false) {
- $predicate = new Predicate\Expression($pkey, $pvalue);
- } elseif (is_string($pkey)) {
- $predicate = new Predicate\Operator($pkey, Predicate\Operator::OP_EQ, $pvalue);
- } else {
- $predicate = new Predicate\Expression($pvalue);
- }
- $this->having->addPredicate($predicate, $combination);
- }
- }
+ $this->having->addPredicates($predicate, $combination);
}
return $this;
}
@@ -647,38 +587,38 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
{
$expr = 1;
- if (!$this->table) {
- return null;
- }
+ if ($this->table) {
+ $table = $this->table;
+ $schema = $alias = null;
- $table = $this->table;
- $schema = $alias = null;
-
- if (is_array($table)) {
- $alias = key($this->table);
- $table = current($this->table);
- }
+ if (is_array($table)) {
+ $alias = key($this->table);
+ $table = current($this->table);
+ }
- // create quoted table name to use in columns processing
- if ($table instanceof TableIdentifier) {
- list($table, $schema) = $table->getTableAndSchema();
- }
+ // create quoted table name to use in columns processing
+ if ($table instanceof TableIdentifier) {
+ list($table, $schema) = $table->getTableAndSchema();
+ }
- if ($table instanceof Select) {
- $table = '(' . $this->processSubselect($table, $platform, $driver, $parameterContainer) . ')';
- } else {
- $table = $platform->quoteIdentifier($table);
- }
+ if ($table instanceof Select) {
+ $table = '(' . $this->processSubselect($table, $platform, $driver, $parameterContainer) . ')';
+ } else {
+ $table = $platform->quoteIdentifier($table);
+ }
- if ($schema) {
- $table = $platform->quoteIdentifier($schema) . $platform->getIdentifierSeparator() . $table;
- }
+ if ($schema) {
+ $table = $platform->quoteIdentifier($schema) . $platform->getIdentifierSeparator() . $table;
+ }
- if ($alias) {
- $fromTable = $platform->quoteIdentifier($alias);
- $table = $this->renderTable($table, $fromTable);
+ if ($alias) {
+ $fromTable = $platform->quoteIdentifier($alias);
+ $table = $this->renderTable($table, $fromTable);
+ } else {
+ $fromTable = $table;
+ }
} else {
- $fromTable = $table;
+ $fromTable = '';
}
if ($this->prefixColumnsWithTable) {
@@ -690,14 +630,13 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
// process table columns
$columns = array();
foreach ($this->columns as $columnIndexOrAs => $column) {
-
$columnName = '';
if ($column === self::SQL_STAR) {
$columns[] = array($fromTable . self::SQL_STAR);
continue;
}
- if ($column instanceof Expression) {
+ if ($column instanceof ExpressionInterface) {
$columnParts = $this->processExpression(
$column,
$platform,
@@ -741,7 +680,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
} else {
$name = (is_array($join['name'])) ? key($join['name']) : $name = $join['name'];
if ($name instanceof TableIdentifier) {
- $name = $platform->quoteIdentifier($name->getSchema()) . $separator . $platform->quoteIdentifier($name->getTable());
+ $name = ($name->hasSchema() ? $platform->quoteIdentifier($name->getSchema()) . $separator : '') . $platform->quoteIdentifier($name->getTable());
} else {
$name = $platform->quoteIdentifier($name);
}
@@ -757,7 +696,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
}
if ($this->quantifier) {
- if ($this->quantifier instanceof Expression) {
+ if ($this->quantifier instanceof ExpressionInterface) {
$quantifierParts = $this->processExpression($this->quantifier, $platform, $driver, 'quantifier');
if ($parameterContainer) {
$parameterContainer->merge($quantifierParts->getParameterContainer());
@@ -768,7 +707,9 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
}
}
- if (isset($quantifier)) {
+ if (!isset($table)) {
+ return array($columns);
+ } elseif (isset($quantifier)) {
return array($quantifier, $columns, $table);
} else {
return array($columns, $table);
@@ -798,12 +739,14 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
} else {
$joinName = $join['name'];
}
- if ($joinName instanceof TableIdentifier) {
+ if ($joinName instanceof ExpressionInterface) {
+ $joinName = $joinName->getExpression();
+ } elseif ($joinName instanceof TableIdentifier) {
$joinName = $joinName->getTableAndSchema();
- $joinName = $platform->quoteIdentifier($joinName[1]) . $platform->getIdentifierSeparator() . $platform->quoteIdentifier($joinName[0]);
+ $joinName = ($joinName[1] ? $platform->quoteIdentifier($joinName[1]) . $platform->getIdentifierSeparator() : '') . $platform->quoteIdentifier($joinName[0]);
} else {
if ($joinName instanceof Select) {
- $joinName = '(' . $joinName->processSubSelect($joinName, $platform, $driver, $parameterContainer) . ')';
+ $joinName = '(' . $this->processSubSelect($joinName, $platform, $driver, $parameterContainer) . ')';
} else {
$joinName = $platform->quoteIdentifier($joinName);
}
@@ -880,7 +823,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
}
$orders = array();
foreach ($this->order as $k => $v) {
- if ($v instanceof Expression) {
+ if ($v instanceof ExpressionInterface) {
/** @var $orderParts \Zend\Db\Adapter\StatementContainer */
$orderParts = $this->processExpression($v, $platform, $driver);
if ($parameterContainer) {
@@ -912,7 +855,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
return null;
}
- $limit = (int) $this->limit;
+ $limit = $this->limit;
if ($driver) {
$sql = $driver->formatParameterName('limit');
@@ -930,7 +873,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
return null;
}
- $offset = (int) $this->offset;
+ $offset = $this->offset;
if ($driver) {
$parameterContainer->offsetSet('offset', $offset, ParameterContainer::TYPE_INTEGER);
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Sql.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Sql.php
index e80c7281aed..e67ab3ff3fa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Sql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Sql.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -129,17 +129,23 @@ class Sql
return $statement;
}
+ /**
+ * Get sql string using platform or sql object
+ *
+ * @param SqlInterface $sqlObject
+ * @param PlatformInterface $platform
+ *
+ * @return string
+ */
public function getSqlStringForSqlObject(SqlInterface $sqlObject, PlatformInterface $platform = null)
{
$platform = ($platform) ?: $this->adapter->getPlatform();
if ($this->sqlPlatform) {
$this->sqlPlatform->setSubject($sqlObject);
- $sqlString = $this->sqlPlatform->getSqlString($platform);
- } else {
- $sqlString = $sqlObject->getSqlString($platform);
+ return $this->sqlPlatform->getSqlString($platform);
}
- return $sqlString;
+ return $sqlObject->getSqlString($platform);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/SqlInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/SqlInterface.php
index d36419e5d29..2e26eb315f0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/SqlInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/SqlInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,5 +13,10 @@ use Zend\Db\Adapter\Platform\PlatformInterface;
interface SqlInterface
{
+ /**
+ * @param PlatformInterface $adapterPlatform
+ *
+ * @return string
+ */
public function getSqlString(PlatformInterface $adapterPlatform = null);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/TableIdentifier.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/TableIdentifier.php
index 48771228196..79f20699f0c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/TableIdentifier.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/TableIdentifier.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ namespace Zend\Db\Sql;
*/
class TableIdentifier
{
-
/**
* @var string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Update.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Update.php
index e484501668d..33fbcac0947 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Update.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Update.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,7 @@ use Zend\Db\Adapter\ParameterContainer;
use Zend\Db\Adapter\Platform\PlatformInterface;
use Zend\Db\Adapter\Platform\Sql92;
use Zend\Db\Adapter\StatementContainerInterface;
+use Zend\Stdlib\PriorityList;
/**
*
@@ -47,9 +48,9 @@ class Update extends AbstractSql implements SqlInterface, PreparableSqlInterface
protected $emptyWhereProtection = true;
/**
- * @var array
+ * @var PriorityList
*/
- protected $set = array();
+ protected $set;
/**
* @var string|Where
@@ -67,6 +68,8 @@ class Update extends AbstractSql implements SqlInterface, PreparableSqlInterface
$this->table($table);
}
$this->where = new Where();
+ $this->set = new PriorityList();
+ $this->set->isLIFO(false);
}
/**
@@ -96,16 +99,15 @@ class Update extends AbstractSql implements SqlInterface, PreparableSqlInterface
}
if ($flag == self::VALUES_SET) {
- $this->set = array();
+ $this->set->clear();
}
-
+ $priority = is_numeric($flag) ? $flag : 0;
foreach ($values as $k => $v) {
if (!is_string($k)) {
throw new Exception\InvalidArgumentException('set() expects a string for the value key');
}
- $this->set[$k] = $v;
+ $this->set->insert($k, $v, $priority);
}
-
return $this;
}
@@ -119,52 +121,10 @@ class Update extends AbstractSql implements SqlInterface, PreparableSqlInterface
*/
public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
{
- if ($predicate === null) {
- throw new Exception\InvalidArgumentException('Predicate cannot be null');
- }
-
if ($predicate instanceof Where) {
$this->where = $predicate;
- } elseif ($predicate instanceof \Closure) {
- $predicate($this->where);
} else {
- if (is_string($predicate)) {
- // String $predicate should be passed as an expression
- $predicate = new Predicate\Expression($predicate);
- $this->where->addPredicate($predicate, $combination);
- } elseif (is_array($predicate)) {
-
- foreach ($predicate as $pkey => $pvalue) {
- // loop through predicates
-
- if (is_string($pkey) && strpos($pkey, '?') !== false) {
- // First, process strings that the abstraction replacement character ?
- // as an Expression predicate
- $predicate = new Predicate\Expression($pkey, $pvalue);
-
- } elseif (is_string($pkey)) {
- // Otherwise, if still a string, do something intelligent with the PHP type provided
-
- if ($pvalue === null) {
- // map PHP null to SQL IS NULL expression
- $predicate = new Predicate\IsNull($pkey, $pvalue);
- } elseif (is_array($pvalue)) {
- // if the value is an array, assume IN() is desired
- $predicate = new Predicate\In($pkey, $pvalue);
- } else {
- // otherwise assume that array('foo' => 'bar') means "foo" = 'bar'
- $predicate = new Predicate\Operator($pkey, Predicate\Operator::OP_EQ, $pvalue);
- }
- } elseif ($pvalue instanceof Predicate\PredicateInterface) {
- // Predicate type is ok
- $predicate = $pvalue;
- } else {
- // must be an array of expressions (with int-indexed array)
- $predicate = new Predicate\Expression($pvalue);
- }
- $this->where->addPredicate($predicate, $combination);
- }
- }
+ $this->where->addPredicates($predicate, $combination);
}
return $this;
}
@@ -174,7 +134,7 @@ class Update extends AbstractSql implements SqlInterface, PreparableSqlInterface
$rawState = array(
'emptyWhereProtection' => $this->emptyWhereProtection,
'table' => $this->table,
- 'set' => $this->set,
+ 'set' => $this->set->toArray(),
'where' => $this->where
);
return (isset($key) && array_key_exists($key, $rawState)) ? $rawState[$key] : $rawState;
@@ -212,29 +172,26 @@ class Update extends AbstractSql implements SqlInterface, PreparableSqlInterface
$table = $platform->quoteIdentifier($schema) . $platform->getIdentifierSeparator() . $table;
}
- $set = $this->set;
- if (is_array($set)) {
- $setSql = array();
- foreach ($set as $column => $value) {
- if ($value instanceof Expression) {
- $exprData = $this->processExpression($value, $platform, $driver);
- $setSql[] = $platform->quoteIdentifier($column) . ' = ' . $exprData->getSql();
- $parameterContainer->merge($exprData->getParameterContainer());
- } else {
- $setSql[] = $platform->quoteIdentifier($column) . ' = ' . $driver->formatParameterName($column);
- $parameterContainer->offsetSet($column, $value);
- }
+ $setSql = array();
+ foreach ($this->set as $column => $value) {
+ if ($value instanceof Expression) {
+ $exprData = $this->processExpression($value, $platform, $driver);
+ $setSql[] = $platform->quoteIdentifier($column) . ' = ' . $exprData->getSql();
+ $parameterContainer->merge($exprData->getParameterContainer());
+ } else {
+ $setSql[] = $platform->quoteIdentifier($column) . ' = ' . $driver->formatParameterName($column);
+ $parameterContainer->offsetSet($column, $value);
}
- $set = implode(', ', $setSql);
}
+ $set = implode(', ', $setSql);
- $sql = sprintf($this->specifications[self::SPECIFICATION_UPDATE], $table, $set);
+ $sql = sprintf($this->specifications[static::SPECIFICATION_UPDATE], $table, $set);
// process where
if ($this->where->count() > 0) {
$whereParts = $this->processExpression($this->where, $platform, $driver, 'where');
$parameterContainer->merge($whereParts->getParameterContainer());
- $sql .= ' ' . sprintf($this->specifications[self::SPECIFICATION_WHERE], $whereParts->getSql());
+ $sql .= ' ' . sprintf($this->specifications[static::SPECIFICATION_WHERE], $whereParts->getSql());
}
$statementContainer->setSql($sql);
}
@@ -262,26 +219,23 @@ class Update extends AbstractSql implements SqlInterface, PreparableSqlInterface
$table = $adapterPlatform->quoteIdentifier($schema) . $adapterPlatform->getIdentifierSeparator() . $table;
}
- $set = $this->set;
- if (is_array($set)) {
- $setSql = array();
- foreach ($set as $column => $value) {
- if ($value instanceof Expression) {
- $exprData = $this->processExpression($value, $adapterPlatform);
- $setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = ' . $exprData->getSql();
- } elseif ($value === null) {
- $setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = NULL';
- } else {
- $setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = ' . $adapterPlatform->quoteValue($value);
- }
+ $setSql = array();
+ foreach ($this->set as $column => $value) {
+ if ($value instanceof ExpressionInterface) {
+ $exprData = $this->processExpression($value, $adapterPlatform);
+ $setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = ' . $exprData->getSql();
+ } elseif ($value === null) {
+ $setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = NULL';
+ } else {
+ $setSql[] = $adapterPlatform->quoteIdentifier($column) . ' = ' . $adapterPlatform->quoteValue($value);
}
- $set = implode(', ', $setSql);
}
+ $set = implode(', ', $setSql);
- $sql = sprintf($this->specifications[self::SPECIFICATION_UPDATE], $table, $set);
+ $sql = sprintf($this->specifications[static::SPECIFICATION_UPDATE], $table, $set);
if ($this->where->count() > 0) {
$whereParts = $this->processExpression($this->where, $adapterPlatform, null, 'where');
- $sql .= ' ' . sprintf($this->specifications[self::SPECIFICATION_WHERE], $whereParts->getSql());
+ $sql .= ' ' . sprintf($this->specifications[static::SPECIFICATION_WHERE], $whereParts->getSql());
}
return $sql;
}
@@ -312,5 +266,6 @@ class Update extends AbstractSql implements SqlInterface, PreparableSqlInterface
public function __clone()
{
$this->where = clone $this->where;
+ $this->set = clone $this->set;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Where.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Where.php
index 23426a93846..22c9d3863a1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Where.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Where.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,5 +11,4 @@ namespace Zend\Db\Sql;
class Where extends Predicate\Predicate
{
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/AbstractTableGateway.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/AbstractTableGateway.php
index 94b685aa539..a98d1930176 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/AbstractTableGateway.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/AbstractTableGateway.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -19,6 +19,7 @@ use Zend\Db\Sql\Sql;
use Zend\Db\Sql\TableIdentifier;
use Zend\Db\Sql\Update;
use Zend\Db\Sql\Where;
+use Zend\Db\TableGateway\Feature\EventFeature;
/**
*
@@ -28,7 +29,6 @@ use Zend\Db\Sql\Where;
*/
abstract class AbstractTableGateway implements TableGatewayInterface
{
-
/**
* @var bool
*/
@@ -95,13 +95,13 @@ abstract class AbstractTableGateway implements TableGatewayInterface
}
$this->featureSet->setTableGateway($this);
- $this->featureSet->apply('preInitialize', array());
+ $this->featureSet->apply(EventFeature::EVENT_PRE_INITIALIZE, array());
if (!$this->adapter instanceof AdapterInterface) {
throw new Exception\RuntimeException('This table does not have an Adapter setup');
}
- if (!is_string($this->table) && !$this->table instanceof TableIdentifier) {
+ if (!is_string($this->table) && !$this->table instanceof TableIdentifier && !is_array($this->table)) {
throw new Exception\RuntimeException('This table object does not have a valid table set.');
}
@@ -113,7 +113,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface
$this->sql = new Sql($this->adapter, $this->table);
}
- $this->featureSet->apply('postInitialize', array());
+ $this->featureSet->apply(EventFeature::EVENT_POST_INITIALIZE, array());
$this->isInitialized = true;
}
@@ -216,7 +216,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface
protected function executeSelect(Select $select)
{
$selectState = $select->getRawState();
- if ($selectState['table'] != $this->table) {
+ if ($selectState['table'] != $this->table && (is_array($selectState['table']) && end($selectState['table']) != $this->table)) {
throw new Exception\RuntimeException('The table name of the provided select object must match that of the table');
}
@@ -226,7 +226,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface
}
// apply preSelect features
- $this->featureSet->apply('preSelect', array($select));
+ $this->featureSet->apply(EventFeature::EVENT_PRE_SELECT, array($select));
// prepare and execute
$statement = $this->sql->prepareStatementForSqlObject($select);
@@ -237,7 +237,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface
$resultSet->initialize($result);
// apply postSelect features
- $this->featureSet->apply('postSelect', array($statement, $result, $resultSet));
+ $this->featureSet->apply(EventFeature::EVENT_POST_SELECT, array($statement, $result, $resultSet));
return $resultSet;
}
@@ -285,14 +285,14 @@ abstract class AbstractTableGateway implements TableGatewayInterface
}
// apply preInsert features
- $this->featureSet->apply('preInsert', array($insert));
+ $this->featureSet->apply(EventFeature::EVENT_PRE_INSERT, array($insert));
$statement = $this->sql->prepareStatementForSqlObject($insert);
$result = $statement->execute();
$this->lastInsertValue = $this->adapter->getDriver()->getConnection()->getLastGeneratedValue();
// apply postInsert features
- $this->featureSet->apply('postInsert', array($statement, $result));
+ $this->featureSet->apply(EventFeature::EVENT_POST_INSERT, array($statement, $result));
return $result->getAffectedRows();
}
@@ -301,7 +301,7 @@ abstract class AbstractTableGateway implements TableGatewayInterface
* Update
*
* @param array $set
- * @param string|array|closure $where
+ * @param string|array|\Closure $where
* @return int
*/
public function update($set, $where = null)
@@ -345,13 +345,13 @@ abstract class AbstractTableGateway implements TableGatewayInterface
}
// apply preUpdate features
- $this->featureSet->apply('preUpdate', array($update));
+ $this->featureSet->apply(EventFeature::EVENT_PRE_UPDATE, array($update));
$statement = $this->sql->prepareStatementForSqlObject($update);
$result = $statement->execute();
// apply postUpdate features
- $this->featureSet->apply('postUpdate', array($statement, $result));
+ $this->featureSet->apply(EventFeature::EVENT_POST_UPDATE, array($statement, $result));
return $result->getAffectedRows();
}
@@ -401,13 +401,13 @@ abstract class AbstractTableGateway implements TableGatewayInterface
}
// pre delete update
- $this->featureSet->apply('preDelete', array($delete));
+ $this->featureSet->apply(EventFeature::EVENT_PRE_DELETE, array($delete));
$statement = $this->sql->prepareStatementForSqlObject($delete);
$result = $statement->execute();
// apply postDelete features
- $this->featureSet->apply('postDelete', array($statement, $result));
+ $this->featureSet->apply(EventFeature::EVENT_POST_DELETE, array($statement, $result));
return $result->getAffectedRows();
}
@@ -482,7 +482,14 @@ abstract class AbstractTableGateway implements TableGatewayInterface
$this->sql = clone $this->sql;
if (is_object($this->table)) {
$this->table = clone $this->table;
+ } elseif (
+ is_array($this->table)
+ && count($this->table) == 1
+ && is_object(reset($this->table))
+ ) {
+ foreach ($this->table as $alias => &$tableObject) {
+ $tableObject = clone $tableObject;
+ }
}
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php
index ecd3085ac6d..857e9a2045c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php
index 1f967a59477..828cd308bd1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/RuntimeException.php
index 3c79b9f0ff8..4b4d9287e22 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/AbstractFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/AbstractFeature.php
index e3d4c319aad..ddbf33284dc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/AbstractFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/AbstractFeature.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Db\TableGateway\Exception;
abstract class AbstractFeature extends AbstractTableGateway
{
-
/**
* @var AbstractTableGateway
*/
@@ -55,5 +54,4 @@ abstract class AbstractFeature extends AbstractTableGateway
public function preDelete(Delete $delete);
public function postDelete(StatementInterface $statement, ResultInterface $result);
*/
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature.php
index 08e3cffbdca..73de610f414 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,6 +22,21 @@ use Zend\EventManager\EventsCapableInterface;
class EventFeature extends AbstractFeature implements EventsCapableInterface
{
+ const EVENT_PRE_INITIALIZE = 'preInitialize';
+ const EVENT_POST_INITIALIZE = 'postInitialize';
+
+ const EVENT_PRE_SELECT = 'preSelect';
+ const EVENT_POST_SELECT = 'postSelect';
+
+ const EVENT_PRE_INSERT = 'preInsert';
+ const EVENT_POST_INSERT = 'postInsert';
+
+ const EVENT_PRE_DELETE = 'preDelete';
+ const EVENT_POST_DELETE = 'postDelete';
+
+ const EVENT_PRE_UPDATE = 'preUpdate';
+ const EVENT_POST_UPDATE = 'postUpdate';
+
/**
* @var EventManagerInterface
*/
@@ -87,7 +102,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
}
$this->event->setTarget($this->tableGateway);
- $this->event->setName(__FUNCTION__);
+ $this->event->setName(static::EVENT_PRE_INITIALIZE);
$this->eventManager->trigger($this->event);
}
@@ -98,7 +113,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
*/
public function postInitialize()
{
- $this->event->setName(__FUNCTION__);
+ $this->event->setName(static::EVENT_POST_INITIALIZE);
$this->eventManager->trigger($this->event);
}
@@ -113,7 +128,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
*/
public function preSelect(Select $select)
{
- $this->event->setName(__FUNCTION__);
+ $this->event->setName(static::EVENT_PRE_SELECT);
$this->event->setParams(array('select' => $select));
$this->eventManager->trigger($this->event);
}
@@ -133,7 +148,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
*/
public function postSelect(StatementInterface $statement, ResultInterface $result, ResultSetInterface $resultSet)
{
- $this->event->setName(__FUNCTION__);
+ $this->event->setName(static::EVENT_POST_SELECT);
$this->event->setParams(array(
'statement' => $statement,
'result' => $result,
@@ -153,7 +168,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
*/
public function preInsert(Insert $insert)
{
- $this->event->setName(__FUNCTION__);
+ $this->event->setName(static::EVENT_PRE_INSERT);
$this->event->setParams(array('insert' => $insert));
$this->eventManager->trigger($this->event);
}
@@ -171,7 +186,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
*/
public function postInsert(StatementInterface $statement, ResultInterface $result)
{
- $this->event->setName(__FUNCTION__);
+ $this->event->setName(static::EVENT_POST_INSERT);
$this->event->setParams(array(
'statement' => $statement,
'result' => $result,
@@ -190,7 +205,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
*/
public function preUpdate(Update $update)
{
- $this->event->setName(__FUNCTION__);
+ $this->event->setName(static::EVENT_PRE_UPDATE);
$this->event->setParams(array('update' => $update));
$this->eventManager->trigger($this->event);
}
@@ -208,7 +223,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
*/
public function postUpdate(StatementInterface $statement, ResultInterface $result)
{
- $this->event->setName(__FUNCTION__);
+ $this->event->setName(static::EVENT_POST_UPDATE);
$this->event->setParams(array(
'statement' => $statement,
'result' => $result,
@@ -227,7 +242,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
*/
public function preDelete(Delete $delete)
{
- $this->event->setName(__FUNCTION__);
+ $this->event->setName(static::EVENT_PRE_DELETE);
$this->event->setParams(array('delete' => $delete));
$this->eventManager->trigger($this->event);
}
@@ -245,7 +260,7 @@ class EventFeature extends AbstractFeature implements EventsCapableInterface
*/
public function postDelete(StatementInterface $statement, ResultInterface $result)
{
- $this->event->setName(__FUNCTION__);
+ $this->event->setName(static::EVENT_POST_DELETE);
$this->event->setParams(array(
'statement' => $statement,
'result' => $result,
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php
index e6a20f83408..af46132d11f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\EventManager\EventInterface;
class TableGatewayEvent implements EventInterface
{
-
/**
* @var AbstractTableGateway
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/FeatureSet.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/FeatureSet.php
index 498db1ad7f5..939444e0e7a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/FeatureSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/FeatureSet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php
index f1fa78eb32f..bdcd97dc30d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/GlobalAdapterFeature.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Db\TableGateway\Exception;
class GlobalAdapterFeature extends AbstractFeature
{
-
/**
* @var Adapter[]
*/
@@ -65,6 +64,4 @@ class GlobalAdapterFeature extends AbstractFeature
{
$this->tableGateway->adapter = self::getStaticAdapter();
}
-
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
index 7c12dc8f732..b266265eed3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Db\Sql\Sql;
class MasterSlaveFeature extends AbstractFeature
{
-
/**
* @var AdapterInterface
*/
@@ -89,5 +88,4 @@ class MasterSlaveFeature extends AbstractFeature
{
$this->tableGateway->sql = $this->masterSql;
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MetadataFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
index b8841588836..278895af32f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Db\Metadata\Object\TableObject;
class MetadataFeature extends AbstractFeature
{
-
/**
* @var MetadataInterface
*/
@@ -83,6 +82,4 @@ class MetadataFeature extends AbstractFeature
$this->sharedData['metadata']['primaryKey'] = $primaryKey;
}
-
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php
index b3c467ac499..1bae69e81e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Db\TableGateway\Exception;
class RowGatewayFeature extends AbstractFeature
{
-
/**
* @var array
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/SequenceFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
index a896c5d38ac..b9f1dd48419 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -42,7 +42,8 @@ class SequenceFeature extends AbstractFeature
}
/**
- * @param Insert $insert
+ * @param Insert $insert
+ * @return Insert
*/
public function preInsert(Insert $insert)
{
@@ -63,6 +64,10 @@ class SequenceFeature extends AbstractFeature
return $insert;
}
+ /**
+ * @param StatementInterface $statement
+ * @param ResultInterface $result
+ */
public function postInsert(StatementInterface $statement, ResultInterface $result)
{
if ($this->sequenceValue !== null) {
@@ -81,10 +86,10 @@ class SequenceFeature extends AbstractFeature
switch ($platformName) {
case 'Oracle':
- $sql = 'SELECT ' . $platform->quoteIdentifier($this->sequenceName) . '.NEXTVAL FROM dual';
+ $sql = 'SELECT ' . $platform->quoteIdentifier($this->sequenceName) . '.NEXTVAL as "nextval" FROM dual';
break;
case 'PostgreSQL':
- $sql = 'SELECT NEXTVAL(\'' . $this->sequenceName . '\')';
+ $sql = 'SELECT NEXTVAL(\'"' . $this->sequenceName . '"\')';
break;
default :
return null;
@@ -109,7 +114,7 @@ class SequenceFeature extends AbstractFeature
switch ($platformName) {
case 'Oracle':
- $sql = 'SELECT ' . $platform->quoteIdentifier($this->sequenceName) . '.CURRVAL FROM dual';
+ $sql = 'SELECT ' . $platform->quoteIdentifier($this->sequenceName) . '.CURRVAL as "currval" FROM dual';
break;
case 'PostgreSQL':
$sql = 'SELECT CURRVAL(\'' . $this->sequenceName . '\')';
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/TableGateway.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/TableGateway.php
index e1aaaf326a3..79c989bf0db 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/TableGateway.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/TableGateway.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Db\Sql\TableIdentifier;
class TableGateway extends AbstractTableGateway
{
-
/**
* Constructor
*
@@ -31,7 +30,7 @@ class TableGateway extends AbstractTableGateway
public function __construct($table, AdapterInterface $adapter, $features = null, ResultSetInterface $resultSetPrototype = null, Sql $sql = null)
{
// table
- if (!(is_string($table) || $table instanceof TableIdentifier)) {
+ if (!(is_string($table) || $table instanceof TableIdentifier || is_array($table))) {
throw new Exception\InvalidArgumentException('Table name must be a string or an instance of Zend\Db\Sql\TableIdentifier');
}
$this->table = $table;
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/TableGatewayInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/TableGatewayInterface.php
index 0a77e0f1d77..a48fec2e61f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/TableGatewayInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/TableGatewayInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/composer.json b/vendor/zendframework/zendframework/library/Zend/Db/composer.json
index c926eecbe27..c80e3344adf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Db/composer.json
@@ -6,6 +6,7 @@
"zf2",
"db"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Db\\": ""
@@ -13,15 +14,22 @@
},
"target-dir": "Zend/Db",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.23",
+ "zendframework/zend-stdlib": "self.version"
},
- "suggest": {
+ "require-dev": {
+ "zendframework/zend-eventmanager": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
"zendframework/zend-stdlib": "self.version"
},
+ "suggest": {
+ "zendframework/zend-eventmanager": "Zend\\EventManager component",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Debug/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Debug/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Debug/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Debug/Debug.php b/vendor/zendframework/zendframework/library/Zend/Debug/Debug.php
index b423b4ce6d1..a53091db038 100644
--- a/vendor/zendframework/zendframework/library/Zend/Debug/Debug.php
+++ b/vendor/zendframework/zendframework/library/Zend/Debug/Debug.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -42,7 +42,7 @@ class Debug
/**
* Set the debug output environment.
- * Setting a value of null causes Zend_Debug to use PHP_SAPI.
+ * Setting a value of null causes Zend\Debug\Debug to use PHP_SAPI.
*
* @param string $sapi
* @return void;
diff --git a/vendor/zendframework/zendframework/library/Zend/Debug/composer.json b/vendor/zendframework/zendframework/library/Zend/Debug/composer.json
index 9ebd8bdd672..8846ed728b7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Debug/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Debug/composer.json
@@ -6,6 +6,7 @@
"zf2",
"debug"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Debug\\": ""
@@ -13,10 +14,10 @@
},
"target-dir": "Zend/Debug",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.23"
},
"require-dev": {
- "zendframework/zend-escaper": "*"
+ "zendframework/zend-escaper": "2.*"
},
"suggest": {
"ext/xdebug": "XDebug, for better backtrace output",
@@ -24,8 +25,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Di/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Di/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Config.php b/vendor/zendframework/zendframework/library/Zend/Di/Config.php
index b1773050459..3dd6fcbd1b8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Config.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Config.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/Annotation/Inject.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/Annotation/Inject.php
index 8534c021510..9544502c223 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/Annotation/Inject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/Annotation/Inject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/Annotation/Instantiator.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/Annotation/Instantiator.php
index d0aed5310d5..cc55d5d4e5e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/Annotation/Instantiator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/Annotation/Instantiator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/ArrayDefinition.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/ArrayDefinition.php
index 5e64f5b38ff..c089962e823 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/ArrayDefinition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/ArrayDefinition.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/InjectionMethod.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/InjectionMethod.php
index c0e3e60a234..9160aacd825 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/InjectionMethod.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/InjectionMethod.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -106,7 +106,7 @@ class InjectionMethod
return Di::METHOD_IS_OPTIONAL;
break;
case "constructor":
- return Di::MEHTOD_IS_CONSTRUCTOR;
+ return Di::METHOD_IS_CONSTRUCTOR;
break;
case "instantiator":
return Di::METHOD_IS_INSTANTIATOR;
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/PhpClass.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/PhpClass.php
index 80d4197a288..2b9c06648f6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/PhpClass.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/PhpClass.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/BuilderDefinition.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/BuilderDefinition.php
index 6ad935a0743..e013b2e2b74 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/BuilderDefinition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/BuilderDefinition.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/ClassDefinition.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/ClassDefinition.php
index 42281503f7f..42b1ab0ba98 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/ClassDefinition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/ClassDefinition.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -79,11 +79,12 @@ class ClassDefinition implements DefinitionInterface, PartialMarker
*/
public function addMethod($method, $isRequired = null)
{
- if ($isRequired === null) {
+ if ($isRequired === null) {
if ($method === '__construct') {
$methodRequirementType = Di::METHOD_IS_CONSTRUCTOR;
+ } else {
+ $methodRequirementType = Di::METHOD_IS_OPTIONAL;
}
- $methodRequirementType = Di::METHOD_IS_OPTIONAL;
} else {
$methodRequirementType = InjectionMethod::detectMethodRequirement($isRequired);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/CompilerDefinition.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/CompilerDefinition.php
index 0f0681d1765..5cb27a9c2aa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/CompilerDefinition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/CompilerDefinition.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -114,7 +114,7 @@ class CompilerDefinition implements DefinitionInterface
*/
public function compile()
{
- /* @var $classScanner \Zend\Code\Scanner\DerivedClassScanner */
+ /* @var $classScanner DerivedClassScanner */
foreach ($this->directoryScanner->getClassNames() as $class) {
$this->processClass($class);
}
@@ -205,7 +205,6 @@ class CompilerDefinition implements DefinitionInterface
}
foreach ($rClass->getMethods(Reflection\MethodReflection::IS_PUBLIC) as $rMethod) {
-
$methodName = $rMethod->getName();
if ($rMethod->getName() === '__construct' || $rMethod->isStatic()) {
@@ -218,7 +217,6 @@ class CompilerDefinition implements DefinitionInterface
if (($annotations instanceof AnnotationCollection)
&& $annotations->hasAnnotation('Zend\Di\Definition\Annotation\Inject')
) {
-
$def['methods'][$methodName] = true;
$this->processParams($def, $rClass, $rMethod);
continue;
@@ -241,7 +239,6 @@ class CompilerDefinition implements DefinitionInterface
// by annotation
// by setter pattern,
// by interface
-
}
$interfaceInjectorPatterns = $this->introspectionStrategy->getInterfaceInjectionInclusionPatterns();
@@ -285,7 +282,6 @@ class CompilerDefinition implements DefinitionInterface
$def['parameters'][$methodName] = array();
foreach ($rMethod->getParameters() as $p) {
-
/** @var $p \ReflectionParameter */
$actualParamName = $p->getName();
$fqName = $rClass->getName() . '::' . $rMethod->getName() . ':' . $p->getPosition();
@@ -297,7 +293,6 @@ class CompilerDefinition implements DefinitionInterface
$def['parameters'][$methodName][$fqName][] = !($optional =$p->isOptional());
$def['parameters'][$methodName][$fqName][] = $optional && $p->isDefaultValueAvailable() ? $p->getDefaultValue() : null;
}
-
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/DefinitionInterface.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/DefinitionInterface.php
index 420bb459d1c..e9d3d13f7c7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/DefinitionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/DefinitionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/IntrospectionStrategy.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/IntrospectionStrategy.php
index c34fbbb99dd..0a432967554 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/IntrospectionStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/IntrospectionStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/PartialMarker.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/PartialMarker.php
index 4a40728f0be..c37e4579d8f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/PartialMarker.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/PartialMarker.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/RuntimeDefinition.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/RuntimeDefinition.php
index 7097e2cfcc9..66fbaedf516 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Definition/RuntimeDefinition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Definition/RuntimeDefinition.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,6 @@ use Zend\Di\Di;
*/
class RuntimeDefinition implements DefinitionInterface
{
-
/**
* @var array
*/
@@ -177,6 +176,8 @@ class RuntimeDefinition implements DefinitionInterface
/**
* @param string $class
+ *
+ * @return bool
*/
protected function hasProcessedClass($class)
{
@@ -244,7 +245,6 @@ class RuntimeDefinition implements DefinitionInterface
}
foreach ($rClass->getMethods(Reflection\MethodReflection::IS_PUBLIC) as $rMethod) {
-
$methodName = $rMethod->getName();
if ($rMethod->getName() === '__construct' || $rMethod->isStatic()) {
@@ -256,7 +256,6 @@ class RuntimeDefinition implements DefinitionInterface
if (($annotations instanceof AnnotationCollection)
&& $annotations->hasAnnotation('Zend\Di\Definition\Annotation\Inject')) {
-
// use '@inject' and search for parameters
$def['methods'][$methodName] = Di::METHOD_IS_EAGER;
$this->processParams($def, $rClass, $rMethod);
@@ -280,7 +279,6 @@ class RuntimeDefinition implements DefinitionInterface
// by annotation
// by setter pattern,
// by interface
-
}
$interfaceInjectorPatterns = $this->introspectionStrategy->getInterfaceInjectionInclusionPatterns();
@@ -324,7 +322,6 @@ class RuntimeDefinition implements DefinitionInterface
$def['parameters'][$methodName] = array();
foreach ($rMethod->getParameters() as $p) {
-
/** @var $p \ReflectionParameter */
$actualParamName = $p->getName();
@@ -338,6 +335,5 @@ class RuntimeDefinition implements DefinitionInterface
$def['parameters'][$methodName][$fqName][] = !($optional = $p->isOptional() && $p->isDefaultValueAvailable());
$def['parameters'][$methodName][$fqName][] = $optional ? $p->getDefaultValue() : null;
}
-
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/DefinitionList.php b/vendor/zendframework/zendframework/library/Zend/Di/DefinitionList.php
index efe190e57f7..0f0c3c7cb05 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/DefinitionList.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/DefinitionList.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/DependencyInjectionInterface.php b/vendor/zendframework/zendframework/library/Zend/Di/DependencyInjectionInterface.php
index b821876136b..4acc8dfb8a0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/DependencyInjectionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/DependencyInjectionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Di.php b/vendor/zendframework/zendframework/library/Zend/Di/Di.php
index d9a092e0248..6141df08cea 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Di.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Di.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -174,6 +174,21 @@ class Di implements DependencyInjectionInterface
return $this->instanceManager;
}
+ /**
+ * Utility method used to retrieve the class of a particular instance. This is here to allow extending classes to
+ * override how class names are resolved
+ *
+ * @internal this method is used by the ServiceLocator\DependencyInjectorProxy class to interact with instances
+ * and is a hack to be used internally until a major refactor does not split the `resolveMethodParameters`. Do not
+ * rely on its functionality.
+ * @param object $instance
+ * @return string
+ */
+ protected function getClass($instance)
+ {
+ return get_class($instance);
+ }
+
/**
* @param $name
* @param array $params
@@ -229,7 +244,6 @@ class Di implements DependencyInjectionInterface
return $im->getSharedInstance($name, $callParameters);
}
-
$config = $im->getConfig($name);
$instance = $this->newInstance($name, $params, $config['shared']);
array_pop($this->instanceContext);
@@ -397,7 +411,7 @@ class Di implements DependencyInjectionInterface
} elseif (is_int($injectName) && is_array($injectValue)) {
throw new Exception\RuntimeException(
'An injection was provided with a keyed index and an array of data, try using'
- . ' the name of a particular method as a key for your injection data.'
+ . ' the name of a particular method as a key for your injection data.'
);
}
}
@@ -411,7 +425,7 @@ class Di implements DependencyInjectionInterface
if ($methodParams) {
foreach ($methodParams as $methodParam) {
$objectToInjectClass = $this->getClass($objectToInject);
- if ($objectToInjectClass == $methodParam[1] || self::isSubclassOf($objectToInjectClass, $methodParam[1])) {
+ if ($objectToInjectClass == $methodParam[1] || is_subclass_of($objectToInjectClass, $methodParam[1])) {
if ($this->resolveAndCallInjectionMethodForInstance($instance, $typeInjectionMethod, array($methodParam[0] => $objectToInject), $instanceAlias, self::METHOD_IS_REQUIRED, $type)) {
$calledMethods[$typeInjectionMethod] = true;
}
@@ -426,7 +440,7 @@ class Di implements DependencyInjectionInterface
}
if ($methodsToCall) {
foreach ($methodsToCall as $methodInfo) {
- $this->resolveAndCallInjectionMethodForInstance($instance, $methodInfo['method'], $methodInfo['args'], $instanceAlias, self::METHOD_IS_REQUIRED, $instanceClass);
+ $this->resolveAndCallInjectionMethodForInstance($instance, $methodInfo['method'], $methodInfo['args'], $instanceAlias, self::METHOD_IS_REQUIRED, $instanceClass);
}
}
}
@@ -551,7 +565,7 @@ class Di implements DependencyInjectionInterface
* @param string $method
* @param array $callTimeUserParams
* @param string $alias
- * @param int|bolean $methodRequirementType
+ * @param int|bool $methodRequirementType
* @param bool $isInstantiator
* @throws Exception\MissingPropertyException
* @throws Exception\CircularDependencyException
@@ -611,7 +625,7 @@ class Di implements DependencyInjectionInterface
if (array_key_exists('parameters', $iConfig['requestedClass'])) {
$newParameters = array();
- foreach($iConfig['requestedClass']['parameters'] as $name=>$parameter) {
+ foreach ($iConfig['requestedClass']['parameters'] as $name => $parameter) {
$newParameters[$requestedClass.'::'.$method.'::'.$name] = $parameter;
}
@@ -634,7 +648,6 @@ class Di implements DependencyInjectionInterface
// PRIORITY 1 - consult user provided parameters
if (isset($callTimeUserParams[$fqParamPos]) || isset($callTimeUserParams[$name])) {
-
if (isset($callTimeUserParams[$fqParamPos])) {
$callTimeCurValue =& $callTimeUserParams[$fqParamPos];
} elseif (isset($callTimeUserParams[$fqParamName])) {
@@ -678,7 +691,6 @@ class Di implements DependencyInjectionInterface
if (isset($iConfig[$thisIndex]['parameters'][$fqParamPos])
|| isset($iConfig[$thisIndex]['parameters'][$fqParamName])
|| isset($iConfig[$thisIndex]['parameters'][$name])) {
-
if (isset($iConfig[$thisIndex]['parameters'][$fqParamPos])) {
$iConfigCurValue =& $iConfig[$thisIndex]['parameters'][$fqParamPos];
} elseif (isset($iConfig[$thisIndex]['parameters'][$fqParamName])) {
@@ -712,7 +724,6 @@ class Di implements DependencyInjectionInterface
unset($iConfigCurValue);
continue 2;
}
-
}
// PRIORITY 6 - globally preferred implementations
@@ -731,7 +742,7 @@ class Di implements DependencyInjectionInterface
}
$pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
$this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
- if ($pInstanceClass === $type || self::isSubclassOf($pInstanceClass, $type)) {
+ if ($pInstanceClass === $type || is_subclass_of($pInstanceClass, $type)) {
$computedParams['retrieval'][$fqParamPos] = array($pInstance, $pInstanceClass);
continue 2;
}
@@ -748,7 +759,7 @@ class Di implements DependencyInjectionInterface
}
$pInstanceClass = ($this->instanceManager->hasAlias($pInstance)) ?
$this->instanceManager->getClassFromAlias($pInstance) : $pInstance;
- if ($pInstanceClass === $type || self::isSubclassOf($pInstanceClass, $type)) {
+ if ($pInstanceClass === $type || is_subclass_of($pInstanceClass, $type)) {
$computedParams['retrieval'][$fqParamPos] = array($pInstance, $pInstanceClass);
continue 2;
}
@@ -762,7 +773,6 @@ class Di implements DependencyInjectionInterface
if ($type && $isRequired && ($methodRequirementType & self::RESOLVE_EAGER)) {
$computedParams['retrieval'][$fqParamPos] = array($type, $type);
}
-
}
$index = 0;
@@ -785,7 +795,7 @@ class Di implements DependencyInjectionInterface
}
array_push($this->currentDependencies, $class);
- if(isset($alias)) {
+ if (isset($alias)) {
array_push($this->currentAliasDependenencies, $alias);
}
@@ -801,21 +811,23 @@ class Di implements DependencyInjectionInterface
if ($methodRequirementType & self::RESOLVE_STRICT) {
//finally ( be aware to do at the end of flow)
array_pop($this->currentDependencies);
- if(isset($alias)) {
+ if (isset($alias)) {
array_pop($this->currentAliasDependenencies);
}
// if this item was marked strict,
// plus it cannot be resolve, and no value exist, bail out
- throw new Exception\MissingPropertyException(sprintf(
- 'Missing %s for parameter ' . $name . ' for ' . $class . '::' . $method,
- (($value[0] === null) ? 'value' : 'instance/object' )
- ),
- $e->getCode(),
- $e);
+ throw new Exception\MissingPropertyException(
+ sprintf(
+ 'Missing %s for parameter ' . $name . ' for ' . $class . '::' . $method,
+ (($value[0] === null) ? 'value' : 'instance/object')
+ ),
+ $e->getCode(),
+ $e
+ );
} else {
//finally ( be aware to do at the end of flow)
array_pop($this->currentDependencies);
- if(isset($alias)) {
+ if (isset($alias)) {
array_pop($this->currentAliasDependenencies);
}
return false;
@@ -825,28 +837,30 @@ class Di implements DependencyInjectionInterface
if ($methodRequirementType & self::RESOLVE_STRICT) {
//finally ( be aware to do at the end of flow)
array_pop($this->currentDependencies);
- if(isset($alias)) {
+ if (isset($alias)) {
array_pop($this->currentAliasDependenencies);
}
// if this item was marked strict,
// plus it cannot be resolve, and no value exist, bail out
- throw new Exception\MissingPropertyException(sprintf(
- 'Missing %s for parameter ' . $name . ' for ' . $class . '::' . $method,
- (($value[0] === null) ? 'value' : 'instance/object' )
- ),
- $e->getCode(),
- $e);
+ throw new Exception\MissingPropertyException(
+ sprintf(
+ 'Missing %s for parameter ' . $name . ' for ' . $class . '::' . $method,
+ (($value[0] === null) ? 'value' : 'instance/object')
+ ),
+ $e->getCode(),
+ $e
+ );
} else {
//finally ( be aware to do at the end of flow)
array_pop($this->currentDependencies);
- if(isset($alias)) {
+ if (isset($alias)) {
array_pop($this->currentAliasDependenencies);
}
return false;
}
}
array_pop($this->currentDependencies);
- if(isset($alias)) {
+ if (isset($alias)) {
array_pop($this->currentAliasDependenencies);
}
} elseif (!array_key_exists($fqParamPos, $computedParams['optional'])) {
@@ -870,44 +884,20 @@ class Di implements DependencyInjectionInterface
return $resolvedParams; // return ordered list of parameters
}
- /**
- * Utility method used to retrieve the class of a particular instance. This is here to allow extending classes to
- * override how class names are resolved
- *
- * @internal this method is used by the ServiceLocator\DependencyInjectorProxy class to interact with instances
- * and is a hack to be used internally until a major refactor does not split the `resolveMethodParameters`. Do not
- * rely on its functionality.
- * @param Object $instance
- * @return string
- */
- protected function getClass($instance)
- {
- return get_class($instance);
- }
-
/**
* Checks if the object has this class as one of its parents
*
* @see https://bugs.php.net/bug.php?id=53727
* @see https://github.com/zendframework/zf2/pull/1807
*
+ * @deprecated since zf 2.3 requires PHP >= 5.3.23
+ *
* @param string $className
* @param $type
* @return bool
*/
protected static function isSubclassOf($className, $type)
{
- if (is_subclass_of($className, $type)) {
- return true;
- }
- if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
- return false;
- }
- if (!interface_exists($type)) {
- return false;
- }
- $r = new ReflectionClass($className);
-
- return $r->implementsInterface($type);
+ return is_subclass_of($className, $type);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Display/Console.php b/vendor/zendframework/zendframework/library/Zend/Di/Display/Console.php
index 44ecad32ba8..9c375389c27 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Display/Console.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Display/Console.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Di\Di;
*/
class Console
{
-
/**
* @var Di
*/
@@ -71,7 +70,6 @@ class Console
public function render()
{
-
$knownClasses = array();
echo 'Definitions' . PHP_EOL . PHP_EOL;
@@ -87,8 +85,9 @@ class Console
}
}
- if ($this->runtimeClasses)
- echo ' Runtime classes:' . PHP_EOL;
+ if ($this->runtimeClasses) {
+ echo ' Runtime classes:' . PHP_EOL;
+ }
$unknownRuntimeClasses = array_diff($this->runtimeClasses, $knownClasses);
foreach ($unknownRuntimeClasses as $runtimeClass) {
@@ -133,7 +132,6 @@ class Console
}
}
}
-
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Exception/CircularDependencyException.php b/vendor/zendframework/zendframework/library/Zend/Di/Exception/CircularDependencyException.php
index 8cb9eae3f6a..ed064adc254 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Exception/CircularDependencyException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Exception/CircularDependencyException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Exception/ClassNotFoundException.php b/vendor/zendframework/zendframework/library/Zend/Di/Exception/ClassNotFoundException.php
index 6ba93ba651b..90db4a2d1b1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Exception/ClassNotFoundException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Exception/ClassNotFoundException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Di/Exception/ExceptionInterface.php
index ae0ba771b27..dc1a3942c22 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidArgumentException.php
index 435cab35d50..9b6257c58b4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidCallbackException.php b/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidCallbackException.php
index ccd958bf458..bd216c12240 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidCallbackException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidCallbackException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidParamNameException.php b/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidParamNameException.php
index dc0f3ba91bd..dcf6f9c8684 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidParamNameException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidParamNameException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidPositionException.php b/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidPositionException.php
index abfecd58e66..352caa706f9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidPositionException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Exception/InvalidPositionException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Exception/MissingPropertyException.php b/vendor/zendframework/zendframework/library/Zend/Di/Exception/MissingPropertyException.php
index 76ce99afc7f..dc987cfee14 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Exception/MissingPropertyException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Exception/MissingPropertyException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Di/Exception/RuntimeException.php
index 1097cae7767..a8236a79853 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Exception/UndefinedReferenceException.php b/vendor/zendframework/zendframework/library/Zend/Di/Exception/UndefinedReferenceException.php
index e7aa43a2721..5e87bfde0ce 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/Exception/UndefinedReferenceException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/Exception/UndefinedReferenceException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/InstanceManager.php b/vendor/zendframework/zendframework/library/Zend/Di/InstanceManager.php
index 63ff594624a..13c19a36d7b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/InstanceManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/InstanceManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -315,7 +315,10 @@ class InstanceManager /* implements InstanceManagerInterface */
{
$classes = array();
foreach ($this->configurations as $name => $data) {
- if (strpos($name, 'alias') === 0) continue;
+ if (strpos($name, 'alias') === 0) {
+ continue;
+ }
+
$classes[] = $name;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/LocatorInterface.php b/vendor/zendframework/zendframework/library/Zend/Di/LocatorInterface.php
index 88a12f6ccaf..4368ed78a66 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/LocatorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/LocatorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator.php b/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator.php
index aa93a3df93b..60c509cc377 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/DependencyInjectorProxy.php b/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/DependencyInjectorProxy.php
index be0c3cb1d50..8141893637e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/DependencyInjectorProxy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/DependencyInjectorProxy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/Generator.php b/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/Generator.php
index 82e8ca191ef..73bf96f419b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/Generator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/Generator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/GeneratorInstance.php b/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/GeneratorInstance.php
index aeb5f93acb3..f7af4698143 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/GeneratorInstance.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocator/GeneratorInstance.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocatorInterface.php b/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocatorInterface.php
index fe5e1257260..08f893d0cba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocatorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Di/ServiceLocatorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/composer.json b/vendor/zendframework/zendframework/library/Zend/Di/composer.json
index a767b4ce4ea..81f6cb78184 100644
--- a/vendor/zendframework/zendframework/library/Zend/Di/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Di/composer.json
@@ -6,6 +6,7 @@
"zf2",
"di"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Di\\": ""
@@ -13,14 +14,20 @@
},
"target-dir": "Zend/Di",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-code": "self.version",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-servicemanager": "self.version"
+ },
+ "suggest": {
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Dom/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/Css2Xpath.php b/vendor/zendframework/zendframework/library/Zend/Dom/Css2Xpath.php
index 53c2fd395f7..55b60c37c82 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/Css2Xpath.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/Css2Xpath.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,119 +11,23 @@ namespace Zend\Dom;
/**
* Transform CSS selectors to XPath
+ *
+ * @deprecated
+ * @see Document\Query
*/
class Css2Xpath
{
/**
* Transform CSS expression to XPath
*
+ * @deprecated
+ * @see Document\Query
* @param string $path
* @return string
*/
public static function transform($path)
{
- $path = (string) $path;
- if (strstr($path, ',')) {
- $paths = explode(',', $path);
- $expressions = array();
- foreach ($paths as $path) {
- $xpath = self::transform(trim($path));
- if (is_string($xpath)) {
- $expressions[] = $xpath;
- } elseif (is_array($xpath)) {
- $expressions = array_merge($expressions, $xpath);
- }
- }
- return implode('|', $expressions);
- }
-
- $paths = array('//');
- $path = preg_replace('|\s+>\s+|', '>', $path);
- $segments = preg_split('/\s+/', $path);
- foreach ($segments as $key => $segment) {
- $pathSegment = static::_tokenize($segment);
- if (0 == $key) {
- if (0 === strpos($pathSegment, '[contains(')) {
- $paths[0] .= '*' . ltrim($pathSegment, '*');
- } else {
- $paths[0] .= $pathSegment;
- }
- continue;
- }
- if (0 === strpos($pathSegment, '[contains(')) {
- foreach ($paths as $pathKey => $xpath) {
- $paths[$pathKey] .= '//*' . ltrim($pathSegment, '*');
- $paths[] = $xpath . $pathSegment;
- }
- } else {
- foreach ($paths as $pathKey => $xpath) {
- $paths[$pathKey] .= '//' . $pathSegment;
- }
- }
- }
-
- if (1 == count($paths)) {
- return $paths[0];
- }
- return implode('|', $paths);
- }
-
- /**
- * Tokenize CSS expressions to XPath
- *
- * @param string $expression
- * @return string
- */
- protected static function _tokenize($expression)
- {
- // Child selectors
- $expression = str_replace('>', '/', $expression);
-
- // IDs
- $expression = preg_replace('|#([a-z][a-z0-9_-]*)|i', '[@id=\'$1\']', $expression);
- $expression = preg_replace('|(?<![a-z0-9_-])(\[@id=)|i', '*$1', $expression);
-
- // arbitrary attribute strict equality
- $expression = preg_replace_callback(
- '|\[@?([a-z0-9_-]+)=[\'"]([^\'"]+)[\'"]\]|i',
- function ($matches) {
- return '[@' . strtolower($matches[1]) . "='" . $matches[2] . "']";
- },
- $expression
- );
-
- // arbitrary attribute contains full word
- $expression = preg_replace_callback(
- '|\[([a-z0-9_-]+)~=[\'"]([^\'"]+)[\'"]\]|i',
- function ($matches) {
- return "[contains(concat(' ', normalize-space(@" . strtolower($matches[1]) . "), ' '), ' "
- . $matches[2] . " ')]";
- },
- $expression
- );
-
- // arbitrary attribute contains specified content
- $expression = preg_replace_callback(
- '|\[([a-z0-9_-]+)\*=[\'"]([^\'"]+)[\'"]\]|i',
- function ($matches) {
- return "[contains(@" . strtolower($matches[1]) . ", '"
- . $matches[2] . "')]";
- },
- $expression
- );
-
- // Classes
- if(false === strpos($expression, "[@")) {
- $expression = preg_replace(
- '|\.([a-z][a-z0-9_-]*)|i',
- "[contains(concat(' ', normalize-space(@class), ' '), ' \$1 ')]",
- $expression
- );
- }
-
- /** ZF-9764 -- remove double asterisk */
- $expression = str_replace('**', '*', $expression);
-
- return $expression;
+ trigger_error(sprintf('%s is deprecated; please use %s\Document\Query::cssToXpath instead', __METHOD__, __NAMESPACE__), E_USER_DEPRECATED);
+ return Document\Query::cssToXpath($path);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/DOMXPath.php b/vendor/zendframework/zendframework/library/Zend/Dom/DOMXPath.php
new file mode 100644
index 00000000000..f46d550445f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/DOMXPath.php
@@ -0,0 +1,70 @@
+<?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\Dom;
+
+use ErrorException;
+
+/**
+ * Extends DOMXpath to throw ErrorExceptions instead of raising errors.
+ */
+class DOMXPath extends \DOMXPath
+{
+ /**
+ * A stack of ErrorExceptions created via addError()
+ *
+ * @var array
+ */
+ protected $errors = array(null);
+
+ /**
+ * Evaluates an XPath expression; throws an ErrorException instead of
+ * raising an error
+ *
+ * @param string $expression The XPath expression to evaluate.
+ * @return \DOMNodeList
+ * @throws ErrorException
+ */
+ public function queryWithErrorException($expression)
+ {
+ $this->errors = array(null);
+
+ set_error_handler(array($this, 'addError'), \E_WARNING);
+ $nodeList = $this->query($expression);
+ restore_error_handler();
+
+ $exception = array_pop($this->errors);
+ if ($exception) {
+ throw $exception;
+ }
+
+ return $nodeList;
+ }
+
+ /**
+ * Adds an error to the stack of errors
+ *
+ * @param int $errno
+ * @param string $errstr
+ * @param string $errfile
+ * @param int $errline
+ * @return void
+ */
+ public function addError($errno, $errstr = '', $errfile = '', $errline = 0)
+ {
+ $last_error = end($this->errors);
+ $this->errors[] = new ErrorException(
+ $errstr,
+ 0,
+ $errno,
+ $errfile,
+ $errline,
+ $last_error
+ );
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/Document.php b/vendor/zendframework/zendframework/library/Zend/Dom/Document.php
new file mode 100644
index 00000000000..5d389430c63
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/Document.php
@@ -0,0 +1,310 @@
+<?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\Dom;
+
+use DOMDocument;
+
+/**
+ * Class used to initialize DomDocument from string, with proper verifications
+ */
+class Document
+{
+ /**#@+
+ * Document types
+ */
+ const DOC_HTML = 'DOC_HTML';
+ const DOC_XHTML = 'DOC_XHTML';
+ const DOC_XML = 'DOC_XML';
+ /**#@-*/
+
+ /**
+ * Raw document
+ * @var string
+ */
+ protected $stringDocument;
+
+ /**
+ * DOMDocument generated from raw string document
+ * @var DOMDocument
+ */
+ protected $domDocument;
+
+ /**
+ * Type of the document provided
+ * @var string
+ */
+ protected $type;
+
+ /**
+ * Error list generated from transformation of document to DOMDocument
+ * @var array
+ */
+ protected $errors = array();
+
+ /**
+ * XPath namespaces
+ * @var array
+ */
+ protected $xpathNamespaces = array();
+
+ /**
+ * XPath PHP Functions
+ * @var mixed
+ */
+ protected $xpathPhpFunctions;
+
+ /**
+ * Constructor
+ *
+ * @param string|null $document String containing the document
+ * @param string|null $type Force the document to be of a certain type, bypassing setStringDocument's detection
+ * @param string|null $encoding Encoding for the document (used for DOMDocument generation)
+ */
+ public function __construct($document = null, $type = null, $encoding = null)
+ {
+ $this->setStringDocument($document, $type, $encoding);
+ }
+
+ /**
+ * Get raw set document
+ *
+ * @return string|null
+ */
+ public function getStringDocument()
+ {
+ return $this->stringDocument;
+ }
+
+ /**
+ * Set raw document
+ *
+ * @param string|null $document
+ * @param string|null $forcedType Type for the provided document (see constants)
+ * @param string|null $forcedEncoding Encoding for the provided document
+ * @return self
+ */
+ protected function setStringDocument($document, $forcedType = null, $forcedEncoding = null)
+ {
+ $type = static::DOC_HTML;
+ if (strstr($document, 'DTD XHTML')) {
+ $type = static::DOC_XHTML;
+ }
+
+ // Breaking XML declaration to make syntax highlighting work
+ if ('<' . '?xml' == substr(trim($document), 0, 5)) {
+ $type = static::DOC_XML;
+ if (preg_match('/<html[^>]*xmlns="([^"]+)"[^>]*>/i', $document, $matches)) {
+ $this->xpathNamespaces[] = $matches[1];
+ $type = static::DOC_XHTML;
+ }
+ }
+
+ // Unsetting previously registered DOMDocument
+ $this->domDocument = null;
+ $this->stringDocument = !empty($document) ? $document : null;
+
+ $this->setType($forcedType ?: (!empty($document) ? $type : null));
+ $this->setEncoding($forcedEncoding);
+ $this->setErrors(array());
+
+ return $this;
+ }
+
+ /**
+ * Get raw document type
+ *
+ * @return string|null
+ */
+ public function getType()
+ {
+ return $this->type;
+ }
+
+ /**
+ * Set raw document type
+ *
+ * @param string $type
+ * @return self
+ */
+ protected function setType($type)
+ {
+ $this->type = $type;
+
+ return $this;
+ }
+
+ /**
+ * Get DOMDocument generated from set raw document
+ *
+ * @return DOMDocument
+ * @throws Exception\RuntimeException If cannot get DOMDocument; no document registered
+ */
+ public function getDomDocument()
+ {
+ if (null === ($stringDocument = $this->getStringDocument())) {
+ throw new Exception\RuntimeException('Cannot get DOMDocument; no document registered');
+ }
+
+ if (null === $this->domDocument) {
+ $this->domDocument = $this->getDomDocumentFromString($stringDocument);
+ }
+
+ return $this->domDocument;
+ }
+
+ /**
+ * Set DOMDocument
+ *
+ * @param DOMDocument $domDocument
+ * @return self
+ */
+ protected function setDomDocument(DOMDocument $domDocument)
+ {
+ $this->domDocument = $domDocument;
+
+ return $this;
+ }
+
+ /**
+ * Get set document encoding
+ *
+ * @return string|null
+ */
+ public function getEncoding()
+ {
+ return $this->encoding;
+ }
+
+ /**
+ * Set raw document encoding for DOMDocument generation
+ *
+ * @param string|null $encoding
+ * @return self
+ */
+ public function setEncoding($encoding)
+ {
+ $this->encoding = $encoding;
+
+ return $this->encoding;
+ }
+
+ /**
+ * Get DOMDocument generation errors
+ *
+ * @return array
+ */
+ public function getErrors()
+ {
+ return $this->errors;
+ }
+
+ /**
+ * Set document errors from DOMDocument generation
+ *
+ * @param array $errors
+ * @return self
+ */
+ protected function setErrors($errors)
+ {
+ $this->errors = $errors;
+
+ return $this;
+ }
+
+ /**
+ * Get DOMDocument from set raw document
+ *
+ * @return DOMDocument
+ * @throws Exception\RuntimeException
+ */
+ protected function getDomDocumentFromString($stringDocument)
+ {
+ libxml_use_internal_errors(true);
+ libxml_disable_entity_loader(true);
+
+ $encoding = $this->getEncoding();
+ $domDoc = null === $encoding ? new DOMDocument('1.0') : new DOMDocument('1.0', $encoding);
+ $type = $this->getType();
+
+ switch ($type) {
+ case static::DOC_XML:
+ $success = $domDoc->loadXML($stringDocument);
+ foreach ($domDoc->childNodes as $child) {
+ if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
+ throw new Exception\RuntimeException(
+ 'Invalid XML: Detected use of illegal DOCTYPE'
+ );
+ }
+ }
+ break;
+ case static::DOC_HTML:
+ case static::DOC_XHTML:
+ default:
+ $success = $domDoc->loadHTML($stringDocument);
+ break;
+ }
+
+ $errors = libxml_get_errors();
+ if (!empty($errors)) {
+ $this->setErrors($errors);
+ libxml_clear_errors();
+ }
+
+ libxml_disable_entity_loader(false);
+ libxml_use_internal_errors(false);
+
+ if (!$success) {
+ throw new Exception\RuntimeException(sprintf('Error parsing document (type == %s)', $type));
+ }
+
+ return $domDoc;
+ }
+
+ /**
+ * Get Document's registered XPath namespaces
+ *
+ * @return array
+ */
+ public function getXpathNamespaces()
+ {
+ return $this->xpathNamespaces;
+ }
+
+ /**
+ * Register XPath namespaces
+ *
+ * @param array $xpathNamespaces
+ * @return void
+ */
+ public function registerXpathNamespaces($xpathNamespaces)
+ {
+ $this->xpathNamespaces = $xpathNamespaces;
+ }
+
+ /**
+ * Get Document's registered XPath PHP Functions
+ *
+ * @return string|null
+ */
+ public function getXpathPhpFunctions()
+ {
+ return $this->xpathPhpFunctions;
+ }
+ /**
+ * Register PHP Functions to use in internal DOMXPath
+ *
+ * @param bool $xpathPhpFunctions
+ * @return void
+ */
+ public function registerXpathPhpFunctions($xpathPhpFunctions = true)
+ {
+ $this->xpathPhpFunctions = $xpathPhpFunctions;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/Document/NodeList.php b/vendor/zendframework/zendframework/library/Zend/Dom/Document/NodeList.php
new file mode 100644
index 00000000000..3c1c8478cf9
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/Document/NodeList.php
@@ -0,0 +1,160 @@
+<?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\Dom\Document;
+
+use ArrayAccess;
+use Countable;
+use DOMNode;
+use DOMNodeList;
+use Iterator;
+use Zend\Dom\Exception;
+
+/**
+ * DOMNodeList wrapper for Zend\Dom\Document\Query results
+ */
+class NodeList implements Iterator, Countable, ArrayAccess
+{
+ /**
+ * @var DOMNodeList
+ */
+ protected $list;
+
+ /**
+ * Current iterator position
+ * @var int
+ */
+ protected $position = 0;
+
+ /**
+ * Constructor
+ *
+ * @param DOMNodeList $list
+ */
+ public function __construct(DOMNodeList $list)
+ {
+ $this->list = $list;
+ }
+
+ /**
+ * Iterator: rewind to first element
+ *
+ * @return DOMNode
+ */
+ public function rewind()
+ {
+ $this->position = 0;
+
+ return $this->list->item(0);
+ }
+
+ /**
+ * Iterator: is current position valid?
+ *
+ * @return bool
+ */
+ public function valid()
+ {
+ if (in_array($this->position, range(0, $this->list->length - 1)) && $this->list->length > 0) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Iterator: return current element
+ *
+ * @return DOMNode
+ */
+ public function current()
+ {
+ return $this->list->item($this->position);
+ }
+
+ /**
+ * Iterator: return key of current element
+ *
+ * @return int
+ */
+ public function key()
+ {
+ return $this->position;
+ }
+
+ /**
+ * Iterator: move to next element
+ *
+ * @return DOMNode
+ */
+ public function next()
+ {
+ ++$this->position;
+
+ return $this->list->item($this->position);
+ }
+
+ /**
+ * Countable: get count
+ *
+ * @return int
+ */
+ public function count()
+ {
+ return $this->list->length;
+ }
+
+ /**
+ * ArrayAccess: offset exists
+ *
+ * @param int $key
+ * @return bool
+ */
+ public function offsetExists($key)
+ {
+ if (in_array($key, range(0, $this->list->length - 1)) && $this->list->length > 0) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * ArrayAccess: get offset
+ *
+ * @param int $key
+ * @return mixed
+ */
+ public function offsetGet($key)
+ {
+ return $this->list->item($key);
+ }
+
+ /**
+ * ArrayAccess: set offset
+ *
+ * @param mixed $key
+ * @param mixed $value
+ * @throws Exception\BadMethodCallException when attempting to write to a read-only item
+ */
+ public function offsetSet($key, $value)
+ {
+ throw new Exception\BadMethodCallException('Attempting to write to a read-only list');
+ }
+
+ /**
+ * ArrayAccess: unset offset
+ *
+ * @param mixed $key
+ * @throws Exception\BadMethodCallException when attempting to unset a read-only item
+ */
+ public function offsetUnset($key)
+ {
+ throw new Exception\BadMethodCallException('Attempting to unset on a read-only list');
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/Document/Query.php b/vendor/zendframework/zendframework/library/Zend/Dom/Document/Query.php
new file mode 100644
index 00000000000..947e6afd0a0
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/Document/Query.php
@@ -0,0 +1,169 @@
+<?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\Dom\Document;
+
+use Zend\Dom\DOMXPath;
+use Zend\Dom\Document;
+
+/**
+ * Query object executable in a Zend\Dom\Document
+ */
+class Query
+{
+ /**#@+
+ * Query types
+ */
+ const TYPE_XPATH = 'TYPE_XPATH';
+ const TYPE_CSS = 'TYPE_CSS';
+ /**#@-*/
+
+ /**
+ * Perform the query on Document
+ *
+ * @param string $expression CSS selector or XPath query
+ * @param Document $document Document to query
+ * @param string $type The type of $expression
+ * @return NodeList
+ */
+ public static function execute($expression, Document $document, $type = self::TYPE_XPATH)
+ {
+ // Expression check
+ if ($type === static::TYPE_CSS) {
+ $expression = static::cssToXpath($expression);
+ }
+ $xpath = new DOMXPath($document->getDomDocument());
+
+ $xpathNamespaces = $document->getXpathNamespaces();
+ foreach ($xpathNamespaces as $prefix => $namespaceUri) {
+ $xpath->registerNamespace($prefix, $namespaceUri);
+ }
+
+ if ($xpathPhpfunctions = $document->getXpathPhpFunctions()) {
+ $xpath->registerNamespace('php', 'http://php.net/xpath');
+ ($xpathPhpfunctions === true) ? $xpath->registerPHPFunctions() : $xpath->registerPHPFunctions($xpathPhpfunctions);
+ }
+
+ $nodeList = $xpath->queryWithErrorException($expression);
+ return new NodeList($nodeList);
+ }
+
+ /**
+ * Transform CSS expression to XPath
+ *
+ * @param string $path
+ * @return string
+ */
+ public static function cssToXpath($path)
+ {
+ $path = (string) $path;
+ if (strstr($path, ',')) {
+ $paths = explode(',', $path);
+ $expressions = array();
+ foreach ($paths as $path) {
+ $xpath = static::cssToXpath(trim($path));
+ if (is_string($xpath)) {
+ $expressions[] = $xpath;
+ } elseif (is_array($xpath)) {
+ $expressions = array_merge($expressions, $xpath);
+ }
+ }
+ return implode('|', $expressions);
+ }
+
+ $paths = array('//');
+ $path = preg_replace('|\s+>\s+|', '>', $path);
+ $segments = preg_split('/\s+/', $path);
+ foreach ($segments as $key => $segment) {
+ $pathSegment = static::_tokenize($segment);
+ if (0 == $key) {
+ if (0 === strpos($pathSegment, '[contains(')) {
+ $paths[0] .= '*' . ltrim($pathSegment, '*');
+ } else {
+ $paths[0] .= $pathSegment;
+ }
+ continue;
+ }
+ if (0 === strpos($pathSegment, '[contains(')) {
+ foreach ($paths as $pathKey => $xpath) {
+ $paths[$pathKey] .= '//*' . ltrim($pathSegment, '*');
+ $paths[] = $xpath . $pathSegment;
+ }
+ } else {
+ foreach ($paths as $pathKey => $xpath) {
+ $paths[$pathKey] .= '//' . $pathSegment;
+ }
+ }
+ }
+
+ if (1 == count($paths)) {
+ return $paths[0];
+ }
+ return implode('|', $paths);
+ }
+
+ /**
+ * Tokenize CSS expressions to XPath
+ *
+ * @param string $expression
+ * @return string
+ */
+ protected static function _tokenize($expression)
+ {
+ // Child selectors
+ $expression = str_replace('>', '/', $expression);
+
+ // IDs
+ $expression = preg_replace('|#([a-z][a-z0-9_-]*)|i', '[@id=\'$1\']', $expression);
+ $expression = preg_replace('|(?<![a-z0-9_-])(\[@id=)|i', '*$1', $expression);
+
+ // arbitrary attribute strict equality
+ $expression = preg_replace_callback(
+ '|\[@?([a-z0-9_-]+)=[\'"]([^\'"]+)[\'"]\]|i',
+ function ($matches) {
+ return '[@' . strtolower($matches[1]) . "='" . $matches[2] . "']";
+ },
+ $expression
+ );
+
+ // arbitrary attribute contains full word
+ $expression = preg_replace_callback(
+ '|\[([a-z0-9_-]+)~=[\'"]([^\'"]+)[\'"]\]|i',
+ function ($matches) {
+ return "[contains(concat(' ', normalize-space(@" . strtolower($matches[1]) . "), ' '), ' "
+ . $matches[2] . " ')]";
+ },
+ $expression
+ );
+
+ // arbitrary attribute contains specified content
+ $expression = preg_replace_callback(
+ '|\[([a-z0-9_-]+)\*=[\'"]([^\'"]+)[\'"]\]|i',
+ function ($matches) {
+ return "[contains(@" . strtolower($matches[1]) . ", '"
+ . $matches[2] . "')]";
+ },
+ $expression
+ );
+
+ // Classes
+ if (false === strpos($expression, "[@")) {
+ $expression = preg_replace(
+ '|\.([a-z][a-z0-9_-]*)|i',
+ "[contains(concat(' ', normalize-space(@class), ' '), ' \$1 ')]",
+ $expression
+ );
+ }
+
+ /** ZF-9764 -- remove double asterisk */
+ $expression = str_replace('**', '*', $expression);
+
+ return $expression;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/BadMethodCallException.php
index df3eb1fda7b..993c26d9ad5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/ExceptionInterface.php
index f342f8fe65c..19251584385 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/RuntimeException.php
index 6cd15e22070..e96886a47d0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php b/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php
index 97a0178af6f..82447c43244 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/NodeList.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,6 +18,8 @@ use Iterator;
/**
* Nodelist for DOM XPath query
+ * @deprecated
+ * @see \Zend\Dom\Document\NodeList
*/
class NodeList implements Iterator, Countable, ArrayAccess
{
@@ -193,7 +195,7 @@ class NodeList implements Iterator, Countable, ArrayAccess
*
* @param mixed $key
* @param mixed $value
- * @throws Exception\BadMethodCallException when attemptingn to write to a read-only item
+ * @throws Exception\BadMethodCallException when attempting to write to a read-only item
*/
public function offsetSet($key, $value)
{
@@ -204,7 +206,7 @@ class NodeList implements Iterator, Countable, ArrayAccess
* ArrayAccess: unset offset
*
* @param mixed $key
- * @throws Exception\BadMethodCallException when attemptingn to unset a read-only item
+ * @throws Exception\BadMethodCallException when attempting to unset a read-only item
*/
public function offsetUnset($key)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/Query.php b/vendor/zendframework/zendframework/library/Zend/Dom/Query.php
index 28c0d40f9f4..7e65b6025c5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/Query.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/Query.php
@@ -3,18 +3,18 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Dom;
use DOMDocument;
-use DOMXPath;
-use Zend\Stdlib\ErrorHandler;
/**
* Query DOM structures based on CSS selectors and/or XPath
+ * @deprecated
+ * @see \Zend\Dom\Document\Query
*/
class Query
{
@@ -210,7 +210,7 @@ class Query
*/
public function execute($query)
{
- $xpathQuery = Css2Xpath::transform($query);
+ $xpathQuery = Document\Query::cssToXpath($query);
return $this->queryXpath($xpathQuery, $query);
}
@@ -297,7 +297,8 @@ class Query
*
* @param DOMDocument $document
* @param string|array $xpathQuery
- * @return array
+ * @return \DOMNodeList
+ * @throws \ErrorException If query cannot be executed
*/
protected function getNodeList($document, $xpathQuery)
{
@@ -313,12 +314,7 @@ class Query
}
$xpathQuery = (string) $xpathQuery;
- ErrorHandler::start();
- $nodeList = $xpath->query($xpathQuery);
- $error = ErrorHandler::stop();
- if ($error) {
- throw $error;
- }
+ $nodeList = $xpath->queryWithErrorException($xpathQuery);
return $nodeList;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Dom/composer.json b/vendor/zendframework/zendframework/library/Zend/Dom/composer.json
index 2524105858f..94433c52af1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/composer.json
@@ -6,6 +6,7 @@
"zf2",
"dom"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Dom\\": ""
@@ -13,13 +14,12 @@
},
"target-dir": "Zend/Dom",
"require": {
- "php": ">=5.3.3",
- "zendframework/zend-stdlib": "self.version"
+ "php": ">=5.3.23"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Escaper/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Escaper/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Escaper/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Escaper/Escaper.php b/vendor/zendframework/zendframework/library/Zend/Escaper/Escaper.php
index 28acfe05224..ac6fbb8fa7c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Escaper/Escaper.php
+++ b/vendor/zendframework/zendframework/library/Zend/Escaper/Escaper.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -146,8 +146,7 @@ class Escaper
*/
public function escapeHtml($string)
{
- $result = htmlspecialchars($string, $this->htmlSpecialCharsFlags, $this->encoding);
- return $result;
+ return htmlspecialchars($string, $this->htmlSpecialCharsFlags, $this->encoding);
}
/**
@@ -368,7 +367,6 @@ class Escaper
*/
protected function convertEncoding($string, $to, $from)
{
- $result = '';
if (function_exists('iconv')) {
$result = iconv($from, $to, $string);
} elseif (function_exists('mb_convert_encoding')) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/ExceptionInterface.php
index 7d3a5f6d00d..7174796a324 100644
--- a/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Escaper\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/InvalidArgumentException.php
index c7958b96d68..0ad3f7313db 100644
--- a/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/RuntimeException.php
index b421756279f..d626123af2e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Escaper/composer.json b/vendor/zendframework/zendframework/library/Zend/Escaper/composer.json
index 3b2f2b602d4..5f81793f37e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Escaper/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Escaper/composer.json
@@ -6,6 +6,7 @@
"zf2",
"escaper"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Escaper\\": ""
@@ -13,12 +14,12 @@
},
"target-dir": "Zend/Escaper",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.23"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/AbstractListenerAggregate.php b/vendor/zendframework/zendframework/library/Zend/EventManager/AbstractListenerAggregate.php
index 9a35d790ec5..a8b887d6ff6 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/AbstractListenerAggregate.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/AbstractListenerAggregate.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\EventManager;
-
/**
* Abstract aggregate listener
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/EventManager/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/Event.php b/vendor/zendframework/zendframework/library/Zend/EventManager/Event.php
index 766ee188e47..bc4ed4429b9 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/Event.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/Event.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -97,9 +97,9 @@ class Event implements EventInterface
public function setParams($params)
{
if (!is_array($params) && !is_object($params)) {
- throw new Exception\InvalidArgumentException(sprintf(
- 'Event parameters must be an array or object; received "%s"', gettype($params)
- ));
+ throw new Exception\InvalidArgumentException(
+ sprintf('Event parameters must be an array or object; received "%s"', gettype($params))
+ );
}
$this->params = $params;
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/EventInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/EventInterface.php
index c1d0de701d5..3a6274e9f6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/EventInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/EventInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManager.php b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManager.php
index 64a25724e6f..261957c10f1 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -530,7 +530,7 @@ class EventManager implements EventManagerInterface
* Used to inject shared listeners and wildcard listeners.
*
* @param PriorityQueue $masterListeners
- * @param PriorityQueue $listeners
+ * @param array|Traversable $listeners
* @return void
*/
protected function insertListeners($masterListeners, $listeners)
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerAwareInterface.php
index a5c25f25fa6..77ea5334fe8 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerAwareTrait.php b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerAwareTrait.php
index faa82445d47..1b87b58fef3 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerAwareTrait.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerAwareTrait.php
@@ -3,14 +3,75 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\EventManager;
+use Traversable;
+/**
+ * A trait for objects that provide events.
+ *
+ * If you use this trait in an object, you will probably want to also implement
+ * EventManagerAwareInterface, which will make it so the default initializer in
+ * a ZF2 MVC application will automatically inject an instance of the
+ * EventManager into your object when it is pulled from the ServiceManager.
+ *
+ * @see Zend\Mvc\Service\ServiceManagerConfig
+ */
trait EventManagerAwareTrait
{
- use ProvidesEvents;
+ /**
+ * @var EventManagerInterface
+ */
+ protected $events;
+
+ /**
+ * Set the event manager instance used by this context.
+ *
+ * For convenience, this method will also set the class name / LSB name as
+ * identifiers, in addition to any string or array of strings set to the
+ * $this->eventIdentifier property.
+ *
+ * @param EventManagerInterface $events
+ * @return mixed
+ */
+ public function setEventManager(EventManagerInterface $events)
+ {
+ $identifiers = array(__CLASS__, get_class($this));
+ if (isset($this->eventIdentifier)) {
+ if ((is_string($this->eventIdentifier))
+ || (is_array($this->eventIdentifier))
+ || ($this->eventIdentifier instanceof Traversable)
+ ) {
+ $identifiers = array_unique(array_merge($identifiers, (array) $this->eventIdentifier));
+ } elseif (is_object($this->eventIdentifier)) {
+ $identifiers[] = $this->eventIdentifier;
+ }
+ // silently ignore invalid eventIdentifier types
+ }
+ $events->setIdentifiers($identifiers);
+ $this->events = $events;
+ if (method_exists($this, 'attachDefaultListeners')) {
+ $this->attachDefaultListeners();
+ }
+ return $this;
+ }
+
+ /**
+ * Retrieve the event manager
+ *
+ * Lazy-loads an EventManager instance if none registered.
+ *
+ * @return EventManagerInterface
+ */
+ public function getEventManager()
+ {
+ if (!$this->events instanceof EventManagerInterface) {
+ $this->setEventManager(new EventManager());
+ }
+ return $this->events;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerInterface.php
index 24f77de96b3..7e619707b58 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -37,7 +37,7 @@ interface EventManagerInterface extends SharedEventManagerAwareInterface
public function trigger($event, $target = null, $argv = array(), $callback = null);
/**
- * Trigger an event until the given callback returns a boolean false
+ * Trigger an event until the given callback returns a boolean true
*
* Should allow handling the following scenarios:
* - Passing Event object and callback only
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/EventsCapableInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/EventsCapableInterface.php
index d94b8d0fdb5..e4b99b3fe5e 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/EventsCapableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/EventsCapableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/DomainException.php
index 180f481be26..6b247ad9596 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/DomainException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/ExceptionInterface.php
index 68cd6c3617a..61382cfc64a 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/InvalidArgumentException.php
index 2a4a6b53302..2b277514a37 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/InvalidCallbackException.php b/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/InvalidCallbackException.php
index e76659425e5..3afda0cb94b 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/InvalidCallbackException.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/Exception/InvalidCallbackException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/Filter/FilterInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/Filter/FilterInterface.php
index b69fc2cb927..71d0c1dce2d 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/Filter/FilterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/Filter/FilterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/Filter/FilterIterator.php b/vendor/zendframework/zendframework/library/Zend/EventManager/Filter/FilterIterator.php
index 60f811fb1e9..d15274ba186 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/Filter/FilterIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/Filter/FilterIterator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/FilterChain.php b/vendor/zendframework/zendframework/library/Zend/EventManager/FilterChain.php
index d79a5de97ce..9618600f727 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/FilterChain.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/FilterChain.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/GlobalEventManager.php b/vendor/zendframework/zendframework/library/Zend/EventManager/GlobalEventManager.php
index 4bac5b57411..5615cb42038 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/GlobalEventManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/GlobalEventManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateInterface.php
index cd0eef4ce58..df76708d13e 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateTrait.php b/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateTrait.php
index bd287e49ceb..17ae0b04d72 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateTrait.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/ListenerAggregateTrait.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/ProvidesEvents.php b/vendor/zendframework/zendframework/library/Zend/EventManager/ProvidesEvents.php
index 0da7a0bddf6..edb19c1d954 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/ProvidesEvents.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/ProvidesEvents.php
@@ -3,61 +3,21 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\EventManager;
-use Traversable;
+trigger_error('Zend\EventManager\ProvidesEvents has been deprecated in favor of Zend\EventManager\EventManagerAwareTrait; please update your code', E_USER_DEPRECATED);
/**
- * A trait for objects that provide events
+ * @deprecated Please use EventManagerAwareTrait instead.
+ *
+ * This trait exists solely for backwards compatibility in the 2.x branch and
+ * will likely be removed in 3.x.
*/
trait ProvidesEvents
{
- /**
- * @var EventManagerInterface
- */
- protected $events;
-
- /**
- * Set the event manager instance used by this context
- *
- * @param EventManagerInterface $events
- * @return mixed
- */
- public function setEventManager(EventManagerInterface $events)
- {
- $identifiers = array(__CLASS__, get_class($this));
- if (isset($this->eventIdentifier)) {
- if ((is_string($this->eventIdentifier))
- || (is_array($this->eventIdentifier))
- || ($this->eventIdentifier instanceof Traversable)
- ) {
- $identifiers = array_unique(array_merge($identifiers, (array) $this->eventIdentifier));
- } elseif (is_object($this->eventIdentifier)) {
- $identifiers[] = $this->eventIdentifier;
- }
- // silently ignore invalid eventIdentifier types
- }
- $events->setIdentifiers($identifiers);
- $this->events = $events;
- return $this;
- }
-
- /**
- * Retrieve the event manager
- *
- * Lazy-loads an EventManager instance if none registered.
- *
- * @return EventManagerInterface
- */
- public function getEventManager()
- {
- if (!$this->events instanceof EventManagerInterface) {
- $this->setEventManager(new EventManager());
- }
- return $this->events;
- }
+ use EventManagerAwareTrait;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/ResponseCollection.php b/vendor/zendframework/zendframework/library/Zend/EventManager/ResponseCollection.php
index b9fb7353b8e..f0b60e03b43 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/ResponseCollection.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/ResponseCollection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventAggregateAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventAggregateAwareInterface.php
index d5701ba1ad3..73b849c3f24 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventAggregateAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventAggregateAwareInterface.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\EventManager;
-
/**
* Interface for allowing attachment of shared aggregate listeners.
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManager.php b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManager.php
index c673b38ceaf..40fae74ae79 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -109,7 +109,7 @@ class SharedEventManager implements
/**
* Detach a listener aggregate
*
- * Listener aggregates accept an SharedEventManagerInterface instance, and call detachShared()
+ * Listener aggregates accept a SharedEventManagerInterface instance, and call detachShared()
* of all previously attached listeners.
*
* @param SharedListenerAggregateInterface $aggregate
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManagerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManagerAwareInterface.php
index 09e5c98c12a..f6c05ec65af 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManagerAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManagerAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManagerInterface.php
index 02710cf6778..1e26c570d26 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManagerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManagerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -33,7 +33,7 @@ interface SharedEventManagerInterface
* @param string $event
* @param callable $callback PHP Callback
* @param int $priority Priority at which listener should execute
- * @return void
+ * @return CallbackHandler|array Either CallbackHandler or array of CallbackHandlers
*/
public function attach($id, $event, $callback, $priority = 1);
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedListenerAggregateInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedListenerAggregateInterface.php
index 2c997db3f05..e1190407538 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedListenerAggregateInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedListenerAggregateInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,7 @@ namespace Zend\EventManager;
* Interface for self-registering event listeners.
*
* Classes implementing this interface may be registered by name or instance
- * with an SharedEventManager, without an event name. The {@link attach()} method will
+ * with a SharedEventManager, without an event name. The {@link attach()} method will
* then be called with the current SharedEventManager instance, allowing the class to
* wire up one or more listeners.
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/StaticEventManager.php b/vendor/zendframework/zendframework/library/Zend/EventManager/StaticEventManager.php
index 4273bdf359c..e3b089e12d1 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/StaticEventManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/StaticEventManager.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\EventManager;
-
/**
* Static version of EventManager
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/composer.json b/vendor/zendframework/zendframework/library/Zend/EventManager/composer.json
index 62ccee5c4fb..cdb67a0e0e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/composer.json
@@ -6,6 +6,7 @@
"zf2",
"eventmanager"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\EventManager\\": ""
@@ -13,13 +14,13 @@
},
"target-dir": "Zend/EventManager",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Feed/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/BadMethodCallException.php
index ef0173a5b2e..3e994f2eb2b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/BadMethodCallException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Feed\Exception;
-class BadMethodCallException
- extends \BadMethodCallException
- implements ExceptionInterface
-{}
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/ExceptionInterface.php
index 8abcfa9e767..0f752962f18 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Feed\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/InvalidArgumentException.php
index c601ef63129..29b64828ac5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/InvalidArgumentException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Feed\Exception;
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/RuntimeException.php
index 824a6db4d80..43167a1e74f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/RuntimeException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Feed\Exception;
-class RuntimeException
- extends \RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/AbstractCallback.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
index 7645cb90519..7321c9625df 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/CallbackInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
index 8873c3db48b..c6b7412fd0c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/CallbackInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php
index 845ae2cd388..f32bc1c3ee1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Feed\PubSubHubbub\Exception;
use Zend\Feed\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php
index 23f8df104f6..cad1e01bdbf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Feed\PubSubHubbub\Exception;
use Zend\Feed\Exception;
-class InvalidArgumentException
- extends Exception\InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php
index 209842bd692..cc954a519ba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Feed\PubSubHubbub\Exception;
use Zend\Feed\Exception;
-class RuntimeException
- extends Exception\RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/HttpResponse.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/HttpResponse.php
index 0c4c7417207..0c1adf2ecb6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/HttpResponse.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/HttpResponse.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php
index 92e688133e3..3ebd07f5b8d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/AbstractModel.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/Subscription.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/Subscription.php
index 9571106a407..46a5d82c80a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/Subscription.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/Subscription.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
index 77b2e71f9d6..09e7d7559f3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Feed\PubSubHubbub\Model;
interface SubscriptionPersistenceInterface
{
-
/**
* Save subscription to RDMBS
*
@@ -43,5 +42,4 @@ interface SubscriptionPersistenceInterface
* @return bool
*/
public function deleteSubscription($key);
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
index f96236c9b30..a930a70bed6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -95,7 +95,7 @@ class PubSubHubbub
/**
* Simple mechanism to delete the entire singleton HTTP Client instance
- * which forces an new instantiation for subsequent requests.
+ * which forces a new instantiation for subsequent requests.
*
* @return void
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php
index 916ffcad592..6130992bdc9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber.php
index 265fe776b16..d5db9085096 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
index 5ec8af2fe14..5160259003b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Version.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Version.php
index edee6953bc2..9ac7fb4bdb4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Version.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Version.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractEntry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractEntry.php
index cf8a9361b1f..73363553feb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractEntry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractEntry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractFeed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractFeed.php
index 57ed45d3eca..7a3a9729fce 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractFeed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/AbstractFeed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -168,7 +168,7 @@ abstract class AbstractFeed implements Feed\FeedInterface
*/
public function saveXml()
{
- return $this->getDomDocument()->saveXml();
+ return $this->getDomDocument()->saveXml();
}
/**
@@ -178,7 +178,7 @@ abstract class AbstractFeed implements Feed\FeedInterface
*/
public function getElement()
{
- return $this->getDomDocument()->documentElement;
+ return $this->getDomDocument()->documentElement;
}
/**
@@ -188,7 +188,7 @@ abstract class AbstractFeed implements Feed\FeedInterface
*/
public function getXpath()
{
- return $this->xpath;
+ return $this->xpath;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection.php
index 172eecce153..f50c1bc2f2f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,5 +13,4 @@ use ArrayObject;
class Collection extends ArrayObject
{
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/AbstractCollection.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/AbstractCollection.php
index 2466a0a9a94..749ff5c809b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/AbstractCollection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/AbstractCollection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use ArrayObject;
abstract class AbstractCollection extends ArrayObject
{
-
/**
* Return a simple array of the most relevant slice of
* the collection values. For example, feed categories contain
@@ -23,5 +22,4 @@ abstract class AbstractCollection extends ArrayObject
* @return array
*/
abstract public function getValues();
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Author.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Author.php
index 1c773d021e8..82716db2a2b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Author.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Author.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Feed\Reader\Collection;
class Author extends AbstractCollection
{
-
/**
* Return a simple array of the most relevant slice of
* the author values, i.e. all author names.
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Category.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Category.php
index 15112ceae32..57d056040d1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Category.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Category.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Feed\Reader\Collection;
class Category extends AbstractCollection
{
-
/**
* Return a simple array of the most relevant slice of
* the collection values. For example, feed categories contain
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Collection.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Collection.php
index e3a6ae3d789..cf791c2e58c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Collection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Collection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,5 +13,4 @@ use ArrayObject;
class Collection extends ArrayObject
{
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/AbstractEntry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/AbstractEntry.php
index 241a8cdba0a..c6e73259c97 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/AbstractEntry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/AbstractEntry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Atom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Atom.php
index ed61a21e5f4..77e54b90b8c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Atom.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Atom.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/EntryInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/EntryInterface.php
index 86fea3ec585..c5e5fb2241b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/EntryInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/EntryInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Rss.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Rss.php
index 27337b1b0ca..666c0c2f405 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Rss.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/Rss.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Feed\Reader\Exception;
class Rss extends AbstractEntry implements EntryInterface
{
-
/**
* XPath query for RDF
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/BadMethodCallException.php
index ee1ef94cba2..008c57eccef 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Feed\Reader\Exception;
use Zend\Feed\Exception;
-class BadMethodCallException
- extends Exception\BadMethodCallException
- implements ExceptionInterface
-{}
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/ExceptionInterface.php
index 8fc904aeed0..e5e664aff6a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Feed\Reader\Exception;
use Zend\Feed\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php
index ad7e928dad9..646b767b93a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Feed\Reader\Exception;
use Zend\Feed\Exception;
-class InvalidArgumentException
- extends Exception\InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/RuntimeException.php
index 706a485810b..d876e7f00e9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Feed\Reader\Exception;
use Zend\Feed\Exception;
-class RuntimeException
- extends Exception\RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/AbstractEntry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/AbstractEntry.php
index 15e7574dfe4..72bd62ea390 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/AbstractEntry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/AbstractEntry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/AbstractFeed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/AbstractFeed.php
index 1bea2e49800..94acea6e358 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/AbstractFeed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/AbstractFeed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -105,7 +105,6 @@ abstract class AbstractFeed
return $type;
}
-
/**
* Return the feed as an array
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Entry.php
index aa91a5c9c34..12fb3c636d8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -138,7 +138,9 @@ class Entry extends Extension\AbstractEntry
*/
protected function collectXhtml($xhtml, $prefix)
{
- if (!empty($prefix)) $prefix = $prefix . ':';
+ if (!empty($prefix)) {
+ $prefix = $prefix . ':';
+ }
$matches = array(
"/<\?xml[^<]*>[^<]*<" . $prefix . "div[^<]*/",
"/<\/" . $prefix . "div>\s*$/"
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Feed.php
index 986d23fdb35..14bf9c33879 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Feed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Content/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Content/Entry.php
index f48a360f2b3..539848f2582 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Content/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Content/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Feed\Reader\Extension;
class Entry extends Extension\AbstractEntry
{
-
public function getContent()
{
if ($this->getType() !== Reader\Reader::TYPE_RSS_10
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
index 6770b4fe0e7..9ecb486b14a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Feed\Reader\Extension\CreativeCommons;
-use Zend\Feed\Reader;
use Zend\Feed\Reader\Extension;
class Entry extends Extension\AbstractEntry
@@ -48,7 +47,7 @@ class Entry extends Extension\AbstractEntry
if ($list->length) {
foreach ($list as $license) {
- $licenses[] = $license->nodeValue;
+ $licenses[] = $license->nodeValue;
}
$licenses = array_unique($licenses);
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
index 103bce7f94e..5aabe8b9928 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Feed\Reader\Extension\CreativeCommons;
-use Zend\Feed\Reader;
use Zend\Feed\Reader\Extension;
class Feed extends Extension\AbstractFeed
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
index 2713353cada..1e656cd06fd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -110,7 +110,6 @@ class Entry extends Extension\AbstractEntry
return $this->data['categories'];
}
-
/**
* Get the entry content
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
index 2738ac732b3..182ce218a98 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Podcast/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
index c97e64ff47e..5aec2fd9ccc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Podcast/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Podcast/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
index 66b13a48b2b..9fb80de540c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Podcast/Feed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -63,7 +63,7 @@ class Feed extends Extension\AbstractFeed
/**
* Get the entry category
*
- * @return string
+ * @return array|null
*/
public function getItunesCategories()
{
@@ -93,7 +93,6 @@ class Feed extends Extension\AbstractFeed
}
}
-
if (!$categories) {
$categories = null;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Slash/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Slash/Entry.php
index 2c47568f91a..786d894ea4a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Slash/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Slash/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -54,8 +54,9 @@ class Entry extends Extension\AbstractEntry
if (!empty($stringParade)) {
$stringParade = explode(',', $stringParade);
- foreach ($stringParade as $hit)
+ foreach ($stringParade as $hit) {
$hitParade[] = $hit + 0; //cast to integer
+ }
}
$this->data[$name] = $hitParade;
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Syndication/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
index 429c7bfd0a7..09f12ddea25 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -24,7 +24,7 @@ class Feed extends Extension\AbstractFeed
public function getUpdatePeriod()
{
$name = 'updatePeriod';
- $period = $this->_getData($name);
+ $period = $this->getData($name);
if ($period === null) {
$this->data[$name] = 'daily';
@@ -52,7 +52,7 @@ class Feed extends Extension\AbstractFeed
public function getUpdateFrequency()
{
$name = 'updateFrequency';
- $freq = $this->_getData($name, 'number');
+ $freq = $this->getData($name, 'number');
if (!$freq || $freq < 1) {
$this->data[$name] = 1;
@@ -70,7 +70,7 @@ class Feed extends Extension\AbstractFeed
public function getUpdateFrequencyAsTicks()
{
$name = 'updateFrequency';
- $freq = $this->_getData($name, 'number');
+ $freq = $this->getData($name, 'number');
if (!$freq || $freq < 1) {
$this->data[$name] = 1;
@@ -107,7 +107,7 @@ class Feed extends Extension\AbstractFeed
*/
public function getUpdateBase()
{
- $updateBase = $this->_getData('updateBase');
+ $updateBase = $this->getData('updateBase');
$date = null;
if ($updateBase) {
$date = DateTime::createFromFormat(DateTime::W3C, $updateBase);
@@ -122,7 +122,7 @@ class Feed extends Extension\AbstractFeed
* @param string $type
* @return mixed|null
*/
- private function _getData($name, $type = 'string')
+ private function getData($name, $type = 'string')
{
if (array_key_exists($name, $this->data)) {
return $this->data[$name];
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Thread/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Thread/Entry.php
index d3bc3158716..e5de5bb1cd9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Thread/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Thread/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
index 6d5a9770538..42fafb4aa4a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManager.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManager.php
index 9103643a301..bf694c8e273 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManagerInterface.php
index 4bbb91d9e9c..70ec37d4c07 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManagerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionManagerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionPluginManager.php
index 45d3b26b5cf..3e3308c29ac 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/ExtensionPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/AbstractFeed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/AbstractFeed.php
index 0d5f2b835a4..ea9cd978edf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/AbstractFeed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/AbstractFeed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -172,7 +172,7 @@ abstract class AbstractFeed implements FeedInterface
*/
public function saveXml()
{
- return $this->getDomDocument()->saveXml();
+ return $this->getDomDocument()->saveXml();
}
/**
@@ -182,7 +182,7 @@ abstract class AbstractFeed implements FeedInterface
*/
public function getElement()
{
- return $this->getDomDocument()->documentElement;
+ return $this->getDomDocument()->documentElement;
}
/**
@@ -192,7 +192,7 @@ abstract class AbstractFeed implements FeedInterface
*/
public function getXpath()
{
- return $this->xpath;
+ return $this->xpath;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom.php
index 02a8f6244db..50a0fb03cdb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Feed\Reader;
*/
class Atom extends AbstractFeed
{
-
/**
* Constructor
*
@@ -383,7 +382,6 @@ class Atom extends AbstractFeed
{
if ($this->getType() == Reader\Reader::TYPE_ATOM_10 ||
$this->getType() == Reader\Reader::TYPE_ATOM_03) {
- $entries = array();
$entries = $this->xpath->evaluate('//atom:entry');
foreach ($entries as $index => $entry) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom/Source.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom/Source.php
index fada1285926..2590de65557 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom/Source.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom/Source.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,6 @@ use Zend\Feed\Reader\Feed;
*/
class Source extends Feed\Atom
{
-
/**
* Constructor: Create a Source object which is largely just a normal
* Zend\Feed\Reader\AbstractFeed object only designed to retrieve feed level
@@ -60,35 +59,49 @@ class Source extends Feed\Atom
/**
* @return void
*/
- public function count() {}
+ public function count()
+ {
+ }
/**
* @return void
*/
- public function current() {}
+ public function current()
+ {
+ }
/**
* @return void
*/
- public function key() {}
+ public function key()
+ {
+ }
/**
* @return void
*/
- public function next() {}
+ public function next()
+ {
+ }
/**
* @return void
*/
- public function rewind() {}
+ public function rewind()
+ {
+ }
/**
* @return void
*/
- public function valid() {}
+ public function valid()
+ {
+ }
/**
* @return void
*/
- protected function indexEntries() {}
+ protected function indexEntries()
+ {
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/FeedInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/FeedInterface.php
index 4ba3293d49e..441ba9269c5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/FeedInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/FeedInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -107,5 +107,4 @@ interface FeedInterface extends Iterator, Countable
* @return \Zend\Feed\Reader\Collection\Category
*/
public function getCategories();
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Rss.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Rss.php
index 0237a531c22..16559971e9d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Rss.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Rss.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -19,7 +19,6 @@ use Zend\Feed\Reader\Exception;
*/
class Rss extends AbstractFeed
{
-
/**
* Constructor
*
@@ -675,8 +674,6 @@ class Rss extends AbstractFeed
*/
protected function indexEntries()
{
- $entries = array();
-
if ($this->getType() !== Reader\Reader::TYPE_RSS_10 && $this->getType() !== Reader\Reader::TYPE_RSS_090) {
$entries = $this->xpath->evaluate('//item');
} else {
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/FeedSet.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/FeedSet.php
index a432ac3be5e..798229e9998 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/FeedSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/FeedSet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Feed\Uri;
*/
class FeedSet extends ArrayObject
{
-
public $rss = null;
public $rdf = null;
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ClientInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ClientInterface.php
index 43932f76127..13879818590 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ClientInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ClientInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ResponseInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ResponseInterface.php
index 39c51724b95..96b422e16de 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ResponseInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ResponseInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Reader.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Reader.php
index 6c222bb5281..f6708df65ff 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Reader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Reader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -125,7 +125,6 @@ class Reader
static::$httpClient = $httpClient;
}
-
/**
* Gets the HTTP client object. If none is set, a new ZendHttp\Client will be used.
*
@@ -192,7 +191,6 @@ class Reader
{
$cache = self::getCache();
$feed = null;
- $responseXml = '';
$client = self::getHttpClient();
$client->resetParameters();
$headers = new ZendHttp\Headers();
@@ -266,7 +264,7 @@ class Reader
* HTTP client implementations.
*
* @param string $uri
- * @param Http\Client $client
+ * @param Http\ClientInterface $client
* @return self
* @throws Exception\RuntimeException if response is not an Http\ResponseInterface
*/
@@ -299,6 +297,11 @@ class Reader
*/
public static function importString($string)
{
+ $trimmed = trim($string);
+ if (!is_string($string) || empty($trimmed)) {
+ throw new Exception\InvalidArgumentException('Only non empty strings are allowed as input');
+ }
+
$libxmlErrflag = libxml_use_internal_errors(true);
$oldValue = libxml_disable_entity_loader(true);
$dom = new DOMDocument;
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Uri.php b/vendor/zendframework/zendframework/library/Zend/Feed/Uri.php
index 940bce11ab0..9a4565e3584 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Uri.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Uri.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php
index b96a5302dce..097a0a7228e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/AbstractFeed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -287,7 +287,6 @@ class AbstractFeed
{
if (preg_match('/^tag:(?P<name>.*),(?P<date>\d{4}-?\d{0,2}-?\d{0,2}):(?P<specific>.*)(.*:)*$/', $id, $matches)) {
$dvalid = false;
- $nvalid = false;
$date = $matches['date'];
$d6 = strtotime($date);
if ((strlen($date) == 4) && $date <= date('Y')) {
@@ -304,7 +303,6 @@ class AbstractFeed
$nvalid = $validator->isValid('info@' . $matches['name']);
}
return $dvalid && $nvalid;
-
}
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Deleted.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Deleted.php
index b4a6567a0d7..0b469f3dda3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Deleted.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Deleted.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Feed\Uri;
*/
class Deleted
{
-
/**
* Internal array containing all data associated with this entry or item.
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php
index 797f4bcd0f5..a17c3aa382e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Feed\Uri;
*/
class Entry
{
-
/**
* Internal array containing all data associated with this entry or item.
*
@@ -530,7 +529,7 @@ class Entry
}
/**
- * Add a entry category
+ * Add an entry category
*
* @param array $category
* @throws Exception\InvalidArgumentException
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/BadMethodCallException.php
index e03851184b7..b2ea2bef008 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Feed\Exception;
*
* Class to represent exceptions that occur during Feed operations.
*/
-class BadMethodCallException
- extends Exception\BadMethodCallException
- implements ExceptionInterface
-{}
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/ExceptionInterface.php
index c2ed59bebcf..ee8bdaf62bd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php
index 377d378db0a..d8c4a8b82cb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Feed\Exception;
*
* Class to represent exceptions that occur during Feed operations.
*/
-class InvalidArgumentException
- extends Exception\InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/RuntimeException.php
index 6de3df500e3..ae8ee361f7c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Feed\Writer\Exception;
use Zend\Feed\Exception;
-class RuntimeException
- extends Exception\RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/AbstractRenderer.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/AbstractRenderer.php
index 5e4eb8c82f8..1a32b475629 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/AbstractRenderer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/AbstractRenderer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
index f790259588c..25571c0e0d6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Feed\Writer\Extension;
*/
class Feed extends Extension\AbstractRenderer
{
-
/**
* Set to TRUE if a rendering method actually renders something. This
* is used to prevent premature appending of a XML namespace declaration
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
index 6d64bc2fc3e..939b2492bc9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Feed\Writer\Extension;
*/
class Entry extends Extension\AbstractRenderer
{
-
/**
* Set to TRUE if a rendering method actually renders something. This
* is used to prevent premature appending of a XML namespace declaration
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
index d7ca4fda74c..5cc86cd6b8b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Feed\Writer\Extension;
*/
class Entry extends Extension\AbstractRenderer
{
-
/**
* Set to TRUE if a rendering method actually renders something. This
* is used to prevent premature appending of a XML namespace declaration
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
index e888fbd0737..160b5a48481 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Feed\Writer\Extension;
*/
class Feed extends Extension\AbstractRenderer
{
-
/**
* Set to TRUE if a rendering method actually renders something. This
* is used to prevent premature appending of a XML namespace declaration
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
index 1b7b64aa5b0..8032ce2f9d3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
index 22c54db6e61..5568d5de393 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Feed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
index bc57d1daa2f..ed8f732ed7c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
index d5b565780de..d978f03201e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Feed\Writer\Extension;
*/
class Feed extends Extension\AbstractRenderer
{
-
/**
* Set to TRUE if a rendering method actually renders something. This
* is used to prevent premature appending of a XML namespace declaration
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/RendererInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/RendererInterface.php
index e72346c2053..9afe88b2a2d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/RendererInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/RendererInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
index cb08828cc65..c74cb02023f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Feed\Writer\Extension;
*/
class Entry extends Extension\AbstractRenderer
{
-
/**
* Set to TRUE if a rendering method actually renders something. This
* is used to prevent premature appending of a XML namespace declaration
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
index bbf4595ed87..6f19641b895 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Feed\Writer\Extension;
*/
class Entry extends Extension\AbstractRenderer
{
-
/**
* Set to TRUE if a rendering method actually renders something. This
* is used to prevent premature appending of a XML namespace declaration
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
index be13b71d95e..48c0d8f2e32 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use Zend\Feed\Writer\Extension;
*/
class Entry extends Extension\AbstractRenderer
{
-
/**
* Set to TRUE if a rendering method actually renders something. This
* is used to prevent premature appending of a XML namespace declaration
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManager.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManager.php
index 5310050a0d2..89be41d8824 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -60,7 +60,7 @@ class ExtensionManager implements ExtensionManagerInterface
* Get the named extension
*
* @param string $name
- * @return Extension\AbstractEntry|Extension\AbstractFeed
+ * @return Extension\AbstractRenderer
*/
public function get($name)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManagerInterface.php
index 0f7e023fec4..b0e28a08c4b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManagerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManagerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionPluginManager.php
index 1155c84d2d1..6763374cabb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Feed.php
index 99f2698a2ac..d402bb8f634 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Feed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Feed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Iterator;
*/
class Feed extends AbstractFeed implements Iterator, Countable
{
-
/**
* Contains all entry objects
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/FeedFactory.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/FeedFactory.php
index 15e7a3468c1..99b528c73ae 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/FeedFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/FeedFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
index e1045019836..76b9a685a15 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/AbstractRenderer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
index 28b325d40c0..9f3aa740141 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -137,7 +137,7 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
$updated = $dom->createElement('updated');
$root->appendChild($updated);
$text = $dom->createTextNode(
- $this->getDataContainer()->getDateModified()->format(DateTime::ISO8601)
+ $this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
);
$updated->appendChild($text);
}
@@ -157,7 +157,7 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
$el = $dom->createElement('published');
$root->appendChild($el);
$text = $dom->createTextNode(
- $this->getDataContainer()->getDateCreated()->format(DateTime::ISO8601)
+ $this->getDataContainer()->getDateCreated()->format(DateTime::ATOM)
);
$el->appendChild($text);
}
@@ -291,7 +291,6 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
{
if (preg_match('/^tag:(?P<name>.*),(?P<date>\d{4}-?\d{0,2}-?\d{0,2}):(?P<specific>.*)(.*:)*$/', $id, $matches)) {
$dvalid = false;
- $nvalid = false;
$date = $matches['date'];
$d6 = strtotime($date);
if ((strlen($date) == 4) && $date <= date('Y')) {
@@ -308,7 +307,6 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
$nvalid = $validator->isValid('info@' . $matches['name']);
}
return $dvalid && $nvalid;
-
}
return false;
}
@@ -353,7 +351,6 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
*/
protected function _loadXhtml($content)
{
- $xhtml = '';
if (class_exists('tidy', false)) {
$tidy = new \tidy;
$config = array(
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
index 65ace00bd7c..8519bd9d9ea 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -40,7 +40,7 @@ class Deleted extends Renderer\AbstractRenderer implements Renderer\RendererInte
$this->dom->appendChild($entry);
$entry->setAttribute('ref', $this->container->getReference());
- $entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ISO8601));
+ $entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ATOM));
$this->_setBy($this->dom, $entry);
$this->_setComment($this->dom, $entry);
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php
index 1ed4aa3d9e5..f0db3e9328e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -42,7 +42,7 @@ class AtomDeleted extends Renderer\AbstractRenderer implements Renderer\Renderer
$this->dom->appendChild($entry);
$entry->setAttribute('ref', $this->container->getReference());
- $entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ISO8601));
+ $entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ATOM));
$this->_setBy($this->dom, $entry);
$this->_setComment($this->dom, $entry);
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Rss.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
index 2338cdc2134..aae2f46e283 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
index e7ad9f56ba7..a5400a60502 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AbstractAtom.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -118,7 +118,7 @@ class AbstractAtom extends Renderer\AbstractRenderer
$updated = $dom->createElement('updated');
$root->appendChild($updated);
$text = $dom->createTextNode(
- $this->getDataContainer()->getDateModified()->format(DateTime::ISO8601)
+ $this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
);
$updated->appendChild($text);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
index 87b6b94ac0c..2b33f6a1e37 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
index 379cd5c9f74..20fc8df81e7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/AbstractAtom.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -115,7 +115,7 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
$updated = $dom->createElement('updated');
$root->appendChild($updated);
$text = $dom->createTextNode(
- $this->getDataContainer()->getDateModified()->format(DateTime::ISO8601)
+ $this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
);
$updated->appendChild($text);
}
@@ -313,7 +313,6 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
$img->appendChild($text);
}
-
/**
* Set date feed was created
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
index 006c6ae4aec..3793db0cbca 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Zend\Feed\Writer\Renderer;
class Source extends AbstractAtom implements Renderer\RendererInterface
{
-
/**
* Constructor
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php
index 739c6f72991..d552b808922 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,6 @@ use Zend\Feed\Writer\Renderer;
*/
class AtomSource extends AbstractAtom implements Renderer\RendererInterface
{
-
/**
* Constructor
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Rss.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
index 75c502e3236..aff8ae160d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/RendererInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/RendererInterface.php
index b2e0e00a32e..24738efcab1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/RendererInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/RendererInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Source.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Source.php
index f0b4dcacb5c..23affa7a6fa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Source.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Source.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Version.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Version.php
index 8dd20df90d6..08351ca3f15 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Version.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Version.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Writer.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Writer.php
index ae8e153642e..8c5397892bf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Writer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Writer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/composer.json b/vendor/zendframework/zendframework/library/Zend/Feed/composer.json
index d55068f011f..0c4d7dc1818 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/composer.json
@@ -6,6 +6,7 @@
"zf2",
"feed"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Feed\\": ""
@@ -13,19 +14,28 @@
},
"target-dir": "Zend/Feed",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-escaper": "self.version",
"zendframework/zend-stdlib": "self.version"
},
+ "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"
+ },
"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"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/File/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/File/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/File/ClassFileLocator.php b/vendor/zendframework/zendframework/library/Zend/File/ClassFileLocator.php
index 5a1ff998d2a..f8c28e86389 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/ClassFileLocator.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/ClassFileLocator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -116,6 +116,10 @@ class ClassFileLocator extends FilterIterator
break;
case $t_trait:
case T_CLASS:
+ // ignore T_CLASS after T_DOUBLE_COLON to allow PHP >=5.5 FQCN scalar resolution
+ if ($i > 0 && is_array($tokens[$i-1]) && $tokens[$i-1][0] === T_DOUBLE_COLON) {
+ break;
+ }
case T_INTERFACE:
// Abstract class, class, interface or trait found
@@ -135,7 +139,6 @@ class ClassFileLocator extends FilterIterator
} else {
$namespace = null;
}
-
}
$class = (null === $namespace) ? $content : $namespace . '\\' . $content;
$file->addClass($class);
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/File/Exception/BadMethodCallException.php
index 87a60ab676e..0e6ac0349c8 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Exception/BadMethodCallException.php
@@ -3,12 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\File\Exception;
-class BadMethodCallException extends \BadMethodCallException implements
- ExceptionInterface
-{}
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/File/Exception/ExceptionInterface.php
index 851724f2ab2..984da8b6f40 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/File/Exception/InvalidArgumentException.php
index 83ae6a93e8e..c9132efdee6 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,6 @@ namespace Zend\File\Exception;
/**
* Exception class raised when invalid arguments are discovered
*/
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/File/Exception/RuntimeException.php
index 533cb0f0cb1..bd9ae27b72d 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Exception/RuntimeException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\File\Exception;
-class RuntimeException
- extends \RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/PhpClassFile.php b/vendor/zendframework/zendframework/library/Zend/File/PhpClassFile.php
index 82503cf361c..800c859caf0 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/PhpClassFile.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/PhpClassFile.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
index 5bcf12b76a8..90959b05f7f 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,7 @@ use Zend\File\Transfer;
use Zend\File\Transfer\Exception;
use Zend\Filter;
use Zend\Filter\Exception as FilterException;
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface as Translator;
use Zend\I18n\Translator\TranslatorAwareInterface;
use Zend\Stdlib\ErrorHandler;
use Zend\Validator;
@@ -275,7 +275,7 @@ abstract class AbstractAdapter implements TranslatorAwareInterface
* Adds a new validator for this class
*
* @param string|Validator\ValidatorInterface $validator Type of validator to add
- * @param bool $breakChainOnFailure If the validation chain should stop an failure
+ * @param bool $breakChainOnFailure If the validation chain should stop a failure
* @param string|array $options Options to set for the validator
* @param string|array $files Files to limit this validator to
* @return AbstractAdapter
@@ -369,14 +369,18 @@ abstract class AbstractAdapter implements TranslatorAwareInterface
break;
case (1 <= $argc):
$validator = array_shift($validatorInfo);
+ // fall-through
case (2 <= $argc):
$breakChainOnFailure = array_shift($validatorInfo);
+ // fall-through
case (3 <= $argc):
$options = array_shift($validatorInfo);
+ // fall-through
case (4 <= $argc):
if (!empty($validatorInfo)) {
$file = array_shift($validatorInfo);
}
+ // fall-through
default:
$this->addValidator($validator, $breakChainOnFailure, $options, $file);
break;
@@ -523,13 +527,13 @@ abstract class AbstractAdapter implements TranslatorAwareInterface
foreach ($options as $name => $value) {
foreach ($file as $key => $content) {
switch ($name) {
- case 'magicFile' :
+ case 'magicFile':
$this->files[$key]['options'][$name] = (string) $value;
break;
- case 'ignoreNoFile' :
- case 'useByteString' :
- case 'detectInfos' :
+ case 'ignoreNoFile':
+ case 'useByteString':
+ case 'detectInfos':
$this->files[$key]['options'][$name] = (bool) $value;
break;
@@ -596,7 +600,7 @@ abstract class AbstractAdapter implements TranslatorAwareInterface
}
$checkit .= DIRECTORY_SEPARATOR . $content['name'];
- $validator->addFile($checkit);
+ $validator->addFile($checkit);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/FilterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/FilterPluginManager.php
index 28da7ee4a08..8179eef19f3 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/FilterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/FilterPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/Http.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/Http.php
index 827420c7d1c..b7c2908be47 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/Http.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/Http.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -333,7 +333,6 @@ class Http extends AbstractAdapter
if (!empty($id)) {
if (static::isApcAvailable()) {
-
$call = call_user_func(static::$callbackApc, ini_get('apc.rfc1867_prefix') . $id);
if (is_array($call)) {
$status = $call + $status;
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
index f24f5d459c2..c6912c01b96 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/BadMethodCallException.php
index 4fb1a5acca3..ed9d0170eef 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,6 @@ namespace Zend\File\Transfer\Exception;
use Zend\File\Exception;
-class BadMethodCallException extends Exception\BadMethodCallException implements
- ExceptionInterface
-{}
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/ExceptionInterface.php
index accae642f7f..827196bf186 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,8 +15,6 @@ use Zend\File\Exception\ExceptionInterface as FileException;
* Exception class for Zend\File\Transfer
*
*/
-interface ExceptionInterface
- extends FileException
+interface ExceptionInterface extends FileException
{
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/InvalidArgumentException.php
index 064acb03af7..63999e30ad2 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,6 @@ namespace Zend\File\Transfer\Exception;
use Zend\File\Exception;
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
- ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
index 412b894ff0a..8a358463f25 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\File\Transfer\Exception;
class PhpEnvironmentException extends RuntimeException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/RuntimeException.php
index 045d424c5ac..29dcc843c16 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,6 @@ namespace Zend\File\Transfer\Exception;
use Zend\File\Exception;
-class RuntimeException extends Exception\RuntimeException implements
- ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Transfer.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Transfer.php
index bdd44c37ebb..28350019377 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Transfer.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Transfer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/File/composer.json b/vendor/zendframework/zendframework/library/Zend/File/composer.json
index c32a985a6da..d3d86cea94b 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/File/composer.json
@@ -6,6 +6,7 @@
"zf2",
"file"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\File\\": ""
@@ -13,13 +14,23 @@
},
"target-dir": "Zend/File",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-filter": "self.version",
+ "zendframework/zend-i18n": "self.version",
+ "zendframework/zend-validator": "self.version"
+ },
+ "suggest": {
+ "zendframework/zend-filter": "Zend\\Filter component",
+ "zendframework/zend-i18n": "Zend\\I18n component",
+ "zendframework/zend-validator": "Zend\\Validator component"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/AbstractFilter.php b/vendor/zendframework/zendframework/library/Zend/Filter/AbstractFilter.php
index a52bcfa7390..138a74e8158 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/AbstractFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/AbstractFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -52,10 +52,14 @@ abstract class AbstractFilter implements FilterInterface
} elseif (array_key_exists($key, $this->options)) {
$this->options[$key] = $value;
} else {
- throw new Exception\InvalidArgumentException(sprintf(
- 'The option "%s" does not have a matching %s setter method or options[%s] array key',
- $key, $setter, $key
- ));
+ throw new Exception\InvalidArgumentException(
+ sprintf(
+ 'The option "%s" does not have a matching %s setter method or options[%s] array key',
+ $key,
+ $setter,
+ $key
+ )
+ );
}
}
return $this;
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/AbstractUnicode.php b/vendor/zendframework/zendframework/library/Zend/Filter/AbstractUnicode.php
index 685608f7d7e..b67c8fda26c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/AbstractUnicode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/AbstractUnicode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/BaseName.php b/vendor/zendframework/zendframework/library/Zend/Filter/BaseName.php
index 6391286cba8..bdbb0b0d5f0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/BaseName.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/BaseName.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,29 +17,17 @@ class BaseName extends AbstractFilter
* Returns basename($value).
*
* If the value provided is non-scalar, the value will remain unfiltered
- * and an E_USER_WARNING will be raised indicating it's unfilterable.
*
* @param string $value
* @return string|mixed
*/
public function filter($value)
{
- if (null === $value) {
- return null;
- }
-
if (!is_scalar($value)) {
- trigger_error(
- sprintf(
- '%s expects parameter to be scalar, "%s" given; cannot filter',
- __METHOD__,
- (is_object($value) ? get_class($value) : gettype($value))
- ),
- E_USER_WARNING
- );
return $value;
}
+ $value = (string) $value;
- return basename((string) $value);
+ return basename($value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php b/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php
index 4e4ea1fed17..87dc04a6b1d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -67,10 +67,7 @@ class Boolean extends AbstractFilter
}
if (is_array($typeOrOptions)) {
- if (isset($typeOrOptions['type'])
- || isset($typeOrOptions['casting'])
- || isset($typeOrOptions['translations']))
- {
+ if (isset($typeOrOptions['type']) || isset($typeOrOptions['casting']) || isset($typeOrOptions['translations'])) {
$this->setOptions($typeOrOptions);
} else {
$this->setType($typeOrOptions);
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Filter/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Callback.php b/vendor/zendframework/zendframework/library/Zend/Filter/Callback.php
index 3fbb00e64dd..fea37c4913a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Callback.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Callback.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -67,7 +67,7 @@ class Callback extends AbstractFilter
/**
* Sets parameters for the callback
*
- * @param mixed $params
+ * @param array $params
* @return self
*/
public function setCallbackParams($params)
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php
index 4b04f925971..d33de12a436 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -201,6 +201,10 @@ class Compress extends AbstractFilter
*/
public function filter($value)
{
+ if (!is_string($value)) {
+ return $value;
+ }
+
return $this->getAdapter()->compress($value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
index b97e68cf123..352c2dcbcba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php
index 79716118b30..f0f4341c39a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Bz2.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php
index cf4e5f3cb17..6947ffd389a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php
index aa0721af257..6663c3e125e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Gz.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Lzf.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Lzf.php
index ea4fd0c60d5..5e6b16efa97 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Lzf.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Lzf.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Rar.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Rar.php
index f8fb845884b..39eb36c9738 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Rar.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Rar.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Snappy.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Snappy.php
index 33a9c616274..d6214e94f4c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Snappy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Snappy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Tar.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Tar.php
index 16ca08e2e65..0addc7db66d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Tar.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Tar.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -45,7 +45,8 @@ class Tar extends AbstractCompressionAlgorithm
if (!class_exists('Archive_Tar')) {
throw new Exception\ExtensionNotLoadedException(
'This filter needs PEAR\'s Archive_Tar component. '
- . 'Ensure loading Archive_Tar (registering autoload or require_once)');
+ . 'Ensure loading Archive_Tar (registering autoload or require_once)'
+ );
}
parent::__construct($options);
@@ -126,16 +127,16 @@ class Tar extends AbstractCompressionAlgorithm
*/
public function setMode($mode)
{
- $mode = ucfirst(strtolower($mode));
- if (($mode != 'Bz2') && ($mode != 'Gz')) {
+ $mode = strtolower($mode);
+ if (($mode != 'bz2') && ($mode != 'gz')) {
throw new Exception\InvalidArgumentException("The mode '$mode' is unknown");
}
- if (($mode == 'Bz2') && (!extension_loaded('bz2'))) {
+ if (($mode == 'bz2') && (!extension_loaded('bz2'))) {
throw new Exception\ExtensionNotLoadedException('This mode needs the bz2 extension');
}
- if (($mode == 'Gz') && (!extension_loaded('zlib'))) {
+ if (($mode == 'gz') && (!extension_loaded('zlib'))) {
throw new Exception\ExtensionNotLoadedException('This mode needs the zlib extension');
}
@@ -171,10 +172,9 @@ class Tar extends AbstractCompressionAlgorithm
if (is_dir($content)) {
// collect all file infos
foreach (new RecursiveIteratorIterator(
- new RecursiveDirectoryIterator($content, RecursiveDirectoryIterator::KEY_AS_PATHNAME),
- RecursiveIteratorIterator::SELF_FIRST
- ) as $directory => $info
- ) {
+ new RecursiveDirectoryIterator($content, RecursiveDirectoryIterator::KEY_AS_PATHNAME),
+ RecursiveIteratorIterator::SELF_FIRST
+ ) as $directory => $info) {
if ($info->isFile()) {
$file[] = $directory;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Zip.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Zip.php
index 81403534212..27781d2c160 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Zip.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Zip.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -184,13 +184,12 @@ class Zip extends AbstractCompressionAlgorithm
*/
public function decompress($content)
{
- $archive = $this->getArchive();
+ $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content));
if (empty($archive) || !file_exists($archive)) {
throw new Exception\RuntimeException('ZIP Archive not found');
}
- $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content));
$zip = new ZipArchive();
$res = $zip->open($archive);
@@ -229,76 +228,76 @@ class Zip extends AbstractCompressionAlgorithm
public function errorString($error)
{
switch ($error) {
- case ZipArchive::ER_MULTIDISK :
+ case ZipArchive::ER_MULTIDISK:
return 'Multidisk ZIP Archives not supported';
- case ZipArchive::ER_RENAME :
+ case ZipArchive::ER_RENAME:
return 'Failed to rename the temporary file for ZIP';
- case ZipArchive::ER_CLOSE :
+ case ZipArchive::ER_CLOSE:
return 'Failed to close the ZIP Archive';
- case ZipArchive::ER_SEEK :
+ case ZipArchive::ER_SEEK:
return 'Failure while seeking the ZIP Archive';
- case ZipArchive::ER_READ :
+ case ZipArchive::ER_READ:
return 'Failure while reading the ZIP Archive';
- case ZipArchive::ER_WRITE :
+ case ZipArchive::ER_WRITE:
return 'Failure while writing the ZIP Archive';
- case ZipArchive::ER_CRC :
+ case ZipArchive::ER_CRC:
return 'CRC failure within the ZIP Archive';
- case ZipArchive::ER_ZIPCLOSED :
+ case ZipArchive::ER_ZIPCLOSED:
return 'ZIP Archive already closed';
- case ZipArchive::ER_NOENT :
+ case ZipArchive::ER_NOENT:
return 'No such file within the ZIP Archive';
- case ZipArchive::ER_EXISTS :
+ case ZipArchive::ER_EXISTS:
return 'ZIP Archive already exists';
- case ZipArchive::ER_OPEN :
+ case ZipArchive::ER_OPEN:
return 'Can not open ZIP Archive';
- case ZipArchive::ER_TMPOPEN :
+ case ZipArchive::ER_TMPOPEN:
return 'Failure creating temporary ZIP Archive';
- case ZipArchive::ER_ZLIB :
+ case ZipArchive::ER_ZLIB:
return 'ZLib Problem';
- case ZipArchive::ER_MEMORY :
+ case ZipArchive::ER_MEMORY:
return 'Memory allocation problem while working on a ZIP Archive';
- case ZipArchive::ER_CHANGED :
+ case ZipArchive::ER_CHANGED:
return 'ZIP Entry has been changed';
- case ZipArchive::ER_COMPNOTSUPP :
+ case ZipArchive::ER_COMPNOTSUPP:
return 'Compression method not supported within ZLib';
- case ZipArchive::ER_EOF :
+ case ZipArchive::ER_EOF:
return 'Premature EOF within ZIP Archive';
- case ZipArchive::ER_INVAL :
+ case ZipArchive::ER_INVAL:
return 'Invalid argument for ZLIB';
- case ZipArchive::ER_NOZIP :
+ case ZipArchive::ER_NOZIP:
return 'Given file is no zip archive';
- case ZipArchive::ER_INTERNAL :
+ case ZipArchive::ER_INTERNAL:
return 'Internal error while working on a ZIP Archive';
- case ZipArchive::ER_INCONS :
+ case ZipArchive::ER_INCONS:
return 'Inconsistent ZIP archive';
- case ZipArchive::ER_REMOVE :
+ case ZipArchive::ER_REMOVE:
return 'Can not remove ZIP Archive';
- case ZipArchive::ER_DELETED :
+ case ZipArchive::ER_DELETED:
return 'ZIP Entry has been deleted';
- default :
+ default:
return 'Unknown error within ZIP Archive';
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php b/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
index 740da2d0885..091db493038 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -23,7 +23,7 @@ class DateTimeFormatter extends AbstractFilter
/**
* Sets filter options
*
- * @param array|Traversable $options
+ * @param array|\Traversable $options
*/
public function __construct($options = null)
{
@@ -41,13 +41,14 @@ class DateTimeFormatter extends AbstractFilter
public function setFormat($format)
{
$this->format = $format;
+
return $this;
}
/**
* Filter a datetime string by normalizing it to the filters specified format
*
- * @param string $value
+ * @param DateTime|string|integer $value
* @throws Exception\InvalidArgumentException
* @return string
*/
@@ -60,6 +61,10 @@ class DateTimeFormatter extends AbstractFilter
throw new Exception\InvalidArgumentException('Invalid date string provided', $e->getCode(), $e);
}
+ if ($result === false) {
+ return $value;
+ }
+
return $result;
}
@@ -73,7 +78,14 @@ class DateTimeFormatter extends AbstractFilter
{
if ($value === '' || $value === null) {
return $value;
- } elseif (is_int($value)) {
+ }
+
+ if (!is_string($value) && !is_int($value) && !$value instanceof DateTime) {
+ return $value;
+ }
+
+ if (is_int($value)) {
+ //timestamp
$value = new DateTime('@' . $value);
} elseif (!$value instanceof DateTime) {
$value = new DateTime($value);
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Decompress.php b/vendor/zendframework/zendframework/library/Zend/Filter/Decompress.php
index 9b821bf1eb4..440700090d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Decompress.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Decompress.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -24,7 +24,7 @@ class Decompress extends Compress
*/
public function __invoke($value)
{
- return $this->getAdapter()->decompress($value);
+ return $this->filter($value);
}
/**
@@ -37,6 +37,10 @@ class Decompress extends Compress
*/
public function filter($value)
{
+ if (!is_string($value) && $value !== null) {
+ return $value;
+ }
+
return $this->getAdapter()->decompress($value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Decrypt.php b/vendor/zendframework/zendframework/library/Zend/Filter/Decrypt.php
index 360c479a37e..aa2b7b6678a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Decrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Decrypt.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -24,6 +24,10 @@ class Decrypt extends Encrypt
*/
public function filter($value)
{
+ if (!is_string($value)) {
+ return $value;
+ }
+
return $this->adapter->decrypt($value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Digits.php b/vendor/zendframework/zendframework/library/Zend/Filter/Digits.php
index 325bb758ba9..cb68407bfd4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Digits.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Digits.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,29 +18,20 @@ class Digits extends AbstractFilter
*
* Returns the string $value, removing all but digit characters
*
- * If the value provided is non-scalar, the value will remain unfiltered
- * and an E_USER_WARNING will be raised indicating it's unfilterable.
+ * If the value provided is not integer, float or string, the value will remain unfiltered
*
* @param string $value
* @return string|mixed
*/
public function filter($value)
{
- if (null === $value) {
- return null;
+ if (is_int($value)) {
+ return (string) $value;
}
-
- if (!is_scalar($value)) {
- trigger_error(
- sprintf(
- '%s expects parameter to be scalar, "%s" given; cannot filter',
- __METHOD__,
- (is_object($value) ? get_class($value) : gettype($value))
- ),
- E_USER_WARNING
- );
+ if (! (is_float($value) || is_string($value))) {
return $value;
}
+ $value = (string) $value;
if (!StringUtils::hasPcreUnicodeSupport()) {
// POSIX named classes are not supported, use alternative 0-9 match
@@ -53,6 +44,6 @@ class Digits extends AbstractFilter
$pattern = '/[\p{^N}]/';
}
- return preg_replace($pattern, '', (string) $value);
+ return preg_replace($pattern, '', $value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Dir.php b/vendor/zendframework/zendframework/library/Zend/Filter/Dir.php
index 16e580e7dc8..c0ba268b132 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Dir.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Dir.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -21,6 +21,11 @@ class Dir extends AbstractFilter
*/
public function filter($value)
{
- return dirname((string) $value);
+ if (!is_scalar($value)) {
+ return $value;
+ }
+ $value = (string) $value;
+
+ return dirname($value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt.php b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt.php
index 93dc87a134e..479a12bd543 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -19,6 +19,8 @@ class Encrypt extends AbstractFilter
{
/**
* Encryption adapter
+ *
+ * @param Encrypt\EncryptionAlgorithmInterface
*/
protected $adapter;
@@ -38,6 +40,7 @@ class Encrypt extends AbstractFilter
/**
* Returns the name of the set adapter
+ * @todo inconsitent: get adapter should return the adapter and not the name
*
* @return string
*/
@@ -73,17 +76,20 @@ class Encrypt extends AbstractFilter
$adapter = 'Zend\Filter\Encrypt\\' . ucfirst($adapter);
} elseif (!class_exists($adapter)) {
throw new Exception\DomainException(
- sprintf('%s expects a valid registry class name; received "%s", which did not resolve',
+ sprintf(
+ '%s expects a valid registry class name; received "%s", which did not resolve',
__METHOD__,
$adapter
- ));
+ )
+ );
}
$this->adapter = new $adapter($options);
if (!$this->adapter instanceof Encrypt\EncryptionAlgorithmInterface) {
throw new Exception\InvalidArgumentException(
"Encoding adapter '" . $adapter
- . "' does not implement Zend\\Filter\\Encrypt\\EncryptionAlgorithmInterface");
+ . "' does not implement Zend\\Filter\\Encrypt\\EncryptionAlgorithmInterface"
+ );
}
return $this;
@@ -117,6 +123,10 @@ class Encrypt extends AbstractFilter
*/
public function filter($value)
{
+ if (!is_string($value) && !is_numeric($value)) {
+ return $value;
+ }
+
return $this->adapter->encrypt($value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/BlockCipher.php b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/BlockCipher.php
index 5f625c83ca2..b51a608b3cf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/BlockCipher.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/BlockCipher.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -215,7 +215,7 @@ class BlockCipher implements EncryptionAlgorithmInterface
}
/**
- * Sets a internal compression for values to encrypt
+ * Sets an internal compression for values to encrypt
*
* @param string|array $compression
* @return self
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php
index faf0c518ccc..31257bc3cad 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/Openssl.php b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/Openssl.php
index fe6b11342d8..141e4a391fc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/Openssl.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/Openssl.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -290,7 +290,7 @@ class Openssl implements EncryptionAlgorithmInterface
}
/**
- * Sets a internal compression for values to encrypt
+ * Sets an internal compression for values to encrypt
*
* @param string|array $compression
* @return self
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/BadMethodCallException.php
index ae0d3f843c2..54bf48410eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/DomainException.php
index 4a37739b6bc..8457b938c1f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/DomainException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/ExceptionInterface.php
index dd0be926b86..013925569a3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/ExtensionNotLoadedException.php
index 7a24b86c786..ef383df464c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/InvalidArgumentException.php
index 52b1c8ab12e..25d34607bf8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/RuntimeException.php
index d8b160be7f3..7131d94c86e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/Decrypt.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/Decrypt.php
index c5970d53355..95f12bc8370 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/Decrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/Decrypt.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -58,9 +58,18 @@ class Decrypt extends Filter\Decrypt
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
// An uploaded file? Retrieve the 'tmp_name'
- $isFileUpload = (is_array($value) && isset($value['tmp_name']));
- if ($isFileUpload) {
+ $isFileUpload = false;
+ if (is_array($value)) {
+ if (!isset($value['tmp_name'])) {
+ return $value;
+ }
+
+ $isFileUpload = true;
$uploadData = $value;
$value = $value['tmp_name'];
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/Encrypt.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/Encrypt.php
index 446126118ca..5638291a92a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/Encrypt.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/Encrypt.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -58,9 +58,18 @@ class Encrypt extends Filter\Encrypt
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
// An uploaded file? Retrieve the 'tmp_name'
- $isFileUpload = (is_array($value) && isset($value['tmp_name']));
- if ($isFileUpload) {
+ $isFileUpload = false;
+ if (is_array($value)) {
+ if (!isset($value['tmp_name'])) {
+ return $value;
+ }
+
+ $isFileUpload = true;
$uploadData = $value;
$value = $value['tmp_name'];
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/LowerCase.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/LowerCase.php
index d903a51f3a4..b730355d4dc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/LowerCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/LowerCase.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -26,9 +26,18 @@ class LowerCase extends StringToLower
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
// An uploaded file? Retrieve the 'tmp_name'
- $isFileUpload = (is_array($value) && isset($value['tmp_name']));
- if ($isFileUpload) {
+ $isFileUpload = false;
+ if (is_array($value)) {
+ if (!isset($value['tmp_name'])) {
+ return $value;
+ }
+
+ $isFileUpload = true;
$uploadData = $value;
$value = $value['tmp_name'];
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
index 41e363eda87..8b04a429688 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -160,9 +160,18 @@ class Rename extends Filter\AbstractFilter
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
// An uploaded file? Retrieve the 'tmp_name'
- $isFileUpload = (is_array($value) && isset($value['tmp_name']));
- if ($isFileUpload) {
+ $isFileUpload = false;
+ if (is_array($value)) {
+ if (!isset($value['tmp_name'])) {
+ return $value;
+ }
+
+ $isFileUpload = true;
$uploadData = $value;
$value = $value['tmp_name'];
}
@@ -216,15 +225,15 @@ class Rename extends Filter\AbstractFilter
$files['source'] = (string) $value;
break;
- case 'target' :
+ case 'target':
$files['target'] = (string) $value;
break;
- case 'overwrite' :
+ case 'overwrite':
$files['overwrite'] = (bool) $value;
break;
- case 'randomize' :
+ case 'randomize':
$files['randomize'] = (bool) $value;
break;
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php
index 09d42ec9095..52aacce3f55 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -159,9 +159,18 @@ class RenameUpload extends AbstractFilter
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
// An uploaded file? Retrieve the 'tmp_name'
- $isFileUpload = (is_array($value) && isset($value['tmp_name']));
- if ($isFileUpload) {
+ $isFileUpload = false;
+ if (is_array($value)) {
+ if (!isset($value['tmp_name'])) {
+ return $value;
+ }
+
+ $isFileUpload = true;
$uploadData = $value;
$sourceFile = $value['tmp_name'];
} else {
@@ -209,7 +218,8 @@ class RenameUpload extends AbstractFilter
if (!$result || null !== $warningException) {
throw new Exception\RuntimeException(
sprintf("File '%s' could not be renamed. An error occurred while processing the file.", $sourceFile),
- 0, $warningException
+ 0,
+ $warningException
);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/File/UpperCase.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/UpperCase.php
index dde7930d08a..fe2af6df4ad 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/File/UpperCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/File/UpperCase.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -26,9 +26,18 @@ class UpperCase extends StringToUpper
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
// An uploaded file? Retrieve the 'tmp_name'
- $isFileUpload = (is_array($value) && isset($value['tmp_name']));
- if ($isFileUpload) {
+ $isFileUpload = false;
+ if (is_array($value)) {
+ if (!isset($value['tmp_name'])) {
+ return $value;
+ }
+
+ $isFileUpload = true;
$uploadData = $value;
$value = $value['tmp_name'];
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/FilterChain.php b/vendor/zendframework/zendframework/library/Zend/Filter/FilterChain.php
index 4202ffbe11c..17ed93c5cab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/FilterChain.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/FilterChain.php
@@ -3,13 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Filter;
use Countable;
+use Traversable;
use Zend\Stdlib\PriorityQueue;
class FilterChain extends AbstractFilter implements Countable
@@ -52,7 +53,7 @@ class FilterChain extends AbstractFilter implements Countable
*/
public function setOptions($options)
{
- if (!is_array($options) && !$options instanceof \Traversable) {
+ if (!is_array($options) && !$options instanceof Traversable) {
throw new Exception\InvalidArgumentException(sprintf(
'Expected array or Traversable; received "%s"',
(is_object($options) ? get_class($options) : gettype($options))
@@ -240,7 +241,7 @@ class FilterChain extends AbstractFilter implements Countable
*
* Plugin manager (property 'plugins') cannot
* be serialized. On wakeup the property remains unset
- * and next invokation to getPluginManager() sets
+ * and next invocation to getPluginManager() sets
* the default plugin manager instance (FilterPluginManager).
*/
public function __sleep()
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/FilterInterface.php b/vendor/zendframework/zendframework/library/Zend/Filter/FilterInterface.php
index 2b3c163538a..a3a0c41064c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/FilterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/FilterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/FilterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Filter/FilterPluginManager.php
index f01248eb43f..d556bf72a05 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/FilterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/FilterPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -58,6 +58,7 @@ class FilterPluginManager extends AbstractPluginManager
'int' => 'Zend\Filter\Int',
'null' => 'Zend\Filter\Null',
'numberformat' => 'Zend\I18n\Filter\NumberFormat',
+ 'numberparse' => 'Zend\I18n\Filter\NumberParse',
'pregreplace' => 'Zend\Filter\PregReplace',
'realpath' => 'Zend\Filter\RealPath',
'stringtolower' => 'Zend\Filter\StringToLower',
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php b/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php
index 2b249f2059a..a77ba6ed4f7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -97,7 +97,6 @@ class HtmlEntities extends AbstractFilter
return $this;
}
-
/**
* Get encoding
*
@@ -105,7 +104,7 @@ class HtmlEntities extends AbstractFilter
*/
public function getEncoding()
{
- return $this->encoding;
+ return $this->encoding;
}
/**
@@ -174,7 +173,6 @@ class HtmlEntities extends AbstractFilter
* equivalents where they exist
*
* If the value provided is non-scalar, the value will remain unfiltered
- * and an E_USER_WARNING will be raised indicating it's unfilterable.
*
* @param string $value
* @return string|mixed
@@ -182,29 +180,18 @@ class HtmlEntities extends AbstractFilter
*/
public function filter($value)
{
- if (null === $value) {
- return null;
- }
-
if (!is_scalar($value)) {
- trigger_error(
- sprintf(
- '%s expects parameter to be scalar, "%s" given; cannot filter',
- __METHOD__,
- (is_object($value) ? get_class($value) : gettype($value))
- ),
- E_USER_WARNING
- );
return $value;
}
+ $value = (string) $value;
- $filtered = htmlentities((string) $value, $this->getQuoteStyle(), $this->getEncoding(), $this->getDoubleQuote());
- if (strlen((string) $value) && !strlen($filtered)) {
+ $filtered = htmlentities($value, $this->getQuoteStyle(), $this->getEncoding(), $this->getDoubleQuote());
+ if (strlen($value) && !strlen($filtered)) {
if (!function_exists('iconv')) {
throw new Exception\DomainException('Encoding mismatch has resulted in htmlentities errors');
}
$enc = $this->getEncoding();
- $value = iconv('', $this->getEncoding() . '//IGNORE', (string) $value);
+ $value = iconv('', $this->getEncoding() . '//IGNORE', $value);
$filtered = htmlentities($value, $this->getQuoteStyle(), $enc, $this->getDoubleQuote());
if (!strlen($filtered)) {
throw new Exception\DomainException('Encoding mismatch has resulted in htmlentities errors');
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php b/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php
index 0b18a5c77f5..dc7e07ef3e9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -217,7 +217,7 @@ class Inflector extends AbstractFilter
/**
* Set Target Reference
*
- * @param reference $target
+ * @param string $target
* @return self
*/
public function setTargetReference(&$target)
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Int.php b/vendor/zendframework/zendframework/library/Zend/Filter/Int.php
index 12c10eee44c..787d6eb2c45 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Int.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Int.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,29 +17,17 @@ class Int extends AbstractFilter
* Returns (int) $value
*
* If the value provided is non-scalar, the value will remain unfiltered
- * and an E_USER_WARNING will be raised indicating it's unfilterable.
*
* @param string $value
* @return int|mixed
*/
public function filter($value)
{
- if (null === $value) {
- return null;
- }
-
if (!is_scalar($value)) {
- trigger_error(
- sprintf(
- '%s expects parameter to be scalar, "%s" given; cannot filter',
- __METHOD__,
- (is_object($value) ? get_class($value) : gettype($value))
- ),
- E_USER_WARNING
- );
return $value;
}
+ $value = (string) $value;
- return (int) ((string) $value);
+ return (int) $value;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Null.php b/vendor/zendframework/zendframework/library/Zend/Filter/Null.php
index 6b7c653c09d..dee5857c126 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Null.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Null.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/PregReplace.php b/vendor/zendframework/zendframework/library/Zend/Filter/PregReplace.php
index 1bbbcf0a625..5eeb9476d1a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/PregReplace.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/PregReplace.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -32,9 +32,7 @@ class PregReplace extends AbstractFilter
$options = iterator_to_array($options);
}
- if (!is_array($options)
- || (!isset($options['pattern']) && !isset($options['replacement'])))
- {
+ if (!is_array($options) || (!isset($options['pattern']) && !isset($options['replacement']))) {
$args = func_get_args();
if (isset($args[0])) {
$this->setPattern($args[0]);
@@ -129,6 +127,10 @@ class PregReplace extends AbstractFilter
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
if ($this->options['pattern'] === null) {
throw new Exception\RuntimeException(sprintf(
'Filter %s does not have a valid pattern set',
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/RealPath.php b/vendor/zendframework/zendframework/library/Zend/Filter/RealPath.php
index d90766d53eb..9a20532743e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/RealPath.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/RealPath.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -67,30 +67,17 @@ class RealPath extends AbstractFilter
* Returns realpath($value)
*
* If the value provided is non-scalar, the value will remain unfiltered
- * and an E_USER_WARNING will be raised indicating it's unfilterable.
*
* @param string $value
* @return string|mixed
*/
public function filter($value)
{
- if (null === $value) {
- return null;
- }
-
- if (!is_scalar($value)) {
- trigger_error(
- sprintf(
- '%s expects parameter to be scalar, "%s" given; cannot filter',
- __METHOD__,
- (is_object($value) ? get_class($value) : gettype($value))
- ),
- E_USER_WARNING
- );
+ if (!is_string($value)) {
return $value;
}
-
$path = (string) $value;
+
if ($this->options['exists']) {
return realpath($path);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/StaticFilter.php b/vendor/zendframework/zendframework/library/Zend/Filter/StaticFilter.php
index 2847137b64b..aeb5c104e25 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/StaticFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/StaticFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/StringToLower.php b/vendor/zendframework/zendframework/library/Zend/Filter/StringToLower.php
index 1b162961cce..9bbd7122188 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/StringToLower.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/StringToLower.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -42,33 +42,21 @@ class StringToLower extends AbstractUnicode
* Returns the string $value, converting characters to lowercase as necessary
*
* If the value provided is non-scalar, the value will remain unfiltered
- * and an E_USER_WARNING will be raised indicating it's unfilterable.
*
* @param string $value
* @return string|mixed
*/
public function filter($value)
{
- if (null === $value) {
- return null;
- }
-
if (!is_scalar($value)) {
- trigger_error(
- sprintf(
- '%s expects parameter to be scalar, "%s" given; cannot filter',
- __METHOD__,
- (is_object($value) ? get_class($value) : gettype($value))
- ),
- E_USER_WARNING
- );
return $value;
}
+ $value = (string) $value;
if ($this->options['encoding'] !== null) {
- return mb_strtolower((string) $value, $this->options['encoding']);
+ return mb_strtolower($value, $this->options['encoding']);
}
- return strtolower((string) $value);
+ return strtolower($value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/StringToUpper.php b/vendor/zendframework/zendframework/library/Zend/Filter/StringToUpper.php
index 951a4f60b1f..4da55114c5a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/StringToUpper.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/StringToUpper.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -42,33 +42,21 @@ class StringToUpper extends AbstractUnicode
* Returns the string $value, converting characters to uppercase as necessary
*
* If the value provided is non-scalar, the value will remain unfiltered
- * and an E_USER_WARNING will be raised indicating it's unfilterable.
*
* @param string $value
* @return string|mixed
*/
public function filter($value)
{
- if (null === $value) {
- return null;
- }
-
if (!is_scalar($value)) {
- trigger_error(
- sprintf(
- '%s expects parameter to be scalar, "%s" given; cannot filter',
- __METHOD__,
- (is_object($value) ? get_class($value) : gettype($value))
- ),
- E_USER_WARNING
- );
return $value;
}
+ $value = (string) $value;
if ($this->options['encoding'] !== null) {
- return mb_strtoupper((string) $value, $this->options['encoding']);
+ return mb_strtoupper($value, $this->options['encoding']);
}
- return strtoupper((string) $value);
+ return strtoupper($value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/StringTrim.php b/vendor/zendframework/zendframework/library/Zend/Filter/StringTrim.php
index db6172667f6..4ec0e6ce86d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/StringTrim.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/StringTrim.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -28,9 +28,7 @@ class StringTrim extends AbstractFilter
public function __construct($charlistOrOptions = null)
{
if ($charlistOrOptions !== null) {
- if (!is_array($charlistOrOptions)
- && !$charlistOrOptions instanceof Traversable)
- {
+ if (!is_array($charlistOrOptions) && !$charlistOrOptions instanceof Traversable) {
$this->setCharList($charlistOrOptions);
} else {
$this->setOptions($charlistOrOptions);
@@ -46,10 +44,12 @@ class StringTrim extends AbstractFilter
*/
public function setCharList($charList)
{
- if (empty($charList)) {
+ if (! strlen($charList)) {
$charList = null;
}
+
$this->options['charlist'] = $charList;
+
return $this;
}
@@ -73,16 +73,16 @@ class StringTrim extends AbstractFilter
*/
public function filter($value)
{
- // Do not filter non-string values
if (!is_string($value)) {
return $value;
}
+ $value = (string) $value;
if (null === $this->options['charlist']) {
- return $this->unicodeTrim((string) $value);
+ return $this->unicodeTrim($value);
}
- return $this->unicodeTrim((string) $value, $this->options['charlist']);
+ return $this->unicodeTrim($value, $this->options['charlist']);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/StripNewlines.php b/vendor/zendframework/zendframework/library/Zend/Filter/StripNewlines.php
index 0c8a922e235..dcf4a1ea423 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/StripNewlines.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/StripNewlines.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,17 +11,19 @@ namespace Zend\Filter;
class StripNewlines extends AbstractFilter
{
-
/**
* Defined by Zend\Filter\FilterInterface
*
* Returns $value without newline control characters
*
- * @param string $value
- * @return string
+ * @param string|array $value
+ * @return string|array
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
return str_replace(array("\n", "\r"), '', $value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/StripTags.php b/vendor/zendframework/zendframework/library/Zend/Filter/StripTags.php
index 3f95f6aabee..24cc346f790 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/StripTags.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/StripTags.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -105,9 +105,8 @@ class StripTags extends AbstractFilter
$tagName = strtolower($element);
// Store the tag as allowed with no attributes
$this->tagsAllowed[$tagName] = array();
- }
- // Otherwise, if a tag was provided with attributes
- elseif (is_string($index) && (is_array($element) || is_string($element))) {
+ } elseif (is_string($index) && (is_array($element) || is_string($element))) {
+ // Otherwise, if a tag was provided with attributes
// Canonicalize the tag name
$tagName = strtolower($index);
// Canonicalize the attributes
@@ -167,7 +166,6 @@ class StripTags extends AbstractFilter
* Defined by Zend\Filter\FilterInterface
*
* If the value provided is non-scalar, the value will remain unfiltered
- * and an E_USER_WARNING will be raised indicating it's unfilterable.
*
* @todo improve docblock descriptions
* @param string $value
@@ -175,22 +173,9 @@ class StripTags extends AbstractFilter
*/
public function filter($value)
{
- if (null === $value) {
- return null;
- }
-
if (!is_scalar($value)) {
- trigger_error(
- sprintf(
- '%s expects parameter to be scalar, "%s" given; cannot filter',
- __METHOD__,
- (is_object($value) ? get_class($value) : gettype($value))
- ),
- E_USER_WARNING
- );
return $value;
}
-
$value = (string) $value;
// Strip HTML comments first
@@ -203,7 +188,7 @@ class StripTags extends AbstractFilter
if (!preg_match('/--\s*>/s', $value)) {
$value = '';
} else {
- $value = preg_replace('/<(?:!(?:--[\s\S]*?--\s*)?(>))/s', '', $value);
+ $value = preg_replace('/<(?:!(?:--[\s\S]*?--\s*)?(>))/s', '', $value);
}
$value = $start . $value;
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php b/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php
index 6dfe5840c85..894f673f528 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -84,6 +84,11 @@ class UriNormalize extends AbstractFilter
*/
public function filter($value)
{
+ if (!is_scalar($value)) {
+ return $value;
+ }
+ $value = (string) $value;
+
$defaultScheme = $this->defaultScheme ?: $this->enforcedScheme;
// Reset default scheme if it is not a known scheme
@@ -96,7 +101,6 @@ class UriNormalize extends AbstractFilter
if ($this->enforcedScheme && (!$uri->getScheme())) {
$this->enforceScheme($uri);
}
-
} catch (UriException $ex) {
// We are unable to parse / enfore scheme with the given config and input
return $value;
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php
index 2fe70d3d4ab..9c2e71c06d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Filter\Exception;
abstract class AbstractSeparator extends AbstractFilter
{
-
protected $separator = ' ';
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToDash.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToDash.php
index f2d1c3462f0..ce31683b927 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToDash.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToDash.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToSeparator.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToSeparator.php
index f50c88e39cb..e6addca6838 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToSeparator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToSeparator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,11 +16,15 @@ class CamelCaseToSeparator extends AbstractSeparator
/**
* Defined by Zend\Filter\Filter
*
- * @param string $value
- * @return string
+ * @param string|array $value
+ * @return string|array
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
if (StringUtils::hasPcreUnicodeSupport()) {
$pattern = array('#(?<=(?:\p{Lu}))(\p{Lu}\p{Ll})#', '#(?<=(?:\p{Ll}|\p{Nd}))(\p{Lu})#');
$replacement = array($this->separator . '\1', $this->separator . '\1');
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToUnderscore.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToUnderscore.php
index fb28b6c56b8..82507847611 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToUnderscore.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToUnderscore.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToCamelCase.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToCamelCase.php
index 4d211a01f14..6bf36f874f6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToCamelCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToCamelCase.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToSeparator.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToSeparator.php
index 1fd43470ee4..856d3c2d9fe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToSeparator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToSeparator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,11 +14,15 @@ class DashToSeparator extends AbstractSeparator
/**
* Defined by Zend\Filter\Filter
*
- * @param string $value
- * @return string
+ * @param string|array $value
+ * @return string|array
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
return preg_replace('#-#', $this->separator, $value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToUnderscore.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToUnderscore.php
index b7d56941156..104dedc34e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToUnderscore.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToUnderscore.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToCamelCase.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToCamelCase.php
index ce63cf31a98..7526a30f5e1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToCamelCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToCamelCase.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,11 +16,15 @@ class SeparatorToCamelCase extends AbstractSeparator
/**
* Defined by Zend\Filter\Filter
*
- * @param string $value
- * @return string
+ * @param string|array $value
+ * @return string|array
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
// a unicode safe way of converting characters to \x00\x00 notation
$pregQuotedSeparator = preg_quote($this->separator, '#');
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToDash.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToDash.php
index 3558a75bcee..d9da74d3973 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToDash.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToDash.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToSeparator.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToSeparator.php
index 90e465b455d..21713c680af 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToSeparator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToSeparator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -78,11 +78,15 @@ class SeparatorToSeparator extends AbstractFilter
*
* Returns the string $value, replacing the searched separators with the defined ones
*
- * @param string $value
- * @return string
+ * @param string|array $value
+ * @return string|array
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
if ($this->searchSeparator == null) {
throw new Exception\RuntimeException('You must provide a search separator for this filter to work.');
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToCamelCase.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToCamelCase.php
index fc9c5138fda..0c6c5be656d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToCamelCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToCamelCase.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToDash.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToDash.php
index 1a39ebec31a..816d35571f5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToDash.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToDash.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToSeparator.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToSeparator.php
index 86d35a28bed..0d55ca4eb45 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToSeparator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToSeparator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/composer.json b/vendor/zendframework/zendframework/library/Zend/Filter/composer.json
index 10454ed308a..d00f49cb9b4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/composer.json
@@ -6,6 +6,7 @@
"zf2",
"filter"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Filter\\": ""
@@ -13,22 +14,24 @@
},
"target-dir": "Zend/Filter",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
- "zendframework/zend-crypt": "self.version"
+ "zendframework/zend-crypt": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-uri": "self.version"
},
"suggest": {
+ "zendframework/zend-crypt": "Zend\\Crypt component",
"zendframework/zend-i18n": "Zend\\I18n component",
- "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter",
- "zendframework/zend-validator": "Zend\\Validator component",
- "zendframework/zend-crypt": "Zend\\Crypt component"
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+ "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractAnnotationsListener.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
index 62685edcc30..acdae220dcd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractArrayAnnotation.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractArrayAnnotation.php
index d6d8b315d77..87c2897144c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractArrayAnnotation.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractArrayAnnotation.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractArrayOrStringAnnotation.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractArrayOrStringAnnotation.php
index 04e3733a2dd..221f57bee05 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractArrayOrStringAnnotation.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractArrayOrStringAnnotation.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractStringAnnotation.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractStringAnnotation.php
index a327ae5c16b..b8e8c897ca0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractStringAnnotation.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractStringAnnotation.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AllowEmpty.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AllowEmpty.php
index eb3a0b70ef3..682dc2fca79 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AllowEmpty.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AllowEmpty.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php
index 53ca47da1f7..c6461382833 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php
@@ -3,14 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Annotation;
use ArrayObject;
-use ReflectionClass;
use Zend\Code\Annotation\AnnotationCollection;
use Zend\Code\Annotation\AnnotationManager;
use Zend\Code\Annotation\Parser;
@@ -335,7 +334,7 @@ class AnnotationBuilder implements EventManagerAwareInterface, FormFactoryAwareI
: 'Zend\Form\Element';
// Compose as a fieldset or an element, based on specification type
- if (static::isSubclassOf($type, 'Zend\Form\FieldsetInterface')) {
+ if (is_subclass_of($type, 'Zend\Form\FieldsetInterface')) {
if (!isset($formSpec['fieldsets'])) {
$formSpec['fieldsets'] = array();
}
@@ -388,22 +387,14 @@ class AnnotationBuilder implements EventManagerAwareInterface, FormFactoryAwareI
* @see https://bugs.php.net/bug.php?id=53727
* @see https://github.com/zendframework/zf2/pull/1807
*
+ * @deprecated since zf 2.3 requires PHP >= 5.3.23
+ *
* @param string $className
* @param string $type
* @return bool
*/
protected static function isSubclassOf($className, $type)
{
- if (is_subclass_of($className, $type)) {
- return true;
- }
- if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
- return false;
- }
- if (!interface_exists($type)) {
- return false;
- }
- $r = new ReflectionClass($className);
- return $r->implementsInterface($type);
+ return is_subclass_of($className, $type);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Attributes.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Attributes.php
index 2a6398f55f0..db4c5bc5be7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Attributes.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Attributes.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ComposedObject.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ComposedObject.php
index 4284c41f351..b8649f99751 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ComposedObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ComposedObject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -19,7 +19,7 @@ namespace Zend\Form\Annotation;
*
* @Annotation
*/
-class ComposedObject extends AbstractStringAnnotation
+class ComposedObject extends AbstractArrayOrStringAnnotation
{
/**
* Retrieve the composed object classname
@@ -28,6 +28,29 @@ class ComposedObject extends AbstractStringAnnotation
*/
public function getComposedObject()
{
+ if (is_array($this->value)) {
+ return $this->value['target_object'];
+ }
return $this->value;
}
+
+ /**
+ * Is this composed object a collection or not
+ *
+ * @return bool
+ */
+ public function isCollection()
+ {
+ return is_array($this->value) && isset($this->value['is_collection']) && $this->value['is_collection'];
+ }
+
+ /**
+ * Retrieve the options for the composed object
+ *
+ * @return array
+ */
+ public function getOptions()
+ {
+ return is_array($this->value) && isset($this->value['options']) ? $this->value['options'] : array();
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ElementAnnotationsListener.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ElementAnnotationsListener.php
index 1cc05ee3e90..8bfdcb495e6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ElementAnnotationsListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ElementAnnotationsListener.php
@@ -3,13 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Annotation;
use Zend\EventManager\EventManagerInterface;
+use Zend\Stdlib\ArrayObject;
/**
* Default listeners for element annotations
@@ -124,20 +125,49 @@ class ElementAnnotationsListener extends AbstractAnnotationsListener
$elementSpec = $e->getParam('elementSpec');
$filterSpec = $e->getParam('filterSpec');
- // Compose input filter into parent input filter
- $inputFilter = $specification['input_filter'];
- if (!isset($inputFilter['type'])) {
- $inputFilter['type'] = 'Zend\InputFilter\InputFilter';
- }
- $e->setParam('inputSpec', $inputFilter);
- unset($specification['input_filter']);
+ if ($annotation->isCollection()) {
+ // Compose specification as a fieldset into parent form/fieldset
+ if (!isset($specification['type'])) {
+ //use input filter provider fieldset so we can compose the input filter into the fieldset
+ //it is assumed that if someone uses a custom fieldset, they will take care of the input
+ //filtering themselves or consume the input_filter_spec option.
+ $specification['type'] = 'Zend\Form\InputFilterProviderFieldset';
+ }
+
+ $inputFilter = $specification['input_filter'];
+ if (!isset($inputFilter['type'])) {
+ $inputFilter['type'] = 'Zend\InputFilter\InputFilter';
+ }
+ unset($specification['input_filter']);
+
+ $elementSpec['spec']['type'] = 'Zend\Form\Element\Collection';
+ $elementSpec['spec']['name'] = $name;
+ $elementSpec['spec']['options'] = new ArrayObject($this->mergeOptions($elementSpec, $annotation));
+ $elementSpec['spec']['options']['target_element'] = $specification;
+ $elementSpec['spec']['options']['target_element']['options']['input_filter_spec'] = $inputFilter;
- // Compose specification as a fieldset into parent form/fieldset
- if (!isset($specification['type'])) {
- $specification['type'] = 'Zend\Form\Fieldset';
+ if (isset($specification['hydrator'])) {
+ $elementSpec['spec']['hydrator'] = $specification['hydrator'];
+ }
+ } else {
+ // Compose input filter into parent input filter
+ $inputFilter = $specification['input_filter'];
+ if (!isset($inputFilter['type'])) {
+ $inputFilter['type'] = 'Zend\InputFilter\InputFilter';
+ }
+ $e->setParam('inputSpec', $inputFilter);
+ unset($specification['input_filter']);
+
+ // Compose specification as a fieldset into parent form/fieldset
+ if (!isset($specification['type'])) {
+ $specification['type'] = 'Zend\Form\Fieldset';
+ }
+
+ // Add element spec:
+ $elementSpec['spec'] = $specification;
+ $elementSpec['spec']['name'] = $name;
+ $elementSpec['spec']['options'] = new ArrayObject($this->mergeOptions($elementSpec, $annotation));
}
- $elementSpec['spec'] = $specification;
- $elementSpec['spec']['name'] = $name;
}
/**
@@ -290,7 +320,7 @@ class ElementAnnotationsListener extends AbstractAnnotationsListener
}
$elementSpec = $e->getParam('elementSpec');
- $elementSpec['spec']['options'] = $annotation->getOptions();
+ $elementSpec['spec']['options'] = $this->mergeOptions($elementSpec, $annotation);
}
/**
@@ -362,4 +392,25 @@ class ElementAnnotationsListener extends AbstractAnnotationsListener
}
$inputSpec['validators'][] = $annotation->getValidator();
}
+
+ /**
+ * @param array|\ArrayAccess $elementSpec
+ * @param ComposedObject|Options $annotation
+ *
+ * @return array
+ */
+ private function mergeOptions($elementSpec, $annotation)
+ {
+ if (isset($elementSpec['spec']['options'])) {
+ if (is_array($elementSpec['spec']['options'])) {
+ return array_merge($elementSpec['spec']['options'], $annotation->getOptions());
+ }
+
+ if ($elementSpec['spec']['options'] instanceof ArrayObject) {
+ return array_merge($elementSpec['spec']['options']->getArrayCopy(), $annotation->getOptions());
+ }
+ }
+
+ return $annotation->getOptions();
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ErrorMessage.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ErrorMessage.php
index e9ae743c691..28c334b6394 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ErrorMessage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ErrorMessage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Exclude.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Exclude.php
index 317d976bd55..d2ba94cada0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Exclude.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Exclude.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Filter.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Filter.php
index e43b88dd739..ffe43eacb0e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Filter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Filter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Flags.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Flags.php
index d7573f7e90b..35fafb756c4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Flags.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Flags.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/FormAnnotationsListener.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/FormAnnotationsListener.php
index 4adf57866bf..9856609226b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/FormAnnotationsListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/FormAnnotationsListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Hydrator.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Hydrator.php
index c7f5e45d158..d8aa0d9f072 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Hydrator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Hydrator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Input.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Input.php
index c01e29e1648..702215980dc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Input.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Input.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/InputFilter.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/InputFilter.php
index 0ba09013fd0..c2c8abc7533 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/InputFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/InputFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Name.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Name.php
index 63927832a6a..47b7ee569f5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Name.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Name.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Object.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Object.php
index 19cfb154aa5..d2dd93bad0b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Object.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Object.php
@@ -3,20 +3,19 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Annotation;
-
/**
* Object annotation
*
* Use this annotation to specify an object to use as the bound object of a form or fieldset
*
* @Annotation
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Object extends AbstractStringAnnotation
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Options.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Options.php
index 26743b8401a..6638d5937f0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Options.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Options.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Required.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Required.php
index 666370aba10..b3f1fe9ea6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Required.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Required.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Type.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Type.php
index 9fd0f5dd11c..9acee1f1c66 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Type.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Type.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ValidationGroup.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ValidationGroup.php
index 85e5c7b14ad..4bac8da03f4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ValidationGroup.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ValidationGroup.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,7 @@ namespace Zend\Form\Annotation;
* The value should be an associative array.
*
* @Annotation
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class ValidationGroup extends AbstractArrayAnnotation
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Validator.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Validator.php
index 61cb6632711..7c8349d0939 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Validator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Validator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Form/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Form/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element.php b/vendor/zendframework/zendframework/library/Zend/Form/Element.php
index 37e9263c126..b450d116d40 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,8 @@ use Zend\Stdlib\InitializableInterface;
class Element implements
ElementAttributeRemovalInterface,
ElementInterface,
- InitializableInterface
+ InitializableInterface,
+ LabelAwareInterface
{
/**
* @var array
@@ -24,14 +25,21 @@ class Element implements
protected $attributes = array();
/**
- * @var string
+ * @var null|string
*/
protected $label;
/**
* @var array
*/
- protected $labelAttributes;
+ protected $labelAttributes = array();
+
+ /**
+ * Label specific options
+ *
+ * @var array
+ */
+ protected $labelOptions = array();
/**
* @var array Validation error messages
@@ -100,6 +108,7 @@ class Element implements
* Set options for an element. Accepted options are:
* - label: label to associate with the element
* - label_attributes: attributes to use when the label is rendered
+ * - label_options: label specific options
*
* @param array|Traversable $options
* @return Element|ElementInterface
@@ -123,6 +132,10 @@ class Element implements
$this->setLabelAttributes($options['label_attributes']);
}
+ if (isset($options['label_options'])) {
+ $this->setLabelOptions($options['label_options']);
+ }
+
$this->options = $options;
return $this;
@@ -153,6 +166,19 @@ class Element implements
return $this->options[$option];
}
+ /**
+ * Set a single option for an element
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return self
+ */
+ public function setOption($key, $value)
+ {
+ $this->options[$key] = $value;
+ return $this;
+ }
+
/**
* Set a single element attribute
*
@@ -179,9 +205,10 @@ class Element implements
*/
public function getAttribute($key)
{
- if (!array_key_exists($key, $this->attributes)) {
+ if (!isset($this->attributes[$key])) {
return null;
}
+
return $this->attributes[$key];
}
@@ -308,7 +335,7 @@ class Element implements
/**
* Retrieve the label used for this element
*
- * @return string
+ * @return null|string
*/
public function getLabel()
{
@@ -337,6 +364,117 @@ class Element implements
return $this->labelAttributes;
}
+ /**
+ * Set many label options at once
+ *
+ * Implementation will decide if this will overwrite or merge.
+ *
+ * @param array|Traversable $arrayOrTraversable
+ * @return Element|ElementInterface
+ * @throws Exception\InvalidArgumentException
+ */
+ public function setLabelOptions($arrayOrTraversable)
+ {
+ if (!is_array($arrayOrTraversable) && !$arrayOrTraversable instanceof Traversable) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects an array or Traversable argument; received "%s"',
+ __METHOD__,
+ (is_object($arrayOrTraversable) ? get_class($arrayOrTraversable) : gettype($arrayOrTraversable))
+ ));
+ }
+ foreach ($arrayOrTraversable as $key => $value) {
+ $this->setLabelOption($key, $value);
+ }
+ return $this;
+ }
+
+ /**
+ * Get label specific options
+ *
+ * @return array
+ */
+ public function getLabelOptions()
+ {
+ return $this->labelOptions;
+ }
+
+ /**
+ * Clear all label options
+ *
+ * @return Element|ElementInterface
+ */
+ public function clearLabelOptions()
+ {
+ $this->labelOptions = array();
+ return $this;
+ }
+
+ /**
+ * Remove many attributes at once
+ *
+ * @param array $keys
+ * @return ElementInterface
+ */
+ public function removeLabelOptions(array $keys)
+ {
+ foreach ($keys as $key) {
+ unset($this->labelOptions[$key]);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Set a single label optionn
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return Element|ElementInterface
+ */
+ public function setLabelOption($key, $value)
+ {
+ $this->labelOptions[$key] = $value;
+ return $this;
+ }
+
+ /**
+ * Retrieve a single label option
+ *
+ * @param $key
+ * @return mixed|null
+ */
+ public function getLabelOption($key)
+ {
+ if (!isset($this->labelOptions[$key])) {
+ return null;
+ }
+
+ return $this->labelOptions[$key];
+ }
+
+ /**
+ * Remove a single label option
+ *
+ * @param string $key
+ * @return ElementInterface
+ */
+ public function removeLabelOption($key)
+ {
+ unset($this->labelOptions[$key]);
+ return $this;
+ }
+
+ /**
+ * Does the element has a specific label option ?
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasLabelOption($key)
+ {
+ return array_key_exists($key, $this->labelOptions);
+ }
+
/**
* Set a list of messages to report when validation fails
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Button.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Button.php
index 93b9360b1de..22e6f62f5d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Button.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Button.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Captcha.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Captcha.php
index 92f43158a75..2d0d45b3985 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Captcha.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php
index 0f2b46b3b6c..9d60cdd9afb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Checkbox.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -167,11 +167,14 @@ class Checkbox extends Element implements InputProviderInterface
$spec = array(
'name' => $this->getName(),
'required' => true,
- 'validators' => array(
- $this->getValidator()
- )
);
+ if ($validator = $this->getValidator()) {
+ $spec['validators'] = array(
+ $validator,
+ );
+ }
+
return $spec;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Collection.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Collection.php
index 6d3a9253132..ff6d1e7f11e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Collection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Collection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -172,7 +172,7 @@ class Collection extends Fieldset
}
$this->object = $object;
- $this->count = count($object);
+ $this->count = count($object) > $this->count ? count($object) : $this->count;
return $this;
}
@@ -197,17 +197,31 @@ class Collection extends Fieldset
// Can't do anything with empty data
if (empty($data)) {
- $this->shouldCreateChildrenOnPrepareElement = false;
return;
}
if (!$this->allowRemove && count($data) < $this->count) {
throw new Exception\DomainException(sprintf(
- 'There are fewer elements than specified in the collection (%s). Either set the allow_remove option ' .
- 'to true, or re-submit the form.',
+ 'There are fewer elements than specified in the collection (%s). Either set the allow_remove option '
+ . 'to true, or re-submit the form.',
get_class($this)
- )
- );
+ ));
+ }
+
+ // Check to see if elements have been replaced or removed
+ foreach ($this->byName as $name => $elementOrFieldset) {
+ if (isset($data[$name])) {
+ continue;
+ }
+
+ if (!$this->allowRemove) {
+ throw new Exception\DomainException(sprintf(
+ 'Elements have been removed from the collection (%s) but the allow_remove option is not true.',
+ get_class($this)
+ ));
+ }
+
+ $this->remove($name);
}
foreach ($data as $key => $value) {
@@ -479,10 +493,13 @@ class Collection extends Fieldset
/**
* @return array
+ * @throws \Zend\Form\Exception\InvalidArgumentException
+ * @throws \Zend\Stdlib\Exception\InvalidArgumentException
+ * @throws \Zend\Form\Exception\DomainException
+ * @throws \Zend\Form\Exception\InvalidElementException
*/
public function extract()
{
-
if ($this->object instanceof Traversable) {
$this->object = ArrayUtils::iteratorToArray($this->object, false);
}
@@ -494,39 +511,34 @@ class Collection extends Fieldset
$values = array();
foreach ($this->object as $key => $value) {
+ // If a hydrator is provided, our work here is done
if ($this->hydrator) {
$values[$key] = $this->hydrator->extract($value);
- } elseif ($value instanceof $this->targetElement->object) {
- // @see https://github.com/zendframework/zf2/pull/2848
+ continue;
+ }
+
+ // If the target element is a fieldset that can accept the provided value
+ // we should clone it, inject the value and extract the data
+ if ( $this->targetElement instanceof FieldsetInterface ) {
+ if ( ! $this->targetElement->allowObjectBinding($value) ) {
+ continue;
+ }
$targetElement = clone $this->targetElement;
- $targetElement->object = $value;
+ $targetElement->setObject($value);
$values[$key] = $targetElement->extract();
if (!$this->createNewObjects() && $this->has($key)) {
- $fieldset = $this->get($key);
- if ($fieldset instanceof Fieldset && $fieldset->allowObjectBinding($value)) {
- $fieldset->setObject($value);
- }
+ $this->get($key)->setObject($value);
}
+ continue;
}
- }
-
- foreach ($values as $name => $object) {
- $fieldset = $this->addNewTargetElementInstance($name);
-
- if ($fieldset->allowObjectBinding($object)) {
- $fieldset->setObject($object);
- $values[$name] = $fieldset->extract();
- } else {
- foreach ($fieldset->fieldsets as $childFieldset) {
- $childName = $childFieldset->getName();
- if (isset($object[$childName])) {
- $childObject = $object[$childName];
- if ($childFieldset->allowObjectBinding($childObject)) {
- $childFieldset->setObject($childObject);
- $values[$name][$childName] = $childFieldset->extract();
- }
- }
+
+ // If the target element is a non-fieldset element, just use the value
+ if ( $this->targetElement instanceof ElementInterface ) {
+ $values[$key] = $value;
+ if (!$this->createNewObjects() && $this->has($key)) {
+ $this->get($key)->setValue($value);
}
+ continue;
}
}
@@ -546,6 +558,7 @@ class Collection extends Fieldset
/**
* Add a new instance of the target element
*
+ * @param string $name
* @return ElementInterface
* @throws Exception\DomainException
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Color.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Color.php
index b11a7db3a63..7de8ee97e84 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Color.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Color.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -45,7 +45,7 @@ class Color extends Element implements InputProviderInterface
/**
* Provide default input rules for this element
*
- * Attaches an email validator.
+ * Attaches a color validator.
*
* @return array
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Csrf.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Csrf.php
index 1ff15aec990..8c8bfa035a1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Csrf.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Csrf.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Date.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Date.php
index a81908b0de0..209060f37ba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Date.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Date.php
@@ -3,14 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Element;
use DateInterval;
-use Zend\Form\Element;
+use DateTimezone;
use Zend\Form\Element\DateTime as DateTimeElement;
use Zend\Validator\DateStep as DateStepValidator;
@@ -50,6 +50,7 @@ class Date extends DateTimeElement
return new DateStepValidator(array(
'format' => $format,
'baseValue' => $baseValue,
+ 'timezone' => new DateTimezone('UTC'),
'step' => new DateInterval("P{$stepValue}D"),
));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php
index 680e32e371e..d05bf486263 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -89,7 +89,7 @@ class DateSelect extends MonthSelect
/**
* @param string|array|\ArrayAccess|PhpDateTime $value
* @throws \Zend\Form\Exception\InvalidArgumentException
- * @return void|\Zend\Form\Element
+ * @return self Provides a fluent interface
*/
public function setValue($value)
{
@@ -112,6 +112,21 @@ class DateSelect extends MonthSelect
$this->yearElement->setValue($value['year']);
$this->monthElement->setValue($value['month']);
$this->dayElement->setValue($value['day']);
+
+ return $this;
+ }
+
+ /**
+ * @return String
+ */
+ public function getValue()
+ {
+ return sprintf(
+ '%s-%s-%s',
+ $this->getYearElement()->getValue(),
+ $this->getMonthElement()->getValue(),
+ $this->getDayElement()->getValue()
+ );
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTime.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTime.php
index 1a7ff598208..3ec892eda43 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTime.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTime.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeLocal.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeLocal.php
index f27cdb80cea..5e602a492dc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeLocal.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeLocal.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeSelect.php
index 8a91c63f711..a34747f89e1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTimeSelect.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -220,6 +220,10 @@ class DateTimeSelect extends DateSelect
}
}
+ if (null === $value) {
+ $value = new PhpDateTime();
+ }
+
if ($value instanceof PhpDateTime) {
$value = array(
'year' => $value->format('Y'),
@@ -243,6 +247,22 @@ class DateTimeSelect extends DateSelect
$this->secondElement->setValue($value['second']);
}
+ /**
+ * @return String
+ */
+ public function getValue()
+ {
+ return sprintf(
+ '%s-%s-%s %s:%s:%s',
+ $this->getYearElement()->getValue(),
+ $this->getMonthElement()->getValue(),
+ $this->getDayElement()->getValue(),
+ $this->getHourElement()->getValue(),
+ $this->getMinuteElement()->getValue(),
+ $this->getSecondElement()->getValue()
+ );
+ }
+
/**
* Prepare the form element (mostly used for rendering purposes)
*
@@ -294,9 +314,14 @@ class DateTimeSelect extends DateSelect
if (!isset($date['second'])) {
$date['second'] = '00';
}
- $date = sprintf('%s-%s-%s %s:%s:%s',
- $date['year'], $date['month'], $date['day'],
- $date['hour'], $date['minute'], $date['second']
+ $date = sprintf(
+ '%s-%s-%s %s:%s:%s',
+ $date['year'],
+ $date['month'],
+ $date['day'],
+ $date['hour'],
+ $date['minute'],
+ $date['second']
);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Email.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Email.php
index 69d36fb6f68..a16eb4a8887 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Email.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Email.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -116,7 +116,6 @@ class Email extends Element implements InputProviderInterface
return $this;
}
-
/**
* Provide default input rules for this element
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php
index ecfaa7e5ab0..68577826116 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Hidden.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Hidden.php
index 6d950db0235..9216c0bae08 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Hidden.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Hidden.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Image.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Image.php
index 96e50fc00d5..11f570429f1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Image.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Image.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Month.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Month.php
index 518833b1787..e831df0815a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Month.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Month.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Element;
-use Zend\Form\Element;
use Zend\Validator\DateStep as DateStepValidator;
use Zend\Validator\Regex as RegexValidator;
use Zend\Validator\ValidatorInterface;
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php
index ac26136d944..62541bf2562 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -68,7 +68,6 @@ class MonthSelect extends Element implements InputProviderInterface, ElementPrep
*/
protected $validator;
-
/**
* Constructor. Add two selects elements
*
@@ -276,6 +275,18 @@ class MonthSelect extends Element implements InputProviderInterface, ElementPrep
$this->monthElement->setValue($value['month']);
}
+ /**
+ * @return String
+ */
+ public function getValue()
+ {
+ return sprintf(
+ '%s-%s',
+ $this->getYearElement()->getValue(),
+ $this->getMonthElement()->getValue()
+ );
+ }
+
/**
* Prepare the form element (mostly used for rendering purposes)
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/MultiCheckbox.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/MultiCheckbox.php
index 4d1db7d0e60..c98ac3a83a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/MultiCheckbox.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/MultiCheckbox.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -26,6 +26,11 @@ class MultiCheckbox extends Checkbox
'type' => 'multi_checkbox',
);
+ /**
+ * @var bool
+ */
+ protected $disableInArrayValidator = false;
+
/**
* @var bool
*/
@@ -66,6 +71,19 @@ class MultiCheckbox extends Checkbox
return $this;
}
+ /**
+ * @param string $key
+ * @return self
+ */
+ public function unsetValueOption($key)
+ {
+ if (isset($this->valueOptions[$key])) {
+ unset($this->valueOptions[$key]);
+ }
+
+ return $this;
+ }
+
/**
* Set options for an element. Accepted options are:
* - label: label to associate with the element
@@ -87,6 +105,9 @@ class MultiCheckbox extends Checkbox
if (isset($this->options['options'])) {
$this->setValueOptions($this->options['options']);
}
+ if (isset($this->options['disable_inarray_validator'])) {
+ $this->setDisableInArrayValidator($this->options['disable_inarray_validator']);
+ }
return $this;
}
@@ -109,6 +130,28 @@ class MultiCheckbox extends Checkbox
return parent::setAttribute($key, $value);
}
+ /**
+ * Set the flag to allow for disabling the automatic addition of an InArray validator.
+ *
+ * @param bool $disableOption
+ * @return Select
+ */
+ public function setDisableInArrayValidator($disableOption)
+ {
+ $this->disableInArrayValidator = (bool) $disableOption;
+ return $this;
+ }
+
+ /**
+ * Get the disable in array validator flag.
+ *
+ * @return bool
+ */
+ public function disableInArrayValidator()
+ {
+ return $this->disableInArrayValidator;
+ }
+
/**
* Get validator
*
@@ -116,7 +159,7 @@ class MultiCheckbox extends Checkbox
*/
protected function getValidator()
{
- if (null === $this->validator) {
+ if (null === $this->validator && !$this->disableInArrayValidator()) {
$inArrayValidator = new InArrayValidator(array(
'haystack' => $this->getValueOptionsValues(),
'strict' => false,
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Number.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Number.php
index d17aa453c3f..a56255a81bf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Number.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Number.php
@@ -3,17 +3,17 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Element;
use Zend\Form\Element;
-use Zend\I18n\Validator\Float as NumberValidator;
use Zend\InputFilter\InputProviderInterface;
use Zend\Validator\GreaterThan as GreaterThanValidator;
use Zend\Validator\LessThan as LessThanValidator;
+use Zend\Validator\Regex as RegexValidator;
use Zend\Validator\Step as StepValidator;
class Number extends Element implements InputProviderInterface
@@ -44,9 +44,11 @@ class Number extends Element implements InputProviderInterface
}
$validators = array();
- $validators[] = new NumberValidator(array(
- 'locale' => 'en_US', // HTML5 uses "100.01" format
- ));
+ // HTML5 always transmits values in the format "1000.01", without a
+ // thousand separator. The prior use of the i18n Float validator
+ // allowed the thousand separator, which resulted in wrong numbers
+ // when casting to float.
+ $validators[] = new RegexValidator('(^-?\d*(\.\d+)?$)');
$inclusive = true;
if (isset($this->attributes['inclusive'])) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php
index 0bea1c50930..47b44947df3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Password.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Radio.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Radio.php
index 0093c1019a1..e0b1de55621 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Radio.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Radio.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -29,7 +29,7 @@ class Radio extends MultiCheckbox
*/
protected function getValidator()
{
- if (null === $this->validator) {
+ if (null === $this->validator && !$this->disableInArrayValidator()) {
$this->validator = new InArrayValidator(array(
'haystack' => $this->getValueOptionsValues(),
'strict' => false,
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Range.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Range.php
index 05fb5f98db1..c9cf8e5fe73 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Range.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Range.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -55,7 +55,6 @@ class Range extends NumberElement
'inclusive' => $inclusive
));
-
if (!isset($this->attributes['step'])
|| 'any' !== $this->attributes['step']
) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php
index cc3ea0f397d..7417f645623 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -50,6 +50,16 @@ class Select extends Element implements InputProviderInterface
*/
protected $valueOptions = array();
+ /**
+ * @var bool
+ */
+ protected $useHiddenElement = false;
+
+ /**
+ * @var string
+ */
+ protected $unselectedValue = '';
+
/**
* @return array
*/
@@ -84,6 +94,19 @@ class Select extends Element implements InputProviderInterface
return $this;
}
+ /**
+ * @param string $key
+ * @return self
+ */
+ public function unsetValueOption($key)
+ {
+ if (isset($this->valueOptions[$key])) {
+ unset($this->valueOptions[$key]);
+ }
+
+ return $this;
+ }
+
/**
* Set options for an element. Accepted options are:
* - label: label to associate with the element
@@ -115,6 +138,14 @@ class Select extends Element implements InputProviderInterface
$this->setDisableInArrayValidator($this->options['disable_inarray_validator']);
}
+ if (isset($options['use_hidden_element'])) {
+ $this->setUseHiddenElement($options['use_hidden_element']);
+ }
+
+ if (isset($options['unselected_value'])) {
+ $this->setUnselectedValue($options['unselected_value']);
+ }
+
return $this;
}
@@ -193,10 +224,7 @@ class Select extends Element implements InputProviderInterface
'strict' => false
));
- $multiple = (isset($this->attributes['multiple']))
- ? $this->attributes['multiple'] : null;
-
- if (true === $multiple || 'multiple' === $multiple) {
+ if ($this->isMultiple()) {
$validator = new ExplodeValidator(array(
'validator' => $validator,
'valueDelimiter' => null, // skip explode if only one value
@@ -209,9 +237,51 @@ class Select extends Element implements InputProviderInterface
}
/**
- * Provide default input rules for this element
+ * Do we render hidden element?
*
- * Attaches the captcha as a validator.
+ * @param bool $useHiddenElement
+ * @return Select
+ */
+ public function setUseHiddenElement($useHiddenElement)
+ {
+ $this->useHiddenElement = (bool) $useHiddenElement;
+ return $this;
+ }
+
+ /**
+ * Do we render hidden element?
+ *
+ * @return bool
+ */
+ public function useHiddenElement()
+ {
+ return $this->useHiddenElement;
+ }
+
+ /**
+ * Set the value if the select is not selected
+ *
+ * @param string $unselectedValue
+ * @return Select
+ */
+ public function setUnselectedValue($unselectedValue)
+ {
+ $this->unselectedValue = (string) $unselectedValue;
+ return $this;
+ }
+
+ /**
+ * Get the value when the select is not selected
+ *
+ * @return string
+ */
+ public function getUnselectedValue()
+ {
+ return $this->unselectedValue;
+ }
+
+ /**
+ * Provide default input rules for this element
*
* @return array
*/
@@ -222,6 +292,24 @@ class Select extends Element implements InputProviderInterface
'required' => true,
);
+ if ($this->useHiddenElement() && $this->isMultiple()) {
+ $unselectedValue = $this->getUnselectedValue();
+
+ $spec['allow_empty'] = true;
+ $spec['continue_if_empty'] = true;
+ $spec['filters'] = array(array(
+ 'name' => 'Callback',
+ 'options' => array(
+ 'callback' => function ($value) use ($unselectedValue) {
+ if ($value === $unselectedValue) {
+ $value = array();
+ }
+ return $value;
+ }
+ )
+ ));
+ }
+
if ($validator = $this->getValidator()) {
$spec['validators'] = array(
$validator,
@@ -257,4 +345,15 @@ class Select extends Element implements InputProviderInterface
{
return is_array($optionSpec) ? $optionSpec['value'] : $key;
}
+
+ /**
+ * Element has the multiple attribute
+ *
+ * @return bool
+ */
+ public function isMultiple()
+ {
+ return isset($this->attributes['multiple'])
+ && ($this->attributes['multiple'] === true || $this->attributes['multiple'] === 'multiple');
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Submit.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Submit.php
index 3f1507e8ea0..b4360721fe4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Submit.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Submit.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Text.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Text.php
index aff287622b3..a1aeb2f9bac 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Text.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Text.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Textarea.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Textarea.php
index a2fe2d3c991..82b637028cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Textarea.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Textarea.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Time.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Time.php
index cec60016725..26b1d5ed98f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Time.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Time.php
@@ -3,14 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Element;
use DateInterval;
-use Zend\Form\Element;
use Zend\Validator\DateStep as DateStepValidator;
class Time extends DateTime
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Url.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Url.php
index d951761464c..3aceca53efb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Url.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Url.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Week.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Week.php
index 8ddf250bcc4..0fec55931c6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Week.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Week.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Element;
-use Zend\Form\Element;
use Zend\Validator\DateStep as DateStepValidator;
use Zend\Validator\Regex as RegexValidator;
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/ElementAttributeRemovalInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/ElementAttributeRemovalInterface.php
index 768a48b4986..975ee4e0c06 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/ElementAttributeRemovalInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/ElementAttributeRemovalInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/ElementInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/ElementInterface.php
index 3ddb028a9fb..4fcd995e97a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/ElementInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/ElementInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -37,6 +37,15 @@ interface ElementInterface
*/
public function setOptions($options);
+ /**
+ * Set a single option for an element
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return self
+ */
+ public function setOption($key, $value);
+
/**
* get the defined options
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/ElementPrepareAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/ElementPrepareAwareInterface.php
index 1e62addd4ac..ee339057724 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/ElementPrepareAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/ElementPrepareAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/BadMethodCallException.php
index 3d641b317c3..943b2dc4670 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Exception/BadMethodCallException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Exception;
-class BadMethodCallException
- extends \BadMethodCallException
- implements ExceptionInterface
-{}
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/DomainException.php
index 642cd4553f0..1399d8cfd42 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Exception/DomainException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,4 +11,5 @@ namespace Zend\Form\Exception;
class DomainException extends \DomainException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExceptionInterface.php
index 3519a47f1ff..5fc745d6727 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExtensionNotLoadedException.php
index 8d58b282dba..02ba3fbb787 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExtensionNotLoadedException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Exception;
class ExtensionNotLoadedException extends DomainException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidArgumentException.php
index 7632be43c36..8710b8fefb8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,4 +11,5 @@ namespace Zend\Form\Exception;
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidElementException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidElementException.php
index 278dbfa89a6..981c0e54299 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidElementException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidElementException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\Exception;
class InvalidElementException extends InvalidArgumentException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/UnexpectedValueException.php
index 3c7a9e67eaf..05d47cc97eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,4 +11,5 @@ namespace Zend\Form\Exception;
class UnexpectedValueException extends \UnexpectedValueException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Factory.php b/vendor/zendframework/zendframework/library/Zend/Form/Factory.php
index 8c00e3f84da..56834f9dbaa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Factory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -335,6 +335,10 @@ class Factory
$elements = $this->validateSpecification($elements, $method);
foreach ($elements as $elementSpecification) {
+ if (null === $elementSpecification) {
+ continue;
+ }
+
$flags = isset($elementSpecification['flags']) ? $elementSpecification['flags'] : array();
$spec = isset($elementSpecification['spec']) ? $elementSpecification['spec'] : array();
@@ -438,9 +442,9 @@ class Factory
$hydrator = $this->getHydratorFromName($hydratorOrName);
}
- if (!$hydrator instanceof Hydrator\HydratorInterface) {
+ if (! isset($hydrator) || !$hydrator instanceof Hydrator\HydratorInterface) {
throw new Exception\DomainException(sprintf(
- '%s expects a valid implementation of Zend\Form\Hydrator\HydratorInterface; received "%s"',
+ '%s expects a valid implementation of Zend\Stdlib\Hydrator\HydratorInterface; received "%s"',
$method,
$hydratorOrName
));
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php b/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
index 258d5d38f8e..06225468765 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
@@ -3,13 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form;
use Traversable;
+use Zend\Code\Reflection\ClassReflection;
use Zend\Stdlib\Hydrator;
use Zend\Stdlib\Hydrator\HydratorAwareInterface;
use Zend\Stdlib\Hydrator\HydratorInterface;
@@ -68,6 +69,13 @@ class Fieldset extends Element implements FieldsetInterface
*/
protected $useAsBaseFieldset = false;
+ /**
+ * The class or interface of objects that can be bound to this fieldset.
+ *
+ * @var string
+ */
+ protected $allowedObjectBindingClass;
+
/**
* @param null|int|string $name Optional name for the element
* @param array $options Optional options for the element
@@ -94,6 +102,10 @@ class Fieldset extends Element implements FieldsetInterface
$this->setUseAsBaseFieldset($options['use_as_base_fieldset']);
}
+ if (isset($options['allowed_object_binding_class'])) {
+ $this->setAllowedObjectBindingClass($options['allowed_object_binding_class']);
+ }
+
return $this;
}
@@ -181,10 +193,10 @@ class Fieldset extends Element implements FieldsetInterface
if ($elementOrFieldset instanceof FieldsetInterface) {
$this->fieldsets[$name] = $elementOrFieldset;
- } else {
- $this->elements[$name] = $elementOrFieldset;
+ return $this;
}
+ $this->elements[$name] = $elementOrFieldset;
return $this;
}
@@ -390,17 +402,20 @@ class Fieldset extends Element implements FieldsetInterface
$valueExists = array_key_exists($name, $data);
if ($elementOrFieldset instanceof FieldsetInterface) {
- if ($valueExists && is_array($data[$name])) {
+ if ($valueExists && (is_array($data[$name]) || $data[$name] instanceof Traversable)) {
$elementOrFieldset->populateValues($data[$name]);
continue;
- } elseif ($elementOrFieldset instanceof Element\Collection) {
+ }
+
+ if ($elementOrFieldset instanceof Element\Collection) {
if ($valueExists && null !== $data[$name]) {
$elementOrFieldset->populateValues($data[$name]);
- } else {
- /* This ensures that collections with allow_remove don't re-create child
- * elements if they all were removed */
- $elementOrFieldset->populateValues(array());
+ continue;
}
+
+ /* This ensures that collections with allow_remove don't re-create child
+ * elements if they all were removed */
+ $elementOrFieldset->populateValues(array());
continue;
}
}
@@ -462,6 +477,26 @@ class Fieldset extends Element implements FieldsetInterface
return $this->object;
}
+ /**
+ * Set the class or interface of objects that can be bound to this fieldset.
+ *
+ * @param string $allowObjectBindingClass
+ */
+ public function setAllowedObjectBindingClass($allowObjectBindingClass)
+ {
+ $this->allowedObjectBindingClass = $allowObjectBindingClass;
+ }
+
+ /**
+ * Get The class or interface of objects that can be bound to this fieldset.
+ *
+ * @return string
+ */
+ public function allowedObjectBindingClass()
+ {
+ return $this->allowedObjectBindingClass;
+ }
+
/**
* Checks if the object can be set in this fieldset
*
@@ -470,7 +505,17 @@ class Fieldset extends Element implements FieldsetInterface
*/
public function allowObjectBinding($object)
{
- return ($this->object && $object instanceof $this->object);
+ $validBindingClass = false;
+ if (is_object($object) && $this->allowedObjectBindingClass()) {
+ $objectClass = ltrim($this->allowedObjectBindingClass(), '\\');
+ $reflection = new ClassReflection($object);
+ $validBindingClass = (
+ $reflection->getName() == $objectClass
+ || $reflection->isSubclassOf($this->allowedObjectBindingClass())
+ );
+ }
+
+ return ($validBindingClass || $this->object && $object instanceof $this->object);
}
/**
@@ -525,6 +570,7 @@ class Fieldset extends Element implements FieldsetInterface
*/
public function bindValues(array $values = array())
{
+ $objectData = $this->extract();
$hydrator = $this->getHydrator();
$hydratableData = array();
@@ -539,7 +585,12 @@ class Fieldset extends Element implements FieldsetInterface
$value = $element->bindValues($value);
}
- $hydratableData[$name] = $value;
+ // skip post values for disabled elements, get old value from object
+ if (!$element->getAttribute('disabled')) {
+ $hydratableData[$name] = $value;
+ } elseif (array_key_exists($name, $objectData)) {
+ $hydratableData[$name] = $objectData[$name];
+ }
}
if (!empty($hydratableData)) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FieldsetInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/FieldsetInterface.php
index f2e16b904b6..f4adab4f7a1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/FieldsetInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/FieldsetInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FieldsetPrepareAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/FieldsetPrepareAwareInterface.php
index b1584c810f2..00008f5490f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/FieldsetPrepareAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/FieldsetPrepareAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Form.php b/vendor/zendframework/zendframework/library/Zend/Form/Form.php
index 637fbf0d28b..2259a0fd20b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Form.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Form.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -129,13 +129,12 @@ class Form extends Fieldset implements FormInterface
*/
protected $validationGroup;
-
/**
* Set options for a form. Accepted options are:
* - prefer_form_input_filter: is form input filter is preferred?
*
* @param array|Traversable $options
- * @return Element|ElementInterface
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setOptions($options)
@@ -164,7 +163,7 @@ class Form extends Fieldset implements FormInterface
*
* @param array|Traversable|ElementInterface $elementOrFieldset
* @param array $flags
- * @return \Zend\Form\Fieldset|\Zend\Form\FieldsetInterface|\Zend\Form\FormInterface
+ * @return self
*/
public function add($elementOrFieldset, array $flags = array())
{
@@ -193,7 +192,7 @@ class Form extends Fieldset implements FormInterface
* available, and prepares any elements and/or fieldsets that require
* preparation.
*
- * @return Form
+ * @return self
*/
public function prepare()
{
@@ -249,7 +248,7 @@ class Form extends Fieldset implements FormInterface
* Typically, also passes data on to the composed input filter.
*
* @param array|\ArrayAccess|Traversable $data
- * @return Form|FormInterface
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setData($data)
@@ -279,7 +278,7 @@ class Form extends Fieldset implements FormInterface
*
* @param object $object
* @param int $flags
- * @return mixed|void
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function bind($object, $flags = FormInterface::VALUES_NORMALIZED)
@@ -300,7 +299,10 @@ class Form extends Fieldset implements FormInterface
$this->bindAs = $flags;
$this->setObject($object);
- $this->extract();
+
+ $data = $this->extract();
+
+ $this->populateValues($data, true);
return $this;
}
@@ -393,7 +395,7 @@ class Form extends Fieldset implements FormInterface
* Set flag indicating whether or not to bind values on successful validation
*
* @param int $bindOnValidateFlag
- * @return void|Form
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setBindOnValidate($bindOnValidateFlag)
@@ -426,7 +428,7 @@ class Form extends Fieldset implements FormInterface
* Set the base fieldset to use when hydrating
*
* @param FieldsetInterface $baseFieldset
- * @return Form
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public function setBaseFieldset(FieldsetInterface $baseFieldset)
@@ -480,6 +482,7 @@ class Form extends Fieldset implements FormInterface
if (!is_array($this->data)) {
$data = $this->extract();
+ $this->populateValues($data, true);
if (!is_array($data)) {
throw new Exception\DomainException(sprintf(
'%s is unable to validate as there is no data currently set',
@@ -558,7 +561,7 @@ class Form extends Fieldset implements FormInterface
* Typically, proxies to the composed input filter
*
* @throws Exception\InvalidArgumentException
- * @return Form|FormInterface
+ * @return self
*/
public function setValidationGroup()
{
@@ -634,12 +637,12 @@ class Form extends Fieldset implements FormInterface
}
$value = $values;
- } else {
- if (!isset($data[$key])) {
- $data[$key] = array();
- }
- $this->prepareValidationGroup($fieldset, $data[$key], $validationGroup[$key]);
}
+
+ if (!isset($data[$key])) {
+ $data[$key] = array();
+ }
+ $this->prepareValidationGroup($fieldset, $data[$key], $validationGroup[$key]);
}
}
@@ -647,7 +650,7 @@ class Form extends Fieldset implements FormInterface
* Set the input filter used by this form
*
* @param InputFilterInterface $inputFilter
- * @return FormInterface
+ * @return self
*/
public function setInputFilter(InputFilterInterface $inputFilter)
{
@@ -701,7 +704,7 @@ class Form extends Fieldset implements FormInterface
* Set flag indicating whether or not to scan elements and fieldsets for defaults
*
* @param bool $useInputFilterDefaults
- * @return Form
+ * @return self
*/
public function setUseInputFilterDefaults($useInputFilterDefaults)
{
@@ -723,7 +726,7 @@ class Form extends Fieldset implements FormInterface
* Set flag indicating whether or not to prefer the form input filter over element and fieldset defaults
*
* @param bool $preferFormInputFilter
- * @return Form
+ * @return self
*/
public function setPreferFormInputFilter($preferFormInputFilter)
{
@@ -760,7 +763,7 @@ class Form extends Fieldset implements FormInterface
$elements = $fieldset->getElements();
}
- if (!$fieldset instanceof Collection || $inputFilter instanceof CollectionInputFilter) {
+ if (!$fieldset instanceof Collection || !$fieldset->getTargetElement() instanceof FieldsetInterface || $inputFilter instanceof CollectionInputFilter) {
foreach ($elements as $element) {
$name = $element->getName();
@@ -848,7 +851,7 @@ class Form extends Fieldset implements FormInterface
* Are the form elements/fieldsets names wrapped by the form name ?
*
* @param bool $wrapElements
- * @return Form
+ * @return self
*/
public function setWrapElements($wrapElements)
{
@@ -867,7 +870,24 @@ class Form extends Fieldset implements FormInterface
}
/**
- * Recursively extract values for elements and sub-fieldsets, and populate form values
+ * {@inheritDoc}
+ *
+ * @param bool $onlyBase
+ */
+ public function populateValues($data, $onlyBase = false)
+ {
+ if ($onlyBase && $this->baseFieldset !== null) {
+ $name = $this->baseFieldset->getName();
+ if (array_key_exists($name, $data)) {
+ $this->baseFieldset->populateValues($data[$name]);
+ }
+ } else {
+ parent::populateValues($data);
+ }
+ }
+
+ /**
+ * Recursively extract values for elements and sub-fieldsets
*
* @return array
*/
@@ -876,10 +896,8 @@ class Form extends Fieldset implements FormInterface
if (null !== $this->baseFieldset) {
$name = $this->baseFieldset->getName();
$values[$name] = $this->baseFieldset->extract();
- $this->baseFieldset->populateValues($values[$name]);
} else {
$values = parent::extract();
- $this->populateValues($values);
}
return $values;
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FormAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Form/FormAbstractServiceFactory.php
index c7c9016426d..cc66abf8edb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/FormAbstractServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/FormAbstractServiceFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FormElementManager.php b/vendor/zendframework/zendframework/library/Zend/Form/FormElementManager.php
index f9ffaf9d36e..34244da4869 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/FormElementManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/FormElementManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,7 @@ namespace Zend\Form;
use Zend\ServiceManager\AbstractPluginManager;
use Zend\ServiceManager\ConfigInterface;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
use Zend\ServiceManager\ServiceLocatorInterface;
use Zend\Stdlib\InitializableInterface;
@@ -76,6 +77,7 @@ class FormElementManager extends AbstractPluginManager
parent::__construct($configuration);
$this->addInitializer(array($this, 'injectFactory'));
+ $this->addInitializer(array($this, 'callElementInit'), false);
}
/**
@@ -98,6 +100,18 @@ class FormElementManager extends AbstractPluginManager
}
}
+ /**
+ * Call init() on any element that implements InitializableInterface
+ *
+ * @internal param $element
+ */
+ public function callElementInit($element)
+ {
+ if ($element instanceof InitializableInterface) {
+ $element->init();
+ }
+ }
+
/**
* Validate the plugin
*
@@ -109,11 +123,6 @@ class FormElementManager extends AbstractPluginManager
*/
public function validatePlugin($plugin)
{
- // Hook to perform various initialization, when the element is not created through the factory
- if ($plugin instanceof InitializableInterface) {
- $plugin->init();
- }
-
if ($plugin instanceof ElementInterface) {
return; // we're okay
}
@@ -153,7 +162,7 @@ class FormElementManager extends AbstractPluginManager
* @param string $canonicalName
* @param string $requestedName
* @return null|\stdClass
- * @throws Exception\ServiceNotCreatedException If resolved class does not exist
+ * @throws ServiceNotCreatedException If resolved class does not exist
*/
protected function createFromInvokable($canonicalName, $requestedName)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FormFactoryAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/FormFactoryAwareInterface.php
index e5e6f501344..3000204f1d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/FormFactoryAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/FormFactoryAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FormFactoryAwareTrait.php b/vendor/zendframework/zendframework/library/Zend/Form/FormFactoryAwareTrait.php
index 1684ca1f069..a5cfeb12eef 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/FormFactoryAwareTrait.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/FormFactoryAwareTrait.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form;
-
trait FormFactoryAwareTrait
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FormInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/FormInterface.php
index 25acfdb100b..42337f0ff31 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/FormInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/FormInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/InputFilterProviderFieldset.php b/vendor/zendframework/zendframework/library/Zend/Form/InputFilterProviderFieldset.php
new file mode 100644
index 00000000000..74b291b18a5
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Form/InputFilterProviderFieldset.php
@@ -0,0 +1,58 @@
+<?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\Form;
+
+use Traversable;
+use Zend\InputFilter\InputFilterProviderInterface;
+
+class InputFilterProviderFieldset extends Fieldset implements InputFilterProviderInterface
+{
+ /**
+ * Holds the specification which will be returned by getInputFilterSpecification
+ *
+ * @var array|Traversable
+ */
+ protected $filterSpec = array();
+
+ /**
+ * @return array|Traversable
+ */
+ public function getInputFilterSpecification()
+ {
+ return $this->filterSpec;
+ }
+
+ /**
+ * @param array|Traversable $filterSpec
+ */
+ public function setInputFilterSpecification($filterSpec)
+ {
+ $this->filterSpec = $filterSpec;
+ }
+
+ /**
+ * Set options for a fieldset. Accepted options are:
+ * - input_filter_spec: specification to be returned by getInputFilterSpecification
+ *
+ * @param array|Traversable $options
+ * @return Element|ElementInterface
+ * @throws Exception\InvalidArgumentException
+ */
+ public function setOptions($options)
+ {
+ parent::setOptions($options);
+
+ if (isset($options['input_filter_spec'])) {
+ $this->setInputFilterSpecification($options['input_filter_spec']);
+ }
+
+ return $this;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/LabelAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/LabelAwareInterface.php
new file mode 100644
index 00000000000..9e3ba8613a2
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Form/LabelAwareInterface.php
@@ -0,0 +1,108 @@
+<?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\Form;
+
+interface LabelAwareInterface
+{
+ /**
+ * Set the label (if any) used for this element
+ *
+ * @param $label
+ * @return ElementInterface
+ */
+ public function setLabel($label);
+
+ /**
+ * Retrieve the label (if any) used for this element
+ *
+ * @return string
+ */
+ public function getLabel();
+
+ /**
+ * Set the attributes to use with the label
+ *
+ * @param array $labelAttributes
+ * @return self
+ */
+ public function setLabelAttributes(array $labelAttributes);
+
+ /**
+ * Get the attributes to use with the label
+ *
+ * @return array
+ */
+ public function getLabelAttributes();
+
+ /**
+ * Set many label options at once
+ *
+ * Implementation will decide if this will overwrite or merge.
+ *
+ * @param array|\Traversable $arrayOrTraversable
+ * @return self
+ */
+ public function setLabelOptions($arrayOrTraversable);
+
+ /**
+ * Get label specific options
+ *
+ * @return array
+ */
+ public function getLabelOptions();
+
+ /**
+ * Set a single label optionn
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return Element|ElementInterface
+ */
+ public function setLabelOption($key, $value);
+
+ /**
+ * Retrieve a single label option
+ *
+ * @param $key
+ * @return mixed|null
+ */
+ public function getLabelOption($key);
+
+ /**
+ * Remove a single label option
+ *
+ * @param string $key
+ * @return ElementInterface
+ */
+ public function removeLabelOption($key);
+
+ /**
+ * Does the element has a specific label option ?
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasLabelOption($key);
+
+ /**
+ * Remove many attributes at once
+ *
+ * @param array $keys
+ * @return ElementInterface
+ */
+ public function removeLabelOptions(array $keys);
+
+ /**
+ * Clear all label options
+ *
+ * @return Element|ElementInterface
+ */
+ public function clearLabelOptions();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/LabelAwareTrait.php b/vendor/zendframework/zendframework/library/Zend/Form/LabelAwareTrait.php
new file mode 100644
index 00000000000..9afaa7df7d7
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Form/LabelAwareTrait.php
@@ -0,0 +1,161 @@
+<?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\Form;
+
+use Traversable;
+
+trait LabelAwareTrait
+{
+ /**
+ * Label specific html attributes
+ *
+ * @var array
+ */
+ protected $labelAttributes;
+
+ /**
+ * Label specific options
+ *
+ * @var array
+ */
+ protected $labelOptions = array();
+
+ /**
+ * Set the attributes to use with the label
+ *
+ * @param array $labelAttributes
+ * @return LabelAwareInterface
+ */
+ public function setLabelAttributes(array $labelAttributes)
+ {
+ $this->labelAttributes = $labelAttributes;
+ return $this;
+ }
+
+ /**
+ * Get the attributes to use with the label
+ *
+ * @return array
+ */
+ public function getLabelAttributes()
+ {
+ return $this->labelAttributes;
+ }
+
+ /**
+ * Set many label options at once
+ *
+ * Implementation will decide if this will overwrite or merge.
+ *
+ * @param array|Traversable $arrayOrTraversable
+ * @return Element|ElementInterface
+ * @throws Exception\InvalidArgumentException
+ */
+ public function setLabelOptions($arrayOrTraversable)
+ {
+ if (!is_array($arrayOrTraversable) && !$arrayOrTraversable instanceof Traversable) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects an array or Traversable argument; received "%s"',
+ __METHOD__,
+ (is_object($arrayOrTraversable) ? get_class($arrayOrTraversable) : gettype($arrayOrTraversable))
+ ));
+ }
+ foreach ($arrayOrTraversable as $key => $value) {
+ $this->setLabelOption($key, $value);
+ }
+ return $this;
+ }
+
+ /**
+ * Get label specific options
+ *
+ * @return array
+ */
+ public function getLabelOptions()
+ {
+ return $this->labelOptions;
+ }
+
+ /**
+ * Clear all label options
+ *
+ * @return Element|ElementInterface
+ */
+ public function clearLabelOptions()
+ {
+ $this->labelOptions = array();
+ return $this;
+ }
+
+ /**
+ * Remove many attributes at once
+ *
+ * @param array $keys
+ * @return ElementInterface
+ */
+ public function removeLabelOptions(array $keys)
+ {
+ foreach ($keys as $key) {
+ unset($this->labelOptions[$key]);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Set a single label optionn
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return Element|ElementInterface
+ */
+ public function setLabelOption($key, $value)
+ {
+ $this->labelOptions[$key] = $value;
+ return $this;
+ }
+
+ /**
+ * Retrieve a single label option
+ *
+ * @param $key
+ * @return mixed|null
+ */
+ public function getLabelOption($key)
+ {
+ if (!array_key_exists($key, $this->labelOptions)) {
+ return null;
+ }
+ return $this->labelOptions[$key];
+ }
+
+ /**
+ * Remove a single label option
+ *
+ * @param string $key
+ * @return ElementInterface
+ */
+ public function removeLabelOption($key)
+ {
+ unset($this->labelOptions[$key]);
+ return $this;
+ }
+
+ /**
+ * Does the element has a specific label option ?
+ *
+ * @param string $key
+ * @return bool
+ */
+ public function hasLabelOption($key)
+ {
+ return array_key_exists($key, $this->labelOptions);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/AbstractHelper.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/AbstractHelper.php
index 856dc7a3121..163d04fba76 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/AbstractHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/AbstractHelper.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -131,6 +131,8 @@ abstract class AbstractHelper extends BaseAbstractHelper
'onvolumechange' => true,
'onwaiting' => true,
'role' => true,
+ 'aria-labelled-by' => true,
+ 'aria-described-by' => true,
'spellcheck' => true,
'style' => true,
'tabindex' => true,
@@ -181,6 +183,7 @@ abstract class AbstractHelper extends BaseAbstractHelper
public function setEncoding($encoding)
{
$this->getEscapeHtmlHelper()->setEncoding($encoding);
+ $this->getEscapeHtmlAttrHelper()->setEncoding($encoding);
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/AbstractWord.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
index b27e641f963..10d9032ff19 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/AbstractWord.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Dumb.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Dumb.php
index 1f49fe21cab..d6acd1b3e1b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Dumb.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Dumb.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Figlet.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Figlet.php
index d8273111309..a04975759bb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Figlet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Figlet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Image.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Image.php
index d848fb0edc1..f2e6fd05916 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Image.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/Image.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
index 7106dbe066a..eb7aaa5f4c0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Captcha/ReCaptcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileApcProgress.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileApcProgress.php
index c2f56074a59..737b6053254 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileApcProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileApcProgress.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileSessionProgress.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileSessionProgress.php
index 3eb1d487699..2a02859b7b8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileSessionProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileSessionProgress.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileUploadProgress.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileUploadProgress.php
index cc2107bf5e7..515d972121f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileUploadProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/File/FormFileUploadProgress.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -38,11 +38,12 @@ class FormFileUploadProgress extends FormInput
*/
public function renderHiddenId()
{
- $attributes = array();
- $attributes['id'] = 'progress_key';
- $attributes['name'] = $this->getName();
- $attributes['type'] = 'hidden';
- $attributes['value'] = $this->getValue();
+ $attributes = array(
+ 'id' => 'progress_key',
+ 'name' => $this->getName(),
+ 'type' => 'hidden',
+ 'value' => $this->getValue()
+ );
return sprintf(
'<input %s%s',
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Form.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Form.php
index 666b968dced..cdecbabb7f4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Form.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Form.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -94,9 +94,7 @@ class Form extends AbstractHelper
$attributes = array_merge($attributes, $formAttributes);
}
- $tag = sprintf('<form %s>', $this->createAttributesString($attributes));
-
- return $tag;
+ return sprintf('<form %s>', $this->createAttributesString($attributes));
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormButton.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormButton.php
index 08c13290969..19c2b191d83 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormButton.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormButton.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,7 @@ namespace Zend\Form\View\Helper;
use Zend\Form\ElementInterface;
use Zend\Form\Exception;
+use Zend\Form\LabelAwareInterface;
class FormButton extends FormInput
{
@@ -78,23 +79,29 @@ class FormButton extends FormInput
if (null === $buttonContent) {
$buttonContent = $element->getLabel();
if (null === $buttonContent) {
- throw new Exception\DomainException(sprintf(
- '%s expects either button content as the second argument, ' .
+ throw new Exception\DomainException(
+ sprintf(
+ '%s expects either button content as the second argument, ' .
'or that the element provided has a label value; neither found',
- __METHOD__
- ));
+ __METHOD__
+ )
+ );
}
if (null !== ($translator = $this->getTranslator())) {
$buttonContent = $translator->translate(
- $buttonContent, $this->getTranslatorTextDomain()
+ $buttonContent,
+ $this->getTranslatorTextDomain()
);
}
}
- $escape = $this->getEscapeHtmlHelper();
+ if (! $element instanceof LabelAwareInterface || ! $element->getLabelOption('disable_html_escape')) {
+ $escapeHtmlHelper = $this->getEscapeHtmlHelper();
+ $buttonContent = $escapeHtmlHelper($buttonContent);
+ }
- return $openTag . $escape($buttonContent) . $this->closeTag();
+ return $openTag . $buttonContent . $this->closeTag();
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCaptcha.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCaptcha.php
index 0ffb6e6d04c..7796ebef4fb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCaptcha.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCaptcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCheckbox.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCheckbox.php
index 97a1023c3f8..e5282e5ec91 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCheckbox.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCheckbox.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCollection.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCollection.php
index 4a8e7510823..fd63aa93b0a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCollection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCollection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,7 @@ use Zend\Form\Element;
use Zend\Form\ElementInterface;
use Zend\Form\Element\Collection as CollectionElement;
use Zend\Form\FieldsetInterface;
+use Zend\Form\LabelAwareInterface;
use Zend\View\Helper\AbstractHelper as BaseAbstractHelper;
class FormCollection extends AbstractHelper
@@ -25,6 +26,27 @@ class FormCollection extends AbstractHelper
*/
protected $shouldWrap = true;
+ /**
+ * This is the default wrapper that the collection is wrapped into
+ *
+ * @var string
+ */
+ protected $wrapper = '<fieldset%4$s>%2$s%1$s%3$s</fieldset>';
+
+ /**
+ * This is the default label-wrapper
+ *
+ * @var string
+ */
+ protected $labelWrapper = '<legend>%s</legend>';
+
+ /**
+ * Where shall the template-data be inserted into
+ *
+ * @var string
+ */
+ protected $templateWrapper = '<span data-template="%s"></span>';
+
/**
* The name of the default view helper that is used to render sub elements.
*
@@ -80,10 +102,8 @@ class FormCollection extends AbstractHelper
return '';
}
- $attributes = $element->getAttributes();
$markup = '';
$templateMarkup = '';
- $escapeHtmlHelper = $this->getEscapeHtmlHelper();
$elementHelper = $this->getElementHelper();
$fieldsetHelper = $this->getFieldsetHelper();
@@ -99,18 +119,16 @@ class FormCollection extends AbstractHelper
}
}
- // If $templateMarkup is not empty, use it for simplify adding new element in JavaScript
- if (!empty($templateMarkup)) {
- $markup .= $templateMarkup;
- }
-
// Every collection is wrapped by a fieldset if needed
if ($this->shouldWrap) {
+ $attributes = $element->getAttributes();
+ unset($attributes['name']);
+ $attributesString = count($attributes) ? ' ' . $this->createAttributesString($attributes) : '';
+
$label = $element->getLabel();
$legend = '';
if (!empty($label)) {
-
if (null !== ($translator = $this->getTranslator())) {
$label = $translator->translate(
$label,
@@ -118,25 +136,26 @@ class FormCollection extends AbstractHelper
);
}
- $label = $escapeHtmlHelper($label);
+ if (! $element instanceof LabelAwareInterface || ! $element->getLabelOption('disable_html_escape')) {
+ $escapeHtmlHelper = $this->getEscapeHtmlHelper();
+ $label = $escapeHtmlHelper($label);
+ }
$legend = sprintf(
- '<legend>%s</legend>',
+ $this->labelWrapper,
$label
);
}
- $attributesString = $this->createAttributesString($attributes);
- if (!empty($attributesString)) {
- $attributesString = ' ' . $attributesString;
- }
-
$markup = sprintf(
- '<fieldset%s>%s%s</fieldset>',
- $attributesString,
+ $this->wrapper,
+ $markup,
$legend,
- $markup
+ $templateMarkup,
+ $attributesString
);
+ } else {
+ $markup .= $templateMarkup;
}
return $markup;
@@ -152,18 +171,20 @@ class FormCollection extends AbstractHelper
{
$elementHelper = $this->getElementHelper();
$escapeHtmlAttribHelper = $this->getEscapeHtmlAttrHelper();
+ $fieldsetHelper = $this->getFieldsetHelper();
+
$templateMarkup = '';
$elementOrFieldset = $collection->getTemplateElement();
if ($elementOrFieldset instanceof FieldsetInterface) {
- $templateMarkup .= $this->render($elementOrFieldset);
+ $templateMarkup .= $fieldsetHelper($elementOrFieldset);
} elseif ($elementOrFieldset instanceof ElementInterface) {
$templateMarkup .= $elementHelper($elementOrFieldset);
}
return sprintf(
- '<span data-template="%s"></span>',
+ $this->templateWrapper,
$escapeHtmlAttribHelper($templateMarkup)
);
}
@@ -273,4 +294,94 @@ class FormCollection extends AbstractHelper
return $this;
}
+
+ /**
+ * Get the wrapper for the collection
+ *
+ * @return string
+ */
+ public function getWrapper()
+ {
+ return $this->wrapper;
+ }
+
+ /**
+ * Set the wrapper for this collection
+ *
+ * The string given will be passed through sprintf with the following three
+ * replacements:
+ *
+ * 1. The content of the collection
+ * 2. The label of the collection. If no label is given this will be an empty
+ * string
+ * 3. The template span-tag. This might also be an empty string
+ *
+ * The preset default is <pre><fieldset>%2$s%1$s%3$s</fieldset></pre>
+ *
+ * @param string $wrapper
+ *
+ * @return self
+ */
+ public function setWrapper($wrapper)
+ {
+ $this->wrapper = $wrapper;
+
+ return $this;
+ }
+
+ /**
+ * Set the label-wrapper
+ * The string will be passed through sprintf with the label as single
+ * parameter
+ * This defaults to '<legend>%s</legend>'
+ *
+ * @param string $labelWrapper
+ *
+ * @return self
+ */
+ public function setLabelWrapper($labelWrapper)
+ {
+ $this->labelWrapper = $labelWrapper;
+
+ return $this;
+ }
+
+ /**
+ * Get the wrapper for the label
+ *
+ * @return string
+ */
+ public function getLabelWrapper()
+ {
+ return $this->labelWrapper;
+ }
+
+ /**
+ * Ge the wrapper for the template
+ *
+ * @return string
+ */
+ public function getTemplateWrapper()
+ {
+ return $this->templateWrapper;
+ }
+
+ /**
+ * Set the string where the template will be inserted into
+ *
+ * This string will be passed through sprintf and has the template as single
+ * parameter
+ *
+ * THis defaults to '<span data-template="%s"></span>'
+ *
+ * @param string $templateWrapper
+ *
+ * @return self
+ */
+ public function setTemplateWrapper($templateWrapper)
+ {
+ $this->templateWrapper = $templateWrapper;
+
+ return $this;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormColor.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormColor.php
index ebf955fa1aa..d83dda78213 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormColor.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormColor.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDate.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDate.php
index 6e21eb629f4..8fda4399588 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDate.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php
index bd9e5e34ce8..be21bbc00cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateSelect.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTime.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTime.php
index 4c2b615c6bc..3bc62e4ec77 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTime.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTime.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeLocal.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeLocal.php
index d072e809080..520ca1b1dce 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeLocal.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeLocal.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeSelect.php
index c5c4042c09c..31048b92328 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormDateTimeSelect.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -144,9 +144,8 @@ class FormDateTimeSelect extends FormDateSelectHelper
$markup .= $data[$value];
}
}
- $markup = trim($markup);
- return $markup;
+ return trim($markup);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElement.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElement.php
index 08e7886babe..3dfe221bb0a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElement.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElement.php
@@ -3,18 +3,74 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\View\Helper;
-use Zend\Form\Element;
use Zend\Form\ElementInterface;
use Zend\View\Helper\AbstractHelper as BaseAbstractHelper;
class FormElement extends BaseAbstractHelper
{
+ const DEFAULT_HELPER = 'forminput';
+
+ /**
+ * Instance map to view helper
+ *
+ * @var array
+ */
+ protected $classMap = array(
+ 'Zend\Form\Element\Button' => 'formbutton',
+ 'Zend\Form\Element\Captcha' => 'formcaptcha',
+ 'Zend\Form\Element\Csrf' => 'formhidden',
+ 'Zend\Form\Element\Collection' => 'formcollection',
+ 'Zend\Form\Element\DateTimeSelect' => 'formdatetimeselect',
+ 'Zend\Form\Element\DateSelect' => 'formdateselect',
+ 'Zend\Form\Element\MonthSelect' => 'formmonthselect',
+ );
+
+ /**
+ * Type map to view helper
+ *
+ * @var array
+ */
+ protected $typeMap = array(
+ 'checkbox' => 'formcheckbox',
+ 'color' => 'formcolor',
+ 'date' => 'formdate',
+ 'datetime' => 'formdatetime',
+ 'datetime-local' => 'formdatetimelocal',
+ 'email' => 'formemail',
+ 'file' => 'formfile',
+ 'hidden' => 'formhidden',
+ 'image' => 'formimage',
+ 'month' => 'formmonth',
+ 'multi_checkbox' => 'formmulticheckbox',
+ 'number' => 'formnumber',
+ 'password' => 'formpassword',
+ 'radio' => 'formradio',
+ 'range' => 'formrange',
+ 'reset' => 'formreset',
+ 'search' => 'formsearch',
+ 'select' => 'formselect',
+ 'submit' => 'formsubmit',
+ 'tel' => 'formtel',
+ 'text' => 'formtext',
+ 'textarea' => 'formtextarea',
+ 'time' => 'formtime',
+ 'url' => 'formurl',
+ 'week' => 'formweek',
+ );
+
+ /**
+ * Default helper name
+ *
+ * @var string
+ */
+ protected $defaultHelper = self::DEFAULT_HELPER;
+
/**
* Invoke helper as function
*
@@ -49,169 +105,104 @@ class FormElement extends BaseAbstractHelper
return '';
}
- if ($element instanceof Element\Button) {
- $helper = $renderer->plugin('form_button');
- return $helper($element);
- }
-
- if ($element instanceof Element\Captcha) {
- $helper = $renderer->plugin('form_captcha');
- return $helper($element);
- }
-
- if ($element instanceof Element\Csrf) {
- $helper = $renderer->plugin('form_hidden');
- return $helper($element);
- }
-
- if ($element instanceof Element\Collection) {
- $helper = $renderer->plugin('form_collection');
- return $helper($element);
- }
-
- if ($element instanceof Element\DateTimeSelect) {
- $helper = $renderer->plugin('form_date_time_select');
- return $helper($element);
- }
-
- if ($element instanceof Element\DateSelect) {
- $helper = $renderer->plugin('form_date_select');
- return $helper($element);
- }
-
- if ($element instanceof Element\MonthSelect) {
- $helper = $renderer->plugin('form_month_select');
- return $helper($element);
- }
-
- $type = $element->getAttribute('type');
-
- if ('checkbox' == $type) {
- $helper = $renderer->plugin('form_checkbox');
- return $helper($element);
- }
-
- if ('color' == $type) {
- $helper = $renderer->plugin('form_color');
- return $helper($element);
- }
-
- if ('date' == $type) {
- $helper = $renderer->plugin('form_date');
- return $helper($element);
- }
-
- if ('datetime' == $type) {
- $helper = $renderer->plugin('form_date_time');
- return $helper($element);
- }
-
- if ('datetime-local' == $type) {
- $helper = $renderer->plugin('form_date_time_local');
- return $helper($element);
- }
-
- if ('email' == $type) {
- $helper = $renderer->plugin('form_email');
- return $helper($element);
- }
-
- if ('file' == $type) {
- $helper = $renderer->plugin('form_file');
- return $helper($element);
- }
-
- if ('hidden' == $type) {
- $helper = $renderer->plugin('form_hidden');
- return $helper($element);
- }
-
- if ('image' == $type) {
- $helper = $renderer->plugin('form_image');
- return $helper($element);
- }
+ $renderedInstance = $this->renderInstance($element);
- if ('month' == $type) {
- $helper = $renderer->plugin('form_month');
- return $helper($element);
+ if ($renderedInstance !== null) {
+ return $renderedInstance;
}
- if ('multi_checkbox' == $type) {
- $helper = $renderer->plugin('form_multi_checkbox');
- return $helper($element);
- }
+ $renderedType = $this->renderType($element);
- if ('number' == $type) {
- $helper = $renderer->plugin('form_number');
- return $helper($element);
+ if ($renderedType !== null) {
+ return $renderedType;
}
- if ('password' == $type) {
- $helper = $renderer->plugin('form_password');
- return $helper($element);
- }
-
- if ('radio' == $type) {
- $helper = $renderer->plugin('form_radio');
- return $helper($element);
- }
-
- if ('range' == $type) {
- $helper = $renderer->plugin('form_range');
- return $helper($element);
- }
+ return $this->renderHelper($this->defaultHelper, $element);
+ }
- if ('reset' == $type) {
- $helper = $renderer->plugin('form_reset');
- return $helper($element);
- }
+ /**
+ * Set default helper name
+ *
+ * @param string $name
+ * @return self
+ */
+ public function setDefaultHelper($name)
+ {
+ $this->defaultHelper = $name;
- if ('search' == $type) {
- $helper = $renderer->plugin('form_search');
- return $helper($element);
- }
+ return $this;
+ }
- if ('select' == $type) {
- $helper = $renderer->plugin('form_select');
- return $helper($element);
- }
+ /**
+ * Add form element type to plugin map
+ *
+ * @param string $type
+ * @param string $plugin
+ * @return self
+ */
+ public function addType($type, $plugin)
+ {
+ $this->typeMap[$type] = $plugin;
- if ('submit' == $type) {
- $helper = $renderer->plugin('form_submit');
- return $helper($element);
- }
+ return $this;
+ }
- if ('tel' == $type) {
- $helper = $renderer->plugin('form_tel');
- return $helper($element);
- }
+ /**
+ * Add instance class to plugin map
+ *
+ * @param string $class
+ * @param string $plugin
+ * @return self
+ */
+ public function addClass($class, $plugin)
+ {
+ $this->classMap[$class] = $plugin;
- if ('text' == $type) {
- $helper = $renderer->plugin('form_text');
- return $helper($element);
- }
+ return $this;
+ }
- if ('textarea' == $type) {
- $helper = $renderer->plugin('form_textarea');
- return $helper($element);
- }
+ /**
+ * Render element by helper name
+ *
+ * @param string $name
+ * @param ElementInterface $element
+ * @return string
+ */
+ protected function renderHelper($name, ElementInterface $element)
+ {
+ $helper = $this->getView()->plugin($name);
+ return $helper($element);
+ }
- if ('time' == $type) {
- $helper = $renderer->plugin('form_time');
- return $helper($element);
+ /**
+ * Render element by instance map
+ *
+ * @param ElementInterface $element
+ * @return string|null
+ */
+ protected function renderInstance(ElementInterface $element)
+ {
+ foreach ($this->classMap as $class => $pluginName) {
+ if ($element instanceof $class) {
+ return $this->renderHelper($pluginName, $element);
+ }
}
+ return null;
+ }
- if ('url' == $type) {
- $helper = $renderer->plugin('form_url');
- return $helper($element);
- }
+ /**
+ * Render element by type map
+ *
+ * @param ElementInterface $element
+ * @return string|null
+ */
+ protected function renderType(ElementInterface $element)
+ {
+ $type = $element->getAttribute('type');
- if ('week' == $type) {
- $helper = $renderer->plugin('form_week');
- return $helper($element);
+ if (isset($this->typeMap[$type])) {
+ return $this->renderHelper($this->typeMap[$type], $element);
}
-
- $helper = $renderer->plugin('form_input');
- return $helper($element);
+ return null;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php
index 662b083f5f4..15fe08ff4a8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -78,11 +78,7 @@ class FormElementErrors extends AbstractHelper
// Flatten message array
$escapeHtml = $this->getEscapeHtmlHelper();
$messagesToPrint = array();
- $self = $this;
- array_walk_recursive($messages, function ($item) use (&$messagesToPrint, $escapeHtml, $self) {
- if (null !== ($translator = $self->getTranslator())) {
- $item = $translator->translate($item, $self->getTranslatorTextDomain());
- }
+ array_walk_recursive($messages, function ($item) use (&$messagesToPrint, $escapeHtml) {
$messagesToPrint[] = $escapeHtml($item);
});
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormEmail.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormEmail.php
index e03930ebb65..2ffb3142934 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormEmail.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormEmail.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormFile.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormFile.php
index e75b34d8b5a..6fbdfab6f36 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormFile.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormFile.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormHidden.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormHidden.php
index f478b2a6a52..c041ad97240 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormHidden.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormHidden.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormImage.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormImage.php
index e5bc26ce9cb..7a0577b5dc9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormImage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormImage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormInput.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormInput.php
index 5a2f5adcea3..150731c2375 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormInput.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormInput.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormLabel.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormLabel.php
index 8c97b5e3b48..b512c5d289e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormLabel.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormLabel.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,7 @@ namespace Zend\Form\View\Helper;
use Zend\Form\ElementInterface;
use Zend\Form\Exception;
+use Zend\Form\LabelAwareInterface;
class FormLabel extends AbstractHelper
{
@@ -50,17 +51,22 @@ class FormLabel extends AbstractHelper
if ($labelContent === null || $position !== null) {
$label = $element->getLabel();
if (empty($label)) {
- throw new Exception\DomainException(sprintf(
- '%s expects either label content as the second argument, ' .
+ throw new Exception\DomainException(
+ sprintf(
+ '%s expects either label content as the second argument, ' .
'or that the element provided has a label attribute; neither found',
- __METHOD__
- ));
+ __METHOD__
+ )
+ );
}
if (null !== ($translator = $this->getTranslator())) {
- $label = $translator->translate(
- $label, $this->getTranslatorTextDomain()
- );
+ $label = $translator->translate($label, $this->getTranslatorTextDomain());
+ }
+
+ if (! $element instanceof LabelAwareInterface || ! $element->getLabelOption('disable_html_escape')) {
+ $escapeHtmlHelper = $this->getEscapeHtmlHelper();
+ $label = $escapeHtmlHelper($label);
}
}
@@ -118,7 +124,11 @@ class FormLabel extends AbstractHelper
));
}
- $labelAttributes = $attributesOrElement->getLabelAttributes();
+ $labelAttributes = array();
+ if ($attributesOrElement instanceof LabelAwareInterface) {
+ $labelAttributes = $attributesOrElement->getLabelAttributes();
+ }
+
$attributes = array('for' => $id);
if (!empty($labelAttributes)) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonth.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonth.php
index a0881b40a3a..9d6955bfb26 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonth.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonth.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php
index f3cfa2136c8..dc0fe3dde19 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonthSelect.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMultiCheckbox.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMultiCheckbox.php
index 1f3c0466925..899711933ce 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMultiCheckbox.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMultiCheckbox.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,6 +12,7 @@ namespace Zend\Form\View\Helper;
use Zend\Form\ElementInterface;
use Zend\Form\Element\MultiCheckbox as MultiCheckboxElement;
use Zend\Form\Exception;
+use Zend\Form\LabelAwareInterface;
class FormMultiCheckbox extends FormInput
{
@@ -94,7 +95,6 @@ class FormMultiCheckbox extends FormInput
*
* @param ElementInterface $element
* @throws Exception\InvalidArgumentException
- * @throws Exception\DomainException
* @return string
*/
public function render(ElementInterface $element)
@@ -109,12 +109,6 @@ class FormMultiCheckbox extends FormInput
$name = static::getName($element);
$options = $element->getValueOptions();
- if (empty($options)) {
- throw new Exception\DomainException(sprintf(
- '%s requires that the element has "value_options"; none found',
- __METHOD__
- ));
- }
$attributes = $element->getAttributes();
$attributes['name'] = $name;
@@ -144,16 +138,19 @@ class FormMultiCheckbox extends FormInput
* @param array $attributes
* @return string
*/
- protected function renderOptions(MultiCheckboxElement $element, array $options, array $selectedOptions,
- array $attributes)
+ protected function renderOptions(MultiCheckboxElement $element, array $options, array $selectedOptions, array $attributes)
{
$escapeHtmlHelper = $this->getEscapeHtmlHelper();
$labelHelper = $this->getLabelHelper();
$labelClose = $labelHelper->closeTag();
$labelPosition = $this->getLabelPosition();
- $globalLabelAttributes = $element->getLabelAttributes();
+ $globalLabelAttributes = array();
$closingBracket = $this->getInlineClosingBracket();
+ if ($element instanceof LabelAwareInterface) {
+ $globalLabelAttributes = $element->getLabelAttributes();
+ }
+
if (empty($globalLabelAttributes)) {
$globalLabelAttributes = $this->labelAttributes;
}
@@ -218,11 +215,15 @@ class FormMultiCheckbox extends FormInput
if (null !== ($translator = $this->getTranslator())) {
$label = $translator->translate(
- $label, $this->getTranslatorTextDomain()
+ $label,
+ $this->getTranslatorTextDomain()
);
}
- $label = $escapeHtmlHelper($label);
+ if (! $element instanceof LabelAwareInterface || ! $element->getLabelOption('disable_html_escape')) {
+ $label = $escapeHtmlHelper($label);
+ }
+
$labelOpen = $labelHelper->openTag($labelAttributes);
$template = $labelOpen . '%s%s' . $labelClose;
switch ($labelPosition) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormNumber.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormNumber.php
index a19c89affeb..ba2f5370631 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormNumber.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormNumber.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormPassword.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormPassword.php
index a2683f69cbc..cbd78228dcc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormPassword.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormPassword.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRadio.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRadio.php
index 97405006d50..5cb5bb11e0b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRadio.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRadio.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRange.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRange.php
index e2d7cf68e88..b1cbd9dd7d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRange.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRange.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormReset.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormReset.php
index 53e2988b82c..22aed0b65ad 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormReset.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormReset.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
index 83f366266cb..99d3f290ed2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
@@ -3,15 +3,18 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\View\Helper;
use Zend\Form\Element\Button;
+use Zend\Form\Element\MonthSelect;
+use Zend\Form\Element\Captcha;
use Zend\Form\ElementInterface;
use Zend\Form\Exception;
+use Zend\Form\LabelAwareInterface;
class FormRow extends AbstractHelper
{
@@ -126,9 +129,7 @@ class FormRow extends AbstractHelper
if (isset($label) && '' !== $label) {
// Translate the label
if (null !== ($translator = $this->getTranslator())) {
- $label = $translator->translate(
- $label, $this->getTranslatorTextDomain()
- );
+ $label = $translator->translate($label, $this->getTranslatorTextDomain());
}
}
@@ -158,9 +159,18 @@ class FormRow extends AbstractHelper
$elementString = $elementHelper->render($element);
- if (isset($label) && '' !== $label) {
- $label = $escapeHtmlHelper($label);
- $labelAttributes = $element->getLabelAttributes();
+ // hidden elements do not need a <label> -https://github.com/zendframework/zf2/issues/5607
+ $type = $element->getAttribute('type');
+ if (isset($label) && '' !== $label && $type !== 'hidden') {
+ $labelAttributes = array();
+
+ if ($element instanceof LabelAwareInterface) {
+ $labelAttributes = $element->getLabelAttributes();
+ }
+
+ if (! $element instanceof LabelAwareInterface || ! $element->getLabelOption('disable_html_escape')) {
+ $label = $escapeHtmlHelper($label);
+ }
if (empty($labelAttributes)) {
$labelAttributes = $this->labelAttributes;
@@ -168,14 +178,22 @@ class FormRow extends AbstractHelper
// Multicheckbox elements have to be handled differently as the HTML standard does not allow nested
// labels. The semantic way is to group them inside a fieldset
- $type = $element->getAttribute('type');
- if ($type === 'multi_checkbox' || $type === 'radio') {
+ if ($type === 'multi_checkbox'
+ || $type === 'radio'
+ || $element instanceof MonthSelect
+ || $element instanceof Captcha
+ ) {
$markup = sprintf(
'<fieldset><legend>%s</legend>%s</fieldset>',
$label,
- $elementString);
+ $elementString
+ );
} else {
- if ($element->hasAttribute('id')) {
+ // Ensure element and label will be separated if element has an `id`-attribute.
+ // If element has label option `always_wrap` it will be nested in any case.
+ if ($element->hasAttribute('id')
+ && ($element instanceof LabelAwareInterface && !$element->getLabelOption('always_wrap'))
+ ) {
$labelOpen = '';
$labelClose = '';
$label = $labelHelper($element);
@@ -184,7 +202,9 @@ class FormRow extends AbstractHelper
$labelClose = $labelHelper->closeTag();
}
- if ($label !== '' && !$element->hasAttribute('id')) {
+ if ($label !== '' && (!$element->hasAttribute('id'))
+ || ($element instanceof LabelAwareInterface && $element->getLabelOption('always_wrap'))
+ ) {
$label = '<span>' . $label . '</span>';
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSearch.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSearch.php
index 80e08620a37..1a824c69a6f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSearch.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSearch.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSelect.php
index 14aca714f54..e2d99762ae6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSelect.php
@@ -3,12 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form\View\Helper;
+use Zend\Form\Element\Hidden;
use Zend\Form\ElementInterface;
use Zend\Form\Element\Select as SelectElement;
use Zend\Form\Exception;
@@ -31,13 +32,14 @@ class FormSelect extends AbstractHelper
* @var array
*/
protected $validSelectAttributes = array(
- 'name' => true,
- 'autofocus' => true,
- 'disabled' => true,
- 'form' => true,
- 'multiple' => true,
- 'required' => true,
- 'size' => true
+ 'name' => true,
+ 'autocomplete' => true,
+ 'autofocus' => true,
+ 'disabled' => true,
+ 'form' => true,
+ 'multiple' => true,
+ 'required' => true,
+ 'size' => true
);
/**
@@ -66,6 +68,11 @@ class FormSelect extends AbstractHelper
'label' => true,
);
+ /**
+ * @var FormHidden|null
+ */
+ protected $formHiddenHelper;
+
/**
* Invoke helper as functor
*
@@ -123,11 +130,22 @@ class FormSelect extends AbstractHelper
}
$this->validTagAttributes = $this->validSelectAttributes;
- return sprintf(
+ $rendered = sprintf(
'<select %s>%s</select>',
$this->createAttributesString($attributes),
$this->renderOptions($options, $value)
);
+
+ // Render hidden element
+ $useHiddenElement = method_exists($element, 'useHiddenElement')
+ && method_exists($element, 'getUnselectedValue')
+ && $element->useHiddenElement();
+
+ if ($useHiddenElement) {
+ $rendered = $this->renderHiddenElement($element) . $rendered;
+ }
+
+ return $rendered;
}
/**
@@ -191,7 +209,8 @@ class FormSelect extends AbstractHelper
if (null !== ($translator = $this->getTranslator())) {
$label = $translator->translate(
- $label, $this->getTranslatorTextDomain()
+ $label,
+ $this->getTranslatorTextDomain()
);
}
@@ -278,4 +297,30 @@ class FormSelect extends AbstractHelper
return $value;
}
+
+ protected function renderHiddenElement(ElementInterface $element)
+ {
+ $hiddenElement = new Hidden($element->getName());
+ $hiddenElement->setValue($element->getUnselectedValue());
+
+ return $this->getFormHiddenHelper()->__invoke($hiddenElement);
+ }
+
+ /**
+ * @return FormHidden
+ */
+ protected function getFormHiddenHelper()
+ {
+ if (!$this->formHiddenHelper) {
+ if (method_exists($this->view, 'plugin')) {
+ $this->formHiddenHelper = $this->view->plugin('formhidden');
+ }
+
+ if (!$this->formHiddenHelper instanceof FormHidden) {
+ $this->formHiddenHelper = new FormHidden();
+ }
+ }
+
+ return $this->formHiddenHelper;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSubmit.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSubmit.php
index 926028d8c99..2dbd43476b5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSubmit.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSubmit.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTel.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTel.php
index 746f0e156da..de1fc356f6a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTel.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTel.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormText.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormText.php
index 0e57c051277..2f39a47133a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormText.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormText.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTextarea.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTextarea.php
index 32011b2c548..114a408c485 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTextarea.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTextarea.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -20,18 +20,19 @@ class FormTextarea extends AbstractHelper
* @var array
*/
protected $validTagAttributes = array(
- 'autofocus' => true,
- 'cols' => true,
- 'dirname' => true,
- 'disabled' => true,
- 'form' => true,
- 'maxlength' => true,
- 'name' => true,
- 'placeholder' => true,
- 'readonly' => true,
- 'required' => true,
- 'rows' => true,
- 'wrap' => true,
+ 'autocomplete' => true,
+ 'autofocus' => true,
+ 'cols' => true,
+ 'dirname' => true,
+ 'disabled' => true,
+ 'form' => true,
+ 'maxlength' => true,
+ 'name' => true,
+ 'placeholder' => true,
+ 'readonly' => true,
+ 'required' => true,
+ 'rows' => true,
+ 'wrap' => true,
);
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTime.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTime.php
index cf8fbc32876..9f8ce6c91fe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTime.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTime.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormUrl.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormUrl.php
index 90df9965b13..a386debbdd2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormUrl.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormUrl.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormWeek.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormWeek.php
index 4fe6758c99e..3704d9a0c3c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormWeek.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormWeek.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/View/HelperConfig.php b/vendor/zendframework/zendframework/library/Zend/Form/View/HelperConfig.php
index 7c3710d61d3..4a425e2f9ff 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/HelperConfig.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/HelperConfig.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -61,9 +61,7 @@ class HelperConfig implements ConfigInterface
'formradio' => 'Zend\Form\View\Helper\FormRadio',
'formrange' => 'Zend\Form\View\Helper\FormRange',
'formreset' => 'Zend\Form\View\Helper\FormReset',
- 'form_reset' => 'Zend\Form\View\Helper\FormReset',
'formrow' => 'Zend\Form\View\Helper\FormRow',
- 'form_row' => 'Zend\Form\View\Helper\FormRow',
'formsearch' => 'Zend\Form\View\Helper\FormSearch',
'formselect' => 'Zend\Form\View\Helper\FormSelect',
'formsubmit' => 'Zend\Form\View\Helper\FormSubmit',
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/composer.json b/vendor/zendframework/zendframework/library/Zend/Form/composer.json
index 0c8e5a7f4b7..9d2cad0f563 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Form/composer.json
@@ -6,6 +6,7 @@
"zf2",
"form"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Form\\": ""
@@ -13,20 +14,37 @@
},
"target-dir": "Zend/Form",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-inputfilter": "self.version",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
+ "zendframework/zend-captcha": "self.version",
+ "zendframework/zend-code": "self.version",
+ "zendframework/zend-eventmanager": "self.version",
+ "zendframework/zend-filter": "self.version",
+ "zendframework/zend-i18n": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-validator": "self.version",
+ "zendframework/zend-view": "self.version",
"zendframework/zendservice-recaptcha": "*"
},
"suggest": {
+
+ "zendframework/zend-captcha": "Zend\\Captcha component",
+ "zendframework/zend-code": "Zend\\Code component",
+ "zendframework/zend-eventmanager": "Zend\\EventManager component",
+ "zendframework/zend-filter": "Zend\\Filter component",
+ "zendframework/zend-i18n": "Zend\\I18n component",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+ "zendframework/zend-validator": "Zend\\Validator component",
+ "zendframework/zend-view": "Zend\\View component",
"zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/AbstractMessage.php b/vendor/zendframework/zendframework/library/Zend/Http/AbstractMessage.php
index 0c607e8a4d9..0f4f3047238 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/AbstractMessage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/AbstractMessage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Http/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Http/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client.php b/vendor/zendframework/zendframework/library/Zend/Http/Client.php
index 2c608eeb3ad..e204b7345c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -54,7 +54,7 @@ class Client implements Stdlib\DispatchableInterface
protected $request;
/**
- * @var Client/Adapter
+ * @var Client\Adapter\AdapterInterface
*/
protected $adapter;
@@ -262,7 +262,6 @@ class Client implements Stdlib\DispatchableInterface
return $this->response;
}
-
/**
* Get the last request (as a string)
*
@@ -347,9 +346,19 @@ class Client implements Stdlib\DispatchableInterface
{
$method = $this->getRequest()->setMethod($method)->getMethod();
- if (($method == Request::METHOD_POST || $method == Request::METHOD_PUT ||
- $method == Request::METHOD_DELETE || $method == Request::METHOD_PATCH)
- && empty($this->encType)) {
+ if (empty($this->encType)
+ && in_array(
+ $method,
+ array(
+ Request::METHOD_POST,
+ Request::METHOD_PUT,
+ Request::METHOD_DELETE,
+ Request::METHOD_PATCH,
+ Request::METHOD_OPTIONS,
+ ),
+ true
+ )
+ ) {
$this->setEncType(self::ENC_URLENCODED);
}
@@ -770,10 +779,10 @@ class Client implements Stdlib\DispatchableInterface
if (empty($digest['qop']) || strtolower($digest['qop']) == 'auth') {
$ha2 = md5($this->getMethod() . ':' . $this->getUri()->getPath());
} elseif (strtolower($digest['qop']) == 'auth-int') {
- if (empty($entityBody)) {
+ if (empty($entityBody)) {
throw new Exception\InvalidArgumentException("I cannot use the auth-int digest authentication without the entity body");
- }
- $ha2 = md5($this->getMethod() . ':' . $this->getUri()->getPath() . ':' . md5($entityBody));
+ }
+ $ha2 = md5($this->getMethod() . ':' . $this->getUri()->getPath() . ':' . md5($entityBody));
}
if (empty($digest['qop'])) {
$response = md5($ha1 . ':' . $digest['nonce'] . ':' . $ha2);
@@ -831,7 +840,7 @@ class Client implements Stdlib\DispatchableInterface
if (!empty($queryArray)) {
$newUri = $uri->toString();
- $queryString = http_build_query($query, null, $this->getArgSeparator());
+ $queryString = http_build_query($queryArray, null, $this->getArgSeparator());
if ($this->config['rfc3986strict']) {
$queryString = str_replace('+', '%20', $queryString);
@@ -854,6 +863,9 @@ class Client implements Stdlib\DispatchableInterface
// method
$method = $this->getRequest()->getMethod();
+ // this is so the correct Encoding Type is set
+ $this->setMethod($method);
+
// body
$body = $this->prepareBody();
@@ -916,7 +928,6 @@ class Client implements Stdlib\DispatchableInterface
// If we got redirected, look for the Location header
if ($response->isRedirect() && ($response->getHeaders()->has('Location'))) {
-
// Avoid problems with buggy servers that add whitespace at the
// end of some headers
$location = trim($response->getHeaders()->get('Location')->getFieldValue());
@@ -926,19 +937,16 @@ class Client implements Stdlib\DispatchableInterface
if ($response->getStatusCode() == 303 ||
((! $this->config['strictredirects']) && ($response->getStatusCode() == 302 ||
$response->getStatusCode() == 301))) {
-
$this->resetParameters(false, false);
$this->setMethod(Request::METHOD_GET);
}
-
// If we got a well formed absolute URI
if (($scheme = substr($location, 0, 6)) &&
($scheme == 'http:/' || $scheme == 'https:')) {
// setURI() clears parameters if host changed, see #4215
$this->setUri($location);
} else {
-
// Split into path and query and set the query
if (strpos($location, '?') !== false) {
list($location, $query) = explode('?', $location, 2);
@@ -959,12 +967,10 @@ class Client implements Stdlib\DispatchableInterface
}
}
++$this->redirectCounter;
-
} else {
// If we didn't get any location, stop redirecting
break;
}
-
} while ($this->redirectCounter <= $this->config['maxredirects']);
$this->response = $response;
@@ -978,11 +984,11 @@ class Client implements Stdlib\DispatchableInterface
*/
public function reset()
{
- $this->resetParameters();
- $this->clearAuth();
- $this->clearCookies();
+ $this->resetParameters();
+ $this->clearAuth();
+ $this->clearCookies();
- return $this;
+ return $this;
}
/**
@@ -1253,7 +1259,6 @@ class Client implements Stdlib\DispatchableInterface
if (static::$fileInfoDb) {
$type = finfo_file(static::$fileInfoDb, $file);
}
-
} elseif (function_exists('mime_content_type')) {
$type = mime_content_type($file);
}
@@ -1331,7 +1336,6 @@ class Client implements Stdlib\DispatchableInterface
if (is_array($value)) {
$parameters = array_merge($parameters, $this->flattenParametersArray($value, $key));
-
} else {
$parameters[] = array($key, $value);
}
@@ -1366,8 +1370,13 @@ class Client implements Stdlib\DispatchableInterface
}
}
// HTTP connection
- $this->lastRawRequest = $this->adapter->write($method,
- $uri, $this->config['httpversion'], $headers, $body);
+ $this->lastRawRequest = $this->adapter->write(
+ $method,
+ $uri,
+ $this->config['httpversion'],
+ $headers,
+ $body
+ );
return $this->adapter->read();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/AdapterInterface.php
index 9e423ebbe7b..f6fe0cfb17c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Curl.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Curl.php
index e54a55e2e23..ccbcfbc5a85 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Curl.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Curl.php
@@ -3,17 +3,15 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Http\Client\Adapter;
use Traversable;
-use Zend\Http\Client;
use Zend\Http\Client\Adapter\AdapterInterface as HttpAdapter;
use Zend\Http\Client\Adapter\Exception as AdapterException;
-use Zend\Http\Request;
use Zend\Stdlib\ArrayUtils;
/**
@@ -203,8 +201,17 @@ class Curl implements HttpAdapter, StreamInterface
}
if (isset($this->config['timeout'])) {
- // Set timeout
- curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT, $this->config['timeout']);
+ if (defined('CURLOPT_CONNECTTIMEOUT_MS')) {
+ curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT_MS, $this->config['timeout'] * 1000);
+ } else {
+ curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT, $this->config['timeout']);
+ }
+
+ if (defined('CURLOPT_TIMEOUT_MS')) {
+ curl_setopt($this->curl, CURLOPT_TIMEOUT_MS, $this->config['timeout'] * 1000);
+ } else {
+ curl_setopt($this->curl, CURLOPT_TIMEOUT, $this->config['timeout']);
+ }
}
if (isset($this->config['maxredirects'])) {
@@ -338,7 +345,7 @@ class Curl implements HttpAdapter, StreamInterface
$curlHttp = ($httpVersion == 1.1) ? CURL_HTTP_VERSION_1_1 : CURL_HTTP_VERSION_1_0;
// mark as HTTP request and set HTTP method
- curl_setopt($this->curl, $curlHttp, true);
+ curl_setopt($this->curl, CURLOPT_HTTP_VERSION, $curlHttp);
curl_setopt($this->curl, $curlMethod, $curlValue);
if ($this->outputStream) {
@@ -377,7 +384,7 @@ class Curl implements HttpAdapter, StreamInterface
* Make sure POSTFIELDS is set after $curlMethod is set:
* @link http://de2.php.net/manual/en/function.curl-setopt.php#81161
*/
- if ($method == 'POST') {
+ if (in_array($method, array('POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'), true)) {
curl_setopt($this->curl, CURLOPT_POSTFIELDS, $body);
} elseif ($curlMethod == CURLOPT_UPLOAD) {
// this covers a PUT by file-handle:
@@ -387,11 +394,6 @@ class Curl implements HttpAdapter, StreamInterface
curl_setopt($this->curl, CURLOPT_INFILESIZE, $this->config['curloptions'][CURLOPT_INFILESIZE]);
unset($this->config['curloptions'][CURLOPT_INFILE]);
unset($this->config['curloptions'][CURLOPT_INFILESIZE]);
- } elseif ($method == 'PUT') {
- // This is a PUT by a setRawData string, not by file-handle
- curl_setopt($this->curl, CURLOPT_POSTFIELDS, $body);
- } elseif ($method == 'PATCH') {
- curl_setopt($this->curl, CURLOPT_POSTFIELDS, $body);
}
// set additional curl options
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php
index 11905999348..bf53840d9b1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Http\Client\Adapter\Exception;
use Zend\Http\Client\Exception\ExceptionInterface as HttpClientException;
interface ExceptionInterface extends HttpClientException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/InitializationException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/InitializationException.php
index e4fe2da6898..c0c9e0372ea 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/InitializationException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/InitializationException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Http\Client\Adapter\Exception;
/**
*/
class InitializationException extends RuntimeException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php
index 9ed2417b971..5ba54691352 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use Zend\Http\Client\Exception;
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php
index 9239a997336..4fd0cbd0b18 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use Zend\Http\Client\Exception;
*/
class OutOfRangeException extends Exception\OutOfRangeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php
index a40ba5e8122..e6a9d4f35d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use Zend\Http\Client\Exception;
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php
index f205246a130..eb8a8e1f7d5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php
index 1e77a08fe5f..4b1c69ad0b0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Proxy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -117,7 +117,9 @@ class Proxy extends Socket
public function write($method, $uri, $httpVer = '1.1', $headers = array(), $body = '')
{
// If no proxy is set, fall back to default Socket adapter
- if (! $this->config['proxy_host']) return parent::write($method, $uri, $httpVer, $headers, $body);
+ if (! $this->config['proxy_host']) {
+ return parent::write($method, $uri, $httpVer, $headers, $body);
+ }
// Make sure we're properly connected
if (! $this->socket) {
@@ -160,7 +162,9 @@ class Proxy extends Socket
// Add all headers to the request string
foreach ($headers as $k => $v) {
- if (is_string($k)) $v = "$k: $v";
+ if (is_string($k)) {
+ $v = "$k: $v";
+ }
$request .= "$v\r\n";
}
@@ -232,7 +236,9 @@ class Proxy extends Socket
$gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false);
if ($gotStatus) {
$response .= $line;
- if (!rtrim($line)) break;
+ if (!rtrim($line)) {
+ break;
+ }
}
}
ErrorHandler::stop();
@@ -254,11 +260,13 @@ class Proxy extends Socket
$success = false;
foreach ($modes as $mode) {
$success = stream_socket_enable_crypto($this->socket, true, $mode);
- if ($success) break;
+ if ($success) {
+ break;
+ }
}
if (! $success) {
- throw new AdapterException\RuntimeException("Unable to connect to" .
+ throw new AdapterException\RuntimeException("Unable to connect to" .
" HTTPS server through proxy: could not negotiate secure connection.");
}
}
@@ -279,6 +287,8 @@ class Proxy extends Socket
*/
public function __destruct()
{
- if ($this->socket) $this->close();
+ if ($this->socket) {
+ $this->close();
+ }
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Socket.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Socket.php
index 8ef2415155e..aceb54dc3cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Socket.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Socket.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -28,10 +28,10 @@ class Socket implements HttpAdapter, StreamInterface
* @var array
*/
protected static $sslCryptoTypes = array(
- 'ssl' => STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
- 'sslv2' => STREAM_CRYPTO_METHOD_SSLv2_CLIENT,
- 'sslv3' => STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
- 'tls' => STREAM_CRYPTO_METHOD_TLS_CLIENT
+ 'ssl' => STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
+ 'sslv2' => STREAM_CRYPTO_METHOD_SSLv2_CLIENT,
+ 'sslv3' => STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
+ 'tls' => STREAM_CRYPTO_METHOD_TLS_CLIENT,
);
/**
@@ -69,7 +69,7 @@ class Socket implements HttpAdapter, StreamInterface
'sslcafile' => null,
'sslcapath' => null,
'sslallowselfsigned' => false,
- 'sslusecontext' => false
+ 'sslusecontext' => false,
);
/**
@@ -144,10 +144,8 @@ class Socket implements HttpAdapter, StreamInterface
{
if (is_resource($context) && get_resource_type($context) == 'stream-context') {
$this->context = $context;
-
} elseif (is_array($context)) {
$this->context = stream_context_create($context);
-
} else {
// Invalid parameter
throw new AdapterException\InvalidArgumentException(
@@ -354,10 +352,14 @@ class Socket implements HttpAdapter, StreamInterface
// Build request headers
$path = $uri->getPath();
- if ($uri->getQuery()) $path .= '?' . $uri->getQuery();
+ if ($uri->getQuery()) {
+ $path .= '?' . $uri->getQuery();
+ }
$request = "{$method} {$path} HTTP/{$httpVer}\r\n";
foreach ($headers as $k => $v) {
- if (is_string($k)) $v = ucfirst($k) . ": $v";
+ if (is_string($k)) {
+ $v = ucfirst($k) . ": $v";
+ }
$request .= "$v\r\n";
}
@@ -401,7 +403,9 @@ class Socket implements HttpAdapter, StreamInterface
$gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false);
if ($gotStatus) {
$response .= $line;
- if (rtrim($line) === '') break;
+ if (rtrim($line) === '') {
+ break;
+ }
}
}
@@ -412,7 +416,9 @@ class Socket implements HttpAdapter, StreamInterface
$statusCode = $responseObj->getStatusCode();
// Handle 100 and 101 responses internally by restarting the read again
- if ($statusCode == 100 || $statusCode == 101) return $this->read();
+ if ($statusCode == 100 || $statusCode == 101) {
+ return $this->read();
+ }
// Check headers to see what kind of connection / transfer encoding we have
$headers = $responseObj->getHeaders();
@@ -423,7 +429,6 @@ class Socket implements HttpAdapter, StreamInterface
*/
if ($statusCode == 304 || $statusCode == 204 ||
$this->method == \Zend\Http\Request::METHOD_HEAD) {
-
// Close the connection if requested to do so by the server
$connection = $headers->get('connection');
if ($connection && $connection->getFieldValue() == 'close') {
@@ -436,9 +441,7 @@ class Socket implements HttpAdapter, StreamInterface
$transferEncoding = $headers->get('transfer-encoding');
$contentLength = $headers->get('content-length');
if ($transferEncoding !== false) {
-
if (strtolower($transferEncoding->getFieldValue()) == 'chunked') {
-
do {
$line = fgets($this->socket);
$this->_checkSocketReadTimeout();
@@ -461,20 +464,22 @@ class Socket implements HttpAdapter, StreamInterface
do {
$currentPos = ftell($this->socket);
- if ($currentPos >= $readTo) break;
+ if ($currentPos >= $readTo) {
+ break;
+ }
if ($this->outStream) {
if (stream_copy_to_stream($this->socket, $this->outStream, $readTo - $currentPos) == 0) {
- $this->_checkSocketReadTimeout();
- break;
- }
+ $this->_checkSocketReadTimeout();
+ break;
+ }
} else {
$line = fread($this->socket, $readTo - $currentPos);
if ($line === false || strlen($line) === 0) {
$this->_checkSocketReadTimeout();
break;
}
- $chunk .= $line;
+ $chunk .= $line;
}
} while (! feof($this->socket));
@@ -500,7 +505,6 @@ class Socket implements HttpAdapter, StreamInterface
}
// Else, if we got the content-length header, read this number of bytes
} elseif ($contentLength !== false) {
-
// If we got more than one Content-Length header (see ZF-9404) use
// the last value sent
if (is_array($contentLength)) {
@@ -509,18 +513,16 @@ class Socket implements HttpAdapter, StreamInterface
$contentLength = $contentLength->getFieldValue();
$currentPos = ftell($this->socket);
- $chunk = '';
for ($readTo = $currentPos + $contentLength;
$readTo > $currentPos;
$currentPos = ftell($this->socket)) {
-
- if ($this->outStream) {
- if (stream_copy_to_stream($this->socket, $this->outStream, $readTo - $currentPos) == 0) {
- $this->_checkSocketReadTimeout();
- break;
- }
- } else {
+ if ($this->outStream) {
+ if (stream_copy_to_stream($this->socket, $this->outStream, $readTo - $currentPos) == 0) {
+ $this->_checkSocketReadTimeout();
+ break;
+ }
+ } else {
$chunk = fread($this->socket, $readTo - $currentPos);
if ($chunk === false || strlen($chunk) === 0) {
$this->_checkSocketReadTimeout();
@@ -531,18 +533,19 @@ class Socket implements HttpAdapter, StreamInterface
}
// Break if the connection ended prematurely
- if (feof($this->socket)) break;
+ if (feof($this->socket)) {
+ break;
+ }
}
// Fallback: just read the response until EOF
} else {
-
do {
if ($this->outStream) {
if (stream_copy_to_stream($this->socket, $this->outStream) == 0) {
- $this->_checkSocketReadTimeout();
- break;
- }
+ $this->_checkSocketReadTimeout();
+ break;
+ }
} else {
$buff = fread($this->socket, 8192);
if ($buff === false || strlen($buff) === 0) {
@@ -552,7 +555,6 @@ class Socket implements HttpAdapter, StreamInterface
$response .= $buff;
}
}
-
} while (feof($this->socket) === false);
$this->close();
@@ -624,7 +626,9 @@ class Socket implements HttpAdapter, StreamInterface
public function __destruct()
{
if (! $this->config['persistent']) {
- if ($this->socket) $this->close();
+ if ($this->socket) {
+ $this->close();
+ }
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/StreamInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/StreamInterface.php
index 6dd1a5045de..63ca174dce8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/StreamInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/StreamInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php
index b57e88e26d2..0de14a157b6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Test.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -56,7 +56,8 @@ class Test implements AdapterInterface
* Adapter constructor, currently empty. Config is set using setOptions()
*/
public function __construct()
- { }
+ {
+ }
/**
* Set the nextRequestWillFail flag
@@ -124,17 +125,21 @@ class Test implements AdapterInterface
public function write($method, $uri, $httpVer = '1.1', $headers = array(), $body = '')
{
$host = $uri->getHost();
- $host = (strtolower($uri->getScheme()) == 'https' ? 'sslv2://' . $host : $host);
+ $host = (strtolower($uri->getScheme()) == 'https' ? 'sslv2://' . $host : $host);
// Build request headers
$path = $uri->getPath();
if (empty($path)) {
$path = '/';
}
- if ($uri->getQuery()) $path .= '?' . $uri->getQuery();
+ if ($uri->getQuery()) {
+ $path .= '?' . $uri->getQuery();
+ }
$request = "{$method} {$path} HTTP/{$httpVer}\r\n";
foreach ($headers as $k => $v) {
- if (is_string($k)) $v = ucfirst($k) . ": $v";
+ if (is_string($k)) {
+ $v = ucfirst($k) . ": $v";
+ }
$request .= "$v\r\n";
}
@@ -164,7 +169,8 @@ class Test implements AdapterInterface
*
*/
public function close()
- { }
+ {
+ }
/**
* Set the HTTP response(s) to be returned by this adapter
@@ -188,9 +194,9 @@ class Test implements AdapterInterface
*/
public function addResponse($response)
{
- if ($response instanceof Response) {
+ if ($response instanceof Response) {
$response = $response->toString();
- }
+ }
$this->responses[] = $response;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Cookies.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Cookies.php
deleted file mode 100644
index e8ecd633627..00000000000
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Cookies.php
+++ /dev/null
@@ -1,499 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Http\Client;
-
-use ArrayIterator;
-use Traversable;
-use Zend\Http\Header\SetCookie;
-use Zend\Http\Response;
-use Zend\Stdlib\ArrayUtils;
-use Zend\Uri;
-
-/**
- * A Cookies object is designed to contain and maintain HTTP cookies, and should
- * be used along with Zend\Http\Client in order to manage cookies across HTTP requests and
- * responses.
- *
- * The class contains an array of Zend\Http\Header\Cookie objects. Cookies can be added
- * automatically from a request or manually. Then, the Cookies class can find and return the
- * cookies needed for a specific HTTP request.
- *
- * A special parameter can be passed to all methods of this class that return cookies: Cookies
- * can be returned either in their native form (as Zend\Http\Header\Cookie objects) or as strings -
- * the later is suitable for sending as the value of the "Cookie" header in an HTTP request.
- * You can also choose, when returning more than one cookie, whether to get an array of strings
- * (by passing Zend\Http\Client\Cookies::COOKIE_STRING_ARRAY) or one unified string for all cookies
- * (by passing Zend\Http\Client\Cookies::COOKIE_STRING_CONCAT).
- *
- * @link http://wp.netscape.com/newsref/std/cookie_spec.html for some specs.
- */
-class Cookies
-{
- /**
- * Return cookie(s) as a Zend\Http\Header\Cookie object
- *
- */
- const COOKIE_OBJECT = 0;
-
- /**
- * Return cookie(s) as a string (suitable for sending in an HTTP request)
- *
- */
- const COOKIE_STRING_ARRAY = 1;
-
- /**
- * Return all cookies as one long string (suitable for sending in an HTTP request)
- *
- */
- const COOKIE_STRING_CONCAT = 2;
-
- /**
- * Array storing cookies
- *
- * Cookies are stored according to domain and path:
- * $cookies
- * + www.mydomain.com
- * + /
- * - cookie1
- * - cookie2
- * + /somepath
- * - othercookie
- * + www.otherdomain.net
- * + /
- * - alsocookie
- *
- * @var array
- */
- protected $cookies = array();
-
- /**
- * The Zend\Http\Header\Cookie array
- *
- * @var array
- */
- protected $rawCookies = array();
-
- /**
- * Add a cookie to the class. Cookie should be passed either as a Zend\Http\Header\Cookie object
- * or as a string - in which case an object is created from the string.
- *
- * @param SetCookie|string $cookie
- * @param Uri\Uri|string $refUri Optional reference URI (for domain, path, secure)
- * @throws Exception\InvalidArgumentException if invalid $cookie value
- */
- public function addCookie($cookie, $refUri = null)
- {
- if (is_string($cookie)) {
- $cookie = SetCookie::fromString($cookie, $refUri);
- }
-
- if ($cookie instanceof SetCookie) {
- $domain = $cookie->getDomain();
- $path = $cookie->getPath();
- if (!isset($this->cookies[$domain])) {
- $this->cookies[$domain] = array();
- }
- if (!isset($this->cookies[$domain][$path])) {
- $this->cookies[$domain][$path] = array();
- }
- $this->cookies[$domain][$path][$cookie->getName()] = $cookie;
- $this->rawCookies[] = $cookie;
- } else {
- throw new Exception\InvalidArgumentException('Supplient argument is not a valid cookie string or object');
- }
- }
-
- /**
- * Parse an HTTP response, adding all the cookies set in that response
- *
- * @param Response $response
- * @param Uri\Uri|string $refUri Requested URI
- */
- public function addCookiesFromResponse(Response $response, $refUri)
- {
- $cookieHdrs = $response->getHeaders()->get('Set-Cookie');
- if ($cookieHdrs instanceof Traversable) {
- $cookieHdrs = ArrayUtils::iteratorToArray($cookieHdrs);
- }
-
- if (is_array($cookieHdrs)) {
- foreach ($cookieHdrs as $cookie) {
- $this->addCookie($cookie, $refUri);
- }
- } elseif (is_string($cookieHdrs)) {
- $this->addCookie($cookieHdrs, $refUri);
- }
- }
-
- /**
- * Get all cookies in the cookie jar as an array
- *
- * @param int $retAs Whether to return cookies as objects of \Zend\Http\Header\Cookie or as strings
- * @return array|string
- */
- public function getAllCookies($retAs = self::COOKIE_OBJECT)
- {
- $cookies = $this->_flattenCookiesArray($this->cookies, $retAs);
- return $cookies;
- }
-
- /**
- * Return an array of all cookies matching a specific request according to the request URI,
- * whether session cookies should be sent or not, and the time to consider as "now" when
- * checking cookie expiry time.
- *
- * @param string|Uri\Uri $uri URI to check against (secure, domain, path)
- * @param bool $matchSessionCookies Whether to send session cookies
- * @param int $retAs Whether to return cookies as objects of \Zend\Http\Header\Cookie or as strings
- * @param int $now Override the current time when checking for expiry time
- * @throws Exception\InvalidArgumentException if invalid URI
- * @return array|string
- */
- public function getMatchingCookies($uri, $matchSessionCookies = true,
- $retAs = self::COOKIE_OBJECT, $now = null)
- {
- if (is_string($uri)) {
- $uri = Uri\UriFactory::factory($uri, 'http');
- } elseif (!$uri instanceof Uri\Uri) {
- throw new Exception\InvalidArgumentException("Invalid URI string or object passed");
- }
-
- $host = $uri->getHost();
- if (empty($host)) {
- throw new Exception\InvalidArgumentException('Invalid URI specified; does not contain a host');
- }
-
- // First, reduce the array of cookies to only those matching domain and path
- $cookies = $this->_matchDomain($host);
- $cookies = $this->_matchPath($cookies, $uri->getPath());
- $cookies = $this->_flattenCookiesArray($cookies, self::COOKIE_OBJECT);
-
- // Next, run Cookie->match on all cookies to check secure, time and session matching
- $ret = array();
- foreach ($cookies as $cookie)
- if ($cookie->match($uri, $matchSessionCookies, $now))
- $ret[] = $cookie;
-
- // Now, use self::_flattenCookiesArray again - only to convert to the return format ;)
- $ret = $this->_flattenCookiesArray($ret, $retAs);
-
- return $ret;
- }
-
- /**
- * Get a specific cookie according to a URI and name
- *
- * @param Uri\Uri|string $uri The uri (domain and path) to match
- * @param string $cookieName The cookie's name
- * @param int $retAs Whether to return cookies as objects of \Zend\Http\Header\Cookie or as strings
- * @throws Exception\InvalidArgumentException if invalid URI specified or invalid $retAs value
- * @return Cookie|string
- */
- public function getCookie($uri, $cookieName, $retAs = self::COOKIE_OBJECT)
- {
- if (is_string($uri)) {
- $uri = Uri\UriFactory::factory($uri, 'http');
- } elseif (!$uri instanceof Uri\Uri) {
- throw new Exception\InvalidArgumentException('Invalid URI specified');
- }
-
- $host = $uri->getHost();
- if (empty($host)) {
- throw new Exception\InvalidArgumentException('Invalid URI specified; host missing');
- }
-
- // Get correct cookie path
- $path = $uri->getPath();
- $path = substr($path, 0, strrpos($path, '/'));
- if (! $path) $path = '/';
-
- if (isset($this->cookies[$uri->getHost()][$path][$cookieName])) {
- $cookie = $this->cookies[$uri->getHost()][$path][$cookieName];
-
- switch ($retAs) {
- case self::COOKIE_OBJECT:
- return $cookie;
- break;
-
- case self::COOKIE_STRING_ARRAY:
- case self::COOKIE_STRING_CONCAT:
- return $cookie->__toString();
- break;
-
- default:
- throw new Exception\InvalidArgumentException("Invalid value passed for \$retAs: {$retAs}");
- break;
- }
- }
-
- return false;
- }
-
- /**
- * Helper function to recursively flatten an array. Should be used when exporting the
- * cookies array (or parts of it)
- *
- * @param \Zend\Http\Header\Cookie|array $ptr
- * @param int $retAs What value to return
- * @return array|string
- */
- protected function _flattenCookiesArray($ptr, $retAs = self::COOKIE_OBJECT)
- {
- if (is_array($ptr)) {
- $ret = ($retAs == self::COOKIE_STRING_CONCAT ? '' : array());
- foreach ($ptr as $item) {
- if ($retAs == self::COOKIE_STRING_CONCAT) {
- $ret .= $this->_flattenCookiesArray($item, $retAs);
- } else {
- $ret = array_merge($ret, $this->_flattenCookiesArray($item, $retAs));
- }
- }
- return $ret;
- } elseif ($ptr instanceof SetCookie) {
- switch ($retAs) {
- case self::COOKIE_STRING_ARRAY:
- return array($ptr->__toString());
- break;
-
- case self::COOKIE_STRING_CONCAT:
- return $ptr->__toString();
- break;
-
- case self::COOKIE_OBJECT:
- default:
- return array($ptr);
- break;
- }
- }
-
- return null;
- }
-
- /**
- * Return a subset of the cookies array matching a specific domain
- *
- * @param string $domain
- * @return array
- */
- protected function _matchDomain($domain)
- {
- $ret = array();
-
- foreach (array_keys($this->cookies) as $cdom) {
- if (SetCookie::matchCookieDomain($cdom, $domain)) {
- $ret[$cdom] = $this->cookies[$cdom];
- }
- }
-
- return $ret;
- }
-
- /**
- * Return a subset of a domain-matching cookies that also match a specified path
- *
- * @param array $domains
- * @param string $path
- * @return array
- */
- protected function _matchPath($domains, $path)
- {
- $ret = array();
-
- foreach ($domains as $dom => $pathsArray) {
- foreach (array_keys($pathsArray) as $cpath) {
- if (SetCookie::matchCookiePath($cpath, $path)) {
- if (! isset($ret[$dom])) {
- $ret[$dom] = array();
- }
-
- $ret[$dom][$cpath] = $pathsArray[$cpath];
- }
- }
- }
-
- return $ret;
- }
-
- /**
- * Create a new Cookies object and automatically load into it all the
- * cookies set in an Http_Response object. If $uri is set, it will be
- * considered as the requested URI for setting default domain and path
- * of the cookie.
- *
- * @param Response $response HTTP Response object
- * @param Uri\Uri|string $refUri The requested URI
- * @return Cookies
- * @todo Add the $uri functionality.
- */
- public static function fromResponse(Response $response, $refUri)
- {
- $jar = new static();
- $jar->addCookiesFromResponse($response, $refUri);
- return $jar;
- }
-
- /**
- * Required by Countable interface
- *
- * @return int
- */
- public function count()
- {
- return count($this->rawCookies);
- }
-
- /**
- * Required by IteratorAggregate interface
- *
- * @return ArrayIterator
- */
- public function getIterator()
- {
- return new ArrayIterator($this->rawCookies);
- }
-
- /**
- * Tells if the array of cookies is empty
- *
- * @return bool
- */
- public function isEmpty()
- {
- return count($this) == 0;
- }
-
- /**
- * Empties the cookieJar of any cookie
- *
- * @return Cookies
- */
- public function reset()
- {
- $this->cookies = $this->rawCookies = array();
- return $this;
- }
-
- /**
- * (PHP 5 >= 5.1.0)<br/>
- * Whether a offset exists
- * @link http://php.net/manual/en/arrayaccess.offsetexists.php
- * @param mixed $offset <p>
- * An offset to check for.
- * </p>
- * @return bool Returns true on success or false on failure.
- * </p>
- * <p>
- * The return value will be casted to boolean if non-boolean was returned.
- */
- public function offsetExists($offset)
- {
- // TODO: Implement offsetExists() method.
- }
-
- /**
- * (PHP 5 >= 5.1.0)<br/>
- * Offset to retrieve
- * @link http://php.net/manual/en/arrayaccess.offsetget.php
- * @param mixed $offset <p>
- * The offset to retrieve.
- * </p>
- * @return mixed Can return all value types.
- */
- public function offsetGet($offset)
- {
- // TODO: Implement offsetGet() method.
- }
-
- /**
- * (PHP 5 >= 5.1.0)<br/>
- * Offset to set
- * @link http://php.net/manual/en/arrayaccess.offsetset.php
- * @param mixed $offset <p>
- * The offset to assign the value to.
- * </p>
- * @param mixed $value <p>
- * The value to set.
- * </p>
- * @return void
- */
- public function offsetSet($offset, $value)
- {
- // TODO: Implement offsetSet() method.
- }
-
- /**
- * (PHP 5 >= 5.1.0)<br/>
- * Offset to unset
- * @link http://php.net/manual/en/arrayaccess.offsetunset.php
- * @param mixed $offset <p>
- * The offset to unset.
- * </p>
- * @return void
- */
- public function offsetUnset($offset)
- {
- // TODO: Implement offsetUnset() method.
- }
-
- /**
- * (PHP 5 >= 5.1.0)<br/>
- * String representation of object
- * @link http://php.net/manual/en/serializable.serialize.php
- * @return string the string representation of the object or &null;
- */
- public function serialize()
- {
- // TODO: Implement serialize() method.
- }
-
- /**
- * (PHP 5 >= 5.1.0)<br/>
- * Constructs the object
- * @link http://php.net/manual/en/serializable.unserialize.php
- * @param string $serialized <p>
- * The string representation of the object.
- * </p>
- * @return mixed the original value unserialized.
- */
- public function unserialize($serialized)
- {
- // TODO: Implement unserialize() method.
- }
-
- public function fromArray(array $values)
- {
- // TODO: Implement fromArray() method.
- }
-
- public function fromString($string)
- {
- // TODO: Implement fromString() method.
- }
-
- public function toArray()
- {
- // TODO: Implement toArray() method.
- }
-
- public function toString()
- {
- // TODO: Implement toString() method.
- }
-
- public function get($name, $default = null)
- {
- // TODO: Implement get() method.
- }
-
- public function set($name, $value)
- {
- // TODO: Implement set() method.
- }
-}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/ExceptionInterface.php
index 5e9723b97c1..aba1a69a51d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Http\Client\Exception;
use Zend\Http\Exception\ExceptionInterface as HttpException;
interface ExceptionInterface extends HttpException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/InvalidArgumentException.php
index bfe9b72aec2..bac8ed32f95 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use Zend\Http\Exception;
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/OutOfRangeException.php
index 24e255a3807..2de55df604a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ use Zend\Http\Exception;
class OutOfRangeException extends Exception\OutOfRangeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/RuntimeException.php
index 34ef3b2236e..39010f068a9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use Zend\Http\Exception;
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/ClientStatic.php b/vendor/zendframework/zendframework/library/Zend/Http/ClientStatic.php
index 5d626e1bf16..6c84443863b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/ClientStatic.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/ClientStatic.php
@@ -3,19 +3,17 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Http;
-
/**
* Http static client
*/
class ClientStatic
{
-
protected static $client;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Cookies.php b/vendor/zendframework/zendframework/library/Zend/Http/Cookies.php
index 499e9f3897c..eae2a0a6949 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Cookies.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Cookies.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use ArrayIterator;
use Zend\Http\Header\SetCookie;
use Zend\Uri;
-
/**
* A Zend\Http\Cookies object is designed to contain and maintain HTTP cookies, and should
* be used along with Zend\Http\Client in order to manage cookies across HTTP requests and
@@ -60,7 +59,7 @@ class Cookies extends Headers
const COOKIE_STRING_CONCAT_STRICT = 3;
/**
- * @var \Zend\Http\Cookies
+ * @var array
*/
protected $cookies = array();
@@ -161,9 +160,12 @@ class Cookies extends Headers
* @throws Exception\InvalidArgumentException if invalid URI specified
* @return array|string
*/
- public function getMatchingCookies($uri, $matchSessionCookies = true,
- $retAs = self::COOKIE_OBJECT, $now = null)
- {
+ public function getMatchingCookies(
+ $uri,
+ $matchSessionCookies = true,
+ $retAs = self::COOKIE_OBJECT,
+ $now = null
+ ) {
if (is_string($uri)) {
$uri = Uri\UriFactory::factory($uri, 'http');
} elseif (!$uri instanceof Uri\Uri) {
@@ -331,7 +333,7 @@ class Cookies extends Headers
/**
* Create a new Cookies object and automatically load into it all the
- * cookies set in an Http_Response object. If $uri is set, it will be
+ * cookies set in a Response object. If $uri is set, it will be
* considered as the requested URI for setting default domain and path
* of the cookie.
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Exception/ExceptionInterface.php
index b58caddf889..365c90aa0ba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Http/Exception/InvalidArgumentException.php
index fb20cde7dc3..926716933d8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Exception/OutOfRangeException.php
index 4faf9667e41..e3e0fd150f8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Exception/OutOfRangeException.php
@@ -3,12 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Http\Exception;
-class OutOfRangeException extends \OutOfRangeException implements
- ExceptionInterface
-{}
+class OutOfRangeException extends \OutOfRangeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Exception/RuntimeException.php
index 9f1ed68eefe..6b924eb7a27 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractAccept.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractAccept.php
index 2f912919bfd..4b9f3bc23a3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractAccept.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractAccept.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -38,10 +38,9 @@ use stdClass;
*/
abstract class AbstractAccept implements HeaderInterface
{
-
/**
*
- * @var array
+ * @var stdClass[]
*/
protected $fieldValueParts = array();
@@ -54,20 +53,23 @@ abstract class AbstractAccept implements HeaderInterface
*/
protected $sorted = false;
-
/**
+ * Parse a full header line or just the field value part.
*
* @param string $headerLine
*/
public function parseHeaderLine($headerLine)
{
- $fieldName = $this->getFieldName();
- $pos = strlen($fieldName) + 2;
- if (strtolower(substr($headerLine, 0, $pos)) == strtolower($fieldName) . ': ') {
- $headerLine = substr($headerLine, $pos);
+ if (strpos($headerLine, ':') !== false) {
+ list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
+ if (strtolower($name) !== strtolower($this->getFieldName())) {
+ $value = $headerLine; // This is just for preserve the BC.
+ }
+ } else {
+ $value = $headerLine;
}
- foreach ($this->getFieldValuePartsFromHeaderLine($headerLine) as $value) {
+ foreach ($this->getFieldValuePartsFromHeaderLine($value) as $value) {
$this->addFieldValuePartToQueue($value);
}
}
@@ -99,7 +101,7 @@ abstract class AbstractAccept implements HeaderInterface
|| !isset($values[0])
) {
throw new Exception\InvalidArgumentException(
- 'Invalid header line for ' . $this->getFieldName() . ' header string'
+ 'Invalid header line for ' . $this->getFieldName() . ' header string'
);
}
@@ -179,7 +181,6 @@ abstract class AbstractAccept implements HeaderInterface
return $params;
}
-
/**
* Get field value
*
@@ -202,7 +203,6 @@ abstract class AbstractAccept implements HeaderInterface
return implode(', ', $strings);
}
-
/**
* Assemble and escape the field value parameters based on RFC 2616 section 2.1
*
@@ -216,7 +216,8 @@ abstract class AbstractAccept implements HeaderInterface
$separators = array('(', ')', '<', '>', '@', ',', ';', ':',
'/', '[', ']', '?', '=', '{', '}', ' ', "\t");
- $escaped = preg_replace_callback('/[[:cntrl:]"\\\\]/', // escape cntrl, ", \
+ $escaped = preg_replace_callback(
+ '/[[:cntrl:]"\\\\]/', // escape cntrl, ", \
function ($v) {
return '\\' . $v[0];
},
@@ -266,15 +267,14 @@ abstract class AbstractAccept implements HeaderInterface
}
$assembledString = $this->getFieldValue(
- array((object) array('typeString' => $type, 'params' => $params))
- );
+ array((object) array('typeString' => $type, 'params' => $params))
+ );
$value = $this->parseFieldValuePart($assembledString);
$this->addFieldValuePartToQueue($value);
return $this;
}
-
/**
* Does the header have the requested type?
*
@@ -290,7 +290,7 @@ abstract class AbstractAccept implements HeaderInterface
* Match a media string against this header
*
* @param array|string $matchAgainst
- * @return Accept\FieldValuePart\AcceptFieldValuePart|bool The matched value or false
+ * @return Accept\FieldValuePArt\AcceptFieldValuePart|bool The matched value or false
*/
public function match($matchAgainst)
{
@@ -309,11 +309,9 @@ abstract class AbstractAccept implements HeaderInterface
}
if ($left->type == $right->type) {
- if ((($left->subtype == $right->subtype ||
- ($right->subtype == '*' || $left->subtype == '*')) &&
- ($left->format == $right->format ||
- $right->format == '*' || $left->format == '*')))
- {
+ if (($left->subtype == $right->subtype || ($right->subtype == '*' || $left->subtype == '*')) &&
+ ($left->format == $right->format || $right->format == '*' || $left->format == '*')
+ ) {
if ($this->matchAcceptParams($left, $right)) {
$left->setMatchedAgainst($right);
@@ -321,8 +319,6 @@ abstract class AbstractAccept implements HeaderInterface
}
}
}
-
-
}
}
@@ -371,13 +367,11 @@ abstract class AbstractAccept implements HeaderInterface
return false;
}
}
-
}
return $match1;
}
-
/**
* Add a key/value combination to the internal queue
*
@@ -411,7 +405,7 @@ abstract class AbstractAccept implements HeaderInterface
*/
protected function sortFieldValueParts()
{
- $sort = function ($a, $b) { // If A has higher prio than B, return -1.
+ $sort = function ($a, $b) { // If A has higher precedence than B, return -1.
if ($a->priority > $b->priority) {
return -1;
} elseif ($a->priority < $b->priority) {
@@ -436,8 +430,10 @@ abstract class AbstractAccept implements HeaderInterface
//@todo count number of dots in case of type==application in subtype
- // So far they're still the same. Longest stringlength may be more specific
- if (strlen($a->raw) == strlen($b->raw)) return 0;
+ // So far they're still the same. Longest string length may be more specific
+ if (strlen($a->raw) == strlen($b->raw)) {
+ return 0;
+ }
return (strlen($a->raw) > strlen($b->raw)) ? -1 : 1;
};
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractDate.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractDate.php
index 5990dc4fa3b..42bf30dd732 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractDate.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractDate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractLocation.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractLocation.php
index d7381d8a706..ed262c89875 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractLocation.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractLocation.php
@@ -3,18 +3,16 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Http\Header;
use Zend\Uri\Exception as UriException;
-use Zend\Uri\Uri;
use Zend\Uri\UriFactory;
use Zend\Uri\UriInterface;
-
/**
* Abstract Location Header
* Supports headers that have URI as value
@@ -75,9 +73,9 @@ abstract class AbstractLocation implements HeaderInterface
$uri = UriFactory::factory($uri);
} catch (UriException\InvalidUriPartException $e) {
throw new Exception\InvalidArgumentException(
- sprintf('Invalid URI passed as string (%s)', (string) $uri),
- $e->getCode(),
- $e
+ sprintf('Invalid URI passed as string (%s)', (string) $uri),
+ $e->getCode(),
+ $e
);
}
} elseif (!($uri instanceof UriInterface)) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php
index 2c344d352fc..de74a92153e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/AbstractFieldValuePart.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/AbstractFieldValuePart.php
index 6e129acdf43..2c1c10961df 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/AbstractFieldValuePart.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/AbstractFieldValuePart.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ namespace Zend\Http\Header\Accept\FieldValuePart;
*/
abstract class AbstractFieldValuePart
{
-
/**
* Internal object used for value retrieval
* @var object
@@ -95,7 +94,7 @@ abstract class AbstractFieldValuePart
}
/**
- * @return raw $raw
+ * @return string $raw
*/
public function getRaw()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/AcceptFieldValuePart.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/AcceptFieldValuePart.php
index d14bedb13ec..e8e2ef1cd6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/AcceptFieldValuePart.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/AcceptFieldValuePart.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ namespace Zend\Http\Header\Accept\FieldValuePart;
*/
class AcceptFieldValuePart extends AbstractFieldValuePart
{
-
/**
* @return string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/CharsetFieldValuePart.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/CharsetFieldValuePart.php
index 9a4e76fb759..9956d795a22 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/CharsetFieldValuePart.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/CharsetFieldValuePart.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ namespace Zend\Http\Header\Accept\FieldValuePart;
*/
class CharsetFieldValuePart extends AbstractFieldValuePart
{
-
/**
*
* @return string
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/EncodingFieldValuePart.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/EncodingFieldValuePart.php
index 7413f093d2e..af73becd232 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/EncodingFieldValuePart.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/EncodingFieldValuePart.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,13 +17,12 @@ namespace Zend\Http\Header\Accept\FieldValuePart;
*/
class EncodingFieldValuePart extends AbstractFieldValuePart
{
-
/**
*
* @return string
*/
public function getEncoding()
{
- return $this->type;
+ return $this->getInternalValues()->type;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/LanguageFieldValuePart.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/LanguageFieldValuePart.php
index 9f8ba704e67..a5b345128b4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/LanguageFieldValuePart.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/LanguageFieldValuePart.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ namespace Zend\Http\Header\Accept\FieldValuePart;
*/
class LanguageFieldValuePart extends AbstractFieldValuePart
{
-
public function getLanguage()
{
return $this->getInternalValues()->typeString;
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptCharset.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptCharset.php
index 5c49c93d282..cd80e752339 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptCharset.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptCharset.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptEncoding.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptEncoding.php
index b5771b0f19e..d5bea1ef6da 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptEncoding.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptEncoding.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,6 @@ use Zend\Http\Header\Accept\FieldValuePart;
*/
class AcceptEncoding extends AbstractAccept
{
-
protected $regexAddType = '#^([a-zA-Z0-9+-]+|\*)$#';
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptLanguage.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptLanguage.php
index f36473a3577..7c00b2591a7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptLanguage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptLanguage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,6 @@ use Zend\Http\Header\Accept\FieldValuePart;
*/
class AcceptLanguage extends AbstractAccept
{
-
protected $regexAddType = '#^([a-zA-Z0-9+-]+|\*)$#';
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptRanges.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptRanges.php
index 0dd275cc578..b084df1e3a4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptRanges.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptRanges.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,13 +16,10 @@ namespace Zend\Http\Header;
*/
class AcceptRanges implements HeaderInterface
{
-
- protected $rangeUnit = null;
+ protected $rangeUnit;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -30,11 +27,16 @@ class AcceptRanges implements HeaderInterface
throw new Exception\InvalidArgumentException('Invalid header line for Accept-Ranges string');
}
- $header->rangeUnit = trim($value);
+ $header = new static($value);
return $header;
}
+ public function __construct($rangeUnit = null)
+ {
+ $this->rangeUnit = $rangeUnit;
+ }
+
public function getFieldName()
{
return 'Accept-Ranges';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Age.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Age.php
index 985fd180c17..aa8637ee60c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Age.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Age.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -21,7 +21,7 @@ class Age implements HeaderInterface
*
* @var int
*/
- protected $deltaSeconds = null;
+ protected $deltaSeconds;
/**
* Create Age header from string
@@ -32,8 +32,6 @@ class Age implements HeaderInterface
*/
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -41,11 +39,18 @@ class Age implements HeaderInterface
throw new Exception\InvalidArgumentException('Invalid header line for Age string: "' . $name . '"');
}
- $header->deltaSeconds = (int) $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($deltaSeconds = null)
+ {
+ if ($deltaSeconds) {
+ $this->setDeltaSeconds($deltaSeconds);
+ }
+ }
+
/**
* Get header name
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Allow.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Allow.php
index 87da3977cdb..aee66731f9a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Allow.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Allow.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -46,8 +46,6 @@ class Allow implements HeaderInterface
*/
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -55,14 +53,9 @@ class Allow implements HeaderInterface
throw new Exception\InvalidArgumentException('Invalid header line for Allow string: "' . $name . '"');
}
- // reset list of methods
- $header->methods = array_fill_keys(array_keys($header->methods), false);
-
- // allow methods from header line
- foreach (explode(',', $value) as $method) {
- $method = trim(strtoupper($method));
- $header->methods[$method] = true;
- }
+ $header = new static();
+ $header->disallowMethods(array_keys($header->getAllMethods()));
+ $header->allowMethods(explode(',', $value));
return $header;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AuthenticationInfo.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AuthenticationInfo.php
index e59eaf61c7e..73e0044a822 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AuthenticationInfo.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AuthenticationInfo.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class AuthenticationInfo implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class AuthenticationInfo implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Authentication-Info';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Authorization.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Authorization.php
index aeee2441aa0..197eef9749f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Authorization.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Authorization.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Authorization implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Authorization implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Authorization';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/CacheControl.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/CacheControl.php
index a048450cbc4..fa1e429bee2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/CacheControl.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/CacheControl.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,6 +15,8 @@ namespace Zend\Http\Header;
*/
class CacheControl implements HeaderInterface
{
+ /** @var string */
+ protected $value;
/**
* Array of Cache-Control directives
@@ -32,8 +34,6 @@ class CacheControl implements HeaderInterface
*/
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -41,8 +41,13 @@ class CacheControl implements HeaderInterface
throw new Exception\InvalidArgumentException('Invalid header line for Cache-Control string: "' . $name . '"');
}
+ $directives = static::parseValue($value);
+
// @todo implementation details
- $header->directives = static::parseValue($value);
+ $header = new static();
+ foreach ($directives as $key => $value) {
+ $header->addDirective($key, $value);
+ }
return $header;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Connection.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Connection.php
index 16cb1258be9..45be7259e39 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Connection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Connection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -47,7 +47,6 @@ class Connection implements HeaderInterface
return $header;
}
-
/**
* Set Connection header to define persistent connection
*
@@ -87,7 +86,6 @@ class Connection implements HeaderInterface
return $this;
}
-
/**
* Connection header name
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentDisposition.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentDisposition.php
index 4dd3f969e4a..1c24f7a654f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentDisposition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentDisposition.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class ContentDisposition implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class ContentDisposition implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Content-Disposition';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentEncoding.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentEncoding.php
index 38e350606f3..c166b66a800 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentEncoding.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentEncoding.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class ContentEncoding implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class ContentEncoding implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Content-Encoding';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLanguage.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLanguage.php
index fcd5e1e12bc..104911f09fb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLanguage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLanguage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class ContentLanguage implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class ContentLanguage implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Content-Language';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLength.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLength.php
index b07f322c087..62e5bde0cbd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLength.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLength.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class ContentLength implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class ContentLength implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Content-Length';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLocation.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLocation.php
index 018761d2bf4..5238e36dc92 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLocation.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLocation.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentMD5.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentMD5.php
index 47792290ae1..581de8157d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentMD5.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentMD5.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class ContentMD5 implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class ContentMD5 implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Content-MD5';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentRange.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentRange.php
index 09146756d96..100eedd656b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentRange.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentRange.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class ContentRange implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class ContentRange implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Content-Range';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentSecurityPolicy.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentSecurityPolicy.php
new file mode 100644
index 00000000000..85f1cff0eb8
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentSecurityPolicy.php
@@ -0,0 +1,150 @@
+<?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\Http\Header;
+
+/**
+ * Content Security Policy 1.0 Header
+ *
+ * @link http://www.w3.org/TR/CSP/
+ */
+class ContentSecurityPolicy implements HeaderInterface
+{
+ /**
+ * Valid directive names
+ *
+ * @var array
+ */
+ protected $validDirectiveNames = array(
+ // As per http://www.w3.org/TR/CSP/#directives
+ 'default-src',
+ 'script-src',
+ 'object-src',
+ 'style-src',
+ 'img-src',
+ 'media-src',
+ 'frame-src',
+ 'font-src',
+ 'connect-src',
+ 'sandbox',
+ 'report-uri',
+ );
+
+ /**
+ * The directives defined for this policy
+ *
+ * @var array
+ */
+ protected $directives = array();
+
+ /**
+ * Get the list of defined directives
+ *
+ * @return array
+ */
+ public function getDirectives()
+ {
+ return $this->directives;
+ }
+
+ /**
+ * Sets the directive to consist of the source list
+ *
+ * Reverses http://www.w3.org/TR/CSP/#parsing-1
+ *
+ * @param string $name The directive name.
+ * @param array $sources The source list.
+ * @return self
+ * @throws Exception\InvalidArgumentException If the name is not a valid directive name.
+ */
+ public function setDirective($name, array $sources)
+ {
+ if (!in_array($name, $this->validDirectiveNames, true)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects a valid directive name; received "%s"',
+ __METHOD__,
+ (string) $name
+ ));
+ }
+ if (empty($sources)) {
+ $this->directives[$name] = "'none'";
+ } else {
+ $this->directives[$name] = implode(' ', $sources);
+ }
+ return $this;
+ }
+
+ /**
+ * Create Content Security Policy header from a given header line
+ *
+ * @param string $headerLine The header line to parse.
+ * @return self
+ * @throws Exception\InvalidArgumentException If the name field in the given header line does not match.
+ */
+ public static function fromString($headerLine)
+ {
+ $header = new static();
+ $headerName = $header->getFieldName();
+ list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
+ // Ensure the proper header name
+ if (strcasecmp($name, $headerName) != 0) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'Invalid header line for %s string: "%s"',
+ $headerName,
+ $name
+ ));
+ }
+ // As per http://www.w3.org/TR/CSP/#parsing
+ $tokens = explode(';', $value);
+ foreach ($tokens as $token) {
+ $token = trim($token);
+ if ($token) {
+ list($directiveName, $directiveValue) = explode(' ', $token, 2);
+ if (!isset($header->directives[$directiveName])) {
+ $header->directives[$directiveName] = $directiveValue;
+ }
+ }
+ }
+ return $header;
+ }
+
+ /**
+ * Get the header name
+ *
+ * @return string
+ */
+ public function getFieldName()
+ {
+ return 'Content-Security-Policy';
+ }
+
+ /**
+ * Get the header value
+ *
+ * @return string
+ */
+ public function getFieldValue()
+ {
+ $directives = array();
+ foreach ($this->directives as $name => $value) {
+ $directives[] = sprintf('%s %s;', $name, $value);
+ }
+ return implode(' ', $directives);
+ }
+
+ /**
+ * Return the header as a string
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return sprintf('%s: %s', $this->getFieldName(), $this->getFieldValue());
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentTransferEncoding.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentTransferEncoding.php
index 37258bb4424..ec72a2169e8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentTransferEncoding.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentTransferEncoding.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class ContentTransferEncoding implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class ContentTransferEncoding implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static(strtolower($value));
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Content-Transfer-Encoding';
@@ -47,5 +52,4 @@ class ContentTransferEncoding implements HeaderInterface
{
return 'Content-Transfer-Encoding: ' . $this->getFieldValue();
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentType.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentType.php
index f05119b57e4..dad12d4a62e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentType.php
@@ -3,23 +3,43 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Http\Header;
+use stdClass;
+
/**
* @throws Exception\InvalidArgumentException
* @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.17
*/
class ContentType implements HeaderInterface
{
+ /**
+ * @var string
+ */
+ protected $mediaType;
+
+ /**
+ * @var array
+ */
+ protected $parameters = array();
+
+ /**
+ * @var string
+ */
+ protected $value;
+ /**
+ * Factory method: create an object from a string representation
+ *
+ * @param string $headerLine
+ * @return self
+ */
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -27,24 +47,346 @@ class ContentType implements HeaderInterface
throw new Exception\InvalidArgumentException('Invalid header line for Content-Type string: "' . $name . '"');
}
- // @todo implementation details
- $header->value = $value;
+ $parts = explode(';', $value);
+ $mediaType = array_shift($parts);
+ $header = new static($value, trim($mediaType));
+
+ if (count($parts) > 0) {
+ $parameters = array();
+ foreach ($parts as $parameter) {
+ $parameter = trim($parameter);
+ if (!preg_match('/^(?P<key>[^\s\=]+)\=(?P<value>[^\s\=]*)$/', $parameter, $matches)) {
+ continue;
+ }
+ $parameters[$matches['key']] = $matches['value'];
+ }
+ $header->setParameters($parameters);
+ }
return $header;
}
+ public function __construct($value = null, $mediaType = null)
+ {
+ $this->value = $value;
+ $this->mediaType = $mediaType;
+ }
+
+ /**
+ * Determine if the mediatype value in this header matches the provided criteria
+ *
+ * @param array|string $matchAgainst
+ * @return string|bool Matched value or false
+ */
+ public function match($matchAgainst)
+ {
+ if (is_string($matchAgainst)) {
+ $matchAgainst = $this->splitMediaTypesFromString($matchAgainst);
+ }
+
+ $mediaType = $this->getMediaType();
+ $left = $this->getMediaTypeObjectFromString($mediaType);
+
+ foreach ($matchAgainst as $matchType) {
+ $matchType = strtolower($matchType);
+
+ if ($mediaType == $matchType) {
+ return $matchType;
+ }
+
+ $right = $this->getMediaTypeObjectFromString($matchType);
+
+ // Is the right side a wildcard type?
+ if ($right->type == '*') {
+ if ($this->validateSubtype($right, $left)) {
+ return $matchType;
+ }
+ }
+
+ // Do the types match?
+ if ($right->type == $left->type) {
+ if ($this->validateSubtype($right, $left)) {
+ return $matchType;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Create a string representation of the header
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Content-Type: ' . $this->getFieldValue();
+ }
+
+ /**
+ * Get the field name
+ *
+ * @return string
+ */
public function getFieldName()
{
return 'Content-Type';
}
+ /**
+ * Get the field value
+ *
+ * @return string
+ */
public function getFieldValue()
{
- return $this->value;
+ if (null !== $this->value) {
+ return $this->value;
+ }
+ return $this->assembleValue();
}
- public function toString()
+ /**
+ * Set the media type
+ *
+ * @param string $mediaType
+ * @return self
+ */
+ public function setMediaType($mediaType)
{
- return 'Content-Type: ' . $this->getFieldValue();
+ $this->mediaType = strtolower($mediaType);
+ $this->value = null;
+ return $this;
+ }
+
+ /**
+ * Get the media type
+ *
+ * @return string
+ */
+ public function getMediaType()
+ {
+ return $this->mediaType;
+ }
+
+ /**
+ * Set additional content-type parameters
+ *
+ * @param array $parameters
+ * @return self
+ */
+ public function setParameters(array $parameters)
+ {
+ $this->parameters = array_merge($this->parameters, $parameters);
+ $this->value = null;
+ return $this;
+ }
+
+ /**
+ * Get any additional content-type parameters currently set
+ *
+ * @return array
+ */
+ public function getParameters()
+ {
+ return $this->parameters;
+ }
+
+ /**
+ * Set the content-type character set encoding
+ *
+ * @param string $charset
+ * @return self
+ */
+ public function setCharset($charset)
+ {
+ $this->parameters['charset'] = $charset;
+ $this->value = null;
+ return $this;
+ }
+
+ /**
+ * Get the content-type character set encoding, if any
+ *
+ * @return null|string
+ */
+ public function getCharset()
+ {
+ if (isset($this->parameters['charset'])) {
+ return $this->parameters['charset'];
+ }
+ return null;
+ }
+
+ /**
+ * Assemble the value based on the media type and any available parameters
+ *
+ * @return string
+ */
+ protected function assembleValue()
+ {
+ $mediaType = $this->getMediaType();
+ if (empty($this->parameters)) {
+ return $mediaType;
+ }
+
+ $parameters = array();
+ foreach ($this->parameters as $key => $value) {
+ $parameters[] = sprintf('%s=%s', $key, $value);
+ }
+
+ return sprintf('%s; %s', $mediaType, implode('; ', $parameters));
+ }
+
+ /**
+ * Split comma-separated media types into an array
+ *
+ * @param string $criteria
+ * @return array
+ */
+ protected function splitMediaTypesFromString($criteria)
+ {
+ $mediaTypes = explode(',', $criteria);
+ array_walk(
+ $mediaTypes,
+ function (&$value) {
+ $value = trim($value);
+ }
+ );
+
+ return $mediaTypes;
+ }
+
+ /**
+ * Split a mediatype string into an object with the following parts:
+ *
+ * - type
+ * - subtype
+ * - format
+ *
+ * @param string $string
+ * @return stdClass
+ */
+ protected function getMediaTypeObjectFromString($string)
+ {
+ if (!is_string($string)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'Non-string mediatype "%s" provided',
+ (is_object($string) ? get_class($string) : gettype($string))
+ ));
+ }
+
+ $parts = explode('/', $string, 2);
+ if (1 == count($parts)) {
+ throw new Exception\DomainException(sprintf(
+ 'Invalid mediatype "%s" provided',
+ $string
+ ));
+ }
+
+ $type = array_shift($parts);
+ $subtype = array_shift($parts);
+ $format = $subtype;
+ if (strstr($subtype, '+')) {
+ $parts = explode('+', $subtype, 2);
+ $subtype = array_shift($parts);
+ $format = array_shift($parts);
+ }
+
+ $mediaType = (object) array(
+ 'type' => $type,
+ 'subtype' => $subtype,
+ 'format' => $format,
+ );
+
+ return $mediaType;
+ }
+
+ /**
+ * Validate a subtype
+ *
+ * @param stdClass $right
+ * @param stdClass $left
+ * @return bool
+ */
+ protected function validateSubtype($right, $left)
+ {
+ // Is the right side a wildcard subtype?
+ if ($right->subtype == '*') {
+ return $this->validateFormat($right, $left);
+ }
+
+ // Do the right side and left side subtypes match?
+ if ($right->subtype == $left->subtype) {
+ return $this->validateFormat($right, $left);
+ }
+
+ // Is the right side a partial wildcard?
+ if ('*' == substr($right->subtype, -1)) {
+ // validate partial-wildcard subtype
+ if (!$this->validatePartialWildcard($right->subtype, $left->subtype)) {
+ return false;
+ }
+ // Finally, verify format is valid
+ return $this->validateFormat($right, $left);
+ }
+
+ // Does the right side subtype match the left side format?
+ if ($right->subtype == $left->format) {
+ return true;
+ }
+
+ // At this point, there is no valid match
+ return false;
+ }
+
+ /**
+ * Validate the format
+ *
+ * Validate that the right side format matches what the left side defines.
+ *
+ * @param string $right
+ * @param string $left
+ * @return bool
+ */
+ protected function validateFormat($right, $left)
+ {
+ if ($right->format && $left->format) {
+ if ($right->format == '*') {
+ return true;
+ }
+ if ($right->format == $left->format) {
+ return true;
+ }
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Validate a partial wildcard (i.e., string ending in '*')
+ *
+ * @param string $right
+ * @param string $left
+ * @return bool
+ */
+ protected function validatePartialWildcard($right, $left)
+ {
+ $requiredSegment = substr($right, 0, strlen($right) - 1);
+ if ($requiredSegment == $left) {
+ return true;
+ }
+
+ if (strlen($requiredSegment) >= strlen($left)) {
+ return false;
+ }
+
+ if (0 === strpos($left, $requiredSegment)) {
+ return true;
+ }
+
+ return false;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Cookie.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Cookie.php
index 0a737a24f68..558c5150a2f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Cookie.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Cookie.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,6 @@ use ArrayObject;
*/
class Cookie extends ArrayObject implements HeaderInterface
{
-
protected $encodeValue = true;
public static function fromSetCookieArray(array $setCookies)
@@ -112,6 +111,4 @@ class Cookie extends ArrayObject implements HeaderInterface
{
return $this->toString();
}
-
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Date.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Date.php
index f310da10939..7b260664ec5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Date.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Date.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Etag.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Etag.php
index c1cfc0dde1c..169bfb85b39 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Etag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Etag.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Etag implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Etag implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Etag';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/DomainException.php
new file mode 100644
index 00000000000..c826e642ad5
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/DomainException.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Http\Header\Exception;
+
+class DomainException extends \DomainException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/ExceptionInterface.php
index 14e429cf532..c4d1069819a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Http\Header\Exception;
use Zend\Http\Exception\ExceptionInterface as HttpException;
interface ExceptionInterface extends HttpException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/InvalidArgumentException.php
index aaf366e37d1..06aa79fd96f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/RuntimeException.php
index 097b381912f..467d626dc60 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Expect.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Expect.php
index 41150eaaaf6..87dea578a8c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Expect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Expect.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Expect implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Expect implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Expect';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Expires.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Expires.php
index 82e8d89c488..ff2de5c82d1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Expires.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Expires.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/From.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/From.php
index b1177dbd267..0089227b23a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/From.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/From.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class From implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class From implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'From';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericHeader.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericHeader.php
index 81fa5217b74..3ad6d71abf4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericHeader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericHeader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericMultiHeader.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericMultiHeader.php
index 62e1c271122..90c1f966894 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericMultiHeader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericMultiHeader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/HeaderInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/HeaderInterface.php
index 1cd2e4654a5..ba285f37d68 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/HeaderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/HeaderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Host.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Host.php
index 7a177cfa20f..2446d155a76 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Host.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Host.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Host implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Host implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Host';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/IfMatch.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfMatch.php
index 546b6aa86d9..adb5e8afc5c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/IfMatch.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfMatch.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class IfMatch implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class IfMatch implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'If-Match';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/IfModifiedSince.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfModifiedSince.php
index d8d9f9a6256..329fbc52c5f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/IfModifiedSince.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfModifiedSince.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/IfNoneMatch.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfNoneMatch.php
index 9275d0836d4..8ce5b15ea4b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/IfNoneMatch.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfNoneMatch.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class IfNoneMatch implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class IfNoneMatch implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'If-None-Match';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/IfRange.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfRange.php
index 7524d464969..3f763d32f48 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/IfRange.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfRange.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class IfRange implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class IfRange implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'If-Range';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/IfUnmodifiedSince.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfUnmodifiedSince.php
index 2615596af53..4a1b35c82e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/IfUnmodifiedSince.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfUnmodifiedSince.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/KeepAlive.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/KeepAlive.php
index dad3e9318f2..86f9dc727c3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/KeepAlive.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/KeepAlive.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class KeepAlive implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class KeepAlive implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Keep-Alive';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/LastModified.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/LastModified.php
index d9ea8bdb6e7..8f30f57b546 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/LastModified.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/LastModified.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Location.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Location.php
index 8d391ebf58d..5fa93f1e7b6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Location.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Location.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Http\Header;
-
/**
* Location Header
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/MaxForwards.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/MaxForwards.php
index 1f1c14c5960..ac298871883 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/MaxForwards.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/MaxForwards.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class MaxForwards implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class MaxForwards implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Max-Forwards';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/MultipleHeaderInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/MultipleHeaderInterface.php
index 3034f7b4a4d..b6b5246cd1a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/MultipleHeaderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/MultipleHeaderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Origin.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Origin.php
new file mode 100644
index 00000000000..d95d56fa6a5
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Origin.php
@@ -0,0 +1,64 @@
+<?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\Http\Header;
+
+use Zend\Uri\UriFactory;
+
+/**
+ * @throws Exception\InvalidArgumentException
+ * @see http://tools.ietf.org/id/draft-abarth-origin-03.html#rfc.section.2
+ */
+class Origin implements HeaderInterface
+{
+ /**
+ * @var string
+ */
+ protected $value;
+
+ public static function fromString($headerLine)
+ {
+ list($name, $value) = explode(': ', $headerLine, 2);
+
+ // check to ensure proper header type for this factory
+ if (strtolower($name) !== 'origin') {
+ throw new Exception\InvalidArgumentException('Invalid header line for Origin string: "' . $name . '"');
+ }
+
+ $uri = UriFactory::factory($value);
+ if (!$uri->isValid()) {
+ throw new Exception\InvalidArgumentException('Invalid header value for Origin key: "' . $name . '"');
+ }
+
+ return new static($value);
+ }
+
+ /**
+ * @param string|null $value
+ */
+ public function __construct($value = null)
+ {
+ $this->value = (string) $value;
+ }
+
+ public function getFieldName()
+ {
+ return 'Origin';
+ }
+
+ public function getFieldValue()
+ {
+ return $this->value;
+ }
+
+ public function toString()
+ {
+ return 'Origin: ' . $this->getFieldValue();
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Pragma.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Pragma.php
index a00cdab0959..f7198577d74 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Pragma.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Pragma.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Pragma implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Pragma implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Pragma';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ProxyAuthenticate.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ProxyAuthenticate.php
index ec63906fc16..292c4ba71b0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ProxyAuthenticate.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ProxyAuthenticate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class ProxyAuthenticate implements MultipleHeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class ProxyAuthenticate implements MultipleHeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Proxy-Authenticate';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/ProxyAuthorization.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ProxyAuthorization.php
index 942bbe30228..b0d5738ab81 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ProxyAuthorization.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/ProxyAuthorization.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class ProxyAuthorization implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class ProxyAuthorization implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Proxy-Authorization';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Range.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Range.php
index 8dc93fb2f8f..103b7b49e58 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Range.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Range.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Range implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Range implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Range';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Referer.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Referer.php
index cde2f8615ce..8b89cf4b1ec 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Referer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Referer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Refresh.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Refresh.php
index fd19aa57be4..f887325ff33 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Refresh.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Refresh.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Refresh implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Refresh implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Refresh';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/RetryAfter.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/RetryAfter.php
index cdd239aa42c..6f526b3baf7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/RetryAfter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/RetryAfter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Server.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Server.php
index e81f0d43a40..bf07f0e4429 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Server.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Server.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Server implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Server implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Server';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php
index 51bbb645120..a1dec80e766 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php
@@ -3,12 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Http\Header;
+use DateTime;
use Zend\Uri\UriFactory;
/**
@@ -18,7 +19,6 @@ use Zend\Uri\UriFactory;
*/
class SetCookie implements MultipleHeaderInterface
{
-
/**
* Cookie name
*
@@ -114,7 +114,7 @@ class SetCookie implements MultipleHeaderInterface
}
// First K=V pair is always the cookie name and value
- if ($header->getName() === NULL) {
+ if ($header->getName() === null) {
$header->setName($headerKey);
$header->setValue(urldecode($headerValue));
continue;
@@ -122,13 +122,27 @@ class SetCookie implements MultipleHeaderInterface
// Process the remaining elements
switch (str_replace(array('-', '_'), '', strtolower($headerKey))) {
- case 'expires' : $header->setExpires($headerValue); break;
- case 'domain' : $header->setDomain($headerValue); break;
- case 'path' : $header->setPath($headerValue); break;
- case 'secure' : $header->setSecure(true); break;
- case 'httponly': $header->setHttponly(true); break;
- case 'version' : $header->setVersion((int) $headerValue); break;
- case 'maxage' : $header->setMaxAge((int) $headerValue); break;
+ case 'expires':
+ $header->setExpires($headerValue);
+ break;
+ case 'domain':
+ $header->setDomain($headerValue);
+ break;
+ case 'path':
+ $header->setPath($headerValue);
+ break;
+ case 'secure':
+ $header->setSecure(true);
+ break;
+ case 'httponly':
+ $header->setHttponly(true);
+ break;
+ case 'version':
+ $header->setVersion((int) $headerValue);
+ break;
+ case 'maxage':
+ $header->setMaxAge((int) $headerValue);
+ break;
default:
// Intentionally omitted
}
@@ -166,16 +180,15 @@ class SetCookie implements MultipleHeaderInterface
*
* @todo Add validation of each one of the parameters (legal domain, etc.)
*
- * @param string $name
- * @param string $value
- * @param int|string $expires
- * @param string $path
- * @param string $domain
- * @param bool $secure
- * @param bool $httponly
- * @param string $maxAge
- * @param int $version
- * @return SetCookie
+ * @param string $name
+ * @param string $value
+ * @param int|string|DateTime $expires
+ * @param string $path
+ * @param string $domain
+ * @param bool $secure
+ * @param bool $httponly
+ * @param string $maxAge
+ * @param int $version
*/
public function __construct($name = null, $value = null, $expires = null, $path = null, $domain = null, $secure = false, $httponly = false, $maxAge = null, $version = null)
{
@@ -211,7 +224,7 @@ class SetCookie implements MultipleHeaderInterface
}
$value = urlencode($this->getValue());
- if ( $this->hasQuoteFieldValue() ) {
+ if ($this->hasQuoteFieldValue()) {
$value = '"'. $value . '"';
}
@@ -343,9 +356,13 @@ class SetCookie implements MultipleHeaderInterface
}
/**
- * @param int|string $expires
+ * Set Expires
+ *
+ * @param int|string|DateTime $expires
+ *
+ * @return self
+ *
* @throws Exception\InvalidArgumentException
- * @return SetCookie
*/
public function setExpires($expires)
{
@@ -354,14 +371,19 @@ class SetCookie implements MultipleHeaderInterface
return $this;
}
+ if ($expires instanceof DateTime) {
+ $expires = $expires->format(DateTime::COOKIE);
+ }
+
$tsExpires = $expires;
+
if (is_string($expires)) {
$tsExpires = strtotime($expires);
// if $tsExpires is invalid and PHP is compiled as 32bit. Check if it fail reason is the 2038 bug
if (!is_int($tsExpires) && PHP_INT_SIZE === 4) {
- $dateTime = new \DateTime($expires);
- if ( $dateTime->format('Y') > 2038) {
+ $dateTime = new DateTime($expires);
+ if ($dateTime->format('Y') > 2038) {
$tsExpires = PHP_INT_MAX;
}
}
@@ -372,6 +394,7 @@ class SetCookie implements MultipleHeaderInterface
}
$this->expires = $tsExpires;
+
return $this;
}
@@ -437,6 +460,8 @@ class SetCookie implements MultipleHeaderInterface
}
/**
+ * Set whether the value for this cookie should be quoted
+ *
* @param bool $quotedValue
* @return SetCookie
*/
@@ -504,7 +529,7 @@ class SetCookie implements MultipleHeaderInterface
}
/**
- * Check whether the cookie is a session cookie (has no expiry time set)
+ * Check whether the value for this cookie should be quoted
*
* @return bool
*/
@@ -528,20 +553,20 @@ class SetCookie implements MultipleHeaderInterface
}
return true;
-
}
/**
* Checks whether the cookie should be sent or not in a specific scenario
*
- * @param string|Zend\Uri\Uri $uri URI to check against (secure, domain, path)
+ * @param string|\Zend\Uri\Uri $uri URI to check against (secure, domain, path)
* @param bool $matchSessionCookies Whether to send session cookies
* @param int $now Override the current time when checking for expiry time
* @return bool
+ * @throws Exception\InvalidArgumentException If URI does not have HTTP or HTTPS scheme.
*/
public function match($uri, $matchSessionCookies = true, $now = null)
{
- if (is_string ($uri)) {
+ if (is_string($uri)) {
$uri = UriFactory::factory($uri);
}
@@ -551,9 +576,15 @@ class SetCookie implements MultipleHeaderInterface
}
// Check that the cookie is secure (if required) and not expired
- if ($this->secure && $uri->getScheme() != 'https') return false;
- if ($this->isExpired($now)) return false;
- if ($this->isSessionCookie() && ! $matchSessionCookies) return false;
+ if ($this->secure && $uri->getScheme() != 'https') {
+ return false;
+ }
+ if ($this->isExpired($now)) {
+ return false;
+ }
+ if ($this->isSessionCookie() && ! $matchSessionCookies) {
+ return false;
+ }
// Check if the domain matches
if (! self::matchCookieDomain($this->getDomain(), $uri->getHost())) {
@@ -581,14 +612,6 @@ class SetCookie implements MultipleHeaderInterface
*/
public static function matchCookieDomain($cookieDomain, $host)
{
- if (! $cookieDomain) {
- throw new Exception\InvalidArgumentException('$cookieDomain is expected to be a cookie domain');
- }
-
- if (! $host) {
- throw new Exception\InvalidArgumentException('$host is expected to be a host name');
- }
-
$cookieDomain = strtolower($cookieDomain);
$host = strtolower($host);
// Check for either exact match or suffix match
@@ -607,14 +630,6 @@ class SetCookie implements MultipleHeaderInterface
*/
public static function matchCookiePath($cookiePath, $path)
{
- if (! $cookiePath) {
- throw new Exception\InvalidArgumentException('$cookiePath is expected to be a cookie path');
- }
-
- if (! $path) {
- throw new Exception\InvalidArgumentException('$path is expected to be a host name');
- }
-
return (strpos($path, $cookiePath) === 0);
}
@@ -637,6 +652,4 @@ class SetCookie implements MultipleHeaderInterface
}
return $headerLine;
}
-
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/TE.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/TE.php
index 0afe87014e7..55178a977b8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/TE.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/TE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class TE implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class TE implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'TE';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Trailer.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Trailer.php
index 0dd90ef7af8..0fcba569edd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Trailer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Trailer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Trailer implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Trailer implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Trailer';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/TransferEncoding.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/TransferEncoding.php
index d3489394e10..17606e3a5fd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/TransferEncoding.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/TransferEncoding.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class TransferEncoding implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class TransferEncoding implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Transfer-Encoding';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Upgrade.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Upgrade.php
index 84f7cefc00c..162251e1326 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Upgrade.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Upgrade.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Upgrade implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Upgrade implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Upgrade';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/UserAgent.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/UserAgent.php
index e83762a9e07..65941f80b80 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/UserAgent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/UserAgent.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class UserAgent implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class UserAgent implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'User-Agent';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Vary.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Vary.php
index 701001796f5..f80cb34c77d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Vary.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Vary.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Vary implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Vary implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Vary';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Via.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Via.php
index b29b5b24111..f8004331e29 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Via.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Via.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Via implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Via implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Via';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/WWWAuthenticate.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/WWWAuthenticate.php
index 630ddd949c8..11de97af852 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/WWWAuthenticate.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/WWWAuthenticate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class WWWAuthenticate implements MultipleHeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class WWWAuthenticate implements MultipleHeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'WWW-Authenticate';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/Warning.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Warning.php
index 4e3f7456cbe..b94b09d3518 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Warning.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Warning.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,11 @@ namespace Zend\Http\Header;
*/
class Warning implements HeaderInterface
{
+ /** @var string */
+ protected $value;
public static function fromString($headerLine)
{
- $header = new static();
-
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
// check to ensure proper header type for this factory
@@ -28,11 +28,16 @@ class Warning implements HeaderInterface
}
// @todo implementation details
- $header->value = $value;
+ $header = new static($value);
return $header;
}
+ public function __construct($value = null)
+ {
+ $this->value = $value;
+ }
+
public function getFieldName()
{
return 'Warning';
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/HeaderLoader.php b/vendor/zendframework/zendframework/library/Zend/Http/HeaderLoader.php
index 21f95bf797c..ffca6362c63 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/HeaderLoader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/HeaderLoader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -56,6 +56,7 @@ class HeaderLoader extends PluginClassLoader
'lastmodified' => 'Zend\Http\Header\LastModified',
'location' => 'Zend\Http\Header\Location',
'maxforwards' => 'Zend\Http\Header\MaxForwards',
+ 'origin' => 'Zend\Http\Header\Origin',
'pragma' => 'Zend\Http\Header\Pragma',
'proxyauthenticate' => 'Zend\Http\Header\ProxyAuthenticate',
'proxyauthorization' => 'Zend\Http\Header\ProxyAuthorization',
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Headers.php b/vendor/zendframework/zendframework/library/Zend/Http/Headers.php
index 440b5be3275..0ed582fd651 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Headers.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Headers.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -24,7 +24,7 @@ use Zend\Loader\PluginClassLocator;
class Headers implements Countable, Iterator
{
/**
- * @var PluginClassLoader
+ * @var PluginClassLocator
*/
protected $pluginClassLoader = null;
@@ -56,7 +56,6 @@ class Headers implements Countable, Iterator
// iterate the header lines, some might be continuations
foreach (explode("\r\n", $string) as $line) {
-
// check if a header name is present
if (preg_match('/^(?P<name>[^()><@,;:\"\\/\[\]?=}{ \t]+):.*$/', $line, $matches)) {
if ($current) {
@@ -146,7 +145,6 @@ class Headers implements Countable, Iterator
} elseif (is_string($name)) {
$this->addHeaderLine($name, $value);
}
-
}
return $this;
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/RemoteAddress.php b/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/RemoteAddress.php
index 077768ab8fb..4406ece4739 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/RemoteAddress.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/RemoteAddress.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -150,7 +150,6 @@ class RemoteAddress
return $ip;
}
-
/**
* Normalize a header string
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Request.php b/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Request.php
index 4a6cf81c50a..aedf90f8973 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Request.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Request.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -216,21 +216,19 @@ class Request extends HttpRequest
$headers = array();
foreach ($server as $key => $value) {
- if ($value && strpos($key, 'HTTP_') === 0) {
- if (strpos($key, 'HTTP_COOKIE') === 0) {
- // Cookies are handled using the $_COOKIE superglobal
- continue;
+ if ($value || (!is_array($value) && strlen($value))) {
+ if (strpos($key, 'HTTP_') === 0) {
+ if (strpos($key, 'HTTP_COOKIE') === 0) {
+ // Cookies are handled using the $_COOKIE superglobal
+ continue;
+ }
+
+ $headers[strtr(ucwords(strtolower(strtr(substr($key, 5), '_', ' '))), ' ', '-')] = $value;
+ } elseif (strpos($key, 'CONTENT_') === 0) {
+ $name = substr($key, 8); // Remove "Content-"
+ $headers['Content-' . (($name == 'MD5') ? $name : ucfirst(strtolower($name)))] = $value;
}
- $name = strtr(substr($key, 5), '_', ' ');
- $name = strtr(ucwords(strtolower($name)), ' ', '-');
- } elseif ($value && strpos($key, 'CONTENT_') === 0) {
- $name = substr($key, 8); // Content-
- $name = 'Content-' . (($name == 'MD5') ? $name : ucfirst(strtolower($name)));
- } else {
- continue;
}
-
- $headers[$name] = $value;
}
$this->getHeaders()->addHeaders($headers);
@@ -251,7 +249,7 @@ class Request extends HttpRequest
$uri = new HttpUri();
// URI scheme
- if ((!empty($this->serverParams['HTTPS']) && $this->serverParams['HTTPS'] !== 'off')
+ if ((!empty($this->serverParams['HTTPS']) && strtolower($this->serverParams['HTTPS']) !== 'off')
|| (!empty($this->serverParams['HTTP_X_FORWARDED_PROTO']) && $this->serverParams['HTTP_X_FORWARDED_PROTO'] == 'https')
) {
$scheme = 'https';
@@ -487,7 +485,6 @@ class Request extends HttpRequest
*/
protected function detectBaseUrl()
{
- $baseUrl = '';
$filename = $this->getServer()->get('SCRIPT_FILENAME', '');
$scriptName = $this->getServer()->get('SCRIPT_NAME');
$phpSelf = $this->getServer()->get('PHP_SELF');
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Response.php b/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Response.php
index 1ffbdb1e22c..1a3dc5ab1c4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Response.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Response.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Request.php b/vendor/zendframework/zendframework/library/Zend/Http/Request.php
index 71d36805fe7..9e53ac2ec95 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Request.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Request.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -279,7 +279,7 @@ class Request extends AbstractMessage implements RequestInterface
* Return the Cookie header, this is the same as calling $request->getHeaders()->get('Cookie');
*
* @convenience $request->getHeaders()->get('Cookie');
- * @return Header\Cookie
+ * @return Header\Cookie|bool
*/
public function getCookie()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Response.php b/vendor/zendframework/zendframework/library/Zend/Http/Response.php
index 9c9c50e5037..4ff8b99b1cf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Response.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Response.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -164,7 +164,7 @@ class Response extends AbstractMessage implements ResponseInterface
* Populate object from string
*
* @param string $string
- * @return Response
+ * @return self
* @throws Exception\InvalidArgumentException
*/
public static function fromString($string)
@@ -197,17 +197,15 @@ class Response extends AbstractMessage implements ResponseInterface
$isHeader = true;
$headers = $content = array();
- while ($lines) {
- $nextLine = array_shift($lines);
-
- if ($isHeader && $nextLine == '') {
+ foreach ($lines as $line) {
+ if ($isHeader && $line == '') {
$isHeader = false;
continue;
}
if ($isHeader) {
- $headers[] = $nextLine;
+ $headers[] = $line;
} else {
- $content[] = $nextLine;
+ $content[] = $line;
}
}
@@ -235,11 +233,12 @@ class Response extends AbstractMessage implements ResponseInterface
*
* @param int $code
* @throws Exception\InvalidArgumentException
- * @return Response
+ * @return self
*/
public function setStatusCode($code)
{
- if (!is_numeric($code)) {
+ $const = get_class($this) . '::STATUS_CODE_' . $code;
+ if (!is_numeric($code) || !defined($const)) {
$code = is_scalar($code) ? $code : gettype($code);
throw new Exception\InvalidArgumentException(sprintf(
'Invalid status code provided: "%s"',
@@ -260,9 +259,30 @@ class Response extends AbstractMessage implements ResponseInterface
return $this->statusCode;
}
+ /**
+ * Set custom HTTP status code
+ *
+ * @param int $code
+ * @throws Exception\InvalidArgumentException
+ * @return self
+ */
+ public function setCustomStatusCode($code)
+ {
+ if (!is_numeric($code)) {
+ $code = is_scalar($code) ? $code : gettype($code);
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'Invalid status code provided: "%s"',
+ $code
+ ));
+ }
+
+ $this->statusCode = (int) $code;
+ return $this;
+ }
+
/**
* @param string $reasonPhrase
- * @return Response
+ * @return self
*/
public function setReasonPhrase($reasonPhrase)
{
@@ -277,7 +297,7 @@ class Response extends AbstractMessage implements ResponseInterface
*/
public function getReasonPhrase()
{
- if ($this->reasonPhrase == null) {
+ if (null == $this->reasonPhrase and isset($this->recommendedReasonPhrases[$this->statusCode])) {
return $this->recommendedReasonPhrases[$this->statusCode];
}
return $this->reasonPhrase;
@@ -307,7 +327,7 @@ class Response extends AbstractMessage implements ResponseInterface
if ($contentEncoding =='gzip') {
$body = $this->decodeGzip($body);
} elseif ($contentEncoding == 'deflate') {
- $body = $this->decodeDeflate($body);
+ $body = $this->decodeDeflate($body);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Response/Stream.php b/vendor/zendframework/zendframework/library/Zend/Http/Response/Stream.php
index 4da7a3f652b..cc74cdc270d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Response/Stream.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Response/Stream.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -156,8 +156,11 @@ class Stream extends Response
$headerComplete = false;
$headersString = '';
+ $responseArray = array();
- $responseArray = explode("\n", $responseString);
+ if ($responseString) {
+ $responseArray = explode("\n", $responseString);
+ }
while (count($responseArray)) {
$nextLine = array_shift($responseArray);
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/composer.json b/vendor/zendframework/zendframework/library/Zend/Http/composer.json
index 423eb57007a..d459e55426b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Http/composer.json
@@ -6,6 +6,7 @@
"zf2",
"http"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Http\\": ""
@@ -13,7 +14,7 @@
},
"target-dir": "Zend/Http",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-loader": "self.version",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-uri": "self.version",
@@ -21,8 +22,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/I18n/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExceptionInterface.php
index 5c776b725f7..6c6cfcdff9e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\I18n\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExtensionNotLoadedException.php
index 2bbc075627f..735116f9466 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,6 @@ namespace Zend\I18n\Exception;
use DomainException;
-class ExtensionNotLoadedException extends DomainException implements
- ExceptionInterface
-{}
+class ExtensionNotLoadedException extends DomainException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/InvalidArgumentException.php
index 022a12809fe..22c68475d6c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/InvalidArgumentException.php
@@ -3,12 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\I18n\Exception;
-class InvalidArgumentException extends \InvalidArgumentException implements
- ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/OutOfBoundsException.php
index 0d49688129c..46f5b2456aa 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/OutOfBoundsException.php
@@ -3,12 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\I18n\Exception;
-class OutOfBoundsException extends \OutOfBoundsException implements
- ExceptionInterface
-{}
+class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ParseException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ParseException.php
index 7e442a66f09..e97878d94f5 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ParseException.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ParseException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\I18n\Exception;
class ParseException extends RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RangeException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RangeException.php
index aec816a27fe..e7e8c457f83 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RangeException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\I18n\Exception;
class RangeException extends \RangeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RuntimeException.php
index b49473e3c58..b420a51ca04 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RuntimeException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\I18n\Exception;
class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/AbstractLocale.php b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/AbstractLocale.php
index 14b3c11fa99..ffff1b1d316 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/AbstractLocale.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/AbstractLocale.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alnum.php b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alnum.php
index 3a20232f32d..15085c97e89 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alnum.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alnum.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -68,11 +68,15 @@ class Alnum extends AbstractLocale
*
* Returns $value as string with all non-alphanumeric characters removed
*
- * @param mixed $value
- * @return string
+ * @param string|array $value
+ * @return string|array
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
$whiteSpace = $this->options['allow_white_space'] ? '\s' : '';
$language = Locale::getPrimaryLanguage($this->getLocale());
@@ -87,6 +91,6 @@ class Alnum extends AbstractLocale
$pattern = '/[^\p{L}\p{N}' . $whiteSpace . ']/u';
}
- return preg_replace($pattern, '', (string) $value);
+ return preg_replace($pattern, '', $value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alpha.php b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alpha.php
index ea990497453..ad468f5366c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alpha.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alpha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,11 +18,15 @@ class Alpha extends Alnum
*
* Returns the string $value, removing all but alphabetic characters
*
- * @param string $value
- * @return string
+ * @param string|array $value
+ * @return string|array
*/
public function filter($value)
{
+ if (!is_scalar($value) && !is_array($value)) {
+ return $value;
+ }
+
$whiteSpace = $this->options['allow_white_space'] ? '\s' : '';
$language = Locale::getPrimaryLanguage($this->getLocale());
@@ -37,6 +41,6 @@ class Alpha extends Alnum
$pattern = '/[^\p{L}' . $whiteSpace . ']/u';
}
- return preg_replace($pattern, '', (string) $value);
+ return preg_replace($pattern, '', $value);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberFormat.php
index 6ea1f1d5e7d..9c53c752488 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberFormat.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberFormat.php
@@ -3,134 +3,16 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\I18n\Filter;
-use NumberFormatter;
-use Traversable;
-use Zend\I18n\Exception;
use Zend\Stdlib\ErrorHandler;
-class NumberFormat extends AbstractLocale
+class NumberFormat extends NumberParse
{
- protected $options = array(
- 'locale' => null,
- 'style' => NumberFormatter::DEFAULT_STYLE,
- 'type' => NumberFormatter::TYPE_DOUBLE
- );
-
- /**
- * @var NumberFormatter
- */
- protected $formatter = null;
-
- /**
- * @param array|Traversable|string|null $localeOrOptions
- * @param int $style
- * @param int $type
- */
- public function __construct(
- $localeOrOptions = null,
- $style = NumberFormatter::DEFAULT_STYLE,
- $type = NumberFormatter::TYPE_DOUBLE)
- {
- parent::__construct();
- if ($localeOrOptions !== null) {
- if ($localeOrOptions instanceof Traversable) {
- $localeOrOptions = iterator_to_array($localeOrOptions);
- }
-
- if (!is_array($localeOrOptions)) {
- $this->setLocale($localeOrOptions);
- $this->setStyle($style);
- $this->setType($type);
- } else {
- $this->setOptions($localeOrOptions);
- }
- }
- }
-
- /**
- * @param string|null $locale
- * @return NumberFormat
- */
- public function setLocale($locale = null)
- {
- $this->options['locale'] = $locale;
- $this->formatter = null;
- return $this;
- }
-
- /**
- * @param int $style
- * @return NumberFormat
- */
- public function setStyle($style)
- {
- $this->options['style'] = (int) $style;
- $this->formatter = null;
- return $this;
- }
-
- /**
- * @return int
- */
- public function getStyle()
- {
- return $this->options['style'];
- }
-
- /**
- * @param int $type
- * @return NumberFormat
- */
- public function setType($type)
- {
- $this->options['type'] = (int) $type;
- return $this;
- }
-
- /**
- * @return int
- */
- public function getType()
- {
- return $this->options['type'];
- }
-
- /**
- * @param NumberFormatter $formatter
- * @return NumberFormat
- */
- public function setFormatter(NumberFormatter $formatter)
- {
- $this->formatter = $formatter;
- return $this;
- }
-
- /**
- * @return NumberFormatter
- * @throws Exception\RuntimeException
- */
- public function getFormatter()
- {
- if ($this->formatter === null) {
- $formatter = NumberFormatter::create($this->getLocale(), $this->getStyle());
- if (!$formatter) {
- throw new Exception\RuntimeException(
- 'Can not create NumberFormatter instance; ' . intl_get_error_message()
- );
- }
-
- $this->formatter = $formatter;
- }
-
- return $this->formatter;
- }
-
/**
* Defined by Zend\Filter\FilterInterface
*
@@ -140,24 +22,24 @@ class NumberFormat extends AbstractLocale
*/
public function filter($value)
{
- $formatter = $this->getFormatter();
- $type = $this->getType();
+ if (!is_scalar($value)) {
+ return $value;
+ }
- if (is_int($value) || is_float($value)) {
- ErrorHandler::start();
- $result = $formatter->format($value, $type);
- ErrorHandler::stop();
+ if (!is_int($value) && !is_float($value)) {
+ $result = parent::filter($value);
} else {
- $value = str_replace(array("\xC2\xA0", ' '), '', $value);
ErrorHandler::start();
- $result = $formatter->parse($value, $type);
+
+ $result = $this->getFormatter()->format($value, $this->getType());
+
ErrorHandler::stop();
}
- if ($result === false) {
- return $value;
+ if (false !== $result) {
+ return $result;
}
- return str_replace("\xC2\xA0", ' ', $result);
+ return $value;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberParse.php b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberParse.php
new file mode 100644
index 00000000000..6f1328e40de
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberParse.php
@@ -0,0 +1,162 @@
+<?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\I18n\Filter;
+
+use NumberFormatter;
+use Traversable;
+use Zend\I18n\Exception;
+use Zend\Stdlib\ErrorHandler;
+
+class NumberParse extends AbstractLocale
+{
+ protected $options = array(
+ 'locale' => null,
+ 'style' => NumberFormatter::DEFAULT_STYLE,
+ 'type' => NumberFormatter::TYPE_DOUBLE
+ );
+
+ /**
+ * @var NumberFormatter
+ */
+ protected $formatter = null;
+
+ /**
+ * @param array|Traversable|string|null $localeOrOptions
+ * @param int $style
+ * @param int $type
+ */
+ public function __construct(
+ $localeOrOptions = null,
+ $style = NumberFormatter::DEFAULT_STYLE,
+ $type = NumberFormatter::TYPE_DOUBLE
+ ) {
+ parent::__construct();
+ if ($localeOrOptions !== null) {
+ if ($localeOrOptions instanceof Traversable) {
+ $localeOrOptions = iterator_to_array($localeOrOptions);
+ }
+
+ if (!is_array($localeOrOptions)) {
+ $this->setLocale($localeOrOptions);
+ $this->setStyle($style);
+ $this->setType($type);
+ } else {
+ $this->setOptions($localeOrOptions);
+ }
+ }
+ }
+
+ /**
+ * @param string|null $locale
+ * @return NumberFormat
+ */
+ public function setLocale($locale = null)
+ {
+ $this->options['locale'] = $locale;
+ $this->formatter = null;
+ return $this;
+ }
+
+ /**
+ * @param int $style
+ * @return NumberFormat
+ */
+ public function setStyle($style)
+ {
+ $this->options['style'] = (int) $style;
+ $this->formatter = null;
+ return $this;
+ }
+
+ /**
+ * @return int
+ */
+ public function getStyle()
+ {
+ return $this->options['style'];
+ }
+
+ /**
+ * @param int $type
+ * @return NumberFormat
+ */
+ public function setType($type)
+ {
+ $this->options['type'] = (int) $type;
+ return $this;
+ }
+
+ /**
+ * @return int
+ */
+ public function getType()
+ {
+ return $this->options['type'];
+ }
+
+ /**
+ * @param NumberFormatter $formatter
+ * @return NumberFormat
+ */
+ public function setFormatter(NumberFormatter $formatter)
+ {
+ $this->formatter = $formatter;
+ return $this;
+ }
+
+ /**
+ * @return NumberFormatter
+ * @throws Exception\RuntimeException
+ */
+ public function getFormatter()
+ {
+ if ($this->formatter === null) {
+ $formatter = NumberFormatter::create($this->getLocale(), $this->getStyle());
+ if (!$formatter) {
+ throw new Exception\RuntimeException(
+ 'Can not create NumberFormatter instance; ' . intl_get_error_message()
+ );
+ }
+
+ $this->formatter = $formatter;
+ }
+
+ return $this->formatter;
+ }
+
+ /**
+ * Defined by Zend\Filter\FilterInterface
+ *
+ * @see Zend\Filter\FilterInterface::filter()
+ * @param mixed $value
+ * @return mixed
+ */
+ public function filter($value)
+ {
+ if (!is_int($value)
+ && !is_float($value)
+ ) {
+ ErrorHandler::start();
+
+ $result = $this->getFormatter()->parse(
+ $value,
+ $this->getType()
+ );
+
+ ErrorHandler::stop();
+
+ if (false !== $result) {
+ return $result;
+ }
+ }
+
+ return $value;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/AbstractFileLoader.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/AbstractFileLoader.php
new file mode 100644
index 00000000000..28527326247
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/AbstractFileLoader.php
@@ -0,0 +1,82 @@
+<?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\I18n\Translator\Loader;
+
+/**
+ * Abstract file loader implementation; provides facilities around resolving
+ * files via the include_path.
+ */
+abstract class AbstractFileLoader implements FileLoaderInterface
+{
+ /**
+ * Whether or not to consult the include_path when locating files
+ *
+ * @var bool
+ */
+ protected $useIncludePath = false;
+
+ /**
+ * Indicate whether or not to use the include_path to resolve translation files
+ *
+ * @param bool $flag
+ * @return self
+ */
+ public function setUseIncludePath($flag = true)
+ {
+ $this->useIncludePath = (bool) $flag;
+ return $this;
+ }
+
+ /**
+ * Are we using the include_path to resolve translation files?
+ *
+ * @return bool
+ */
+ public function useIncludePath()
+ {
+ return $this->useIncludePath;
+ }
+
+ /**
+ * Resolve a translation file
+ *
+ * Checks if the file exists and is readable, returning a boolean false if not; if the "useIncludePath"
+ * flag is enabled, it will attempt to resolve the file from the
+ * include_path if the file does not exist on the current working path.
+ *
+ * @param string $filename
+ * @return string|false
+ */
+ protected function resolveFile($filename)
+ {
+ if (!is_file($filename) || !is_readable($filename)) {
+ if (!$this->useIncludePath()) {
+ return false;
+ }
+ return $this->resolveViaIncludePath($filename);
+ }
+ return $filename;
+ }
+
+ /**
+ * Resolve a translation file via the include_path
+ *
+ * @param string $filename
+ * @return string|false
+ */
+ protected function resolveViaIncludePath($filename)
+ {
+ $resolvedIncludePath = stream_resolve_include_path($filename);
+ if (!$resolvedIncludePath || !is_file($resolvedIncludePath) || !is_readable($resolvedIncludePath)) {
+ return false;
+ }
+ return $resolvedIncludePath;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/FileLoaderInterface.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/FileLoaderInterface.php
index f21125e9389..e387aaea401 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/FileLoaderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/FileLoaderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Gettext.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Gettext.php
index cf952b5f778..d64827a5860 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Gettext.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Gettext.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,7 @@ use Zend\Stdlib\ErrorHandler;
/**
* Gettext loader.
*/
-class Gettext implements FileLoaderInterface
+class Gettext extends AbstractFileLoader
{
/**
* Current file pointer.
@@ -44,9 +44,10 @@ class Gettext implements FileLoaderInterface
*/
public function load($locale, $filename)
{
- if (!is_file($filename) || !is_readable($filename)) {
+ $resolvedFile = $this->resolveFile($filename);
+ if (!$resolvedFile) {
throw new Exception\InvalidArgumentException(sprintf(
- 'Could not open file %s for reading',
+ 'Could not find or open file %s for reading',
$filename
));
}
@@ -54,7 +55,7 @@ class Gettext implements FileLoaderInterface
$textDomain = new TextDomain();
ErrorHandler::start();
- $this->file = fopen($filename, 'rb');
+ $this->file = fopen($resolvedFile, 'rb');
$error = ErrorHandler::stop();
if (false === $this->file) {
throw new Exception\InvalidArgumentException(sprintf(
@@ -127,7 +128,9 @@ class Gettext implements FileLoaderInterface
array_shift($originalString);
foreach ($originalString as $string) {
- $textDomain[$string] = '';
+ if (! isset($textDomain[$string])) {
+ $textDomain[$string] = '';
+ }
}
} else {
$textDomain[$originalString[0]] = $translationString[0];
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Ini.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Ini.php
index 4943ac99b44..fcbd058c75d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Ini.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Ini.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,7 @@ use Zend\I18n\Translator\TextDomain;
/**
* PHP INI format loader.
*/
-class Ini implements FileLoaderInterface
+class Ini extends AbstractFileLoader
{
/**
* load(): defined by FileLoaderInterface.
@@ -30,20 +30,22 @@ class Ini implements FileLoaderInterface
*/
public function load($locale, $filename)
{
- if (!is_file($filename) || !is_readable($filename)) {
+ $resolvedIncludePath = stream_resolve_include_path($filename);
+ $fromIncludePath = ($resolvedIncludePath !== false) ? $resolvedIncludePath : $filename;
+ if (!$fromIncludePath || !is_file($fromIncludePath) || !is_readable($fromIncludePath)) {
throw new Exception\InvalidArgumentException(sprintf(
- 'Could not open file %s for reading',
+ 'Could not find or open file %s for reading',
$filename
));
}
$messages = array();
$iniReader = new IniReader();
- $messagesNamespaced = $iniReader->fromFile($filename);
+ $messagesNamespaced = $iniReader->fromFile($fromIncludePath);
$list = $messagesNamespaced;
if (isset($messagesNamespaced['translation'])) {
- $list = $messagesNamespaced['translation'];
+ $list = $messagesNamespaced['translation'];
}
foreach ($list as $message) {
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/PhpArray.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/PhpArray.php
index 4765720cf5e..10fdab87925 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/PhpArray.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/PhpArray.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,7 @@ use Zend\I18n\Translator\TextDomain;
/**
* PHP array loader.
*/
-class PhpArray implements FileLoaderInterface
+class PhpArray extends AbstractFileLoader
{
/**
* load(): defined by FileLoaderInterface.
@@ -29,14 +29,16 @@ class PhpArray implements FileLoaderInterface
*/
public function load($locale, $filename)
{
- if (!is_file($filename) || !is_readable($filename)) {
+ $resolvedIncludePath = stream_resolve_include_path($filename);
+ $fromIncludePath = ($resolvedIncludePath !== false) ? $resolvedIncludePath : $filename;
+ if (!$fromIncludePath || !is_file($fromIncludePath) || !is_readable($fromIncludePath)) {
throw new Exception\InvalidArgumentException(sprintf(
- 'Could not open file %s for reading',
+ 'Could not find or open file %s for reading',
$filename
));
}
- $messages = include $filename;
+ $messages = include $fromIncludePath;
if (!is_array($messages)) {
throw new Exception\InvalidArgumentException(sprintf(
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/PhpMemoryArray.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/PhpMemoryArray.php
new file mode 100644
index 00000000000..dc9b9e387a4
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/PhpMemoryArray.php
@@ -0,0 +1,74 @@
+<?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\I18n\Translator\Loader;
+
+use Zend\I18n\Exception;
+use Zend\I18n\Translator\Plural\Rule as PluralRule;
+use Zend\I18n\Translator\TextDomain;
+
+/**
+ * PHP Memory array loader.
+ */
+class PhpMemoryArray implements RemoteLoaderInterface
+{
+ /**
+ * @var array
+ */
+ protected $messages;
+
+ public function __construct($messages)
+ {
+ $this->messages = $messages;
+ }
+
+ /**
+ * Load translations from a remote source.
+ *
+ * @param string $locale
+ * @param string $textDomain
+ *
+ * @throws \Zend\I18n\Exception\InvalidArgumentException
+ * @return \Zend\I18n\Translator\TextDomain|null
+ */
+ public function load($locale, $textDomain)
+ {
+ if (!is_array($this->messages)) {
+ throw new Exception\InvalidArgumentException(
+ sprintf('Expected an array, but received %s', gettype($this->messages))
+ );
+ }
+
+ if (!isset($this->messages[$textDomain])) {
+ throw new Exception\InvalidArgumentException(
+ sprintf('Expected textdomain "%s" to be an array, but it is not set', $textDomain)
+ );
+ }
+
+ if (!isset($this->messages[$textDomain][$locale])) {
+ throw new Exception\InvalidArgumentException(
+ sprintf('Expected locale "%s" to be an array, but it is not set', $locale)
+ );
+ }
+
+ $textDomain = new TextDomain($this->messages[$textDomain][$locale]);
+
+ if (array_key_exists('', $textDomain)) {
+ if (isset($textDomain['']['plural_forms'])) {
+ $textDomain->setPluralRule(
+ PluralRule::fromString($textDomain['']['plural_forms'])
+ );
+ }
+
+ unset($textDomain['']);
+ }
+
+ return $textDomain;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/RemoteLoaderInterface.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/RemoteLoaderInterface.php
index 59b0046d61b..8ed1d8fb616 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/RemoteLoaderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/RemoteLoaderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/LoaderPluginManager.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/LoaderPluginManager.php
index 0649cd82dbf..9ecdbb100d5 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/LoaderPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/LoaderPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,6 +18,39 @@ use Zend\ServiceManager\AbstractPluginManager;
* Enforces that loaders retrieved are either instances of
* Loader\FileLoaderInterface or Loader\RemoteLoaderInterface. Additionally,
* it registers a number of default loaders.
+ *
+ * If you are wanting to use the ability to load translation files from the
+ * include_path, you will need to create a factory to override the defaults
+ * defined in this class. A simple factory might look like:
+ *
+ * <code>
+ * function ($translators) {
+ * $adapter = new Gettext();
+ * $adapter->setUseIncludePath(true);
+ * return $adapter;
+ * }
+ * </code>
+ *
+ * You may need to override the Translator service factory to make this happen
+ * more easily. That can be done by extending it:
+ *
+ * <code>
+ * use Zend\I18n\Translator\TranslatorServiceFactory;
+ * // or Zend\Mvc\I18n\TranslatorServiceFactory
+ * use Zend\ServiceManager\ServiceLocatorInterface;
+ *
+ * class MyTranslatorServiceFactory extends TranslatorServiceFactory
+ * {
+ * public function createService(ServiceLocatorInterface $services)
+ * {
+ * $translator = parent::createService($services);
+ * $translator->getLoaderPluginManager()->setFactory(...);
+ * return $translator;
+ * }
+ * }
+ * </code>
+ *
+ * You would then specify your custom factory in your service configuration.
*/
class LoaderPluginManager extends AbstractPluginManager
{
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Parser.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Parser.php
index d3e872e3c5e..86383467833 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Parser.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Parser.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -222,7 +222,7 @@ class Parser
* Parse a string.
*
* @param string $string
- * @return array
+ * @return Symbol
*/
public function parse($string)
{
@@ -264,10 +264,9 @@ class Parser
public function advance($id = null)
{
if ($id !== null && $this->currentToken->id !== $id) {
- throw new Exception\ParseException(sprintf(
- 'Expected token with id %s but received %s',
- $id, $this->currentToken->id
- ));
+ throw new Exception\ParseException(
+ sprintf('Expected token with id %s but received %s', $id, $this->currentToken->id)
+ );
}
$this->currentToken = $this->getNextToken();
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Rule.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Rule.php
index 98e29cf6000..5427fce8e41 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Rule.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Rule.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -62,10 +62,9 @@ class Rule
$result = $this->evaluateAstPart($this->ast, abs((int) $number));
if ($result < 0 || $result >= $this->numPlurals) {
- throw new Exception\RangeException(sprintf(
- 'Calculated result %s is between 0 and %d',
- $result, ($this->numPlurals - 1)
- ));
+ throw new Exception\RangeException(
+ sprintf('Calculated result %s is between 0 and %d', $result, ($this->numPlurals - 1))
+ );
}
return $result;
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Symbol.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Symbol.php
index 31d6606c720..7b33419ea2e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Symbol.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Symbol.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -132,9 +132,7 @@ class Symbol
public function getNullDenotation()
{
if ($this->nullDenotationGetter === null) {
- throw new Exception\ParseException(sprintf(
- 'Syntax error: %s', $this->id
- ));
+ throw new Exception\ParseException(sprintf('Syntax error: %s', $this->id));
}
/** @var callable $function */
@@ -152,9 +150,7 @@ class Symbol
public function getLeftDenotation($left)
{
if ($this->leftDenotationGetter === null) {
- throw new Exception\ParseException(sprintf(
- 'Unknown operator: %s', $this->id
- ));
+ throw new Exception\ParseException(sprintf('Unknown operator: %s', $this->id));
}
/** @var callable $function */
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TextDomain.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TextDomain.php
index a4aceb0152a..ee746ba172b 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TextDomain.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TextDomain.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -25,6 +25,13 @@ class TextDomain extends ArrayObject
*/
protected $pluralRule;
+ /**
+ * Default plural rule shared between instances.
+ *
+ * @var PluralRule
+ */
+ protected static $defaultPluralRule;
+
/**
* Set the plural rule
*
@@ -40,17 +47,40 @@ class TextDomain extends ArrayObject
/**
* Get the plural rule.
*
- * Lazy loads a default rule if none already registered
+ * @param bool $fallbackToDefaultRule
+ * @return PluralRule|null
+ */
+ public function getPluralRule($fallbackToDefaultRule = true)
+ {
+ if ($this->pluralRule === null && $fallbackToDefaultRule) {
+ return static::getDefaultPluralRule();
+ }
+
+ return $this->pluralRule;
+ }
+
+ /**
+ * Checks whether the text domain has a plural rule.
+ *
+ * @return bool
+ */
+ public function hasPluralRule()
+ {
+ return ($this->pluralRule !== null);
+ }
+
+ /**
+ * Returns a shared default plural rule.
*
* @return PluralRule
*/
- public function getPluralRule()
+ public static function getDefaultPluralRule()
{
- if ($this->pluralRule === null) {
- $this->setPluralRule(PluralRule::fromString('nplurals=2; plural=n != 1;'));
+ if (static::$defaultPluralRule === null) {
+ static::$defaultPluralRule = PluralRule::fromString('nplurals=2; plural=n != 1;');
}
- return $this->pluralRule;
+ return static::$defaultPluralRule;
}
/**
@@ -66,8 +96,12 @@ class TextDomain extends ArrayObject
*/
public function merge(TextDomain $textDomain)
{
- if ($this->getPluralRule()->getNumPlurals() !== $textDomain->getPluralRule()->getNumPlurals()) {
- throw new Exception\RuntimeException('Plural rule of merging text domain is not compatible with the current one');
+ if ($this->hasPluralRule() && $textDomain->hasPluralRule()) {
+ if ($this->getPluralRule()->getNumPlurals() !== $textDomain->getPluralRule()->getNumPlurals()) {
+ throw new Exception\RuntimeException('Plural rule of merging text domain is not compatible with the current one');
+ }
+ } elseif ($textDomain->hasPluralRule()) {
+ $this->setPluralRule($textDomain->getPluralRule());
}
$this->exchangeArray(
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Translator.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Translator.php
index c746ddce035..7f11a63d691 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Translator.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Translator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -23,7 +23,7 @@ use Zend\Stdlib\ArrayUtils;
/**
* Translator.
*/
-class Translator
+class Translator implements TranslatorInterface
{
/**
* Event fired when the translation for a message is missing.
@@ -408,9 +408,9 @@ class Translator
->evaluate($number);
if (!isset($translation[$index])) {
- throw new Exception\OutOfBoundsException(sprintf(
- 'Provided index %d does not exist in plural array', $index
- ));
+ throw new Exception\OutOfBoundsException(
+ sprintf('Provided index %d does not exist in plural array', $index)
+ );
}
return $translation[$index];
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareInterface.php
index a69b0045938..aaebf61648a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,18 +14,18 @@ interface TranslatorAwareInterface
/**
* Sets translator to use in helper
*
- * @param Translator $translator [optional] translator.
- * Default is null, which sets no translator.
- * @param string $textDomain [optional] text domain
- * Default is null, which skips setTranslatorTextDomain
+ * @param TranslatorInterface $translator [optional] translator.
+ * Default is null, which sets no translator.
+ * @param string $textDomain [optional] text domain
+ * Default is null, which skips setTranslatorTextDomain
* @return TranslatorAwareInterface
*/
- public function setTranslator(Translator $translator = null, $textDomain = null);
+ public function setTranslator(TranslatorInterface $translator = null, $textDomain = null);
/**
* Returns translator used in object
*
- * @return Translator|null
+ * @return TranslatorInterface|null
*/
public function getTranslator();
@@ -66,5 +66,4 @@ interface TranslatorAwareInterface
* @return string
*/
public function getTranslatorTextDomain();
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareTrait.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareTrait.php
index 016b18ac10d..d4d4e75316c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareTrait.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareTrait.php
@@ -3,17 +3,16 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\I18n\Translator;
-
trait TranslatorAwareTrait
{
/**
- * @var Translator
+ * @var TranslatorInterface
*/
protected $translator = null;
@@ -30,15 +29,15 @@ trait TranslatorAwareTrait
/**
* Sets translator to use in helper
*
- * @param Translator $translator
- * @param string $textDomain
+ * @param TranslatorInterface $translator
+ * @param string $textDomain
* @return mixed
*/
- public function setTranslator(Translator $translator = null, $textDomain = null)
+ public function setTranslator(TranslatorInterface $translator = null, $textDomain = null)
{
$this->translator = $translator;
- if (!is_null($textDomain)) {
+ if (null !== $textDomain) {
$this->setTranslatorTextDomain($textDomain);
}
@@ -48,7 +47,7 @@ trait TranslatorAwareTrait
/**
* Returns translator used in object
*
- * @return Translator
+ * @return TranslatorInterface
*/
public function getTranslator()
{
@@ -62,7 +61,7 @@ trait TranslatorAwareTrait
*/
public function hasTranslator()
{
- return !is_null($this->translator);
+ return (null !== $this->translator);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorInterface.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorInterface.php
new file mode 100644
index 00000000000..43986b6b122
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorInterface.php
@@ -0,0 +1,44 @@
+<?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\I18n\Translator;
+
+/**
+ * Translator interface.
+ */
+interface TranslatorInterface
+{
+ /**
+ * Translate a message.
+ *
+ * @param string $message
+ * @param string $textDomain
+ * @param string $locale
+ * @return string
+ */
+ public function translate($message, $textDomain = 'default', $locale = null);
+
+ /**
+ * Translate a plural message.
+ *
+ * @param string $singular
+ * @param string $plural
+ * @param int $number
+ * @param string $textDomain
+ * @param string|null $locale
+ * @return string
+ */
+ public function translatePlural(
+ $singular,
+ $plural,
+ $number,
+ $textDomain = 'default',
+ $locale = null
+ );
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorServiceFactory.php
index 8a14ffed699..427df424040 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorServiceFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Alnum.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Alnum.php
index f983a642f28..162fd86bea5 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Alnum.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Alnum.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Alpha.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Alpha.php
index c79729933ec..2e136cd3245 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Alpha.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Alpha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/DateTime.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/DateTime.php
index fd453efa45e..f67886b24bb 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/DateTime.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/DateTime.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,21 +12,23 @@ namespace Zend\I18n\Validator;
use Locale;
use IntlDateFormatter;
use Traversable;
+use IntlException;
use Zend\I18n\Exception as I18nException;
use Zend\Validator\AbstractValidator;
use Zend\Validator\Exception as ValidatorException;
class DateTime extends AbstractValidator
{
- const INVALID = 'datetimeInvalid';
- const INVALID_DATETIME = 'datetimeInvalidDateTime';
+ const INVALID = 'datetimeInvalid';
+ const INVALID_DATETIME = 'datetimeInvalidDateTime';
/**
+ *
* @var array
*/
protected $messageTemplates = array(
- self::INVALID => "Invalid type given. String expected",
- self::INVALID_DATETIME => "The input does not appear to be a valid datetime",
+ self::INVALID => "Invalid type given. String expected",
+ self::INVALID_DATETIME => "The input does not appear to be a valid datetime",
);
/**
@@ -70,7 +72,6 @@ class DateTime extends AbstractValidator
/**
* Is the formatter invalidated
- *
* Invalidation occurs when immutable properties are changed
*
* @var bool
@@ -86,10 +87,9 @@ class DateTime extends AbstractValidator
public function __construct($options = array())
{
if (!extension_loaded('intl')) {
- throw new I18nException\ExtensionNotLoadedException(sprintf(
- '%s component requires the intl PHP extension',
- __NAMESPACE__
- ));
+ throw new I18nException\ExtensionNotLoadedException(
+ sprintf('%s component requires the intl PHP extension', __NAMESPACE__)
+ );
}
// Delaying initialization until we know ext/intl is available
@@ -138,7 +138,7 @@ class DateTime extends AbstractValidator
*/
public function setDateType($dateType)
{
- $this->dateType = $dateType;
+ $this->dateType = $dateType;
$this->invalidateFormatter = true;
return $this;
@@ -185,7 +185,7 @@ class DateTime extends AbstractValidator
*/
public function setTimeType($timeType)
{
- $this->timeType = $timeType;
+ $this->timeType = $timeType;
$this->invalidateFormatter = true;
return $this;
@@ -251,7 +251,7 @@ class DateTime extends AbstractValidator
/**
* Returns true if and only if $value is a floating-point value
*
- * @param string $value
+ * @param string $value
* @return bool
* @throws ValidatorException\InvalidArgumentException
*/
@@ -265,24 +265,26 @@ class DateTime extends AbstractValidator
$this->setValue($value);
- $formatter = $this->getIntlDateFormatter();
+ try {
+ $formatter = $this->getIntlDateFormatter();
- if (intl_is_failure($formatter->getErrorCode())) {
- throw new ValidatorException\InvalidArgumentException("Invalid locale string given");
+ if (intl_is_failure($formatter->getErrorCode())) {
+ throw new ValidatorException\InvalidArgumentException($formatter->getErrorMessage());
+ }
+ } catch (IntlException $intlException) {
+ throw new ValidatorException\InvalidArgumentException($e->getMessage(), 0, $intlException);
}
- $position = 0;
- $parsedDate = $formatter->parse($value, $position);
- if (intl_is_failure($formatter->getErrorCode())) {
- $this->error(self::INVALID_DATETIME);
+ try {
+ $timestamp = $formatter->parse($value);
- return false;
- }
-
- if ($position != strlen($value)) {
+ if (intl_is_failure($formatter->getErrorCode()) || $timestamp === false) {
+ $this->error(self::INVALID_DATETIME);
+ return false;
+ }
+ } catch (IntlException $intlException) {
$this->error(self::INVALID_DATETIME);
-
return false;
}
@@ -297,8 +299,14 @@ class DateTime extends AbstractValidator
protected function getIntlDateFormatter()
{
if ($this->formatter == null || $this->invalidateFormatter) {
- $this->formatter = new IntlDateFormatter($this->getLocale(), $this->getDateType(), $this->getTimeType(),
- $this->getTimezone(), $this->getCalendar(), $this->getPattern());
+ $this->formatter = new IntlDateFormatter(
+ $this->getLocale(),
+ $this->getDateType(),
+ $this->getTimeType(),
+ $this->getTimezone(),
+ $this->getCalendar(),
+ $this->getPattern()
+ );
$this->formatter->setLenient(false);
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Float.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Float.php
index d1026caafb5..b52aa3962cf 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Float.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Float.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,11 @@ namespace Zend\I18n\Validator;
use Locale;
use NumberFormatter;
use Traversable;
+use IntlException;
use Zend\I18n\Exception as I18nException;
use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\StringUtils;
+use Zend\Stdlib\StringWrapper\StringWrapperInterface;
use Zend\Validator\AbstractValidator;
use Zend\Validator\Exception;
@@ -37,6 +40,13 @@ class Float extends AbstractValidator
*/
protected $locale;
+ /**
+ * UTF-8 compatable wrapper for string functions
+ *
+ * @var StringWrapperInterface
+ */
+ protected $wrapper;
+
/**
* Constructor for the integer validator
*
@@ -46,12 +56,13 @@ class Float extends AbstractValidator
public function __construct($options = array())
{
if (!extension_loaded('intl')) {
- throw new I18nException\ExtensionNotLoadedException(sprintf(
- '%s component requires the intl PHP extension',
- __NAMESPACE__
- ));
+ throw new I18nException\ExtensionNotLoadedException(
+ sprintf('%s component requires the intl PHP extension', __NAMESPACE__)
+ );
}
+ $this->wrapper = StringUtils::getWrapper();
+
if ($options instanceof Traversable) {
$options = ArrayUtils::iteratorToArray($options);
}
@@ -88,9 +99,9 @@ class Float extends AbstractValidator
return $this;
}
-
/**
- * Returns true if and only if $value is a floating-point value
+ * Returns true if and only if $value is a floating-point value. Uses the formal definition of a float as described
+ * in the PHP manual: {@link http://www.php.net/float}
*
* @param string $value
* @return bool
@@ -98,46 +109,143 @@ class Float extends AbstractValidator
*/
public function isValid($value)
{
- if (!is_string($value) && !is_int($value) && !is_float($value)) {
+ if (!is_scalar($value) || is_bool($value)) {
$this->error(self::INVALID);
return false;
}
$this->setValue($value);
- if (is_float($value)) {
+ if (is_float($value) || is_int($value)) {
return true;
}
- $locale = $this->getLocale();
- $format = new NumberFormatter($locale, NumberFormatter::DECIMAL);
- if (intl_is_failure($format->getErrorCode())) {
- throw new Exception\InvalidArgumentException("Invalid locale string given");
+ // Need to check if this is scientific formatted string. If not, switch to decimal.
+ $formatter = new NumberFormatter($this->getLocale(), NumberFormatter::SCIENTIFIC);
+
+ try {
+ if (intl_is_failure($formatter->getErrorCode())) {
+ throw new Exception\InvalidArgumentException($formatter->getErrorMessage());
+ }
+ } catch (IntlException $intlException) {
+ throw new Exception\InvalidArgumentException($e->getMessage(), 0, $intlException);
}
- $parsedFloat = $format->parse($value, NumberFormatter::TYPE_DOUBLE);
- if (intl_is_failure($format->getErrorCode())) {
- $this->error(self::NOT_FLOAT);
- return false;
+ if (StringUtils::hasPcreUnicodeSupport()) {
+ $exponentialSymbols = '[Ee' . $formatter->getSymbol(NumberFormatter::EXPONENTIAL_SYMBOL) . ']+';
+ $search = '/' . $exponentialSymbols . '/u';
+ } else {
+ $exponentialSymbols = '[Ee]';
+ $search = '/' . $exponentialSymbols . '/';
}
- $decimalSep = $format->getSymbol(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
- $groupingSep = $format->getSymbol(NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
+ if (!preg_match($search, $value)) {
+ $formatter = new NumberFormatter($this->getLocale(), NumberFormatter::DECIMAL);
+ }
- $valueFiltered = str_replace($groupingSep, '', $value);
- $valueFiltered = str_replace($decimalSep, '.', $valueFiltered);
+ /**
+ * @desc There are seperator "look-alikes" for decimal and group seperators that are more commonly used than the
+ * official unicode chracter. We need to replace those with the real thing - or remove it.
+ */
+ $groupSeparator = $formatter->getSymbol(NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
+ $decSeparator = $formatter->getSymbol(NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
+
+ //NO-BREAK SPACE and ARABIC THOUSANDS SEPARATOR
+ if ($groupSeparator == "\xC2\xA0") {
+ $value = str_replace(' ', $groupSeparator, $value);
+ } elseif ($groupSeparator == "\xD9\xAC") { //NumberFormatter doesn't have grouping at all for Arabic-Indic
+ $value = str_replace(array('\'', $groupSeparator), '', $value);
+ }
- while (strpos($valueFiltered, '.') !== false
- && (substr($valueFiltered, -1) == '0' || substr($valueFiltered, -1) == '.')
- ) {
- $valueFiltered = substr($valueFiltered, 0, strlen($valueFiltered) - 1);
+ //ARABIC DECIMAL SEPARATOR
+ if ($decSeparator == "\xD9\xAB") {
+ $value = str_replace(',', $decSeparator, $value);
}
- if (strval($parsedFloat) !== $valueFiltered) {
+ $groupSeparatorPosition = $this->wrapper->strpos($value, $groupSeparator);
+ $decSeparatorPosition = $this->wrapper->strpos($value, $decSeparator);
+
+ //We have seperators, and they are flipped. i.e. 2.000,000 for en-US
+ if ($groupSeparatorPosition && $decSeparatorPosition && $groupSeparatorPosition > $decSeparatorPosition) {
$this->error(self::NOT_FLOAT);
+
return false;
}
- return true;
+ //If we have Unicode support, we can use the real graphemes, otherwise, just the ASCII characters
+ $decimal = '['. preg_quote($decSeparator, '/') . ']';
+ $prefix = '[+-]';
+ $exp = $exponentialSymbols;
+ $numberRange = '0-9';
+ $useUnicode = '';
+ $suffix = '';
+
+ if (StringUtils::hasPcreUnicodeSupport()) {
+ $prefix = '['
+ . preg_quote(
+ $formatter->getTextAttribute(NumberFormatter::POSITIVE_PREFIX)
+ . $formatter->getTextAttribute(NumberFormatter::NEGATIVE_PREFIX)
+ . $formatter->getSymbol(NumberFormatter::PLUS_SIGN_SYMBOL)
+ . $formatter->getSymbol(NumberFormatter::MINUS_SIGN_SYMBOL),
+ '/'
+ )
+ . ']{0,3}';
+ $suffix = ($formatter->getTextAttribute(NumberFormatter::NEGATIVE_SUFFIX))
+ ? '['
+ . preg_quote(
+ $formatter->getTextAttribute(NumberFormatter::POSITIVE_SUFFIX)
+ . $formatter->getTextAttribute(NumberFormatter::NEGATIVE_SUFFIX)
+ . $formatter->getSymbol(NumberFormatter::PLUS_SIGN_SYMBOL)
+ . $formatter->getSymbol(NumberFormatter::MINUS_SIGN_SYMBOL),
+ '/'
+ )
+ . ']{0,3}'
+ : '';
+ $numberRange = '\p{N}';
+ $useUnicode = 'u';
+ }
+
+ /**
+ * @desc Match against the formal definition of a float. The
+ * exponential number check is modified for RTL non-Latin number
+ * systems (Arabic-Indic numbering). I'm also switching out the period
+ * for the decimal separator. The formal definition leaves out +- from
+ * the integer and decimal notations so add that. This also checks
+ * that a grouping sperator is not in the last GROUPING_SIZE graphemes
+ * of the string - i.e. 10,6 is not valid for en-US.
+ * @see http://www.php.net/float
+ */
+
+ $lnum = '[' . $numberRange . ']+';
+ $dnum = '(([' . $numberRange . ']*' . $decimal . $lnum . ')|(' . $lnum . $decimal . '[' . $numberRange . ']*))';
+ $expDnum = '((' . $prefix . '((' . $lnum . '|' . $dnum . ')' . $exp . $prefix . $lnum . ')' . $suffix . ')|'
+ . '(' . $suffix . '(' . $lnum . $prefix . $exp . '(' . $dnum . '|' . $lnum . '))' . $prefix . '))';
+
+ // LEFT-TO-RIGHT MARK (U+200E) is messing up everything for the handful
+ // of locales that have it
+ $lnumSearch = str_replace("\xE2\x80\x8E", '', '/^' .$prefix . $lnum . $suffix . '$/' . $useUnicode);
+ $dnumSearch = str_replace("\xE2\x80\x8E", '', '/^' .$prefix . $dnum . $suffix . '$/' . $useUnicode);
+ $expDnumSearch = str_replace("\xE2\x80\x8E", '', '/^' . $expDnum . '$/' . $useUnicode);
+ $value = str_replace("\xE2\x80\x8E", '', $value);
+ $unGroupedValue = str_replace($groupSeparator, '', $value);
+
+ // No strrpos() in wrappers yet. ICU 4.x doesn't have grouping size for
+ // everything. ICU 52 has 3 for ALL locales.
+ $groupSize = ($formatter->getAttribute(NumberFormatter::GROUPING_SIZE))
+ ? $formatter->getAttribute(NumberFormatter::GROUPING_SIZE)
+ : 3;
+ $lastStringGroup = $this->wrapper->substr($value, -$groupSize);
+
+ if ((preg_match($lnumSearch, $unGroupedValue)
+ || preg_match($dnumSearch, $unGroupedValue)
+ || preg_match($expDnumSearch, $unGroupedValue))
+ && false === $this->wrapper->strpos($lastStringGroup, $groupSeparator)
+ ) {
+ return true;
+ }
+
+ $this->error(self::NOT_FLOAT);
+
+ return false;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Int.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Int.php
index c6f90ca81f6..7f8df04b93c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Int.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Int.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,11 +12,13 @@ namespace Zend\I18n\Validator;
use Locale;
use NumberFormatter;
use Traversable;
+use IntlException;
use Zend\I18n\Exception as I18nException;
use Zend\Stdlib\ArrayUtils;
use Zend\Validator\AbstractValidator;
use Zend\Validator\Exception;
+
class Int extends AbstractValidator
{
const INVALID = 'intInvalid';
@@ -107,13 +109,22 @@ class Int extends AbstractValidator
$this->setValue($value);
$locale = $this->getLocale();
- $format = new NumberFormatter($locale, NumberFormatter::DECIMAL);
- if (intl_is_failure($format->getErrorCode())) {
- throw new Exception\InvalidArgumentException("Invalid locale string given");
+ try {
+ $format = new NumberFormatter($locale, NumberFormatter::DECIMAL);
+ if (intl_is_failure($format->getErrorCode())) {
+ throw new Exception\InvalidArgumentException("Invalid locale string given");
+ }
+ } catch (IntlException $intlException) {
+ throw new Exception\InvalidArgumentException("Invalid locale string given", 0, $intlException);
}
- $parsedInt = $format->parse($value, NumberFormatter::TYPE_INT64);
- if (intl_is_failure($format->getErrorCode())) {
+ try {
+ $parsedInt = $format->parse($value, NumberFormatter::TYPE_INT64);
+ if (intl_is_failure($format->getErrorCode())) {
+ $this->error(self::NOT_INT);
+ return false;
+ }
+ } catch (IntlException $intlException) {
$this->error(self::NOT_INT);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php
index 729a4fbdf90..3af31a2b80b 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php
@@ -3,19 +3,19 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\I18n\Validator;
+use Locale;
use Traversable;
use Zend\Stdlib\ArrayUtils;
use Zend\Validator\AbstractValidator;
class PhoneNumber extends AbstractValidator
{
-
const NO_MATCH = 'phoneNumberNoMatch';
const UNSUPPORTED = 'phoneNumberUnsupported';
const INVALID = 'phoneNumberInvalid';
@@ -86,6 +86,9 @@ class PhoneNumber extends AbstractValidator
if (array_key_exists('country', $options)) {
$this->setCountry($options['country']);
+ } else {
+ $country = Locale::getRegion(Locale::getDefault());
+ $this->setCountry($country);
}
if (array_key_exists('allowed_types', $options)) {
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AC.php
index a8e32bfaabd..d1356fee6ec 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AC.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AC.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AD.php
index 54ccdbb0697..e9369ba7231 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AD.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AD.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AE.php
index 8cacd8c0730..45f8ea3cd18 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AF.php
index c4a25e332e9..bbbdb2dafcb 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AF.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AF.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AG.php
index f3f62c88350..99c074cfb2d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AI.php
index 4d5c2f2d087..e086c43e2e1 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AI.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AI.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AL.php
index 765acf2ec1b..a80de5f2728 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AL.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AL.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AM.php
index af34426b671..03b04fb8a34 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AO.php
index a9c8632ee21..6817767c125 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AR.php
index 2cdb5efb879..b61e9476c61 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AS.php
index 21686cbac3e..da5300b9115 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AS.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AS.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AT.php
index e79f2b23c8c..9bdcd3fa198 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AT.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AT.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AU.php
index 129c543a10f..5e5c46d23d8 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AU.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AU.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AW.php
index a5493c5fc66..f1b927fc8b2 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AW.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AW.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AX.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AX.php
index 36b90a0ac94..2223a7fb319 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AX.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AX.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AZ.php
index f62ef58eb6a..ad8e82394e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AZ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/AZ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BA.php
index aacdbc9e01e..e7908dd3afd 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BB.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BB.php
index eff89300b6c..961750c2c97 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BB.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BB.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BD.php
index 9924303c86a..9a6b8a18dd1 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BD.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BD.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BE.php
index ae0020a410b..72022bc9456 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BF.php
index 2d9d9a5802a..9b287fcdd90 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BF.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BF.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BG.php
index 4e8c4fcbda2..70cdc86a111 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BH.php
index 755ff41e96f..86dd502ad38 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BH.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BH.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BI.php
index d71589d0ba5..7a29f820bd3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BI.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BI.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BJ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BJ.php
index d45f86293f9..0b6b7f609a9 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BJ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BJ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BL.php
index 7a65486cc3d..fa7d83ad186 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BL.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BL.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BM.php
index 9db45422b21..c5212876715 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BN.php
index 0dabeae002d..b49f67d05fa 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BN.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BN.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BO.php
index a81a711b8a2..b7eddf86bdb 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BQ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BQ.php
index ec24739335b..5b91802d8e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BQ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BQ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BR.php
index 00d334c172c..7d623e6b974 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BS.php
index 55a9d552b0c..238c7d16fe9 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BS.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BS.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BT.php
index f6e49d4a2c9..19022abcda9 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BT.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BT.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BW.php
index 1cac6f552a0..208ea9cfbb7 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BW.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BW.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BY.php
index 288b0d00e6e..6c06aa365e1 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BY.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BY.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BZ.php
index 713e28fddaa..047562aa3b0 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BZ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/BZ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CA.php
index 0d7388e4c2b..e184b713379 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CC.php
index d5565fccffb..c37dac8cd8f 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CC.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CC.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CD.php
index f0589c91c24..cc3278e1bf3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CD.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CD.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CF.php
index 2ccb05cffea..29c28e45f48 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CF.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CF.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CG.php
index dadad9ff4b2..f036b81363a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CH.php
index a16c372abee..c3e34cbcf17 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CH.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CH.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CI.php
index c688aa2b30c..2dc7092e802 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CI.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CI.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CK.php
index 932f83fcb20..1c2871ed5c6 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CK.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CK.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CL.php
index 8cccec24db2..0c2362fda06 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CL.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CL.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CM.php
index b3249d9a6b2..1c2e0188c8b 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CN.php
index 28ed30d0986..e936fab2587 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CN.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CN.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CO.php
index bb37839a663..2f67c08c1f2 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CR.php
index dd31fc8c518..354bbbb23d1 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CU.php
index 8b57518fadf..9686c1a5b2f 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CU.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CU.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CV.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CV.php
index e0fbd208ae2..eb4574b21a7 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CV.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CV.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CW.php
index f98f612436d..837226580f3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CW.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CW.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CX.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CX.php
index f8b783d1e68..c0780f48951 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CX.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CX.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CY.php
index d31c642cf0b..3a62a9e21aa 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CY.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CY.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CZ.php
index 0522f3a2fe6..a4752b3e11a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CZ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/CZ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DE.php
index c2e33cfe606..9e385832630 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DJ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DJ.php
index 4d67877a518..2f1c7df00ca 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DJ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DJ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DK.php
index 7ca1c02ab95..a3493b254a9 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DK.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DK.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DM.php
index 46fb12cbacf..74cca0ab749 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DO.php
index 8ad41576ed8..412ad19c97b 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DZ.php
index dc76f783a51..46e941d52eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DZ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/DZ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EC.php
index e059b3e85f3..2e929bd61b5 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EC.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EC.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EE.php
index 43184e26988..d09f3081a92 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EG.php
index 5137004557c..d26829a70df 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EH.php
index 61fa0254501..a328ffcc378 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EH.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/EH.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ER.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ER.php
index 561f303ab2d..919acf5d042 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ER.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ER.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ES.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ES.php
index c9640759f39..5387b25fb9c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ES.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ES.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ET.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ET.php
index 8601f009907..f87979b5e43 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ET.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ET.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FI.php
index 3450c5aed29..ecfa89b61a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FI.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FI.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FJ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FJ.php
index 4d6cf27cac3..da6105a0df6 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FJ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FJ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FK.php
index fb92b5b3bf1..b826575e9a3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FK.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FK.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FM.php
index 05b987ff086..f16972bc0a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FO.php
index 175587aaf22..8f402e4253d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FR.php
index 0ac6b7851bd..b14e32afd2e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/FR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,7 @@ return array(
'national' => array(
'general' => '/^[124-9]\\d{8}|3\\d{3}(?:\\d{5})?$/',
'fixed' => '/^[1-5]\\d{8}$/',
- 'mobile' => '/^6\\d{8}|7[5-9]\\d{7}$/',
+ 'mobile' => '/^[6-7]\\d{8}|7[5-9]\\d{7}$/',
'tollfree' => '/^80\\d{7}$/',
'premium' => '/^3\\d{3}|89[1-37-9]\\d{6}$/',
'shared' => '/^8(?:1[019]|2[0156]|84|90)\\d{6}$/',
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GA.php
index 89efc1a7ec0..46ad3fe60d3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GB.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GB.php
index c79d084ce02..ccebd249a5e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GB.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GB.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GD.php
index 5402120e7c4..79d8b665f81 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GD.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GD.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GE.php
index 8574f7fe13d..fac5a77035f 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GF.php
index 2cf36618dfa..8a2d790db40 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GF.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GF.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GG.php
index ed54147597b..067acc378f3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GH.php
index cd575022d9c..7f7e363d444 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GH.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GH.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GI.php
index 6847168bed8..561620e9bc3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GI.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GI.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GL.php
index 074467e1c54..c429cd4e6f1 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GL.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GL.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GM.php
index d4b834bdc44..637a496c632 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GN.php
index d1df586c330..df126258b21 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GN.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GN.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GP.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GP.php
index 75ab3436cc7..2efcda498f4 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GP.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GP.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GQ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GQ.php
index df5d25311f5..77fe07cc1d8 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GQ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GQ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GR.php
index f279291acd3..ecb5dafd168 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GT.php
index f417e17a6a3..25010c61b76 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GT.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GT.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GU.php
index f897375f930..466d7bc18cb 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GU.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GU.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GW.php
index 661a13e03b4..7f251ad9f21 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GW.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GW.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GY.php
index 1d97f5138ef..d485d2e085d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GY.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GY.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HK.php
index 4d8ad36b073..66acea94e84 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HK.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HK.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HN.php
index d6737460a59..2645c73cce8 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HN.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HN.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HR.php
index a4c032f812b..1dfe30cf08a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HT.php
index 90abff5766d..e9371388c7b 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HT.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HT.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HU.php
index c1d2661567e..400a29dbe80 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HU.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/HU.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ID.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ID.php
index 05f70715b0e..b22157f6fd3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ID.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ID.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IE.php
index 416da05441d..75a9ddf7864 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IL.php
index 293a3fa6150..286fca8c15e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IL.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IL.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IM.php
index d36f15a2908..910d465caa5 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IN.php
index 1968e8f9ab7..440addf0e0e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IN.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IN.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IO.php
index 1b1d63bd35c..6375b337287 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IQ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IQ.php
index e660e274811..912c3194cde 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IQ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IQ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IR.php
index 6ca5e96acce..7743e69e609 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IS.php
index 517e49fa8a6..0f1874d4b51 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IS.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IS.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IT.php
index 9274de6a000..b6f16be62be 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IT.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/IT.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JE.php
index 71f2f6984ae..fb4d5604b0a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JM.php
index d70e08ebd68..b602a498f04 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JO.php
index efd7f97ed80..c1bd3b98557 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JP.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JP.php
index 31d8ab5a456..85619eba577 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JP.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/JP.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KE.php
index 49f198d6a2c..704fab02ca1 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KG.php
index 25820b21d16..6f08e53313a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KH.php
index ebd1b0c9ef4..aba42b4ca41 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KH.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KH.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KI.php
index 3b9b43fb59b..2fde2e2e983 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KI.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KI.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KM.php
index 97c0af26a7d..7c2fe27c6b7 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KN.php
index 6f54c236c6c..0ca61108c99 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KN.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KN.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KP.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KP.php
index c005ef8e77f..f99646714f2 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KP.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KP.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KR.php
index 3c3363399ae..d94c4e0d195 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KW.php
index ad19cafcbae..68b8a6f14b4 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KW.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KW.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KY.php
index ea8b6fe1829..1dd83798192 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KY.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KY.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KZ.php
index 0ba5df16112..30e98e9d6d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KZ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/KZ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LA.php
index 618b55d566f..b861bd1357a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LB.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LB.php
index 52a0819978a..25c0e803bbf 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LB.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LB.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LC.php
index 8bd033c643d..f943a618d36 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LC.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LC.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LI.php
index bf27ab78def..1342dea8db3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LI.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LI.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LK.php
index 739737f556d..7f7bfaacc6a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LK.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LK.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LR.php
index 6547a6c715c..16bc19e3cf1 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LS.php
index f5073759fa7..1951870a4fe 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LS.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LS.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LT.php
index b054f55ef6d..9f7fca06b0d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LT.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LT.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LU.php
index aee8dc9faf9..a41eec60acf 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LU.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LU.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LV.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LV.php
index 9d73e5152bd..02596f67384 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LV.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LV.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LY.php
index 0855a57a3d0..3afc6a38f40 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LY.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/LY.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MA.php
index 7e887cfabc8..d1bf3da5313 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MC.php
index c2212dcd7c1..11f305b15ce 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MC.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MC.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MD.php
index 7c490dee647..d1a257bd997 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MD.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MD.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ME.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ME.php
index fbc80ff7717..bae5d575360 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ME.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ME.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MF.php
index 55dd233e343..c72d36dba4a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MF.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MF.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MG.php
index 5a26015bbcb..8b16a3a19b4 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MH.php
index b4a462cb5a0..d42cade3199 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MH.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MH.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MK.php
index 5fe3a4f9c44..f3509851f69 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MK.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MK.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ML.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ML.php
index fef63884480..36f1172960f 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ML.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ML.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MM.php
index 282bccb11ea..41182b1b7c3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MN.php
index 33e5258ace8..2c947a861fd 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MN.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MN.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MO.php
index 1dbd32af8bd..66a033d9662 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MP.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MP.php
index aa93d4560a5..9125a20a4af 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MP.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MP.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MQ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MQ.php
index 1224eb1d944..873de070229 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MQ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MQ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MR.php
index 1a8e84c2abb..fb1b5294f05 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MS.php
index 1587038d837..ab3bf7c41f9 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MS.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MS.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MT.php
index 320a3015de0..ced6e51ea4f 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MT.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MT.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MU.php
index 1884219dba3..4fc5cadec29 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MU.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MU.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MV.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MV.php
index fd58c0a6180..0203235fc53 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MV.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MV.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MW.php
index 193fcec451a..ce7afec0cd4 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MW.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MW.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MX.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MX.php
index fe04bb4b503..30ccaa308d7 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MX.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MX.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MY.php
index 09a5cc4c769..4c8a13e7cdb 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MY.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MY.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MZ.php
index dc3c66d1927..7322f5d853b 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MZ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/MZ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NA.php
index ca55c4d8570..cf590936af7 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NC.php
index 000d5de258d..2f0f9d8fd5a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NC.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NC.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NE.php
index 447ceaf9cc4..fe593e95556 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NF.php
index 5cc97acbbc2..9d174161dfb 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NF.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NF.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NG.php
index 2e892aff205..30dad5596f6 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NI.php
index 0deba4720c9..1a6dc26b389 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NI.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NI.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,7 @@ return array(
'national' => array(
'general' => '/^[128]\\d{7}$/',
'fixed' => '/^2\\d{7}$/',
- 'mobile' => '/^[78]\\d{7}$/',
+ 'mobile' => '/^[578]\\d{7}$/',
'tollfree' => '/^1800\\d{4}$/',
'emergency' => '/^118$/',
),
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NL.php
index 770efefc4cd..2d1c32a1366 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NL.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NL.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NO.php
index 9a35d2cb6a2..16e727d38fe 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NP.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NP.php
index 3e50c534cde..167eb5cf2d3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NP.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NP.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NR.php
index 584755f44ca..20a8f665b4f 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NU.php
index d215c2e7edb..0f1a7587d3e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NU.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NU.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NZ.php
index 35b2dfbf0e6..d1694483dc8 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NZ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/NZ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/OM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/OM.php
index 079f91282f6..67e16524539 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/OM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/OM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PA.php
index e12308bb9c5..23736a5b44c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PE.php
index 677e9e77a96..55952bdc5ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PF.php
index b145f73ee28..16eafa34a59 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PF.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PF.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PG.php
index 9b670bca80a..838271329e8 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PH.php
index 63c83e67744..017f1a8caeb 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PH.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PH.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PK.php
index 8bc537ddc7e..9f3de733efd 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PK.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PK.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PL.php
index 727adf867f8..8c6357839e6 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PL.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PL.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PM.php
index c47eae2bcdc..25602651077 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PR.php
index f0cb29d066e..c13d9e137e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PS.php
index 7e98744f6c1..2897f8202e4 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PS.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PS.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PT.php
index 01ca673441c..ee18cfb47c3 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PT.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PT.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PW.php
index dbb7e2a328c..d1fc4987122 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PW.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PW.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PY.php
index 7fd69d0f764..99aec619227 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PY.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/PY.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/QA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/QA.php
index 3d139c1b70f..7ffff430f16 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/QA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/QA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RE.php
index 5281602b326..45022369ce6 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RO.php
index b51f28fccc5..b0fcd0d17f9 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RS.php
index 35c2eeff935..f37422d2542 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RS.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RS.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RU.php
index 6a4e91cae4f..c90aaf6c78f 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RU.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RU.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RW.php
index c75e3e2acc8..8dc2b389acb 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RW.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/RW.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SA.php
index 375f84befa1..2bc0b9c8e3b 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SB.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SB.php
index ea109869179..909f49b8a88 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SB.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SB.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SC.php
index 3127bc4c74e..7d347da3dec 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SC.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SC.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SD.php
index ac1258093d5..264e994044d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SD.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SD.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SE.php
index 1019aa411fd..b5dc73a9e14 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SG.php
index 8bfd363e17e..e729579d186 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SH.php
index 789f0d8072f..970c20714e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SH.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SH.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SI.php
index ff155ebaf62..e291c0c6d96 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SI.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SI.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SJ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SJ.php
index 32ebd5ccda2..8b298fba7cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SJ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SJ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SK.php
index 0f5ac7d571a..40d6f0ce82d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SK.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SK.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SL.php
index 021a8c317e3..7ca542ca94c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SL.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SL.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SM.php
index 31ecb9a3870..372f0b808ec 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SN.php
index b1cb398ef8f..896ce54bc45 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SN.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SN.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SO.php
index a8400a35e8a..1d442519fe8 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SR.php
index 73468fc83d3..f7f3f13e27c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SS.php
index e1055dbf8f1..8e8eb691bfd 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SS.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SS.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ST.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ST.php
index e6204120f3c..332f980f0a4 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ST.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ST.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SV.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SV.php
index 2f0e5f18d9d..9fac35253b2 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SV.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SV.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SX.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SX.php
index 1a58b86ada8..122b7f38033 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SX.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SX.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SY.php
index 2036019cf91..cfb7af6f5e6 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SY.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SY.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SZ.php
index 1200fe57dd2..2fa2672631a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SZ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/SZ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TC.php
index a111f2e1823..3cd78dc1cd7 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TC.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TC.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TD.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TD.php
index 832f9f83558..ffa54afdb4d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TD.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TD.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TG.php
index efbff3a5537..ebf28dd79b6 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TH.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TH.php
index 2b546e314b7..b3d50d63156 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TH.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TH.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TJ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TJ.php
index 1542a109ce9..c95bcc50d3d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TJ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TJ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TK.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TK.php
index ffbac87c0ac..93387430f32 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TK.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TK.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TL.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TL.php
index b316d81bfef..00980a84b7b 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TL.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TL.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TM.php
index 94f7f38c616..a57bf6adb08 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TN.php
index a974e155e51..858c6763747 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TN.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TN.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TO.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TO.php
index 4c76aa71864..e60e0c7ca4d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TO.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TO.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TR.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TR.php
index d0b4bf799af..196a3852961 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TR.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TR.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TT.php
index 663c946eb9a..6ad19f1416f 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TT.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TT.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TV.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TV.php
index aa34f107f0b..153a69813ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TV.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TV.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TW.php
index 1bdc22827b7..fa69626f762 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TW.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TW.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TZ.php
index 9f11578c5ae..d03db84e1ca 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TZ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/TZ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UA.php
index 3c4ea482c6e..4dc1de69e7f 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UG.php
index 30ae376af34..7780758e632 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/US.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/US.php
index ef0f7b5d231..b4bcbc9534e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/US.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/US.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UY.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UY.php
index 991caec3fd7..1cc5cee549e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UY.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UY.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UZ.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UZ.php
index 6e3a5c7dfc1..d4de706391c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UZ.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/UZ.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VA.php
index 365826d1f5d..8811f5c34d8 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VC.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VC.php
index fc911554fe0..3ff352e221e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VC.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VC.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VE.php
index 6a064f8acca..3a155ef781f 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VG.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VG.php
index 604e063ad09..e5c44aa3df5 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VG.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VG.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VI.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VI.php
index a1f8010dd79..6a23bdb7c3d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VI.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VI.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VN.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VN.php
index ea46f114e0c..00577091314 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VN.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VN.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VU.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VU.php
index 7ba438b8fa6..9dc42aaaf7a 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VU.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/VU.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WF.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WF.php
index 8dd7c1a4127..63981b80be5 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WF.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WF.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WS.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WS.php
index 3d0a9de363f..a4ffd0a8af6 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WS.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/WS.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YE.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YE.php
index a09d92f02d9..6a37c42d02c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YE.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YE.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YT.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YT.php
index 416090e9e46..43e0bf41563 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YT.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/YT.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZA.php
index e53ffcf3efc..be812ec86bf 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZA.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZA.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZM.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZM.php
index 149d854903d..39f95170020 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZM.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZM.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZW.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZW.php
index 6818e722229..332cf55f60d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZW.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/ZW.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PostCode.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PostCode.php
index a1ab059cb72..da532bb8642 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PostCode.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PostCode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
index 23c0a6f1ea0..61b3a32ee23 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
@@ -3,13 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\I18n\View\Helper;
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface as Translator;
use Zend\I18n\Translator\TranslatorAwareInterface;
use Zend\View\Helper\AbstractHelper;
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php
index e2c7d83c263..ddad245d76e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -81,8 +81,8 @@ class CurrencyFormat extends AbstractHelper
$number,
$currencyCode = null,
$showDecimals = null,
- $locale = null,
- $pattern = null
+ $locale = null,
+ $pattern = null
) {
if (null === $locale) {
$locale = $this->getLocale();
@@ -136,9 +136,7 @@ class CurrencyFormat extends AbstractHelper
$this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 0);
}
- return $this->formatters[$formatterId]->formatCurrency(
- $number, $currencyCode
- );
+ return $this->formatters[$formatterId]->formatCurrency($number, $currencyCode);
}
/**
@@ -163,7 +161,6 @@ class CurrencyFormat extends AbstractHelper
return $this->currencyCode;
}
-
/**
* Set the currency pattern
*
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/DateFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/DateFormat.php
index acf3b195d2a..026cdd9a645 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/DateFormat.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/DateFormat.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -68,8 +68,8 @@ class DateFormat extends AbstractHelper
$date,
$dateType = IntlDateFormatter::NONE,
$timeType = IntlDateFormatter::NONE,
- $locale = null,
- $pattern = null
+ $locale = null,
+ $pattern = null
) {
if ($locale === null) {
$locale = $this->getLocale();
@@ -89,11 +89,6 @@ class DateFormat extends AbstractHelper
);
}
- // DateTime support for IntlDateFormatter::format() was only added in 5.3.4
- if ($date instanceof DateTime && (PHP_VERSION_ID < 50304)) {
- $date = $date->getTimestamp();
- }
-
return $this->formatters[$formatterId]->format($date);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/NumberFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/NumberFormat.php
index eb6301a8a4b..b944b1ae3c6 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/NumberFormat.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/NumberFormat.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -80,9 +80,9 @@ class NumberFormat extends AbstractHelper
public function __invoke(
$number,
$formatStyle = null,
- $formatType = null,
- $locale = null,
- $decimals = null
+ $formatType = null,
+ $locale = null,
+ $decimals = null
) {
if (null === $locale) {
$locale = $this->getLocale();
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Plural.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Plural.php
index a366b27f7b7..3bb31ba7e66 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Plural.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Plural.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,7 @@ use Zend\View\Helper\AbstractHelper;
* Helper for rendering text based on a count number (like the I18n plural translation helper, but when translation
* is not needed).
*
- * Please note that we did not write any hard-coded rules for languages, as languages can evolve, we prefered to
+ * Please note that we did not write any hard-coded rules for languages, as languages can evolve, we preferred to
* let the developer define the rules himself, instead of potentially break applications if we change rules in the
* future.
*
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Translate.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Translate.php
index 5b7a508346a..bfd9d20a87b 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Translate.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Translate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/TranslatePlural.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/TranslatePlural.php
index f5d5e723870..eee3efeae36 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/TranslatePlural.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/TranslatePlural.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -33,8 +33,7 @@ class TranslatePlural extends AbstractTranslatorHelper
$number,
$textDomain = null,
$locale = null
- )
- {
+ ) {
$translator = $this->getTranslator();
if (null === $translator) {
throw new Exception\RuntimeException('Translator has not been set');
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/View/HelperConfig.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/HelperConfig.php
index e7ac22df278..714b131501e 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/HelperConfig.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/HelperConfig.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/composer.json b/vendor/zendframework/zendframework/library/Zend/I18n/composer.json
index 606194d6b0b..6eec5a6a11c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/composer.json
@@ -6,6 +6,7 @@
"zf2",
"i18n"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\I18n\\": ""
@@ -13,21 +14,33 @@
},
"target-dir": "Zend/I18n",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-cache": "self.version",
+ "zendframework/zend-config": "self.version",
+ "zendframework/zend-eventmanager": "self.version",
+ "zendframework/zend-filter": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-validator": "self.version",
+ "zendframework/zend-view": "self.version"
+ },
"suggest": {
"ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP",
+ "zendframework/zend-cache": "Zend\\Cache component",
+ "zendframework/zend-config": "Zend\\Config component",
"zendframework/zend-eventmanager": "You should install this package to use the events in the translator",
"zendframework/zend-filter": "You should install this package to use the provided filters",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
"zendframework/zend-validator": "You should install this package to use the provided validators",
"zendframework/zend-view": "You should install this package to use the provided view helpers",
"zendframework/zend-resources": "Translation resources"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/ArrayInput.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/ArrayInput.php
index 7a32f64bca7..4d1dc7b4339 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/ArrayInput.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/ArrayInput.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,6 +18,7 @@ class ArrayInput extends Input
/**
* @param array $value
+ * @throws Exception\InvalidArgumentException
* @return Input
*/
public function setValue($value)
@@ -56,8 +57,8 @@ class ArrayInput extends Input
foreach ($values as $value) {
$result = $validator->isValid($value, $context);
if (!$result) {
- if ($fallbackValue = $this->getFallbackValue()) {
- $this->setValue($fallbackValue);
+ if ($this->hasFallback()) {
+ $this->setValue($this->getFallbackValue());
$result = true;
}
break;
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php
index 38e9de03e3a..13dd900177d 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -245,7 +245,7 @@ class BaseInputFilter implements
&& $input->isRequired()
&& $input->allowEmpty()
) {
- if(!($input instanceOf EmptyContextInterface && $input->continueIfEmpty())) {
+ if (!($input instanceof EmptyContextInterface && $input->continueIfEmpty())) {
$this->validInputs[$name] = $input;
continue;
}
@@ -369,13 +369,14 @@ class BaseInputFilter implements
* each specifying a single input.
*
* @param mixed $name
+ * @throws Exception\InvalidArgumentException
* @return InputFilterInterface
*/
public function setValidationGroup($name)
{
if ($name === self::VALIDATE_ALL) {
$this->validationGroup = null;
- foreach($this->getInputs() as $input) {
+ foreach ($this->getInputs() as $input) {
if ($input instanceof InputFilterInterface) {
$input->setValidationGroup(self::VALIDATE_ALL);
}
@@ -462,6 +463,11 @@ class BaseInputFilter implements
));
}
$input = $this->inputs[$name];
+
+ if ($input instanceof InputFilterInterface) {
+ return $input->getValues();
+ }
+
return $input->getValue();
}
@@ -577,6 +583,11 @@ class BaseInputFilter implements
foreach (array_keys($this->inputs) as $name) {
$input = $this->inputs[$name];
+ if ($input instanceof CollectionInputFilter) {
+ $input->clearValues();
+ $input->clearRawValues();
+ }
+
if (!isset($this->data[$name])) {
// No value; clear value in this input
if ($input instanceof InputFilterInterface) {
@@ -584,6 +595,11 @@ class BaseInputFilter implements
continue;
}
+ if ($input instanceof ArrayInput) {
+ $input->setValue(array());
+ continue;
+ }
+
$input->setValue(null);
continue;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/InputFilter/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php
index 44b6f443468..1e2f1daebc7 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,21 +13,6 @@ use Traversable;
class CollectionInputFilter extends InputFilter
{
- /*
- * @var array
- */
- protected $collectionData;
-
- /*
- * @var array
- */
- protected $collectionValidInputs;
-
- /*
- * @var array
- */
- protected $collectionInvalidInputs;
-
/*
* @var bool
*/
@@ -62,6 +47,7 @@ class CollectionInputFilter extends InputFilter
* Set the input filter to use when looping the data
*
* @param BaseInputFilter|array|Traversable $inputFilter
+ * @throws Exception\RuntimeException
* @return CollectionInputFilter
*/
public function setInputFilter($inputFilter)
@@ -80,7 +66,7 @@ class CollectionInputFilter extends InputFilter
}
$this->inputFilter = $inputFilter;
- $this->inputs = $inputFilter->getInputs();
+
return $this;
}
@@ -94,6 +80,7 @@ class CollectionInputFilter extends InputFilter
if (null === $this->inputFilter) {
$this->setInputFilter(new InputFilter());
}
+
return $this->inputFilter;
}
@@ -106,6 +93,7 @@ class CollectionInputFilter extends InputFilter
public function setIsRequired($isRequired)
{
$this->isRequired = $isRequired;
+
return $this;
}
@@ -119,7 +107,6 @@ class CollectionInputFilter extends InputFilter
return $this->isRequired;
}
-
/**
* Set the count of data to validate
*
@@ -129,6 +116,7 @@ class CollectionInputFilter extends InputFilter
public function setCount($count)
{
$this->count = $count > 0 ? $count : 0;
+
return $this;
}
@@ -140,8 +128,9 @@ class CollectionInputFilter extends InputFilter
public function getCount()
{
if (null === $this->count) {
- $this->count = count($this->collectionData);
+ return count($this->data);
}
+
return $this->count;
}
@@ -150,7 +139,7 @@ class CollectionInputFilter extends InputFilter
*/
public function setData($data)
{
- $this->collectionData = $data;
+ $this->data = $data;
}
/**
@@ -158,6 +147,7 @@ class CollectionInputFilter extends InputFilter
*/
public function isValid()
{
+ $inputFilter = $this->getInputFilter();
$valid = true;
if ($this->getCount() < 1) {
@@ -166,49 +156,39 @@ class CollectionInputFilter extends InputFilter
}
}
- if (count($this->collectionData) < $this->getCount()) {
+ if (is_scalar($this->data)
+ || count($this->data) < $this->getCount()
+ ) {
$valid = false;
}
- $inputs = $this->validationGroup ?: array_keys($this->inputs);
- foreach ($this->collectionData as $key => $data) {
+ if (empty($this->data) || is_scalar($this->data)) {
+ $this->clearValues();
+ $this->clearRawValues();
+
+ return $valid;
+ }
+
+ foreach ($this->data as $key => $data) {
if (!is_array($data)) {
$data = array();
}
- $this->data = $data;
- $this->populate();
+ $inputFilter->setData($data);
- if ($this->validateInputs($inputs, $data)) {
- $this->collectionValidInputs[$key] = $this->validInputs;
- } else {
- $this->collectionInvalidInputs[$key] = $this->invalidInputs;
- $valid = false;
+ if (null !== $this->validationGroup) {
+ $inputFilter->setValidationGroup($this->validationGroup[$key]);
}
- $values = array();
- $rawValues = array();
- $messages = array();
- foreach ($inputs as $name) {
- $input = $this->inputs[$name];
-
- if ($input instanceof InputFilterInterface) {
- $values[$name] = $input->getValues();
- $rawValues[$name] = $input->getRawValues();
- continue;
- }
- $values[$name] = $input->getValue($this->data);
- $rawValues[$name] = $input->getRawValue();
- $tmpMessages = $input->getMessages();
- if (!empty($tmpMessages)) {
- $messages[$name] = $tmpMessages;
- }
+ if ($inputFilter->isValid()) {
+ $this->validInputs[$key] = $inputFilter->getValidInput();
+ } else {
+ $valid = false;
+ $this->collectionMessages[$key] = $inputFilter->getMessages();
+ $this->invalidInputs[$key] = $inputFilter->getInvalidInput();
}
- $this->collectionValues[$key] = $values;
- $this->collectionRawValues[$key] = $rawValues;
- if (!empty($messages)) {
- $this->collectionMessages[$key] = $messages;
- }
+ $this->collectionValues[$key] = $inputFilter->getValues();
+ $this->collectionRawValues[$key] = $inputFilter->getRawValues();
}
return $valid;
@@ -221,50 +201,49 @@ class CollectionInputFilter extends InputFilter
{
if ($name === self::VALIDATE_ALL) {
$this->validationGroup = null;
+
return $this;
}
- if (is_array($name)) {
- // Best effort check if the validation group was set by a form for BC
- if (count($name) == count($this->collectionData) && is_array(reset($name))) {
- return parent::setValidationGroup(reset($name));
- }
- return parent::setValidationGroup($name);
- }
+ $this->validationGroup = $name;
- return parent::setValidationGroup(func_get_args());
+ return $this;
}
/**
* {@inheritdoc}
*/
- public function getInvalidInput()
+ public function getValues()
{
- return (is_array($this->collectionInvalidInputs) ? $this->collectionInvalidInputs : array());
+ return $this->collectionValues;
}
/**
* {@inheritdoc}
*/
- public function getValidInput()
+ public function getRawValues()
{
- return (is_array($this->collectionValidInputs) ? $this->collectionValidInputs : array());
+ return $this->collectionRawValues;
}
/**
- * {@inheritdoc}
+ * Clear collectionValues
+ *
+ * @access public
*/
- public function getValues()
+ public function clearValues()
{
- return $this->collectionValues;
+ return $this->collectionValues = array();
}
/**
- * {@inheritdoc}
+ * Clear collectionRawValues
+ *
+ * @access public
*/
- public function getRawValues()
+ public function clearRawValues()
{
- return $this->collectionRawValues;
+ return $this->collectionRawValues = array();
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/EmptyContextInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/EmptyContextInterface.php
index 0a2270d7fc2..3c141129063 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/EmptyContextInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/EmptyContextInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/ExceptionInterface.php
index 848fa2e520e..25dc0f9319e 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\InputFilter\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/InvalidArgumentException.php
index 3fcec0c68d2..2be90530c74 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/InvalidArgumentException.php
@@ -3,12 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\InputFilter\Exception;
-class InvalidArgumentException extends \InvalidArgumentException implements
- ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/RuntimeException.php
index 45ef3ee857f..b882163de4e 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/RuntimeException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\InputFilter\Exception;
class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php
index 6ac6bc2be5c..ff179651277 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php
@@ -3,13 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\InputFilter;
use Traversable;
+use Zend\Filter\Exception;
use Zend\Filter\FilterChain;
use Zend\Stdlib\ArrayUtils;
use Zend\Validator\ValidatorInterface;
@@ -38,12 +39,12 @@ class Factory
*/
public function __construct(InputFilterPluginManager $inputFilterManager = null)
{
+ $this->defaultFilterChain = new FilterChain();
+ $this->defaultValidatorChain = new ValidatorChain();
+
if ($inputFilterManager) {
$this->setInputFilterManager($inputFilterManager);
}
-
- $this->defaultFilterChain = new FilterChain();
- $this->defaultValidatorChain = new ValidatorChain();
}
/**
@@ -303,10 +304,16 @@ class Factory
if (isset($inputFilterSpecification['count'])) {
$inputFilter->setCount($inputFilterSpecification['count']);
}
+ if (isset($inputFilterSpecification['required'])) {
+ $inputFilter->setIsRequired($inputFilterSpecification['required']);
+ }
return $inputFilter;
}
foreach ($inputFilterSpecification as $key => $value) {
+ if (null === $value) {
+ continue;
+ }
if (($value instanceof InputInterface)
|| ($value instanceof InputFilterInterface)
@@ -325,6 +332,7 @@ class Factory
/**
* @param FilterChain $chain
* @param array|Traversable $filters
+ * @throws Exception\RuntimeException
* @return void
*/
protected function populateFilters(FilterChain $chain, $filters)
@@ -360,6 +368,7 @@ class Factory
/**
* @param ValidatorChain $chain
* @param array|Traversable $validators
+ * @throws Exception\RuntimeException
* @return void
*/
protected function populateValidators(ValidatorChain $chain, $validators)
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/FileInput.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/FileInput.php
index 41d2e4934e4..223d7cb90bc 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/FileInput.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/FileInput.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
index ab2eab14dc5..a5dae88f027 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/Input.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -70,6 +70,11 @@ class Input implements InputInterface, EmptyContextInterface
*/
protected $fallbackValue;
+ /**
+ * @var bool
+ */
+ protected $hasFallback = false;
+
public function __construct($name = null)
{
$this->name = $name;
@@ -173,6 +178,7 @@ class Input implements InputInterface, EmptyContextInterface
public function setFallbackValue($value)
{
$this->fallbackValue = $value;
+ $this->hasFallback = true;
return $this;
}
@@ -271,18 +277,32 @@ class Input implements InputInterface, EmptyContextInterface
return $this->fallbackValue;
}
+ /**
+ * @return bool
+ */
+ public function hasFallback()
+ {
+ return $this->hasFallback;
+ }
+
+ public function clearFallbackValue()
+ {
+ $this->hasFallback = false;
+ $this->fallbackValue = null;
+ }
+
/**
* @param InputInterface $input
* @return Input
*/
public function merge(InputInterface $input)
{
- $this->setAllowEmpty($input->allowEmpty());
$this->setBreakOnFailure($input->breakOnFailure());
$this->setContinueIfEmpty($input->continueIfEmpty());
$this->setErrorMessage($input->getErrorMessage());
$this->setName($input->getName());
$this->setRequired($input->isRequired());
+ $this->setAllowEmpty($input->allowEmpty());
$this->setValue($input->getRawValue());
$filterChain = $input->getFilterChain();
@@ -308,8 +328,8 @@ class Input implements InputInterface, EmptyContextInterface
$validator = $this->getValidatorChain();
$value = $this->getValue();
$result = $validator->isValid($value, $context);
- if (!$result && $fallbackValue = $this->getFallbackValue()) {
- $this->setValue($fallbackValue);
+ if (!$result && $this->hasFallback()) {
+ $this->setValue($this->getFallbackValue());
$result = true;
}
@@ -325,7 +345,7 @@ class Input implements InputInterface, EmptyContextInterface
return (array) $this->errorMessage;
}
- if ($this->getFallbackValue()) {
+ if ($this->hasFallback()) {
return array();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilter.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilter.php
index 29073e91287..931316402f1 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterAwareInterface.php
index bf4f2011570..fcbf887e9fd 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterAwareTrait.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterAwareTrait.php
index cab399e4436..a7670f7499f 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterAwareTrait.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterAwareTrait.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\InputFilter;
-
trait InputFilterAwareTrait
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterInterface.php
index 41bbfcfb44c..d1df06150b9 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterPluginManager.php
index de1038aafc8..562b7cf7a60 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,6 +16,8 @@ use Zend\Stdlib\InitializableInterface;
/**
* Plugin manager implementation for input filters.
+ *
+ * @method InputFilterInterface|InputInterface get($name)
*/
class InputFilterPluginManager extends AbstractPluginManager
{
@@ -70,7 +72,7 @@ class InputFilterPluginManager extends AbstractPluginManager
*/
public function validatePlugin($plugin)
{
- if ($plugin instanceof InputFilterInterface) {
+ if ($plugin instanceof InputFilterInterface || $plugin instanceof InputInterface) {
// Hook to perform various initialization, when the inputfilter is not created through the factory
if ($plugin instanceof InitializableInterface) {
$plugin->init();
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterProviderInterface.php
index 3b57cc8be44..f6073faf83f 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputInterface.php
index 85637654280..134b06d81cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputProviderInterface.php
index f5298a19565..79aca5652eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/ReplaceableInputInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/ReplaceableInputInterface.php
index dcb3f834ed8..02e5c0950a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/ReplaceableInputInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/ReplaceableInputInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/UnknownInputsCapableInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/UnknownInputsCapableInterface.php
index 1890307bed9..0c34bc73813 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/UnknownInputsCapableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/UnknownInputsCapableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/composer.json b/vendor/zendframework/zendframework/library/Zend/InputFilter/composer.json
index b82d5f23693..886d7310b75 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/composer.json
@@ -6,6 +6,7 @@
"zf2",
"inputfilter"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\InputFilter\\": ""
@@ -13,18 +14,21 @@
},
"target-dir": "Zend/InputFilter",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-filter": "self.version",
"zendframework/zend-validator": "self.version",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-servicemanager": "self.version"
+ },
"suggest": {
"zendframework/zend-servicemanager": "To support plugin manager support"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Json/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Json/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Decoder.php b/vendor/zendframework/zendframework/library/Zend/Json/Decoder.php
index ecfca74b414..15937da2f92 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Decoder.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Decoder.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,6 @@ use Zend\Json\Exception\RuntimeException;
*/
class Decoder
{
-
/**
* Parse tokens used to decode the JSON object. These are not
* for public consumption, they are just used internally to the
@@ -75,6 +74,79 @@ class Decoder
*/
protected $tokenValue;
+ /**
+ * Decode Unicode Characters from \u0000 ASCII syntax.
+ *
+ * This algorithm was originally developed for the
+ * Solar Framework by Paul M. Jones
+ *
+ * @link http://solarphp.com/
+ * @link https://github.com/solarphp/core/blob/master/Solar/Json.php
+ * @param string $chrs
+ * @return string
+ */
+ public static function decodeUnicodeString($chrs)
+ {
+ $chrs = (string) $chrs;
+ $utf8 = '';
+ $strlenChrs = strlen($chrs);
+
+ for ($i = 0; $i < $strlenChrs; $i++) {
+ $ordChrsC = ord($chrs[$i]);
+
+ switch (true) {
+ case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $i, 6)):
+ // single, escaped unicode character
+ $utf16 = chr(hexdec(substr($chrs, ($i + 2), 2)))
+ . chr(hexdec(substr($chrs, ($i + 4), 2)));
+ $utf8char = self::_utf162utf8($utf16);
+ $search = array('\\', "\n", "\t", "\r", chr(0x08), chr(0x0C), '"', '\'', '/');
+ if (in_array($utf8char, $search)) {
+ $replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\\"', '\\\'', '\\/');
+ $utf8char = str_replace($search, $replace, $utf8char);
+ }
+ $utf8 .= $utf8char;
+ $i += 5;
+ break;
+ case ($ordChrsC >= 0x20) && ($ordChrsC <= 0x7F):
+ $utf8 .= $chrs{$i};
+ break;
+ case ($ordChrsC & 0xE0) == 0xC0:
+ // characters U-00000080 - U-000007FF, mask 110XXXXX
+ //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $i, 2);
+ ++$i;
+ break;
+ case ($ordChrsC & 0xF0) == 0xE0:
+ // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $i, 3);
+ $i += 2;
+ break;
+ case ($ordChrsC & 0xF8) == 0xF0:
+ // characters U-00010000 - U-001FFFFF, mask 11110XXX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $i, 4);
+ $i += 3;
+ break;
+ case ($ordChrsC & 0xFC) == 0xF8:
+ // characters U-00200000 - U-03FFFFFF, mask 111110XX
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $i, 5);
+ $i += 4;
+ break;
+ case ($ordChrsC & 0xFE) == 0xFC:
+ // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+ // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+ $utf8 .= substr($chrs, $i, 6);
+ $i += 5;
+ break;
+ }
+ }
+
+ return $utf8;
+ }
+
/**
* Constructor
*
@@ -193,7 +265,7 @@ class Decoder
throw new RuntimeException('Missing ":" in object encoding: ' . $this->source);
}
- $tok = $this->_getNextToken();
+ $this->_getNextToken();
$members[$key] = $this->_decodeValue();
$tok = $this->token;
@@ -262,25 +334,17 @@ class Decoder
return $result;
}
-
/**
* Removes whitespace characters from the source input
*/
protected function _eatWhitespace()
{
- if (preg_match(
- '/([\t\b\f\n\r ])*/s',
- $this->source,
- $matches,
- PREG_OFFSET_CAPTURE,
- $this->offset)
- && $matches[0][1] == $this->offset)
- {
+ if (preg_match('/([\t\b\f\n\r ])*/s', $this->source, $matches, PREG_OFFSET_CAPTURE, $this->offset)
+ && $matches[0][1] == $this->offset) {
$this->offset += strlen($matches[0][0]);
}
}
-
/**
* Retrieves the next token from the source stream
*
@@ -304,8 +368,8 @@ class Decoder
switch ($str{$i}) {
case '{':
- $this->token = self::LBRACE;
- break;
+ $this->token = self::LBRACE;
+ break;
case '}':
$this->token = self::RBRACE;
break;
@@ -321,7 +385,7 @@ class Decoder
case ':':
$this->token = self::COLON;
break;
- case '"':
+ case '"':
$result = '';
do {
$i++;
@@ -338,31 +402,31 @@ class Decoder
}
$chr = $str{$i};
switch ($chr) {
- case '"' :
+ case '"':
$result .= '"';
break;
case '\\':
$result .= '\\';
break;
- case '/' :
+ case '/':
$result .= '/';
break;
- case 'b' :
+ case 'b':
$result .= "\x08";
break;
- case 'f' :
+ case 'f':
$result .= "\x0c";
break;
- case 'n' :
+ case 'n':
$result .= "\x0a";
break;
- case 'r' :
+ case 'r':
$result .= "\x0d";
break;
- case 't' :
+ case 't':
$result .= "\x09";
break;
- case '\'' :
+ case '\'':
$result .= '\'';
break;
default:
@@ -397,7 +461,7 @@ class Decoder
if (($i+ 3) < $strLength && substr($str, $start, 4) == "null") {
$this->token = self::DATUM;
}
- $this->tokenValue = NULL;
+ $this->tokenValue = null;
$i += 3;
break;
}
@@ -409,9 +473,7 @@ class Decoder
$chr = $str{$i};
if ($chr == '-' || $chr == '.' || ($chr >= '0' && $chr <= '9')) {
- if (preg_match('/-?([0-9])*(\.[0-9]*)?((e|E)((-|\+)?)[0-9]+)?/s',
- $str, $matches, PREG_OFFSET_CAPTURE, $start) && $matches[0][1] == $start) {
-
+ if (preg_match('/-?([0-9])*(\.[0-9]*)?((e|E)((-|\+)?)[0-9]+)?/s', $str, $matches, PREG_OFFSET_CAPTURE, $start) && $matches[0][1] == $start) {
$datum = $matches[0][0];
if (is_numeric($datum)) {
@@ -436,79 +498,6 @@ class Decoder
return $this->token;
}
- /**
- * Decode Unicode Characters from \u0000 ASCII syntax.
- *
- * This algorithm was originally developed for the
- * Solar Framework by Paul M. Jones
- *
- * @link http://solarphp.com/
- * @link https://github.com/solarphp/core/blob/master/Solar/Json.php
- * @param string $chrs
- * @return string
- */
- public static function decodeUnicodeString($chrs)
- {
- $chrs = (string) $chrs;
- $utf8 = '';
- $strlenChrs = strlen($chrs);
-
- for ($i = 0; $i < $strlenChrs; $i++) {
- $ordChrsC = ord($chrs[$i]);
-
- switch (true) {
- case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $i, 6)):
- // single, escaped unicode character
- $utf16 = chr(hexdec(substr($chrs, ($i + 2), 2)))
- . chr(hexdec(substr($chrs, ($i + 4), 2)));
- $utf8char = self::_utf162utf8($utf16);
- $search = array('\\', "\n", "\t", "\r", chr(0x08), chr(0x0C), '"', '\'', '/');
- if (in_array($utf8char, $search)) {
- $replace = array('\\\\', '\\n', '\\t', '\\r', '\\b', '\\f', '\\"', '\\\'', '\\/');
- $utf8char = str_replace($search, $replace, $utf8char);
- }
- $utf8 .= $utf8char;
- $i += 5;
- break;
- case ($ordChrsC >= 0x20) && ($ordChrsC <= 0x7F):
- $utf8 .= $chrs{$i};
- break;
- case ($ordChrsC & 0xE0) == 0xC0:
- // characters U-00000080 - U-000007FF, mask 110XXXXX
- //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $i, 2);
- ++$i;
- break;
- case ($ordChrsC & 0xF0) == 0xE0:
- // characters U-00000800 - U-0000FFFF, mask 1110XXXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $i, 3);
- $i += 2;
- break;
- case ($ordChrsC & 0xF8) == 0xF0:
- // characters U-00010000 - U-001FFFFF, mask 11110XXX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $i, 4);
- $i += 3;
- break;
- case ($ordChrsC & 0xFC) == 0xF8:
- // characters U-00200000 - U-03FFFFFF, mask 111110XX
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $i, 5);
- $i += 4;
- break;
- case ($ordChrsC & 0xFE) == 0xFC:
- // characters U-04000000 - U-7FFFFFFF, mask 1111110X
- // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $utf8 .= substr($chrs, $i, 6);
- $i += 5;
- break;
- }
- }
-
- return $utf8;
- }
-
/**
* Convert a string from one UTF-16 char to one UTF-8 char.
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Encoder.php b/vendor/zendframework/zendframework/library/Zend/Json/Encoder.php
index ecc471f9054..82929e44cb2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Encoder.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Encoder.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,7 @@ namespace Zend\Json;
use Iterator;
use IteratorAggregate;
+use JsonSerializable;
use ReflectionClass;
use Zend\Json\Exception\InvalidArgumentException;
use Zend\Json\Exception\RecursionException;
@@ -66,6 +67,10 @@ class Encoder
{
$encoder = new static(($cycleCheck) ? true : false, $options);
+ if ($value instanceof JsonSerializable) {
+ $value = $value->jsonSerialize();
+ }
+
return $encoder->_encodeValue($value);
}
@@ -90,7 +95,6 @@ class Encoder
return $this->_encodeDatum($value);
}
-
/**
* Encode an object to JSON by encoding each of the public properties
*
@@ -107,12 +111,9 @@ class Encoder
{
if ($this->cycleCheck) {
if ($this->_wasVisited($value)) {
-
if (isset($this->options['silenceCyclicalExceptions'])
&& $this->options['silenceCyclicalExceptions']===true) {
-
return '"* RECURSION (' . str_replace('\\', '\\\\', get_class($value)) . ') *"';
-
} else {
throw new RecursionException(
'Cycles not supported in JSON encoding, cycle introduced by '
@@ -127,7 +128,7 @@ class Encoder
$props = '';
if (method_exists($value, 'toJson')) {
- $props =',' . preg_replace("/^\{(.*)\}$/","\\1", $value->toJson());
+ $props = ',' . preg_replace("/^\{(.*)\}$/", "\\1", $value->toJson());
} else {
if ($value instanceof IteratorAggregate) {
$propCollection = $value->getIterator();
@@ -153,7 +154,6 @@ class Encoder
. $props . '}';
}
-
/**
* Determine if an object has been serialized already
*
@@ -169,7 +169,6 @@ class Encoder
return false;
}
-
/**
* JSON encode an array value
*
@@ -213,7 +212,6 @@ class Encoder
return $result;
}
-
/**
* JSON encode a basic data type (string, number, boolean, null)
*
@@ -239,7 +237,6 @@ class Encoder
return $result;
}
-
/**
* JSON encode a string value by escaping characters as necessary
*
@@ -263,7 +260,6 @@ class Encoder
return '"' . $string . '"';
}
-
/**
* Encode the constants associated with the ReflectionClass
* parameter. The encoding format is based on the class2 format
@@ -288,7 +284,6 @@ class Encoder
return $result . "}";
}
-
/**
* Encode the public methods of the ReflectionClass in the
* class2 format
@@ -317,7 +312,6 @@ class Encoder
if ('__construct' != $method->getName()) {
$parameters = $method->getParameters();
- $paramCount = count($parameters);
$argsStarted = false;
$argNames = "var argNames=[";
@@ -352,7 +346,6 @@ class Encoder
return $result . "}";
}
-
/**
* Encode the public properties of the ReflectionClass in the class2
* format.
@@ -366,7 +359,6 @@ class Encoder
$properties = $cls->getProperties();
$propValues = get_class_vars($cls->getName());
$result = "variables:{";
- $cnt = 0;
$tmpArray = array();
foreach ($properties as $prop) {
@@ -409,7 +401,6 @@ class Encoder
. self::_encodeVariables($cls) .'});';
}
-
/**
* Encode several classes at once
*
@@ -470,9 +461,12 @@ class Encoder
case (($ordVarC & 0xF0) == 0xE0):
// characters U-00000800 - U-0000FFFF, mask 1110XXXX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ordVarC,
- ord($value[$i + 1]),
- ord($value[$i + 2]));
+ $char = pack(
+ 'C*',
+ $ordVarC,
+ ord($value[$i + 1]),
+ ord($value[$i + 2])
+ );
$i += 2;
$utf16 = self::_utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -481,10 +475,13 @@ class Encoder
case (($ordVarC & 0xF8) == 0xF0):
// characters U-00010000 - U-001FFFFF, mask 11110XXX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ordVarC,
- ord($value[$i + 1]),
- ord($value[$i + 2]),
- ord($value[$i + 3]));
+ $char = pack(
+ 'C*',
+ $ordVarC,
+ ord($value[$i + 1]),
+ ord($value[$i + 2]),
+ ord($value[$i + 3])
+ );
$i += 3;
$utf16 = self::_utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -493,11 +490,14 @@ class Encoder
case (($ordVarC & 0xFC) == 0xF8):
// characters U-00200000 - U-03FFFFFF, mask 111110XX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ordVarC,
- ord($value[$i + 1]),
- ord($value[$i + 2]),
- ord($value[$i + 3]),
- ord($value[$i + 4]));
+ $char = pack(
+ 'C*',
+ $ordVarC,
+ ord($value[$i + 1]),
+ ord($value[$i + 2]),
+ ord($value[$i + 3]),
+ ord($value[$i + 4])
+ );
$i += 4;
$utf16 = self::_utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -506,12 +506,15 @@ class Encoder
case (($ordVarC & 0xFE) == 0xFC):
// characters U-04000000 - U-7FFFFFFF, mask 1111110X
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- $char = pack('C*', $ordVarC,
- ord($value[$i + 1]),
- ord($value[$i + 2]),
- ord($value[$i + 3]),
- ord($value[$i + 4]),
- ord($value[$i + 5]));
+ $char = pack(
+ 'C*',
+ $ordVarC,
+ ord($value[$i + 1]),
+ ord($value[$i + 2]),
+ ord($value[$i + 3]),
+ ord($value[$i + 4]),
+ ord($value[$i + 5])
+ );
$i += 5;
$utf16 = self::_utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -520,7 +523,7 @@ class Encoder
}
return $ascii;
- }
+ }
/**
* Convert a string from one UTF-8 char to one UTF-16 char.
@@ -551,17 +554,12 @@ class Encoder
case 2:
// return a UTF-16 character from a 2-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0x07 & (ord($utf8{0}) >> 2))
- . chr((0xC0 & (ord($utf8{0}) << 6))
- | (0x3F & ord($utf8{1})));
+ return chr(0x07 & (ord($utf8{0}) >> 2)) . chr((0xC0 & (ord($utf8{0}) << 6)) | (0x3F & ord($utf8{1})));
case 3:
// return a UTF-16 character from a 3-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr((0xF0 & (ord($utf8{0}) << 4))
- | (0x0F & (ord($utf8{1}) >> 2)))
- . chr((0xC0 & (ord($utf8{1}) << 6))
- | (0x7F & ord($utf8{2})));
+ return chr((0xF0 & (ord($utf8{0}) << 4)) | (0x0F & (ord($utf8{1}) >> 2))) . chr((0xC0 & (ord($utf8{1}) << 6)) | (0x7F & ord($utf8{2})));
}
// ignoring UTF-32 for now, sorry
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Json/Exception/BadMethodCallException.php
index 9d2e9636f00..ef32d84d72a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,4 +11,5 @@ namespace Zend\Json\Exception;
class BadMethodCallException extends \BadMethodCallException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Json/Exception/ExceptionInterface.php
index 6ba43cf7f6d..2e5ee94f50e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Json\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Json/Exception/InvalidArgumentException.php
index 5673dd595b2..3863261dc04 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,4 +11,5 @@ namespace Zend\Json\Exception;
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Exception/RecursionException.php b/vendor/zendframework/zendframework/library/Zend/Json/Exception/RecursionException.php
index 6f9c979b521..e6fd545b6f0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Exception/RecursionException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Exception/RecursionException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Json\Exception;
class RecursionException extends RuntimeException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Json/Exception/RuntimeException.php
index b83c5250edc..a74268ee0e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Exception/RuntimeException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Json\Exception;
class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Expr.php b/vendor/zendframework/zendframework/library/Zend/Json/Expr.php
index c112de7fc4d..683127c36b6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Expr.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Expr.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Json.php b/vendor/zendframework/zendframework/library/Zend/Json/Json.php
index 1bb15794867..41512460a5e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Json.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Json.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -160,9 +160,11 @@ class Json
* @return mixed
*/
protected static function _recursiveJsonExprFinder(
- &$value, array &$javascriptExpressions, $currentKey = null
+ &$value,
+ array &$javascriptExpressions,
+ $currentKey = null
) {
- if ($value instanceof Expr) {
+ if ($value instanceof Expr) {
// TODO: Optimize with ascii keys, if performance is bad
$magicKey = "____" . $currentKey . "_" . (count($javascriptExpressions));
$javascriptExpressions[] = array(
@@ -285,6 +287,7 @@ class Json
}
/**
+ * @deprecated by https://github.com/zendframework/zf2/pull/6778
* fromXml - Converts XML to JSON
*
* Converts a XML formatted string into a JSON formatted string.
@@ -352,7 +355,9 @@ class Json
$inLiteral = false;
foreach ($tokens as $token) {
- if ($token == "") continue;
+ if ($token == "") {
+ continue;
+ }
$prefix = str_repeat($ind, $indent);
if (!$inLiteral && ($token == "{" || $token == "[")) {
@@ -381,5 +386,5 @@ class Json
}
}
return $result;
- }
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Cache.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Cache.php
index ebcb340b227..7f86331ad52 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Cache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Cache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -28,9 +28,7 @@ class Cache extends ServerCache
*/
public static function saveSmd($filename, Server $server)
{
- if (!is_string($filename)
- || (!file_exists($filename) && !is_writable(dirname($filename))))
- {
+ if (!is_string($filename) || (!file_exists($filename) && !is_writable(dirname($filename)))) {
return false;
}
@@ -48,7 +46,7 @@ class Cache extends ServerCache
/**
* Retrieve a cached SMD
*
- * On success, returns the cached SMD (a JSON string); an failure, returns
+ * On success, returns the cached SMD (a JSON string); a failure, returns
* boolean false.
*
* @param string $filename
@@ -56,10 +54,7 @@ class Cache extends ServerCache
*/
public static function getSmd($filename)
{
- if (!is_string($filename)
- || !file_exists($filename)
- || !is_readable($filename))
- {
+ if (!is_string($filename) || !file_exists($filename) || !is_readable($filename)) {
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Client.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Client.php
index 04efb54be8f..174cdc7b1e4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Client.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Client.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -104,7 +104,7 @@ class Client implements ServerClient
}
/**
- * Perform an JSOC-RPC request and return a response.
+ * Perform a JSON-RPC request and return a response.
*
* @param Request $request Request.
* @return Response Response.
@@ -151,7 +151,7 @@ class Client implements ServerClient
}
/**
- * Send an JSON-RPC request to the service (for a specific method).
+ * Send a JSON-RPC request to the service (for a specific method).
*
* @param string $method Name of the method we want to call.
* @param array $params Array of parameters for the method.
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Error.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Error.php
index 7a350de7d89..ed1bbca7784 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Error.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Error.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,24 +18,11 @@ class Error
const ERROR_INTERNAL = -32603;
const ERROR_OTHER = -32000;
- /**
- * Allowed error codes
- * @var array
- */
- protected $allowedCodes = array(
- self::ERROR_PARSE,
- self::ERROR_INVALID_REQUEST,
- self::ERROR_INVALID_METHOD,
- self::ERROR_INVALID_PARAMS,
- self::ERROR_INTERNAL,
- self::ERROR_OTHER,
- );
-
/**
* Current code
* @var int
*/
- protected $code = -32000;
+ protected $code = self::ERROR_OTHER;
/**
* Error data
@@ -56,7 +43,7 @@ class Error
* @param int $code
* @param mixed $data
*/
- public function __construct($message = null, $code = -32000, $data = null)
+ public function __construct($message = null, $code = self::ERROR_OTHER, $data = null)
{
$this->setMessage($message)
->setCode($code)
@@ -64,21 +51,28 @@ class Error
}
/**
- * Set error code
+ * Set error code.
+ *
+ * If the error code is 0, it will be set to -32000 (ERROR_OTHER).
*
* @param int $code
* @return \Zend\Json\Server\Error
*/
public function setCode($code)
{
- if (!is_scalar($code)) {
+ if (!is_scalar($code) || is_bool($code) || is_float($code)) {
+ return $this;
+ }
+
+ if (is_string($code) && !is_numeric($code)) {
return $this;
}
$code = (int) $code;
- if (in_array($code, $this->allowedCodes)) {
- $this->code = $code;
- } elseif (in_array($code, range(-32099, -32000))) {
+
+ if (0 === $code) {
+ $this->code = self::ERROR_OTHER;
+ } else {
$this->code = $code;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/ErrorException.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/ErrorException.php
index f7e614c4387..d6676d42dd6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/ErrorException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/ErrorException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,9 @@ namespace Zend\Json\Server\Exception;
use Zend\Json\Exception;
/**
- * Thrown by Zend\Json\Server\Client when an JSON-RPC fault response is returned.
+ * Thrown by Zend\Json\Server\Client when a JSON-RPC fault response is returned.
*/
class ErrorException extends Exception\BadMethodCallException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/ExceptionInterface.php
index a91d60dd5d7..5efc62e8407 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Json\Server\Exception;
use Zend\Json\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/HttpException.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/HttpException.php
index 8ad3d039419..2b794dbf6a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/HttpException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/HttpException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,4 +14,5 @@ namespace Zend\Json\Server\Exception;
* JSON-RPC method call.
*/
class HttpException extends RuntimeException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/InvalidArgumentException.php
index adf60dc3a42..199eb1eefa3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ use Zend\Json\Exception;
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/RuntimeException.php
index a6edcab474d..68ded9279eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ use Zend\Json\Exception;
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Request.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Request.php
index 398db24b689..cb57e4f4949 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Request.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Request.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -253,7 +253,7 @@ class Request
try {
$options = Json\Json::decode($json, Json\Json::TYPE_ARRAY);
$this->setOptions($options);
- } catch(\Exception $e) {
+ } catch (\Exception $e) {
$this->isParseError = true;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Request/Http.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Request/Http.php
index 1cc43efb09f..b1b864d561b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Request/Http.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Request/Http.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Response.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Response.php
index 30566fdef07..c53cac96d5b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Response.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Response.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -79,10 +79,16 @@ class Response
*
* @param string $json
* @return void
+ * @throws Exception\RuntimeException
*/
public function loadJson($json)
{
$options = Json::decode($json, Json::TYPE_ARRAY);
+
+ if (!is_array($options)) {
+ throw new Exception\RuntimeException('json is not a valid response; array expected');
+ }
+
$this->setOptions($options);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Response/Http.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Response/Http.php
index 71b2d1a02f9..de21723f6e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Response/Http.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Response/Http.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php
index 78e26312aac..c5076e62295 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Server.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -501,7 +501,7 @@ class Server extends AbstractServer
{
$request = $this->getRequest();
- if($request->isParseError()){
+ if ($request->isParseError()) {
return $this->fault('Parse error', Error::ERROR_PARSE);
}
@@ -534,7 +534,6 @@ class Server extends AbstractServer
if ('function' == $callback->getType()) {
$reflection = new ReflectionFunction($callback->getFunction());
} else {
-
$reflection = new ReflectionMethod(
$callback->getClass(),
$callback->getMethod()
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd.php
index c04c44064af..5abd8ac687d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd/Service.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd/Service.php
index 51e49a30ed5..bea17c21ca9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd/Service.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd/Service.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Json\Server\Smd;
-use Zend\Json\Server;
use Zend\Json\Server\Exception\InvalidArgumentException;
use Zend\Json\Server\Smd;
@@ -43,8 +42,11 @@ class Service
/**
* Regex for names
* @var string
+ *
+ * @link http://php.net/manual/en/language.oop5.basic.php
+ * @link http://www.jsonrpc.org/specification#request_object
*/
- protected $nameRegex = '/^[a-z][a-z0-9.\\\\_]+$/i';
+ protected $nameRegex = '/^(?!^rpc\.)[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff\.\\\]*$/';
/**
* Parameter option types
@@ -103,7 +105,7 @@ class Service
/**
* Constructor
*
- * @param string|array $spec
+ * @param string|array $spec
* @throws InvalidArgumentException if no name provided
*/
public function __construct($spec)
@@ -122,7 +124,7 @@ class Service
/**
* Set object state
*
- * @param array $options
+ * @param array $options
* @return Service
*/
public function setOptions(array $options)
@@ -137,13 +139,14 @@ class Service
$this->$method($value);
}
}
+
return $this;
}
/**
* Set service name
*
- * @param string $name
+ * @param string $name
* @return Service
* @throws InvalidArgumentException
*/
@@ -154,6 +157,7 @@ class Service
throw new InvalidArgumentException("Invalid name '{$name} provided for service; must follow PHP method naming conventions");
}
$this->name = $name;
+
return $this;
}
@@ -172,7 +176,7 @@ class Service
*
* Currently limited to POST
*
- * @param string $transport
+ * @param string $transport
* @throws InvalidArgumentException
* @return Service
*/
@@ -183,6 +187,7 @@ class Service
}
$this->transport = $transport;
+
return $this;
}
@@ -199,12 +204,13 @@ class Service
/**
* Set service target
*
- * @param string $target
+ * @param string $target
* @return Service
*/
public function setTarget($target)
{
$this->target = (string) $target;
+
return $this;
}
@@ -221,7 +227,7 @@ class Service
/**
* Set envelope type
*
- * @param string $envelopeType
+ * @param string $envelopeType
* @throws InvalidArgumentException
* @return Service
*/
@@ -232,6 +238,7 @@ class Service
}
$this->envelope = $envelopeType;
+
return $this;
}
@@ -248,9 +255,9 @@ class Service
/**
* Add a parameter to the service
*
- * @param string|array $type
- * @param array $options
- * @param int|null $order
+ * @param string|array $type
+ * @param array $options
+ * @param int|null $order
* @throws InvalidArgumentException
* @return Service
*/
@@ -293,7 +300,7 @@ class Service
*
* Each param should be an array, and should include the key 'type'.
*
- * @param array $params
+ * @param array $params
* @return Service
*/
public function addParams(array $params)
@@ -310,18 +317,20 @@ class Service
$order = (array_key_exists('order', $options)) ? $options['order'] : null;
$this->addParam($type, $options, $order);
}
+
return $this;
}
/**
* Overwrite all parameters
*
- * @param array $params
+ * @param array $params
* @return Service
*/
public function setParams(array $params)
{
$this->params = array();
+
return $this->addParams($params);
}
@@ -348,13 +357,14 @@ class Service
}
}
ksort($params);
+
return $params;
}
/**
* Set return type
*
- * @param string|array $type
+ * @param string|array $type
* @throws InvalidArgumentException
* @return Service
*/
@@ -370,6 +380,7 @@ class Service
throw new InvalidArgumentException("Invalid param type provided ('" . gettype($type) . "')");
}
$this->return = $type;
+
return $this;
}
@@ -412,6 +423,7 @@ class Service
public function toJson()
{
$service = array($this->getName() => $this->toArray());
+
return \Zend\Json\Json::encode($service);
}
@@ -428,8 +440,8 @@ class Service
/**
* Validate parameter type
*
- * @param string $type
- * @param bool $isReturn
+ * @param string $type
+ * @param bool $isReturn
* @return string
* @throws InvalidArgumentException
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/composer.json b/vendor/zendframework/zendframework/library/Zend/Json/composer.json
index b9996f9db22..0ca65aa4b25 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Json/composer.json
@@ -6,6 +6,7 @@
"zf2",
"json"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Json\\": ""
@@ -13,16 +14,22 @@
},
"target-dir": "Zend/Json",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-http": "self.version",
+ "zendframework/zend-server": "self.version"
+ },
"suggest": {
- "zendframework/zend-server": "Zend\\Server component"
+ "zendframework/zend-http": "Zend\\Http component",
+ "zendframework/zend-server": "Zend\\Server component",
+ "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Attribute.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Attribute.php
index c2984f3c70a..9ff7e8dfc05 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Attribute.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Attribute.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -37,13 +37,13 @@ class Attribute
$valArray = array();
if (is_array($value) || ($value instanceof \Traversable)) {
foreach ($value as $v) {
- $v = static::valueToLdap($v);
+ $v = self::valueToLdap($v);
if ($v !== null) {
$valArray[] = $v;
}
}
} elseif ($value !== null) {
- $value = static::valueToLdap($value);
+ $value = self::valueToLdap($value);
if ($value !== null) {
$valArray[] = $value;
}
@@ -76,14 +76,14 @@ class Attribute
}
$retArray = array();
foreach ($data[$attribName] as $v) {
- $retArray[] = static::valueFromLdap($v);
+ $retArray[] = self::valueFromLdap($v);
}
return $retArray;
} elseif (is_int($index)) {
if (!isset($data[$attribName])) {
return null;
} elseif ($index >= 0 && $index < count($data[$attribName])) {
- return static::valueFromLdap($data[$attribName][$index]);
+ return self::valueFromLdap($data[$attribName][$index]);
} else {
return null;
}
@@ -213,8 +213,7 @@ class Attribute
public static function setPassword(
array &$data, $password, $hashType = self::PASSWORD_HASH_MD5,
$attribName = null
- )
- {
+ ) {
if ($attribName === null) {
if ($hashType === self::PASSWORD_UNICODEPWD) {
$attribName = 'unicodePwd';
@@ -290,18 +289,17 @@ class Attribute
public static function setDateTimeAttribute(
array &$data, $attribName, $value, $utc = false,
$append = false
- )
- {
+ ) {
$convertedValues = array();
if (is_array($value) || ($value instanceof \Traversable)) {
foreach ($value as $v) {
- $v = static::valueToLdapDateTime($v, $utc);
+ $v = self::valueToLdapDateTime($v, $utc);
if ($v !== null) {
$convertedValues[] = $v;
}
}
} elseif ($value !== null) {
- $value = static::valueToLdapDateTime($value, $utc);
+ $value = self::valueToLdapDateTime($value, $utc);
if ($value !== null) {
$convertedValues[] = $value;
}
@@ -336,13 +334,13 @@ class Attribute
$values = static::getAttribute($data, $attribName, $index);
if (is_array($values)) {
for ($i = 0, $count = count($values); $i < $count; $i++) {
- $newVal = static::valueFromLdapDateTime($values[$i]);
+ $newVal = self::valueFromLdapDateTime($values[$i]);
if ($newVal !== null) {
$values[$i] = $newVal;
}
}
} else {
- $newVal = static::valueFromLdapDateTime($values);
+ $newVal = self::valueFromLdapDateTime($values);
if ($newVal !== null) {
$values = $newVal;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Ldap/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php
index a460d269342..2e7f3088848 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php
index 1a30db54be4..5876f390c8b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection/DefaultIterator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Converter.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Converter.php
index 8932343b045..4347ba28cff 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Converter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Converter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -66,7 +66,6 @@ class Converter
return $string;
}
-
/**
* Convert any value to an LDAP-compatible value.
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/ConverterException.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/ConverterException.php
index eae8f5dfe12..6226da94a8a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/ConverterException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/ConverterException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php
index 39d9cdff7e1..a1587474775 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php
index f54cc47df04..a1cd356000a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php
index 9a13f45158e..78456f49d60 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php
index 0ca0721fb9c..0809a15ce70 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Dn.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/BadMethodCallException.php
index c028787f6da..74ac7243bf2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/ExceptionInterface.php
index 8d5ed4b4359..9c03b13ef95 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/InvalidArgumentException.php
index e1b7f306352..cf8e371adf0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/LdapException.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/LdapException.php
index 84800795346..48838bdc111 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/LdapException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Exception/LdapException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter.php
index ac79bd49b4d..98c6744676d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AbstractFilter.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AbstractFilter.php
index 89f063e01f3..5a079c870e2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AbstractFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AbstractFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AbstractLogicalFilter.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AbstractLogicalFilter.php
index f04cd641b10..b83200d907f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AbstractLogicalFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AbstractLogicalFilter.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Ldap\Filter;
-
/**
* Zend\Ldap\Filter\AbstractLogicalFilter provides a base implementation for a grouping filter.
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AndFilter.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AndFilter.php
index beeb4ce2157..af859395780 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AndFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/AndFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php
index f5ff231ff3c..42413306a48 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/Exception/FilterException.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/Exception/FilterException.php
index 0ed114218d1..81398e5e3fe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/Exception/FilterException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/Exception/FilterException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/MaskFilter.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/MaskFilter.php
index 89b5059c540..64566ab8729 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/MaskFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/MaskFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/NotFilter.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/NotFilter.php
index b2a236018f3..7759337457c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/NotFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/NotFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/OrFilter.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/OrFilter.php
index 215a51f4736..d7727815b09 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/OrFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/OrFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/StringFilter.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/StringFilter.php
index 9f98cf8eb56..3d6bbcd64e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/StringFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/StringFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php
index 4152649c87f..f4d036fc0b0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Ldap.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -867,8 +867,7 @@ class Ldap
*/
public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB, array $attributes = array(),
$sort = null, $collectionClass = null, $sizelimit = 0, $timelimit = 0
- )
- {
+ ) {
if (is_array($filter)) {
$options = array_change_key_case($filter, CASE_LOWER);
foreach ($options as $key => $value) {
@@ -898,7 +897,7 @@ class Ldap
if ($basedn === null) {
$basedn = $this->getBaseDn();
} elseif ($basedn instanceof Dn) {
- $basedn = $basedn->toString();
+ $basedn = $basedn->toString();
}
if ($filter instanceof Filter\AbstractFilter) {
@@ -1160,7 +1159,7 @@ class Ldap
if (!array_key_exists($key, $entry)) {
$entry[$key] = array($value);
} elseif (!in_array($value, $entry[$key])) {
- $entry[$key] = array_merge(array($value), $entry[$key]);
+ $entry[$key] = array_merge(array($value), $entry[$key]);
}
}
$adAttributes = array('distinguishedname', 'instancetype', 'name', 'objectcategory',
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Ldif/Encoder.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Ldif/Encoder.php
index 02fa92b2c81..6e2184eeb34 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Ldif/Encoder.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Ldif/Encoder.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php
index 01e9dc82956..1cd3920e6e5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php
index 5e14c97ff41..322c89b0608 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/AbstractNode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/ChildrenIterator.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/ChildrenIterator.php
index 1b6a361dbcb..7c4eaa40737 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/ChildrenIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/ChildrenIterator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Collection.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Collection.php
index 5185a636c54..42f1712a32e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Collection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Collection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse.php
index 213df1ddb92..255f2878336 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
index b786b09e3e6..52d13f810b8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/OpenLdap.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/OpenLdap.php
index 2c765fc6bf8..67128817b28 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/OpenLdap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/OpenLdap.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/eDirectory.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/eDirectory.php
index eb96ac2b40e..9855f7813a4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/eDirectory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/RootDse/eDirectory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema.php
index 20d2b0cc272..329432243cc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AbstractItem.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AbstractItem.php
index 5f5e164841f..635a146a134 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AbstractItem.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AbstractItem.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ActiveDirectory.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
index 946ab51355d..a3a4ab8a83d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ActiveDirectory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
index 94256df8554..770a97821c4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -34,7 +34,6 @@ class ActiveDirectory extends Schema\AbstractItem implements AttributeTypeInterf
*/
public function getOid()
{
-
}
/**
@@ -44,7 +43,6 @@ class ActiveDirectory extends Schema\AbstractItem implements AttributeTypeInterf
*/
public function getSyntax()
{
-
}
/**
@@ -54,7 +52,6 @@ class ActiveDirectory extends Schema\AbstractItem implements AttributeTypeInterf
*/
public function getMaxLength()
{
-
}
/**
@@ -64,7 +61,6 @@ class ActiveDirectory extends Schema\AbstractItem implements AttributeTypeInterf
*/
public function isSingleValued()
{
-
}
/**
@@ -74,6 +70,5 @@ class ActiveDirectory extends Schema\AbstractItem implements AttributeTypeInterf
*/
public function getDescription()
{
-
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php
index 83ad8f2f067..6bc49164b56 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
index d71924b14e7..78226cda0fa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
index b29e70eb1ed..95e0dcc05b7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -34,7 +34,6 @@ class ActiveDirectory extends Schema\AbstractItem implements ObjectClassInterfac
*/
public function getOid()
{
-
}
/**
@@ -44,7 +43,6 @@ class ActiveDirectory extends Schema\AbstractItem implements ObjectClassInterfac
*/
public function getMustContain()
{
-
}
/**
@@ -54,7 +52,6 @@ class ActiveDirectory extends Schema\AbstractItem implements ObjectClassInterfac
*/
public function getMayContain()
{
-
}
/**
@@ -64,7 +61,6 @@ class ActiveDirectory extends Schema\AbstractItem implements ObjectClassInterfac
*/
public function getDescription()
{
-
}
/**
@@ -74,7 +70,6 @@ class ActiveDirectory extends Schema\AbstractItem implements ObjectClassInterfac
*/
public function getType()
{
-
}
/**
@@ -85,6 +80,5 @@ class ActiveDirectory extends Schema\AbstractItem implements ObjectClassInterfac
*/
public function getParentClasses()
{
-
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
index 0a317f265eb..fd5e08a2598 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
index 0f5a88efce6..a39f3d36439 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -31,7 +31,6 @@ class OpenLdap extends Schema\AbstractItem implements ObjectClassInterface
*/
protected $inheritedMay = null;
-
/**
* Gets the objectClass name
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/OpenLdap.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/OpenLdap.php
index 3c97d3ac652..6fc2b810899 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/OpenLdap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/OpenLdap.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -134,7 +134,6 @@ class OpenLdap extends Node\Schema
$val = $this->parseAttributeType($value);
$val = new AttributeType\OpenLdap($val);
$this->attributeTypes[$val->getName()] = $val;
-
}
foreach ($this->attributeTypes as $val) {
if (count($val->sup) > 0) {
@@ -321,7 +320,7 @@ class OpenLdap extends Node\Schema
}
/**
- * Parses an matchingRules value
+ * Parses a matchingRules value
*
* @param string $value
* @return array
@@ -361,7 +360,7 @@ class OpenLdap extends Node\Schema
}
/**
- * Parses an matchingRuleUse value
+ * Parses a matchingRuleUse value
*
* @param string $value
* @return array
@@ -451,7 +450,7 @@ class OpenLdap extends Node\Schema
} else {
$data[$token] = Converter\Converter::fromLdap($data[$token]);
}
- // create a array if the value should be multivalued but was not
+ // create an array if the value should be multivalued but was not
if (in_array($token, $multiValue) && !is_array($data[$token])) {
$data[$token] = array($data[$token]);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/composer.json b/vendor/zendframework/zendframework/library/Zend/Ldap/composer.json
index c1cff48df56..512d8903ebd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Ldap/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Ldap/composer.json
@@ -6,6 +6,7 @@
"zf2",
"ldap"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Ldap\\": ""
@@ -13,13 +14,19 @@
},
"target-dir": "Zend/Ldap",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-eventmanager": "self.version"
+ },
+ "suggest": {
+ "zendframework/zend-eventmanager": "Zend\\EventManager component"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/AutoloaderFactory.php b/vendor/zendframework/zendframework/library/Zend/Loader/AutoloaderFactory.php
index 609086c18bb..a786c494ad8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/AutoloaderFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/AutoloaderFactory.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Loader;
-use ReflectionClass;
use Traversable;
if (class_exists('Zend\Loader\AutoloaderFactory')) {
@@ -87,7 +86,7 @@ abstract class AutoloaderFactory
);
}
- if (!static::isSubclassOf($class, 'Zend\Loader\SplAutoloader')) {
+ if (!is_subclass_of($class, 'Zend\Loader\SplAutoloader')) {
require_once 'Exception/InvalidArgumentException.php';
throw new Exception\InvalidArgumentException(
sprintf('Autoloader class %s must implement Zend\\Loader\\SplAutoloader', $class)
@@ -108,7 +107,7 @@ abstract class AutoloaderFactory
}
/**
- * Get an list of all autoloaders registered with the factory
+ * Get a list of all autoloaders registered with the factory
*
* Returns an array of autoloader instances.
*
@@ -199,22 +198,14 @@ abstract class AutoloaderFactory
* @see https://bugs.php.net/bug.php?id=53727
* @see https://github.com/zendframework/zf2/pull/1807
*
+ * @deprecated since zf 2.3 requires PHP >= 5.3.23
+ *
* @param string $className
* @param string $type
* @return bool
*/
protected static function isSubclassOf($className, $type)
{
- if (is_subclass_of($className, $type)) {
- return true;
- }
- if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
- return false;
- }
- if (!interface_exists($type)) {
- return false;
- }
- $r = new ReflectionClass($className);
- return $r->implementsInterface($type);
+ return is_subclass_of($className, $type);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Loader/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/ClassMapAutoloader.php b/vendor/zendframework/zendframework/library/Zend/Loader/ClassMapAutoloader.php
index 58b6378dbe2..4d848bf3fcd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/ClassMapAutoloader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/ClassMapAutoloader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -197,7 +197,7 @@ class ClassMapAutoloader implements SplAutoloader
*/
public static function realPharPath($path)
{
- if (!preg_match('|^phar:(/{2,3})|',$path, $match)) {
+ if (!preg_match('|^phar:(/{2,3})|', $path, $match)) {
return;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/BadMethodCallException.php
index 3ae448817f7..9d939115531 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/DomainException.php
index 74cb19a817b..33835571191 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/DomainException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Loader\Exception;
require_once __DIR__ . '/ExceptionInterface.php';
class DomainException extends \DomainException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/ExceptionInterface.php
index d66e3942b45..5c6218269d6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Loader\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/InvalidArgumentException.php
index 1abb4c43862..beb5c0876a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,6 @@ namespace Zend\Loader\Exception;
require_once __DIR__ . '/ExceptionInterface.php';
-class InvalidArgumentException extends \InvalidArgumentException implements
- ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/InvalidPathException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/InvalidPathException.php
index ac1b43e4427..3c93cec4905 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/InvalidPathException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/InvalidPathException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Loader\Exception;
require_once __DIR__ . '/ExceptionInterface.php';
class InvalidPathException extends \Exception implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/MissingResourceNamespaceException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/MissingResourceNamespaceException.php
index 3269207b81b..bef0a295764 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/MissingResourceNamespaceException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/MissingResourceNamespaceException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,6 @@ namespace Zend\Loader\Exception;
require_once __DIR__ . '/ExceptionInterface.php';
-class MissingResourceNamespaceException extends \Exception implements
- ExceptionInterface
-{}
+class MissingResourceNamespaceException extends \Exception implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/PluginLoaderException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/PluginLoaderException.php
index 49f393a7cc2..e7603f73eb1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/PluginLoaderException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/PluginLoaderException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/RuntimeException.php
index b028169b7d4..6476cad0ef8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Loader\Exception;
require_once __DIR__ . '/ExceptionInterface.php';
class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/SecurityException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/SecurityException.php
index 39e7e59318e..7ea1ad46a0e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/SecurityException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/SecurityException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Loader\Exception;
require_once __DIR__ . '/DomainException.php';
class SecurityException extends DomainException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/ModuleAutoloader.php b/vendor/zendframework/zendframework/library/Zend/Loader/ModuleAutoloader.php
index 2aa6938bad3..773f3dc7a00 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/ModuleAutoloader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/ModuleAutoloader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -159,7 +159,7 @@ class ModuleAutoloader implements SplAutoloader
continue;
}
- $moduleNameBuffer = str_replace($namespace . "\\", "", $moduleName );
+ $moduleNameBuffer = str_replace($namespace . "\\", "", $moduleName);
$path .= DIRECTORY_SEPARATOR . $moduleNameBuffer . DIRECTORY_SEPARATOR;
$classLoaded = $this->loadModuleFromDir($path, $class);
@@ -174,7 +174,6 @@ class ModuleAutoloader implements SplAutoloader
}
}
-
$moduleClassPath = str_replace('\\', DIRECTORY_SEPARATOR, $moduleName);
$pharSuffixPattern = null;
@@ -369,7 +368,7 @@ class ModuleAutoloader implements SplAutoloader
));
}
if ($moduleName) {
- if (in_array( substr($moduleName, -2), array('\\*', '\\%'))) {
+ if (in_array(substr($moduleName, -2), array('\\*', '\\%'))) {
$this->namespacedPaths[substr($moduleName, 0, -2)] = static::normalizePath($path);
} else {
$this->explicitPaths[$moduleName] = static::normalizePath($path);
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLoader.php b/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLoader.php
index 637014444af..0fbf2111f03 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLoader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLoader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLocator.php b/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLocator.php
index e141586c00c..91ed0dde153 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLocator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLocator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/ShortNameLocator.php b/vendor/zendframework/zendframework/library/Zend/Loader/ShortNameLocator.php
index f0ee23c7b83..dfa020c7d77 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/ShortNameLocator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/ShortNameLocator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/SplAutoloader.php b/vendor/zendframework/zendframework/library/Zend/Loader/SplAutoloader.php
index 58798948a8f..47d6b6c5f6e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/SplAutoloader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/SplAutoloader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,9 @@ namespace Zend\Loader;
use Traversable;
-if (interface_exists('Zend\Loader\SplAutoloader')) return;
+if (interface_exists('Zend\Loader\SplAutoloader')) {
+ return;
+}
/**
* Defines an interface for classes that may register with the spl_autoload
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/StandardAutoloader.php b/vendor/zendframework/zendframework/library/Zend/Loader/StandardAutoloader.php
index 3e722473780..6e00908e52f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/StandardAutoloader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/StandardAutoloader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -303,7 +303,6 @@ class StandardAutoloader implements SplAutoloader
if (file_exists($filename)) {
return include $filename;
}
- return false;
}
}
return false;
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/composer.json b/vendor/zendframework/zendframework/library/Zend/Loader/composer.json
index fffd5df4157..c2cab63475a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/composer.json
@@ -6,6 +6,7 @@
"zf2",
"loader"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Loader\\": ""
@@ -13,12 +14,12 @@
},
"target-dir": "Zend/Loader",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.23"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Log/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Log/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/Exception/ExceptionInterface.php
index 20917bed743..39bf0b1c6b5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Log\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Log/Exception/InvalidArgumentException.php
index 8bb0920f7e3..ba0be8f3c61 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,7 +12,6 @@ namespace Zend\Log\Exception;
/**
* Invalid argument exception
*/
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Log/Exception/RuntimeException.php
index 57522ceeec7..85493afcc8b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,7 +12,6 @@ namespace Zend\Log\Exception;
/**
* Runtime argument exception
*/
-class RuntimeException
- extends \RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Filter/FilterInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/Filter/FilterInterface.php
index dc72777d69c..561550edc95 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Filter/FilterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Filter/FilterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Filter/Mock.php b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Mock.php
index f35c62313fd..5e6f5b1c993 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Filter/Mock.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Mock.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Filter/Priority.php b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Priority.php
index e52f8062086..7df5586eb22 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Filter/Priority.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Priority.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -42,14 +42,14 @@ class Priority implements FilterInterface
$operator = isset($priority['operator']) ? $priority['operator'] : null;
$priority = isset($priority['priority']) ? $priority['priority'] : null;
}
- if (!is_int($priority)) {
+ if (!is_int($priority) && !ctype_digit($priority)) {
throw new Exception\InvalidArgumentException(sprintf(
- 'Priority must be an integer; received "%s"',
+ 'Priority must be a number, received "%s"',
gettype($priority)
));
}
- $this->priority = $priority;
+ $this->priority = (int) $priority;
$this->operator = $operator === null ? '<=' : $operator;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Filter/Regex.php b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Regex.php
index 6d055bd1b00..24451b102cc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Filter/Regex.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Regex.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -59,7 +59,7 @@ class Regex implements FilterInterface
{
$message = $event['message'];
if (is_array($event['message'])) {
- $message = var_export($message, TRUE);
+ $message = var_export($message, true);
}
return preg_match($this->regex, $message) > 0;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Filter/Sample.php b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Sample.php
new file mode 100644
index 00000000000..504837c9896
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Sample.php
@@ -0,0 +1,56 @@
+<?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\Log\Filter;
+
+use Zend\Log\Exception;
+
+class Sample implements FilterInterface
+{
+ /**
+ * Sample rate [0-1].
+ *
+ * @var float
+ */
+ protected $sampleRate;
+
+ /**
+ * Filters logging by sample rate.
+ *
+ * Sample rate must be a float number between 0 and 1 included.
+ * If 0.5, only half of the values will be logged.
+ * If 0.1 only 1 among 10 values will be logged.
+ *
+ * @param float|int $samplerate Sample rate [0-1].
+ * @return Priority
+ * @throws Exception\InvalidArgumentException
+ */
+ public function __construct($sampleRate = 1)
+ {
+ if (! is_numeric($sampleRate)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'Sample rate must be numeric, received "%s"',
+ gettype($sampleRate)
+ ));
+ }
+
+ $this->sampleRate = (float) $sampleRate;
+ }
+
+ /**
+ * Returns TRUE to accept the message, FALSE to block it.
+ *
+ * @param array $event event data
+ * @return bool Accepted ?
+ */
+ public function filter(array $event)
+ {
+ return (mt_rand() / mt_getrandmax()) <= $this->sampleRate;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Filter/SuppressFilter.php b/vendor/zendframework/zendframework/library/Zend/Log/Filter/SuppressFilter.php
index 23cf4a5ae8c..cc34fef6bb2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Filter/SuppressFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Filter/SuppressFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -34,9 +34,9 @@ class SuppressFilter implements FilterInterface
$suppress = isset($suppress['suppress']) ? $suppress['suppress'] : false;
}
if (!is_bool($suppress)) {
- throw new Exception\InvalidArgumentException(sprintf(
- 'Suppress must be an boolean; received "%s"', gettype($suppress)
- ));
+ throw new Exception\InvalidArgumentException(
+ sprintf('Suppress must be a boolean; received "%s"', gettype($suppress))
+ );
}
$this->suppress($suppress);
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Filter/Validator.php b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Validator.php
index 651ea882191..33a0a0c4249 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Filter/Validator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Validator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php
index 54e0cd83581..e150418bdce 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ChromePhp.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ChromePhp.php
index 671429b02f2..0670faa0f48 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ChromePhp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ChromePhp.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Db.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Db.php
index 256bb1c0f7d..45bb60dfd3a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Db.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Db.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ErrorHandler.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ErrorHandler.php
index 287d6977858..a6a12da1fa4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ErrorHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ErrorHandler.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ExceptionHandler.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ExceptionHandler.php
index 28d8211893a..e3f5a7d22a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ExceptionHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ExceptionHandler.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -79,11 +79,11 @@ class ExceptionHandler implements FormatterInterface
protected function getType($type)
{
switch ($type) {
- case "::" :
+ case "::":
return "static";
- case "->" :
+ case "->":
return "method";
- default :
+ default:
return $type;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FirePhp.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FirePhp.php
index 4e15a982507..84465621101 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FirePhp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FirePhp.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FormatterInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FormatterInterface.php
index 975c3ec4934..8962e59263b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FormatterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FormatterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Simple.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Simple.php
index 531ea76429a..8ba520081d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Simple.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Simple.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Xml.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Xml.php
index ae4abf73ec5..00a6ec22526 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Xml.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Xml.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Logger.php b/vendor/zendframework/zendframework/library/Zend/Log/Logger.php
index 462b30f7e9b..880738e1565 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Logger.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Logger.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,6 +12,7 @@ namespace Zend\Log;
use DateTime;
use ErrorException;
use Traversable;
+use Zend\ServiceManager\AbstractPluginManager;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\SplPriorityQueue;
@@ -60,6 +61,13 @@ class Logger implements LoggerInterface
*/
protected static $registeredErrorHandler = false;
+ /**
+ * Registered shutdown error handler
+ *
+ * @var bool
+ */
+ protected static $registeredFatalErrorShutdownFunction = false;
+
/**
* Registered exception handler
*
@@ -114,7 +122,7 @@ class Logger implements LoggerInterface
/**
* Constructor
*
- * Set options for an logger. Accepted options are:
+ * Set options for a logger. Accepted options are:
* - writers: array of writers to add to this logger
* - exceptionhandler: if true register this logger as exceptionhandler
* - errorhandler: if true register this logger as errorhandler
@@ -140,6 +148,20 @@ class Logger implements LoggerInterface
throw new Exception\InvalidArgumentException('Options must be an array or an object implementing \Traversable ');
}
+ // Inject writer plugin manager, if available
+ if (isset($options['writer_plugin_manager'])
+ && $options['writer_plugin_manager'] instanceof AbstractPluginManager
+ ) {
+ $this->setWriterPluginManager($options['writer_plugin_manager']);
+ }
+
+ // Inject processor plugin manager, if available
+ if (isset($options['processor_plugin_manager'])
+ && $options['processor_plugin_manager'] instanceof AbstractPluginManager
+ ) {
+ $this->setProcessorPluginManager($options['processor_plugin_manager']);
+ }
+
if (isset($options['writers']) && is_array($options['writers'])) {
foreach ($options['writers'] as $writer) {
if (!isset($writer['name'])) {
@@ -173,6 +195,10 @@ class Logger implements LoggerInterface
if (isset($options['errorhandler']) && $options['errorhandler'] === true) {
static::registerErrorHandler($this);
}
+
+ if (isset($options['fatal_error_shutdownfunction']) && $options['fatal_error_shutdownfunction'] === true) {
+ static::registerFatalErrorShutdownFunction($this);
+ }
}
/**
@@ -185,7 +211,8 @@ class Logger implements LoggerInterface
foreach ($this->writers as $writer) {
try {
$writer->shutdown();
- } catch (\Exception $e) {}
+ } catch (\Exception $e) {
+ }
}
}
@@ -318,9 +345,9 @@ class Logger implements LoggerInterface
}
if (!$plugins instanceof ProcessorPluginManager) {
throw new Exception\InvalidArgumentException(sprintf(
- 'processor plugin manager must extend %s\ProcessorPluginManager; received %s',
- __NAMESPACE__,
- is_object($plugins) ? get_class($plugins) : gettype($plugins)
+ 'processor plugin manager must extend %s\ProcessorPluginManager; received %s',
+ __NAMESPACE__,
+ is_object($plugins) ? get_class($plugins) : gettype($plugins)
));
}
@@ -355,8 +382,8 @@ class Logger implements LoggerInterface
$processor = $this->processorPlugin($processor, $options);
} elseif (!$processor instanceof Processor\ProcessorInterface) {
throw new Exception\InvalidArgumentException(sprintf(
- 'Processor must implement Zend\Log\ProcessorInterface; received "%s"',
- is_object($processor) ? get_class($processor) : gettype($processor)
+ 'Processor must implement Zend\Log\ProcessorInterface; received "%s"',
+ is_object($processor) ? get_class($processor) : gettype($processor)
));
}
$this->processors->insert($processor, $priority);
@@ -423,7 +450,7 @@ class Logger implements LoggerInterface
'priority' => (int) $priority,
'priorityName' => $this->priorities[$priority],
'message' => (string) $message,
- 'extra' => $extra
+ 'extra' => $extra,
);
foreach ($this->processors->toArray() as $processor) {
@@ -568,6 +595,40 @@ class Logger implements LoggerInterface
static::$registeredErrorHandler = false;
}
+ /**
+ * Register a shutdown handler to log fatal errors
+ *
+ * @link http://www.php.net/manual/function.register-shutdown-function.php
+ * @param Logger $logger
+ * @return bool
+ */
+ public static function registerFatalErrorShutdownFunction(Logger $logger)
+ {
+ // Only register once per instance
+ if (static::$registeredFatalErrorShutdownFunction) {
+ return false;
+ }
+
+ $errorPriorityMap = static::$errorPriorityMap;
+
+ register_shutdown_function(function () use ($logger, $errorPriorityMap) {
+ $error = error_get_last();
+ if (null !== $error && $error['type'] === E_ERROR) {
+ $logger->log(
+ $errorPriorityMap[E_ERROR],
+ $error['message'],
+ array(
+ 'file' => $error['file'],
+ 'line' => $error['line'],
+ )
+ );
+ }
+ });
+
+ static::$registeredFatalErrorShutdownFunction = true;
+ return true;
+ }
+
/**
* Register logging system as an exception handler to log PHP exceptions
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAbstractServiceFactory.php
index ce2eea3be2a..b280dd04612 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAbstractServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAbstractServiceFactory.php
@@ -3,13 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Log;
use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\AbstractPluginManager;
use Zend\ServiceManager\ServiceLocatorInterface;
/**
@@ -90,6 +91,34 @@ class LoggerAbstractServiceFactory implements AbstractFactoryInterface
protected function processConfig(&$config, ServiceLocatorInterface $services)
{
+ if (isset($config['writer_plugin_manager'])
+ && is_string($config['writer_plugin_manager'])
+ && $services->has($config['writer_plugin_manager'])
+ ) {
+ $config['writer_plugin_manager'] = $services->get($config['writer_plugin_manager']);
+ }
+
+ if ((!isset($config['writer_plugin_manager'])
+ || ! $config['writer_plugin_manager'] instanceof AbstractPluginManager)
+ && $services->has('LogWriterManager')
+ ) {
+ $config['writer_plugin_manager'] = $services->get('LogWriterManager');
+ }
+
+ if (isset($config['processor_plugin_manager'])
+ && is_string($config['processor_plugin_manager'])
+ && $services->has($config['processor_plugin_manager'])
+ ) {
+ $config['processor_plugin_manager'] = $services->get($config['processor_plugin_manager']);
+ }
+
+ if ((!isset($config['processor_plugin_manager'])
+ || ! $config['processor_plugin_manager'] instanceof AbstractPluginManager)
+ && $services->has('LogProcessorManager')
+ ) {
+ $config['processor_plugin_manager'] = $services->get('LogProcessorManager');
+ }
+
if (!isset($config['writers'])) {
return;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareInterface.php
index c23bc321a59..ad6d979b0ce 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareInterface.php
@@ -3,17 +3,30 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Log;
-
/**
* Logger aware interface
*/
interface LoggerAwareInterface
{
+ /**
+ * Set logger instance
+ *
+ * @param LoggerInterface
+ * @return void
+ */
public function setLogger(LoggerInterface $logger);
+
+ /**
+ * Get logger instance. Currently commented out as this would possibly break
+ * existing implementations.
+ *
+ * @return null|LoggerInterface
+ */
+ // public function getLogger();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareTrait.php b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareTrait.php
index c28bdb9bc6c..2da20dee6d5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareTrait.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareTrait.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Log;
-
trait LoggerAwareTrait
{
/**
@@ -29,4 +28,14 @@ trait LoggerAwareTrait
return $this;
}
+
+ /**
+ * Get logger object
+ *
+ * @return null|LoggerInterface
+ */
+ public function getLogger()
+ {
+ return $this->logger;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/LoggerInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/LoggerInterface.php
index a2fc6eb5d0a..b82a5fbdab5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/LoggerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/LoggerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/LoggerServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Log/LoggerServiceFactory.php
index 0fc47c05869..afa75c15686 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/LoggerServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/LoggerServiceFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Processor/Backtrace.php b/vendor/zendframework/zendframework/library/Zend/Log/Processor/Backtrace.php
index 1ede1ea046f..01b19ade385 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Processor/Backtrace.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Processor/Backtrace.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
-* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -62,18 +62,14 @@ class Backtrace implements ProcessorInterface
/**
* Provide backtrace as slim as possible
*
- * @return array:
+ * @return array[]
*/
protected function getBacktrace()
{
- if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+ if (PHP_VERSION_ID >= 50400) {
return debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $this->traceLimit);
}
- if (version_compare(PHP_VERSION, '5.3.6') >= 0) {
- return debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
- }
-
- return debug_backtrace();
+ return debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Processor/ProcessorInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/Processor/ProcessorInterface.php
index ca1c20fc944..ea1b2eff1f0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Processor/ProcessorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Processor/ProcessorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,5 +18,4 @@ interface ProcessorInterface
* @return array
*/
public function process(array $event);
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Processor/RequestId.php b/vendor/zendframework/zendframework/library/Zend/Log/Processor/RequestId.php
index 5cf18ed48e6..7614e8e9efa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Processor/RequestId.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Processor/RequestId.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
-* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -21,7 +21,7 @@ class RequestId implements ProcessorInterface
protected $identifier;
/**
- * Adds a identifier for the request to the log.
+ * Adds an identifier for the request to the log.
*
* This enables to filter the log for messages belonging to a specific request
*
@@ -49,7 +49,7 @@ class RequestId implements ProcessorInterface
return $this->identifier;
}
- $requestTime = (version_compare(PHP_VERSION, '5.4.0') >= 0)
+ $requestTime = (PHP_VERSION_ID >= 50400)
? $_SERVER['REQUEST_TIME_FLOAT']
: $_SERVER['REQUEST_TIME'];
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/ProcessorPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Log/ProcessorPluginManager.php
index 6e9b50aeab6..4164481ec5e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/ProcessorPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/ProcessorPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,7 @@ use Zend\ServiceManager\AbstractPluginManager;
class ProcessorPluginManager extends AbstractPluginManager
{
/**
- * Default set of writers
+ * Default set of processors
*
* @var array
*/
@@ -24,7 +24,7 @@ class ProcessorPluginManager extends AbstractPluginManager
);
/**
- * Allow many writers of the same type
+ * Allow many processors of the same type
*
* @var bool
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/AbstractWriter.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/AbstractWriter.php
index e4c2499014f..b519e4cf821 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/AbstractWriter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/AbstractWriter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -62,12 +62,11 @@ abstract class AbstractWriter implements WriterInterface
/**
* Constructor
*
- * Set options for an writer. Accepted options are:
+ * Set options for a writer. Accepted options are:
* - filters: array of filters to add to this filter
* - formatter: formatter for this writer
*
* @param array|Traversable $options
- * @return Logger
* @throws Exception\InvalidArgumentException
*/
public function __construct($options = null)
@@ -79,11 +78,11 @@ abstract class AbstractWriter implements WriterInterface
if (is_array($options)) {
if (isset($options['filters'])) {
$filters = $options['filters'];
- if (is_string($filters) || $filters instanceof Filter\FilterInterface) {
+ if (is_int($filters) || is_string($filters) || $filters instanceof Filter\FilterInterface) {
$this->addFilter($filters);
} elseif (is_array($filters)) {
foreach ($filters as $filter) {
- if (is_string($filter) || $filter instanceof Filter\FilterInterface) {
+ if (is_int($filter) || is_string($filter) || $filter instanceof Filter\FilterInterface) {
$this->addFilter($filter);
} elseif (is_array($filter)) {
if (!isset($filter['name'])) {
@@ -216,18 +215,19 @@ abstract class AbstractWriter implements WriterInterface
$plugins = new $plugins;
}
if (!$plugins instanceof FormatterPluginManager) {
- throw new Exception\InvalidArgumentException(sprintf(
+ throw new Exception\InvalidArgumentException(
+ sprintf(
'Writer plugin manager must extend %s\FormatterPluginManager; received %s',
__NAMESPACE__,
is_object($plugins) ? get_class($plugins) : gettype($plugins)
- ));
+ )
+ );
}
$this->formatterPlugins = $plugins;
return $this;
}
-
/**
* Get formatter instance
*
@@ -296,9 +296,9 @@ abstract class AbstractWriter implements WriterInterface
if (!$formatter instanceof Formatter\FormatterInterface) {
throw new Exception\InvalidArgumentException(sprintf(
- 'Formatter must implement %s\Formatter\FormatterInterface; received "%s"',
- __NAMESPACE__,
- is_object($formatter) ? get_class($formatter) : gettype($formatter)
+ 'Formatter must implement %s\Formatter\FormatterInterface; received "%s"',
+ __NAMESPACE__,
+ is_object($formatter) ? get_class($formatter) : gettype($formatter)
));
}
@@ -306,6 +306,26 @@ abstract class AbstractWriter implements WriterInterface
return $this;
}
+ /**
+ * Get formatter
+ *
+ * @return Formatter\FormatterInterface
+ */
+ protected function getFormatter()
+ {
+ return $this->formatter;
+ }
+
+ /**
+ * Check if the writer has a formatter
+ *
+ * @return bool
+ */
+ protected function hasFormatter()
+ {
+ return $this->formatter instanceof Formatter\FormatterInterface;
+ }
+
/**
* Set convert write errors to exception flag
*
@@ -322,7 +342,8 @@ abstract class AbstractWriter implements WriterInterface
* @return void
*/
public function shutdown()
- {}
+ {
+ }
/**
* Write a message to the log
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp.php
index aa536314965..6483cc29a2b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp/ChromePhpBridge.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp/ChromePhpBridge.php
index 05de1de8329..ac263cb3ece 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp/ChromePhpBridge.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp/ChromePhpBridge.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp/ChromePhpInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp/ChromePhpInterface.php
index 772fe0b7727..569b6def366 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp/ChromePhpInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp/ChromePhpInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Db.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Db.php
index a8d1b156c43..33ba0c94baf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Db.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Db.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,7 +12,6 @@ namespace Zend\Log\Writer;
use Traversable;
use Zend\Db\Adapter\Adapter;
use Zend\Log\Exception;
-use Zend\Log\Formatter;
use Zend\Log\Formatter\Db as DbFormatter;
class Db extends AbstractWriter
@@ -87,7 +86,9 @@ class Db extends AbstractWriter
$this->separator = $separator;
}
- $this->setFormatter(new DbFormatter());
+ if (!$this->hasFormatter()) {
+ $this->setFormatter(new DbFormatter());
+ }
}
/**
@@ -124,7 +125,6 @@ class Db extends AbstractWriter
$statement = $this->db->query($this->prepareInsert($this->db, $this->tableName, $dataToInsert));
$statement->execute($dataToInsert);
-
}
/**
@@ -139,8 +139,8 @@ class Db extends AbstractWriter
{
$keys = array_keys($fields);
$sql = 'INSERT INTO ' . $db->platform->quoteIdentifier($tableName) . ' (' .
- implode(",",array_map(array($db->platform, 'quoteIdentifier'), $keys)) . ') VALUES (' .
- implode(",",array_map(array($db->driver, 'formatParameterName'), $keys)) . ')';
+ implode(",", array_map(array($db->platform, 'quoteIdentifier'), $keys)) . ') VALUES (' .
+ implode(",", array_map(array($db->driver, 'formatParameterName'), $keys)) . ')';
return $sql;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FilterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FilterPluginManager.php
index d2c569b8a52..456d84e6a5f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FilterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FilterPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FingersCrossed.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FingersCrossed.php
index ee8d3026a68..26316b1917a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FingersCrossed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FingersCrossed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Log\Writer;
@@ -24,7 +24,6 @@ use Zend\Log\WriterPluginManager;
*/
class FingersCrossed extends AbstractWriter
{
-
/**
* The wrapped writer
*
@@ -113,9 +112,9 @@ class FingersCrossed extends AbstractWriter
if (!$writer instanceof WriterInterface) {
throw new Exception\InvalidArgumentException(sprintf(
- 'Writer must implement %s\WriterInterface; received "%s"',
- __NAMESPACE__,
- is_object($writer) ? get_class($writer) : gettype($writer)
+ 'Writer must implement %s\WriterInterface; received "%s"',
+ __NAMESPACE__,
+ is_object($writer) ? get_class($writer) : gettype($writer)
));
}
@@ -150,9 +149,9 @@ class FingersCrossed extends AbstractWriter
}
if (!$plugins instanceof WriterPluginManager) {
throw new Exception\InvalidArgumentException(sprintf(
- 'Writer plugin manager must extend %s\WriterPluginManager; received %s',
- __NAMESPACE__,
- is_object($plugins) ? get_class($plugins) : gettype($plugins)
+ 'Writer plugin manager must extend %s\WriterPluginManager; received %s',
+ __NAMESPACE__,
+ is_object($plugins) ? get_class($plugins) : gettype($plugins)
));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp.php
index 3a6b766424e..a04a9be4d24 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -46,7 +46,6 @@ class FirePhp extends AbstractWriter
throw new Exception\InvalidArgumentException('You must pass a valid FirePhp\FirePhpInterface');
}
-
$this->firephp = $instance;
$this->formatter = new FirePhpFormatter();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp/FirePhpBridge.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp/FirePhpBridge.php
index 0b8dc81cb49..5c8db0e5696 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp/FirePhpBridge.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp/FirePhpBridge.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp/FirePhpInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp/FirePhpInterface.php
index 523c5b92a46..ddecf10965f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp/FirePhpInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp/FirePhpInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FormatterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FormatterPluginManager.php
index 374f1e5b87c..c06faf4102d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FormatterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FormatterPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Mail.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Mail.php
index 4ceca29abd3..056528ed399 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Mail.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Mail.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -192,10 +192,11 @@ class Mail extends AbstractWriter
} catch (TransportException\ExceptionInterface $e) {
trigger_error(
"unable to send log entries via email; " .
- "message = {$e->getMessage()}; " .
- "code = {$e->getCode()}; " .
- "exception class = " . get_class($e),
- E_USER_WARNING);
+ "message = {$e->getMessage()}; " .
+ "code = {$e->getCode()}; " .
+ "exception class = " . get_class($e),
+ E_USER_WARNING
+ );
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Mock.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Mock.php
index 2059c535576..a7c15432fd3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Mock.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Mock.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/MongoDB.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/MongoDB.php
index ee472b90dc8..4179f965d1e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/MongoDB.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/MongoDB.php
@@ -4,7 +4,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -62,15 +62,11 @@ class MongoDB extends AbstractWriter
}
if (null === $collection) {
- throw new Exception\InvalidArgumentException(
- 'The collection parameter cannot be empty'
- );
+ throw new Exception\InvalidArgumentException('The collection parameter cannot be empty');
}
if (null === $database) {
- throw new Exception\InvalidArgumentException(
- 'The database parameter cannot be empty'
- );
+ throw new Exception\InvalidArgumentException('The database parameter cannot be empty');
}
if (!($mongo instanceof MongoClient || $mongo instanceof Mongo)) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Null.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Null.php
index 0b1aee24684..ec41f689b7d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Null.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Null.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,5 +18,6 @@ class Null extends AbstractWriter
* @return void
*/
protected function doWrite(array $event)
- {}
+ {
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Stream.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Stream.php
index 36a16b62070..57a05507a11 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Stream.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Stream.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php
index 121f1fb0bdd..99348170d61 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Syslog.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/WriterInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/WriterInterface.php
index e2e6ed68141..2b92fde5081 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/WriterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/WriterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/ZendMonitor.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/ZendMonitor.php
index 6f2cf9026aa..32a8c321ef8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Writer/ZendMonitor.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/Writer/ZendMonitor.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/WriterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Log/WriterPluginManager.php
index 934f08b1ecd..343514dc144 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/WriterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/WriterPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/composer.json b/vendor/zendframework/zendframework/library/Zend/Log/composer.json
index 962f559d92a..af64219475e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Log/composer.json
@@ -7,6 +7,7 @@
"log",
"logging"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Log\\": ""
@@ -14,21 +15,30 @@
},
"target-dir": "Zend/Log",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-servicemanager": "self.version",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-console": "self.version",
+ "zendframework/zend-db": "self.version",
+ "zendframework/zend-escaper": "self.version",
+ "zendframework/zend-mail": "self.version",
+ "zendframework/zend-validator": "self.version"
+ },
"suggest": {
"ext-mongo": "*",
+ "zendframework/zend-console": "Zend\\Console component",
"zendframework/zend-db": "Zend\\Db component",
"zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML formatter",
"zendframework/zend-mail": "Zend\\Mail component",
"zendframework/zend-validator": "Zend\\Validator component"
+
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Address.php b/vendor/zendframework/zendframework/library/Zend/Mail/Address.php
index 526826a929a..e34c850692c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Address.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Address.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Address/AddressInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Address/AddressInterface.php
index 4f23c5f8aae..bcdf92ad84e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Address/AddressInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Address/AddressInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/AddressList.php b/vendor/zendframework/zendframework/library/Zend/Mail/AddressList.php
index acf5bde8964..751b65c89b8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/AddressList.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/AddressList.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Mail/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/BadMethodCallException.php
index 6a11063b380..05f15e0097b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/DomainException.php
index a3b14dd60dd..921d1d875b5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/DomainException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/ExceptionInterface.php
index e1ebc9902c9..4d9f77834c9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/InvalidArgumentException.php
index 30c58a5b3ab..b25b51086e2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/OutOfBoundsException.php
index 1e94c8e4962..dd832995085 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/OutOfBoundsException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/RuntimeException.php
index 339d3a4021d..7b437460624 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/AbstractAddressList.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/AbstractAddressList.php
index 4ccd38bba3f..78587ea4680 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/AbstractAddressList.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/AbstractAddressList.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -58,7 +58,12 @@ abstract class AbstractAddressList implements HeaderInterface
// split value on ","
$fieldValue = str_replace(Headers::FOLDING, ' ', $fieldValue);
$values = explode(',', $fieldValue);
- array_walk($values, 'trim');
+ array_walk(
+ $values,
+ function (&$value) {
+ $value = trim($value);
+ }
+ );
$addressList = $header->getAddressList();
foreach ($values as $address) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Bcc.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Bcc.php
index b03611fe409..418b3bd77fc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Bcc.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Bcc.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Cc.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Cc.php
index 07c6668c564..f4ee5709c16 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Cc.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Cc.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/ContentTransferEncoding.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/ContentTransferEncoding.php
index d331383be7f..5d386f363f4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/ContentTransferEncoding.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/ContentTransferEncoding.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mail\Header;
-
class ContentTransferEncoding implements HeaderInterface
{
/**
@@ -29,7 +28,6 @@ class ContentTransferEncoding implements HeaderInterface
*/
);
-
/**
* @var string
*/
@@ -94,9 +92,9 @@ class ContentTransferEncoding implements HeaderInterface
// Per RFC 1521, the value of the header is not case sensitive
$transferEncoding = strtolower($transferEncoding);
- if (!in_array($transferEncoding, self::$allowedTransferEncodings)) {
+ if (!in_array($transferEncoding, static::$allowedTransferEncodings)) {
throw new Exception\InvalidArgumentException(sprintf(
- '%s expects one of "'. implode(', ', self::$allowedTransferEncodings) . '"; received "%s"',
+ '%s expects one of "'. implode(', ', static::$allowedTransferEncodings) . '"; received "%s"',
__METHOD__,
(string) $transferEncoding
));
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/ContentType.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/ContentType.php
index 1983acd7699..5e72fbdc164 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/ContentType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/ContentType.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -37,6 +37,9 @@ class ContentType implements HeaderInterface
$values = preg_split('#\s*;\s*#', $value);
$type = array_shift($values);
+ //Remove empty values
+ $values = array_filter($values);
+
$header = new static();
$header->setType($type);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Date.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Date.php
index 4c62da8daab..fdf5941bd16 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Date.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Date.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/BadMethodCallException.php
index ebd63ca63bf..c58f5bb017f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Mail\Header\Exception;
use Zend\Mail\Exception;
-class BadMethodCallException extends Exception\BadMethodCallException implements
- ExceptionInterface
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/ExceptionInterface.php
index a6333e03fd0..8ac63324f75 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/InvalidArgumentException.php
index f7ec234a3f4..af8fd91c8cf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,6 @@ namespace Zend\Mail\Header\Exception;
use Zend\Mail\Exception;
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
- ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/RuntimeException.php
index 532440e77ad..98354eb9542 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,6 +11,6 @@ namespace Zend\Mail\Header\Exception;
use Zend\Mail\Exception;
-class RuntimeException extends Exception\RuntimeException implements
- ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/From.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/From.php
index 463f1c6d01b..4d10dfec7b5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/From.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/From.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/GenericHeader.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/GenericHeader.php
index 3824604ab93..05989179a91 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/GenericHeader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/GenericHeader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/GenericMultiHeader.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/GenericMultiHeader.php
index 318acd600d2..d0b0d204f90 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/GenericMultiHeader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/GenericMultiHeader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -25,7 +25,6 @@ class GenericMultiHeader extends GenericHeader implements MultipleHeadersInterfa
foreach (explode(',', $fieldValue) as $multiValue) {
$header = new static($fieldName, $multiValue);
$headers[] = $header->setEncoding($encoding);
-
}
return $headers;
} else {
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderInterface.php
index 37919eca770..8b304b3daa9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -25,7 +25,6 @@ interface HeaderInterface
*/
const FORMAT_RAW = false;
-
/**
* Factory to generate a header object from a string
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderLoader.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderLoader.php
index aa33fc0dab9..2711ac85bc1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderLoader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderLoader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderWrap.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderWrap.php
index 30c223f2cba..24b72ce1169 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderWrap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderWrap.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/MessageId.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/MessageId.php
index fbb7cd5aa2f..80c56e0bd0b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/MessageId.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/MessageId.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mail\Header;
-
class MessageId implements HeaderInterface
{
/**
@@ -17,7 +16,6 @@ class MessageId implements HeaderInterface
*/
protected $messageId;
-
public static function fromString($headerLine)
{
list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/MimeVersion.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/MimeVersion.php
index c6b34e50fd9..80da4cf38a3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/MimeVersion.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/MimeVersion.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/MultipleHeadersInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/MultipleHeadersInterface.php
index dae4c7eb667..66e8b06d6d5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/MultipleHeadersInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/MultipleHeadersInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Received.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Received.php
index 3efbe42e87c..904e3076342 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Received.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Received.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/ReplyTo.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/ReplyTo.php
index ca977b29f21..8d2c8929bdc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/ReplyTo.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/ReplyTo.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Sender.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Sender.php
index c8840baaedc..9c08d3b6705 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Sender.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Sender.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/StructuredInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/StructuredInterface.php
index 475cee3b40b..8d3825d3778 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/StructuredInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/StructuredInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Subject.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Subject.php
index 50daa82f9e3..a4858c2f341 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/Subject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Subject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/To.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/To.php
index 78f69a4a80c..26d41ae367e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/To.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/To.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/UnstructuredInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/UnstructuredInterface.php
index 1b60c1d0a6f..c14dbc2cadd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/UnstructuredInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/UnstructuredInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Headers.php b/vendor/zendframework/zendframework/library/Zend/Mail/Headers.php
index bba7039a9d1..414168f38e2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Headers.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Headers.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -178,7 +178,6 @@ class Headers implements Countable, Iterator
} elseif (is_string($name)) {
$this->addHeaderLine($name, $value);
}
-
}
return $this;
@@ -237,18 +236,26 @@ class Headers implements Countable, Iterator
/**
* Remove a Header from the container
*
- * @param string $fieldName
+ * @param string|Header\HeaderInterface field name or specific header instance to remove
* @return bool
*/
- public function removeHeader($fieldName)
+ public function removeHeader($instanceOrFieldName)
{
- $key = $this->normalizeFieldName($fieldName);
- $index = array_search($key, $this->headersKeys, true);
- if ($index !== false) {
- unset($this->headersKeys[$index]);
- unset($this->headers[$index]);
+ if ($instanceOrFieldName instanceof Header\HeaderInterface) {
+ $indexes = array_keys($this->headers, $instanceOrFieldName, true);
+ } else {
+ $key = $this->normalizeFieldName($instanceOrFieldName);
+ $indexes = array_keys($this->headersKeys, $key, true);
+ }
+
+ if (!empty($indexes)) {
+ foreach ($indexes as $index) {
+ unset ($this->headersKeys[$index]);
+ unset ($this->headers[$index]);
+ }
return true;
}
+
return false;
}
@@ -295,6 +302,7 @@ class Headers implements Countable, Iterator
} else {
return $results[0];
}
+ //fall-trough
default:
return new ArrayIterator($results);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Message.php b/vendor/zendframework/zendframework/library/Zend/Mail/Message.php
index 283b4391b4e..e1b999bb967 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Message.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Message.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -438,7 +438,7 @@ class Message
*
* @param string $headerName
* @param string $headerClass
- * @return \Zend\Mail\Header\HeaderInterface
+ * @return Header\HeaderInterface|\ArrayIterator header instance or collection of headers
*/
protected function getHeaderByName($headerName, $headerClass)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php
index 07d477d4369..af472078b4b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -23,7 +23,6 @@ abstract class AbstractProtocol
*/
const EOL = "\r\n";
-
/**
* Default timeout in seconds for initiating session
*/
@@ -35,56 +34,48 @@ abstract class AbstractProtocol
*/
protected $maximumLog = 64;
-
/**
* Hostname or IP address of remote server
* @var string
*/
protected $host;
-
/**
* Port number of connection
* @var int
*/
protected $port;
-
/**
* Instance of Zend\Validator\ValidatorChain to check hostnames
* @var \Zend\Validator\ValidatorChain
*/
protected $validHost;
-
/**
* Socket connection resource
* @var resource
*/
protected $socket;
-
/**
* Last request sent to server
* @var string
*/
protected $request;
-
/**
* Array of server responses to last request
* @var array
*/
protected $response;
-
/**
* Log of mail requests and server responses for a session
* @var array
*/
private $log = array();
-
/**
* Constructor.
*
@@ -105,7 +96,6 @@ abstract class AbstractProtocol
$this->port = $port;
}
-
/**
* Class destructor to cleanup open resources
*
@@ -125,7 +115,6 @@ abstract class AbstractProtocol
$this->maximumLog = (int) $maximumLog;
}
-
/**
* Get the maximum log size
*
@@ -136,7 +125,6 @@ abstract class AbstractProtocol
return $this->maximumLog;
}
-
/**
* Create a connection to the remote host
*
@@ -144,7 +132,6 @@ abstract class AbstractProtocol
*/
abstract public function connect();
-
/**
* Retrieve the last client request
*
@@ -155,7 +142,6 @@ abstract class AbstractProtocol
return $this->request;
}
-
/**
* Retrieve the last server response
*
@@ -166,7 +152,6 @@ abstract class AbstractProtocol
return $this->response;
}
-
/**
* Retrieve the transaction log
*
@@ -177,7 +162,6 @@ abstract class AbstractProtocol
return implode('', $this->log);
}
-
/**
* Reset the transaction log
*
@@ -232,7 +216,6 @@ abstract class AbstractProtocol
return $result;
}
-
/**
* Disconnect from remote host and free resource
*
@@ -244,7 +227,6 @@ abstract class AbstractProtocol
}
}
-
/**
* Send the given request followed by a LINEEND to the server.
*
@@ -272,7 +254,6 @@ abstract class AbstractProtocol
return $result;
}
-
/**
* Get a line from the stream.
*
@@ -288,7 +269,7 @@ abstract class AbstractProtocol
// Adapters may wish to supply per-commend timeouts according to appropriate RFC
if ($timeout !== null) {
- stream_set_timeout($this->socket, $timeout);
+ stream_set_timeout($this->socket, $timeout);
}
// Retrieve response
@@ -311,7 +292,6 @@ abstract class AbstractProtocol
return $response;
}
-
/**
* Parse server response for successful codes
*
@@ -326,9 +306,6 @@ abstract class AbstractProtocol
protected function _expect($code, $timeout = null)
{
$this->response = array();
- $cmd = '';
- $more = '';
- $msg = '';
$errMsg = '';
if (!is_array($code)) {
@@ -344,7 +321,6 @@ abstract class AbstractProtocol
} elseif ($cmd === null || !in_array($cmd, $code)) {
$errMsg = $msg;
}
-
} while (strpos($more, '-') === 0); // The '-' message prefix indicates an information string instead of a response string.
if ($errMsg !== '') {
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php
index a19ba3a3a0c..3ec5ce25584 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
index f7532513abb..f49618df378 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,6 @@ use Zend\Mail\Exception;
/**
* Exception for Zend\Mail component.
*/
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
- ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/RuntimeException.php
index 6822f1cebbd..1b9e19237e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,6 @@ use Zend\Mail\Exception;
/**
* Exception for Zend\Mail component.
*/
-class RuntimeException extends Exception\RuntimeException implements
- ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Imap.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Imap.php
index 4228174fedc..e7dd0245386 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Imap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Imap.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -389,7 +389,6 @@ class Imap
$result = array();
foreach ($list as $v) {
if (!is_array($v)) {
-// $result[] = $this->escapeString($v);
$result[] = $v;
continue;
}
@@ -430,7 +429,6 @@ class Imap
return $result;
}
-
/**
* Get capabilities from IMAP server
*
@@ -587,7 +585,8 @@ class Imap
// if we want only one message we can ignore everything else and just return
if ($to === null && !is_array($from) && $tokens[0] == $from) {
// we still need to read all lines
- while (!$this->readLine($tokens, $tag));
+ while (!$this->readLine($tokens, $tag)) {
+ }
return $data;
}
$result[$tokens[0]] = $data;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Pop3.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Pop3.php
index 4434bd1bd72..6a9eb14192a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Pop3.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Pop3.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -36,7 +36,6 @@ class Pop3
*/
protected $timestamp;
-
/**
* Public constructor
*
@@ -51,7 +50,6 @@ class Pop3
}
}
-
/**
* Public destructor
*/
@@ -60,7 +58,6 @@ class Pop3
$this->logout();
}
-
/**
* Open connection to POP3 server
*
@@ -125,7 +122,6 @@ class Pop3
return $welcome;
}
-
/**
* Send a request
*
@@ -142,7 +138,6 @@ class Pop3
}
}
-
/**
* read a response
*
@@ -186,7 +181,6 @@ class Pop3
return $message;
}
-
/**
* Send request and get response
*
@@ -202,7 +196,6 @@ class Pop3
return $this->readResponse($multiline);
}
-
/**
* End communication with POP3 server (also closes socket)
*/
@@ -251,8 +244,8 @@ class Pop3
}
}
- $result = $this->request("USER $user");
- $result = $this->request("PASS $password");
+ $this->request("USER $user");
+ $this->request("PASS $password");
}
@@ -372,7 +365,6 @@ class Pop3
return $result;
}
-
/**
* Make a RETR call for retrieving a full message with headers and body
*
@@ -393,7 +385,6 @@ class Pop3
$this->request('NOOP');
}
-
/**
* Make a DELE count to remove a message
*
@@ -404,7 +395,6 @@ class Pop3
$this->request("DELE $msgno");
}
-
/**
* Make RSET call, which rollbacks delete requests
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
index 909c5b771e9..8110f624e08 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -23,7 +23,6 @@ class Smtp extends AbstractProtocol
*/
protected $transport = 'tcp';
-
/**
* Indicates that a session is requested to be secure
*
@@ -31,7 +30,6 @@ class Smtp extends AbstractProtocol
*/
protected $secure;
-
/**
* Indicates an smtp session has been started by the HELO command
*
@@ -39,7 +37,6 @@ class Smtp extends AbstractProtocol
*/
protected $sess = false;
-
/**
* Indicates an smtp AUTH has been issued and authenticated
*
@@ -47,7 +44,6 @@ class Smtp extends AbstractProtocol
*/
protected $auth = false;
-
/**
* Indicates a MAIL command has been issued
*
@@ -55,7 +51,6 @@ class Smtp extends AbstractProtocol
*/
protected $mail = false;
-
/**
* Indicates one or more RCTP commands have been issued
*
@@ -63,7 +58,6 @@ class Smtp extends AbstractProtocol
*/
protected $rcpt = false;
-
/**
* Indicates that DATA has been issued and sent
*
@@ -71,7 +65,6 @@ class Smtp extends AbstractProtocol
*/
protected $data = null;
-
/**
* Constructor.
*
@@ -254,7 +247,6 @@ class Smtp extends AbstractProtocol
*/
public function rcpt($to)
{
-
if ($this->mail !== true) {
throw new Exception\RuntimeException('No sender reverse path has been supplied');
}
@@ -318,7 +310,6 @@ class Smtp extends AbstractProtocol
$this->data = false;
}
-
/**
* Issues the NOOP command end validates answer
*
@@ -331,7 +322,6 @@ class Smtp extends AbstractProtocol
$this->_expect(250, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
}
-
/**
* Issues the VRFY command end validates answer
*
@@ -345,7 +335,6 @@ class Smtp extends AbstractProtocol
$this->_expect(array(250, 251, 252), 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
}
-
/**
* Issues the QUIT command and clears the current session
*
@@ -360,7 +349,6 @@ class Smtp extends AbstractProtocol
}
}
-
/**
* Default authentication method
*
@@ -375,7 +363,6 @@ class Smtp extends AbstractProtocol
}
}
-
/**
* Closes connection
*
@@ -404,7 +391,6 @@ class Smtp extends AbstractProtocol
$this->sess = true;
}
-
/**
* Stop mail session
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
index 9666df10164..c3bd3a0ccbc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,13 +22,11 @@ class Crammd5 extends Smtp
*/
protected $username;
-
/**
* @var string
*/
protected $password;
-
/**
* Constructor.
*
@@ -65,7 +63,6 @@ class Crammd5 extends Smtp
parent::__construct($host, $port, $origConfig);
}
-
/**
* Performs CRAM-MD5 authentication with supplied credentials
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Login.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
index 79158e67ace..b5dba8fc284 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -23,7 +23,6 @@ class Login extends Smtp
*/
protected $username;
-
/**
* LOGIN password
*
@@ -31,7 +30,6 @@ class Login extends Smtp
*/
protected $password;
-
/**
* Constructor.
*
@@ -65,7 +63,6 @@ class Login extends Smtp
parent::__construct($host, $port, $origConfig);
}
-
/**
* Perform LOGIN authentication with supplied credentials
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
index 335ba407dcc..7011aeff408 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -23,7 +23,6 @@ class Plain extends Smtp
*/
protected $username;
-
/**
* PLAIN password
*
@@ -31,7 +30,6 @@ class Plain extends Smtp
*/
protected $password;
-
/**
* Constructor.
*
@@ -65,7 +63,6 @@ class Plain extends Smtp
parent::__construct($host, $port, $origConfig);
}
-
/**
* Perform PLAIN authentication with supplied credentials
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/SmtpPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/SmtpPluginManager.php
index b84272b2532..898fd47b402 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/SmtpPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/SmtpPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage.php
index bcad4e364a2..3c0b0df4ec2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/AbstractStorage.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/AbstractStorage.php
index 032adb948dc..36bec3c6569 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/AbstractStorage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/AbstractStorage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -70,7 +70,6 @@ abstract class AbstractStorage implements
throw new Exception\InvalidArgumentException($var . ' not found');
}
-
/**
* Get a full list of features supported by the specific mail lib and the server
*
@@ -81,7 +80,6 @@ abstract class AbstractStorage implements
return $this->has;
}
-
/**
* Count messages messages in current box/folder
*
@@ -90,7 +88,6 @@ abstract class AbstractStorage implements
*/
abstract public function countMessages();
-
/**
* Get a list of messages with number and size
*
@@ -99,7 +96,6 @@ abstract class AbstractStorage implements
*/
abstract public function getSize($id = 0);
-
/**
* Get a message with headers and body
*
@@ -108,7 +104,6 @@ abstract class AbstractStorage implements
*/
abstract public function getMessage($id);
-
/**
* Get raw header of message or part
*
@@ -136,7 +131,6 @@ abstract class AbstractStorage implements
*/
abstract public function __construct($params);
-
/**
* Destructor calls close() and therefore closes the resource.
*/
@@ -145,14 +139,12 @@ abstract class AbstractStorage implements
$this->close();
}
-
/**
* Close resource for mail lib. If you need to control, when the resource
* is closed. Otherwise the destructor would call this.
*/
abstract public function close();
-
/**
* Keep the resource alive.
*/
@@ -195,41 +187,39 @@ abstract class AbstractStorage implements
*
* @return int
*/
- public function count()
- {
+ public function count()
+ {
return $this->countMessages();
- }
-
+ }
- /**
- * ArrayAccess::offsetExists()
- *
- * @param int $id
- * @return bool
- */
- public function offsetExists($id)
- {
+ /**
+ * ArrayAccess::offsetExists()
+ *
+ * @param int $id
+ * @return bool
+ */
+ public function offsetExists($id)
+ {
try {
if ($this->getMessage($id)) {
return true;
}
- } catch (Exception\ExceptionInterface $e) {}
+ } catch (Exception\ExceptionInterface $e) {
+ }
return false;
- }
-
+ }
- /**
- * ArrayAccess::offsetGet()
- *
- * @param int $id
- * @return \Zend\Mail\Storage\Message message object
- */
- public function offsetGet($id)
- {
+ /**
+ * ArrayAccess::offsetGet()
+ *
+ * @param int $id
+ * @return \Zend\Mail\Storage\Message message object
+ */
+ public function offsetGet($id)
+ {
return $this->getMessage($id);
- }
-
+ }
/**
* ArrayAccess::offsetSet()
@@ -238,98 +228,91 @@ abstract class AbstractStorage implements
* @param mixed $value
* @throws Exception\RuntimeException
*/
- public function offsetSet($id, $value)
- {
+ public function offsetSet($id, $value)
+ {
throw new Exception\RuntimeException('cannot write mail messages via array access');
- }
-
+ }
- /**
- * ArrayAccess::offsetUnset()
- *
- * @param int $id
- * @return bool success
- */
- public function offsetUnset($id)
- {
+ /**
+ * ArrayAccess::offsetUnset()
+ *
+ * @param int $id
+ * @return bool success
+ */
+ public function offsetUnset($id)
+ {
return $this->removeMessage($id);
- }
-
-
- /**
- * Iterator::rewind()
- *
- * Rewind always gets the new count from the storage. Thus if you use
- * the interfaces and your scripts take long you should use reset()
- * from time to time.
- */
- public function rewind()
- {
+ }
+
+ /**
+ * Iterator::rewind()
+ *
+ * Rewind always gets the new count from the storage. Thus if you use
+ * the interfaces and your scripts take long you should use reset()
+ * from time to time.
+ */
+ public function rewind()
+ {
$this->iterationMax = $this->countMessages();
$this->iterationPos = 1;
- }
-
+ }
- /**
- * Iterator::current()
- *
- * @return Message current message
- */
- public function current()
- {
+ /**
+ * Iterator::current()
+ *
+ * @return Message current message
+ */
+ public function current()
+ {
return $this->getMessage($this->iterationPos);
- }
-
+ }
- /**
- * Iterator::key()
- *
- * @return int id of current position
- */
- public function key()
- {
+ /**
+ * Iterator::key()
+ *
+ * @return int id of current position
+ */
+ public function key()
+ {
return $this->iterationPos;
- }
-
+ }
- /**
- * Iterator::next()
- */
- public function next()
- {
+ /**
+ * Iterator::next()
+ */
+ public function next()
+ {
++$this->iterationPos;
- }
-
+ }
- /**
- * Iterator::valid()
- *
- * @return bool
- */
- public function valid()
- {
+ /**
+ * Iterator::valid()
+ *
+ * @return bool
+ */
+ public function valid()
+ {
if ($this->iterationMax === null) {
- $this->iterationMax = $this->countMessages();
+ $this->iterationMax = $this->countMessages();
}
return $this->iterationPos && $this->iterationPos <= $this->iterationMax;
- }
-
+ }
- /**
- * SeekableIterator::seek()
- *
- * @param int $pos
- * @throws Exception\OutOfBoundsException
- */
- public function seek($pos)
- {
+ /**
+ * SeekableIterator::seek()
+ *
+ * @param int $pos
+ * @throws Exception\OutOfBoundsException
+ */
+ public function seek($pos)
+ {
if ($this->iterationMax === null) {
- $this->iterationMax = $this->countMessages();
+ $this->iterationMax = $this->countMessages();
}
if ($pos > $this->iterationMax) {
throw new Exception\OutOfBoundsException('this position does not exist');
}
$this->iterationPos = $pos;
- }
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/ExceptionInterface.php
index 630637c3b34..923dd1b8e82 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
index 4d9be4409d4..64c8dc94576 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,6 @@ use Zend\Mail\Exception;
/**
* Exception for Zend\Mail component.
*/
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
- ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
index 714d7d39ed2..d86c16ac24d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,6 @@ use Zend\Mail\Exception;
/**
* Exception for Zend\Mail component.
*/
-class OutOfBoundsException extends Exception\OutOfBoundsException implements
- ExceptionInterface
-{}
+class OutOfBoundsException extends Exception\OutOfBoundsException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/RuntimeException.php
index 965fcd8810f..281ae1b9833 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,6 @@ use Zend\Mail\Exception;
/**
* Exception for Zend\Mail component.
*/
-class RuntimeException extends Exception\RuntimeException implements
- ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder.php
index 4d5c316ef05..6ccb5d6537f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/FolderInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/FolderInterface.php
index d334f45ca88..a3d05f1bff2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/FolderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/FolderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -29,7 +29,6 @@ interface FolderInterface
*/
public function selectFolder($globalName);
-
/**
* get Zend\Mail\Storage\Folder instance for current folder
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Maildir.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Maildir.php
index f45fa63d91e..876bccb34b0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Maildir.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Maildir.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -91,7 +91,6 @@ class Maildir extends Storage\Maildir implements FolderInterface
$dirs = array();
while (($entry = readdir($dh)) !== false) {
-
// maildir++ defines folders must start with .
if ($entry[0] != '.' || $entry == '.' || $entry == '..') {
continue;
@@ -194,8 +193,11 @@ class Maildir extends Storage\Maildir implements FolderInterface
}
// seems like file has vanished; rebuilding folder tree - but it's still an exception
$this->_buildFolderTree();
- throw new Exception\RuntimeException('seems like the maildir has vanished, I\'ve rebuild the ' .
- 'folder tree, search for an other folder and try again', 0, $e);
+ throw new Exception\RuntimeException(
+ 'seems like the maildir has vanished, I\'ve rebuild the folder tree, search for an other folder and try again',
+ 0,
+ $e
+ );
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Mbox.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Mbox.php
index ffc536dcaa7..29445d71aa3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Mbox.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Mbox.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -168,8 +168,11 @@ class Mbox extends Storage\Mbox implements FolderInterface
}
// seems like file has vanished; rebuilding folder tree - but it's still an exception
$this->_buildFolderTree($this->rootdir);
- throw new Exception\RuntimeException('seems like the mbox file has vanished, I\'ve rebuild the ' .
- 'folder tree, search for an other folder and try again', 0, $e);
+ throw new Exception\RuntimeException(
+ 'seems like the mbox file has vanished, I\'ve rebuild the folder tree, search for an other folder and try again',
+ 0,
+ $e
+ );
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Imap.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Imap.php
index 93a3cfef445..0bd2b277269 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Imap.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Imap.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -289,7 +289,6 @@ class Imap extends AbstractStorage implements Folder\FolderInterface, Writable\W
throw new Exception\InvalidArgumentException('unique id not found');
}
-
/**
* get root folder or given folder
*
@@ -362,7 +361,6 @@ class Imap extends AbstractStorage implements Folder\FolderInterface, Writable\W
}
}
-
/**
* get \Zend\Mail\Storage\Folder instance for current folder
*
@@ -444,7 +442,6 @@ class Imap extends AbstractStorage implements Folder\FolderInterface, Writable\W
* @param null|array $flags set flags for new message, else a default set is used
* @throws Exception\RuntimeException
*/
- // not yet * @param string|\Zend\Mail\Message|\Zend\Mime\Message $message message as string or instance of message class
public function appendMessage($message, $folder = null, $flags = null)
{
if ($folder === null) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Maildir.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Maildir.php
index 1b4c3fbcf53..02f81e92431 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Maildir.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Maildir.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -65,15 +65,15 @@ class Maildir extends AbstractStorage
}
$flags = array_flip($flags);
- foreach ($this->files as $file) {
- foreach ($flags as $flag => $v) {
- if (!isset($file['flaglookup'][$flag])) {
- continue 2;
- }
- }
- ++$count;
- }
- return $count;
+ foreach ($this->files as $file) {
+ foreach ($flags as $flag => $v) {
+ if (!isset($file['flaglookup'][$flag])) {
+ continue 2;
+ }
+ }
+ ++$count;
+ }
+ return $count;
}
/**
@@ -122,8 +122,6 @@ class Maildir extends AbstractStorage
return $result;
}
-
-
/**
* Fetch a message
*
@@ -330,7 +328,6 @@ class Maildir extends AbstractStorage
}
}
-
/**
* Close resource for mail lib. If you need to control, when the resource
* is closed. Otherwise the destructor would call this.
@@ -341,7 +338,6 @@ class Maildir extends AbstractStorage
$this->files = array();
}
-
/**
* Waste some CPU cycles doing nothing.
*
@@ -352,7 +348,6 @@ class Maildir extends AbstractStorage
return true;
}
-
/**
* stub for not supported message deletion
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Mbox.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Mbox.php
index 847c3c0e0b2..35113677c66 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Mbox.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Mbox.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -54,7 +54,6 @@ class Mbox extends AbstractStorage
return count($this->positions);
}
-
/**
* Get a list of messages with number and size
*
@@ -76,7 +75,6 @@ class Mbox extends AbstractStorage
return $result;
}
-
/**
* Get positions for mail message or throw exception if id is invalid
*
@@ -93,7 +91,6 @@ class Mbox extends AbstractStorage
return $this->positions[$id - 1];
}
-
/**
* Fetch a message
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message.php
index 53c858f7d1d..726b5871357 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/File.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/File.php
index 98933dfe2ea..cd9a501fc0c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/File.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/File.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/MessageInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/MessageInterface.php
index 7dd7067d616..80a1bf74593 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/MessageInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message/MessageInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part.php
index d46d7d14be5..26a511273a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -349,7 +349,6 @@ class Part implements RecursiveIterator, Part\PartInterface
return Mime\Decode::splitHeaderField(current($this->getHeader($name, 'array')), $wantedPart, $firstName);
}
-
/**
* Getter for mail headers - name is matched in lowercase
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php
index d0cfeefbe9f..851d00806ca 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
index 2681c5e5c4d..f904c032afc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,6 @@ use Zend\Mail\Storage\Exception;
/**
* Exception for Zend\Mail component.
*/
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
- ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
index 7ee120ea68b..e27d09e470e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,6 @@ use Zend\Mail\Storage\Exception;
/**
* Exception for Zend\Mail component.
*/
-class RuntimeException extends Exception\RuntimeException implements
- ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/File.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/File.php
index b119c8e3c4d..2bf0d57a6bb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/File.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/File.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -101,10 +101,8 @@ class File extends Part
}
}
$this->countParts = count($this->partPos);
-
}
-
/**
* Body of part
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/PartInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/PartInterface.php
index d0cd78ef7eb..88224bed179 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/PartInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/PartInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -20,7 +20,6 @@ interface PartInterface extends RecursiveIterator
*/
public function isMultipart();
-
/**
* Body of part
*
@@ -54,7 +53,6 @@ interface PartInterface extends RecursiveIterator
*/
public function countParts();
-
/**
* Get all headers
*
@@ -95,7 +93,6 @@ interface PartInterface extends RecursiveIterator
*/
public function getHeaderField($name, $wantedPart = '0', $firstName = '0');
-
/**
* Getter for mail headers - name is matched in lowercase
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Pop3.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Pop3.php
index 4e5b698fb02..e1e49b1a07c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Pop3.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Pop3.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -21,7 +21,6 @@ class Pop3 extends AbstractStorage
*/
protected $protocol;
-
/**
* Count messages all messages in current box
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/Maildir.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/Maildir.php
index 1b269395514..b5d75d4a3b6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/Maildir.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/Maildir.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -379,8 +379,9 @@ class Maildir extends Folder\Maildir implements WritableInterface
}
if (!$fh) {
- throw new StorageException\RuntimeException("tried $maxTries unique ids for a temp file, but all were taken"
- . ' - giving up');
+ throw new StorageException\RuntimeException(
+ "tried {$maxTries} unique ids for a temp file, but all were taken - giving up"
+ );
}
return array('dirname' => $this->rootdir . '.' . $folder,
@@ -426,7 +427,7 @@ class Maildir extends Folder\Maildir implements WritableInterface
/**
* append a new message to mail storage
*
- * @param string|stream $message message as string or stream resource
+ * @param string|resource $message message as string or stream resource
* @param null|string|\Zend\Mail\Storage\Folder $folder folder for new message, else current folder is taken
* @param null|array $flags set flags for new message, else a default set is used
* @param bool $recent handle this mail as if recent flag has been set,
@@ -625,7 +626,6 @@ class Maildir extends Folder\Maildir implements WritableInterface
$this->files = array_values($this->files);
}
-
/**
* set flags for message
*
@@ -656,7 +656,6 @@ class Maildir extends Folder\Maildir implements WritableInterface
$this->files[$id - 1] = $filedata;
}
-
/**
* stub for not supported message deletion
*
@@ -783,7 +782,6 @@ class Maildir extends Folder\Maildir implements WritableInterface
continue;
}
-
while (($entry = readdir()) !== false) {
if ($entry[0] == '.' || !is_file($dirname . $entry)) {
continue;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/WritableInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/WritableInterface.php
index de00e8b48b9..2fbbffbb63a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/WritableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/WritableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/DomainException.php
new file mode 100644
index 00000000000..7ecec702795
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/DomainException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mail\Transport\Exception;
+
+use Zend\Mail\Exception;
+
+/**
+ * Exception for Zend\Mail\Transport component.
+ */
+class DomainException extends Exception\DomainException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/ExceptionInterface.php
index db249c653f3..3b1a56cbb84 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
index 75d29aacd67..40dd3551670 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,6 @@ use Zend\Mail\Exception;
/**
* Exception for Zend\Mail component.
*/
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
- ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/RuntimeException.php
index 1b577210149..a14e41b73d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,6 @@ use Zend\Mail\Exception;
/**
* Exception for Zend\Mail component.
*/
-class RuntimeException extends Exception\RuntimeException implements
- ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Factory.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Factory.php
new file mode 100644
index 00000000000..63b69486a62
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Factory.php
@@ -0,0 +1,83 @@
+<?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\Mail\Transport;
+
+use Traversable;
+use Zend\Stdlib\ArrayUtils;
+
+abstract class Factory
+{
+ /**
+ * @var array Known transport types
+ */
+ protected static $classMap = array(
+ 'file' => 'Zend\Mail\Transport\File',
+ 'null' => 'Zend\Mail\Transport\Null',
+ 'sendmail' => 'Zend\Mail\Transport\Sendmail',
+ 'smtp' => 'Zend\Mail\Transport\Smtp',
+ );
+
+ /**
+ * @param array $spec
+ * @return TransportInterface
+ * @throws Exception\InvalidArgumentException
+ * @throws Exception\DomainException
+ */
+ public static function create($spec = array())
+ {
+ if ($spec instanceof Traversable) {
+ $spec = ArrayUtils::iteratorToArray($spec);
+ }
+
+ if (! is_array($spec)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects an array or Traversable argument; received "%s"',
+ __METHOD__,
+ (is_object($spec) ? get_class($spec) : gettype($spec))
+ ));
+ }
+
+ $type = isset($spec['type']) ? $spec['type'] : 'sendmail';
+
+ $normalizedType = strtolower($type);
+
+ if (isset(static::$classMap[$normalizedType])) {
+ $type = static::$classMap[$normalizedType];
+ }
+
+ if (! class_exists($type)) {
+ throw new Exception\DomainException(sprintf(
+ '%s expects the "type" attribute to resolve to an existing class; received "%s"',
+ __METHOD__,
+ $type
+ ));
+ }
+
+ $transport = new $type;
+
+ if (! $transport instanceof TransportInterface) {
+ throw new Exception\DomainException(sprintf(
+ '%s expects the "type" attribute to resolve to a valid Zend\Mail\Transport\TransportInterface instance; received "%s"',
+ __METHOD__,
+ $type
+ ));
+ }
+
+ if ($transport instanceof Smtp && isset($spec['options'])) {
+ $transport->setOptions(new SmtpOptions($spec['options']));
+ }
+
+ if ($transport instanceof File && isset($spec['options'])) {
+ $transport->setOptions(new FileOptions($spec['options']));
+ }
+
+ return $transport;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/File.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/File.php
index 78eea6e6040..8efd6c88e15 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/File.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/File.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -43,6 +43,14 @@ class File implements TransportInterface
$this->setOptions($options);
}
+ /**
+ * @return FileOptions
+ */
+ public function getOptions()
+ {
+ return $this->options;
+ }
+
/**
* Sets options
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/FileOptions.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/FileOptions.php
index 8bcae3e8657..13d208c285c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/FileOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/FileOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -88,7 +88,7 @@ class FileOptions extends AbstractOptions
{
if (null === $this->callback) {
$this->setCallback(function ($transport) {
- return 'ZendMail_' . time() . '_' . mt_rand() . '.tmp';
+ return 'ZendMail_' . time() . '_' . mt_rand() . '.eml';
});
}
return $this->callback;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Null.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Null.php
new file mode 100644
index 00000000000..2abea75f4a3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Null.php
@@ -0,0 +1,46 @@
+<?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\Mail\Transport;
+
+use Zend\Mail\Message;
+
+/**
+ * File transport
+ *
+ * The null transport will just store the message in memory. It is helpful
+ * when unit testing.
+ */
+class Null implements TransportInterface
+{
+ /**
+ * @var Message
+ */
+ protected $lastMessage;
+
+ /**
+ * Takes the last message and Saves it for testing
+ *
+ * @param Message $message
+ */
+ public function send(Message $message)
+ {
+ $this->lastMessage = $message;
+ }
+
+ /**
+ * Get the last message sent
+ *
+ * @return Message
+ */
+ public function getLastMessage()
+ {
+ return $this->lastMessage;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Sendmail.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Sendmail.php
index 0378ee3743d..aac12993aed 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Sendmail.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Sendmail.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -248,7 +248,7 @@ class Sendmail implements TransportInterface
$sender = $message->getSender();
if ($sender instanceof AddressInterface) {
- $parameters .= ' -f ' . $sender->getEmail();
+ $parameters .= ' -f' . $sender->getEmail();
return $parameters;
}
@@ -256,7 +256,7 @@ class Sendmail implements TransportInterface
if (count($from)) {
$from->rewind();
$sender = $from->current();
- $parameters .= ' -f ' . $sender->getEmail();
+ $parameters .= ' -f' . $sender->getEmail();
return $parameters;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Smtp.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Smtp.php
index 62277ef4402..82bf3d1dc44 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Smtp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Smtp.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -164,7 +164,6 @@ class Smtp implements TransportInterface
$this->connection = $connection;
}
-
/**
* Gets the connection protocol instance
*
@@ -215,11 +214,13 @@ class Smtp implements TransportInterface
$body = $this->prepareBody($message);
if ((count($recipients) == 0) && (!empty($headers) || !empty($body))) {
- throw new Exception\RuntimeException( // Per RFC 2821 3.3 (page 18)
+ // Per RFC 2821 3.3 (page 18)
+ throw new Exception\RuntimeException(
sprintf(
'%s transport expects at least one recipient if the message has at least one header or body',
__CLASS__
- ));
+ )
+ );
}
// Set sender email address
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/SmtpOptions.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/SmtpOptions.php
index a3039c344cd..2ce262a699f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/SmtpOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/SmtpOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/TransportInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/TransportInterface.php
index cded3c6d115..6d9fe7d866c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Transport/TransportInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/TransportInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/composer.json b/vendor/zendframework/zendframework/library/Zend/Mail/composer.json
index bdb440ce230..57b7f083639 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/composer.json
@@ -6,6 +6,7 @@
"zf2",
"mail"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Mail\\": ""
@@ -13,20 +14,23 @@
},
"target-dir": "Zend/Mail",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-crypt": "self.version",
"zendframework/zend-loader": "self.version",
"zendframework/zend-mime": "self.version",
- "zendframework/zend-stdlib": "self.version"
+ "zendframework/zend-stdlib": "self.version",
+ "zendframework/zend-validator": "self.version"
+ },
+ "require-dev": {
+ "zendframework/zend-servicemanager": "self.version"
},
"suggest": {
- "zendframework/zend-validator": "Zend\\Validator component",
"zendframework/zend-servicemanager": "Zend\\ServiceManager component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
index 6a0eb120adf..6db40ff15a7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Bcmath.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Bcmath.php
index d3bc289ad0e..65c2fcf7ffa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Bcmath.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Bcmath.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Gmp.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Gmp.php
index 788786abc9c..8084965d6e9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Gmp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/Gmp.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -45,7 +45,9 @@ class Gmp implements AdapterInterface
}
}
+ set_error_handler(function () { /* Do nothing */}, \E_WARNING);
$res = gmp_init($sign . $operand, $base);
+ restore_error_handler();
if ($res === false) {
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/AdapterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/AdapterPluginManager.php
index f86bdb24b40..4f84e1080e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/AdapterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/AdapterPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/BigInteger.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/BigInteger.php
index f633b821f48..7e0c16b8e62 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/BigInteger.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/BigInteger.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php
index 6caaa9b5d4c..d3323257a5d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/DivisionByZeroException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ namespace Zend\Math\BigInteger\Exception;
* Division by zero exception
*/
class DivisionByZeroException extends RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php
index 22625dbe0da..ea758242ae0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use Zend\Math\Exception;
* Invalid argument exception
*/
interface ExceptionInterface extends Exception\ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php
index f5fc36ce8ee..fc9f3352ee0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use Zend\Math\Exception;
* Invalid argument exception
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/RuntimeException.php
index c3f1a2e6f70..954d373420a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use Zend\Math\Exception;
* Runtime exception
*/
class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Math/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Math/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Math/Exception/DomainException.php
index e536f7002e5..881bb60e964 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/Exception/DomainException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ namespace Zend\Math\Exception;
* Invalid argument exception
*/
class DomainException extends \DomainException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Math/Exception/ExceptionInterface.php
index dfe206dea92..d63726403b8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Math\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Math/Exception/InvalidArgumentException.php
index a1d66bd2a82..2c6d76030f8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,4 +14,5 @@ namespace Zend\Math\Exception;
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Math/Exception/RuntimeException.php
index 4e10bab5bc5..d1aca8d9a65 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,4 +14,5 @@ namespace Zend\Math\Exception;
*/
class RuntimeException extends \RuntimeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/Rand.php b/vendor/zendframework/zendframework/library/Zend/Math/Rand.php
index 996a84a6c4e..0ab500f8acc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/Rand.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/Rand.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use RandomLib;
*/
abstract class Rand
{
-
/**
* Alternative random byte generator using RandomLib
*
@@ -34,23 +33,19 @@ abstract class Rand
*/
public static function getBytes($length, $strong = false)
{
+ $length = (int) $length;
+
if ($length <= 0) {
return false;
}
- $bytes = '';
- if (function_exists('openssl_random_pseudo_bytes')
- && (version_compare(PHP_VERSION, '5.3.4') >= 0
- || strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
- ) {
+
+ if (function_exists('openssl_random_pseudo_bytes')) {
$bytes = openssl_random_pseudo_bytes($length, $usable);
if (true === $usable) {
return $bytes;
}
}
- if (function_exists('mcrypt_create_iv')
- && (version_compare(PHP_VERSION, '5.3.7') >= 0
- || strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
- ) {
+ if (function_exists('mcrypt_create_iv')) {
$bytes = mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
if ($bytes !== false && strlen($bytes) === $length) {
return $bytes;
@@ -75,7 +70,7 @@ abstract class Rand
*/
public static function getAlternativeGenerator()
{
- if (!is_null(static::$generator)) {
+ if (null !== static::$generator) {
return static::$generator;
}
if (!class_exists('RandomLib\\Factory')) {
@@ -134,8 +129,9 @@ abstract class Rand
// calculate number of bits required to store range on this machine
$r = $range;
$bits = 0;
- while ($r >>= 1) {
+ while ($r) {
$bits++;
+ $r >>= 1;
}
$bits = (int) max($bits, 1);
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/Source/HashTiming.php b/vendor/zendframework/zendframework/library/Zend/Math/Source/HashTiming.php
index b83c197d457..a50ce43d12f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/Source/HashTiming.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/Source/HashTiming.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Math\Source;
@@ -51,7 +51,6 @@ use SecurityLib\Strength;
*/
class HashTiming implements RandomLib\Source
{
-
/**
* Return an instance of Strength indicating the strength of the source
*
@@ -76,9 +75,8 @@ class HashTiming implements RandomLib\Source
$msec_per_round = 400;
$bits_per_round = 2;
$total = $size;
- $bytes = 0;
$hash_length = 20;
- $rounds = 0;
+
while (strlen($result) < $size) {
$bytes = ($total > $hash_length)? $hash_length : $total;
$total -= $bytes;
@@ -101,7 +99,7 @@ class HashTiming implements RandomLib\Source
$t1 = microtime();
$seed = sha1(mt_rand());
for ($j = 0; $j < $rounds; $j++) {
- $seed = sha1($seed);
+ $seed = sha1($seed);
}
$t2 = microtime();
$entropy .= $t1 . $t2;
@@ -110,5 +108,4 @@ class HashTiming implements RandomLib\Source
}
return substr($result, 0, $size);
}
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/composer.json b/vendor/zendframework/zendframework/library/Zend/Math/composer.json
index 5a0fae22638..d818427e7bd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Math/composer.json
@@ -6,6 +6,7 @@
"zf2",
"math"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Math\\": ""
@@ -13,7 +14,7 @@
},
"target-dir": "Zend/Math",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.23"
},
"suggest": {
"ext-bcmath": "If using the bcmath functionality",
@@ -23,8 +24,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Memory/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Container/AbstractContainer.php b/vendor/zendframework/zendframework/library/Zend/Memory/Container/AbstractContainer.php
index 079bda814fe..e2a7b08124b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Container/AbstractContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Container/AbstractContainer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Container/AccessController.php b/vendor/zendframework/zendframework/library/Zend/Memory/Container/AccessController.php
index 47055611542..08e4095e4fc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Container/AccessController.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Container/AccessController.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -30,7 +30,6 @@ class AccessController implements ContainerInterface
*/
private $memContainer;
-
/**
* Object constructor
*
@@ -49,7 +48,6 @@ class AccessController implements ContainerInterface
$this->memContainer->destroy();
}
-
/**
* Get string value reference
*
@@ -81,7 +79,6 @@ class AccessController implements ContainerInterface
$this->memContainer->lock();
}
-
/**
* Unlock object
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Container/ContainerInterface.php b/vendor/zendframework/zendframework/library/Zend/Memory/Container/ContainerInterface.php
index fd78a581d12..4b8311b429a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Container/ContainerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Container/ContainerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Container/Locked.php b/vendor/zendframework/zendframework/library/Zend/Memory/Container/Locked.php
index 12cf62c71fc..a903139defa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Container/Locked.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Container/Locked.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -23,7 +23,6 @@ class Locked extends AbstractContainer
*/
public $value;
-
/**
* Object constructor
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Container/Movable.php b/vendor/zendframework/zendframework/library/Zend/Memory/Container/Movable.php
index a45e096a2d6..c5d12976255 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Container/Movable.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Container/Movable.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Memory/Exception/ExceptionInterface.php
index 299ceb95321..ad87a42dc80 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Memory\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Memory/Exception/InvalidArgumentException.php
index c35534b00d7..9f9a7675bcf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Memory/Exception/RuntimeException.php
index ecf52c077dd..72e202cc43f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php b/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php
index ab0b8cd11c9..d1d5a077b1b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/MemoryManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -107,7 +107,7 @@ class MemoryManager
/**
* This function is intended to generate unique id, used by memory manager
*/
- private function _generateMemManagerId()
+ private function generateMemManagerId()
{
/**
* @todo !!!
@@ -132,7 +132,7 @@ class MemoryManager
}
$this->cache = $cache;
- $this->_generateMemManagerId();
+ $this->generateMemManagerId();
$memoryLimitStr = trim(ini_get('memory_limit'));
if ($memoryLimitStr != '' && $memoryLimitStr != -1) {
@@ -180,7 +180,7 @@ class MemoryManager
{
$this->memoryLimit = $newLimit;
- $this->_swapCheck();
+ $this->swapCheck();
}
/**
@@ -222,7 +222,7 @@ class MemoryManager
*/
public function create($value = '')
{
- return $this->_create($value, false);
+ return $this->_create($value, false);
}
/**
@@ -255,7 +255,7 @@ class MemoryManager
}
// Commit other objects modifications
- $this->_commit();
+ $this->commit();
$valueObject = new Container\Movable($this, $id, $value);
@@ -322,7 +322,7 @@ class MemoryManager
$this->memorySize -= $this->sizes[$id];
// Commit changes of previously modified object if necessary
- $this->_commit();
+ $this->commit();
$this->lastModified = $container;
}
@@ -330,7 +330,7 @@ class MemoryManager
/**
* Commit modified object and put it back to the loaded objects list
*/
- private function _commit()
+ private function commit()
{
if (($container = $this->lastModified) === null) {
return;
@@ -350,7 +350,7 @@ class MemoryManager
$container->startTrace();
- $this->_swapCheck();
+ $this->swapCheck();
}
/**
@@ -358,7 +358,7 @@ class MemoryManager
*
* @throws Exception\RuntimeException
*/
- private function _swapCheck()
+ private function swapCheck()
{
if ($this->memoryLimit < 0 || $this->memorySize < $this->memoryLimit) {
// Memory limit is not reached
@@ -368,7 +368,7 @@ class MemoryManager
// walk through loaded objects in access history order
foreach ($this->unloadCandidates as $id => $container) {
- $this->_swap($container, $id);
+ $this->swap($container, $id);
unset($this->unloadCandidates[$id]);
if ($this->memorySize < $this->memoryLimit) {
@@ -388,7 +388,7 @@ class MemoryManager
* @param \Zend\Memory\Container\Movable $container
* @param int $id
*/
- private function _swap(Container\Movable $container, $id)
+ private function swap(Container\Movable $container, $id)
{
if ($container->isLocked()) {
return;
@@ -418,7 +418,7 @@ class MemoryManager
// Try to swap other objects if necessary
// (do not include specified object into check)
$this->memorySize += strlen($value);
- $this->_swapCheck();
+ $this->swapCheck();
// Add loaded object to the end of loaded objects list
$container->setValue($value);
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Value.php b/vendor/zendframework/zendframework/library/Zend/Memory/Value.php
index 5615891f865..0c5f1837861 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Value.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/Value.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -132,7 +132,6 @@ class Value implements ArrayAccess, Countable
}
}
-
/**
* To string conversion
*
@@ -143,7 +142,6 @@ class Value implements ArrayAccess, Countable
return $this->value;
}
-
/**
* Get string value reference
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/composer.json b/vendor/zendframework/zendframework/library/Zend/Memory/composer.json
index f0d708c9370..1dd9b832493 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/composer.json
@@ -6,6 +6,7 @@
"zf2",
"memory"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Memory\\": ""
@@ -13,15 +14,18 @@
},
"target-dir": "Zend/Memory",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.23"
+ },
+ "require-dev": {
+ "zendframework/zend-cache": "self.version"
},
"suggest": {
"zendframework/zend-cache": "To support swap the memory objects"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Mime/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php b/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php
index 738b877a2dd..7fbdcfb81fe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mime/Exception/ExceptionInterface.php
index 8611e8442a6..f5ff3c8ebfd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mime\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mime/Exception/RuntimeException.php
index 5dea87b5569..c7b54ee2168 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,6 @@ namespace Zend\Mime\Exception;
/**
* Exception for Zend\Mime component.
*/
-class RuntimeException
- extends \RuntimeException
- implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Message.php b/vendor/zendframework/zendframework/library/Zend/Mime/Message.php
index b32b5261be7..ad97e126db7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Message.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/Message.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Mime;
class Message
{
-
protected $parts = array();
protected $mime = null;
@@ -107,6 +106,9 @@ class Message
public function generateMessage($EOL = Mime::LINEEND)
{
if (!$this->isMultiPart()) {
+ if (empty($this->parts)) {
+ return '';
+ }
$part = current($this->parts);
$body = $part->getContent($EOL);
} else {
@@ -222,7 +224,6 @@ class Message
$res = new static();
foreach ($parts as $part) {
-
// now we build a new MimePart for the current Message Part:
$properties = array();
foreach ($part['header'] as $header) {
@@ -256,7 +257,8 @@ class Message
$properties['language'] = $fieldValue;
break;
default:
- throw new Exception\RuntimeException('Unknown header ignored for MimePart:' . $fieldName);
+ // Ignore unknown header
+ break;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Mime.php b/vendor/zendframework/zendframework/library/Zend/Mime/Mime.php
index 4223aa61f8a..862581eba00 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Mime.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/Mime.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Part.php b/vendor/zendframework/zendframework/library/Zend/Mime/Part.php
index 2fde6ccffce..0271d6f69a4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Part.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/Part.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -28,7 +28,6 @@ class Part
protected $isStream = false;
protected $filters = array();
-
/**
* create a new Mime Part.
* The (unencoded) content of the Part as passed
@@ -60,7 +59,7 @@ class Part
*/
public function isStream()
{
- return $this->isStream;
+ return $this->isStream;
}
/**
@@ -68,7 +67,7 @@ class Part
* reading the content. very useful for large file attachments.
*
* @param string $EOL
- * @return stream
+ * @return resource
* @throws Exception\RuntimeException if not a stream or unable to append filter
*/
public function getEncodedStream($EOL = Mime::LINEEND)
@@ -129,9 +128,14 @@ class Part
public function getContent($EOL = Mime::LINEEND)
{
if ($this->isStream) {
- $encodedStream = $this->getEncodedStream($EOL);
+ $encodedStream = $this->getEncodedStream($EOL);
$encodedStreamContents = stream_get_contents($encodedStream);
- rewind($encodedStream);
+ $streamMetaData = stream_get_meta_data($encodedStream);
+
+ if (isset($streamMetaData['seekable']) && $streamMetaData['seekable']) {
+ rewind($encodedStream);
+ }
+
return $encodedStreamContents;
}
return Mime::encode($this->content, $this->encoding, $EOL);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/composer.json b/vendor/zendframework/zendframework/library/Zend/Mime/composer.json
index b7d0c15379c..bbbe5fea474 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/composer.json
@@ -6,6 +6,7 @@
"zf2",
"mime"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Mime\\": ""
@@ -13,13 +14,19 @@
},
"target-dir": "Zend/Mime",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-mail": "self.version"
+ },
+ "suggest": {
+ "zendframework/zend-mail": "Zend\\Mail component"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/ModuleManager/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/ExceptionInterface.php
index f673f1666d2..3e784eedebe 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/InvalidArgumentException.php
index 2616bdcc36f..0c2752dd119 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/MissingDependencyModuleException.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/MissingDependencyModuleException.php
index add17e8c966..a28373b92ec 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/MissingDependencyModuleException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/MissingDependencyModuleException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/RuntimeException.php
index 358f55530cc..d01e905eabf 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php
index 894ebd40e0a..bb72b389270 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/AutoloaderProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php
index e898d61efa6..5e2ee294dc8 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/BootstrapListenerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php
index 259cb639470..0829e652362 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConsoleBannerProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConsoleBannerProviderInterface.php
index f1989ab1bd9..3ec2ebd6939 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConsoleBannerProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConsoleBannerProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConsoleUsageProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConsoleUsageProviderInterface.php
index 610c75800e0..ebc43344ef5 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConsoleUsageProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConsoleUsageProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php
index 1202d10b69a..e1270ae0028 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ControllerPluginProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php
index ccb18c6ba4a..1ff1bd3d081 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ControllerProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/DependencyIndicatorInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/DependencyIndicatorInterface.php
index 0f851887c14..c68d1e68637 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/DependencyIndicatorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/DependencyIndicatorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/FilterProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/FilterProviderInterface.php
index be1305ee3ce..5b4639a6c27 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/FilterProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/FilterProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/FormElementProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/FormElementProviderInterface.php
index 364b228d5ff..6f97818af43 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/FormElementProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/FormElementProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/HydratorProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/HydratorProviderInterface.php
index 628e5f23dda..935e1a5deaa 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/HydratorProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/HydratorProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/InitProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/InitProviderInterface.php
index 61c8da6a2a7..f04c3eb16f4 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/InitProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/InitProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php
index 5074829fa02..d84caee6833 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/InputFilterProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php
index 5a85affce77..d4578b67df9 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LocatorRegisteredInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php
new file mode 100644
index 00000000000..4e15d81c2a2
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LogProcessorProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+interface LogProcessorProviderInterface
+{
+ /**
+ * Expected to return \Zend\ServiceManager\Config object or array to
+ * seed such an object.
+ *
+ * @return array|\Zend\ServiceManager\Config
+ */
+ public function getLogProcessorConfig();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php
new file mode 100644
index 00000000000..a81ad545961
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/LogWriterProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\ModuleManager\Feature;
+
+interface LogWriterProviderInterface
+{
+ /**
+ * Expected to return \Zend\ServiceManager\Config object or array to
+ * seed such an object.
+ *
+ * @return array|\Zend\ServiceManager\Config
+ */
+ public function getLogWriterConfig();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/RouteProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/RouteProviderInterface.php
index 95dbaf9aae9..af5bcf8ebed 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/RouteProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/RouteProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/SerializerProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/SerializerProviderInterface.php
index 94e7885369c..481c28b3481 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/SerializerProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/SerializerProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php
index 91f1f9b4a37..7fcf922da87 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ServiceProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ValidatorProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ValidatorProviderInterface.php
index a79cae03d8f..fa6c8530af3 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ValidatorProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ValidatorProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php
index d7356acc9de..ed5d5b53c7d 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ViewHelperProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/AbstractListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/AbstractListener.php
index 791b7011d1b..cc7636e2dfb 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/AbstractListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/AbstractListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/AutoloaderListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/AutoloaderListener.php
index 60d05a1771f..8c35d888553 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/AutoloaderListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/AutoloaderListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,6 @@ use Zend\ModuleManager\ModuleEvent;
*/
class AutoloaderListener extends AbstractListener
{
-
/**
* @param ModuleEvent $e
* @return void
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigListener.php
index bdd6fbe4973..5646350d51b 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -89,8 +89,8 @@ class ConfigListener extends AbstractListener implements
}
$this->callbacks[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULE, array($this, 'onLoadModule'));
- $this->callbacks[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULES, array($this, 'onLoadModulesPost'), -1000);
-
+ $this->callbacks[] = $events->attach(ModuleEvent::EVENT_LOAD_MODULES, array($this, 'onLoadModules'), -1000);
+ $this->callbacks[] = $events->attach(ModuleEvent::EVENT_MERGE_CONFIG, array($this, 'onMergeConfig'), 1000);
return $this;
}
@@ -137,7 +137,7 @@ class ConfigListener extends AbstractListener implements
* @param ModuleEvent $e
* @return ConfigListener
*/
- public function onLoadModulesPost(ModuleEvent $e)
+ public function onMergeConfig(ModuleEvent $e)
{
// Load the config files
foreach ($this->paths as $path) {
@@ -150,6 +150,23 @@ class ConfigListener extends AbstractListener implements
$this->mergedConfig = ArrayUtils::merge($this->mergedConfig, $config);
}
+ return $this;
+ }
+
+ /**
+ * Optionally cache merged config
+ *
+ * This is only attached if config is not cached.
+ *
+ * @param ModuleEvent $e
+ * @return ConfigListener
+ */
+ public function onLoadModules(ModuleEvent $e)
+ {
+ // Trigger MERGE_CONFIG event. This is a hook to allow the merged application config to be
+ // modified before it is cached (In particular, allows the removal of config keys)
+ $e->getTarget()->getEventManager()->trigger(ModuleEvent::EVENT_MERGE_CONFIG, $e->getTarget(), $e);
+
// If enabled, update the config cache
if (
$this->getOptions()->getConfigCacheEnabled()
@@ -269,10 +286,14 @@ class ConfigListener extends AbstractListener implements
if (!is_array($paths)) {
throw new Exception\InvalidArgumentException(
- sprintf('Argument passed to %::%s() must be an array, '
- . 'implement the Traversable interface, or be an '
- . 'instance of Zend\Config\Config. %s given.',
- __CLASS__, __METHOD__, gettype($paths))
+ sprintf(
+ 'Argument passed to %::%s() must be an array, '
+ . 'implement the Traversable interface, or be an '
+ . 'instance of Zend\Config\Config. %s given.',
+ __CLASS__,
+ __METHOD__,
+ gettype($paths)
+ )
);
}
@@ -293,8 +314,12 @@ class ConfigListener extends AbstractListener implements
{
if (!is_string($path)) {
throw new Exception\InvalidArgumentException(
- sprintf('Parameter to %s::%s() must be a string; %s given.',
- __CLASS__, __METHOD__, gettype($path))
+ sprintf(
+ 'Parameter to %s::%s() must be a string; %s given.',
+ __CLASS__,
+ __METHOD__,
+ gettype($path)
+ )
);
}
$this->paths[] = array('type' => $type, 'path' => $path);
@@ -315,9 +340,12 @@ class ConfigListener extends AbstractListener implements
if (!is_array($config)) {
throw new Exception\InvalidArgumentException(
- sprintf('Config being merged must be an array, '
- . 'implement the Traversable interface, or be an '
- . 'instance of Zend\Config\Config. %s given.', gettype($config))
+ sprintf(
+ 'Config being merged must be an array, '
+ . 'implement the Traversable interface, or be an '
+ . 'instance of Zend\Config\Config. %s given.',
+ gettype($config)
+ )
);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php
index 9b86a4f9f02..1b6eb7662c8 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php
index dae7d5eaed8..3eaedca5f19 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php
index f52be43d085..e988e4f38c8 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php
index 94d597eb712..e8c82cd0a5f 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php
index b5a2710e7f6..9234a3ccfae 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/InitTrigger.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/InitTrigger.php
index 884961f88c2..4487b2e5dbb 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/InitTrigger.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/InitTrigger.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ListenerOptions.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ListenerOptions.php
index a32206cdafb..4901562cd6a 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ListenerOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ListenerOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -88,10 +88,14 @@ class ListenerOptions extends AbstractOptions
{
if (!is_array($modulePaths) && !$modulePaths instanceof Traversable) {
throw new Exception\InvalidArgumentException(
- sprintf('Argument passed to %s::%s() must be an array, '
- . 'implement the Traversable interface, or be an '
- . 'instance of Zend\Config\Config. %s given.',
- __CLASS__, __METHOD__, gettype($modulePaths))
+ sprintf(
+ 'Argument passed to %s::%s() must be an array, '
+ . 'implement the Traversable interface, or be an '
+ . 'instance of Zend\Config\Config. %s given.',
+ __CLASS__,
+ __METHOD__,
+ gettype($modulePaths)
+ )
);
}
@@ -130,10 +134,14 @@ class ListenerOptions extends AbstractOptions
{
if (!is_array($configGlobPaths) && !$configGlobPaths instanceof Traversable) {
throw new Exception\InvalidArgumentException(
- sprintf('Argument passed to %s::%s() must be an array, '
- . 'implement the Traversable interface, or be an '
- . 'instance of Zend\Config\Config. %s given.',
- __CLASS__, __METHOD__, gettype($configGlobPaths))
+ sprintf(
+ 'Argument passed to %s::%s() must be an array, '
+ . 'implement the Traversable interface, or be an '
+ . 'instance of Zend\Config\Config. %s given.',
+ __CLASS__,
+ __METHOD__,
+ gettype($configGlobPaths)
+ )
);
}
@@ -152,10 +160,14 @@ class ListenerOptions extends AbstractOptions
{
if (!is_array($configStaticPaths) && !$configStaticPaths instanceof Traversable) {
throw new Exception\InvalidArgumentException(
- sprintf('Argument passed to %s::%s() must be an array, '
- . 'implement the Traversable interface, or be an '
- . 'instance of Zend\Config\Config. %s given.',
- __CLASS__, __METHOD__, gettype($configStaticPaths))
+ sprintf(
+ 'Argument passed to %s::%s() must be an array, '
+ . 'implement the Traversable interface, or be an '
+ . 'instance of Zend\Config\Config. %s given.',
+ __CLASS__,
+ __METHOD__,
+ gettype($configStaticPaths)
+ )
);
}
@@ -185,10 +197,14 @@ class ListenerOptions extends AbstractOptions
{
if (!is_array($extraConfig) && !$extraConfig instanceof Traversable) {
throw new Exception\InvalidArgumentException(
- sprintf('Argument passed to %s::%s() must be an array, '
- . 'implement the Traversable interface, or be an '
- . 'instance of Zend\Config\Config. %s given.',
- __CLASS__, __METHOD__, gettype($extraConfig))
+ sprintf(
+ 'Argument passed to %s::%s() must be an array, '
+ . 'implement the Traversable interface, or be an '
+ . 'instance of Zend\Config\Config. %s given.',
+ __CLASS__,
+ __METHOD__,
+ gettype($extraConfig)
+ )
);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
index b3bc1410698..19fac01179d 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,7 @@ use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\ListenerAggregateInterface;
use Zend\ModuleManager\Feature\LocatorRegisteredInterface;
use Zend\ModuleManager\ModuleEvent;
-use Zend\Mvc\MvcEvent;
+use Zend\ModuleManager\ModuleManager;
/**
* Locator registration listener
@@ -67,7 +67,7 @@ class LocatorRegistrationListener extends AbstractListener implements
}
// Shared instance for module manager
- $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_BOOTSTRAP, function ($e) use ($moduleManager) {
+ $events->attach('Zend\Mvc\Application', ModuleManager::EVENT_BOOTSTRAP, function ($e) use ($moduleManager) {
$moduleClassName = get_class($moduleManager);
$moduleClassNameArray = explode('\\', $moduleClassName);
$moduleClassNameAlias = end($moduleClassNameArray);
@@ -83,7 +83,7 @@ class LocatorRegistrationListener extends AbstractListener implements
}
// Attach to the bootstrap event if there are modules we need to process
- $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_BOOTSTRAP, array($this, 'onBootstrap'), 1000);
+ $events->attach('Zend\Mvc\Application', ModuleManager::EVENT_BOOTSTRAP, array($this, 'onBootstrap'), 1000);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleDependencyCheckerListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleDependencyCheckerListener.php
index 636ba92d07b..fcb766440a8 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleDependencyCheckerListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleDependencyCheckerListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
index 9e8bdf5686a..b4ea9509fa5 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleResolverListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleResolverListener.php
index 6e841155ff9..bf8543f269c 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleResolverListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleResolverListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/OnBootstrapListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/OnBootstrapListener.php
index 332dd94fd7b..434792c74f6 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/OnBootstrapListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/OnBootstrapListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,14 +11,13 @@ namespace Zend\ModuleManager\Listener;
use Zend\ModuleManager\Feature\BootstrapListenerInterface;
use Zend\ModuleManager\ModuleEvent;
-use Zend\Mvc\MvcEvent;
+use Zend\ModuleManager\ModuleManager;
/**
* Autoloader listener
*/
class OnBootstrapListener extends AbstractListener
{
-
/**
* @param ModuleEvent $e
* @return void
@@ -35,6 +34,6 @@ class OnBootstrapListener extends AbstractListener
$moduleManager = $e->getTarget();
$events = $moduleManager->getEventManager();
$sharedEvents = $events->getSharedManager();
- $sharedEvents->attach('Zend\Mvc\Application', MvcEvent::EVENT_BOOTSTRAP, array($module, 'onBootstrap'));
+ $sharedEvents->attach('Zend\Mvc\Application', ModuleManager::EVENT_BOOTSTRAP, array($module, 'onBootstrap'));
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ServiceListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ServiceListener.php
index 973778cea3b..252d84c0a1d 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ServiceListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ServiceListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -144,7 +144,6 @@ class ServiceListener implements ServiceListenerInterface
$module = $e->getModule();
foreach ($this->serviceManagers as $key => $sm) {
-
if (!$module instanceof $sm['module_class_interface']
&& !method_exists($module, $sm['module_class_method'])
) {
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ServiceListenerInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ServiceListenerInterface.php
index 3de7660f175..9cfe4018ca0 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ServiceListenerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ServiceListenerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleEvent.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleEvent.php
index 0f83266ae21..a4b2783b624 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleEvent.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleEvent.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -20,11 +20,11 @@ class ModuleEvent extends Event
/**
* Module events triggered by eventmanager
*/
- CONST EVENT_MERGE_CONFIG = 'mergeConfig';
- CONST EVENT_LOAD_MODULES = 'loadModules';
- CONST EVENT_LOAD_MODULE_RESOLVE = 'loadModule.resolve';
- CONST EVENT_LOAD_MODULE = 'loadModule';
- CONST EVENT_LOAD_MODULES_POST = 'loadModules.post';
+ const EVENT_MERGE_CONFIG = 'mergeConfig';
+ const EVENT_LOAD_MODULES = 'loadModules';
+ const EVENT_LOAD_MODULE_RESOLVE = 'loadModule.resolve';
+ const EVENT_LOAD_MODULE = 'loadModule';
+ const EVENT_LOAD_MODULES_POST = 'loadModules.post';
/**
* @var mixed
@@ -61,10 +61,13 @@ class ModuleEvent extends Event
public function setModuleName($moduleName)
{
if (!is_string($moduleName)) {
- throw new Exception\InvalidArgumentException(sprintf(
- '%s expects a string as an argument; %s provided'
- ,__METHOD__, gettype($moduleName)
- ));
+ throw new Exception\InvalidArgumentException(
+ sprintf(
+ '%s expects a string as an argument; %s provided',
+ __METHOD__,
+ gettype($moduleName)
+ )
+ );
}
// Performance tweak, don't add it as param.
$this->moduleName = $moduleName;
@@ -92,10 +95,13 @@ class ModuleEvent extends Event
public function setModule($module)
{
if (!is_object($module)) {
- throw new Exception\InvalidArgumentException(sprintf(
- '%s expects a module object as an argument; %s provided'
- ,__METHOD__, gettype($module)
- ));
+ throw new Exception\InvalidArgumentException(
+ sprintf(
+ '%s expects a module object as an argument; %s provided',
+ __METHOD__,
+ gettype($module)
+ )
+ );
}
// Performance tweak, don't add it as param.
$this->module = $module;
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManager.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManager.php
index 865b9876527..7823052cfd4 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,6 +18,12 @@ use Zend\EventManager\EventManagerInterface;
*/
class ModuleManager implements ModuleManagerInterface
{
+ /**#@+
+ * Reference to Zend\Mvc\MvcEvent::EVENT_BOOTSTRAP
+ */
+ const EVENT_BOOTSTRAP = 'bootstrap';
+ /**#@-*/
+
/**
* @var array An array of Module classes of loaded modules
*/
@@ -140,10 +146,24 @@ class ModuleManager implements ModuleManagerInterface
return $this->loadedModules[$moduleName];
}
- $event = ($this->loadFinished === false) ? clone $this->getEvent() : $this->getEvent();
+ /*
+ * Keep track of nested module loading using the $loadFinished
+ * property.
+ *
+ * Increment the value for each loadModule() call and then decrement
+ * once the loading process is complete.
+ *
+ * To load a module, we clone the event if we are inside a nested
+ * loadModule() call, and use the original event otherwise.
+ */
+ if (!isset($this->loadFinished)) {
+ $this->loadFinished = 0;
+ }
+
+ $event = ($this->loadFinished > 0) ? clone $this->getEvent() : $this->getEvent();
$event->setModuleName($moduleName);
- $this->loadFinished = false;
+ $this->loadFinished++;
if (!is_object($module)) {
$module = $this->loadModuleByName($event);
@@ -153,14 +173,14 @@ class ModuleManager implements ModuleManagerInterface
$this->loadedModules[$moduleName] = $module;
$this->getEventManager()->trigger(ModuleEvent::EVENT_LOAD_MODULE, $this, $event);
- $this->loadFinished = true;
+ $this->loadFinished--;
return $module;
}
/**
* Load a module with the name
- * @param Zend\EventManager\EventInterface $event
+ * @param \Zend\EventManager\EventInterface $event
* @return mixed module instance
* @throws Exception\RuntimeException
*/
@@ -232,10 +252,13 @@ class ModuleManager implements ModuleManagerInterface
if (is_array($modules) || $modules instanceof Traversable) {
$this->modules = $modules;
} else {
- throw new Exception\InvalidArgumentException(sprintf(
- 'Parameter to %s\'s %s method must be an array or implement the Traversable interface',
- __CLASS__, __METHOD__
- ));
+ throw new Exception\InvalidArgumentException(
+ sprintf(
+ 'Parameter to %s\'s %s method must be an array or implement the Traversable interface',
+ __CLASS__,
+ __METHOD__
+ )
+ );
}
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManagerInterface.php
index 8d38187264f..92454c033b2 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManagerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManagerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/composer.json b/vendor/zendframework/zendframework/library/Zend/ModuleManager/composer.json
index 40ad41ab7cb..0e7bc7c5cf6 100644
--- a/vendor/zendframework/zendframework/library/Zend/ModuleManager/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/ModuleManager/composer.json
@@ -6,6 +6,7 @@
"zf2",
"modulemanager"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\ModuleManager\\": ""
@@ -13,19 +14,27 @@
},
"target-dir": "Zend/ModuleManager",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-eventmanager": "self.version",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-config": "self.version",
+ "zendframework/zend-console": "self.version",
+ "zendframework/zend-loader": "self.version",
+ "zendframework/zend-servicemanager": "self.version"
+ },
"suggest": {
"zendframework/zend-config": "Zend\\Config component",
+ "zendframework/zend-console": "Zend\\Console component",
"zendframework/zend-loader": "Zend\\Loader component",
+ "zendframework/zend-mvc": "Zend\\Mvc component",
"zendframework/zend-servicemanager": "Zend\\ServiceManager component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Application.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Application.php
index 02ca3d9e542..d4d8f02ee9f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Application.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Application.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -148,8 +148,8 @@ class Application implements
$this->event = $event = new MvcEvent();
$event->setTarget($this);
$event->setApplication($this)
- ->setRequest($this->getRequest())
- ->setResponse($this->getResponse())
+ ->setRequest($this->request)
+ ->setResponse($this->response)
->setRouter($serviceManager->get('Router'));
// Trigger bootstrap events
@@ -247,10 +247,16 @@ class Application implements
public static function init($configuration = array())
{
$smConfig = isset($configuration['service_manager']) ? $configuration['service_manager'] : array();
- $listeners = isset($configuration['listeners']) ? $configuration['listeners'] : array();
$serviceManager = new ServiceManager(new Service\ServiceManagerConfig($smConfig));
$serviceManager->setService('ApplicationConfig', $configuration);
$serviceManager->get('ModuleManager')->loadModules();
+
+ $listenersFromAppConfig = isset($configuration['listeners']) ? $configuration['listeners'] : array();
+ $config = $serviceManager->get('Config');
+ $listenersFromConfigService = isset($config['listeners']) ? $config['listeners'] : array();
+
+ $listeners = array_unique(array_merge($listenersFromConfigService, $listenersFromAppConfig));
+
return $serviceManager->get('Application')->bootstrap($listeners);
}
@@ -268,12 +274,12 @@ class Application implements
* discovered controller, and controller class (if known).
* Typically, a handler should return a populated Response object
* that can be returned immediately.
- * @return ResponseInterface
+ * @return self
*/
public function run()
{
- $events = $this->getEventManager();
- $event = $this->getMvcEvent();
+ $events = $this->events;
+ $event = $this->event;
// Define callback used to determine whether or not to short-circuit
$shortCircuit = function ($r) use ($event) {
@@ -294,13 +300,11 @@ class Application implements
$event->setTarget($this);
$event->setResponse($response);
$events->trigger(MvcEvent::EVENT_FINISH, $event);
- return $response;
+ $this->response = $response;
+ return $this;
}
- if ($event->getError()) {
- return $this->completeRequest($event);
- }
- return $event->getResponse();
}
+
if ($event->getError()) {
return $this->completeRequest($event);
}
@@ -314,10 +318,11 @@ class Application implements
$event->setTarget($this);
$event->setResponse($response);
$events->trigger(MvcEvent::EVENT_FINISH, $event);
- return $response;
+ $this->response = $response;
+ return $this;
}
- $response = $this->getResponse();
+ $response = $this->response;
$event->setResponse($response);
$this->completeRequest($event);
@@ -342,7 +347,7 @@ class Application implements
*/
protected function completeRequest(MvcEvent $event)
{
- $events = $this->getEventManager();
+ $events = $this->events;
$event->setTarget($this);
$events->trigger(MvcEvent::EVENT_RENDER, $event);
$events->trigger(MvcEvent::EVENT_FINISH, $event);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ApplicationInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ApplicationInterface.php
index d259a6ed880..51bd7eec018 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ApplicationInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ApplicationInterface.php
@@ -3,15 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc;
use Zend\EventManager\EventsCapableInterface;
-use Zend\Http\Request;
-use Zend\Http\Response;
interface ApplicationInterface extends EventsCapableInterface
{
@@ -39,7 +37,7 @@ interface ApplicationInterface extends EventsCapableInterface
/**
* Run the application
*
- * @return Response
+ * @return self
*/
public function run();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Mvc/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractActionController.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractActionController.php
index f933b83ed24..f0cfb03fe34 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractActionController.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractActionController.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractConsoleController.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractConsoleController.php
new file mode 100644
index 00000000000..42eb361a0fb
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractConsoleController.php
@@ -0,0 +1,57 @@
+<?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\Mvc\Controller;
+
+use Zend\Console\Adapter\AdapterInterface as ConsoleAdapter;
+use Zend\Console\Request as ConsoleRequest;
+use Zend\Mvc\Exception\InvalidArgumentException;
+use Zend\Stdlib\RequestInterface;
+use Zend\Stdlib\ResponseInterface;
+
+class AbstractConsoleController extends AbstractActionController
+{
+ /**
+ * @var ConsoleAdapter
+ */
+ protected $console;
+
+ /**
+ * @param ConsoleAdapter $console
+ * @return self
+ */
+ public function setConsole(ConsoleAdapter $console)
+ {
+ $this->console = $console;
+
+ return $this;
+ }
+
+ /**
+ * @return ConsoleAdapter
+ */
+ public function getConsole()
+ {
+ return $this->console;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function dispatch(RequestInterface $request, ResponseInterface $response = null)
+ {
+ if (! $request instanceof ConsoleRequest) {
+ throw new InvalidArgumentException(sprintf(
+ '%s can only dispatch requests in a console environment',
+ get_called_class()
+ ));
+ }
+ return parent::dispatch($request, $response);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractController.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractController.php
index d29ee7dc5e0..a3616d9379e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractController.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractController.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -90,7 +90,6 @@ abstract class AbstractController implements
*/
abstract public function onDispatch(MvcEvent $e);
-
/**
* Dispatch a request
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
index 0d3517eccfc..75850cb7323 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Controller;
@@ -20,7 +20,6 @@ use Zend\Stdlib\ResponseInterface as Response;
*/
abstract class AbstractRestfulController extends AbstractController
{
-
const CONTENT_TYPE_JSON = 'json';
/**
@@ -201,6 +200,7 @@ abstract class AbstractRestfulController extends AbstractController
*
* @param $id
* @param $data
+ * @return array
*/
public function patch($id, $data)
{
@@ -230,7 +230,7 @@ abstract class AbstractRestfulController extends AbstractController
}
/**
- * Modify a resource collection withou completely replacing it
+ * Modify a resource collection without completely replacing it
*
* Not marked as abstract, as that would introduce a BC break
* (introduced in 2.2.0); instead, raises an exception if not implemented.
@@ -374,8 +374,8 @@ abstract class AbstractRestfulController extends AbstractController
$id = null;
}
$action = 'head';
- $this->head($id);
- $response = $e->getResponse();
+ $headResult = $this->head($id);
+ $response = ($headResult instanceof Response) ? clone $headResult : $e->getResponse();
$response->setContent('');
$return = $response;
break;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/ControllerManager.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/ControllerManager.php
index ff142a12cec..97f428dbfcb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/ControllerManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/ControllerManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -80,6 +80,10 @@ class ControllerManager extends AbstractPluginManager
}
}
+ if ($controller instanceof AbstractConsoleController) {
+ $controller->setConsole($parentLocator->get('Console'));
+ }
+
if (method_exists($controller, 'setPluginManager')) {
$controller->setPluginManager($parentLocator->get('ControllerPluginManager'));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
index 6c6e3ae4745..7f74dfb3f74 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php
index fffab0ed7fc..582c4531317 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AcceptableViewModelSelector.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
index 9250ad78366..df54816bc75 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FilePostRedirectGet.php
@@ -4,7 +4,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -126,7 +126,6 @@ class FilePostRedirectGet extends AbstractPlugin
$post = $container->post;
$errors = $container->errors;
$isValid = $container->isValid;
- $previousFiles = ($container->files) ?: array();
unset($container->post);
unset($container->errors);
unset($container->isValid);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
index 6ddee2dd7eb..9799119d9c4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -190,7 +190,6 @@ class FlashMessenger extends AbstractPlugin implements IteratorAggregate, Counta
$this->setNamespace($namespace);
return $this;
-
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Forward.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Forward.php
index 2b1b65e467e..264ddb6c60b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Forward.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Forward.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -39,7 +39,7 @@ class Forward extends AbstractPlugin
protected $numNestedForwards = 0;
/**
- * @var array
+ * @var array[]|null
*/
protected $listenersToDetach = null;
@@ -55,11 +55,12 @@ class Forward extends AbstractPlugin
* Set maximum number of nested forwards allowed
*
* @param int $maxNestedForwards
- * @return Forward
+ * @return self
*/
public function setMaxNestedForwards($maxNestedForwards)
{
$this->maxNestedForwards = (int) $maxNestedForwards;
+
return $this;
}
@@ -94,11 +95,14 @@ class Forward extends AbstractPlugin
* Set information on listeners that need to be detached before dispatching.
*
* @param array $listeners Listener information; see getListenersToDetach() for details on format.
- * @return void
+ *
+ * @return self
*/
public function setListenersToDetach($listeners)
{
$this->listenersToDetach = $listeners;
+
+ return $this;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Identity.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Identity.php
index 5c30d699d63..98618e6d580 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Identity.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Identity.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Layout.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Layout.php
index ccdd2f2179f..149630984d8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Layout.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Layout.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Params.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Params.php
index 7642b05fff3..7f28188009b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Params.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Params.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PluginInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PluginInterface.php
index ba4d7378a72..f4b28d00982 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PluginInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PluginInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
index a2b67efa751..de74783c142 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
@@ -4,7 +4,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -52,7 +52,7 @@ class PostRedirectGet extends AbstractPlugin
$container->post = $request->getPost()->toArray();
return $this->redirect($redirect, $redirectToUrl);
} else {
- if ($container->post !== null) {
+ if (null !== $container->post) {
$post = $container->post;
unset($container->post);
return $post;
@@ -114,14 +114,14 @@ class PostRedirectGet extends AbstractPlugin
* If the user wants to redirect to a route, the redirector has to come
* from the plugin manager -- otherwise no router will be injected
*/
- if ($redirectToUrl === false) {
+ if (false === $redirectToUrl) {
throw new RuntimeException('Could not redirect to a route without a router');
}
$redirector = new Redirect();
}
- if ($redirectToUrl === false) {
+ if (false === $redirectToUrl) {
$response = $redirector->toRoute($redirect, $params, $options, $reuseMatchedParams);
$response->setStatusCode(303);
return $response;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Redirect.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Redirect.php
index 10eb029f40f..471f5b561eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Redirect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Redirect.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php
index ff47bfe8112..1f114ac57a7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/ForwardFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -20,7 +20,7 @@ class ForwardFactory implements FactoryInterface
* {@inheritDoc}
*
* @return Forward
- * @throws ServiceNotCreatedException if ControllerLoader service is not found in application service locator
+ * @throws ServiceNotCreatedException if Controllermanager service is not found in application service locator
*/
public function createService(ServiceLocatorInterface $plugins)
{
@@ -32,14 +32,14 @@ class ForwardFactory implements FactoryInterface
));
}
- if (!$services->has('ControllerLoader')) {
+ if (!$services->has('ControllerManager')) {
throw new ServiceNotCreatedException(sprintf(
'%s requires that the application service manager contains a "%s" service; none found',
__CLASS__,
- 'ControllerLoader'
+ 'ControllerManager'
));
}
- $controllers = $services->get('ControllerLoader');
+ $controllers = $services->get('ControllerManager');
return new Forward($controllers);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php
index a59c6a624ca..701b3ddd793 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Url.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Url.php
index 4eb313517da..583023e29ae 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Url.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Url.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/PluginManager.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/PluginManager.php
index ec53bb0c1ab..6d96cf09617 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/PluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/PluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/DispatchListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/DispatchListener.php
index e27fc8cfd91..a2756242220 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/DispatchListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/DispatchListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,11 +15,10 @@ use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\Exception\InvalidControllerException;
use Zend\Stdlib\ArrayUtils;
-
/**
* Default dispatch listener
*
- * Pulls controllers from the service manager's "ControllerLoader" service.
+ * Pulls controllers from the service manager's "ControllerManager" service.
*
* If the controller cannot be found a "404" result is set up. Otherwise it
* will continue to try to load the controller.
@@ -86,20 +85,20 @@ class DispatchListener implements ListenerAggregateInterface
$controllerName = $routeMatch->getParam('controller', 'not-found');
$application = $e->getApplication();
$events = $application->getEventManager();
- $controllerLoader = $application->getServiceManager()->get('ControllerLoader');
+ $controllerLoader = $application->getServiceManager()->get('ControllerManager');
if (!$controllerLoader->has($controllerName)) {
- $return = $this->marshallControllerNotFoundEvent($application::ERROR_CONTROLLER_NOT_FOUND, $controllerName, $e, $application);
+ $return = $this->marshalControllerNotFoundEvent($application::ERROR_CONTROLLER_NOT_FOUND, $controllerName, $e, $application);
return $this->complete($return, $e);
}
try {
$controller = $controllerLoader->get($controllerName);
} catch (InvalidControllerException $exception) {
- $return = $this->marshallControllerNotFoundEvent($application::ERROR_CONTROLLER_INVALID, $controllerName, $e, $application, $exception);
+ $return = $this->marshalControllerNotFoundEvent($application::ERROR_CONTROLLER_INVALID, $controllerName, $e, $application, $exception);
return $this->complete($return, $e);
} catch (\Exception $exception) {
- $return = $this->marshallBadControllerEvent($controllerName, $e, $application, $exception);
+ $return = $this->marshalBadControllerEvent($controllerName, $e, $application, $exception);
return $this->complete($return, $e);
}
@@ -158,7 +157,7 @@ class DispatchListener implements ListenerAggregateInterface
}
/**
- * Marshall a controller not found exception event
+ * Marshal a controller not found exception event
*
* @param string $type
* @param string $controllerName
@@ -167,7 +166,7 @@ class DispatchListener implements ListenerAggregateInterface
* @param \Exception $exception
* @return mixed
*/
- protected function marshallControllerNotFoundEvent(
+ protected function marshalControllerNotFoundEvent(
$type,
$controllerName,
MvcEvent $event,
@@ -191,7 +190,34 @@ class DispatchListener implements ListenerAggregateInterface
}
/**
- * Marshall a bad controller exception event
+ * Marshal a controller not found exception event
+ *
+ * @deprecated Use marshalControllerNotFoundEvent() instead
+ * @param string $type
+ * @param string $controllerName
+ * @param MvcEvent $event
+ * @param Application $application
+ * @param \Exception $exception
+ * @return mixed
+ */
+ protected function marshallControllerNotFoundEvent(
+ $type,
+ $controllerName,
+ MvcEvent $event,
+ Application $application,
+ \Exception $exception = null
+ ) {
+ trigger_error(sprintf(
+ '%s is deprecated; please use %s::marshalControllerNotFoundEvent instead',
+ __METHOD__,
+ __CLASS__
+ ), E_USER_DEPRECATED);
+
+ return $this->marshalControllerNotFoundEvent($type, $controllerName, $event, $application, $exception);
+ }
+
+ /**
+ * Marshal a bad controller exception event
*
* @param string $controllerName
* @param MvcEvent $event
@@ -199,7 +225,7 @@ class DispatchListener implements ListenerAggregateInterface
* @param \Exception $exception
* @return mixed
*/
- protected function marshallBadControllerEvent(
+ protected function marshalBadControllerEvent(
$controllerName,
MvcEvent $event,
Application $application,
@@ -213,7 +239,7 @@ class DispatchListener implements ListenerAggregateInterface
$results = $events->trigger(MvcEvent::EVENT_DISPATCH_ERROR, $event);
$return = $results->last();
if (! $return) {
- $return = $event->getResult();
+ return $event->getResult();
}
return $return;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/BadMethodCallException.php
new file mode 100644
index 00000000000..cb01a8a5e3c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/BadMethodCallException.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Exception;
+
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/DomainException.php
index fdf8dbf1391..7490b6465ad 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/DomainException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/ExceptionInterface.php
index 8fd5cd55288..abdd7a32be5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidArgumentException.php
index cc81ee999e7..fbd05f591d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidControllerException.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidControllerException.php
index 83e484b8d7d..166f1fcdb7e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidControllerException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidControllerException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidPluginException.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidPluginException.php
index 4961c9ce73a..05abc5da43e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidPluginException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/InvalidPluginException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/MissingLocatorException.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/MissingLocatorException.php
index e741a16a01c..220c01e4f61 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/MissingLocatorException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/MissingLocatorException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/RuntimeException.php
index cabf55da84b..a959ed7ff38 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/DummyTranslator.php b/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/DummyTranslator.php
new file mode 100644
index 00000000000..62019817594
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/DummyTranslator.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\I18n;
+
+use Zend\I18n\Translator\TranslatorInterface as I18nTranslatorInterface;
+
+class DummyTranslator implements I18nTranslatorInterface
+{
+ public function translate($message, $textDomain = 'default', $locale = null)
+ {
+ return $message;
+ }
+
+ public function translatePlural($singular, $plural, $number, $textDomain = 'default', $locale = null)
+ {
+ return ($number == 1 ? $singular : $plural);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/Translator.php b/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/Translator.php
index ac7f2944a3a..032dbed1ae2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/Translator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/Translator.php
@@ -3,15 +3,88 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\I18n;
-use Zend\I18n\Translator\Translator as I18nTranslator;
+use Zend\I18n\Translator\TranslatorInterface as I18nTranslatorInterface;
+use Zend\Mvc\Exception;
use Zend\Validator\Translator\TranslatorInterface as ValidatorTranslatorInterface;
-class Translator extends I18nTranslator implements ValidatorTranslatorInterface
+class Translator implements
+ I18nTranslatorInterface,
+ ValidatorTranslatorInterface
{
+ /**
+ * @var I18nTranslatorInterface
+ */
+ protected $translator;
+
+ /**
+ * @param I18nTranslatorInterface $translator
+ */
+ public function __construct(I18nTranslatorInterface $translator)
+ {
+ $this->translator = $translator;
+ }
+
+ /**
+ * Proxy unknown method calls to underlying translator instance
+ *
+ * Note: this method is only implemented to keep backwards compatibility
+ * with pre-2.3.0 code.
+ *
+ * @deprecated
+ * @param string $method
+ * @param array $args
+ * @return mixed
+ */
+ public function __call($method, array $args)
+ {
+ if (!method_exists($this->translator, $method)) {
+ throw new Exception\BadMethodCallException(sprintf(
+ 'Unable to call method "%s"; does not exist in translator',
+ $method
+ ));
+ }
+ return call_user_func_array(array($this->translator, $method), $args);
+ }
+
+ /**
+ * @return I18nTranslatorInterface
+ */
+ public function getTranslator()
+ {
+ return $this->translator;
+ }
+
+ /**
+ * Translate a message using the given text domain and locale
+ *
+ * @param string $message
+ * @param string $textDomain
+ * @param string $locale
+ * @return string
+ */
+ public function translate($message, $textDomain = 'default', $locale = null)
+ {
+ return $this->translator->translate($message, $textDomain, $locale);
+ }
+
+ /**
+ * Provide a pluralized translation of the given string using the given text domain and locale
+ *
+ * @param string $singular
+ * @param string $plural
+ * @param string $number
+ * @param string $textDomain
+ * @param string $locale
+ * @return string
+ */
+ public function translatePlural($singular, $plural, $number, $textDomain = 'default', $locale = null)
+ {
+ return $this->translator->translatePlural($singular, $plural, $number, $textDomain, $locale);
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/InjectApplicationEventInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/InjectApplicationEventInterface.php
index ba3be137d7c..506b6e2fa49 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/InjectApplicationEventInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/InjectApplicationEventInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ModuleRouteListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ModuleRouteListener.php
index f9c4dc6ab38..659645ea9f4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ModuleRouteListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ModuleRouteListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/MvcEvent.php b/vendor/zendframework/zendframework/library/Zend/Mvc/MvcEvent.php
index 896cdbf4f7b..824b27e3710 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/MvcEvent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/MvcEvent.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/AbstractResponseSender.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/AbstractResponseSender.php
index edfbd4f8002..09a42567e22 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/AbstractResponseSender.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/AbstractResponseSender.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ConsoleResponseSender.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ConsoleResponseSender.php
index c921dfa97fb..0ed96773895 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ConsoleResponseSender.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ConsoleResponseSender.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/HttpResponseSender.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/HttpResponseSender.php
index 2f07bbd1033..5c129e63af8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/HttpResponseSender.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/HttpResponseSender.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php
index 94833d238e3..3fe5efb41ad 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php
index b1a76dd30bf..de42f9a6724 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\ResponseSender;
-
interface ResponseSenderInterface
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/SendResponseEvent.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/SendResponseEvent.php
index 696c22a0396..34c2d3b7de3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/SendResponseEvent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/SendResponseEvent.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/SimpleStreamResponseSender.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/SimpleStreamResponseSender.php
index 2cd90c50a08..d238232aa8d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/SimpleStreamResponseSender.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/SimpleStreamResponseSender.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/RouteListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/RouteListener.php
index a5095ba8ea2..646925d0c48 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/RouteListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/RouteListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -68,11 +68,10 @@ class RouteListener implements ListenerAggregateInterface
$results = $target->getEventManager()->trigger(MvcEvent::EVENT_DISPATCH_ERROR, $e);
if (count($results)) {
- $return = $results->last();
- } else {
- $return = $e->getParams();
+ return $results->last();
}
- return $return;
+
+ return $e->getParams();
}
$e->setRouteMatch($routeMatch);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php
index f80488201cd..8f796c46552 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php
@@ -27,7 +27,6 @@ use Zend\Validator\ValidatorChain;
*/
class Catchall implements RouteInterface
{
-
/**
* Parts of the route.
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteInterface.php
index b35be0a996b..2a3c8c6da38 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,7 @@ use Zend\Mvc\Router\RouteInterface as BaseRoute;
/**
* Tree specific route interface.
*
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface RouteInterface extends BaseRoute
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php
index b5af6a8beca..5de4746a456 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/RouteMatch.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,7 @@ use Zend\Mvc\Router\RouteMatch as BaseRouteMatch;
/**
* Part route match.
*
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class RouteMatch extends BaseRouteMatch
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
index 14e2c91fe11..18fb6945bc1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Simple.php
@@ -13,9 +13,10 @@
namespace Zend\Mvc\Router\Console;
use Traversable;
+use Zend\Console\RouteMatcher\DefaultRouteMatcher;
use Zend\Console\Request as ConsoleRequest;
+use Zend\Console\RouteMatcher\RouteMatcherInterface;
use Zend\Filter\FilterChain;
-use Zend\Mvc\Exception\InvalidArgumentException;
use Zend\Mvc\Router\Exception;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\RequestInterface as Request;
@@ -30,27 +31,6 @@ use Zend\Validator\ValidatorChain;
*/
class Simple implements RouteInterface
{
- /**
- * Parts of the route.
- *
- * @var array
- */
- protected $parts;
-
- /**
- * Default values.
- *
- * @var array
- */
- protected $defaults;
-
- /**
- * Parameters' name aliases.
- *
- * @var array
- */
- protected $aliases;
-
/**
* List of assembled parameters.
*
@@ -59,69 +39,39 @@ class Simple implements RouteInterface
protected $assembledParams = array();
/**
- * @var \Zend\Validator\ValidatorChain
+ * @var RouteMatcherInterface
*/
- protected $validators;
-
- /**
- * @var \Zend\Filter\FilterChain
- */
- protected $filters;
+ protected $matcher;
/**
* Create a new simple console route.
*
- * @param string $route
+ * @param string|RouteMatcherInterface $routeOrRouteMatcher
* @param array $constraints
* @param array $defaults
* @param array $aliases
* @param null|array|Traversable|FilterChain $filters
* @param null|array|Traversable|ValidatorChain $validators
- * @throws \Zend\Mvc\Exception\InvalidArgumentException
- * @return \Zend\Mvc\Router\Console\Simple
+ * @throws Exception\InvalidArgumentException
*/
public function __construct(
- $route,
+ $routeOrRouteMatcher,
array $constraints = array(),
array $defaults = array(),
array $aliases = array(),
$filters = null,
$validators = null
) {
- $this->defaults = $defaults;
- $this->constraints = $constraints;
- $this->aliases = $aliases;
-
- if ($filters !== null) {
- if ($filters instanceof FilterChain) {
- $this->filters = $filters;
- } elseif ($filters instanceof Traversable) {
- $this->filters = new FilterChain(array(
- 'filters' => ArrayUtils::iteratorToArray($filters, false)
- ));
- } elseif (is_array($filters)) {
- $this->filters = new FilterChain(array(
- 'filters' => $filters
- ));
- } else {
- throw new InvalidArgumentException('Cannot use ' . gettype($filters) . ' as filters for ' . __CLASS__);
- }
- }
-
- if ($validators !== null) {
- if ($validators instanceof ValidatorChain) {
- $this->validators = $validators;
- } elseif ($validators instanceof Traversable || is_array($validators)) {
- $this->validators = new ValidatorChain();
- foreach ($validators as $v) {
- $this->validators->attach($v);
- }
- } else {
- throw new InvalidArgumentException('Cannot use ' . gettype($validators) . ' as validators for ' . __CLASS__);
- }
+ if (is_string($routeOrRouteMatcher)) {
+ $this->matcher = new DefaultRouteMatcher($routeOrRouteMatcher, $constraints, $defaults, $aliases);
+ } elseif ($routeOrRouteMatcher instanceof RouteMatcherInterface) {
+ $this->matcher = $routeOrRouteMatcher;
+ } else {
+ throw new Exception\InvalidArgumentException(
+ "routeOrRouteMatcher should either be string, or class implementing RouteMatcherInterface. "
+ . gettype($routeOrRouteMatcher) . " was given."
+ );
}
-
- $this->parts = $this->parseRouteDefinition($route);
}
/**
@@ -129,8 +79,8 @@ class Simple implements RouteInterface
*
* @see \Zend\Mvc\Router\RouteInterface::factory()
* @param array|Traversable $options
- * @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
- * @return Simple
+ * @throws Exception\InvalidArgumentException
+ * @return self
*/
public static function factory($options = array())
{
@@ -162,7 +112,6 @@ class Simple implements RouteInterface
$options['filters'] = null;
}
-
return new static(
$options['route'],
$options['constraints'],
@@ -173,357 +122,6 @@ class Simple implements RouteInterface
);
}
- /**
- * Parse a route definition.
- *
- * @param string $def
- * @return array
- * @throws Exception\InvalidArgumentException
- */
- protected function parseRouteDefinition($def)
- {
- $def = trim($def);
- $pos = 0;
- $length = strlen($def);
- $parts = array();
- $unnamedGroupCounter = 1;
-
- while ($pos < $length) {
- /**
- * Mandatory long param
- * --param=
- * --param=whatever
- */
- if (preg_match('/\G--(?P<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+)(?P<hasValue>=\S*?)?(?: +|$)/s', $def, $m, 0, $pos)) {
- $item = array(
- 'name' => $m['name'],
- 'short' => false,
- 'literal' => false,
- 'required' => true,
- 'positional' => false,
- 'hasValue' => !empty($m['hasValue']),
- );
- }
- /**
- * Optional long flag
- * [--param]
- */
- elseif (preg_match(
- '/\G\[ *?--(?P<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+) *?\](?: +|$)/s', $def, $m, 0, $pos
- )) {
- $item = array(
- 'name' => $m['name'],
- 'short' => false,
- 'literal' => false,
- 'required' => false,
- 'positional' => false,
- 'hasValue' => false,
- );
- }
- /**
- * Optional long param
- * [--param=]
- * [--param=whatever]
- */
- elseif (preg_match(
- '/\G\[ *?--(?P<name>[a-zA-Z0-9][a-zA-Z0-9\_\-]+)(?P<hasValue>=\S*?)? *?\](?: +|$)/s', $def, $m, 0, $pos
- )) {
- $item = array(
- 'name' => $m['name'],
- 'short' => false,
- 'literal' => false,
- 'required' => false,
- 'positional' => false,
- 'hasValue' => !empty($m['hasValue']),
- );
- }
- /**
- * Mandatory short param
- * -a
- * -a=i
- * -a=s
- * -a=w
- */
- elseif (preg_match('/\G-(?P<name>[a-zA-Z0-9])(?:=(?P<type>[ns]))?(?: +|$)/s', $def, $m, 0, $pos)) {
- $item = array(
- 'name' => $m['name'],
- 'short' => true,
- 'literal' => false,
- 'required' => true,
- 'positional' => false,
- 'hasValue' => !empty($m['type']) ? $m['type'] : null,
- );
- }
- /**
- * Optional short param
- * [-a]
- * [-a=n]
- * [-a=s]
- */
- elseif (preg_match('/\G\[ *?-(?P<name>[a-zA-Z0-9])(?:=(?P<type>[ns]))? *?\](?: +|$)/s', $def, $m, 0, $pos)) {
- $item = array(
- 'name' => $m['name'],
- 'short' => true,
- 'literal' => false,
- 'required' => false,
- 'positional' => false,
- 'hasValue' => !empty($m['type']) ? $m['type'] : null,
- );
- }
- /**
- * Optional literal param alternative
- * [ something | somethingElse | anotherOne ]
- * [ something | somethingElse | anotherOne ]:namedGroup
- */
- elseif (preg_match('/
- \G
- \[
- (?P<options>
- (?:
- \ *?
- (?P<name>[a-z0-9][a-zA-Z0-9_\-]*?)
- \ *?
- (?:\||(?=\]))
- \ *?
- )+
- )
- \]
- (?:\:(?P<groupName>[a-zA-Z0-9]+))?
- (?:\ +|$)
- /sx', $def, $m, 0, $pos
- )
- ) {
- // extract available options
- $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
-
- // remove dupes
- array_unique($options);
-
- // prepare item
- $item = array(
- 'name' => isset($m['groupName']) ? $m['groupName'] : 'unnamedGroup' . $unnamedGroupCounter++,
- 'literal' => true,
- 'required' => false,
- 'positional' => true,
- 'alternatives' => $options,
- 'hasValue' => false,
- );
- }
-
- /**
- * Required literal param alternative
- * ( something | somethingElse | anotherOne )
- * ( something | somethingElse | anotherOne ):namedGroup
- */
- elseif (preg_match('/
- \G
- \(
- (?P<options>
- (?:
- \ *?
- (?P<name>[a-z0-9][a-zA-Z0-9_\-]+)
- \ *?
- (?:\||(?=\)))
- \ *?
- )+
- )
- \)
- (?:\:(?P<groupName>[a-zA-Z0-9]+))?
- (?:\ +|$)
- /sx', $def, $m, 0, $pos
- )) {
- // extract available options
- $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
-
- // remove dupes
- array_unique($options);
-
- // prepare item
- $item = array(
- 'name' => isset($m['groupName']) ? $m['groupName']:'unnamedGroupAt' . $unnamedGroupCounter++,
- 'literal' => true,
- 'required' => true,
- 'positional' => true,
- 'alternatives' => $options,
- 'hasValue' => false,
- );
- }
- /**
- * Required long/short flag alternative
- * ( --something | --somethingElse | --anotherOne | -s | -a )
- * ( --something | --somethingElse | --anotherOne | -s | -a ):namedGroup
- */
- elseif (preg_match('/
- \G
- \(
- (?P<options>
- (?:
- \ *?
- \-+(?P<name>[a-zA-Z0-9][a-zA-Z0-9_\-]*?)
- \ *?
- (?:\||(?=\)))
- \ *?
- )+
- )
- \)
- (?:\:(?P<groupName>[a-zA-Z0-9]+))?
- (?:\ +|$)
- /sx', $def, $m, 0, $pos
- )) {
- // extract available options
- $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
-
- // remove dupes
- array_unique($options);
-
- // remove prefix
- array_walk($options, function (&$val, $key) {
- $val = ltrim($val, '-');
- });
-
- // prepare item
- $item = array(
- 'name' => isset($m['groupName']) ? $m['groupName']:'unnamedGroupAt' . $unnamedGroupCounter++,
- 'literal' => false,
- 'required' => true,
- 'positional' => false,
- 'alternatives' => $options,
- 'hasValue' => false,
- );
- }
- /**
- * Optional flag alternative
- * [ --something | --somethingElse | --anotherOne | -s | -a ]
- * [ --something | --somethingElse | --anotherOne | -s | -a ]:namedGroup
- */
- elseif (preg_match('/
- \G
- \[
- (?P<options>
- (?:
- \ *?
- \-+(?P<name>[a-zA-Z0-9][a-zA-Z0-9_\-]*?)
- \ *?
- (?:\||(?=\]))
- \ *?
- )+
- )
- \]
- (?:\:(?P<groupName>[a-zA-Z0-9]+))?
- (?:\ +|$)
- /sx', $def, $m, 0, $pos
- )) {
- // extract available options
- $options = preg_split('/ *\| */', trim($m['options']), 0, PREG_SPLIT_NO_EMPTY);
-
- // remove dupes
- array_unique($options);
-
- // remove prefix
- array_walk($options, function (&$val, $key) {
- $val = ltrim($val, '-');
- });
-
- // prepare item
- $item = array(
- 'name' => isset($m['groupName']) ? $m['groupName']:'unnamedGroupAt' . $unnamedGroupCounter++,
- 'literal' => false,
- 'required' => false,
- 'positional' => false,
- 'alternatives' => $options,
- 'hasValue' => false,
- );
- }
- /**
- * Optional literal param, i.e.
- * [something]
- */
- elseif (preg_match('/\G\[ *?(?P<name>[a-z0-9][a-zA-Z0-9\_\-]*?) *?\](?: +|$)/s', $def, $m, 0, $pos)) {
- $item = array(
- 'name' => $m['name'],
- 'literal' => true,
- 'required' => false,
- 'positional' => true,
- 'hasValue' => false,
- );
- }
- /**
- * Optional value param, i.e.
- * [SOMETHING]
- */
- elseif (preg_match('/\G\[(?P<name>[a-z0-9][a-zA-Z0-9\_\-]*?)\](?: +|$)/s', $def, $m, 0, $pos)) {
- $item = array(
- 'name' => strtolower($m['name']),
- 'literal' => false,
- 'required' => false,
- 'positional' => true,
- 'hasValue' => true,
- );
- }
- /**
- * Optional value param, syntax 2, i.e.
- * [<SOMETHING>]
- */
- elseif (preg_match('/\G\[ *\<(?P<name>[a-z0-9][a-zA-Z0-9\_\-]*?)\> *\](?: +|$)/s', $def, $m, 0, $pos)) {
- $item = array(
- 'name' => strtolower($m['name']),
- 'literal' => false,
- 'required' => false,
- 'positional' => true,
- 'hasValue' => true,
- );
- }
- /**
- * Mandatory value param, i.e.
- * <something>
- */
- elseif (preg_match('/\G\< *(?P<name>[a-z0-9][a-zA-Z0-9\_\-]*?) *\>(?: +|$)/s', $def, $m, 0, $pos)) {
- $item = array(
- 'name' => $m['name'],
- 'literal' => false,
- 'required' => true,
- 'positional' => true,
- 'hasValue' => true,
- );
- }
- /**
- * Mandatory value param, i.e.
- * SOMETHING
- */
- elseif (preg_match('/\G(?P<name>[A-Z][a-zA-Z0-9\_\-]*?)(?: +|$)/s', $def, $m, 0, $pos)) {
- $item = array(
- 'name' => strtolower($m['name']),
- 'literal' => false,
- 'required' => true,
- 'positional' => true,
- 'hasValue' => true,
- );
- }
- /**
- * Mandatory literal param, i.e.
- * something
- */
- elseif (preg_match('/\G(?P<name>[a-z0-9][a-zA-Z0-9\_\-]*?)(?: +|$)/s', $def, $m, 0, $pos)) {
- $item = array(
- 'name' => $m['name'],
- 'literal' => true,
- 'required' => true,
- 'positional' => true,
- 'hasValue' => false,
- );
- } else {
- throw new Exception\InvalidArgumentException(
- 'Cannot understand Console route at "' . substr($def, $pos) . '"'
- );
- }
-
- $pos += strlen($m[0]);
- $parts[] = $item;
- }
-
- return $parts;
- }
-
/**
* match(): defined by Route interface.
*
@@ -538,279 +136,13 @@ class Simple implements RouteInterface
return null;
}
- /** @var $request ConsoleRequest */
- /** @var $params \Zend\Stdlib\Parameters */
- $params = $request->getParams()->toArray();
- $matches = array();
+ $params = $request->getParams()->toArray();
+ $matches = $this->matcher->match($params);
- /**
- * Extract positional and named parts
- */
- $positional = $named = array();
- foreach ($this->parts as &$part) {
- if ($part['positional']) {
- $positional[] = &$part;
- } else {
- $named[] = &$part;
- }
+ if (null !== $matches) {
+ return new RouteMatch($matches);
}
-
- /**
- * Scan for named parts inside Console params
- */
- foreach ($named as &$part) {
- /**
- * Prepare match regex
- */
- if (isset($part['alternatives'])) {
- // an alternative of flags
- $regex = '/^\-+(?P<name>';
- $regex .= join('|', $part['alternatives']);
-
- if ($part['hasValue']) {
- $regex .= ')(?:\=(?P<value>.*?)$)?$/';
- } else {
- $regex .= ')$/i';
- }
- } else {
- // a single named flag
- if ($part['short'] === true) {
- // short variant
- if ($part['hasValue']) {
- $regex = '/^\-' . $part['name'] . '(?:\=(?P<value>.*?)$)?$/i';
- } else {
- $regex = '/^\-' . $part['name'] . '$/i';
- }
- } elseif ($part['short'] === false) {
- // long variant
- if ($part['hasValue']) {
- $regex = '/^\-{2,}' . $part['name'] . '(?:\=(?P<value>.*?)$)?$/i';
- } else {
- $regex = '/^\-{2,}' . $part['name'] . '$/i';
- }
- }
- }
-
- /**
- * Look for param
- */
- $value = $param = null;
- for ($x = 0, $count = count($params); $x < $count; $x++) {
- if (preg_match($regex, $params[$x], $m)) {
- // found param
- $param = $params[$x];
-
- // prevent further scanning of this param
- array_splice($params, $x, 1);
-
- if (isset($m['value'])) {
- $value = $m['value'];
- }
-
- if (isset($m['name'])) {
- $matchedName = $m['name'];
- }
-
- break;
- }
- }
-
-
- if (!$param) {
- /**
- * Drop out if that was a mandatory param
- */
- if ($part['required']) {
- return null;
- }
-
- /**
- * Continue to next positional param
- */
- else {
- continue;
- }
- }
-
-
- /**
- * Value for flags is always boolean
- */
- if ($param && !$part['hasValue']) {
- $value = true;
- }
-
- /**
- * Try to retrieve value if it is expected
- */
- if ((null === $value || "" === $value) && $part['hasValue']) {
- if ($x < count($params)+1 && isset($params[$x])) {
- // retrieve value from adjacent param
- $value = $params[$x];
-
- // prevent further scanning of this param
- array_splice($params, $x, 1);
- } else {
- // there are no more params available
- return null;
- }
- }
-
- /**
- * Validate the value against constraints
- */
- if ($part['hasValue'] && isset($this->constraints[$part['name']])) {
- if (
- !preg_match($this->constraints[$part['name']], $value)
- ) {
- // constraint failed
- return null;
- }
- }
-
- /**
- * Store the value
- */
- if ($part['hasValue']) {
- $matches[$part['name']] = $value;
- } else {
- $matches[$part['name']] = true;
- }
-
- /**
- * If there are alternatives, fill them
- */
- if (isset($part['alternatives'])) {
- if ($part['hasValue']) {
- foreach ($part['alternatives'] as $alt) {
- if ($alt === $matchedName && !isset($matches[$alt])) {
- $matches[$alt] = $value;
- } elseif (!isset($matches[$alt])) {
- $matches[$alt] = null;
- }
- }
- } else {
- foreach ($part['alternatives'] as $alt) {
- if ($alt === $matchedName && !isset($matches[$alt])) {
- $matches[$alt] = isset($this->defaults[$alt])? $this->defaults[$alt] : true;
- } elseif (!isset($matches[$alt])) {
- $matches[$alt] = false;
- }
- }
- }
- }
- }
-
- /**
- * Scan for left-out flags that should result in a mismatch
- */
- foreach ($params as $param) {
- if (preg_match('#^\-+#', $param)) {
- return null; // there is an unrecognized flag
- }
- }
-
- /**
- * Go through all positional params
- */
- $argPos = 0;
- foreach ($positional as &$part) {
- /**
- * Check if param exists
- */
- if (!isset($params[$argPos])) {
- if ($part['required']) {
- // cannot find required positional param
- return null;
- } else {
- // stop matching
- break;
- }
- }
-
- $value = $params[$argPos];
-
- /**
- * Check if literal param matches
- */
- if ($part['literal']) {
- if (
- (isset($part['alternatives']) && !in_array($value, $part['alternatives'])) ||
- (!isset($part['alternatives']) && $value != $part['name'])
- ) {
- return null;
- }
- }
-
- /**
- * Validate the value against constraints
- */
- if ($part['hasValue'] && isset($this->constraints[$part['name']])) {
- if (
- !preg_match($this->constraints[$part['name']], $value)
- ) {
- // constraint failed
- return null;
- }
- }
-
- /**
- * Store the value
- */
- if ($part['hasValue']) {
- $matches[$part['name']] = $value;
- } elseif (isset($part['alternatives'])) {
- // from all alternativesm set matching parameter to TRUE and the rest to FALSE
- foreach ($part['alternatives'] as $alt) {
- if ($alt == $value) {
- $matches[$alt] = isset($this->defaults[$alt])? $this->defaults[$alt] : true;
- } else {
- $matches[$alt] = false;
- }
- }
-
- // set alternatives group value
- $matches[$part['name']] = $value;
- } elseif (!$part['required']) {
- // set optional parameter flag
- $name = $part['name'];
- $matches[$name] = isset($this->defaults[$name])? $this->defaults[$name] : true;
- }
-
- /**
- * Advance to next argument
- */
- $argPos++;
-
- }
-
- /**
- * Check if we have consumed all positional parameters
- */
- if ($argPos < count($params)) {
- return null; // there are extraneous params that were not consumed
- }
-
- /**
- * Any optional flags that were not entered have value false
- */
- foreach ($this->parts as &$part) {
- if (!$part['required'] && !$part['hasValue']) {
- if (!isset($matches[$part['name']])) {
- $matches[$part['name']] = false;
- }
- // unset alternatives also should be false
- if (isset($part['alternatives'])) {
- foreach ($part['alternatives'] as $alt) {
- if (!isset($matches[$alt])) {
- $matches[$alt] = false;
- }
- }
- }
- }
- }
-
- return new RouteMatch(array_replace($this->defaults, $matches));
+ return null;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/SimpleRouteStack.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
index 9ad7fa5dd91..acdb93e27fc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -72,7 +72,9 @@ class SimpleRouteStack extends BaseSimpleRouteStack
}
// default to 'simple' console route
- if (!isset($specs['type'])) $specs['type'] = 'simple';
+ if (!isset($specs['type'])) {
+ $specs['type'] = 'simple';
+ }
// build route object
$route = parent::routeFromArray($specs);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/ExceptionInterface.php
index d2eda183e15..42e2fad8eb9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php
index ab3432c0245..c0a7272976b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/RuntimeException.php
index 243a4bb6882..d722b958fe1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Chain.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Chain.php
index 0a98618e47f..a4f3373343c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Chain.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Chain.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -149,7 +149,7 @@ class Chain extends TreeRouteStack implements RouteInterface
*/
public function assemble(array $params = array(), array $options = array())
{
- if ($this->chainRoutes !== null) {
+ if ($this->chainRoutes !== null) {
$this->addRoutes($this->chainRoutes);
$this->chainRoutes = null;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php
index 0b4de2cef13..dab4da843de 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Literal.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Literal.php
index 528536a0b8f..2cab258d7f5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Literal.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Literal.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Method.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Method.php
index 27b3b642f71..40694893f71 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Method.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Method.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Part.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Part.php
index 40ad4cd9a24..bbe92f91689 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Part.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Part.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -156,6 +156,10 @@ class Part extends TreeRouteStack implements RouteInterface
}
}
+ if (isset($options['translator']) && !isset($options['locale']) && null !== ($locale = $match->getParam('locale', null))) {
+ $options['locale'] = $locale;
+ }
+
foreach ($this->routes as $name => $route) {
if (($subMatch = $route->match($request, $nextOffset, $options)) instanceof RouteMatch) {
if ($match->getLength() + $subMatch->getLength() + $pathOffset === $pathLength) {
@@ -186,6 +190,10 @@ class Part extends TreeRouteStack implements RouteInterface
$options['has_child'] = (isset($options['name']));
+ if (isset($options['translator']) && !isset($options['locale']) && isset($params['locale'])) {
+ $options['locale'] = $params['locale'];
+ }
+
$path = $this->route->assemble($params, $options);
$params = array_diff_key($params, array_flip($this->route->getAssembledParams()));
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Query.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Query.php
index c25964f23f2..c17ef0cd20f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Query.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Query.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Regex.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Regex.php
index d2f70370469..fe3e77c205d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Regex.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Regex.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteInterface.php
index a9987758a8c..50d5f3f4330 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteMatch.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteMatch.php
index 39c8823557b..f1864f2599c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteMatch.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/RouteMatch.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Scheme.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Scheme.php
index 707f8ea117c..5ca68af8eef 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Scheme.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Scheme.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Segment.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Segment.php
index 3fa393f5e7b..dc8be858cdb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Segment.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Segment.php
@@ -3,14 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Router\Http;
use Traversable;
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface as Translator;
use Zend\Mvc\Router\Exception;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\RequestInterface as Request;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
index 118732bd0bd..7b2884cfee9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
@@ -3,14 +3,15 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Router\Http;
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface as Translator;
use Zend\I18n\Translator\TranslatorAwareInterface;
+use Zend\Mvc\Router\Exception;
use Zend\Stdlib\RequestInterface as Request;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TreeRouteStack.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TreeRouteStack.php
index da18421d002..091be69743d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TreeRouteStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TreeRouteStack.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Wildcard.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Wildcard.php
index ce8f6251f42..871f91f2da8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Wildcard.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Wildcard.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/PriorityList.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/PriorityList.php
index 2cb7f586191..3fcf8ad734b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/PriorityList.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/PriorityList.php
@@ -3,209 +3,17 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Router;
-use Countable;
-use Iterator;
+use Zend\Stdlib\PriorityList as StdlibPriorityList;
/**
* Priority list
*/
-class PriorityList implements Iterator, Countable
+class PriorityList extends StdlibPriorityList
{
- /**
- * Internal list of all routes.
- *
- * @var array
- */
- protected $routes = array();
-
- /**
- * Serial assigned to routes to preserve LIFO.
- *
- * @var int
- */
- protected $serial = 0;
-
- /**
- * Internal counter to avoid usage of count().
- *
- * @var int
- */
- protected $count = 0;
-
- /**
- * Whether the list was already sorted.
- *
- * @var bool
- */
- protected $sorted = false;
-
- /**
- * Insert a new route.
- *
- * @param string $name
- * @param RouteInterface $route
- * @param int $priority
- * @return void
- */
- public function insert($name, RouteInterface $route, $priority)
- {
- $this->sorted = false;
- $this->count++;
-
- $this->routes[$name] = array(
- 'route' => $route,
- 'priority' => (int) $priority,
- 'serial' => $this->serial++,
- );
- }
-
- /**
- * Remove a route.
- *
- * @param string $name
- * @return void
- */
- public function remove($name)
- {
- if (!isset($this->routes[$name])) {
- return;
- }
-
- $this->count--;
-
- unset($this->routes[$name]);
- }
-
- /**
- * Remove all routes.
- *
- * @return void
- */
- public function clear()
- {
- $this->routes = array();
- $this->serial = 0;
- $this->count = 0;
- $this->sorted = false;
- }
-
- /**
- * Get a route.
- *
- * @param string $name
- * @return RouteInterface
- */
- public function get($name)
- {
- if (!isset($this->routes[$name])) {
- return null;
- }
-
- return $this->routes[$name]['route'];
- }
-
- /**
- * Sort all routes.
- *
- * @return void
- */
- protected function sort()
- {
- uasort($this->routes, array($this, 'compare'));
- $this->sorted = true;
- }
-
- /**
- * Compare the priority of two routes.
- *
- * @param array $route1,
- * @param array $route2
- * @return int
- */
- protected function compare(array $route1, array $route2)
- {
- if ($route1['priority'] === $route2['priority']) {
- return ($route1['serial'] > $route2['serial'] ? -1 : 1);
- }
-
- return ($route1['priority'] > $route2['priority'] ? -1 : 1);
- }
-
- /**
- * rewind(): defined by Iterator interface.
- *
- * @see Iterator::rewind()
- * @return void
- */
- public function rewind()
- {
- if (!$this->sorted) {
- $this->sort();
- }
-
- reset($this->routes);
- }
-
- /**
- * current(): defined by Iterator interface.
- *
- * @see Iterator::current()
- * @return RouteInterface
- */
- public function current()
- {
- $node = current($this->routes);
- return ($node !== false ? $node['route'] : false);
- }
-
- /**
- * key(): defined by Iterator interface.
- *
- * @see Iterator::key()
- * @return string
- */
- public function key()
- {
- return key($this->routes);
- }
-
- /**
- * next(): defined by Iterator interface.
- *
- * @see Iterator::next()
- * @return RouteInterface
- */
- public function next()
- {
- $node = next($this->routes);
- return ($node !== false ? $node['route'] : false);
- }
-
- /**
- * valid(): defined by Iterator interface.
- *
- * @see Iterator::valid()
- * @return bool
- */
- public function valid()
- {
- return ($this->current() !== false);
- }
-
- /**
- * count(): defined by Countable interface.
- *
- * @see Countable::count()
- * @return int
- */
- public function count()
- {
- return $this->count;
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteInterface.php
index a5374bc3d11..c5977bde881 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteMatch.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteMatch.php
index 94cf57dd76a..a78dd454d59 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteMatch.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteMatch.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RoutePluginManager.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RoutePluginManager.php
index b3fbca3a58c..641c128cb90 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RoutePluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RoutePluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteStackInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteStackInterface.php
index 4eb5b10c87a..2470da0b78c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteStackInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteStackInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php
index 798bbf539ad..f8652f17203 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/SimpleRouteStack.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/SendResponseListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/SendResponseListener.php
index 2e5847eb634..380d03998e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/SendResponseListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/SendResponseListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -24,7 +24,6 @@ class SendResponseListener implements
EventManagerAwareInterface,
ListenerAggregateInterface
{
-
/**
* @var \Zend\Stdlib\CallbackHandler[]
*/
@@ -72,7 +71,6 @@ class SendResponseListener implements
return $this->eventManager;
}
-
/**
* Attach the aggregate to the specified event manager
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
index 44e9fcfed18..1463fd5d39d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
@@ -3,14 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Service;
use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\Di\DiAbstractServiceFactory;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
@@ -24,12 +23,12 @@ abstract class AbstractPluginManagerFactory implements FactoryInterface
* the PLUGIN_MANGER_CLASS constant.
*
* @param ServiceLocatorInterface $serviceLocator
- * @return \Zend\ServiceManager\AbstractPluginManager
+ * @return AbstractPluginManager
*/
public function createService(ServiceLocatorInterface $serviceLocator)
{
$pluginManagerClass = static::PLUGIN_MANAGER_CLASS;
- /* @var $plugins \Zend\ServiceManager\AbstractPluginManager */
+ /* @var $plugins AbstractPluginManager */
$plugins = new $pluginManagerClass;
$plugins->setServiceLocator($serviceLocator);
$configuration = $serviceLocator->get('Config');
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ApplicationFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ApplicationFactory.php
index 6bb3c58431e..3b6cb8ee019 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ApplicationFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ApplicationFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConfigFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConfigFactory.php
index 4fbc2bf32ed..a3683994c77 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConfigFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConfigFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleAdapterFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleAdapterFactory.php
index 79ffa399c99..0258653d45f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleAdapterFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleAdapterFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleViewManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleViewManagerFactory.php
index 1bd8c939415..e3dfc6653ac 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleViewManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ConsoleViewManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerLoaderFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerLoaderFactory.php
index b55729077cf..cf5cda2d06d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerLoaderFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerLoaderFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
index 048f9a35392..adcfac7246c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php
index 75bf207d915..625468f6586 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiFactory.php
index 4bc11566898..9ea5ceabaac 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiServiceInitializerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiServiceInitializerFactory.php
index f6cb47d6284..2a2fb19049a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiServiceInitializerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiServiceInitializerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,7 +12,6 @@ namespace Zend\Mvc\Service;
use Zend\ServiceManager\Di\DiServiceInitializer;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\ServiceManager\ServiceManager;
class DiServiceInitializerFactory implements FactoryInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php
index eb6df3d5141..38eaa8978fe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -87,7 +87,6 @@ class DiStrictAbstractServiceFactory extends Di implements AbstractFactoryInterf
throw new Exception\InvalidServiceNameException('Service "' . $requestedName . '" is not whitelisted');
}
-
if ($serviceLocator instanceof AbstractPluginManager) {
/* @var $serviceLocator AbstractPluginManager */
$this->serviceLocator = $serviceLocator->getServiceLocator();
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.php
index 70100c29735..54dd3335abd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/EventManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/EventManagerFactory.php
index 7941cb761b8..a806e104be0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/EventManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/EventManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FilterManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FilterManagerFactory.php
index a6a53603dd3..d9a9e1722a9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FilterManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FilterManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FormElementManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FormElementManagerFactory.php
index fd5400f30c9..e33dd87eb33 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FormElementManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FormElementManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HttpViewManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HttpViewManagerFactory.php
index 928c3da5b3d..5c61bad97bd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HttpViewManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HttpViewManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HydratorManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HydratorManagerFactory.php
index 561d00c75d9..76c6da0772b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HydratorManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HydratorManagerFactory.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Service;
-
class HydratorManagerFactory extends AbstractPluginManagerFactory
{
const PLUGIN_MANAGER_CLASS = 'Zend\Stdlib\Hydrator\HydratorPluginManager';
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/InputFilterManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/InputFilterManagerFactory.php
index 61cf6888c41..14806f7f8d3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/InputFilterManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/InputFilterManagerFactory.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Service;
-
class InputFilterManagerFactory extends AbstractPluginManagerFactory
{
const PLUGIN_MANAGER_CLASS = 'Zend\InputFilter\InputFilterPluginManager';
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/LogProcessorManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/LogProcessorManagerFactory.php
new file mode 100644
index 00000000000..fa3f884e89a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/LogProcessorManagerFactory.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Service;
+
+class LogProcessorManagerFactory extends AbstractPluginManagerFactory
+{
+ const PLUGIN_MANAGER_CLASS = 'Zend\Log\ProcessorPluginManager';
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/LogWriterManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/LogWriterManagerFactory.php
new file mode 100644
index 00000000000..b858dbe3c92
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/LogWriterManagerFactory.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Mvc\Service;
+
+class LogWriterManagerFactory extends AbstractPluginManagerFactory
+{
+ const PLUGIN_MANAGER_CLASS = 'Zend\Log\WriterPluginManager';
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ModuleManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ModuleManagerFactory.php
index e8acea5e01d..2532658c2c9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ModuleManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ModuleManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -109,6 +109,18 @@ class ModuleManagerFactory implements FactoryInterface
'Zend\ModuleManager\Feature\InputFilterProviderInterface',
'getInputFilterConfig'
);
+ $serviceListener->addServiceManager(
+ 'LogProcessorManager',
+ 'log_processors',
+ 'Zend\ModuleManager\Feature\LogProcessorProviderInterface',
+ 'getLogProcessorConfig'
+ );
+ $serviceListener->addServiceManager(
+ 'LogWriterManager',
+ 'log_writers',
+ 'Zend\ModuleManager\Feature\LogWriterProviderInterface',
+ 'getLogWriterConfig'
+ );
$events = $serviceLocator->get('EventManager');
$events->attach($defaultListeners);
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
index 2f8db4c95d7..182a53a4020 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RequestFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RequestFactory.php
index 84201bd56ab..3c5d4a5c1e7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RequestFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RequestFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ResponseFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ResponseFactory.php
index 9f7b74a5612..707e6c9ddb2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ResponseFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ResponseFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RoutePluginManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RoutePluginManagerFactory.php
index c37f606fc1a..2f24b8581ed 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RoutePluginManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RoutePluginManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
index 2a760e6b308..462ec210155 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
@@ -3,14 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Service;
use Zend\Console\Console;
-use Zend\Mvc\Router\Console\SimpleRouteStack as ConsoleRouter;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php
index aee001c54b5..11d1653ca0d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/SerializerAdapterPluginManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceListenerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceListenerFactory.php
index 6a96895477f..2d3acb46c22 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceListenerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceListenerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -57,6 +57,8 @@ class ServiceListenerFactory implements FactoryInterface
'HttpViewManager' => 'Zend\Mvc\Service\HttpViewManagerFactory',
'HydratorManager' => 'Zend\Mvc\Service\HydratorManagerFactory',
'InputFilterManager' => 'Zend\Mvc\Service\InputFilterManagerFactory',
+ 'LogProcessorManager' => 'Zend\Mvc\Service\LogProcessorManagerFactory',
+ 'LogWriterManager' => 'Zend\Mvc\Service\LogWriterManagerFactory',
'MvcTranslator' => 'Zend\Mvc\Service\TranslatorServiceFactory',
'PaginatorPluginManager' => 'Zend\Mvc\Service\PaginatorPluginManagerFactory',
'Request' => 'Zend\Mvc\Service\RequestFactory',
@@ -85,6 +87,7 @@ class ServiceListenerFactory implements FactoryInterface
'Zend\View\Resolver\TemplatePathStack' => 'ViewTemplatePathStack',
'Zend\View\Resolver\AggregateResolver' => 'ViewResolver',
'Zend\View\Resolver\ResolverInterface' => 'ViewResolver',
+ 'ControllerManager' => 'ControllerLoader'
),
'abstract_factories' => array(
'Zend\Form\FormAbstractServiceFactory',
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceManagerConfig.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceManagerConfig.php
index 16066259d29..921d4f743d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceManagerConfig.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceManagerConfig.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,12 +11,14 @@ namespace Zend\Mvc\Service;
use Zend\EventManager\EventManagerAwareInterface;
use Zend\EventManager\EventManagerInterface;
-use Zend\ServiceManager\ConfigInterface;
+use Zend\ServiceManager\Config;
use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
use Zend\ServiceManager\ServiceManager;
use Zend\ServiceManager\ServiceManagerAwareInterface;
+use Zend\Stdlib\ArrayUtils;
-class ServiceManagerConfig implements ConfigInterface
+class ServiceManagerConfig extends Config
{
/**
* Services that can be instantiated without factories
@@ -50,7 +52,9 @@ class ServiceManagerConfig implements ConfigInterface
* @var array
*/
protected $aliases = array(
- 'Zend\EventManager\EventManagerInterface' => 'EventManager',
+ 'Zend\EventManager\EventManagerInterface' => 'EventManager',
+ 'Zend\ServiceManager\ServiceLocatorInterface' => 'ServiceManager',
+ 'Zend\ServiceManager\ServiceManager' => 'ServiceManager',
);
/**
@@ -66,95 +70,67 @@ class ServiceManagerConfig implements ConfigInterface
);
/**
- * Constructor
- *
- * Merges internal arrays with those passed via configuration
+ * Delegators
*
- * @param array $configuration
+ * @var array
*/
- public function __construct(array $configuration = array())
- {
- if (isset($configuration['invokables'])) {
- $this->invokables = array_merge($this->invokables, $configuration['invokables']);
- }
-
- if (isset($configuration['factories'])) {
- $this->factories = array_merge($this->factories, $configuration['factories']);
- }
+ protected $delegators = array();
- if (isset($configuration['abstract_factories'])) {
- $this->abstractFactories = array_merge($this->abstractFactories, $configuration['abstract_factories']);
- }
-
- if (isset($configuration['aliases'])) {
- $this->aliases = array_merge($this->aliases, $configuration['aliases']);
- }
-
- if (isset($configuration['shared'])) {
- $this->shared = array_merge($this->shared, $configuration['shared']);
- }
-
- }
+ /**
+ * Initializers
+ *
+ * @var array
+ */
+ protected $initializers = array();
/**
- * Configure the provided service manager instance with the configuration
- * in this class.
+ * Constructor
*
- * In addition to using each of the internal properties to configure the
- * service manager, also adds an initializer to inject ServiceManagerAware
- * and ServiceLocatorAware classes with the service manager.
+ * Merges internal arrays with those passed via configuration
*
- * @param ServiceManager $serviceManager
- * @return void
+ * @param array $configuration
*/
- public function configureServiceManager(ServiceManager $serviceManager)
+ public function __construct(array $configuration = array())
{
- foreach ($this->invokables as $name => $class) {
- $serviceManager->setInvokableClass($name, $class);
- }
-
- foreach ($this->factories as $name => $factoryClass) {
- $serviceManager->setFactory($name, $factoryClass);
- }
-
- foreach ($this->abstractFactories as $factoryClass) {
- $serviceManager->addAbstractFactory($factoryClass);
- }
-
- foreach ($this->aliases as $name => $service) {
- $serviceManager->setAlias($name, $service);
- }
-
- foreach ($this->shared as $name => $value) {
- $serviceManager->setShared($name, $value);
- }
-
- $serviceManager->addInitializer(function ($instance) use ($serviceManager) {
- if ($instance instanceof EventManagerAwareInterface) {
- if ($instance->getEventManager() instanceof EventManagerInterface) {
- $instance->getEventManager()->setSharedManager(
- $serviceManager->get('SharedEventManager')
- );
- } else {
- $instance->setEventManager($serviceManager->get('EventManager'));
+ $this->initializers = array(
+ 'EventManagerAwareInitializer' => function ($instance, ServiceLocatorInterface $serviceLocator) {
+ if ($instance instanceof EventManagerAwareInterface) {
+ $eventManager = $instance->getEventManager();
+
+ if ($eventManager instanceof EventManagerInterface) {
+ $eventManager->setSharedManager($serviceLocator->get('SharedEventManager'));
+ } else {
+ $instance->setEventManager($serviceLocator->get('EventManager'));
+ }
}
- }
- });
-
- $serviceManager->addInitializer(function ($instance) use ($serviceManager) {
- if ($instance instanceof ServiceManagerAwareInterface) {
- $instance->setServiceManager($serviceManager);
- }
- });
-
- $serviceManager->addInitializer(function ($instance) use ($serviceManager) {
- if ($instance instanceof ServiceLocatorAwareInterface) {
- $instance->setServiceLocator($serviceManager);
- }
- });
-
- $serviceManager->setService('ServiceManager', $serviceManager);
- $serviceManager->setAlias('Zend\ServiceManager\ServiceLocatorInterface', 'ServiceManager');
- $serviceManager->setAlias('Zend\ServiceManager\ServiceManager', 'ServiceManager');
+ },
+ 'ServiceManagerAwareInitializer' => function ($instance, ServiceLocatorInterface $serviceLocator) {
+ if ($serviceLocator instanceof ServiceManager && $instance instanceof ServiceManagerAwareInterface) {
+ $instance->setServiceManager($serviceLocator);
+ }
+ },
+ 'ServiceLocatorAwareInitializer' => function ($instance, ServiceLocatorInterface $serviceLocator) {
+ if ($instance instanceof ServiceLocatorAwareInterface) {
+ $instance->setServiceLocator($serviceLocator);
+ }
+ },
+ );
+
+ $this->factories['ServiceManager'] = function (ServiceLocatorInterface $serviceLocator) {
+ return $serviceLocator;
+ };
+
+ parent::__construct(ArrayUtils::merge(
+ array(
+ 'invokables' => $this->invokables,
+ 'factories' => $this->factories,
+ 'abstract_factories' => $this->abstractFactories,
+ 'aliases' => $this->aliases,
+ 'shared' => $this->shared,
+ 'delegators' => $this->delegators,
+ 'initializers' => $this->initializers,
+ ),
+ $configuration
+ ));
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/TranslatorServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/TranslatorServiceFactory.php
index f4ae420e294..b819f3ede4d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/TranslatorServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/TranslatorServiceFactory.php
@@ -3,28 +3,63 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Service;
-use Zend\I18n\Translator\TranslatorServiceFactory as I18nTranslatorServiceFactory;
-use Zend\Mvc\I18n\Translator;
+use Traversable;
+use Zend\I18n\Translator\Translator;
+use Zend\Mvc\I18n\DummyTranslator;
+use Zend\Mvc\I18n\Translator as MvcTranslator;
+use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
/**
* Overrides the translator factory from the i18n component in order to
* replace it with the bridge class from this namespace.
*/
-class TranslatorServiceFactory extends I18nTranslatorServiceFactory
+class TranslatorServiceFactory implements FactoryInterface
{
+ /**
+ * @param ServiceLocatorInterface $serviceLocator
+ * @return MvcTranslator
+ */
public function createService(ServiceLocatorInterface $serviceLocator)
{
- // Configure the translator
- $config = $serviceLocator->get('Config');
- $trConfig = isset($config['translator']) ? $config['translator'] : array();
- $translator = Translator::factory($trConfig);
- return $translator;
+ // Assume that if a user has registered a service for the
+ // TranslatorInterface, it must be valid
+ if ($serviceLocator->has('Zend\I18n\Translator\TranslatorInterface')) {
+ return new MvcTranslator($serviceLocator->get('Zend\I18n\Translator\TranslatorInterface'));
+ }
+
+ // Load a translator from configuration, if possible
+ if ($serviceLocator->has('Config')) {
+ $config = $serviceLocator->get('Config');
+
+ // 'translator' => false
+ if (array_key_exists('translator', $config) && $config['translator'] === false) {
+ return new MvcTranslator(new DummyTranslator());
+ }
+
+ // 'translator' => array( ... translator options ... )
+ if (array_key_exists('translator', $config)
+ && ((is_array($config['translator']) && !empty($config['translator']))
+ || $config['translator'] instanceof Traversable)
+ ) {
+ $i18nTranslator = Translator::factory($config['translator']);
+ $serviceLocator->setService('Zend\I18n\Translator\TranslatorInterface', $i18nTranslator);
+ return new MvcTranslator($i18nTranslator);
+ }
+ }
+
+ // If ext/intl is not loaded, return a dummy translator
+ if (!extension_loaded('intl')) {
+ return new MvcTranslator(new DummyTranslator());
+ }
+
+ // For BC purposes (pre-2.3.0), use the I18n Translator
+ return new MvcTranslator(new Translator());
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ValidatorManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ValidatorManagerFactory.php
index 0fe09f0c84c..a270f8fc3ee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ValidatorManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ValidatorManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php
index 56ab2556a40..2e7c8d20b67 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewFeedStrategyFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewHelperManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
index b9a074e2986..969fca2f59d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewHelperManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -60,7 +60,7 @@ class ViewHelperManagerFactory extends AbstractPluginManagerFactory
}
// Configure URL view helper with router
- $plugins->setFactory('url', function ($sm) use ($serviceLocator) {
+ $plugins->setFactory('url', function () use ($serviceLocator) {
$helper = new ViewHelper\Url;
$router = Console::isConsole() ? 'HttpRouter' : 'Router';
$helper->setRouter($serviceLocator->get($router));
@@ -77,7 +77,7 @@ class ViewHelperManagerFactory extends AbstractPluginManagerFactory
return $helper;
});
- $plugins->setFactory('basepath', function ($sm) use ($serviceLocator) {
+ $plugins->setFactory('basepath', function () use ($serviceLocator) {
$config = $serviceLocator->has('Config') ? $serviceLocator->get('Config') : array();
$basePathHelper = new ViewHelper\BasePath;
if (isset($config['view_manager']) && isset($config['view_manager']['base_path'])) {
@@ -98,7 +98,7 @@ class ViewHelperManagerFactory extends AbstractPluginManagerFactory
* Other view helpers depend on this to decide which spec to generate their tags
* based on. This is why it must be set early instead of later in the layout phtml.
*/
- $plugins->setFactory('doctype', function ($sm) use ($serviceLocator) {
+ $plugins->setFactory('doctype', function () use ($serviceLocator) {
$config = $serviceLocator->has('Config') ? $serviceLocator->get('Config') : array();
$config = isset($config['view_manager']) ? $config['view_manager'] : array();
$doctypeHelper = new ViewHelper\Doctype;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php
index 63be77d1dfc..f0935de5bdb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewManagerFactory.php
index 008eb4a2216..548e530f57d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewResolverFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewResolverFactory.php
index 166ce1a245c..fdb8f1e2f34 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewResolverFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewResolverFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php
index 1df38dbd973..ca49219a214 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplateMapResolverFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php
index 153200bb646..dcf6ddd4be3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewTemplatePathStackFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,7 @@ use Zend\View\Resolver as ViewResolver;
class ViewTemplatePathStackFactory implements FactoryInterface
{
/**
- * Create the template map view resolver
+ * Create the template path stack view resolver
*
* Creates a Zend\View\Resolver\TemplatePathStack and populates it with the
* ['view_manager']['template_path_stack'] and sets the default suffix with the
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php
index 91eaf6d621e..0403d3a448a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php
index 63579f03c8a..fb322986f65 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -65,10 +65,18 @@ class DefaultRenderingStrategy extends AbstractListenerAggregate
$responseText .= $result->getVariable(ConsoleViewModel::RESULT);
}
+ // Fetch service manager
+ $sm = $e->getApplication()->getServiceManager();
+
+ // Fetch console
+ $console = $sm->get('console');
+
// Append console response to response object
- $response->setContent(
- $response->getContent() . $responseText
- );
+ $content = $response->getContent() . $responseText;
+ if (is_callable(array($console, 'encodeText'))) {
+ $content = $console->encodeText($content);
+ }
+ $response->setContent($content);
// Pass on console-specific options
if ($response instanceof ConsoleResponse
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php
index 128f250f17b..f4f21ff5163 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ExceptionStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -187,7 +187,7 @@ EOT;
} elseif ($this->displayExceptions && $exception instanceof \Exception) {
$previous = '';
$previousException = $exception->getPrevious();
- while($previousException) {
+ while ($previousException) {
$previous .= str_replace(
array(
':className',
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php
index 18919365fc0..5631105ac9f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectViewModelListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectViewModelListener.php
index 154e80b31d5..30895cb80c6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectViewModelListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectViewModelListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Mvc\View\Console;
use Zend\Mvc\View\Http\InjectViewModelListener as HttpInjectViewModelListener;
class InjectViewModelListener extends HttpInjectViewModelListener
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
index dbee881bdc0..f30c80f0e29 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,7 +22,6 @@ use Zend\Mvc\Application;
use Zend\Mvc\Exception\RuntimeException;
use Zend\Mvc\MvcEvent;
use Zend\ServiceManager\Exception\ServiceNotFoundException;
-use Zend\ServiceManager\ServiceManager;
use Zend\Stdlib\ResponseInterface as Response;
use Zend\Stdlib\StringUtils;
use Zend\Text\Table;
@@ -126,31 +125,23 @@ class RouteNotFoundStrategy extends AbstractListenerAggregate
// Try to fetch module manager
$mm = null;
- try{
+ try {
$mm = $sm->get('ModuleManager');
- } catch (ServiceNotFoundException $e) {
+ } catch (ServiceNotFoundException $exception) {
// The application does not have or use module manager, so we cannot use it
}
// Try to fetch current console adapter
- try{
+ try {
$console = $sm->get('console');
if (!$console instanceof ConsoleAdapter) {
throw new ServiceNotFoundException();
}
- } catch (ServiceNotFoundException $e) {
+ } catch (ServiceNotFoundException $exception) {
// The application does not have console adapter
throw new RuntimeException('Cannot access Console adapter - is it defined in ServiceManager?');
}
- // Try to fetch router
- $router = null;
- try{
- $router = $sm->get('Router');
- } catch (ServiceNotFoundException $e) {
- // The application does not have a router
- }
-
// Retrieve the script's name (entry point)
$scriptName = '';
if ($request instanceof ConsoleRequest) {
@@ -387,6 +378,9 @@ class RouteNotFoundStrategy extends AbstractListenerAggregate
// If there is only 1 column, just concatenate it
if ($cols == 1) {
foreach ($data as $row) {
+ if (! isset($row[0])) {
+ continue;
+ }
$result .= $row[0] . "\n";
}
return $result;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ViewManager.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ViewManager.php
index 2ca26438f25..2fabf251355 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ViewManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/ViewManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/CreateViewModelListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/CreateViewModelListener.php
index d2282eb2efc..77b2029e3ec 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/CreateViewModelListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/CreateViewModelListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php
index 0407d1a6563..e3db51edc00 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/DefaultRenderingStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -77,7 +77,8 @@ class DefaultRenderingStrategy extends AbstractListenerAggregate
* Render the view
*
* @param MvcEvent $e
- * @return Response
+ * @return Response|null
+ * @throws \Exception
*/
public function render(MvcEvent $e)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ExceptionStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ExceptionStrategy.php
index 1f888cd6d2c..dc99f5e8245 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ExceptionStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ExceptionStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php
index f68f0308d6e..79228930dc7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectTemplateListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectTemplateListener.php
index 0b7273db669..1decc4c3873 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectTemplateListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectTemplateListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -25,6 +25,13 @@ class InjectTemplateListener extends AbstractListenerAggregate
*/
protected $inflector;
+ /**
+ * Array of controller namespace -> template mappings
+ *
+ * @var array
+ */
+ protected $controllerMap = array();
+
/**
* {@inheritDoc}
*/
@@ -63,26 +70,29 @@ class InjectTemplateListener extends AbstractListenerAggregate
$controller = $routeMatch->getParam('controller', '');
}
- $module = $this->deriveModuleNamespace($controller);
-
- if ($namespace = $routeMatch->getParam(ModuleRouteListener::MODULE_NAMESPACE)) {
- $controllerSubNs = $this->deriveControllerSubNamespace($namespace);
- if (!empty($controllerSubNs)) {
- if (!empty($module)) {
- $module .= '/' . $controllerSubNs;
- } else {
- $module = $controllerSubNs;
+ $template = $this->mapController($controller);
+ if (!$template) {
+ $module = $this->deriveModuleNamespace($controller);
+
+ if ($namespace = $routeMatch->getParam(ModuleRouteListener::MODULE_NAMESPACE)) {
+ $controllerSubNs = $this->deriveControllerSubNamespace($namespace);
+ if (!empty($controllerSubNs)) {
+ if (!empty($module)) {
+ $module .= '/' . $controllerSubNs;
+ } else {
+ $module = $controllerSubNs;
+ }
}
}
- }
- $controller = $this->deriveControllerClass($controller);
- $template = $this->inflectName($module);
+ $controller = $this->deriveControllerClass($controller);
+ $template = $this->inflectName($module);
- if (!empty($template)) {
- $template .= '/';
+ if (!empty($template)) {
+ $template .= '/';
+ }
+ $template .= $this->inflectName($controller);
}
- $template .= $this->inflectName($controller);
$action = $routeMatch->getParam('action');
if (null !== $action) {
@@ -91,6 +101,61 @@ class InjectTemplateListener extends AbstractListenerAggregate
$model->setTemplate($template);
}
+ /**
+ * Set map of controller namespace -> template pairs
+ *
+ * @param array $map
+ * @return self
+ */
+ public function setControllerMap(array $map)
+ {
+ krsort($map);
+ $this->controllerMap = $map;
+ return $this;
+ }
+
+ /**
+ * Maps controller to template if controller namespace is whitelisted or mapped
+ *
+ * @param string $controller controller FQCN
+ * @return string|false template name or false if controller was not matched
+ */
+ public function mapController($controller)
+ {
+ foreach ($this->controllerMap as $namespace => $replacement) {
+ if (
+ // Allow disabling rule by setting value to false since config
+ // merging have no feature to remove entries
+ false == $replacement
+ // Match full class or full namespace
+ || !($controller === $namespace || strpos($controller, $namespace . '\\') === 0)
+ ) {
+ continue;
+ }
+
+ $map = '';
+ // Map namespace to $replacement if its value is string
+ if (is_string($replacement)) {
+ $map = rtrim($replacement, '/') . '/';
+ $controller = substr($controller, strlen($namespace) + 1);
+ }
+
+ //strip Controller namespace(s) (but not classname)
+ $parts = explode('\\', $controller);
+ array_pop($parts);
+ $parts = array_diff($parts, array('Controller'));
+ //strip trailing Controller in class name
+ $parts[] = $this->deriveControllerClass($controller);
+ $controller = implode('/', $parts);
+
+ $template = trim($map . $controller, '/');
+
+ //inflect CamelCase to dash
+ return $this->inflectName($template);
+ }
+ return false;
+ }
+
/**
* Inflect a name to a normalized value
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectViewModelListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectViewModelListener.php
index 2115984a676..dc9bd7c5651 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectViewModelListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectViewModelListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php
index 718e774df32..951d4f75e10 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/RouteNotFoundStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ViewManager.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ViewManager.php
index 219549ad7f2..3216d02567d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ViewManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ViewManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -84,21 +84,6 @@ class ViewManager extends AbstractListenerAggregate
$this->listeners[] = $events->attach(MvcEvent::EVENT_BOOTSTRAP, array($this, 'onBootstrap'), 10000);
}
- /**
- * Detach aggregate listeners from the specified event manager
- *
- * @param EventManagerInterface $events
- * @return void
- */
- public function detach(EventManagerInterface $events)
- {
- foreach ($this->listeners as $index => $listener) {
- if ($events->detach($listener)) {
- unset($this->listeners[$index]);
- }
- }
- }
-
/**
* Prepares the view layer
*
@@ -122,8 +107,8 @@ class ViewManager extends AbstractListenerAggregate
$routeNotFoundStrategy = $this->getRouteNotFoundStrategy();
$exceptionStrategy = $this->getExceptionStrategy();
$mvcRenderingStrategy = $this->getMvcRenderingStrategy();
+ $injectTemplateListener = $this->getInjectTemplateListener();
$createViewModelListener = new CreateViewModelListener();
- $injectTemplateListener = new InjectTemplateListener();
$injectViewModelListener = new InjectViewModelListener();
$this->registerMvcRenderingStrategies($events);
@@ -145,7 +130,7 @@ class ViewManager extends AbstractListenerAggregate
/**
* Instantiates and configures the renderer's helper manager
*
- * @return \Zend\View\HelperPluginManager
+ * @return ViewHelperManager
*/
public function getHelperManager()
{
@@ -245,11 +230,11 @@ class ViewManager extends AbstractListenerAggregate
*/
public function getLayoutTemplate()
{
- $layout = 'layout/layout';
if (isset($this->config['layout'])) {
- $layout = $this->config['layout'];
+ return $this->config['layout'];
}
- return $layout;
+
+ return 'layout/layout';
}
/**
@@ -345,6 +330,15 @@ class ViewManager extends AbstractListenerAggregate
return $this->routeNotFoundStrategy;
}
+ public function getInjectTemplateListener()
+ {
+ $listener = new InjectTemplateListener();
+ if (isset($this->config['controller_map'])) {
+ $listener->setControllerMap($this->config['controller_map']);
+ }
+ return $listener;
+ }
+
/**
* Configures the MvcEvent view model to ensure it has the template injected
*
@@ -370,6 +364,9 @@ class ViewManager extends AbstractListenerAggregate
* is a ListenerAggregate, attach it to the view, at priority 100. This
* latter allows each to trigger before the default mvc rendering strategy,
* and for them to trigger in the order they are registered.
+ *
+ * @param EventManagerInterface $events
+ * @return void
*/
protected function registerMvcRenderingStrategies(EventManagerInterface $events)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/SendResponseListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/SendResponseListener.php
index 275fb8c592c..0e1ebb84624 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/SendResponseListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/SendResponseListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json b/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json
index 644c8f72e7c..68483df1398 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/composer.json
@@ -6,6 +6,7 @@
"zf2",
"mvc"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Mvc\\": ""
@@ -13,11 +14,31 @@
},
"target-dir": "Zend/Mvc",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-eventmanager": "self.version",
"zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-form": "self.version",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-authentication": "self.version",
+ "zendframework/zend-console": "self.version",
+ "zendframework/zend-di": "self.version",
+ "zendframework/zend-filter": "self.version",
+ "zendframework/zend-http": "self.version",
+ "zendframework/zend-i18n": "self.version",
+ "zendframework/zend-inputfilter": "self.version",
+ "zendframework/zend-json": "self.version",
+ "zendframework/zend-log": "self.version",
+ "zendframework/zend-modulemanager": "self.version",
+ "zendframework/zend-session": "self.version",
+ "zendframework/zend-serializer": "self.version",
+ "zendframework/zend-text": "self.version",
+ "zendframework/zend-uri": "self.version",
+ "zendframework/zend-validator": "self.version",
+ "zendframework/zend-version": "self.version",
+ "zendframework/zend-view": "self.version"
+ },
"suggest": {
"zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
"zendframework/zend-config": "Zend\\Config component",
@@ -25,9 +46,10 @@
"zendframework/zend-di": "Zend\\Di component",
"zendframework/zend-filter": "Zend\\Filter component",
"zendframework/zend-http": "Zend\\Http component",
- "zendframework/zend-form": "Zend\\Form component",
"zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
"zendframework/zend-inputfilter": "Zend\\Inputfilter component",
+ "zendframework/zend-json": "Zend\\Json component",
+ "zendframework/zend-log": "Zend\\Log component",
"zendframework/zend-modulemanager": "Zend\\ModuleManager component",
"zendframework/zend-serializer": "Zend\\Serializer component",
"zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
@@ -35,12 +57,14 @@
"zendframework/zend-text": "Zend\\Text component",
"zendframework/zend-uri": "Zend\\Uri component",
"zendframework/zend-validator": "Zend\\Validator component",
+ "zendframework/zend-version": "Zend\\Version component",
"zendframework/zend-view": "Zend\\View component"
+
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/AbstractContainer.php b/vendor/zendframework/zendframework/library/Zend/Navigation/AbstractContainer.php
index 9decd2e6337..718c855560b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/AbstractContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/AbstractContainer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -193,11 +193,12 @@ abstract class AbstractContainer implements Countable, RecursiveIterator
/**
* Removes the given page from the container
*
- * @param Page\AbstractPage|int $page page to remove, either a page
- * instance or a specific page order
+ * @param Page\AbstractPage|int $page page to remove, either a page
+ * instance or a specific page order
+ * @param bool $recursive [optional] whether to remove recursively
* @return bool whether the removal was successful
*/
- public function removePage($page)
+ public function removePage($page, $recursive = false)
{
if ($page instanceof Page\AbstractPage) {
$hash = $page->hashCode();
@@ -217,6 +218,16 @@ abstract class AbstractContainer implements Countable, RecursiveIterator
return true;
}
+ if ($recursive) {
+ /** @var \Zend\Navigation\Page\AbstractPage $childPage */
+ foreach ($this->pages as $childPage) {
+ if ($childPage->hasPage($page, true)) {
+ $childPage->removePage($page, true);
+ return true;
+ }
+ }
+ }
+
return false;
}
@@ -258,10 +269,20 @@ abstract class AbstractContainer implements Countable, RecursiveIterator
/**
* Returns true if container contains any pages
*
+ * @param bool $onlyVisible whether to check only visible pages
* @return bool whether container has any pages
*/
- public function hasPages()
+ public function hasPages($onlyVisible = false)
{
+ if ($onlyVisible) {
+ foreach ($this->pages as $page) {
+ if ($page->isVisible()) {
+ return true;
+ }
+ }
+ // no visible pages found
+ return false;
+ }
return count($this->index) > 0;
}
@@ -358,7 +379,6 @@ abstract class AbstractContainer implements Countable, RecursiveIterator
), 0, $error);
}
return $this->{$match[1]}($match[2], $arguments[0]);
-
}
/**
@@ -464,7 +484,7 @@ abstract class AbstractContainer implements Countable, RecursiveIterator
*/
public function hasChildren()
{
- return $this->hasPages();
+ return $this->valid() && $this->current()->hasPages();
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Navigation/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/BadMethodCallException.php
index efdf6e13dd1..af2be2684a5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,4 +14,5 @@ namespace Zend\Navigation\Exception;
*/
class BadMethodCallException extends \BadMethodCallException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/DomainException.php
index a08649c23df..11dafd28cb6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/DomainException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ namespace Zend\Navigation\Exception;
* Navigation domain exception
*/
class DomainException extends \DomainException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/ExceptionInterface.php
index 97e89ded7ba..dc841acf9e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,5 +14,4 @@ namespace Zend\Navigation\Exception;
*/
interface ExceptionInterface
{
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/InvalidArgumentException.php
index f1fd848b0bd..5e36fa5b80d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,4 +14,5 @@ namespace Zend\Navigation\Exception;
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/OutOfBoundsException.php
index 82856e8d629..edfd5c793f4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/OutOfBoundsException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ namespace Zend\Navigation\Exception;
* Navigation out of bounds exception
*/
class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Navigation.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Navigation.php
index dede898e6b8..2c2dd5b517e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Navigation.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Navigation.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
index 77b07dae143..f178d26db3a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/AbstractPage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -115,6 +115,13 @@ abstract class AbstractPage extends AbstractContainer
*/
protected $permission;
+ /**
+ * Text domain for Translator
+ *
+ * @var string
+ */
+ protected $textDomain;
+
/**
* Whether this page should be considered active
*
@@ -143,6 +150,13 @@ abstract class AbstractPage extends AbstractContainer
*/
protected $properties = array();
+ /**
+ * Static factories list for factory pages
+ *
+ * @var array
+ */
+ protected static $factories = array();
+
// Initialization:
/**
@@ -220,6 +234,14 @@ abstract class AbstractPage extends AbstractContainer
}
}
+ if (static::$factories) {
+ foreach (static::$factories as $factoryCallBack) {
+ if (($page = call_user_func($factoryCallBack, $options))) {
+ return $page;
+ }
+ }
+ }
+
$hasUri = isset($options['uri']);
$hasMvc = isset($options['action']) || isset($options['controller'])
|| isset($options['route']);
@@ -235,6 +257,16 @@ abstract class AbstractPage extends AbstractContainer
}
}
+ /**
+ * Add static factory for self::factory function
+ *
+ * @param callable $callback Any callable variable
+ */
+ public static function addFactory($callback)
+ {
+ static::$factories[] = $callback;
+ }
+
/**
* Page constructor
*
@@ -732,6 +764,33 @@ abstract class AbstractPage extends AbstractContainer
return $this->permission;
}
+ /**
+ * Sets text domain for translation
+ *
+ * @param string|null $textDomain [optional] text domain to associate
+ * with this page. Default is null, which
+ * sets no text domain.
+ *
+ * @return AbstractPage fluent interface, returns self
+ */
+ public function setTextDomain($textDomain = null)
+ {
+ if (null !== $textDomain) {
+ $this->textDomain = $textDomain;
+ }
+ return $this;
+ }
+
+ /**
+ * Returns text domain for translation
+ *
+ * @return mixed|null text domain or null
+ */
+ public function getTextDomain()
+ {
+ return $this->textDomain;
+ }
+
/**
* Sets whether page should be considered active or not
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php
index 099d6b0b51e..569caedf771 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -97,7 +97,14 @@ class Mvc extends AbstractPage
*
* @var RouteStackInterface
*/
- protected static $defaultRouter= null;
+ protected static $defaultRouter = null;
+
+ /**
+ * Default route name
+ *
+ * @var string
+ */
+ protected static $defaultRoute = null;
// Accessors:
@@ -228,8 +235,8 @@ class Mvc extends AbstractPage
}
switch (true) {
- case ($this->getRoute() !== null):
- $name = $this->getRoute();
+ case ($this->getRoute() !== null || static::getDefaultRoute() !== null):
+ $name = ($this->getRoute() !== null) ? $this->getRoute() : static::getDefaultRoute();
break;
case ($this->getRouteMatch() !== null):
$name = $this->getRouteMatch()->getMatchedRouteName();
@@ -359,13 +366,7 @@ class Mvc extends AbstractPage
*/
public function setParams(array $params = null)
{
- if (null === $params) {
- $this->params = array();
- } else {
- // TODO: do this more intelligently?
- $this->params = $params;
- }
-
+ $this->params = empty($params) ? array() : $params;
$this->hrefCache = null;
return $this;
}
@@ -508,6 +509,27 @@ class Mvc extends AbstractPage
return static::$defaultRouter;
}
+ /**
+ * Set default route name
+ *
+ * @param string $route
+ * @return void
+ */
+ public static function setDefaultRoute($route)
+ {
+ static::$defaultRoute = $route;
+ }
+
+ /**
+ * Get default route name
+ *
+ * @return string
+ */
+ public static function getDefaultRoute()
+ {
+ return static::$defaultRoute;
+ }
+
// Public methods:
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Uri.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Uri.php
index 6c5a992063b..e07c886d181 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Uri.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Uri.php
@@ -3,12 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Navigation\Page;
+use Zend\Http\Request;
use Zend\Navigation\Exception;
/**
@@ -23,6 +24,13 @@ class Uri extends AbstractPage
*/
protected $uri = null;
+ /**
+ * Request object used to determine uri path
+ *
+ * @var string
+ */
+ protected $request;
+
/**
* Sets page URI
*
@@ -76,6 +84,53 @@ class Uri extends AbstractPage
return $uri;
}
+ /**
+ * Returns whether page should be considered active or not
+ *
+ * This method will compare the page properties against the request uri.
+ *
+ * @param bool $recursive
+ * [optional] whether page should be considered
+ * active if any child pages are active. Default is
+ * false.
+ * @return bool whether page should be considered active or not
+ */
+ public function isActive($recursive = false)
+ {
+ if (!$this->active) {
+ if ($this->getRequest() instanceof Request) {
+ if ($this->getRequest()->getUri()->getPath() == $this->getUri()) {
+ $this->active = true;
+ return true;
+ }
+ }
+ }
+
+ return parent::isActive($recursive);
+ }
+
+ /**
+ * Get the request
+ *
+ * @return Request
+ */
+ public function getRequest()
+ {
+ return $this->request;
+ }
+
+ /**
+ * Sets request for assembling URLs
+ *
+ * @param Request $request
+ * @return self Fluent interface, returns self
+ */
+ public function setRequest(Request $request = null)
+ {
+ $this->request = $request;
+ return $this;
+ }
+
/**
* Returns an array representation of the page
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Service/AbstractNavigationFactory.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Service/AbstractNavigationFactory.php
index 9ef00e0c382..650b603c388 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Service/AbstractNavigationFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Service/AbstractNavigationFactory.php
@@ -3,13 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Navigation\Service;
use Zend\Config;
+use Zend\Http\Request;
use Zend\Mvc\Router\RouteMatch;
use Zend\Mvc\Router\RouteStackInterface as Router;
use Zend\Navigation\Exception;
@@ -79,8 +80,14 @@ abstract class AbstractNavigationFactory implements FactoryInterface
$application = $serviceLocator->get('Application');
$routeMatch = $application->getMvcEvent()->getRouteMatch();
$router = $application->getMvcEvent()->getRouter();
+ $request = $application->getMvcEvent()->getRequest();
- return $this->injectComponents($pages, $routeMatch, $router);
+ // HTTP request is the only one that may be injected
+ if (!$request instanceof Request) {
+ $request = null;
+ }
+
+ return $this->injectComponents($pages, $routeMatch, $router, $request);
}
/**
@@ -102,8 +109,8 @@ abstract class AbstractNavigationFactory implements FactoryInterface
} elseif ($config instanceof Config\Config) {
$config = $config->toArray();
} elseif (!is_array($config)) {
- throw new Exception\InvalidArgumentException('
- Invalid input, expected array, filename, or Zend\Config object'
+ throw new Exception\InvalidArgumentException(
+ 'Invalid input, expected array, filename, or Zend\Config object'
);
}
@@ -114,11 +121,13 @@ abstract class AbstractNavigationFactory implements FactoryInterface
* @param array $pages
* @param RouteMatch $routeMatch
* @param Router $router
+ * @param null|Request $request
* @return mixed
*/
- protected function injectComponents(array $pages, RouteMatch $routeMatch = null, Router $router = null)
+ protected function injectComponents(array $pages, RouteMatch $routeMatch = null, Router $router = null, $request = null)
{
foreach ($pages as &$page) {
+ $hasUri = isset($page['uri']);
$hasMvc = isset($page['action']) || isset($page['controller']) || isset($page['route']);
if ($hasMvc) {
if (!isset($page['routeMatch']) && $routeMatch) {
@@ -127,10 +136,14 @@ abstract class AbstractNavigationFactory implements FactoryInterface
if (!isset($page['router'])) {
$page['router'] = $router;
}
+ } elseif ($hasUri) {
+ if (!isset($page['request'])) {
+ $page['request'] = $request;
+ }
}
if (isset($page['pages'])) {
- $page['pages'] = $this->injectComponents($page['pages'], $routeMatch, $router);
+ $page['pages'] = $this->injectComponents($page['pages'], $routeMatch, $router, $request);
}
}
return $pages;
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Service/ConstructedNavigationFactory.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Service/ConstructedNavigationFactory.php
index 363c2b2e7ac..7c3e281cd40 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Service/ConstructedNavigationFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Service/ConstructedNavigationFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/Service/DefaultNavigationFactory.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Service/DefaultNavigationFactory.php
index 771666d785b..3e06179c328 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Service/DefaultNavigationFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Service/DefaultNavigationFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/View/HelperConfig.php b/vendor/zendframework/zendframework/library/Zend/Navigation/View/HelperConfig.php
index 68c00b19310..f831691f280 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/View/HelperConfig.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/View/HelperConfig.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -33,6 +33,12 @@ class HelperConfig implements ConfigInterface
$serviceManager->setFactory('navigation', function (HelperPluginManager $pm) {
$helper = new \Zend\View\Helper\Navigation;
$helper->setServiceLocator($pm->getServiceLocator());
+
+ $config = $pm->getServiceLocator()->get('config');
+ if (isset($config['navigation_helpers'])) {
+ $config = new \Zend\ServiceManager\Config($config['navigation_helpers']);
+ $config->configureServiceManager($helper->getPluginManager());
+ }
return $helper;
});
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Navigation/composer.json b/vendor/zendframework/zendframework/library/Zend/Navigation/composer.json
index b395d0ad219..8c0ec78fc8c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/composer.json
@@ -6,6 +6,7 @@
"zf2",
"navigation"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Navigation\\": ""
@@ -13,18 +14,27 @@
},
"target-dir": "Zend/Navigation",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-config": "self.version",
+ "zendframework/zend-mvc": "self.version",
+ "zendframework/zend-permissions-acl": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-view": "self.version"
+ },
"suggest": {
"zendframework/zend-config": "Zend\\Config component",
"zendframework/zend-mvc": "Zend\\Mvc component",
+ "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
"zendframework/zend-view": "Zend\\View component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/AdapterInterface.php
index 49368465f23..513517e9c67 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,7 @@ use Countable;
interface AdapterInterface extends Countable
{
/**
- * Returns an collection of items for a page.
+ * Returns a collection of items for a page.
*
* @param int $offset Page offset
* @param int $itemCountPerPage Number of items per page
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/ArrayAdapter.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/ArrayAdapter.php
index a713b19d5fb..90a5dc16dea 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/ArrayAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/ArrayAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Callback.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Callback.php
new file mode 100644
index 00000000000..412736b9c84
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Callback.php
@@ -0,0 +1,75 @@
+<?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\Paginator\Adapter;
+
+use Zend\Stdlib\CallbackHandler;
+
+class Callback implements AdapterInterface
+{
+ /**
+ * Callback to be executed to retrieve the items for a page.
+ *
+ * @var CallbackHandler
+ */
+ protected $itemsCallback;
+
+ /**
+ * Callback to be executed to retrieve the total number of items.
+ *
+ * @var CallbackHandler
+ */
+ protected $countCallback;
+
+ /**
+ * Constructs instance.
+ *
+ * @param CallbackHandler|callable $itemsCallback Callback to be executed to retrieve the items for a page.
+ * @param CallbackHandler|callable $countCallback Callback to be executed to retrieve the total number of items.
+ */
+ public function __construct($itemsCallback, $countCallback)
+ {
+ if (! $itemsCallback instanceof CallbackHandler) {
+ $itemsCallback = new CallbackHandler($itemsCallback);
+ }
+
+ if (! $countCallback instanceof CallbackHandler) {
+ $countCallback = new CallbackHandler($countCallback);
+ }
+
+ $this->itemsCallback = $itemsCallback;
+ $this->countCallback = $countCallback;
+ }
+
+ /**
+ * Returns an array of items for a page.
+ *
+ * Executes the {$itemsCallback}.
+ *
+ * @param int $offset Page offset
+ * @param int $itemCountPerPage Number of items per page
+ * @return array
+ */
+ public function getItems($offset, $itemCountPerPage)
+ {
+ return $this->itemsCallback->call(array($offset, $itemCountPerPage));
+ }
+
+ /**
+ * Returns the total number of items.
+ *
+ * Executes the {$countCallback}.
+ *
+ * @return int
+ */
+ public function count()
+ {
+ return $this->countCallback->call();
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php
index 0c024e4ba71..4739569b828 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,6 @@ use Zend\Db\ResultSet\ResultSetInterface;
class DbSelect implements AdapterInterface
{
-
/**
* @var Sql
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbTableGateway.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbTableGateway.php
index 7c165adc81e..8f2b30f7560 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbTableGateway.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbTableGateway.php
@@ -3,13 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Paginator\Adapter;
use Zend\Db\Sql\Where;
+use Zend\Db\Sql\Having;
use Zend\Db\TableGateway\TableGateway;
class DbTableGateway extends DbSelect
@@ -17,23 +18,30 @@ class DbTableGateway extends DbSelect
/**
* Constructs instance.
*
- * @param TableGateway $tableGateway
- * @param Where|\Closure|string|array $where
- * @param null $order
+ * @param TableGateway $tableGateway
+ * @param null|Where|\Closure|string|array $where
+ * @param null|string|array $order
+ * @param null|string|array $group
+ * @param null|Having|\Closure|string|array $having
*/
- public function __construct(TableGateway $tableGateway, $where = null, $order = null)
+ public function __construct(TableGateway $tableGateway, $where = null, $order = null, $group = null, $having = null)
{
- $select = $tableGateway->getSql()->select();
+ $sql = $tableGateway->getSql();
+ $select = $sql->select();
if ($where) {
$select->where($where);
}
if ($order) {
$select->order($order);
}
+ if ($group) {
+ $select->group($group);
+ }
+ if ($having) {
+ $select->having($having);
+ }
- $dbAdapter = $tableGateway->getAdapter();
$resultSetPrototype = $tableGateway->getResultSetPrototype();
-
- parent::__construct($select, $dbAdapter, $resultSetPrototype);
+ parent::__construct($select, $sql, $resultSetPrototype);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php
index c0d9f171ee5..71d02ea0ccd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Paginator\Adapter\Exception;
use Zend\Paginator\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php
index 4626282daf7..f8b76a87c93 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ use Zend\Paginator\Exception;
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/RuntimeException.php
index b6dd6a4fcc4..85868d2c63b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ use Zend\Paginator\Exception;
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php
index d01c5e9531f..bf956f584bb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ use Zend\Paginator\Exception;
class UnexpectedValueException extends Exception\UnexpectedValueException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Iterator.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Iterator.php
index 8b2e760a9d7..ebbc1d7fb55 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Iterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Iterator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,7 @@ class Iterator implements AdapterInterface
/**
* Iterator which implements Countable
*
- * @var Iterator
+ * @var \Iterator
*/
protected $iterator = null;
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Null.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Null.php
index 557c03c8868..a1a9cfcf5fd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Null.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Null.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/CallbackFactory.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/CallbackFactory.php
new file mode 100644
index 00000000000..e59d6509da1
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/CallbackFactory.php
@@ -0,0 +1,44 @@
+<?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\Paginator\Adapter\Service;
+
+use Zend\Paginator\Adapter\Callback;
+use Zend\ServiceManager\MutableCreationOptionsInterface;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class CallbackFactory implements
+ FactoryInterface,
+ MutableCreationOptionsInterface
+{
+ /**
+ * Adapter options
+ * @var array
+ */
+ protected $creationOptions;
+
+ /**
+ * {@inheritDoc}
+ */
+ public function setCreationOptions(array $creationOptions)
+ {
+ $this->creationOptions = $creationOptions;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @return Callback
+ */
+ public function createService(ServiceLocatorInterface $serviceLocator)
+ {
+ return new Callback($this->creationOptions[0], $this->creationOptions[1]);
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/DbSelectFactory.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/DbSelectFactory.php
index ea95a325cd8..41a2a18473f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/DbSelectFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/DbSelectFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -31,7 +31,7 @@ class DbSelectFactory implements FactoryInterface
/**
* @param ServiceLocatorInterface $serviceLocator
- * @return \Zend\Navigation\Navigation
+ * @return \Zend\Paginator\Adapter\DbSelect
*/
public function createService(ServiceLocatorInterface $serviceLocator)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/DbTableGatewayFactory.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/DbTableGatewayFactory.php
new file mode 100644
index 00000000000..e849fec5725
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/DbTableGatewayFactory.php
@@ -0,0 +1,50 @@
+<?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\Paginator\Adapter\Service;
+
+use Zend\Paginator\Adapter\DbTableGateway;
+use Zend\ServiceManager\MutableCreationOptionsInterface;
+use Zend\ServiceManager\FactoryInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class DbTableGatewayFactory implements
+ FactoryInterface,
+ MutableCreationOptionsInterface
+{
+ /**
+ * Adapter options
+ * @var array
+ */
+ protected $creationOptions;
+
+ /**
+ * {@inheritDoc}
+ */
+ public function setCreationOptions(array $creationOptions)
+ {
+ $this->creationOptions = $creationOptions;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @return DbTableGateway
+ */
+ public function createService(ServiceLocatorInterface $serviceLocator)
+ {
+ return new DbTableGateway(
+ $this->creationOptions[0],
+ isset($this->creationOptions[1]) ? $this->creationOptions[1] : null,
+ isset($this->creationOptions[2]) ? $this->creationOptions[2] : null,
+ isset($this->creationOptions[3]) ? $this->creationOptions[3] : null,
+ isset($this->creationOptions[4]) ? $this->creationOptions[4] : null
+ );
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/AdapterAggregateInterface.php b/vendor/zendframework/zendframework/library/Zend/Paginator/AdapterAggregateInterface.php
index 4b50b458085..da00a86eedf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/AdapterAggregateInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/AdapterAggregateInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/AdapterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Paginator/AdapterPluginManager.php
index 040d20b724c..d9c0707957c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/AdapterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/AdapterPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -37,7 +37,9 @@ class AdapterPluginManager extends AbstractPluginManager
* @var array
*/
protected $factories = array(
- 'dbselect' => 'Zend\Paginator\Adapter\Service\DbSelectFactory'
+ 'dbselect' => 'Zend\Paginator\Adapter\Service\DbSelectFactory',
+ 'dbtablegateway' => 'Zend\Paginator\Adapter\Service\DbTableGatewayFactory',
+ 'callback' => 'Zend\Paginator\Adapter\Service\CallbackFactory',
);
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Paginator/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/ExceptionInterface.php
index 526b716f537..25f5a3bb5d5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Paginator\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/InvalidArgumentException.php
index 8779f1fceeb..1e158e98288 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/InvalidArgumentException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Paginator\Exception;
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/RuntimeException.php
index ed9c15ec9b7..06401f0fadc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/RuntimeException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Paginator\Exception;
-class RuntimeException
- extends \RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/UnexpectedValueException.php
index 3fe9c76236d..42d1736dbac 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/UnexpectedValueException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Paginator\Exception;
-class UnexpectedValueException
- extends \UnexpectedValueException
- implements ExceptionInterface
-{}
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Factory.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Factory.php
index 790f51b717e..afba3da792d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Factory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/Paginator.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Paginator.php
index 6be3df8d194..03b73caa444 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Paginator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Paginator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -25,7 +25,6 @@ use Zend\View;
class Paginator implements Countable, IteratorAggregate
{
-
/**
* The cache tag prefix used to namespace Paginator results in the cache
*
@@ -524,8 +523,9 @@ class Paginator implements Countable, IteratorAggregate
$itemNumber = $this->normalizeItemNumber($itemNumber);
if ($itemNumber > $itemCount) {
- throw new Exception\InvalidArgumentException('Page ' . $pageNumber . ' does not'
- . ' contain item number ' . $itemNumber);
+ throw new Exception\InvalidArgumentException(
+ "Page {$pageNumber} does not contain item number {$itemNumber}"
+ );
}
return $page[$itemNumber - 1];
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/All.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/All.php
index c22d807a1f3..c7f44b82830 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/All.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/All.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Elastic.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Elastic.php
index 07d0e344775..8183ae2e759 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Elastic.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Elastic.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Jumping.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Jumping.php
index 705d2e9e1f3..f560c9b7192 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Jumping.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Jumping.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
index eeb92c92358..3bf7c9794d6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/ScrollingStyleInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Sliding.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Sliding.php
index 57fed038788..00ecf508e6e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Sliding.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/Sliding.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStylePluginManager.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStylePluginManager.php
index 09e78335a60..8c6b4bed93a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStylePluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStylePluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/SerializableLimitIterator.php b/vendor/zendframework/zendframework/library/Zend/Paginator/SerializableLimitIterator.php
index c3b1ec3ab9e..c67b2f8fc86 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/SerializableLimitIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/SerializableLimitIterator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,6 @@ use Serializable;
class SerializableLimitIterator extends LimitIterator implements Serializable, ArrayAccess
{
-
/**
* Offset to first element
*
@@ -39,7 +38,7 @@ class SerializableLimitIterator extends LimitIterator implements Serializable, A
* @param int $count Maximum number of elements to show or -1 for all
* @see LimitIterator::__construct
*/
- public function __construct(Iterator $it, $offset=0, $count=-1)
+ public function __construct(Iterator $it, $offset = 0, $count = -1)
{
parent::__construct($it, $offset, $count);
$this->offset = $offset;
diff --git a/vendor/zendframework/zendframework/library/Zend/Paginator/composer.json b/vendor/zendframework/zendframework/library/Zend/Paginator/composer.json
index 4a1f9fb69cc..a94257517fd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/composer.json
@@ -6,6 +6,7 @@
"zf2",
"paginator"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Paginator\\": ""
@@ -13,16 +14,29 @@
},
"target-dir": "Zend/Paginator",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-cache": "self.version",
+ "zendframework/zend-db": "self.version",
+ "zendframework/zend-filter": "self.version",
+ "zendframework/zend-json": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-view": "self.version"
+ },
"suggest": {
- "zendframework/zend-cache":"To support cache feature"
+ "zendframework/zend-cache": "Zend\\Cache component to support cache features",
+ "zendframework/zend-db": "Zend\\Db component",
+ "zendframework/zend-filter": "Zend\\Filter component",
+ "zendframework/zend-json": "Zend\\Json component",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+ "zendframework/zend-view": "Zend\\View component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Acl.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Acl.php
index 3140fbfa4b1..571e37bb8aa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Acl.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Acl.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -108,7 +108,6 @@ class Acl implements AclInterface
);
}
-
$this->getRoleRegistry()->add($role, $parents);
return $this;
@@ -522,8 +521,13 @@ class Acl implements AclInterface
* @throws Exception\InvalidArgumentException
* @return Acl Provides a fluent interface
*/
- public function setRule($operation, $type, $roles = null, $resources = null,
- $privileges = null, Assertion\AssertionInterface $assert = null
+ public function setRule(
+ $operation,
+ $type,
+ $roles = null,
+ $resources = null,
+ $privileges = null,
+ Assertion\AssertionInterface $assert = null
) {
// ensure that the rule type is valid; normalize input to uppercase
$type = strtoupper($type);
@@ -632,16 +636,12 @@ class Acl implements AclInterface
continue;
}
- if (isset($rules['allPrivileges']['type']) &&
- $type === $rules['allPrivileges']['type'])
- {
+ if (isset($rules['allPrivileges']['type']) && $type === $rules['allPrivileges']['type']) {
unset($rules['allPrivileges']);
}
} else {
foreach ($privileges as $privilege) {
- if (isset($rules['byPrivilegeId'][$privilege]) &&
- $type === $rules['byPrivilegeId'][$privilege]['type'])
- {
+ if (isset($rules['byPrivilegeId'][$privilege]) && $type === $rules['byPrivilegeId'][$privilege]['type']) {
unset($rules['byPrivilegeId'][$privilege]);
}
}
@@ -756,7 +756,6 @@ class Acl implements AclInterface
// try next Resource
$resource = $this->resources[$resource->getResourceId()]['parent'];
-
} while (true); // loop terminates at 'allResources' pseudo-parent
} else {
$this->isAllowedPrivilege = $privilege;
@@ -779,7 +778,6 @@ class Acl implements AclInterface
// try next Resource
$resource = $this->resources[$resource->getResourceId()]['parent'];
-
} while (true); // loop terminates at 'allResources' pseudo-parent
}
}
@@ -928,8 +926,11 @@ class Acl implements AclInterface
* @return bool|null
* @throws Exception\RuntimeException
*/
- protected function roleDFSVisitOnePrivilege(Role\RoleInterface $role, Resource\ResourceInterface $resource = null,
- $privilege = null, &$dfs = null
+ protected function roleDFSVisitOnePrivilege(
+ Role\RoleInterface $role,
+ Resource\ResourceInterface $resource = null,
+ $privilege = null,
+ &$dfs = null
) {
if (null === $privilege) {
/**
@@ -1057,7 +1058,6 @@ class Acl implements AclInterface
$visitor =& $this->rules['byResourceId'][$resourceId];
} while (false);
-
// follow $role
if (null === $role) {
if (!isset($visitor['allRoles'])) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php
index 2f730d19b55..6e0b9f2cf85 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionAggregate.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionAggregate.php
new file mode 100644
index 00000000000..4821e56a482
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionAggregate.php
@@ -0,0 +1,173 @@
+<?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\Permissions\Acl\Assertion;
+
+use Zend\Permissions\Acl\Acl;
+use Zend\Permissions\Acl\Role\RoleInterface;
+use Zend\Permissions\Acl\Resource\ResourceInterface;
+use Zend\Permissions\Acl\Exception\InvalidArgumentException;
+use Zend\Permissions\Acl\Exception\RuntimeException;
+
+class AssertionAggregate implements AssertionInterface
+{
+ const MODE_ALL = 'all';
+
+ const MODE_AT_LEAST_ONE = 'at_least_one';
+
+ protected $assertions = array();
+
+ /**
+ *
+ * @var $manager AssertionManager
+ */
+ protected $assertionManager;
+
+ protected $mode = self::MODE_ALL;
+
+ /**
+ * Stacks an assertion in aggregate
+ *
+ * @param AssertionInterface|string $assertion
+ * if string, must match a AssertionManager declared service (checked later)
+ *
+ * @return self
+ */
+ public function addAssertion($assertion)
+ {
+ $this->assertions[] = $assertion;
+
+ return $this;
+ }
+
+ public function addAssertions(array $assertions)
+ {
+ foreach ($assertions as $assertion) {
+ $this->addAssertion($assertion);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Empties assertions stack
+ *
+ * @return self
+ */
+ public function clearAssertions()
+ {
+ $this->assertions = array();
+
+ return $this;
+ }
+
+ /**
+ *
+ * @param AssertionManager $manager
+ *
+ * @return self
+ */
+ public function setAssertionManager(AssertionManager $manager)
+ {
+ $this->assertionManager = $manager;
+
+ return $this;
+ }
+
+ public function getAssertionManager()
+ {
+ return $this->assertionManager;
+ }
+
+ /**
+ * Set assertion chain behavior
+ *
+ * AssertionAggregate should assert to true when:
+ *
+ * - all assertions are true with MODE_ALL
+ * - at least one assertion is true with MODE_AT_LEAST_ONE
+ *
+ * @param string $mode
+ * indicates how assertion chain result should interpreted (either 'all' or 'at_least_one')
+ * @throws InvalidArgumentException
+ *
+ * @return self
+ */
+ public function setMode($mode)
+ {
+ if ($mode != self::MODE_ALL && $mode != self::MODE_AT_LEAST_ONE) {
+ throw new InvalidArgumentException('invalid assertion aggregate mode');
+ }
+
+ $this->mode = $mode;
+
+ return $this;
+ }
+
+ /**
+ * Return current mode
+ *
+ * @return string
+ */
+ public function getMode()
+ {
+ return $this->mode;
+ }
+
+ /**
+ * @see \Zend\Permissions\Acl\Assertion\AssertionInterface::assert()
+ *
+ * @throws RuntimeException
+ * @return bool
+ */
+ public function assert(Acl $acl, RoleInterface $role = null, ResourceInterface $resource = null, $privilege = null)
+ {
+ // check if assertions are set
+ if (! $this->assertions) {
+ throw new RuntimeException('no assertion have been aggregated to this AssertionAggregate');
+ }
+
+ foreach ($this->assertions as $assertion) {
+ // jit assertion mloading
+ if (! $assertion instanceof AssertionInterface) {
+ if (class_exists($assertion)) {
+ $assertion = new $assertion();
+ } else {
+ if ($manager = $this->getAssertionManager()) {
+ try {
+ $assertion = $manager->get($assertion);
+ } catch (\Exception $e) {
+ throw new Exception\InvalidAssertionException('assertion "' . $assertion . '" is not defined in assertion manager');
+ }
+ } else {
+ throw new RuntimeException('no assertion manager is set - cannot look up for assertions');
+ }
+ }
+ }
+
+ $result = (bool) $assertion->assert($acl, $role, $resource, $privilege);
+
+ if ($this->getMode() == self::MODE_ALL && ! $result) {
+ // on false is enough
+ return false;
+ }
+
+ if ($this->getMode() == self::MODE_AT_LEAST_ONE && $result) {
+ // one true is enough
+ return true;
+ }
+ }
+
+ if ($this->getMode() == self::MODE_ALL) {
+ // none of the assertions returned false
+ return true;
+ } else {
+ return false;
+ }
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionInterface.php
index f43823a2348..f963c93d1b6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionManager.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionManager.php
new file mode 100644
index 00000000000..69e35e8f802
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionManager.php
@@ -0,0 +1,41 @@
+<?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\Permissions\Acl\Assertion;
+
+use Zend\ServiceManager\AbstractPluginManager;
+use Zend\Permissions\Acl\Exception\InvalidArgumentException;
+
+class AssertionManager extends AbstractPluginManager
+{
+ protected $sharedByDefault = true;
+
+ /**
+ * Validate the plugin
+ *
+ * Checks that the element is an instance of AssertionInterface
+ *
+ * @param mixed $plugin
+ *
+ * @throws InvalidArgumentException
+ * @return bool
+ */
+ public function validatePlugin($plugin)
+ {
+ if (! $plugin instanceof AssertionInterface) {
+ throw new InvalidArgumentException(
+ sprintf(
+ 'Plugin of type %s is invalid; must implement Zend\Permissions\Acl\Assertion\AssertionInterface',
+ (is_object($plugin) ? get_class($plugin) : gettype($plugin))
+ )
+ );
+ }
+
+ return true;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/Exception/InvalidAssertionException.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/Exception/InvalidAssertionException.php
new file mode 100644
index 00000000000..1f6bb87f094
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/Exception/InvalidAssertionException.php
@@ -0,0 +1,8 @@
+<?php
+namespace Zend\Permissions\Acl\Assertion\Exception;
+
+use Zend\Permissions\Acl\Exception\ExceptionInterface;
+
+class InvalidAssertionException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/ExceptionInterface.php
index 7d356abddd0..78c92c63393 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Permissions\Acl\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/InvalidArgumentException.php
index 8cf10bee0cb..0ca63111e53 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,4 +11,5 @@ namespace Zend\Permissions\Acl\Exception;
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/RuntimeException.php
index 9b8795660dc..db23864bfb2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,5 +12,4 @@ namespace Zend\Permissions\Acl\Exception;
class RuntimeException extends \RuntimeException implements
ExceptionInterface
{
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Resource/GenericResource.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Resource/GenericResource.php
index 019e2871841..2b45d6bd919 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Resource/GenericResource.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Resource/GenericResource.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Resource/ResourceInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Resource/ResourceInterface.php
index f761c2ed70c..4ae5b40acbf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Resource/ResourceInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Resource/ResourceInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/GenericRole.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/GenericRole.php
index 2f7463f89b4..a913393d7c7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/GenericRole.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/GenericRole.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/Registry.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/Registry.php
index 3c38ec07593..b575759aafa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/Registry.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/Registry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/RoleInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/RoleInterface.php
index 55c8375934d..104de047de7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/RoleInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Role/RoleInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/composer.json b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/composer.json
index 5eeacc35eb7..ffe94f9846f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/composer.json
@@ -6,6 +6,7 @@
"zf2",
"acl"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Permissions\\Acl\\": ""
@@ -13,12 +14,15 @@
},
"target-dir": "Zend/Permissions/Acl",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.23"
+ },
+ "suggest": {
+ "zendframework/zend-servicemanager": "To support Zend\\Permissions\\Acl\\Assertion\\AssertionManager plugin manager usage"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractIterator.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractIterator.php
index f7720143904..dc8a68340a3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractIterator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractIterator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,13 @@ use RecursiveIterator;
abstract class AbstractIterator implements RecursiveIterator
{
+ /**
+ * @var int
+ */
protected $index = 0;
+ /**
+ * @var array
+ */
protected $children = array();
/**
@@ -42,7 +48,7 @@ abstract class AbstractIterator implements RecursiveIterator
* (PHP 5 >= 5.0.0)<br/>
* Return the key of the current element
* @link http://php.net/manual/en/iterator.key.php
- * @return scalar scalar on success, or null on failure.
+ * @return int|null scalar on success, or null on failure.
*/
public function key()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractRole.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractRole.php
index d3d6ea7664c..0f69b0890e7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractRole.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractRole.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AssertionInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AssertionInterface.php
index 0a01addc04b..cddff258de4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AssertionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AssertionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Exception/ExceptionInterface.php
index c94f8b804dd..431c4d5ebb1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Permissions\Rbac\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Exception/InvalidArgumentException.php
index 9c89a682901..c2708ae49d8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,4 +11,5 @@ namespace Zend\Permissions\Rbac\Exception;
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Rbac.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Rbac.php
index aa903e6e648..8ed79a8eccb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Rbac.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Rbac.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -108,9 +108,16 @@ class Rbac extends AbstractIterator
);
}
+ if (is_object($objectOrName)) {
+ $requiredRole = $objectOrName->getName();
+ } else {
+ $requiredRole = $objectOrName;
+ }
+
$it = new RecursiveIteratorIterator($this, RecursiveIteratorIterator::CHILD_FIRST);
foreach ($it as $leaf) {
- if ((is_string($objectOrName) && $leaf->getName() == $objectOrName) || $leaf == $objectOrName) {
+ /** @var RoleInterface $leaf */
+ if ($leaf->getName() == $requiredRole) {
return $leaf;
}
}
@@ -127,6 +134,7 @@ class Rbac extends AbstractIterator
* @param RoleInterface|string $role
* @param string $permission
* @param AssertionInterface|Callable|null $assert
+ * @throws Exception\InvalidArgumentException
* @return bool
*/
public function isGranted($role, $permission, $assert = null)
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Role.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Role.php
index 9daa1d74353..18114a41f78 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Role.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Role.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php
index fd8a65c5fc3..f7a78279ab7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/RoleInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/composer.json b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/composer.json
index e06dc227bbe..e70e6c13ca5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/composer.json
@@ -6,6 +6,7 @@
"zf2",
"Rbac"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Permissions\\Rbac\\": ""
@@ -13,12 +14,12 @@
},
"target-dir": "Zend/Permissions/Rbac",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.23"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
index 53f9d2897a3..446a6334e94 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php
index 64e8e10da62..3d9b8ff31ef 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -436,8 +436,9 @@ class Console extends AbstractAdapter
break;
case self::ELEMENT_TEXT:
- $renderedElements[] = StringUtils::getWrapper($this->charset)->strPad(
- substr($text, 0, $this->textWidth),
+ $wrapper = StringUtils::getWrapper($this->charset);
+ $renderedElements[] = $wrapper->strPad(
+ $wrapper->substr($text, 0, $this->textWidth),
$this->textWidth,
' ',
STR_PAD_RIGHT
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
index e64d3afdce6..7f9c7ca9625 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
index 18e3045295c..a7bafe4584f 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,6 @@ use Zend\ProgressBar\Exception;
/**
* Exception for Zend\Progressbar component.
*/
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
- ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
index 64069fe3f48..43faa3cc946 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,6 @@ use Zend\ProgressBar\Exception;
/**
* Exception for Zend\Progressbar component.
*/
-class RuntimeException extends Exception\RuntimeException implements
- ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php
index f5f63f07183..66940e96e51 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php
index cf417468e64..25796bd4154 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPush.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/ProgressBar/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/ExceptionInterface.php
index d89fbc01eb6..a2ca184b6fc 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
index ff5b89b0e5b..122fc78d2c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,6 +12,6 @@ namespace Zend\ProgressBar\Exception;
/**
* Exception for Zend\Progressbar component.
*/
-class InvalidArgumentException extends \InvalidArgumentException implements
- ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/OutOfRangeException.php
index 72a7543e94f..9a477e31179 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/OutOfRangeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/PhpEnvironmentException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/PhpEnvironmentException.php
index 65823a236eb..2893bcdb006 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/PhpEnvironmentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/PhpEnvironmentException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ProgressBar\Exception;
class PhpEnvironmentException extends RuntimeException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/RuntimeException.php
index d22dd114e1a..6b8a51a4b79 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ namespace Zend\ProgressBar\Exception;
* Exception for Zend\Progressbar component.
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php
index 424a0d3c794..c811ecd0456 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
index 1474c4c2b40..82b42a356c5 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -137,9 +137,7 @@ abstract class AbstractUploadHandler implements UploadHandlerInterface
$adapter = $this->getProgressAdapter();
if (isset($adapter)) {
if ($adapter instanceof AbstractProgressAdapter) {
- $adapter = new ProgressBar(
- $adapter, 0, $status['total'], $this->getSessionNamespace()
- );
+ $adapter = new ProgressBar($adapter, 0, $status['total'], $this->getSessionNamespace());
$this->setProgressAdapter($adapter);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/ApcProgress.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/ApcProgress.php
index 236e3767af6..2fa561f4678 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/ApcProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/ApcProgress.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.php
index 3c8cfbede25..8560a610dd8 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php
index 9c97469396f..234759ed1c9 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ProgressBar\Upload;
-
/**
* Interface for Upload Progress Handlers
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadProgress.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadProgress.php
index 871de58dfc6..8dd65aacb19 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadProgress.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json b/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json
index 17a3e97fb91..c0cefdc875d 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/composer.json
@@ -6,6 +6,7 @@
"zf2",
"progressbar"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\ProgressBar\\": ""
@@ -13,17 +14,21 @@
},
"target-dir": "Zend/ProgressBar",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-json": "self.version",
+ "zendframework/zend-session": "self.version"
+ },
"suggest": {
"zendframework/zend-json": "Zend\\Json component",
"zendframework/zend-session": "To support progressbar persistent"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AbstractAdapter.php
index de5ae4a3e58..1b6c8b43cf8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AbstractAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AdapterInterface.php
index 132304f4bb2..44c0c4fcde9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AdapterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AdapterOptions.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AdapterOptions.php
index 594884d6a72..800eb9f8c0c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AdapterOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AdapterOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Serializer\Adapter;
use Zend\Stdlib\AbstractOptions;
class AdapterOptions extends AbstractOptions
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/IgBinary.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/IgBinary.php
index 391cb3ebbe9..d821c403b83 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/IgBinary.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/IgBinary.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/Json.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/Json.php
index 025c19efaed..03bde65dbcb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/Json.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/Json.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/JsonOptions.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/JsonOptions.php
index e6bc3c910b9..4b2e3e00466 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/JsonOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/JsonOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/MsgPack.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/MsgPack.php
index 01734e3978b..e8537d6b98c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/MsgPack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/MsgPack.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PhpCode.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PhpCode.php
index d2f672f8b60..9b2cee95644 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PhpCode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PhpCode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -44,7 +44,6 @@ class PhpCode extends AbstractAdapter
$err = ErrorHandler::stop();
if ($eval === false || $err) {
-
$msg = 'eval failed';
// Error handler doesn't catch syntax errors
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PhpSerialize.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PhpSerialize.php
index 3fef17e4aaa..5dbd92f53fe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PhpSerialize.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PhpSerialize.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -48,9 +48,7 @@ class PhpSerialize extends AbstractAdapter
$ret = serialize($value);
$err = ErrorHandler::stop();
if ($err) {
- throw new Exception\RuntimeException(
- 'Serialization failed', 0, $err
- );
+ throw new Exception\RuntimeException('Serialization failed', 0, $err);
}
return $ret;
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickle.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickle.php
index db0fea920f0..25ea9cd2f70 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickle.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickle.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -449,7 +449,7 @@ class PythonPickle extends AbstractAdapter
}
/**
- * Write an object as an dictionary
+ * Write an object as a dictionary
*
* @param object $value
*/
@@ -466,7 +466,7 @@ class PythonPickle extends AbstractAdapter
$this->writeArrayDict($value->toArray());
// If the object is an iterator simply iterate it
- // and convert it to an dictionary
+ // and convert it to a dictionary
} elseif ($value instanceof Traversable) {
$this->writeArrayDict($value);
@@ -1035,25 +1035,22 @@ class PythonPickle extends AbstractAdapter
if ($uniCode < 0x80) { // 1Byte
$utf8Char = chr($uniCode);
-
} elseif ($uniCode < 0x800) { // 2Byte
$utf8Char = chr(0xC0 | $uniCode >> 6)
. chr(0x80 | $uniCode & 0x3F);
-
} elseif ($uniCode < 0x10000) { // 3Byte
$utf8Char = chr(0xE0 | $uniCode >> 12)
. chr(0x80 | $uniCode >> 6 & 0x3F)
. chr(0x80 | $uniCode & 0x3F);
-
} elseif ($uniCode < 0x110000) { // 4Byte
$utf8Char = chr(0xF0 | $uniCode >> 18)
. chr(0x80 | $uniCode >> 12 & 0x3F)
. chr(0x80 | $uniCode >> 6 & 0x3F)
. chr(0x80 | $uniCode & 0x3F);
} else {
- throw new Exception\RuntimeException(sprintf(
- 'Unsupported unicode character found "%s"', dechex($uniCode)
- ));
+ throw new Exception\RuntimeException(
+ sprintf('Unsupported unicode character found "%s"', dechex($uniCode))
+ );
}
return $utf8Char;
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickleOptions.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickleOptions.php
index b43f2ab7263..bdf551174f3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickleOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickleOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/Wddx.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/Wddx.php
index b848cee1709..4d1ba3f836a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/Wddx.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/Wddx.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/WddxOptions.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/WddxOptions.php
index e403731ae03..a06276a6905 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/WddxOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/WddxOptions.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Serializer\Adapter;
-
class WddxOptions extends AdapterOptions
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/AdapterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Serializer/AdapterPluginManager.php
index 5be62ce6b3d..56d2f7291f6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/AdapterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/AdapterPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Serializer/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExceptionInterface.php
index 6620aa6a865..c58b17ada22 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Serializer\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php
index 798c1256349..d502a3d3010 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Serializer\Exception;
class ExtensionNotLoadedException extends RuntimeException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/InvalidArgumentException.php
index 3a0215acf5e..f0b3853280b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,4 +14,5 @@ namespace Zend\Serializer\Exception;
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/RuntimeException.php
index 9e1ac51ff35..3d8486aa5f2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ namespace Zend\Serializer\Exception;
* @used RuntimeException
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Serializer.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Serializer.php
index 5cc6bdc55bc..ec3b63b46e1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Serializer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Serializer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,7 @@ abstract class Serializer
*
* @var null|AdapterPluginManager
*/
- private static $adapters = null;
+ protected static $adapters;
/**
* The default adapter.
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/composer.json b/vendor/zendframework/zendframework/library/Zend/Serializer/composer.json
index 6c1ec8e5e23..c36b3ab56f7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/composer.json
@@ -6,6 +6,7 @@
"zf2",
"serializer"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Serializer\\": ""
@@ -13,18 +14,21 @@
},
"target-dir": "Zend/Serializer",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-json": "self.version",
"zendframework/zend-math": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-servicemanager": "self.version"
+ },
"suggest": {
"zendframework/zend-servicemanager": "To support plugin manager support"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/AbstractServer.php b/vendor/zendframework/zendframework/library/Zend/Server/AbstractServer.php
index e52deefd169..47e4ca6749c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/AbstractServer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/AbstractServer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Server/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Server/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Cache.php b/vendor/zendframework/zendframework/library/Zend/Server/Cache.php
index 2f61fa0404e..c23ea8f3d51 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Cache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Cache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -36,9 +36,7 @@ class Cache
*/
public static function save($filename, Server $server)
{
- if (!is_string($filename)
- || (!file_exists($filename) && !is_writable(dirname($filename))))
- {
+ if (!is_string($filename) || (!file_exists($filename) && !is_writable(dirname($filename)))) {
return false;
}
@@ -98,10 +96,7 @@ class Cache
*/
public static function get($filename, Server $server)
{
- if (!is_string($filename)
- || !file_exists($filename)
- || !is_readable($filename))
- {
+ if (!is_string($filename) || !file_exists($filename) || !is_readable($filename)) {
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Client.php b/vendor/zendframework/zendframework/library/Zend/Server/Client.php
index 203b9c011d1..b84ed4db612 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Client.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Client.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Definition.php b/vendor/zendframework/zendframework/library/Zend/Server/Definition.php
index 1cf6e09d5b5..442a037079e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Definition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Definition.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Server/Exception/BadMethodCallException.php
index 39d8281e306..8ba9c2da3e8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Exception/BadMethodCallException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Server\Exception;
-class BadMethodCallException
- extends \BadMethodCallException
- implements ExceptionInterface
-{}
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Server/Exception/ExceptionInterface.php
index 65974b9d9cc..8b19f6c8faf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Server/Exception/InvalidArgumentException.php
index 9683e6dc81a..bbddd095d32 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Exception/InvalidArgumentException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Server\Exception;
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Server/Exception/RuntimeException.php
index 4dc22a4022f..f2f213e26db 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Exception/RuntimeException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Server\Exception;
-class RuntimeException
- extends \RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Method/Callback.php b/vendor/zendframework/zendframework/library/Zend/Server/Method/Callback.php
index 6f0ae26d1bf..7e73b3496b6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Method/Callback.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Method/Callback.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -48,7 +48,7 @@ class Callback
*/
public function __construct($options = null)
{
- if ((null !== $options) && is_array($options)) {
+ if ((null !== $options) && is_array($options)) {
$this->setOptions($options);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Method/Definition.php b/vendor/zendframework/zendframework/library/Zend/Server/Method/Definition.php
index 661259776c4..3df08b53110 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Method/Definition.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Method/Definition.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Method/Parameter.php b/vendor/zendframework/zendframework/library/Zend/Server/Method/Parameter.php
index a867ec97294..9d6ea917ec1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Method/Parameter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Method/Parameter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Method/Prototype.php b/vendor/zendframework/zendframework/library/Zend/Server/Method/Prototype.php
index 61380b9864f..851cda9a63d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Method/Prototype.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Method/Prototype.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection.php
index 729efbf7378..28eb04d8d42 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/AbstractFunction.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/AbstractFunction.php
index 1f288316d66..cb37bf94cd5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/AbstractFunction.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/AbstractFunction.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -282,8 +282,9 @@ abstract class AbstractFunction
}
} elseif ($nParamTypesTmp != $paramCount) {
throw new Exception\RuntimeException(
- 'Variable number of arguments is not supported for services (except optional parameters). '
- . 'Number of function arguments must correspond to actual number of arguments described in a docblock.');
+ 'Variable number of arguments is not supported for services (except optional parameters). '
+ . 'Number of function arguments must correspond to actual number of arguments described in a docblock.'
+ );
}
$paramTypes = array();
@@ -297,7 +298,6 @@ abstract class AbstractFunction
$this->buildSignatures($return, $returnDesc, $paramTypes, $paramDesc);
}
-
/**
* Proxy reflection calls
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/BadMethodCallException.php
index 7c8f83a70f9..613fdde0bbe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Server\Reflection\Exception;
use Zend\Server\Exception;
-class BadMethodCallException
- extends Exception\BadMethodCallException
- implements ExceptionInterface
-{}
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
index ee5507ae692..e44c798d315 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use Zend\Server\Exception\ExceptionInterface as Exception;
* Zend\Server\Reflection exceptions
*/
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php
index 74bd70de890..4fc4e271691 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Server\Reflection\Exception;
use Zend\Server\Exception;
-class InvalidArgumentException
- extends Exception\InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/RuntimeException.php
index 75bfeee5b5a..6ddfdf95954 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Server\Reflection\Exception;
use Zend\Server\Exception;
-class RuntimeException
- extends Exception\RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Node.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Node.php
index f6e13472982..6f49044ae26 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Node.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Node.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -168,9 +168,7 @@ class Node
if (null === $value) {
$endPoints[] = $this;
- } elseif ((null !== $value)
- && $child->hasChildren())
- {
+ } elseif ((null !== $value) && $child->hasChildren()) {
$childEndPoints = $child->getEndPoints();
if (!empty($childEndPoints)) {
$endPoints = array_merge($endPoints, $childEndPoints);
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Prototype.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Prototype.php
index 416995bff8e..35c53ddd35a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Prototype.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Prototype.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionClass.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionClass.php
index 7c04798961b..8f191bc1fb3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionClass.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionClass.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionFunction.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionFunction.php
index 2595ce56d3a..f06fc68ffe3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionFunction.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionFunction.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionMethod.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionMethod.php
index af63f5064b5..3e8865d0c70 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionMethod.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionMethod.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionParameter.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionParameter.php
index e076e93bebe..af6b661f3c3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionParameter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionParameter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionReturnValue.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionReturnValue.php
index 64f0fb956a6..3b7e1839359 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionReturnValue.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/ReflectionReturnValue.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/Server.php b/vendor/zendframework/zendframework/library/Zend/Server/Server.php
index 56e5269bb6b..3cf0756da08 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Server.php
+++ b/vendor/zendframework/zendframework/library/Zend/Server/Server.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Server/composer.json b/vendor/zendframework/zendframework/library/Zend/Server/composer.json
index 2d5bc49dd60..5391d38a1e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Server/composer.json
@@ -6,6 +6,7 @@
"zf2",
"server"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Server\\": ""
@@ -13,14 +14,14 @@
},
"target-dir": "Zend/Server",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-code": "self.version"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractFactoryInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractFactoryInterface.php
index f54205b25a3..96bffea829a 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractFactoryInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractFactoryInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractPluginManager.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractPluginManager.php
index cd5d5c91d48..791a314f948 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -164,6 +164,16 @@ abstract class AbstractPluginManager extends ServiceManager implements ServiceLo
{
$invokable = $this->invokableClasses[$canonicalName];
+ if (!class_exists($invokable)) {
+ throw new Exception\ServiceNotFoundException(sprintf(
+ '%s: failed retrieving "%s%s" via invokable class "%s"; class does not exist',
+ get_class($this) . '::' . __FUNCTION__,
+ $canonicalName,
+ ($requestedName ? '(alias: ' . $requestedName . ')' : ''),
+ $invokable
+ ));
+ }
+
if (null === $this->creationOptions
|| (is_array($this->creationOptions) && empty($this->creationOptions))
) {
@@ -206,9 +216,13 @@ abstract class AbstractPluginManager extends ServiceManager implements ServiceLo
} elseif (is_callable($factory)) {
$instance = $this->createServiceViaCallback($factory, $canonicalName, $requestedName);
} else {
- throw new Exception\ServiceNotCreatedException(sprintf(
- 'While attempting to create %s%s an invalid factory was registered for this instance type.', $canonicalName, ($requestedName ? '(alias: ' . $requestedName . ')' : '')
- ));
+ throw new Exception\ServiceNotCreatedException(
+ sprintf(
+ 'While attempting to create %s%s an invalid factory was registered for this instance type.',
+ $canonicalName,
+ ($requestedName ? '(alias: ' . $requestedName . ')' : '')
+ )
+ );
}
return $instance;
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/ServiceManager/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Config.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Config.php
index c64bb0e7c36..0551ee02e6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Config.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Config.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ConfigInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ConfigInterface.php
index 1593312a3af..d55bc0e5630 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ConfigInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ConfigInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/DelegatorFactoryInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/DelegatorFactoryInterface.php
index 27ad5f1fb7d..fc8a47a9eac 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/DelegatorFactoryInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/DelegatorFactoryInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php
index 616ed25670c..7b4b257d271 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiAbstractServiceFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -43,7 +43,7 @@ class DiAbstractServiceFactory extends DiServiceFactory implements AbstractFacto
return $this->get($requestedName, array());
}
- return $this->get($serviceName, array());
+ return $this->get($name, array());
}
/**
@@ -51,10 +51,18 @@ class DiAbstractServiceFactory extends DiServiceFactory implements AbstractFacto
*/
public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
{
- return $this->instanceManager->hasSharedInstance($requestedName)
+ if ($this->instanceManager->hasSharedInstance($requestedName)
|| $this->instanceManager->hasAlias($requestedName)
|| $this->instanceManager->hasConfig($requestedName)
|| $this->instanceManager->hasTypePreferences($requestedName)
- || $this->definitions->hasClass($requestedName);
+ ) {
+ return true;
+ }
+
+ if (! $this->definitions->hasClass($requestedName) || interface_exists($requestedName)) {
+ return false;
+ }
+
+ return true;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiInstanceManagerProxy.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiInstanceManagerProxy.php
index cdd4bf9fa65..87b10a390d7 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiInstanceManagerProxy.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiInstanceManagerProxy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceFactory.php
index c64784c58d2..97bcb02c952 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -100,12 +100,9 @@ class DiServiceFactory extends Di implements FactoryInterface
}
try {
-
$service = parent::get($name, $params);
return $service;
-
} catch (DiClassNotFoundException $e) {
-
// allow this di service to get dependencies from the service locator AFTER trying di
if ($this->useServiceLocator == self::USE_SL_AFTER_DI && $this->serviceLocator->has($name)) {
return $this->serviceLocator->get($name);
@@ -117,6 +114,5 @@ class DiServiceFactory extends Di implements FactoryInterface
);
}
}
-
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceInitializer.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceInitializer.php
index 6bfe8d2eaf3..2e3c594d14f 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceInitializer.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceInitializer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php
index d50ef311ad5..280ff9d11a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/CircularDependencyFoundException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/CircularReferenceException.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/CircularReferenceException.php
index f5451f804ac..0472cdf27cb 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/CircularReferenceException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/CircularReferenceException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ExceptionInterface.php
index d72a170d667..ca59fbf39e7 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/InvalidArgumentException.php
index d997c62ee7a..174c7eb0825 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php
index 8958b6310bf..a7065c4df66 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/InvalidServiceNameException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/RuntimeException.php
index 1ce28f1fc7c..d1916537406 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php
index caf843d7559..a8b08e0f5da 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ServiceNotCreatedException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php
index e02b24099a7..478f4ee0ddb 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Exception/ServiceNotFoundException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/FactoryInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/FactoryInterface.php
index 8fd7dc44916..0a65d6550c4 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/FactoryInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/FactoryInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/InitializerInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/InitializerInterface.php
index b12061b54a5..7e7f793fcbd 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/InitializerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/InitializerInterface.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ServiceManager;
-
interface InitializerInterface
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/MutableCreationOptionsInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/MutableCreationOptionsInterface.php
index 785e6e84e59..3464155e7fa 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/MutableCreationOptionsInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/MutableCreationOptionsInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php
index 3be5506b15e..6dcdf322071 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php
index e390181853f..9c94e75a28c 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Proxy/LazyServiceFactoryFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -43,6 +43,10 @@ class LazyServiceFactoryFactory implements FactoryInterface
$factoryConfig = new Configuration();
+ if (isset($lazyServices['proxies_namespace'])) {
+ $factoryConfig->setProxiesNamespace($lazyServices['proxies_namespace']);
+ }
+
if (isset($lazyServices['proxies_target_dir'])) {
$factoryConfig->setProxiesTargetDir($lazyServices['proxies_target_dir']);
}
@@ -51,22 +55,7 @@ class LazyServiceFactoryFactory implements FactoryInterface
$factoryConfig->setGeneratorStrategy(new EvaluatingGeneratorStrategy());
}
- if (isset($lazyServices['auto_generate_proxies'])) {
- $factoryConfig->setAutoGenerateProxies($lazyServices['auto_generate_proxies']);
-
- // register the proxy autoloader if the proxies already exist
- if (!$lazyServices['auto_generate_proxies']) {
- spl_autoload_register($factoryConfig->getProxyAutoloader());
-
- $factoryConfig->setGeneratorStrategy(new EvaluatingGeneratorStrategy());
- }
- }
-
- //if (!isset($lazyServicesConfig['runtime_evaluate_proxies']))
-
- if (isset($lazyServices['proxies_namespace'])) {
- $factoryConfig->setProxiesNamespace($lazyServices['proxies_namespace']);
- }
+ spl_autoload_register($factoryConfig->getProxyAutoloader());
return new LazyServiceFactory(new LazyLoadingValueHolderFactory($factoryConfig), $lazyServices['class_map']);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorAwareInterface.php
index 7f53ada01da..1058042cf9d 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorAwareTrait.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorAwareTrait.php
index 17f6069d854..94ceb56e697 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorAwareTrait.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorAwareTrait.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ServiceManager;
-
trait ServiceLocatorAwareTrait
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorInterface.php
index b9a04e5dc1f..4df3c5fc516 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManager.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManager.php
index 65d612fe489..2ed71d27e4d 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManager.php
@@ -3,17 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ServiceManager;
-use ReflectionClass;
-
class ServiceManager implements ServiceLocatorInterface
{
-
/**@#+
* Constants
*/
@@ -59,14 +56,14 @@ class ServiceManager implements ServiceLocatorInterface
protected $pendingAbstractFactoryRequests = array();
/**
- * @var string
+ * @var integer
*/
- protected $lastAbstractFactoryUsed = null;
+ protected $nestedContextCounter = -1;
/**
- * @var string
+ * @var array
*/
- protected $lastCanonicalNameUsed = null;
+ protected $nestedContext = array();
/**
* @var array
@@ -429,6 +426,30 @@ class ServiceManager implements ServiceLocatorInterface
return $this;
}
+ /**
+ * @param string $name
+ * @return bool
+ * @throws Exception\ServiceNotFoundException
+ */
+ public function isShared($name)
+ {
+ $cName = $this->canonicalizeName($name);
+
+ if (!$this->has($name)) {
+ throw new Exception\ServiceNotFoundException(sprintf(
+ '%s: A service by the name "%s" was not found',
+ get_class($this) . '::' . __FUNCTION__,
+ $name
+ ));
+ }
+
+ if (!isset($this->shared[$cName])) {
+ return $this->shareByDefault();
+ }
+
+ return $this->shared[$cName];
+ }
+
/**
* Resolve the alias for the given canonical name
*
@@ -494,6 +515,7 @@ class ServiceManager implements ServiceLocatorInterface
}
if (!$instance) {
+ $this->checkNestedContextStart($cName);
if (
isset($this->invokableClasses[$cName])
|| isset($this->factories[$cName])
@@ -512,10 +534,12 @@ class ServiceManager implements ServiceLocatorInterface
} elseif ($usePeeringServiceManagers && !$this->retrieveFromPeeringManagerFirst) {
$instance = $this->retrieveFromPeeringManager($name);
}
+ $this->checkNestedContextStop();
}
// Still no instance? raise an exception
if ($instance === null) {
+ $this->checkNestedContextStop(true);
if ($isAlias) {
throw new Exception\ServiceNotFoundException(sprintf(
'An alias "%s" was requested but no service could be found.',
@@ -612,12 +636,14 @@ class ServiceManager implements ServiceLocatorInterface
if ($instance === null && isset($this->invokableClasses[$cName])) {
$instance = $this->createFromInvokable($cName, $rName);
}
-
+ $this->checkNestedContextStart($cName);
if ($instance === null && $this->canCreateFromAbstractFactory($cName, $rName)) {
$instance = $this->createFromAbstractFactory($cName, $rName);
}
+ $this->checkNestedContextStop();
if ($instance === null && $this->throwExceptionInCreate) {
+ $this->checkNestedContextStop(true);
throw new Exception\ServiceNotFoundException(sprintf(
'No valid instance was found for %s%s',
$cName,
@@ -643,65 +669,57 @@ class ServiceManager implements ServiceLocatorInterface
/**
* Determine if we can create an instance.
+ * Proxies to has()
*
* @param string|array $name
* @param bool $checkAbstractFactories
* @return bool
- *
- * @deprecated this method is being deprecated as of zendframework 2.2, and may be removed in future major versions
+ * @deprecated this method is being deprecated as of zendframework 2.3, and may be removed in future major versions
*/
public function canCreate($name, $checkAbstractFactories = true)
{
- if (is_array($name)) {
- list($cName, $rName) = $name;
- } else {
- $rName = $name;
- $cName = $this->canonicalizeName($rName);
- }
-
- return (
- isset($this->invokableClasses[$cName])
- || isset($this->factories[$cName])
- || isset($this->aliases[$cName])
- || isset($this->instances[$cName])
- || ($checkAbstractFactories && $this->canCreateFromAbstractFactory($cName, $rName))
- );
+ trigger_error(sprintf('%s is deprecated; please use %s::has', __METHOD__, __CLASS__), E_USER_DEPRECATED);
+ return $this->has($name, $checkAbstractFactories, false);
}
/**
- * @param string|array $name
+ * Determine if an instance exists.
+ *
+ * @param string|array $name An array argument accepts exactly two values.
+ * Example: array('canonicalName', 'requestName')
* @param bool $checkAbstractFactories
* @param bool $usePeeringServiceManagers
* @return bool
*/
public function has($name, $checkAbstractFactories = true, $usePeeringServiceManagers = true)
{
- if (is_array($name)) {
- list($cName, $rName) = $name;
- } else {
+ if (is_string($name)) {
$rName = $name;
// inlined code from ServiceManager::canonicalizeName for performance
if (isset($this->canonicalNames[$rName])) {
- $cName = $this->canonicalNames[$name];
+ $cName = $this->canonicalNames[$rName];
} else {
$cName = $this->canonicalizeName($name);
}
+ } elseif (is_array($name) && count($name) >= 2) {
+ list($cName, $rName) = $name;
+ } else {
+ return false;
}
- if (
- isset($this->invokableClasses[$cName])
+ if (isset($this->invokableClasses[$cName])
|| isset($this->factories[$cName])
|| isset($this->aliases[$cName])
|| isset($this->instances[$cName])
- || ($checkAbstractFactories && $this->canCreateFromAbstractFactory($cName, $name))
+ || ($checkAbstractFactories && $this->canCreateFromAbstractFactory($cName, $rName))
) {
return true;
}
if ($usePeeringServiceManagers) {
foreach ($this->peeringServiceManagers as $peeringServiceManager) {
- if ($peeringServiceManager->has($rName)) {
+ if ($peeringServiceManager->has($name)) {
return true;
}
}
@@ -719,33 +737,33 @@ class ServiceManager implements ServiceLocatorInterface
*/
public function canCreateFromAbstractFactory($cName, $rName)
{
- // check abstract factories
- foreach ($this->abstractFactories as $abstractFactory) {
- $factoryClass = get_class($abstractFactory);
-
- if (
- isset($this->pendingAbstractFactoryRequests[$factoryClass])
- && $this->pendingAbstractFactoryRequests[$factoryClass] == $rName
- ) {
+ if (array_key_exists($cName, $this->nestedContext)) {
+ $context = $this->nestedContext[$cName];
+ if ($context === false) {
return false;
+ } elseif (is_object($context)) {
+ return !isset($this->pendingAbstractFactoryRequests[get_class($context).$cName]);
}
-
- $objectHash = spl_object_hash($abstractFactory);
-
- if ($this->lastAbstractFactoryUsed === $objectHash && $this->lastCanonicalNameUsed === $cName) {
- $this->lastAbstractFactoryUsed = $this->lastCanonicalNameUsed = null;
- return false;
+ }
+ $this->checkNestedContextStart($cName);
+ // check abstract factories
+ $result = false;
+ $this->nestedContext[$cName] = false;
+ foreach ($this->abstractFactories as $abstractFactory) {
+ $pendingKey = get_class($abstractFactory).$cName;
+ if (isset($this->pendingAbstractFactoryRequests[$pendingKey])) {
+ $result = false;
+ break;
}
- $this->lastAbstractFactoryUsed = $objectHash;
- $this->lastCanonicalNameUsed = $cName;
-
if ($abstractFactory->canCreateServiceWithName($this, $cName, $rName)) {
- $this->lastAbstractFactoryUsed = $this->lastCanonicalNameUsed = null;
- return true;
+ $this->nestedContext[$cName] = $abstractFactory;
+ $result = true;
+ break;
}
}
- return false;
+ $this->checkNestedContextStop();
+ return $result;
}
/**
@@ -971,6 +989,7 @@ class ServiceManager implements ServiceLocatorInterface
{
foreach ($this->peeringServiceManagers as $peeringServiceManager) {
if ($peeringServiceManager->has($name)) {
+ $this->shared[$name] = $peeringServiceManager->isShared($name);
return $peeringServiceManager->get($name);
}
}
@@ -985,6 +1004,7 @@ class ServiceManager implements ServiceLocatorInterface
foreach ($this->peeringServiceManagers as $peeringServiceManager) {
if ($peeringServiceManager->has($name)) {
+ $this->shared[$name] = $peeringServiceManager->isShared($name);
return $peeringServiceManager->get($name);
}
}
@@ -1055,31 +1075,21 @@ class ServiceManager implements ServiceLocatorInterface
*/
protected function createFromAbstractFactory($canonicalName, $requestedName)
{
- foreach ($this->abstractFactories as $index => $abstractFactory) {
- // support factories as strings
- if (is_string($abstractFactory) && class_exists($abstractFactory, true)) {
- $this->abstractFactories[$index] = $abstractFactory = new $abstractFactory;
- } elseif (!$abstractFactory instanceof AbstractFactoryInterface) {
- throw new Exception\ServiceNotCreatedException(sprintf(
- 'While attempting to create %s%s an abstract factory could not produce a valid instance.',
- $canonicalName,
- ($requestedName ? '(alias: ' . $requestedName . ')' : '')
- ));
- }
+ if (isset($this->nestedContext[$canonicalName])) {
+ $abstractFactory = $this->nestedContext[$canonicalName];
+ $pendingKey = get_class($abstractFactory).$canonicalName;
try {
- if ($abstractFactory->canCreateServiceWithName($this, $canonicalName, $requestedName)) {
- $this->pendingAbstractFactoryRequests[get_class($abstractFactory)] = $requestedName;
- $instance = $this->createServiceViaCallback(
- array($abstractFactory, 'createServiceWithName'),
- $canonicalName,
- $requestedName
- );
- unset($this->pendingAbstractFactoryRequests[get_class($abstractFactory)]);
- } else {
- $instance = null;
- }
+ $this->pendingAbstractFactoryRequests[$pendingKey] = true;
+ $instance = $this->createServiceViaCallback(
+ array($abstractFactory, 'createServiceWithName'),
+ $canonicalName,
+ $requestedName
+ );
+ unset($this->pendingAbstractFactoryRequests[$pendingKey]);
+ return $instance;
} catch (\Exception $e) {
- unset($this->pendingAbstractFactoryRequests[get_class($abstractFactory)]);
+ unset($this->pendingAbstractFactoryRequests[$pendingKey]);
+ $this->checkNestedContextStop(true);
throw new Exception\ServiceNotCreatedException(
sprintf(
'An abstract factory could not create an instance of %s%s.',
@@ -1090,10 +1100,42 @@ class ServiceManager implements ServiceLocatorInterface
$e
);
}
- if ($instance !== null) {
- return $instance;
- }
}
+ return null;
+ }
+
+ /**
+ *
+ * @param string $cName
+ * @return self
+ */
+ protected function checkNestedContextStart($cName)
+ {
+ if ($this->nestedContextCounter === -1 || !isset($this->nestedContext[$cName])) {
+ $this->nestedContext[$cName] = null;
+ }
+ $this->nestedContextCounter++;
+ return $this;
+ }
+
+ /**
+ *
+ * @param bool $force
+ * @return self
+ */
+ protected function checkNestedContextStop($force = false)
+ {
+ if ($force) {
+ $this->nestedContextCounter = -1;
+ $this->nestedContext = array();
+ return $this;
+ }
+
+ $this->nestedContextCounter--;
+ if ($this->nestedContextCounter === -1) {
+ $this->nestedContext = array();
+ }
+ return $this;
}
/**
@@ -1111,7 +1153,6 @@ class ServiceManager implements ServiceLocatorInterface
};
for ($i = 0; $i < $delegatorsCount; $i += 1) {
-
$delegatorFactory = $this->delegators[$canonicalName][$i];
if (is_string($delegatorFactory)) {
@@ -1146,6 +1187,8 @@ class ServiceManager implements ServiceLocatorInterface
* @see https://bugs.php.net/bug.php?id=53727
* @see https://github.com/zendframework/zf2/pull/1807
*
+ * @deprecated since zf 2.3 requires PHP >= 5.3.23
+ *
* @param string $className
* @param string $type
* @return bool
@@ -1154,17 +1197,7 @@ class ServiceManager implements ServiceLocatorInterface
*/
protected static function isSubclassOf($className, $type)
{
- if (is_subclass_of($className, $type)) {
- return true;
- }
- if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
- return false;
- }
- if (!interface_exists($type)) {
- return false;
- }
- $r = new ReflectionClass($className);
- return $r->implementsInterface($type);
+ return is_subclass_of($className, $type);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManagerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManagerAwareInterface.php
index 320f6bc69ef..2519bbaf4fa 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManagerAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManagerAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/composer.json b/vendor/zendframework/zendframework/library/Zend/ServiceManager/composer.json
index 15e65e28e3b..d843f4929eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/composer.json
@@ -6,6 +6,7 @@
"zf2",
"servicemanager"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\ServiceManager\\": ""
@@ -13,15 +14,19 @@
},
"target-dir": "Zend/ServiceManager",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.23"
+ },
+ "require-dev": {
+ "zendframework/zend-di": "self.version"
},
"suggest": {
+ "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services",
"zendframework/zend-di": "Zend\\Di component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/AbstractContainer.php b/vendor/zendframework/zendframework/library/Zend/Session/AbstractContainer.php
index e3cc1078e90..39327d11064 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/AbstractContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/AbstractContainer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -63,7 +63,7 @@ abstract class AbstractContainer extends ArrayObject
*/
public function __construct($name = 'Default', Manager $manager = null)
{
- if (!preg_match('/^[a-z][a-z0-9_\\\]+$/i', $name)) {
+ if (!preg_match('/^[a-z0-9][a-z0-9_\\\\]+$/i', $name)) {
throw new Exception\InvalidArgumentException(
'Name passed to container is invalid; must consist of alphanumerics, backslashes and underscores only'
);
@@ -609,6 +609,6 @@ abstract class AbstractContainer extends ArrayObject
$storage = $this->verifyNamespace();
$container = $storage[$this->getName()];
- return $container->getArrayCopy();
+ return $container instanceof ArrayObject ? $container->getArrayCopy() : $container;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/AbstractManager.php b/vendor/zendframework/zendframework/library/Zend/Session/AbstractManager.php
index 7f94be15e94..145841a91fc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/AbstractManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/AbstractManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Session/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Session/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Config/ConfigInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/Config/ConfigInterface.php
index a71b891e71f..97b062d7ac0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Config/ConfigInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Config/ConfigInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Config/SessionConfig.php b/vendor/zendframework/zendframework/library/Zend/Session/Config/SessionConfig.php
index e909e5043e3..3328a6c9f8d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Config/SessionConfig.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Config/SessionConfig.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -42,6 +42,7 @@ class SessionConfig extends StandardConfig
* @var array Valid cache limiters (per session.cache_limiter)
*/
protected $validCacheLimiters = array(
+ '',
'nocache',
'public',
'private',
@@ -72,7 +73,6 @@ class SessionConfig extends StandardConfig
*/
public function setStorageOption($storageName, $storageValue)
{
- $key = false;
switch ($storageName) {
case 'remember_me_seconds':
// do nothing; not an INI option
@@ -86,9 +86,10 @@ class SessionConfig extends StandardConfig
}
$result = ini_set($key, $storageValue);
- if (FALSE === $result) {
- throw new Exception\InvalidArgumentException("'" . $key .
- "' is not a valid sessions-related ini setting.");
+ if (false === $result) {
+ throw new Exception\InvalidArgumentException(
+ "'{$key}' is not a valid sessions-related ini setting."
+ );
}
return $this;
}
@@ -161,7 +162,6 @@ class SessionConfig extends StandardConfig
return $this;
}
-
/**
* Set session.serialize_handler
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php b/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php
index 805691fd7d4..5ff2c2469a5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -88,7 +88,6 @@ class StandardConfig implements ConfigInterface
*/
protected $options = array();
-
/**
* Set many options at once
*
@@ -251,8 +250,6 @@ class StandardConfig implements ConfigInterface
return $this->savePath;
}
-
-
/**
* Set session.name
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Container.php b/vendor/zendframework/zendframework/library/Zend/Session/Container.php
index 53e2eb0b9f9..9957ae7229f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Container.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Container.php
@@ -3,18 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Session;
-if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
- class_alias('Zend\Session\AbstractContainer', 'Zend\Session\AbstractBaseContainer');
-} else {
- class_alias('Zend\Session\Container\PhpReferenceCompatibility', 'Zend\Session\AbstractBaseContainer');
-}
-
/**
* Session storage container
*
@@ -23,6 +17,24 @@ if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
* Additionally, expiries may be absolute TTLs or measured in "hops", which
* are based on how many times the key or container were accessed.
*/
-class Container extends AbstractBaseContainer
+class Container extends AbstractContainer
{
+ /**
+ * Retrieve a specific key in the container
+ *
+ * @param string $key
+ * @return mixed
+ */
+ public function &offsetGet($key)
+ {
+ $ret = null;
+ if (!$this->offsetExists($key)) {
+ return $ret;
+ }
+ $storage = $this->getStorage();
+ $name = $this->getName();
+ $ret =& $storage[$name][$key];
+
+ return $ret;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Container/PhpReferenceCompatibility.php b/vendor/zendframework/zendframework/library/Zend/Session/Container/PhpReferenceCompatibility.php
deleted file mode 100644
index a367fba8031..00000000000
--- a/vendor/zendframework/zendframework/library/Zend/Session/Container/PhpReferenceCompatibility.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Session\Container;
-
-use Zend\Session\AbstractContainer;
-
-/**
- * Session storage container for PHP 5.3.4 and above.
- */
-abstract class PhpReferenceCompatibility extends AbstractContainer
-{
- /**
- * Retrieve a specific key in the container
- *
- * @param string $key
- * @return mixed
- */
- public function &offsetGet($key)
- {
- $ret = null;
- if (!$this->offsetExists($key)) {
- return $ret;
- }
- $storage = $this->getStorage();
- $name = $this->getName();
- $ret =& $storage[$name][$key];
-
- return $ret;
- }
-}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Session/Exception/BadMethodCallException.php
index 8d31d387133..273372d7795 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,4 +11,5 @@ namespace Zend\Session\Exception;
class BadMethodCallException extends \BadMethodCallException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/Exception/ExceptionInterface.php
index 4466e36d849..457ecc7b809 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ namespace Zend\Session\Exception;
* Zend\Session\Exception
*/
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Session/Exception/InvalidArgumentException.php
index f90ab4161b1..85e698dabc8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,4 +11,5 @@ namespace Zend\Session\Exception;
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Session/Exception/RuntimeException.php
index be4cf0e2a9a..48446ecbb5f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Exception/RuntimeException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Session\Exception;
class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/ManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/ManagerInterface.php
index 2038c6928b5..f5e34681ebd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/ManagerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/ManagerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/Cache.php b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/Cache.php
index c5ad2707474..be3b4d75655 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/Cache.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/Cache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/DbTableGateway.php b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/DbTableGateway.php
index 7d791192da9..77d0e4dd28c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/DbTableGateway.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/DbTableGateway.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -164,10 +164,12 @@ class DbTableGateway implements SaveHandlerInterface
public function gc($maxlifetime)
{
$platform = $this->tableGateway->getAdapter()->getPlatform();
- return (bool) $this->tableGateway->delete(sprintf('%s + %s < %d',
- $platform->quoteIdentifier($this->options->getModifiedColumn()),
- $platform->quoteIdentifier($this->options->getLifetimeColumn()),
- time()
- ));
+ return (bool) $this->tableGateway->delete(
+ sprintf(
+ '%s < %d',
+ $platform->quoteIdentifier($this->options->getModifiedColumn()),
+ (time() - $this->lifetime)
+ )
+ );
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php
index ad55c73c751..6553863acf1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -47,7 +47,6 @@ class DbTableGatewayOptions extends AbstractOptions
*/
protected $modifiedColumn = 'modified';
-
/**
* Set Id Column
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDB.php b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDB.php
index 2edabd282cd..2965ab49251 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDB.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDB.php
@@ -4,7 +4,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -51,7 +51,7 @@ class MongoDB implements SaveHandlerInterface
*
* @param Mongo|MongoClient $mongo
* @param MongoDBOptions $options
- * @throws Zend\Session\Exception\InvalidArgumentException
+ * @throws InvalidArgumentException
*/
public function __construct($mongo, MongoDBOptions $options)
{
@@ -63,11 +63,11 @@ class MongoDB implements SaveHandlerInterface
}
if (null === ($database = $options->getDatabase())) {
- throw new InvalidArgumentException('The database option cannot be emtpy');
+ throw new InvalidArgumentException('The database option cannot be empty');
}
if (null === ($collection = $options->getCollection())) {
- throw new InvalidArgumentException('The collection option cannot be emtpy');
+ throw new InvalidArgumentException('The collection option cannot be empty');
}
$this->mongoCollection = $mongo->selectCollection($database, $collection);
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDBOptions.php b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDBOptions.php
index 7eb7c95cc79..d915b682920 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDBOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDBOptions.php
@@ -4,7 +4,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -38,7 +38,7 @@ class MongoDBOptions extends AbstractOptions
* @see http://php.net/manual/en/mongocollection.save.php
* @var string
*/
- protected $saveOptions = array('safe' => true);
+ protected $saveOptions = array('w' => 1);
/**
* Name field
@@ -68,6 +68,19 @@ class MongoDBOptions extends AbstractOptions
*/
protected $modifiedField = 'modified';
+
+ /**
+ * {@inheritdoc}
+ */
+ public function __construct($options = null)
+ {
+ parent::__construct($options);
+
+ if ($this->saveOptions === array('w' => 1) && version_compare(phpversion('mongo'), '1.3.0', '<')) {
+ $this->saveOptions = array('safe' => true);
+ }
+ }
+
/**
* Set database name
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/SaveHandlerInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/SaveHandlerInterface.php
index 5ee7dd4985b..8ed3bcf2137 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/SaveHandlerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/SaveHandlerInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Service/ContainerAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Session/Service/ContainerAbstractServiceFactory.php
index cb4ecd7e479..0d099dc64c7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Service/ContainerAbstractServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Service/ContainerAbstractServiceFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionConfigFactory.php b/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionConfigFactory.php
index 0da49842b79..35f1d889613 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionConfigFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionConfigFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -43,7 +43,7 @@ class SessionConfigFactory implements FactoryInterface
if (!class_exists($config['config_class'])) {
throw new ServiceNotCreatedException(sprintf(
'Invalid configuration class "%s" specified in "config_class" session configuration; must be a valid class',
- $class
+ $config['config_class']
));
}
$class = $config['config_class'];
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionManagerFactory.php
index f69e2987597..864d8649c6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionManagerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -53,6 +53,7 @@ class SessionManagerFactory implements FactoryInterface
* - enable_default_container_manager: whether to inject the created instance
* as the default manager for Container instances. The default value for
* this is true; set it to false to disable.
+ * - validators: ...
*
* @param ServiceLocatorInterface $services
* @return SessionManager
@@ -112,6 +113,14 @@ class SessionManagerFactory implements FactoryInterface
) {
$managerConfig = array_merge($managerConfig, $configService['session_manager']);
}
+ // Attach validators to session manager, if any
+ if (isset($managerConfig['validators'])) {
+ $chain = $manager->getValidatorChain();
+ foreach ($managerConfig['validators'] as $validator) {
+ $validator = new $validator();
+ $chain->attach('session.validate', array($validator, 'isValid'));
+ }
+ }
}
// If configuration enables the session manager as the default manager for container
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Service/StorageFactory.php b/vendor/zendframework/zendframework/library/Zend/Session/Service/StorageFactory.php
index 6222e75adc7..7dfc827b98f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Service/StorageFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Service/StorageFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,7 +12,7 @@ namespace Zend\Session\Service;
use Zend\ServiceManager\Exception\ServiceNotCreatedException;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\Session\Storage\Exception as SessionException;
+use Zend\Session\Exception\ExceptionInterface as SessionException;
use Zend\Session\Storage\Factory;
use Zend\Session\Storage\StorageInterface;
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/SessionManager.php b/vendor/zendframework/zendframework/library/Zend/Session/SessionManager.php
index 3dafc003c6a..77219f645a1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/SessionManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/SessionManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -341,7 +341,7 @@ class SessionManager extends AbstractManager
{
$validator = $this->getValidatorChain();
$responses = $validator->triggerUntil('session.validate', $this, array($this), function ($test) {
- return !$test;
+ return false === $test;
});
if ($responses->stopped()) {
// If execution was halted, validation failed
@@ -365,8 +365,8 @@ class SessionManager extends AbstractManager
return;
}
setcookie(
- $this->getName(), // session name
- '', // value
+ $this->getName(), // session name
+ '', // value
$_SERVER['REQUEST_TIME'] - 42000, // TTL for cookie
$config->getCookiePath(),
$config->getCookieDomain(),
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
index 604954aee0d..fd861767a44 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -35,7 +35,6 @@ abstract class AbstractSessionArrayStorage implements
$this->init($input);
}
-
/**
* Initialize Storage
*
@@ -351,9 +350,9 @@ abstract class AbstractSessionArrayStorage implements
public function setMetadata($key, $value, $overwriteArray = false)
{
if ($this->isImmutable()) {
- throw new Exception\RuntimeException(sprintf(
- 'Cannot set key "%s" as storage is marked isImmutable', $key
- ));
+ throw new Exception\RuntimeException(
+ sprintf('Cannot set key "%s" as storage is marked isImmutable', $key)
+ );
}
if (!isset($_SESSION['__ZF'])) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/ArrayStorage.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/ArrayStorage.php
index f0d70647254..ed54a31a311 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/ArrayStorage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/ArrayStorage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -87,14 +87,14 @@ class ArrayStorage extends ArrayObject implements StorageInterface
public function offsetSet($key, $value)
{
if ($this->isImmutable()) {
- throw new Exception\RuntimeException(sprintf(
- 'Cannot set key "%s" as storage is marked isImmutable', $key
- ));
+ throw new Exception\RuntimeException(
+ sprintf('Cannot set key "%s" as storage is marked isImmutable', $key)
+ );
}
if ($this->isLocked($key)) {
- throw new Exception\RuntimeException(sprintf(
- 'Cannot set key "%s" due to locking', $key
- ));
+ throw new Exception\RuntimeException(
+ sprintf('Cannot set key "%s" due to locking', $key)
+ );
}
parent::offsetSet($key, $value);
@@ -232,9 +232,9 @@ class ArrayStorage extends ArrayObject implements StorageInterface
public function setMetadata($key, $value, $overwriteArray = false)
{
if ($this->isImmutable) {
- throw new Exception\RuntimeException(sprintf(
- 'Cannot set key "%s" as storage is marked isImmutable', $key
- ));
+ throw new Exception\RuntimeException(
+ sprintf('Cannot set key "%s" as storage is marked isImmutable', $key)
+ );
}
if (!isset($this['__ZF'])) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/Factory.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/Factory.php
index 0e6c4ea3bb2..73595fbf841 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/Factory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage.php
index 0362077f777..f000a5891bc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage.php
@@ -3,21 +3,36 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Session\Storage;
-if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
- class_alias('Zend\Session\Storage\AbstractSessionArrayStorage', 'Zend\Session\Storage\AbstractBaseSessionArrayStorage');
-} else {
- class_alias('Zend\Session\Storage\SessionArrayStorage\PhpReferenceCompatibility', 'Zend\Session\Storage\AbstractBaseSessionArrayStorage');
-}
-
/**
* Session storage in $_SESSION
*/
-class SessionArrayStorage extends AbstractBaseSessionArrayStorage
+class SessionArrayStorage extends AbstractSessionArrayStorage
{
+ /**
+ * Get Offset
+ *
+ * @param mixed $key
+ * @return mixed
+ */
+ public function &__get($key)
+ {
+ return $_SESSION[$key];
+ }
+
+ /**
+ * Offset Get
+ *
+ * @param mixed $key
+ * @return mixed
+ */
+ public function &offsetGet($key)
+ {
+ return $_SESSION[$key];
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage/PhpReferenceCompatibility.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage/PhpReferenceCompatibility.php
deleted file mode 100644
index 3a3b29477f4..00000000000
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage/PhpReferenceCompatibility.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Session\Storage\SessionArrayStorage;
-
-use Zend\Session\Storage\AbstractSessionArrayStorage;
-
-/**
- * PHP 5.3.4 and greater variant of SessionArrayStorage
- */
-abstract class PhpReferenceCompatibility extends AbstractSessionArrayStorage
-{
- /**
- * Get Offset
- *
- * @param mixed $key
- * @return mixed
- */
- public function &__get($key)
- {
- return $_SESSION[$key];
- }
-
- /**
- * Offset Get
- *
- * @param mixed $key
- * @return mixed
- */
- public function &offsetGet($key)
- {
- return $_SESSION[$key];
- }
-}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionStorage.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionStorage.php
index 231fb7ffd34..ec7e2954278 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionStorage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionStorage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInitializationInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInitializationInterface.php
index 8323eed48e3..afb2f7d73ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInitializationInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInitializationInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInterface.php
index 4070bc5f574..74a26e39895 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/StorageInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Validator/HttpUserAgent.php b/vendor/zendframework/zendframework/library/Zend/Session/Validator/HttpUserAgent.php
index 5b1bf92ed82..f8129bfcfb0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Validator/HttpUserAgent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Validator/HttpUserAgent.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Validator/RemoteAddr.php b/vendor/zendframework/zendframework/library/Zend/Session/Validator/RemoteAddr.php
index d8870059e82..93baf58bb52 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Validator/RemoteAddr.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Validator/RemoteAddr.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Validator/ValidatorInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/Validator/ValidatorInterface.php
index fcbe9bca4a3..6f1c8b777ae 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Validator/ValidatorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Validator/ValidatorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/ValidatorChain.php b/vendor/zendframework/zendframework/library/Zend/Session/ValidatorChain.php
index 5774c98f3ed..333797d0027 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/ValidatorChain.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/ValidatorChain.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Session;
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/compatibility/autoload.php b/vendor/zendframework/zendframework/library/Zend/Session/compatibility/autoload.php
index 3ecffe7fcaa..287c6ba0d4b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/compatibility/autoload.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/compatibility/autoload.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @deprecated
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/composer.json b/vendor/zendframework/zendframework/library/Zend/Session/composer.json
index ba47ac2b93c..c3541e78441 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Session/composer.json
@@ -6,6 +6,7 @@
"zf2",
"session"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Session\\": ""
@@ -13,18 +14,29 @@
},
"target-dir": "Zend/Session",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
+ "zendframework/zend-eventmanager": "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-eventmanager": "Zend\\EventManager component",
+ "zendframework/zend-http": "Zend\\Http component",
"zendframework/zend-servicemanager": "Zend\\ServiceManager component",
"zendframework/zend-validator": "Zend\\Validator component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover.php b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover.php
index 8fde138f0e7..fc534aafa5a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -207,7 +207,6 @@ class AutoDiscover
return $this->serviceName;
}
-
/**
* Set the location at which the WSDL file will be available.
*
@@ -354,7 +353,7 @@ class AutoDiscover
public function addFunction($function)
{
if (is_array($function)) {
- foreach($function as $row) {
+ foreach ($function as $row) {
$this->addFunction($row);
}
} elseif (is_string($function)) {
@@ -365,7 +364,6 @@ class AutoDiscover
'Argument to Zend\Soap\AutoDiscover::addFunction should be a valid function name.'
);
}
-
} else {
throw new Exception\InvalidArgumentException(
'Argument to Zend\Soap\AutoDiscover::addFunction should be string or array of strings.'
@@ -483,7 +481,6 @@ class AutoDiscover
// Add the wrapper element part, which must be named 'parameters'
$args['parameters'] = array('element' => $wsdl->addElement($element));
-
} else {
// RPC style: add each parameter as a typed part
foreach ($prototype->getParameters() as $param) {
@@ -516,7 +513,6 @@ class AutoDiscover
// Add the wrapper element part, which must be named 'parameters'
$args['parameters'] = array('element' => $wsdl->addElement($element));
-
} elseif ($prototype->getReturnType() != "void") {
// RPC style: add the return value as a typed part
$args['return'] = array(
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
index fccbd95daac..126b1e3f1e6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/DiscoveryStrategyInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
index abc7688b00b..b5ab91a3967 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover/DiscoveryStrategy/ReflectionDiscovery.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Soap/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Client.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client.php
index 6bb794b20c5..91c956355ba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Client.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Client.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Client/Common.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client/Common.php
index fae2466b69a..5b1c2fb42d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Client/Common.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Client/Common.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,9 @@ namespace Zend\Soap\Client;
use SoapClient;
-if (extension_loaded('soap')) {
+if (! extension_loaded('soap')) {
+ return;
+}
class Common extends SoapClient
{
@@ -57,5 +59,3 @@ class Common extends SoapClient
return call_user_func($this->doRequestCallback, $this, ltrim($request), $location, $action, $version, $oneWay);
}
}
-
-} // end if (extension_loaded('soap')
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Client/DotNet.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client/DotNet.php
index a44d7d2f5d1..84393d87edd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Client/DotNet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Client/DotNet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -216,7 +216,10 @@ class DotNet extends SOAPClient
protected function _preProcessResult($result)
{
$resultProperty = $this->getLastMethod() . 'Result';
- return $result->$resultProperty;
+ if (property_exists($result, $resultProperty)) {
+ return $result->$resultProperty;
+ }
+ return $result;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Client/Local.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client/Local.php
index 61c11cfa8e2..fc9868c0ea5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Client/Local.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Client/Local.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/BadMethodCallException.php
index bf954c6b4b8..6cc54650b87 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use BadMethodCallException as SPLBadMethodCallException;
* Exception thrown when unrecognized method is called via overloading
*/
class BadMethodCallException extends SPLBadMethodCallException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExceptionInterface.php
index aa1f1a9e8ec..1aae25f6126 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ namespace Zend\Soap\Exception;
* Common Exception interface
*/
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExtensionNotLoadedException.php
index 887aa4614db..03e346bd624 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use RuntimeException;
* Exception thrown when SOAP PHP extension is not loaded
*/
class ExtensionNotLoadedException extends RuntimeException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/InvalidArgumentException.php
index 5994b95044c..8b9ec023964 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use InvalidArgumentException as SPLInvalidArgumentException;
* Exception thrown when one or more method arguments are invalid
*/
class InvalidArgumentException extends SPLInvalidArgumentException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/RuntimeException.php
index 4cf9bfc9db0..9a36a5ab919 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use RuntimeException as SPLRuntimeException;
* Exception thrown when there is an error during program execution
*/
class RuntimeException extends SPLRuntimeException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/UnexpectedValueException.php
index 58ef42bcc5d..b18e0108a3e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use UnexpectedValueException as SPLUnexpectedValueException;
* Exception thrown when provided arguments are invalid
*/
class UnexpectedValueException extends SPLUnexpectedValueException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Server.php b/vendor/zendframework/zendframework/library/Zend/Soap/Server.php
index 39e228a2faf..dc111d86f02 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Server.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Server.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -33,6 +33,11 @@ class Server implements ZendServerServer
*/
protected $class;
+ /**
+ * Server instance
+ * @var SoapServer
+ */
+ protected $server = null;
/**
* Arguments to pass to {@link $class} constructor
* @var array
@@ -57,6 +62,12 @@ class Server implements ZendServerServer
*/
protected $faultExceptions = array();
+ /**
+ * Container for caught exception during business code execution
+ * @var \Exception
+ */
+ protected $caughtException = null;
+
/**
* SOAP Server Features
* @var int
@@ -74,6 +85,12 @@ class Server implements ZendServerServer
*/
protected $object;
+ /**
+ * Informs if the soap server is in debug mode
+ * @var bool
+ */
+ protected $debug = false;
+
/**
* Persistence mode; should be one of the SOAP persistence constants
* @var int
@@ -540,13 +557,10 @@ class Server implements ZendServerServer
throw new Exception\InvalidArgumentException('One or more invalid functions specified in array');
}
}
-
} elseif (is_string($function) && function_exists($function)) {
$this->functions[] = $function;
-
} elseif ($function == SOAP_FUNCTIONS_ALL) {
$this->functions = SOAP_FUNCTIONS_ALL;
-
} else {
throw new Exception\InvalidArgumentException('Invalid function specified');
}
@@ -703,7 +717,7 @@ class Server implements ZendServerServer
* - stdClass; if so, calls __toString() and verifies XML
* - string; if so, verifies XML
*
- * @param DOMDocument|DOMNode|SimpleXMLElement|stdClass|string $request
+ * @param DOMDocument|DOMNode|SimpleXMLElement|\stdClass|string $request
* @return self
* @throws Exception\InvalidArgumentException
*/
@@ -713,13 +727,10 @@ class Server implements ZendServerServer
if ($request instanceof DOMDocument) {
$xml = $request->saveXML();
-
} elseif ($request instanceof DOMNode) {
$xml = $request->ownerDocument->saveXML();
-
} elseif ($request instanceof SimpleXMLElement) {
$xml = $request->asXML();
-
} elseif (is_object($request) || is_string($request)) {
if (is_object($request)) {
$xml = $request->__toString();
@@ -728,11 +739,13 @@ class Server implements ZendServerServer
}
$xml = trim($xml);
- libxml_disable_entity_loader(true);
+ $loadEntities = libxml_disable_entity_loader(true);
$dom = new DOMDocument();
$loadStatus = $dom->loadXML($xml);
+ libxml_disable_entity_loader($loadEntities);
+
// @todo check libxml errors ? validate document ?
if (strlen($xml) == 0 || !$loadStatus) {
throw new Exception\InvalidArgumentException('Invalid XML');
@@ -743,7 +756,6 @@ class Server implements ZendServerServer
throw new Exception\InvalidArgumentException('Invalid XML: Detected use of illegal DOCTYPE');
}
}
- libxml_disable_entity_loader(false);
}
$this->request = $xml;
@@ -806,8 +818,12 @@ class Server implements ZendServerServer
*
* @return SoapServer
*/
- protected function _getSoap()
+ public function getSoap()
{
+ if ($this->server instanceof SoapServer) {
+ return $this->server;
+ }
+
$options = $this->getOptions();
$server = new SoapServer($this->wsdl, $options);
@@ -829,9 +845,20 @@ class Server implements ZendServerServer
$server->setPersistence($this->persistence);
}
- return $server;
+ $this->server = $server;
+ return $this->server;
}
+ /**
+ * Proxy for _getSoap method
+ * @see _getSoap
+ * @return SoapServer the soapServer instance
+ public function getSoap()
+ {
+ return $this->_getSoap();
+ }
+ */
+
/**
* Handle a request
*
@@ -848,7 +875,7 @@ class Server implements ZendServerServer
* If no request is passed, pulls request using php:://input (for
* cross-platform compatibility purposes).
*
- * @param DOMDocument|DOMNode|SimpleXMLElement|stdClass|string $request Optional request
+ * @param DOMDocument|DOMNode|SimpleXMLElement|\stdClass|string $request Optional request
* @return void|string
*/
public function handle($request = null)
@@ -867,7 +894,7 @@ class Server implements ZendServerServer
$setRequestException = $e;
}
- $soap = $this->_getSoap();
+ $soap = $this->getSoap();
$fault = false;
$this->response = '';
@@ -925,6 +952,17 @@ class Server implements ZendServerServer
return $displayErrorsOriginalState;
}
+ /**
+ * Set the debug mode.
+ * In debug mode, all exceptions are send to the client.
+ * @param bool $debug
+ */
+ public function setDebugMode($debug)
+ {
+ $this->debug = $debug;
+ return $this;
+ }
+
/**
* Validate and register fault exception
*
@@ -935,10 +973,9 @@ class Server implements ZendServerServer
public function registerFaultException($class)
{
if (is_array($class)) {
- foreach($class as $row) {
+ foreach ($class as $row) {
$this->registerFaultException($row);
}
-
} elseif (is_string($class) && class_exists($class) && (is_subclass_of($class, 'Exception') || 'Exception' === $class)) {
$ref = new ReflectionClass($class);
@@ -956,11 +993,15 @@ class Server implements ZendServerServer
/**
* Checks if provided fault name is registered as valid in this server.
*
- * @param $fault Name of a fault class
+ * @param string $fault Name of a fault class
* @return bool
*/
public function isRegisteredAsFaultException($fault)
{
+ if ($this->debug) {
+ return true;
+ }
+
$ref = new ReflectionClass($fault);
$classNames = $ref->getName();
return in_array($classNames, $this->faultExceptions);
@@ -993,6 +1034,15 @@ class Server implements ZendServerServer
return $this->faultExceptions;
}
+ /**
+ * Return caught exception during business code execution
+ * @return null|\Exception caught exception
+ */
+ public function getException()
+ {
+ return $this->caughtException;
+ }
+
/**
* Generate a server fault
*
@@ -1009,6 +1059,8 @@ class Server implements ZendServerServer
*/
public function fault($fault = null, $code = 'Receiver')
{
+ $this->caughtException = (is_string($fault)) ? new \Exception($fault) : $fault;
+
if ($fault instanceof \Exception) {
if ($this->isRegisteredAsFaultException($fault)) {
$message = $fault->getMessage();
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Server/DocumentLiteralWrapper.php b/vendor/zendframework/zendframework/library/Zend/Soap/Server/DocumentLiteralWrapper.php
index fcf4c20a34b..b3f7222cbf5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Server/DocumentLiteralWrapper.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Server/DocumentLiteralWrapper.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl.php
index aac4263bfb5..a6941620879 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use DOMDocument;
use DOMDocumentFragment;
use DOMElement;
use DOMXPath;
-use Zend\Soap\Exception\InvalidArgumentException;
use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy;
use Zend\Uri\Uri;
@@ -191,7 +190,7 @@ class Wsdl
$oldUri = $this->uri;
$this->uri = $uri;
- if ($this->dom instanceof DOMDocument ) {
+ if ($this->dom instanceof DOMDocument) {
// namespace declarations are NOT true attributes so one must explicitly set on root element
// xmlns:tns = $uri
$this->dom->documentElement->setAttributeNS(self::XML_NS_URI, self::XML_NS . ':' . self::TYPES_NS, $uri);
@@ -550,7 +549,7 @@ class Wsdl
if ($types instanceof DOMDocument) {
$dom = $this->dom->importNode($types->documentElement);
$this->wsdl->appendChild($dom);
- } elseif ($types instanceof DOMNode || $types instanceof DOMElement || $types instanceof DOMDocumentFragment ) {
+ } elseif ($types instanceof DOMNode || $types instanceof DOMElement || $types instanceof DOMDocumentFragment) {
$dom = $this->dom->importNode($types);
$this->wsdl->appendChild($dom);
}
@@ -813,7 +812,7 @@ class Wsdl
*/
protected function arrayToAttributes(\DOMNode $node, array $attributes, $withSanitizer = true)
{
- foreach($attributes as $attributeName => $attributeValue) {
+ foreach ($attributes as $attributeName => $attributeValue) {
if ($withSanitizer) {
$this->setAttributeWithSanitization($node, $attributeName, $attributeValue);
} else {
@@ -860,7 +859,7 @@ class Wsdl
*/
protected function getSoapNamespaceUriByVersion($soapVersion)
{
- if ($soapVersion != SOAP_1_1 AND $soapVersion != SOAP_1_2) {
+ if ($soapVersion != SOAP_1_1 and $soapVersion != SOAP_1_2) {
throw new Exception\InvalidArgumentException('Invalid SOAP version, use constants: SOAP_1_1 or SOAP_1_2');
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
index 3af11bb178e..bdce1f423fe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -50,7 +50,6 @@ abstract class AbstractComplexTypeStrategy implements ComplexTypeStrategyInterfa
*/
public function scanRegisteredTypes($phpType)
{
-
if (array_key_exists($phpType, $this->getContext()->getTypes())) {
$soapTypes = $this->getContext()->getTypes();
return $soapTypes[$phpType];
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
index 17774147d7c..c1594df853b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
index 487a969973d..16f9eee5f20 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -69,7 +69,6 @@ class ArrayOfTypeComplex extends DefaultComplexType
// Process singular type using DefaultComplexType strategy
parent::addComplexType($singularType);
-
// Add array type structure to WSDL document
$dom = $this->getContext()->toDomDocument();
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
index c9248e2a6dc..9085f08916a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -104,7 +104,6 @@ class ArrayOfTypeSequence extends DefaultComplexType
// Register type here to avoid recursion
$this->getContext()->addType($phpArrayType, $arrayType);
-
$dom = $this->getContext()->toDomDocument();
$arrayTypeName = substr($arrayType, strpos($arrayType, ':') + 1);
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php
index 47aece3738d..69128a17fb0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
index 784e73f64cd..8f1b9f0b02c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/Composite.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
index ce45fbd9cfa..b3fe27c32c5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -32,19 +32,19 @@ class DefaultComplexType extends AbstractComplexTypeStrategy
));
}
- if (($soapType = $this->scanRegisteredTypes($type)) !== null) {
+ $class = new ReflectionClass($type);
+ $phpType = $class->getName();
+
+ if (($soapType = $this->scanRegisteredTypes($phpType)) !== null) {
return $soapType;
}
$dom = $this->getContext()->toDomDocument();
- $class = new ReflectionClass($type);
-
- $soapTypeName = $this->getContext()->translateType($type);
+ $soapTypeName = $this->getContext()->translateType($phpType);
$soapType = Wsdl::TYPES_NS . ':' . $soapTypeName;
// Register type here to avoid recursion
- $this->getContext()->addType($type, $soapType);
-
+ $this->getContext()->addType($phpType, $soapType);
$defaultProperties = $class->getDefaultProperties();
@@ -55,7 +55,6 @@ class DefaultComplexType extends AbstractComplexTypeStrategy
foreach ($class->getProperties() as $property) {
if ($property->isPublic() && preg_match_all('/@var\s+([^\s]+)/m', $property->getDocComment(), $matches)) {
-
/**
* @todo check if 'xsd:element' must be used here (it may not be
* compatible with using 'complexType' node for describing other
diff --git a/vendor/zendframework/zendframework/library/Zend/Soap/composer.json b/vendor/zendframework/zendframework/library/Zend/Soap/composer.json
index fe3190017c2..53b0a87de39 100644
--- a/vendor/zendframework/zendframework/library/Zend/Soap/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Soap/composer.json
@@ -6,6 +6,7 @@
"zf2",
"soap"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Soap\\": ""
@@ -13,15 +14,21 @@
},
"target-dir": "Zend/Soap",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-server": "self.version",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-uri": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-http": "self.version"
+ },
+ "suggest": {
+ "zendframework/zend-http": "Zend\\Http component"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/AbstractOptions.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/AbstractOptions.php
index ffe471a5119..29a491f6a55 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/AbstractOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/AbstractOptions.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -47,10 +47,15 @@ abstract class AbstractOptions implements ParameterObjectInterface
}
if (!is_array($options) && !$options instanceof Traversable) {
- throw new Exception\InvalidArgumentException(sprintf(
- 'Parameter provided to %s must be an %s, %s or %s',
- __METHOD__, 'array', 'Traversable', 'Zend\Stdlib\AbstractOptions'
- ));
+ throw new Exception\InvalidArgumentException(
+ sprintf(
+ 'Parameter provided to %s must be an %s, %s or %s',
+ __METHOD__,
+ 'array',
+ 'Traversable',
+ 'Zend\Stdlib\AbstractOptions'
+ )
+ );
}
foreach ($options as $key => $value) {
@@ -73,7 +78,9 @@ abstract class AbstractOptions implements ParameterObjectInterface
return '_' . strtolower($letter);
};
foreach ($this as $key => $value) {
- if ($key === '__strictMode__') continue;
+ if ($key === '__strictMode__') {
+ continue;
+ }
$normalizedKey = preg_replace_callback('/([A-Z])/', $transform, $key);
$array[$normalizedKey] = $value;
}
@@ -91,17 +98,21 @@ abstract class AbstractOptions implements ParameterObjectInterface
*/
public function __set($key, $value)
{
- $setter = 'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
- if ($this->__strictMode__ && !method_exists($this, $setter)) {
- throw new Exception\BadMethodCallException(
- 'The option "' . $key . '" does not '
- . 'have a matching ' . $setter . ' setter method '
- . 'which must be defined'
- );
- } elseif (!$this->__strictMode__ && !method_exists($this, $setter)) {
+ $setter = 'set' . str_replace('_', '', $key);
+
+ if (method_exists($this, $setter)) {
+ $this->{$setter}($value);
+
return;
}
- $this->{$setter}($value);
+
+ if ($this->__strictMode__) {
+ throw new Exception\BadMethodCallException(sprintf(
+ 'The option "%s" does not have a matching "%s" setter method which must be defined',
+ $key,
+ 'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)))
+ ));
+ }
}
/**
@@ -114,16 +125,17 @@ abstract class AbstractOptions implements ParameterObjectInterface
*/
public function __get($key)
{
- $getter = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
- if (!method_exists($this, $getter)) {
- throw new Exception\BadMethodCallException(
- 'The option "' . $key . '" does not '
- . 'have a matching ' . $getter . ' getter method '
- . 'which must be defined'
- );
+ $getter = 'get' . str_replace('_', '', $key);
+
+ if (method_exists($this, $getter)) {
+ return $this->{$getter}();
}
- return $this->{$getter}();
+ throw new Exception\BadMethodCallException(sprintf(
+ 'The option "%s" does not have a matching "%s" getter method which must be defined',
+ $key,
+ 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)))
+ ));
}
/**
@@ -152,7 +164,7 @@ abstract class AbstractOptions implements ParameterObjectInterface
} catch (Exception\BadMethodCallException $e) {
throw new Exception\InvalidArgumentException(
'The class property $' . $key . ' cannot be unset as'
- . ' NULL is an invalid value for it',
+ . ' NULL is an invalid value for it',
0,
$e
);
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject.php
index 2bebaf8dd93..44145c8554e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject.php
@@ -3,32 +3,430 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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;
-/**
- * If the version is less than 5.3.4, we'll use Zend\Stdlib\ArrayObject\PhpLegacyCompatibility
- * which extends the native PHP ArrayObject implementation. For versions greater than or equal
- * to 5.3.4, we'll use Zend\Stdlib\ArrayObject\PhpReferenceCompatibility, which corrects
- * issues with how PHP handles references inside ArrayObject.
- *
- * class_alias is a global construct, so we can alias either one to Zend\Stdlib\ArrayObject,
- * and from this point forward, that alias will be used.
- */
-if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
- class_alias('Zend\Stdlib\ArrayObject\PhpLegacyCompatibility', 'Zend\Stdlib\AbstractArrayObject');
-} else {
- class_alias('Zend\Stdlib\ArrayObject\PhpReferenceCompatibility', 'Zend\Stdlib\AbstractArrayObject');
-}
+use ArrayAccess;
+use Countable;
+use IteratorAggregate;
+use Serializable;
/**
* Custom framework ArrayObject implementation
*
* Extends version-specific "abstract" implementation.
*/
-class ArrayObject extends AbstractArrayObject
+class ArrayObject implements IteratorAggregate, ArrayAccess, Serializable, Countable
{
+ /**
+ * Properties of the object have their normal functionality
+ * when accessed as list (var_dump, foreach, etc.).
+ */
+ const STD_PROP_LIST = 1;
+
+ /**
+ * Entries can be accessed as properties (read and write).
+ */
+ const ARRAY_AS_PROPS = 2;
+
+ /**
+ * @var array
+ */
+ protected $storage;
+
+ /**
+ * @var int
+ */
+ protected $flag;
+
+ /**
+ * @var string
+ */
+ protected $iteratorClass;
+
+ /**
+ * @var array
+ */
+ protected $protectedProperties;
+
+ /**
+ * Constructor
+ *
+ * @param array $input
+ * @param int $flags
+ * @param string $iteratorClass
+ */
+ public function __construct($input = array(), $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
+ {
+ $this->setFlags($flags);
+ $this->storage = $input;
+ $this->setIteratorClass($iteratorClass);
+ $this->protectedProperties = array_keys(get_object_vars($this));
+ }
+
+ /**
+ * Returns whether the requested key exists
+ *
+ * @param mixed $key
+ * @return bool
+ */
+ public function __isset($key)
+ {
+ if ($this->flag == self::ARRAY_AS_PROPS) {
+ return $this->offsetExists($key);
+ }
+ if (in_array($key, $this->protectedProperties)) {
+ throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
+ }
+
+ return isset($this->$key);
+ }
+
+ /**
+ * Sets the value at the specified key to value
+ *
+ * @param mixed $key
+ * @param mixed $value
+ * @return void
+ */
+ public function __set($key, $value)
+ {
+ if ($this->flag == self::ARRAY_AS_PROPS) {
+ return $this->offsetSet($key, $value);
+ }
+ if (in_array($key, $this->protectedProperties)) {
+ throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
+ }
+ $this->$key = $value;
+ }
+
+ /**
+ * Unsets the value at the specified key
+ *
+ * @param mixed $key
+ * @return void
+ */
+ public function __unset($key)
+ {
+ if ($this->flag == self::ARRAY_AS_PROPS) {
+ return $this->offsetUnset($key);
+ }
+ if (in_array($key, $this->protectedProperties)) {
+ throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
+ }
+ unset($this->$key);
+ }
+
+ /**
+ * Returns the value at the specified key by reference
+ *
+ * @param mixed $key
+ * @return mixed
+ */
+ public function &__get($key)
+ {
+ $ret = null;
+ if ($this->flag == self::ARRAY_AS_PROPS) {
+ $ret =& $this->offsetGet($key);
+
+ return $ret;
+ }
+ if (in_array($key, $this->protectedProperties)) {
+ throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
+ }
+
+ return $this->$key;
+ }
+
+ /**
+ * Appends the value
+ *
+ * @param mixed $value
+ * @return void
+ */
+ public function append($value)
+ {
+ $this->storage[] = $value;
+ }
+
+ /**
+ * Sort the entries by value
+ *
+ * @return void
+ */
+ public function asort()
+ {
+ asort($this->storage);
+ }
+
+ /**
+ * Get the number of public properties in the ArrayObject
+ *
+ * @return int
+ */
+ public function count()
+ {
+ return count($this->storage);
+ }
+
+ /**
+ * Exchange the array for another one.
+ *
+ * @param array|ArrayObject $data
+ * @return array
+ */
+ public function exchangeArray($data)
+ {
+ if (!is_array($data) && !is_object($data)) {
+ throw new Exception\InvalidArgumentException('Passed variable is not an array or object, using empty array instead');
+ }
+
+ if (is_object($data) && ($data instanceof self || $data instanceof \ArrayObject)) {
+ $data = $data->getArrayCopy();
+ }
+ if (!is_array($data)) {
+ $data = (array) $data;
+ }
+
+ $storage = $this->storage;
+
+ $this->storage = $data;
+
+ return $storage;
+ }
+
+ /**
+ * Creates a copy of the ArrayObject.
+ *
+ * @return array
+ */
+ public function getArrayCopy()
+ {
+ return $this->storage;
+ }
+
+ /**
+ * Gets the behavior flags.
+ *
+ * @return int
+ */
+ public function getFlags()
+ {
+ return $this->flag;
+ }
+
+ /**
+ * Create a new iterator from an ArrayObject instance
+ *
+ * @return \Iterator
+ */
+ public function getIterator()
+ {
+ $class = $this->iteratorClass;
+
+ return new $class($this->storage);
+ }
+
+ /**
+ * Gets the iterator classname for the ArrayObject.
+ *
+ * @return string
+ */
+ public function getIteratorClass()
+ {
+ return $this->iteratorClass;
+ }
+
+ /**
+ * Sort the entries by key
+ *
+ * @return void
+ */
+ public function ksort()
+ {
+ ksort($this->storage);
+ }
+
+ /**
+ * Sort an array using a case insensitive "natural order" algorithm
+ *
+ * @return void
+ */
+ public function natcasesort()
+ {
+ natcasesort($this->storage);
+ }
+
+ /**
+ * Sort entries using a "natural order" algorithm
+ *
+ * @return void
+ */
+ public function natsort()
+ {
+ natsort($this->storage);
+ }
+
+ /**
+ * Returns whether the requested key exists
+ *
+ * @param mixed $key
+ * @return bool
+ */
+ public function offsetExists($key)
+ {
+ return isset($this->storage[$key]);
+ }
+
+ /**
+ * Returns the value at the specified key
+ *
+ * @param mixed $key
+ * @return mixed
+ */
+ public function &offsetGet($key)
+ {
+ $ret = null;
+ if (!$this->offsetExists($key)) {
+ return $ret;
+ }
+ $ret =& $this->storage[$key];
+
+ return $ret;
+ }
+
+ /**
+ * Sets the value at the specified key to value
+ *
+ * @param mixed $key
+ * @param mixed $value
+ * @return void
+ */
+ public function offsetSet($key, $value)
+ {
+ $this->storage[$key] = $value;
+ }
+
+ /**
+ * Unsets the value at the specified key
+ *
+ * @param mixed $key
+ * @return void
+ */
+ public function offsetUnset($key)
+ {
+ if ($this->offsetExists($key)) {
+ unset($this->storage[$key]);
+ }
+ }
+
+ /**
+ * Serialize an ArrayObject
+ *
+ * @return string
+ */
+ public function serialize()
+ {
+ return serialize(get_object_vars($this));
+ }
+
+ /**
+ * Sets the behavior flags
+ *
+ * @param int $flags
+ * @return void
+ */
+ public function setFlags($flags)
+ {
+ $this->flag = $flags;
+ }
+
+ /**
+ * Sets the iterator classname for the ArrayObject
+ *
+ * @param string $class
+ * @return void
+ */
+ public function setIteratorClass($class)
+ {
+ if (class_exists($class)) {
+ $this->iteratorClass = $class;
+
+ return ;
+ }
+
+ if (strpos($class, '\\') === 0) {
+ $class = '\\' . $class;
+ if (class_exists($class)) {
+ $this->iteratorClass = $class;
+
+ return ;
+ }
+ }
+
+ throw new Exception\InvalidArgumentException('The iterator class does not exist');
+ }
+
+ /**
+ * Sort the entries with a user-defined comparison function and maintain key association
+ *
+ * @param callable $function
+ * @return void
+ */
+ public function uasort($function)
+ {
+ if (is_callable($function)) {
+ uasort($this->storage, $function);
+ }
+ }
+
+ /**
+ * Sort the entries by keys using a user-defined comparison function
+ *
+ * @param callable $function
+ * @return void
+ */
+ public function uksort($function)
+ {
+ if (is_callable($function)) {
+ uksort($this->storage, $function);
+ }
+ }
+
+ /**
+ * Unserialize an ArrayObject
+ *
+ * @param string $data
+ * @return void
+ */
+ public function unserialize($data)
+ {
+ $ar = unserialize($data);
+ $this->protectedProperties = array_keys(get_object_vars($this));
+
+ $this->setFlags($ar['flag']);
+ $this->exchangeArray($ar['storage']);
+ $this->setIteratorClass($ar['iteratorClass']);
+
+ foreach ($ar as $k => $v) {
+ switch ($k) {
+ case 'flag':
+ $this->setFlags($v);
+ break;
+ case 'storage':
+ $this->exchangeArray($v);
+ break;
+ case 'iteratorClass':
+ $this->setIteratorClass($v);
+ break;
+ case 'protectedProperties':
+ continue;
+ default:
+ $this->__set($k, $v);
+ }
+ }
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpLegacyCompatibility.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpLegacyCompatibility.php
deleted file mode 100644
index b34f21cb74c..00000000000
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpLegacyCompatibility.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\ArrayObject;
-
-use ArrayObject as PhpArrayObject;
-
-/**
- * ArrayObject
- *
- * Since we need to substitute an alternate ArrayObject implementation for
- * versions > 5.3.3, we need to provide a stub for 5.3.3. This stub
- * simply extends the PHP ArrayObject implementation, and provides default
- * behavior in the constructor.
- */
-abstract class PhpLegacyCompatibility extends PhpArrayObject
-{
- /**
- * Constructor
- *
- * @param array $input
- * @param int $flags
- * @param string $iteratorClass
- */
- public function __construct($input = array(), $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
- {
- parent::__construct($input, $flags, $iteratorClass);
- }
-}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php
deleted file mode 100644
index a6d7b9abba4..00000000000
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php
+++ /dev/null
@@ -1,433 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-namespace Zend\Stdlib\ArrayObject;
-
-use ArrayAccess;
-use Countable;
-use IteratorAggregate;
-use Serializable;
-use Zend\Stdlib\Exception;
-
-/**
- * ArrayObject
- *
- * This ArrayObject is a rewrite of the implementation to fix
- * issues with php's implementation of ArrayObject where you
- * are unable to unset multi-dimensional arrays because you
- * need to fetch the properties / lists as references.
- */
-abstract class PhpReferenceCompatibility implements IteratorAggregate, ArrayAccess, Serializable, Countable
-{
- /**
- * Properties of the object have their normal functionality
- * when accessed as list (var_dump, foreach, etc.).
- */
- const STD_PROP_LIST = 1;
-
- /**
- * Entries can be accessed as properties (read and write).
- */
- const ARRAY_AS_PROPS = 2;
-
- /**
- * @var array
- */
- protected $storage;
-
- /**
- * @var int
- */
- protected $flag;
-
- /**
- * @var string
- */
- protected $iteratorClass;
-
- /**
- * @var array
- */
- protected $protectedProperties;
-
- /**
- * Constructor
- *
- * @param array $input
- * @param int $flags
- * @param string $iteratorClass
- */
- public function __construct($input = array(), $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
- {
- $this->setFlags($flags);
- $this->storage = $input;
- $this->setIteratorClass($iteratorClass);
- $this->protectedProperties = array_keys(get_object_vars($this));
- }
-
- /**
- * Returns whether the requested key exists
- *
- * @param mixed $key
- * @return bool
- */
- public function __isset($key)
- {
- if ($this->flag == self::ARRAY_AS_PROPS) {
- return $this->offsetExists($key);
- }
- if (in_array($key, $this->protectedProperties)) {
- throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
- }
-
- return isset($this->$key);
- }
-
- /**
- * Sets the value at the specified key to value
- *
- * @param mixed $key
- * @param mixed $value
- * @return void
- */
- public function __set($key, $value)
- {
- if ($this->flag == self::ARRAY_AS_PROPS) {
- return $this->offsetSet($key, $value);
- }
- if (in_array($key, $this->protectedProperties)) {
- throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
- }
- $this->$key = $value;
- }
-
- /**
- * Unsets the value at the specified key
- *
- * @param mixed $key
- * @return void
- */
- public function __unset($key)
- {
- if ($this->flag == self::ARRAY_AS_PROPS) {
- return $this->offsetUnset($key);
- }
- if (in_array($key, $this->protectedProperties)) {
- throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
- }
- unset($this->$key);
- }
-
- /**
- * Returns the value at the specified key by reference
- *
- * @param mixed $key
- * @return mixed
- */
- public function &__get($key)
- {
- $ret = null;
- if ($this->flag == self::ARRAY_AS_PROPS) {
- $ret =& $this->offsetGet($key);
-
- return $ret;
- }
- if (in_array($key, $this->protectedProperties)) {
- throw new Exception\InvalidArgumentException('$key is a protected property, use a different key');
- }
-
- return $this->$key;
- }
-
- /**
- * Appends the value
- *
- * @param mixed $value
- * @return void
- */
- public function append($value)
- {
- $this->storage[] = $value;
- }
-
- /**
- * Sort the entries by value
- *
- * @return void
- */
- public function asort()
- {
- asort($this->storage);
- }
-
- /**
- * Get the number of public properties in the ArrayObject
- *
- * @return int
- */
- public function count()
- {
- return count($this->storage);
- }
-
- /**
- * Exchange the array for another one.
- *
- * @param array|ArrayObject $data
- * @return array
- */
- public function exchangeArray($data)
- {
- if (!is_array($data) && !is_object($data)) {
- throw new Exception\InvalidArgumentException('Passed variable is not an array or object, using empty array instead');
- }
-
- if (is_object($data) && ($data instanceof self || $data instanceof \ArrayObject)) {
- $data = $data->getArrayCopy();
- }
- if (!is_array($data)) {
- $data = (array) $data;
- }
-
- $storage = $this->storage;
-
- $this->storage = $data;
-
- return $storage;
- }
-
- /**
- * Creates a copy of the ArrayObject.
- *
- * @return array
- */
- public function getArrayCopy()
- {
- return $this->storage;
- }
-
- /**
- * Gets the behavior flags.
- *
- * @return int
- */
- public function getFlags()
- {
- return $this->flag;
- }
-
- /**
- * Create a new iterator from an ArrayObject instance
- *
- * @return \Iterator
- */
- public function getIterator()
- {
- $class = $this->iteratorClass;
-
- return new $class($this->storage);
- }
-
- /**
- * Gets the iterator classname for the ArrayObject.
- *
- * @return string
- */
- public function getIteratorClass()
- {
- return $this->iteratorClass;
- }
-
- /**
- * Sort the entries by key
- *
- * @return void
- */
- public function ksort()
- {
- ksort($this->storage);
- }
-
- /**
- * Sort an array using a case insensitive "natural order" algorithm
- *
- * @return void
- */
- public function natcasesort()
- {
- natcasesort($this->storage);
- }
-
- /**
- * Sort entries using a "natural order" algorithm
- *
- * @return void
- */
- public function natsort()
- {
- natsort($this->storage);
- }
-
- /**
- * Returns whether the requested key exists
- *
- * @param mixed $key
- * @return bool
- */
- public function offsetExists($key)
- {
- return isset($this->storage[$key]);
- }
-
- /**
- * Returns the value at the specified key
- *
- * @param mixed $key
- * @return mixed
- */
- public function &offsetGet($key)
- {
- $ret = null;
- if (!$this->offsetExists($key)) {
- return $ret;
- }
- $ret =& $this->storage[$key];
-
- return $ret;
- }
-
- /**
- * Sets the value at the specified key to value
- *
- * @param mixed $key
- * @param mixed $value
- * @return void
- */
- public function offsetSet($key, $value)
- {
- $this->storage[$key] = $value;
- }
-
- /**
- * Unsets the value at the specified key
- *
- * @param mixed $key
- * @return void
- */
- public function offsetUnset($key)
- {
- if ($this->offsetExists($key)) {
- unset($this->storage[$key]);
- }
- }
-
- /**
- * Serialize an ArrayObject
- *
- * @return string
- */
- public function serialize()
- {
- return serialize(get_object_vars($this));
- }
-
- /**
- * Sets the behavior flags
- *
- * @param int $flags
- * @return void
- */
- public function setFlags($flags)
- {
- $this->flag = $flags;
- }
-
- /**
- * Sets the iterator classname for the ArrayObject
- *
- * @param string $class
- * @return void
- */
- public function setIteratorClass($class)
- {
- if (class_exists($class)) {
- $this->iteratorClass = $class;
-
- return ;
- }
-
- if (strpos($class, '\\') === 0) {
- $class = '\\' . $class;
- if (class_exists($class)) {
- $this->iteratorClass = $class;
-
- return ;
- }
- }
-
- throw new Exception\InvalidArgumentException('The iterator class does not exist');
- }
-
- /**
- * Sort the entries with a user-defined comparison function and maintain key association
- *
- * @param callable $function
- * @return void
- */
- public function uasort($function)
- {
- if (is_callable($function)) {
- uasort($this->storage, $function);
- }
- }
-
- /**
- * Sort the entries by keys using a user-defined comparison function
- *
- * @param callable $function
- * @return void
- */
- public function uksort($function)
- {
- if (is_callable($function)) {
- uksort($this->storage, $function);
- }
- }
-
- /**
- * Unserialize an ArrayObject
- *
- * @param string $data
- * @return void
- */
- public function unserialize($data)
- {
- $ar = unserialize($data);
- $this->setFlags($ar['flag']);
- $this->exchangeArray($ar['storage']);
- $this->setIteratorClass($ar['iteratorClass']);
- foreach ($ar as $k => $v) {
- switch ($k) {
- case 'flag':
- $this->setFlags($v);
- break;
- case 'storage':
- $this->exchangeArray($v);
- break;
- case 'iteratorClass':
- $this->setIteratorClass($v);
- break;
- case 'protectedProperties':
- continue;
- default:
- $this->__set($k, $v);
- }
- }
- }
-}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArraySerializableInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArraySerializableInterface.php
index 222f57b0a18..dcf84719521 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArraySerializableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArraySerializableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayStack.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayStack.php
index 0fcceb954f5..39d02aacac1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayStack.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayUtils.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayUtils.php
index 8da7a9cdb8e..8f77bc836da 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayUtils.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayUtils.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -257,8 +257,8 @@ abstract class ArrayUtils
public static function merge(array $a, array $b, $preserveNumericKeys = false)
{
foreach ($b as $key => $value) {
- if (array_key_exists($key, $a)) {
- if (is_int($key) && !$preserveNumericKeys) {
+ if (isset($a[$key]) || array_key_exists($key, $a)) {
+ if (!$preserveNumericKeys && is_int($key)) {
$a[] = $value;
} elseif (is_array($value) && is_array($a[$key])) {
$a[$key] = static::merge($a[$key], $value, $preserveNumericKeys);
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Stdlib/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.php
index 303558adfe2..cc66e457a4c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,7 @@ use ReflectionClass;
/**
* CallbackHandler
*
- * A handler for a event, event, filterchain, etc. Abstracts PHP callbacks,
+ * A handler for an event, event, filterchain, etc. Abstracts PHP callbacks,
* primarily to allow for lazy-loading and ensuring availability of default
* arguments (currying).
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/DateTime.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/DateTime.php
index 64a39f62faa..cdab67d6e83 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/DateTime.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/DateTime.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/DispatchableInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/DispatchableInterface.php
index b8bfdac168a..4f74d1e8af4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/DispatchableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/DispatchableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ErrorHandler.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ErrorHandler.php
index 6a63ee22fc1..01949d1efee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ErrorHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ErrorHandler.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,7 @@ use ErrorException;
/**
* ErrorHandler that can be used to catch internal PHP errors
- * and convert to a ErrorException instance.
+ * and convert to an ErrorException instance.
*/
abstract class ErrorHandler
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/BadMethodCallException.php
index 4b06b388527..0254e45bffb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/DomainException.php
index 3178c15340b..6d2ac714a1f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/DomainException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/ExceptionInterface.php
index d43eb3078a8..60b795f8dde 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/ExtensionNotLoadedException.php
index 3955952f80f..4b51475f246 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/ExtensionNotLoadedException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/InvalidArgumentException.php
index 534d1906a8d..8028c471756 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/InvalidCallbackException.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/InvalidCallbackException.php
index bfc1070a1c8..aa36f98632d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/InvalidCallbackException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/InvalidCallbackException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/LogicException.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/LogicException.php
index 8becb252bde..087ac0e83fd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/LogicException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/LogicException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/RuntimeException.php
index bb52eb874a6..f3891d64b6a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Extractor/ExtractionInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Extractor/ExtractionInterface.php
new file mode 100644
index 00000000000..297d557746c
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Extractor/ExtractionInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Extractor;
+
+interface ExtractionInterface
+{
+ /**
+ * Extract values from an object
+ *
+ * @param object $object
+ * @return array
+ */
+ public function extract($object);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Glob.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Glob.php
index 5a821be9e0c..a4d0068a091 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Glob.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Glob.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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;
-
/**
* Wrapper for glob with fallback if GLOB_BRACE is not available.
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/AllGuardsTrait.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/AllGuardsTrait.php
new file mode 100644
index 00000000000..95bc5162d38
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/AllGuardsTrait.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Guard;
+
+/**
+ * An aggregate for all guard traits
+ */
+trait AllGuardsTrait
+{
+ use ArrayOrTraversableGuardTrait;
+ use EmptyGuardTrait;
+ use NullGuardTrait;
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/ArrayOrTraversableGuardTrait.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/ArrayOrTraversableGuardTrait.php
new file mode 100644
index 00000000000..e6959a5ef42
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/ArrayOrTraversableGuardTrait.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Guard;
+
+use Traversable;
+
+/**
+ * Provide a guard method for array or Traversable data
+ */
+trait ArrayOrTraversableGuardTrait
+{
+ /**
+ * Verifies that the data is an array or Traversable
+ *
+ * @param mixed $data the data to verify
+ * @param string $dataName the data name
+ * @param string $exceptionClass FQCN for the exception
+ * @throws \Exception
+ */
+ protected function guardForArrayOrTraversable(
+ $data,
+ $dataName = 'Argument',
+ $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
+ ) {
+ if (!is_array($data) && !($data instanceof Traversable)) {
+ $message = sprintf(
+ "%s must be an array or Traversable, [%s] given",
+ $dataName,
+ is_object($data) ? get_class($data) : gettype($data)
+ );
+ throw new $exceptionClass($message);
+ }
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/EmptyGuardTrait.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/EmptyGuardTrait.php
new file mode 100644
index 00000000000..c6751cc35a2
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/EmptyGuardTrait.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Guard;
+
+/**
+ * Provide a guard method against empty data
+ */
+trait EmptyGuardTrait
+{
+ /**
+ * Verify that the data is not empty
+ *
+ * @param mixed $data the data to verify
+ * @param string $dataName the data name
+ * @param string $exceptionClass FQCN for the exception
+ * @throws \Exception
+ */
+ protected function guardAgainstEmpty(
+ $data,
+ $dataName = 'Argument',
+ $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
+ ) {
+ if (empty($data)) {
+ $message = sprintf('%s cannot be empty', $dataName);
+ throw new $exceptionClass($message);
+ }
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/GuardUtils.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/GuardUtils.php
new file mode 100644
index 00000000000..4fe4ccacb91
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/GuardUtils.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Guard;
+
+use Traversable;
+
+/**
+ * Static guard helper class
+ *
+ * Bridges the gap for allowing refactoring until traits can be used by default.
+ *
+ * @deprecated
+ */
+abstract class GuardUtils
+{
+ const DEFAULT_EXCEPTION_CLASS = 'Zend\Stdlib\Exception\InvalidArgumentException';
+
+ /**
+ * Verifies that the data is an array or Traversable
+ *
+ * @param mixed $data the data to verify
+ * @param string $dataName the data name
+ * @param string $exceptionClass FQCN for the exception
+ * @throws \Exception
+ */
+ public static function guardForArrayOrTraversable(
+ $data,
+ $dataName = 'Argument',
+ $exceptionClass = self::DEFAULT_EXCEPTION_CLASS
+ ) {
+ if (!is_array($data) && !($data instanceof Traversable)) {
+ $message = sprintf(
+ '%s must be an array or Traversable, [%s] given',
+ $dataName,
+ is_object($data) ? get_class($data) : gettype($data)
+ );
+ throw new $exceptionClass($message);
+ }
+ }
+
+ /**
+ * Verify that the data is not empty
+ *
+ * @param mixed $data the data to verify
+ * @param string $dataName the data name
+ * @param string $exceptionClass FQCN for the exception
+ * @throws \Exception
+ */
+ public static function guardAgainstEmpty(
+ $data,
+ $dataName = 'Argument',
+ $exceptionClass = self::DEFAULT_EXCEPTION_CLASS
+ ) {
+ if (empty($data)) {
+ $message = sprintf('%s cannot be empty', $dataName);
+ throw new $exceptionClass($message);
+ }
+ }
+
+ /**
+ * Verify that the data is not null
+ *
+ * @param mixed $data the data to verify
+ * @param string $dataName the data name
+ * @param string $exceptionClass FQCN for the exception
+ * @throws \Exception
+ */
+ public static function guardAgainstNull(
+ $data,
+ $dataName = 'Argument',
+ $exceptionClass = self::DEFAULT_EXCEPTION_CLASS
+ ) {
+ if (null === $data) {
+ $message = sprintf('%s cannot be null', $dataName);
+ throw new $exceptionClass($message);
+ }
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/NullGuardTrait.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/NullGuardTrait.php
new file mode 100644
index 00000000000..eac716281cd
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Guard/NullGuardTrait.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Guard;
+
+/**
+ * Provide a guard method against null data
+ */
+trait NullGuardTrait
+{
+ /**
+ * Verify that the data is not null
+ *
+ * @param mixed $data the data to verify
+ * @param string $dataName the data name
+ * @param string $exceptionClass FQCN for the exception
+ * @throws \Exception
+ */
+ protected function guardAgainstNull(
+ $data,
+ $dataName = 'Argument',
+ $exceptionClass = 'Zend\Stdlib\Exception\InvalidArgumentException'
+ ) {
+ if (null === $data) {
+ $message = sprintf('%s cannot be null', $dataName);
+ throw new $exceptionClass($message);
+ }
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/AbstractHydrator.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
index 6397a86a017..338ed804422 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,14 @@ namespace Zend\Stdlib\Hydrator;
use ArrayObject;
use Zend\Stdlib\Exception;
use Zend\Stdlib\Hydrator\Filter\FilterComposite;
+use Zend\Stdlib\Hydrator\NamingStrategy\NamingStrategyInterface;
use Zend\Stdlib\Hydrator\Strategy\StrategyInterface;
-abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInterface
+abstract class AbstractHydrator implements
+ HydratorInterface,
+ StrategyEnabledInterface,
+ FilterEnabledInterface,
+ NamingStrategyEnabledInterface
{
/**
* The list with strategies that this hydrator has.
@@ -23,8 +28,16 @@ abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInt
*/
protected $strategies;
+ /**
+ * An instance of NamingStrategyInterface
+ *
+ * @var NamingStrategyInterface
+ */
+ protected $namingStrategy;
+
/**
* Composite to filter the methods, that need to be hydrated
+ *
* @var Filter\FilterComposite
*/
protected $filterComposite;
@@ -42,6 +55,8 @@ abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInt
* Gets the strategy with the given name.
*
* @param string $name The name of the strategy to get.
+ *
+ * @throws \Zend\Stdlib\Exception\InvalidArgumentException
* @return StrategyInterface
*/
public function getStrategy($name)
@@ -103,7 +118,7 @@ abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInt
*
* @param string $name The name of the strategy to use.
* @param mixed $value The value that should be converted.
- * @param array $object The object is optionally provided as context.
+ * @param mixed $object The object is optionally provided as context.
* @return mixed
*/
public function extractValue($name, $value, $object = null)
@@ -132,6 +147,36 @@ abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInt
return $value;
}
+ /**
+ * Convert a name for extraction. If no naming strategy exists, the plain value is returned.
+ *
+ * @param string $name The name to convert.
+ * @param null $object The object is optionally provided as context.
+ * @return mixed
+ */
+ public function extractName($name, $object = null)
+ {
+ if ($this->hasNamingStrategy()) {
+ $name = $this->getNamingStrategy()->extract($name, $object);
+ }
+ return $name;
+ }
+
+ /**
+ * Converts a value for hydration. If no naming strategy exists, the plain value is returned.
+ *
+ * @param string $name The name to convert.
+ * @param array $data The whole data is optionally provided as context.
+ * @return mixed
+ */
+ public function hydrateName($name, $data = null)
+ {
+ if ($this->hasNamingStrategy()) {
+ $name = $this->getNamingStrategy()->hydrate($name, $data);
+ }
+ return $name;
+ }
+
/**
* Get the filter instance
*
@@ -194,4 +239,49 @@ abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInt
{
return $this->filterComposite->removeFilter($name);
}
+
+ /**
+ * Adds the given naming strategy
+ *
+ * @param NamingStrategyInterface $strategy The naming to register.
+ * @return self
+ */
+ public function setNamingStrategy(NamingStrategyInterface $strategy)
+ {
+ $this->namingStrategy = $strategy;
+
+ return $this;
+ }
+
+ /**
+ * Gets the naming strategy.
+ *
+ * @return NamingStrategyInterface
+ */
+ public function getNamingStrategy()
+ {
+ return $this->namingStrategy;
+ }
+
+ /**
+ * Checks if a naming strategy exists.
+ *
+ * @return bool
+ */
+ public function hasNamingStrategy()
+ {
+ return isset($this->namingStrategy);
+ }
+
+ /**
+ * Removes the naming strategy
+ *
+ * @return self
+ */
+ public function removeNamingStrategy()
+ {
+ $this->namingStrategy = null;
+
+ return $this;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/AggregateHydrator.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/AggregateHydrator.php
index 335f5648ac8..38a868e022e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/AggregateHydrator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/AggregateHydrator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php
index 7e199397a5a..b13bc5c70b2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Aggregate;
-
use Zend\EventManager\Event;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php
index 0cc48abee07..a7c91eec261 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Aggregate;
-
use Zend\EventManager\Event;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
index d2d8ff46acb..1c25ff3c461 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Aggregate;
-
use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
use Zend\Stdlib\Hydrator\HydratorInterface;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ArraySerializable.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ArraySerializable.php
index 6331af0087f..4f4ab2a1333 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ArraySerializable.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ArraySerializable.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use Zend\Stdlib\Exception;
class ArraySerializable extends AbstractHydrator
{
-
/**
* Extract values from the provided object
*
@@ -26,20 +25,26 @@ class ArraySerializable extends AbstractHydrator
public function extract($object)
{
if (!is_callable(array($object, 'getArrayCopy'))) {
- throw new Exception\BadMethodCallException(sprintf(
- '%s expects the provided object to implement getArrayCopy()', __METHOD__
- ));
+ throw new Exception\BadMethodCallException(
+ sprintf('%s expects the provided object to implement getArrayCopy()', __METHOD__)
+ );
}
$data = $object->getArrayCopy();
+ $filter = $this->getFilter();
foreach ($data as $name => $value) {
- if (!$this->getFilter()->filter($name)) {
+ if (!$filter->filter($name)) {
unset($data[$name]);
continue;
}
-
- $data[$name] = $this->extractValue($name, $value);
+ $extractedName = $this->extractName($name, $object);
+ // replace the original key with extracted, if differ
+ if ($extractedName !== $name) {
+ unset($data[$name]);
+ $name = $extractedName;
+ }
+ $data[$name] = $this->extractValue($name, $value, $object);
}
return $data;
@@ -58,19 +63,20 @@ class ArraySerializable extends AbstractHydrator
*/
public function hydrate(array $data, $object)
{
- $self = $this;
- array_walk($data, function (&$value, $name) use ($self) {
- $value = $self->hydrateValue($name, $value);
- });
+ $replacement = array();
+ foreach ($data as $key => $value) {
+ $name = $this->hydrateName($key, $data);
+ $replacement[$name] = $this->hydrateValue($name, $value, $data);
+ }
if (is_callable(array($object, 'exchangeArray'))) {
- $object->exchangeArray($data);
+ $object->exchangeArray($replacement);
} elseif (is_callable(array($object, 'populate'))) {
- $object->populate($data);
+ $object->populate($replacement);
} else {
- throw new Exception\BadMethodCallException(sprintf(
- '%s expects the provided object to implement exchangeArray() or populate()', __METHOD__
- ));
+ throw new Exception\BadMethodCallException(
+ sprintf('%s expects the provided object to implement exchangeArray() or populate()', __METHOD__)
+ );
}
return $object;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php
index ec3fc6ffb9f..526a276405a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -19,6 +19,7 @@ use Zend\Stdlib\Hydrator\Filter\HasFilter;
use Zend\Stdlib\Hydrator\Filter\IsFilter;
use Zend\Stdlib\Hydrator\Filter\MethodMatchFilter;
use Zend\Stdlib\Hydrator\Filter\OptionalParametersFilter;
+use Zend\Stdlib\Hydrator\NamingStrategy\UnderscoreNamingStrategy;
class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
{
@@ -44,10 +45,10 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
$this->callableMethodFilter = new OptionalParametersFilter();
- $this->filterComposite->addFilter("is", new IsFilter());
- $this->filterComposite->addFilter("has", new HasFilter());
- $this->filterComposite->addFilter("get", new GetFilter());
- $this->filterComposite->addFilter("parameter", new OptionalParametersFilter(), FilterComposite::CONDITION_AND);
+ $this->filterComposite->addFilter('is', new IsFilter());
+ $this->filterComposite->addFilter('has', new HasFilter());
+ $this->filterComposite->addFilter('get', new GetFilter());
+ $this->filterComposite->addFilter('parameter', new OptionalParametersFilter(), FilterComposite::CONDITION_AND);
}
/**
@@ -77,7 +78,13 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
*/
public function setUnderscoreSeparatedKeys($underscoreSeparatedKeys)
{
- $this->underscoreSeparatedKeys = $underscoreSeparatedKeys;
+ $this->underscoreSeparatedKeys = (bool) $underscoreSeparatedKeys;
+
+ if ($this->underscoreSeparatedKeys) {
+ $this->setNamingStrategy(new UnderscoreNamingStrategy);
+ } elseif ($this->getNamingStrategy() instanceof UnderscoreNamingStrategy) {
+ $this->removeNamingStrategy();
+ }
return $this;
}
@@ -102,26 +109,21 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
public function extract($object)
{
if (!is_object($object)) {
- throw new Exception\BadMethodCallException(sprintf(
- '%s expects the provided $object to be a PHP object)', __METHOD__
- ));
+ throw new Exception\BadMethodCallException(
+ sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
+ );
}
$filter = null;
if ($object instanceof FilterProviderInterface) {
$filter = new FilterComposite(
array($object->getFilter()),
- array(new MethodMatchFilter("getFilter"))
+ array(new MethodMatchFilter('getFilter'))
);
} else {
$filter = $this->filterComposite;
}
- $transform = function ($letters) {
- $letter = array_shift($letters);
-
- return '_' . strtolower($letter);
- };
$attributes = array();
$methods = get_class_methods($object);
@@ -146,9 +148,7 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
}
}
- if ($this->underscoreSeparatedKeys) {
- $attribute = preg_replace_callback('/([A-Z])/', $transform, $attribute);
- }
+ $attribute = $this->extractName($attribute, $object);
$attributes[$attribute] = $this->extractValue($attribute, $object->$method(), $object);
}
@@ -168,22 +168,13 @@ class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
public function hydrate(array $data, $object)
{
if (!is_object($object)) {
- throw new Exception\BadMethodCallException(sprintf(
- '%s expects the provided $object to be a PHP object)', __METHOD__
- ));
+ throw new Exception\BadMethodCallException(
+ sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
+ );
}
- $transform = function ($letters) {
- $letter = substr(array_shift($letters), 1, 1);
-
- return ucfirst($letter);
- };
-
foreach ($data as $property => $value) {
- $method = 'set' . ucfirst($property);
- if ($this->underscoreSeparatedKeys) {
- $method = preg_replace_callback('/(_[a-z])/i', $transform, $method);
- }
+ $method = 'set' . ucfirst($this->hydrateName($property, $data));
if (is_callable(array($object, $method))) {
$value = $this->hydrateValue($property, $value, $data);
$object->$method($value);
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php
index 49cd785d4a7..000fc701e23 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Filter;
@@ -40,12 +40,10 @@ class FilterComposite implements FilterInterface
*/
public function __construct($orFilter = array(), $andFilter = array())
{
- array_walk($orFilter,
+ array_walk(
+ $orFilter,
function ($value, $key) {
- if (
- !is_callable($value)
- && !$value instanceof FilterInterface
- ) {
+ if (!is_callable($value) && !$value instanceof FilterInterface) {
throw new InvalidArgumentException(
'The value of ' . $key . ' should be either a callable or ' .
'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
@@ -54,12 +52,10 @@ class FilterComposite implements FilterInterface
}
);
- array_walk($andFilter,
+ array_walk(
+ $andFilter,
function ($value, $key) {
- if (
- !is_callable($value)
- && !$value instanceof FilterInterface
- ) {
+ if (!is_callable($value) && !$value instanceof FilterInterface) {
throw new InvalidArgumentException(
'The value of ' . $key . ' should be either a callable or ' .
'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterInterface.php
index 7e2ebaaea6b..16df098f560 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Filter;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterProviderInterface.php
index e3fbc8c078a..c2e978877a5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterProviderInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/FilterProviderInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Filter;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/GetFilter.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/GetFilter.php
index 8a303f8f3ec..b4d898dc22f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/GetFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/GetFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Filter;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/HasFilter.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/HasFilter.php
index 48011fe055f..0cf57f95e17 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/HasFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/HasFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Filter;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/IsFilter.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/IsFilter.php
index 736212b5b95..3b6e3763742 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/IsFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/IsFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Filter;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/MethodMatchFilter.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/MethodMatchFilter.php
index 0f8db0714aa..5ed594ee750 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/MethodMatchFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/MethodMatchFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Filter;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php
index 25ed587dbd9..1254b63b35c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/NumberOfParameterFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -26,7 +26,7 @@ class NumberOfParameterFilter implements FilterInterface
*/
public function __construct($numberOfParameters = 0)
{
- $this->numberOfParameters = 0;
+ $this->numberOfParameters = (int) $numberOfParameters;
}
/**
@@ -44,10 +44,6 @@ class NumberOfParameterFilter implements FilterInterface
);
}
- if ($reflectionMethod->getNumberOfParameters() !== $this->numberOfParameters) {
- return false;
- }
-
- return true;
+ return $reflectionMethod->getNumberOfParameters() === $this->numberOfParameters;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/OptionalParametersFilter.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/OptionalParametersFilter.php
index b78a21b1d25..ccd67ca54a4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/OptionalParametersFilter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Filter/OptionalParametersFilter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Filter;
@@ -25,7 +25,7 @@ class OptionalParametersFilter implements FilterInterface
*
* @var bool[]
*/
- private static $propertiesCache = array();
+ protected static $propertiesCache = array();
/**
* {@inheritDoc}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/FilterEnabledInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/FilterEnabledInterface.php
new file mode 100644
index 00000000000..380aade050a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/FilterEnabledInterface.php
@@ -0,0 +1,63 @@
+<?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;
+
+use Zend\Stdlib\Hydrator\Filter\FilterInterface;
+use Zend\Stdlib\Hydrator\Filter\FilterComposite;
+use Zend\Stdlib\Hydrator\Filter\FilterProviderInterface;
+
+interface FilterEnabledInterface extends FilterProviderInterface
+{
+ /**
+ * Add a new filter to take care of what needs to be hydrated.
+ * To exclude e.g. the method getServiceLocator:
+ *
+ * <code>
+ * $composite->addFilter(
+ * "servicelocator",
+ * function ($property) {
+ * list($class, $method) = explode('::', $property);
+ * if ($method === 'getServiceLocator') {
+ * return false;
+ * }
+ * return true;
+ * },
+ * FilterComposite::CONDITION_AND
+ * );
+ * </code>
+ *
+ * @param string $name Index in the composite
+ * @param callable|FilterInterface $filter
+ * @param int $condition
+ * @return FilterComposite
+ */
+ public function addFilter($name, $filter, $condition = FilterComposite::CONDITION_OR);
+
+ /**
+ * Check whether a specific filter exists at key $name or not
+ *
+ * @param string $name Index in the composite
+ * @return bool
+ */
+ public function hasFilter($name);
+
+ /**
+ * Remove a filter from the composition.
+ * To not extract "has" methods, you simply need to unregister it
+ *
+ * <code>
+ * $filterComposite->removeFilter('has');
+ * </code>
+ *
+ * @param $name
+ * @return FilterComposite
+ */
+ public function removeFilter($name);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydrationInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydrationInterface.php
new file mode 100644
index 00000000000..e7deff491ae
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydrationInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator;
+
+interface HydrationInterface
+{
+ /**
+ * Hydrate $object with the provided $data.
+ *
+ * @param array $data
+ * @param object $object
+ * @return object
+ */
+ public function hydrate(array $data, $object);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php
index 598af9f1eaf..d64782ea41e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareTrait.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareTrait.php
new file mode 100644
index 00000000000..9c772c277a3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareTrait.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator;
+
+trait HydratorAwareTrait
+{
+ /**
+ * Hydrator instance
+ *
+ * @var HydratorInterface
+ * @access protected
+ */
+ protected $hydrator = null;
+
+ /**
+ * Set hydrator
+ *
+ * @param HydratorInterface $hydrator
+ * @return self
+ * @access public
+ */
+ public function setHydrator(HydratorInterface $hydrator)
+ {
+ $this->hydrator = $hydrator;
+
+ return $this;
+ }
+
+ /**
+ * Retrieve hydrator
+ *
+ * @param void
+ * @return null|HydratorInterface
+ * @access public
+ */
+ public function getHydrator()
+ {
+ return $this->hydrator;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorInterface.php
index 7d65bb08510..bc9983d9a5a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorInterface.php
@@ -3,28 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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;
-interface HydratorInterface
-{
- /**
- * Extract values from an object
- *
- * @param object $object
- * @return array
- */
- public function extract($object);
+use Zend\Stdlib\Extractor\ExtractionInterface;
- /**
- * Hydrate $object with the provided $data.
- *
- * @param array $data
- * @param object $object
- * @return object
- */
- public function hydrate(array $data, $object);
+interface HydratorInterface extends HydrationInterface, ExtractionInterface
+{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorOptionsInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorOptionsInterface.php
index 0830b758184..44610f7c1e2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorOptionsInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorOptionsInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorPluginManager.php
index 3b01f0c994d..347cce323d7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategy/NamingStrategyInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategy/NamingStrategyInterface.php
new file mode 100644
index 00000000000..ff99385c19f
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategy/NamingStrategyInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\Hydrator\NamingStrategy;
+
+/**
+ * Allow property extraction / hydration for hydrator
+ *
+ * Interface PropertyStrategyInterface
+ * @package Zend\Stdlib\Hydrator\NamingStrategy
+ */
+interface NamingStrategyInterface
+{
+ /**
+ * Converts the given name so that it can be extracted by the hydrator.
+ *
+ * @param string $name The original name
+ * @param object $object (optional) The original object for context.
+ * @return mixed The hydrated name
+ */
+ public function hydrate($name);
+
+ /**
+ * Converts the given name so that it can be hydrated by the hydrator.
+ *
+ * @param string $name The original name
+ * @param array $data (optional) The original data for context.
+ * @return mixed The extracted name
+ */
+ public function extract($name);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
new file mode 100644
index 00000000000..e76e7b04f0a
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategy/UnderscoreNamingStrategy.php
@@ -0,0 +1,72 @@
+<?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\NamingStrategy;
+
+use Zend\Filter\FilterChain;
+
+class UnderscoreNamingStrategy implements NamingStrategyInterface
+{
+ protected static $camelCaseToUnderscoreFilter;
+
+ protected static $underscoreToCamelCaseFilter;
+
+ /**
+ * Remove underscores and capitalize letters
+ *
+ * @param string $name
+ * @return string
+ */
+ public function hydrate($name)
+ {
+ return lcfirst($this->getUnderscoreToCamelCaseFilter()->filter($name));
+ }
+
+ /**
+ * Remove capitalized letters and prepend underscores.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function extract($name)
+ {
+ return $this->getCamelCaseToUnderscoreFilter()->filter($name);
+ }
+
+ /**
+ * @return FilterChain
+ */
+ protected function getUnderscoreToCamelCaseFilter()
+ {
+ if (static::$underscoreToCamelCaseFilter instanceof FilterChain) {
+ return static::$underscoreToCamelCaseFilter;
+ }
+
+ $filter = new FilterChain();
+ $filter->attachByName('WordUnderscoreToCamelCase');
+ static::$underscoreToCamelCaseFilter = $filter;
+ return $filter;
+ }
+
+ /**
+ * @return FilterChain
+ */
+ protected function getCamelCaseToUnderscoreFilter()
+ {
+ if (static::$camelCaseToUnderscoreFilter instanceof FilterChain) {
+ return static::$camelCaseToUnderscoreFilter;
+ }
+
+ $filter = new FilterChain();
+ $filter->attachByName('WordCamelCaseToUnderscore');
+ $filter->attachByName('StringToLower');
+ static::$camelCaseToUnderscoreFilter = $filter;
+ return $filter;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategyEnabledInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategyEnabledInterface.php
new file mode 100644
index 00000000000..f9c6288a760
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/NamingStrategyEnabledInterface.php
@@ -0,0 +1,44 @@
+<?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;
+
+use Zend\Stdlib\Hydrator\NamingStrategy\NamingStrategyInterface;
+
+interface NamingStrategyEnabledInterface
+{
+ /**
+ * Adds the given naming strategy
+ *
+ * @param NamingStrategyInterface $strategy The naming to register.
+ * @return NamingStrategyEnabledInterface
+ */
+ public function setNamingStrategy(NamingStrategyInterface $strategy);
+
+ /**
+ * Gets the naming strategy.
+ *
+ * @return NamingStrategyInterface
+ */
+ public function getNamingStrategy();
+
+ /**
+ * Checks if a naming strategy exists.
+ *
+ * @return bool
+ */
+ public function hasNamingStrategy();
+
+ /**
+ * Removes the naming with the given name.
+ *
+ * @return NamingStrategyEnabledInterface
+ */
+ public function removeNamingStrategy();
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ObjectProperty.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ObjectProperty.php
index c53dafb156a..c9f5260a5e8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ObjectProperty.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ObjectProperty.php
@@ -3,69 +3,108 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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;
use Zend\Stdlib\Exception;
+use ReflectionClass;
+use ReflectionProperty;
class ObjectProperty extends AbstractHydrator
{
/**
- * Extract values from an object
+ * @var array[] indexed by class name and then property name
+ */
+ private static $skippedPropertiesCache = array();
+
+ /**
+ * {@inheritDoc}
*
* Extracts the accessible non-static properties of the given $object.
*
- * @param object $object
- * @return array
* @throws Exception\BadMethodCallException for a non-object $object
*/
public function extract($object)
{
if (!is_object($object)) {
- throw new Exception\BadMethodCallException(sprintf(
- '%s expects the provided $object to be a PHP object)', __METHOD__
- ));
+ throw new Exception\BadMethodCallException(
+ sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
+ );
}
- $data = get_object_vars($object);
-
+ $data = get_object_vars($object);
$filter = $this->getFilter();
+
foreach ($data as $name => $value) {
// Filter keys, removing any we don't want
- if (!$filter->filter($name)) {
+ if (! $filter->filter($name)) {
unset($data[$name]);
continue;
}
- // Extract data
- $data[$name] = $this->extractValue($name, $value);
+
+ // Replace name if extracted differ
+ $extracted = $this->extractName($name, $object);
+
+ if ($extracted !== $name) {
+ unset($data[$name]);
+ $name = $extracted;
+ }
+
+ $data[$name] = $this->extractValue($name, $value, $object);
}
return $data;
}
/**
+ * {@inheritDoc}
+ *
* Hydrate an object by populating public properties
*
* Hydrates an object by setting public properties of the object.
*
- * @param array $data
- * @param object $object
- * @return object
* @throws Exception\BadMethodCallException for a non-object $object
*/
public function hydrate(array $data, $object)
{
if (!is_object($object)) {
- throw new Exception\BadMethodCallException(sprintf(
- '%s expects the provided $object to be a PHP object)', __METHOD__
- ));
+ throw new Exception\BadMethodCallException(
+ sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
+ );
}
- foreach ($data as $property => $value) {
+
+ $properties = & self::$skippedPropertiesCache[get_class($object)];
+
+ if (! isset($properties)) {
+ $reflection = new ReflectionClass($object);
+ $properties = array_fill_keys(
+ array_map(
+ function (ReflectionProperty $property) {
+ return $property->getName();
+ },
+ $reflection->getProperties(
+ ReflectionProperty::IS_PRIVATE
+ + ReflectionProperty::IS_PROTECTED
+ + ReflectionProperty::IS_STATIC
+ )
+ ),
+ true
+ );
+ }
+
+ foreach ($data as $name => $value) {
+ $property = $this->hydrateName($name, $data);
+
+ if (isset($properties[$property])) {
+ continue;
+ }
+
$object->$property = $this->hydrateValue($property, $value, $data);
}
+
return $object;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Reflection.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Reflection.php
index 3e9cfd0cc22..ea8e2d21530 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Reflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Reflection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,7 @@ class Reflection extends AbstractHydrator
{
/**
* Simple in-memory array cache of ReflectionProperties used.
- * @var array
+ * @var \ReflectionProperty[]
*/
protected static $reflProperties = array();
@@ -30,7 +30,7 @@ class Reflection extends AbstractHydrator
{
$result = array();
foreach (self::getReflProperties($object) as $property) {
- $propertyName = $property->getName();
+ $propertyName = $this->extractName($property->getName(), $object);
if (!$this->filterComposite->filter($propertyName)) {
continue;
}
@@ -53,8 +53,9 @@ class Reflection extends AbstractHydrator
{
$reflProperties = self::getReflProperties($object);
foreach ($data as $key => $value) {
- if (isset($reflProperties[$key])) {
- $reflProperties[$key]->setValue($object, $this->hydrateValue($key, $value, $data));
+ $name = $this->hydrateName($key, $data);
+ if (isset($reflProperties[$name])) {
+ $reflProperties[$name]->setValue($object, $this->hydrateValue($name, $value, $data));
}
}
return $object;
@@ -66,7 +67,7 @@ class Reflection extends AbstractHydrator
*
* @param string|object $input
* @throws Exception\InvalidArgumentException
- * @return array
+ * @return \ReflectionProperty[]
*/
protected static function getReflProperties($input)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/ClosureStrategy.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/ClosureStrategy.php
index a5cb3413a4b..bf456a7fc43 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/ClosureStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/ClosureStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -75,26 +75,28 @@ class ClosureStrategy implements StrategyInterface
/**
* Converts the given value so that it can be extracted by the hydrator.
*
- * @param mixed $value The original value.
+ * @param mixed $value The original value.
+ * @param array $object The object is optionally provided as context.
* @return mixed Returns the value that should be extracted.
*/
- public function extract($value)
+ public function extract($value, $object = null)
{
$func = $this->extractFunc;
- return $func($value);
+ return $func($value, $object);
}
/**
* Converts the given value so that it can be hydrated by the hydrator.
*
- * @param mixed $value The original value.
+ * @param mixed $value The original value.
+ * @param array $data The whole data is optionally provided as context.
* @return mixed Returns the value that should be hydrated.
*/
- public function hydrate($value)
+ public function hydrate($value, $data = null)
{
$func = $this->hydrateFunc;
- return $func($value);
+ return $func($value, $data);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php
index d455f177d80..b2c5c29b433 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
index 71375bb9788..260efa3087b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php
index 03208b3eef7..562ec4bd6c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php
index 9cb0f4ab633..6f29b16a6dd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/InitializableInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/InitializableInterface.php
index f50343c25be..f78bedef301 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/InitializableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/InitializableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/JsonSerializable.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/JsonSerializable.php
new file mode 100644
index 00000000000..6d6c2abe873
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/JsonSerializable.php
@@ -0,0 +1,28 @@
+<?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;
+
+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/vendor/zendframework/zendframework/library/Zend/Stdlib/JsonSerializable/PhpLegacyCompatibility.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/JsonSerializable/PhpLegacyCompatibility.php
new file mode 100644
index 00000000000..ecc7525d4cd
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/JsonSerializable/PhpLegacyCompatibility.php
@@ -0,0 +1,28 @@
+<?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/vendor/zendframework/zendframework/library/Zend/Stdlib/Message.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Message.php
index c6c1c825c69..63ba7c7303c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Message.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Message.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/MessageInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/MessageInterface.php
index 8d94e146bb1..28d8857fcdd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/MessageInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/MessageInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -41,5 +41,4 @@ interface MessageInterface
* @return mixed
*/
public function getContent();
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ParameterObjectInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ParameterObjectInterface.php
index e03f4e6c456..676a6e2b991 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ParameterObjectInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ParameterObjectInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Parameters.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Parameters.php
index e33e4e482c2..f59197cbe9b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Parameters.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Parameters.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -83,7 +83,7 @@ class Parameters extends PhpArrayObject implements ParametersInterface
*/
public function offsetGet($name)
{
- if (isset($this[$name])) {
+ if ($this->offsetExists($name)) {
return parent::offsetGet($name);
}
return null;
@@ -96,7 +96,7 @@ class Parameters extends PhpArrayObject implements ParametersInterface
*/
public function get($name, $default = null)
{
- if (isset($this[$name])) {
+ if ($this->offsetExists($name)) {
return parent::offsetGet($name);
}
return $default;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ParametersInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ParametersInterface.php
index 7dcd6677841..feeda580735 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ParametersInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ParametersInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/PriorityList.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/PriorityList.php
new file mode 100644
index 00000000000..ba206a958fc
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/PriorityList.php
@@ -0,0 +1,261 @@
+<?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;
+
+use Countable;
+use Iterator;
+
+class PriorityList implements Iterator, Countable
+{
+ const EXTR_DATA = 0x00000001;
+ const EXTR_PRIORITY = 0x00000002;
+ const EXTR_BOTH = 0x00000003;
+ /**
+ * Internal list of all items.
+ *
+ * @var array[]
+ */
+ protected $items = array();
+
+ /**
+ * Serial assigned to items to preserve LIFO.
+ *
+ * @var int
+ */
+ protected $serial = 0;
+
+ /**
+ * Serial order mode
+ * @var integer
+ */
+ protected $isLIFO = 1;
+
+ /**
+ * Internal counter to avoid usage of count().
+ *
+ * @var int
+ */
+ protected $count = 0;
+
+ /**
+ * Whether the list was already sorted.
+ *
+ * @var bool
+ */
+ protected $sorted = false;
+
+ /**
+ * Insert a new item.
+ *
+ * @param string $name
+ * @param mixed $value
+ * @param int $priority
+ *
+ * @return void
+ */
+ public function insert($name, $value, $priority = 0)
+ {
+ $this->sorted = false;
+ $this->count++;
+
+ $this->items[$name] = array(
+ 'data' => $value,
+ 'priority' => (int) $priority,
+ 'serial' => $this->serial++,
+ );
+ }
+
+ /**
+ * @param string $name
+ * @param int $priority
+ *
+ * @return $this
+ *
+ * @throws \Exception
+ */
+ public function setPriority($name, $priority)
+ {
+ if (!isset($this->items[$name])) {
+ throw new \Exception("item $name not found");
+ }
+
+ $this->items[$name]['priority'] = (int) $priority;
+ $this->sorted = false;
+
+ return $this;
+ }
+
+ /**
+ * Remove a item.
+ *
+ * @param string $name
+ * @return void
+ */
+ public function remove($name)
+ {
+ if (isset($this->items[$name])) {
+ $this->count--;
+ }
+
+ unset($this->items[$name]);
+ }
+
+ /**
+ * Remove all items.
+ *
+ * @return void
+ */
+ public function clear()
+ {
+ $this->items = array();
+ $this->serial = 0;
+ $this->count = 0;
+ $this->sorted = false;
+ }
+
+ /**
+ * Get a item.
+ *
+ * @param string $name
+ * @return mixed
+ */
+ public function get($name)
+ {
+ if (!isset($this->items[$name])) {
+ return null;
+ }
+
+ return $this->items[$name]['data'];
+ }
+
+ /**
+ * Sort all items.
+ *
+ * @return void
+ */
+ protected function sort()
+ {
+ if (!$this->sorted) {
+ uasort($this->items, array($this, 'compare'));
+ $this->sorted = true;
+ }
+ }
+
+ /**
+ * Compare the priority of two items.
+ *
+ * @param array $item1,
+ * @param array $item2
+ * @return int
+ */
+ protected function compare(array $item1, array $item2)
+ {
+ return ($item1['priority'] === $item2['priority'])
+ ? ($item1['serial'] > $item2['serial'] ? -1 : 1) * $this->isLIFO
+ : ($item1['priority'] > $item2['priority'] ? -1 : 1);
+ }
+
+ /**
+ * Get/Set serial order mode
+ *
+ * @param bool|null $flag
+ *
+ * @return bool
+ */
+ public function isLIFO($flag = null)
+ {
+ if ($flag !== null) {
+ $isLifo = $flag === true ? 1 : -1;
+
+ if ($isLifo !== $this->isLIFO) {
+ $this->isLIFO = $isLifo;
+ $this->sorted = false;
+ }
+ }
+
+ return 1 === $this->isLIFO;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function rewind()
+ {
+ $this->sort();
+ reset($this->items);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function current()
+ {
+ $node = current($this->items);
+
+ return $node ? $node['data'] : false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function key()
+ {
+ return key($this->items);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function next()
+ {
+ $node = next($this->items);
+
+ return $node ? $node['data'] : false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function valid()
+ {
+ return current($this->items) !== false;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function count()
+ {
+ return $this->count;
+ }
+
+ /**
+ * Return list as array
+ *
+ * @param int $flag
+ *
+ * @return array
+ */
+ public function toArray($flag = self::EXTR_DATA)
+ {
+ $this->sort();
+
+ if ($flag == self::EXTR_BOTH) {
+ return $this->items;
+ }
+
+ return array_map(
+ function ($item) use ($flag) {
+ return ($flag == PriorityList::EXTR_PRIORITY) ? $item['priority'] : $item['data'];
+ },
+ $this->items
+ );
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/PriorityQueue.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/PriorityQueue.php
index 869af132f23..81acaf59f32 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/PriorityQueue.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/PriorityQueue.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Request.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Request.php
index 674111e3124..7c0840395e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Request.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Request.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/RequestInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/RequestInterface.php
index 210e486907b..c2bac316d4c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/RequestInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/RequestInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Response.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Response.php
index 69b8818ae50..f3074bad5e9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Response.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Response.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/ResponseInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ResponseInterface.php
index 2ddc9787aba..fe94d3043a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ResponseInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ResponseInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,5 +11,4 @@ namespace Zend\Stdlib;
interface ResponseInterface extends MessageInterface
{
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/SplPriorityQueue.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/SplPriorityQueue.php
index 404e4c243f3..029d8e9f059 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/SplPriorityQueue.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/SplPriorityQueue.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -42,7 +42,6 @@ class SplPriorityQueue extends \SplPriorityQueue implements Serializable
parent::insert($datum, $priority);
}
-
/**
* Serialize to an array
*
@@ -59,7 +58,6 @@ class SplPriorityQueue extends \SplPriorityQueue implements Serializable
return $array;
}
-
/**
* Serialize
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/SplQueue.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/SplQueue.php
index fe06b88472f..029bc9f1273 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/SplQueue.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/SplQueue.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/SplStack.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/SplStack.php
index 1b17acc72f1..fac77a5d047 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/SplStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/SplStack.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringUtils.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringUtils.php
index e468a8f294c..9bbb4a46e31 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringUtils.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringUtils.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -19,7 +19,6 @@ use Zend\Stdlib\StringWrapper\StringWrapperInterface;
*/
abstract class StringUtils
{
-
/**
* Ordered list of registered string wrapper instances
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
index d3e8830d654..3e395ccc5ae 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -67,7 +67,6 @@ abstract class AbstractStringWrapper implements StringWrapperInterface
);
}
-
if ($convertEncoding !== null) {
$convertEncodingUpper = strtoupper($convertEncoding);
if (!in_array($convertEncodingUpper, $supportedEncodings)) {
@@ -245,8 +244,6 @@ abstract class AbstractStringWrapper implements StringWrapperInterface
$repeatCount = floor($lengthOfPadding / $padStringLength);
if ($padType === STR_PAD_BOTH) {
- $lastStringLeft = '';
- $lastStringRight = '';
$repeatCountLeft = $repeatCountRight = ($repeatCount - $repeatCount % 2) / 2;
$lastStringLength = $lengthOfPadding - 2 * $repeatCountLeft * $padStringLength;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Iconv.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Iconv.php
index d240eaaddb1..04930ff453d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Iconv.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Iconv.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Intl.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Intl.php
index 77596c84738..1b012773678 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Intl.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Intl.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/MbString.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/MbString.php
index fad66295607..d6db18566d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/MbString.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/MbString.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Native.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Native.php
index d6e55b10865..38b3c10a41c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Native.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Native.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php
index a22c4e55730..f25b3253fc3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/StringWrapperInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/compatibility/autoload.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/compatibility/autoload.php
index 1a237d227ee..f8670cc16b6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/compatibility/autoload.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/compatibility/autoload.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @deprecated
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/composer.json b/vendor/zendframework/zendframework/library/Zend/Stdlib/composer.json
index 217c5eaa40e..642622704ae 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/composer.json
@@ -6,23 +6,32 @@
"zf2",
"stdlib"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Stdlib\\": ""
}
},
"target-dir": "Zend/Stdlib",
+ "require": {
+ "php": ">=5.3.23"
+ },
+ "require-dev": {
+ "zendframework/zend-eventmanager": "self.version",
+ "zendframework/zend-serializer": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-filter": "self.version"
+ },
"suggest": {
+ "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+ "zendframework/zend-serializer": "Zend\\Serializer component",
"zendframework/zend-servicemanager": "To support hydrator plugin manager usage",
- "zendframework/zend-eventmanager": "To support aggregate hydrator usage"
- },
- "require": {
- "php": ">=5.3.3"
+ "zendframework/zend-filter": "To support naming strategy hydrator usage"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Tag/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud.php
index af108c5d316..3d6e2277e13 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php
index 3510b28b128..2b001638dc5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractCloud.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractDecorator.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractDecorator.php
index d33db3c225a..cfc91362586 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractDecorator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractDecorator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractTag.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractTag.php
index b2e61d76e34..c4fcaacfb73 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/AbstractTag.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php
index 312e8aeee39..18bc5e38637 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/DecoratorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
index 45c50c49f20..1526b6256f0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,4 +15,5 @@ use Zend\Tag\Exception\ExceptionInterface as Exception;
* Exception class for Zend\Tag\Cloud\Decorator
*/
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php
index 8279d2ea9c9..8d4d2cf4639 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Tag\Cloud\Decorator\Exception;
use Zend\Tag\Exception;
-class InvalidArgumentException
- extends Exception\InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
index d1822cdada2..625d51ca015 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -20,7 +20,7 @@ class HtmlCloud extends AbstractCloud
* @var array
*/
protected $htmlTags = array(
- 'ul' => array('class' => 'Zend\Tag\Cloud')
+ 'ul' => array('class' => 'zend-tag-cloud'),
);
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlTag.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
index ebbe8dad860..b7ecf3491cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/DecoratorPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/DecoratorPluginManager.php
index 0e212878505..1a951846abe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/DecoratorPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/DecoratorPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -30,7 +30,7 @@ class DecoratorPluginManager extends AbstractPluginManager
'htmlcloud' => 'Zend\Tag\Cloud\Decorator\HtmlCloud',
'htmltag' => 'Zend\Tag\Cloud\Decorator\HtmlTag',
'tag' => 'Zend\Tag\Cloud\Decorator\HtmlTag',
- );
+ );
/**
* Validate the plugin
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/ExceptionInterface.php
index cd99c4e5318..3a8e882a32c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidArgumentException.php
index 8d25185a22b..88a8db56608 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidArgumentException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Tag\Exception;
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidAttributeNameException.php b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidAttributeNameException.php
index 8e5abfc62bc..44700c85882 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidAttributeNameException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidAttributeNameException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Tag\Exception;
use DomainException;
class InvalidAttributeNameException extends DomainException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidElementNameException.php b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidElementNameException.php
index a9e1c6f9fd7..02f15376f87 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidElementNameException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidElementNameException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Tag\Exception;
use DomainException;
class InvalidElementNameException extends DomainException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/OutOfBoundsException.php
index 98e24c06c40..6db45d52077 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/OutOfBoundsException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Tag\Exception;
-class OutOfBoundsException
- extends \OutOfBoundsException
- implements ExceptionInterface
-{}
+class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/Item.php b/vendor/zendframework/zendframework/library/Zend/Tag/Item.php
index 35effba901d..96c2ea5a6a7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Item.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/Item.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/ItemList.php b/vendor/zendframework/zendframework/library/Zend/Tag/ItemList.php
index 7585260176c..c85a8586f47 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/ItemList.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/ItemList.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/TaggableInterface.php b/vendor/zendframework/zendframework/library/Zend/Tag/TaggableInterface.php
index 3a475ac9d7c..6489a0395bf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/TaggableInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/TaggableInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Tag/composer.json b/vendor/zendframework/zendframework/library/Zend/Tag/composer.json
index 45900c0988c..baaa1e739ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/composer.json
@@ -6,6 +6,7 @@
"zf2",
"tag"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Tag\\": ""
@@ -13,14 +14,20 @@
},
"target-dir": "Zend/Tag",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-escaper": "self.version",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-servicemanager": "self.version"
+ },
+ "suggest": {
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Test/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Test/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
index d1f1ea2155c..e30d948ac93 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractConsoleControllerTestCase.php
@@ -4,7 +4,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Test\PHPUnit\Controller;
@@ -29,10 +29,13 @@ abstract class AbstractConsoleControllerTestCase extends AbstractControllerTestC
{
$response = $this->getResponse();
if (false === stripos($response->getContent(), $match)) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting output CONTAINS content "%s", actual content is "%s"',
- $match, $response->getContent()
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf(
+ 'Failed asserting output CONTAINS content "%s", actual content is "%s"',
+ $match,
+ $response->getContent()
+ )
+ );
}
$this->assertNotSame(false, stripos($response->getContent(), $match));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
index 8fd550ce6ea..cccf5203d1c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Test\PHPUnit\Controller;
@@ -65,6 +65,15 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
protected function tearDown()
{
Console::overrideIsConsole($this->usedConsoleBackup);
+
+ if (true !== $this->traceError) {
+ return;
+ }
+
+ $exception = $this->getApplication()->getMvcEvent()->getParam('exception');
+ if ($exception instanceof \Exception) {
+ throw $exception;
+ }
}
/**
@@ -78,12 +87,13 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Set the trace error flag
- * @param bool $traceError
+ * @param bool $traceError
* @return AbstractControllerTestCase
*/
public function setTraceError($traceError)
{
$this->traceError = $traceError;
+
return $this;
}
@@ -98,12 +108,13 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Set the usage of the console router or not
- * @param bool $boolean
+ * @param bool $boolean
* @return AbstractControllerTestCase
*/
public function setUseConsoleRequest($boolean)
{
$this->useConsoleRequest = (bool) $boolean;
+
return $this;
}
@@ -118,7 +129,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Set the application config
- * @param array $applicationConfig
+ * @param array $applicationConfig
* @return AbstractControllerTestCase
* @throws LogicException
*/
@@ -135,6 +146,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$applicationConfig['module_listener_options']['config_cache_enabled'] = false;
}
$this->applicationConfig = $applicationConfig;
+
return $this;
}
@@ -187,18 +199,19 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Set the request URL
*
- * @param string $url
- * @param string|null $method
- * @param array|null $params
+ * @param string $url
+ * @param string|null $method
+ * @param array|null $params
* @return AbstractControllerTestCase
*/
public function url($url, $method = HttpRequest::METHOD_GET, $params = array())
{
$request = $this->getRequest();
if ($this->useConsoleRequest) {
- preg_match_all('/(--\S+[= ]"\S*\s*\S*")|(--\S+=\S+|--\S+\s\S+|\S+)/', $url, $matches);
+ preg_match_all('/(--\S+[= ]"[^\s"]*\s*[^\s"]*")|(--\S+=\S+|--\S+\s\S+|\S+)/', $url, $matches);
$params = str_replace(array(' "', '"'), array('=', ''), $matches[0]);
$request->params()->exchangeArray($params);
+
return $this;
}
@@ -219,10 +232,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$query = array_merge($query, $params);
} elseif ($method == HttpRequest::METHOD_PUT) {
if (count($params) != 0) {
- array_walk($params,
- function (&$item, $key) { $item = $key . '=' . $item; }
- );
- $content = implode('&', $params);
+ $content = http_build_query($params);
$request->setContent($content);
}
} elseif ($params) {
@@ -242,38 +252,34 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
}
/**
- * Dispatch the MVC with an URL
+ * Dispatch the MVC with a URL
* Accept a HTTP (simulate a customer action) or console route.
*
* The URL provided set the request URI in the request object.
*
- * @param string $url
+ * @param string $url
* @param string|null $method
- * @param array|null $params
+ * @param array|null $params
* @throws \Exception
*/
- public function dispatch($url, $method = null, $params = array())
+ public function dispatch($url, $method = null, $params = array(), $isXmlHttpRequest = false)
{
- if ( !isset($method) &&
- $this->getRequest() instanceof HttpRequest &&
- $requestMethod = $this->getRequest()->getMethod()
+ if (!isset($method)
+ && $this->getRequest() instanceof HttpRequest
+ && $requestMethod = $this->getRequest()->getMethod()
) {
$method = $requestMethod;
} elseif (!isset($method)) {
$method = HttpRequest::METHOD_GET;
}
- $this->url($url, $method, $params);
- $this->getApplication()->run();
-
- if (true !== $this->traceError) {
- return;
+ if ($isXmlHttpRequest) {
+ $headers = $this->getRequest()->getHeaders();
+ $headers->addHeaderLine('X_REQUESTED_WITH', 'XMLHttpRequest');
}
- $exception = $this->getApplication()->getMvcEvent()->getParam('exception');
- if ($exception instanceof \Exception) {
- throw $exception;
- }
+ $this->url($url, $method, $params);
+ $this->getApplication()->run();
}
/**
@@ -281,16 +287,19 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
*
* @return AbstractControllerTestCase
*/
- public function reset()
+ public function reset($keepPersistence = false)
{
// force to re-create all components
$this->application = null;
// reset server datas
- $_SESSION = array();
+ if (!$keepPersistence) {
+ $_SESSION = array();
+ $_COOKIE = array();
+ }
+
$_GET = array();
$_POST = array();
- $_COOKIE = array();
// reset singleton
StaticEventManager::resetInstance();
@@ -301,7 +310,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Trigger an application event
*
- * @param string $eventName
+ * @param string $eventName
* @return \Zend\EventManager\ResponseCollection
*/
public function triggerApplicationEvent($eventName)
@@ -339,9 +348,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$modulesLoaded = $moduleManager->getModules();
$list = array_diff($modules, $modulesLoaded);
if ($list) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Several modules are not loaded "%s"', implode(', ', $list)
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Several modules are not loaded "%s"', implode(', ', $list))
+ );
}
$this->assertEquals(count($list), 0);
}
@@ -349,7 +358,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Assert modules were not loaded with the module manager
*
- * @param array $modules
+ * @param array $modules
*/
public function assertNotModulesLoaded(array $modules)
{
@@ -357,9 +366,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$modulesLoaded = $moduleManager->getModules();
$list = array_intersect($modules, $modulesLoaded);
if ($list) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Several modules WAS not loaded "%s"', implode(', ', $list)
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Several modules WAS not loaded "%s"', implode(', ', $list))
+ );
}
$this->assertEquals(count($list), 0);
}
@@ -380,13 +389,14 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
if (null === $match) {
$match = 0;
}
+
return $match;
}
/**
* Assert response status code
*
- * @param int $code
+ * @param int $code
*/
public function assertResponseStatusCode($code)
{
@@ -399,10 +409,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
}
$match = $this->getResponseStatusCode();
if ($code != $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting response code "%s", actual status code is "%s"',
- $code, $match
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting response code "%s", actual status code is "%s"', $code, $match)
+ );
}
$this->assertEquals($code, $match);
}
@@ -410,7 +419,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Assert not response status code
*
- * @param int $code
+ * @param int $code
*/
public function assertNotResponseStatusCode($code)
{
@@ -423,10 +432,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
}
$match = $this->getResponseStatusCode();
if ($code == $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting response code was NOT "%s"',
- $code
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting response code was NOT "%s"', $code)
+ );
}
$this->assertNotEquals($code, $match);
}
@@ -462,15 +470,16 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
{
$routeMatch = $this->getApplication()->getMvcEvent()->getRouteMatch();
$controllerIdentifier = $routeMatch->getParam('controller');
- $controllerManager = $this->getApplicationServiceLocator()->get('ControllerLoader');
+ $controllerManager = $this->getApplicationServiceLocator()->get('ControllerManager');
$controllerClass = $controllerManager->get($controllerIdentifier);
+
return get_class($controllerClass);
}
/**
* Assert that the application route match used the given module
*
- * @param string $module
+ * @param string $module
*/
public function assertModuleName($module)
{
@@ -479,10 +488,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$match = strtolower($match);
$module = strtolower($module);
if ($module != $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting module name "%s", actual module name is "%s"',
- $module, $match
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting module name "%s", actual module name is "%s"', $module, $match)
+ );
}
$this->assertEquals($module, $match);
}
@@ -490,7 +498,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Assert that the application route match used NOT the given module
*
- * @param string $module
+ * @param string $module
*/
public function assertNotModuleName($module)
{
@@ -499,10 +507,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$match = strtolower($match);
$module = strtolower($module);
if ($module == $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting module was NOT "%s"',
- $module
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting module was NOT "%s"', $module)
+ );
}
$this->assertNotEquals($module, $match);
}
@@ -510,7 +517,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Assert that the application route match used the given controller class
*
- * @param string $controller
+ * @param string $controller
*/
public function assertControllerClass($controller)
{
@@ -519,10 +526,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$match = strtolower($match);
$controller = strtolower($controller);
if ($controller != $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting controller class "%s", actual controller class is "%s"',
- $controller, $match
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting controller class "%s", actual controller class is "%s"', $controller, $match)
+ );
}
$this->assertEquals($controller, $match);
}
@@ -530,7 +536,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Assert that the application route match used NOT the given controller class
*
- * @param string $controller
+ * @param string $controller
*/
public function assertNotControllerClass($controller)
{
@@ -539,10 +545,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$match = strtolower($match);
$controller = strtolower($controller);
if ($controller == $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting controller class was NOT "%s"',
- $controller
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting controller class was NOT "%s"', $controller)
+ );
}
$this->assertNotEquals($controller, $match);
}
@@ -550,7 +555,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Assert that the application route match used the given controller name
*
- * @param string $controller
+ * @param string $controller
*/
public function assertControllerName($controller)
{
@@ -559,10 +564,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$match = strtolower($match);
$controller = strtolower($controller);
if ($controller != $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting controller name "%s", actual controller name is "%s"',
- $controller, $match
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting controller name "%s", actual controller name is "%s"', $controller, $match)
+ );
}
$this->assertEquals($controller, $match);
}
@@ -570,7 +574,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Assert that the application route match used NOT the given controller name
*
- * @param string $controller
+ * @param string $controller
*/
public function assertNotControllerName($controller)
{
@@ -579,10 +583,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$match = strtolower($match);
$controller = strtolower($controller);
if ($controller == $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting controller name was NOT "%s"',
- $controller
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting controller name was NOT "%s"', $controller)
+ );
}
$this->assertNotEquals($controller, $match);
}
@@ -590,7 +593,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Assert that the application route match used the given action
*
- * @param string $action
+ * @param string $action
*/
public function assertActionName($action)
{
@@ -599,10 +602,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$match = strtolower($match);
$action = strtolower($action);
if ($action != $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting action name "%s", actual action name is "%s"',
- $action, $match
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting action name "%s", actual action name is "%s"', $action, $match)
+ );
}
$this->assertEquals($action, $match);
}
@@ -610,7 +612,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Assert that the application route match used NOT the given action
*
- * @param string $action
+ * @param string $action
*/
public function assertNotActionName($action)
{
@@ -619,10 +621,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$match = strtolower($match);
$action = strtolower($action);
if ($action == $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting action name was NOT "%s"',
- $action
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting action name was NOT "%s"', $action)
+ );
}
$this->assertNotEquals($action, $match);
}
@@ -630,7 +631,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Assert that the application route match used the given route name
*
- * @param string $route
+ * @param string $route
*/
public function assertMatchedRouteName($route)
{
@@ -639,10 +640,9 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$match = strtolower($match);
$route = strtolower($route);
if ($route != $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting matched route name was "%s", actual matched route name is "%s"',
- $route, $match
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting matched route name was "%s", actual matched route name is "%s"', $route, $match)
+ );
}
$this->assertEquals($route, $match);
}
@@ -650,7 +650,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
/**
* Assert that the application route match used NOT the given route name
*
- * @param string $route
+ * @param string $route
*/
public function assertNotMatchedRouteName($route)
{
@@ -659,10 +659,53 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
$match = strtolower($match);
$route = strtolower($route);
if ($route == $match) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting route matched was NOT "%s"', $route
- ));
+ throw new PHPUnit_Framework_ExpectationFailedException(
+ sprintf('Failed asserting route matched was NOT "%s"', $route)
+ );
}
$this->assertNotEquals($route, $match);
}
+
+ /**
+ * Assert template name
+ * Assert that a template was used somewhere in the view model tree
+ *
+ * @param string $templateName
+ */
+ public function assertTemplateName($templateName)
+ {
+ $viewModel = $this->getApplication()->getMvcEvent()->getViewModel();
+ $this->assertTrue($this->searchTemplates($viewModel, $templateName));
+ }
+
+ /**
+ * Assert not template name
+ * Assert that a template was not used somewhere in the view model tree
+ *
+ * @param string $templateName
+ */
+ public function assertNotTemplateName($templateName)
+ {
+ $viewModel = $this->getApplication()->getMvcEvent()->getViewModel();
+ $this->assertFalse($this->searchTemplates($viewModel, $templateName));
+ }
+
+ /**
+ * Recursively search a view model and it's children for the given templateName
+ *
+ * @param \Zend\View\Model\ModelInterface $viewModel
+ * @param string $templateName
+ * @return boolean
+ */
+ protected function searchTemplates($viewModel, $templateName)
+ {
+ if ($viewModel->getTemplate($templateName) == $templateName) {
+ return true;
+ }
+ foreach ($viewModel->getChildren() as $child) {
+ return $this->searchTemplates($child, $templateName);
+ }
+
+ return false;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
index 12cca473036..0c741475462 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
@@ -3,13 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Test\PHPUnit\Controller;
use PHPUnit_Framework_ExpectationFailedException;
-use Zend\Dom;
+use Zend\Dom\Document;
abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
{
@@ -39,6 +39,16 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
return $responseHeader;
}
+ /**
+ * Assert response has the given reason phrase
+ *
+ * @param string $phrase
+ */
+ public function assertResponseReasonPhrase($phrase)
+ {
+ $this->assertEquals($phrase, $this->getResponse()->getReasonPhrase());
+ }
+
/**
* Assert response header exists
*
@@ -84,7 +94,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$responseHeader = $this->getResponseHeader($header);
if (!$responseHeader) {
throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting response header, header "%s" do not exists',
+ 'Failed asserting response header, header "%s" doesn\'t exist',
$header
));
}
@@ -125,7 +135,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$responseHeader = $this->getResponseHeader($header);
if (!$responseHeader) {
throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting response header, header "%s" do not exists',
+ 'Failed asserting response header, header "%s" doesn\'t exist',
$header
));
}
@@ -158,7 +168,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$responseHeader = $this->getResponseHeader($header);
if (!$responseHeader) {
throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting response header, header "%s" do not exists',
+ 'Failed asserting response header, header "%s" doesn\'t exist',
$header
));
}
@@ -200,7 +210,7 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$responseHeader = $this->getResponseHeader($header);
if (!$responseHeader) {
throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting response header, header "%s" do not exists',
+ 'Failed asserting response header, header "%s" doesn\'t exist',
$header
));
}
@@ -360,17 +370,24 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
*
* @param string $path
* @param bool $useXpath
- * @return array
+ * @return Document\NodeList
*/
private function query($path, $useXpath = false)
{
$response = $this->getResponse();
- $dom = new Dom\Query($response->getContent());
+ $document = new Document($response->getContent());
+
if ($useXpath) {
- $dom->registerXpathNamespaces($this->xpathNamespaces);
- return $dom->queryXpath($path);
+ $document->registerXpathNamespaces($this->xpathNamespaces);
}
- return $dom->execute($path);
+
+ $result = Document\Query::execute(
+ $path,
+ $document,
+ $useXpath ? Document\Query::TYPE_XPATH : Document\Query::TYPE_CSS
+ );
+
+ return $result;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/Util/ModuleLoader.php b/vendor/zendframework/zendframework/library/Zend/Test/Util/ModuleLoader.php
index 05d36068398..671dfa2dedf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/Util/ModuleLoader.php
+++ b/vendor/zendframework/zendframework/library/Zend/Test/Util/ModuleLoader.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Test\Util;
@@ -52,7 +52,7 @@ class ModuleLoader
/**
* Get the application
*
- * @return Zend\Mvc\Application
+ * @return \Zend\Mvc\Application
*/
public function getApplication()
{
@@ -62,7 +62,7 @@ class ModuleLoader
/**
* Get the module manager
*
- * @return Zend\ModuleManager\ModuleManager
+ * @return \Zend\ModuleManager\ModuleManager
*/
public function getModuleManager()
{
@@ -70,8 +70,9 @@ class ModuleLoader
}
/**
- * Get module
+ * Get module by name
*
+ * @param $moduleName
* @return mixed
*/
public function getModule($moduleName)
@@ -82,7 +83,7 @@ class ModuleLoader
/**
* Get the service manager
*
- * @var ServiceManager
+ * @return ServiceManager
*/
public function getServiceManager()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/composer.json b/vendor/zendframework/zendframework/library/Zend/Test/composer.json
index 99bba1c3720..f107cefb8db 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Test/composer.json
@@ -6,6 +6,7 @@
"zf2",
"test"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Test\\": ""
@@ -13,7 +14,7 @@
},
"target-dir": "Zend/Test",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"phpunit/PHPUnit": "3.7.*",
"zendframework/zend-console": "self.version",
"zendframework/zend-dom": "self.version",
@@ -25,10 +26,16 @@
"zendframework/zend-uri": "self.version",
"zendframework/zend-view": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-console": "self.version"
+ },
+ "suggest": {
+ "zendframework/zend-console": "Zend\\Console component"
+ },
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Text/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Text/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/ExceptionInterface.php
index d104ef1125f..efce79a61eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Text\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/InvalidArgumentException.php
index 72c9764b87a..68b980bc412 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Exception/InvalidArgumentException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Text\Exception;
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/OutOfBoundsException.php
index 1897dffc01a..59e71299984 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Exception/OutOfBoundsException.php
@@ -3,15 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Text\Exception;
-use Zend\Text\Exception;
-
-class OutOfBoundsException
- extends \OutOfBoundsException
- implements ExceptionInterface
-{}
+class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Exception/OverflowException.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/OverflowException.php
index bb2e7d6f974..de9c1fdaddf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/OverflowException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Exception/OverflowException.php
@@ -3,15 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Text\Exception;
-use Zend\Text\Exception;
-
-class OverflowException
- extends \OverflowException
- implements ExceptionInterface
-{}
+class OverflowException extends \OverflowException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/RuntimeException.php
index 7677c1e813a..35493d0f8a2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Exception/RuntimeException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Text\Exception;
-class RuntimeException
- extends \RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/UnexpectedValueException.php
index e5e0c648ec8..fbe71b04756 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Exception/UnexpectedValueException.php
@@ -3,14 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Text\Exception;
-class UnexpectedValueException
- extends \UnexpectedValueException
- implements ExceptionInterface
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/ExceptionInterface.php
index eded63a1710..5803b7e3bc5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Text\Figlet\Exception;
use Zend\Text\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
index 266e5dc3cc0..de981c98408 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Text\Exception;
/**
* Exception class for Zend\Text
*/
-class InvalidArgumentException
- extends Exception\InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/RuntimeException.php
index 2334e8a6a69..961bf59ae02 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Text\Exception;
/**
* Exception class for Zend\Text
*/
-class RuntimeException
- extends Exception\RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
index d7a54c8a199..45c60fe7223 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use Zend\Text\Exception;
/**
* Exception class for Zend\Text
*/
-class UnexpectedValueException
- extends Exception\UnexpectedValueException
- implements ExceptionInterface
-{}
+class UnexpectedValueException extends Exception\UnexpectedValueException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php
index b5ffca7e444..98161e86dd4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -651,7 +651,6 @@ class Figlet
return false;
}
- $tempLine = '';
for ($row = 0; $row < $this->charHeight; $row++) {
if ($this->rightToLeft === 1) {
$tempLine = $this->currentChar[$row];
@@ -718,7 +717,6 @@ class Figlet
}
$maxSmush = $this->currentCharWidth;
- $amount = $maxSmush;
for ($row = 0; $row < $this->charHeight; $row++) {
if ($this->rightToLeft === 1) {
@@ -956,8 +954,7 @@ class Figlet
// Check if gzip support is required
if (substr($fontFile, -3) === '.gz') {
if (!function_exists('gzcompress')) {
- throw new Exception\RuntimeException('GZIP library is required for '
- . 'gzip compressed font files');
+ throw new Exception\RuntimeException('GZIP library is required for gzip compressed font files');
}
$fontFile = 'compress.zlib://' . $fontFile;
@@ -981,15 +978,17 @@ class Figlet
$magic = $this->_readMagic($fp);
// Get the header
- $numsRead = sscanf(fgets($fp, 1000),
- '%*c%c %d %*d %d %d %d %d %d',
- $this->hardBlank,
- $this->charHeight,
- $this->maxLength,
- $smush,
- $cmtLines,
- $rightToLeft,
- $this->fontSmush);
+ $numsRead = sscanf(
+ fgets($fp, 1000),
+ '%*c%c %d %*d %d %d %d %d %d',
+ $this->hardBlank,
+ $this->charHeight,
+ $this->maxLength,
+ $smush,
+ $cmtLines,
+ $rightToLeft,
+ $this->fontSmush
+ );
if ($magic !== self::FONTFILE_MAGIC_NUMBER || $numsRead < 5) {
throw new Exception\UnexpectedValueException($fontFile . ': Not a FIGlet 2 font file');
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/MultiByte.php b/vendor/zendframework/zendframework/library/Zend/Text/MultiByte.php
index 04bc869d984..dba732a1bc0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/MultiByte.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/MultiByte.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Column.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Column.php
index 154749e74e9..8a2aacc957e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Column.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Column.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -107,7 +107,6 @@ class Column
$strWrapper = StringUtils::getWrapper($inputCharset, $outputCharset);
$content = $strWrapper->convert($content);
}
-
}
$this->content = $content;
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Ascii.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Ascii.php
index 6d049ae8014..159820d106f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Ascii.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Ascii.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Blank.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Blank.php
index 0b4bf087975..81b058b9521 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Blank.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Blank.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/DecoratorInterface.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/DecoratorInterface.php
index 31d0b5e3092..9e9ec76d45e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/DecoratorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/DecoratorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Unicode.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Unicode.php
index cb12a9d69fe..9d2748bbffa 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Unicode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Unicode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/DecoratorManager.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/DecoratorManager.php
index e936230e80f..10a5f00fb3f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/DecoratorManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/DecoratorManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/ExceptionInterface.php
index a3f0112a3a1..8330046d217 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Text\Table\Exception;
use Zend\Text\Exception\ExceptionInterface as Exception;
interface ExceptionInterface extends Exception
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/InvalidArgumentException.php
index 5577ab61c17..6e99a829547 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/InvalidArgumentException.php
@@ -3,14 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Text\Table\Exception;
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/InvalidDecoratorException.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/InvalidDecoratorException.php
index 7e61bb2e970..cc39ab335e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/InvalidDecoratorException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/InvalidDecoratorException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,4 +12,5 @@ namespace Zend\Text\Table\Exception;
use DomainException;
class InvalidDecoratorException extends DomainException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/OutOfBoundsException.php
index 542a487632e..1d07b24eeb1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/OutOfBoundsException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Text\Table\Exception;
use Zend\Text\Exception;
-class OutOfBoundsException
- extends Exception\OutOfBoundsException
- implements ExceptionInterface
-{}
+class OutOfBoundsException extends Exception\OutOfBoundsException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/OverflowException.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/OverflowException.php
index 0ea8017d4e7..199c7e4b979 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/OverflowException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/OverflowException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Text\Table\Exception;
use Zend\Text\Exception;
-class OverflowException
- extends Exception\OverflowException
- implements ExceptionInterface
-{}
+class OverflowException extends Exception\OverflowException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/UnexpectedValueException.php
index d9a8c4bd99d..71a76254b95 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/UnexpectedValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\Text\Table\Exception;
use Zend\Text\Exception;
-class UnexpectedValueException
- extends Exception\UnexpectedValueException
- implements ExceptionInterface
-{}
+class UnexpectedValueException extends Exception\UnexpectedValueException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Row.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Row.php
index 7af59288bf8..21dfbbf0227 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Row.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Row.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -103,7 +103,9 @@ class Row
public function getColumnWidths()
{
if ($this->columnWidths === null) {
- throw new Exception\UnexpectedValueException('render() must be called before columnWidths can be populated');
+ throw new Exception\UnexpectedValueException(
+ 'render() must be called before columnWidths can be populated'
+ );
}
return $this->columnWidths;
@@ -143,9 +145,7 @@ class Row
}
// Calculate the column width
- $columnWidth = ($colSpan - 1 + array_sum(array_slice($columnWidths,
- $colNum,
- $colSpan)));
+ $columnWidth = ($colSpan - 1 + array_sum(array_slice($columnWidths, $colNum, $colSpan)));
// Render the column and split it's lines into an array
$result = explode("\n", $column->render($columnWidth, $padding));
@@ -165,8 +165,7 @@ class Row
// it with an empty column
if ($colNum < count($columnWidths)) {
$remainingWidth = (count($columnWidths) - $colNum - 1) +
- array_sum(array_slice($columnWidths,
- $colNum));
+ array_sum(array_slice($columnWidths, $colNum));
$renderedColumns[] = array(str_repeat(' ', $remainingWidth));
$this->columnWidths[] = $remainingWidth;
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php
index 2dd7672ce20..6077673e7c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -164,8 +164,7 @@ class Table
foreach ($columnWidths as $columnNum => $columnWidth) {
if (is_int($columnWidth) === false or $columnWidth < 1) {
- throw new Exception\InvalidArgumentException('Column ' . $columnNum . ' has an invalid'
- . ' column width');
+ throw new Exception\InvalidArgumentException('Column ' . $columnNum . ' has an invalid column width');
}
}
@@ -375,8 +374,7 @@ class Table
$result .= $this->decorator->getTopLeft();
foreach ($columnWidths as $columnNum => $columnWidth) {
- $result .= str_repeat($this->decorator->getHorizontal(),
- $columnWidth);
+ $result .= str_repeat($this->decorator->getHorizontal(), $columnWidth);
if (($columnNum + 1) === $numColumns) {
$result .= $this->decorator->getTopRight();
@@ -412,8 +410,7 @@ class Table
// Loop through all column widths
foreach ($this->columnWidths as $columnNum => $columnWidth) {
// Add the horizontal line
- $result .= str_repeat($this->decorator->getHorizontal(),
- $columnWidth);
+ $result .= str_repeat($this->decorator->getHorizontal(), $columnWidth);
// If this is the last line, break out
if (($columnNum + 1) === $totalNumColumns) {
@@ -476,8 +473,7 @@ class Table
$result .= $this->decorator->getBottomLeft();
foreach ($columnWidths as $columnNum => $columnWidth) {
- $result .= str_repeat($this->decorator->getHorizontal(),
- $columnWidth);
+ $result .= str_repeat($this->decorator->getHorizontal(), $columnWidth);
if (($columnNum + 1) === $numColumns) {
$result .= $this->decorator->getBottomRight();
@@ -505,6 +501,5 @@ class Table
} catch (\Exception $e) {
trigger_error($e->getMessage(), E_USER_ERROR);
}
-
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/composer.json b/vendor/zendframework/zendframework/library/Zend/Text/composer.json
index ce4c7ed8940..7f7cafb7fed 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Text/composer.json
@@ -6,6 +6,7 @@
"zf2",
"text"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Text\\": ""
@@ -13,14 +14,14 @@
},
"target-dir": "Zend/Text",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-servicemanager": "self.version"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Uri/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/ExceptionInterface.php
index 3d29c18def9..de4a547e393 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ namespace Zend\Uri\Exception;
* Exception for Zend\Uri
*/
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidArgumentException.php
index e8d91ebf444..dae1bec1745 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidArgumentException.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Uri\Exception;
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriException.php b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriException.php
index 9a6cc1d3021..d68dbfff50e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,4 +13,5 @@ namespace Zend\Uri\Exception;
* Exceptions for Zend\Uri
*/
class InvalidUriException extends InvalidArgumentException implements ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriPartException.php b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriPartException.php
index 0daf5b083d1..6f5a52a9dc5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriPartException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriPartException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/File.php b/vendor/zendframework/zendframework/library/Zend/Uri/File.php
index 71c21875a0b..f95b7392503 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/File.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/File.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Http.php b/vendor/zendframework/zendframework/library/Zend/Uri/Http.php
index a24851b1f37..9c10a1df626 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Http.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Http.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Mailto.php b/vendor/zendframework/zendframework/library/Zend/Uri/Mailto.php
index 8463f995c4d..afe61c8e1ee 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Mailto.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Mailto.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/Uri.php b/vendor/zendframework/zendframework/library/Zend/Uri/Uri.php
index cf8a1b18f5b..f6ab7f17510 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Uri.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/Uri.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -560,10 +560,8 @@ class Uri implements UriInterface
return $this;
}
- $pathParts = preg_split('|(/)|', $this->getPath(), null,
- PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
- $baseParts = preg_split('|(/)|', $baseUri->getPath(), null,
- PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+ $pathParts = preg_split('|(/)|', $this->getPath(), null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+ $baseParts = preg_split('|(/)|', $baseUri->getPath(), null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
// Get the intersection of existing path parts and those from the
// provided URI
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/UriFactory.php b/vendor/zendframework/zendframework/library/Zend/Uri/UriFactory.php
index d6b65a12e50..f2b4b1df457 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/UriFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/UriFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -73,9 +73,9 @@ abstract class UriFactory
{
if (isset(static::$schemeClasses[$scheme])) {
return static::$schemeClasses[$scheme];
- } else {
- return null;
}
+
+ return null;
}
/**
@@ -103,9 +103,9 @@ abstract class UriFactory
if ($scheme && ! isset(static::$schemeClasses[$scheme])) {
throw new Exception\InvalidArgumentException(sprintf(
- 'no class registered for scheme "%s"',
- $scheme
- ));
+ 'no class registered for scheme "%s"',
+ $scheme
+ ));
}
if ($scheme && isset(static::$schemeClasses[$scheme])) {
$class = static::$schemeClasses[$scheme];
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php b/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php
index db97c66cdc9..040a894c23e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php
@@ -3,18 +3,17 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Uri;
/**
- * Interface defining an URI
+ * Interface defining a URI
*/
interface UriInterface
{
-
/**
* Create a new URI object
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/composer.json b/vendor/zendframework/zendframework/library/Zend/Uri/composer.json
index 57420246ced..536ae1b5910 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/composer.json
@@ -6,6 +6,7 @@
"zf2",
"uri"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Uri\\": ""
@@ -13,14 +14,14 @@
},
"target-dir": "Zend/Uri",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-escaper": "self.version",
"zendframework/zend-validator": "self.version"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/AbstractValidator.php b/vendor/zendframework/zendframework/library/Zend/Validator/AbstractValidator.php
index 8ab827f6939..79d9c0f56bb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/AbstractValidator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/AbstractValidator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -36,7 +36,7 @@ abstract class AbstractValidator implements
protected static $defaultTranslatorTextDomain = 'default';
/**
- * Limits the maximum returned length of a error message
+ * Limits the maximum returned length of an error message
*
* @var int
*/
@@ -248,21 +248,17 @@ abstract class AbstractValidator implements
if (array_key_exists($property, $this->abstractOptions['messageVariables'])) {
$result = $this->abstractOptions['messageVariables'][$property];
if (is_array($result)) {
- $result = $this->{key($result)}[current($result)];
- } else {
- $result = $this->{$result};
+ return $this->{key($result)}[current($result)];
}
- return $result;
+ return $this->{$result};
}
if (isset($this->messageVariables) && array_key_exists($property, $this->messageVariables)) {
$result = $this->{$this->messageVariables[$property]};
if (is_array($result)) {
- $result = $this->{key($result)}[current($result)];
- } else {
- $result = $this->{$result};
+ return $this->{key($result)}[current($result)];
}
- return $result;
+ return $this->{$result};
}
throw new Exception\InvalidArgumentException("No property exists by the name '$property'");
@@ -468,9 +464,7 @@ abstract class AbstractValidator implements
* @return void
* @throws Exception\InvalidArgumentException
*/
- public static function setDefaultTranslator(
- Translator\TranslatorInterface $translator = null, $textDomain = null
- )
+ public static function setDefaultTranslator(Translator\TranslatorInterface $translator = null, $textDomain = null)
{
static::$defaultTranslator = $translator;
if (null !== $textDomain) {
@@ -575,15 +569,6 @@ abstract class AbstractValidator implements
return $message;
}
- $translated = $translator->translate(
- $messageKey, $this->getTranslatorTextDomain()
- );
- if ($translated !== $messageKey) {
- return $translated;
- }
-
- return $translator->translate(
- $message, $this->getTranslatorTextDomain()
- );
+ return $translator->translate($message, $this->getTranslatorTextDomain());
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode.php
index f86003eb83b..cfa6cdc0aed 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -91,15 +91,20 @@ class Barcode extends AbstractValidator
throw new Exception\InvalidArgumentException('Barcode adapter matching "' . $adapter . '" not found');
}
- $this->options['adapter'] = new $adapter($options);
+ $adapter = new $adapter($options);
}
- if (!$this->options['adapter'] instanceof Barcode\AdapterInterface) {
+ if (!$adapter instanceof Barcode\AdapterInterface) {
throw new Exception\InvalidArgumentException(
- "Adapter $adapter does not implement Zend\\Validate\\Barcode\\AdapterInterface"
+ sprintf(
+ "Adapter %s does not implement Zend\\Validator\\Barcode\\AdapterInterface",
+ (is_object($adapter) ? get_class($adapter) : gettype($adapter))
+ )
);
}
+ $this->options['adapter'] = $adapter;
+
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AbstractAdapter.php
index 1222d87ed8a..7cca59a191b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AbstractAdapter.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AbstractAdapter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AdapterInterface.php
index 33d24496038..f30fe93ee18 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AdapterInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AdapterInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Codabar.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Codabar.php
index 1a3011c10d0..eca14e2121a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Codabar.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Codabar.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code128.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code128.php
index 49195368f28..b8e3ee2d36b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code128.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code128.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -29,53 +29,53 @@ class Code128 extends AbstractAdapter
{
$this->setLength(-1);
$this->setCharacters(array(
- 'A' => array(
- 0 => ' ', 1 => '!', 2 => '"', 3 => '#', 4 => '$', 5 => '%', 6 => '&', 7 => "'",
- 8 => '(', 9 => ')', 10 => '*', 11 => '+', 12 => ',', 13 => '-', 14 => '.', 15 => '/',
- 16 => '0', 17 => '1', 18 => '2', 19 => '3', 20 => '4', 21 => '5', 22 => '6', 23 => '7',
- 24 => '8', 25 => '9', 26 => ':', 27 => ';', 28 => '<', 29 => '=', 30 => '>', 31 => '?',
- 32 => '@', 33 => 'A', 34 => 'B', 35 => 'C', 36 => 'D', 37 => 'E', 38 => 'F', 39 => 'G',
- 40 => 'H', 41 => 'I', 42 => 'J', 43 => 'K', 44 => 'L', 45 => 'M', 46 => 'N', 47 => 'O',
- 48 => 'P', 49 => 'Q', 50 => 'R', 51 => 'S', 52 => 'T', 53 => 'U', 54 => 'V', 55 => 'W',
- 56 => 'X', 57 => 'Y', 58 => 'Z', 59 => '[', 60 => '\\',61 => ']', 62 => '^', 63 => '_',
- 64 =>0x00, 65 =>0x01, 66 =>0x02, 67 =>0x03, 68 =>0x04, 69 =>0x05, 70 =>0x06, 71 =>0x07,
- 72 =>0x08, 73 =>0x09, 74 =>0x0A, 75 =>0x0B, 76 =>0x0C, 77 =>0x0D, 78 =>0x0E, 79 =>0x0F,
- 80 =>0x10, 81 =>0x11, 82 =>0x12, 83 =>0x13, 84 =>0x14, 85 =>0x15, 86 =>0x16, 87 =>0x17,
- 88 =>0x18, 89 =>0x19, 90 =>0x1A, 91 =>0x1B, 92 =>0x1C, 93 =>0x1D, 94 =>0x1E, 95 =>0x1F,
- 96 => 'Ç', 97 => 'ü', 98 => 'é', 99 => 'â',100 => 'ä',101 => 'à ',102 => 'å',103 => '‡',
- 104 => 'ˆ',105 => '‰',106 => 'Š'),
- 'B' => array(
- 0 => ' ', 1 => '!', 2 => '"', 3 => '#', 4 => '$', 5 => '%', 6 => '&', 7 => "'",
- 8 => '(', 9 => ')', 10 => '*', 11 => '+', 12 => ',', 13 => '-', 14 => '.', 15 => '/',
- 16 => '0', 17 => '1', 18 => '2', 19 => '3', 20 => '4', 21 => '5', 22 => '6', 23 => '7',
- 24 => '8', 25 => '9', 26 => ':', 27 => ';', 28 => '<', 29 => '=', 30 => '>', 31 => '?',
- 32 => '@', 33 => 'A', 34 => 'B', 35 => 'C', 36 => 'D', 37 => 'E', 38 => 'F', 39 => 'G',
- 40 => 'H', 41 => 'I', 42 => 'J', 43 => 'K', 44 => 'L', 45 => 'M', 46 => 'N', 47 => 'O',
- 48 => 'P', 49 => 'Q', 50 => 'R', 51 => 'S', 52 => 'T', 53 => 'U', 54 => 'V', 55 => 'W',
- 56 => 'X', 57 => 'Y', 58 => 'Z', 59 => '[', 60 => '\\',61 => ']', 62 => '^', 63 => '_',
- 64 => '`', 65 => 'a', 66 => 'b', 67 => 'c', 68 => 'd', 69 => 'e', 70 => 'f', 71 => 'g',
- 72 => 'h', 73 => 'i', 74 => 'j', 75 => 'k', 76 => 'l', 77 => 'm', 78 => 'n', 79 => 'o',
- 80 => 'p', 81 => 'q', 82 => 'r', 83 => 's', 84 => 't', 85 => 'u', 86 => 'v', 87 => 'w',
- 88 => 'x', 89 => 'y', 90 => 'z', 91 => '{', 92 => '|', 93 => '}', 94 => '~', 95 =>0x7F,
- 96 => 'Ç', 97 => 'ü', 98 => 'é', 99 => 'â',100 => 'ä',101 => 'à ',102 => 'å',103 => '‡',
- 104 => 'ˆ',105 => '‰',106 => 'Š'),
- 'C' => array(
- 0 => '00', 1 => '01', 2 => '02', 3 => '03', 4 => '04', 5 => '05', 6 => '06', 7 => '07',
- 8 => '08', 9 => '09', 10 => '10', 11 => '11', 12 => '12', 13 => '13', 14 => '14', 15 => '15',
- 16 => '16', 17 => '17', 18 => '18', 19 => '19', 20 => '20', 21 => '21', 22 => '22', 23 => '23',
- 24 => '24', 25 => '25', 26 => '26', 27 => '27', 28 => '28', 29 => '29', 30 => '30', 31 => '31',
- 32 => '32', 33 => '33', 34 => '34', 35 => '35', 36 => '36', 37 => '37', 38 => '38', 39 => '39',
- 40 => '40', 41 => '41', 42 => '42', 43 => '43', 44 => '44', 45 => '45', 46 => '46', 47 => '47',
- 48 => '48', 49 => '49', 50 => '50', 51 => '51', 52 => '52', 53 => '53', 54 => '54', 55 => '55',
- 56 => '56', 57 => '57', 58 => '58', 59 => '59', 60 => '60', 61 => '61', 62 => '62', 63 => '63',
- 64 => '64', 65 => '65', 66 => '66', 67 => '67', 68 => '68', 69 => '69', 70 => '70', 71 => '71',
- 72 => '72', 73 => '73', 74 => '74', 75 => '75', 76 => '76', 77 => '77', 78 => '78', 79 => '79',
- 80 => '80', 81 => '81', 82 => '82', 83 => '83', 84 => '84', 85 => '85', 86 => '86', 87 => '87',
- 88 => '88', 89 => '89', 90 => '90', 91 => '91', 92 => '92', 93 => '93', 94 => '94', 95 => '95',
- 96 => '96', 97 => '97', 98 => '98', 99 => '99',100 => 'ä', 101 => 'à ', 102 => 'å', 103 => '‡',
- 104 => 'ˆ', 105 => '‰', 106 => 'Š')));
+ 'A' => array(
+ 0 => ' ', 1 => '!', 2 => '"', 3 => '#', 4 => '$', 5 => '%', 6 => '&', 7 => "'",
+ 8 => '(', 9 => ')', 10 => '*', 11 => '+', 12 => ',', 13 => '-', 14 => '.', 15 => '/',
+ 16 => '0', 17 => '1', 18 => '2', 19 => '3', 20 => '4', 21 => '5', 22 => '6', 23 => '7',
+ 24 => '8', 25 => '9', 26 => ':', 27 => ';', 28 => '<', 29 => '=', 30 => '>', 31 => '?',
+ 32 => '@', 33 => 'A', 34 => 'B', 35 => 'C', 36 => 'D', 37 => 'E', 38 => 'F', 39 => 'G',
+ 40 => 'H', 41 => 'I', 42 => 'J', 43 => 'K', 44 => 'L', 45 => 'M', 46 => 'N', 47 => 'O',
+ 48 => 'P', 49 => 'Q', 50 => 'R', 51 => 'S', 52 => 'T', 53 => 'U', 54 => 'V', 55 => 'W',
+ 56 => 'X', 57 => 'Y', 58 => 'Z', 59 => '[', 60 => '\\',61 => ']', 62 => '^', 63 => '_',
+ 64 =>0x00, 65 =>0x01, 66 =>0x02, 67 =>0x03, 68 =>0x04, 69 =>0x05, 70 =>0x06, 71 =>0x07,
+ 72 =>0x08, 73 =>0x09, 74 =>0x0A, 75 =>0x0B, 76 =>0x0C, 77 =>0x0D, 78 =>0x0E, 79 =>0x0F,
+ 80 =>0x10, 81 =>0x11, 82 =>0x12, 83 =>0x13, 84 =>0x14, 85 =>0x15, 86 =>0x16, 87 =>0x17,
+ 88 =>0x18, 89 =>0x19, 90 =>0x1A, 91 =>0x1B, 92 =>0x1C, 93 =>0x1D, 94 =>0x1E, 95 =>0x1F,
+ 96 => 'Ç', 97 => 'ü', 98 => 'é', 99 => 'â',100 => 'ä',101 => 'à ',102 => 'å',103 => '‡',
+ 104 => 'ˆ',105 => '‰',106 => 'Š'),
+ 'B' => array(
+ 0 => ' ', 1 => '!', 2 => '"', 3 => '#', 4 => '$', 5 => '%', 6 => '&', 7 => "'",
+ 8 => '(', 9 => ')', 10 => '*', 11 => '+', 12 => ',', 13 => '-', 14 => '.', 15 => '/',
+ 16 => '0', 17 => '1', 18 => '2', 19 => '3', 20 => '4', 21 => '5', 22 => '6', 23 => '7',
+ 24 => '8', 25 => '9', 26 => ':', 27 => ';', 28 => '<', 29 => '=', 30 => '>', 31 => '?',
+ 32 => '@', 33 => 'A', 34 => 'B', 35 => 'C', 36 => 'D', 37 => 'E', 38 => 'F', 39 => 'G',
+ 40 => 'H', 41 => 'I', 42 => 'J', 43 => 'K', 44 => 'L', 45 => 'M', 46 => 'N', 47 => 'O',
+ 48 => 'P', 49 => 'Q', 50 => 'R', 51 => 'S', 52 => 'T', 53 => 'U', 54 => 'V', 55 => 'W',
+ 56 => 'X', 57 => 'Y', 58 => 'Z', 59 => '[', 60 => '\\',61 => ']', 62 => '^', 63 => '_',
+ 64 => '`', 65 => 'a', 66 => 'b', 67 => 'c', 68 => 'd', 69 => 'e', 70 => 'f', 71 => 'g',
+ 72 => 'h', 73 => 'i', 74 => 'j', 75 => 'k', 76 => 'l', 77 => 'm', 78 => 'n', 79 => 'o',
+ 80 => 'p', 81 => 'q', 82 => 'r', 83 => 's', 84 => 't', 85 => 'u', 86 => 'v', 87 => 'w',
+ 88 => 'x', 89 => 'y', 90 => 'z', 91 => '{', 92 => '|', 93 => '}', 94 => '~', 95 =>0x7F,
+ 96 => 'Ç', 97 => 'ü', 98 => 'é', 99 => 'â',100 => 'ä',101 => 'à ',102 => 'å',103 => '‡',
+ 104 => 'ˆ',105 => '‰',106 => 'Š'),
+ 'C' => array(
+ 0 => '00', 1 => '01', 2 => '02', 3 => '03', 4 => '04', 5 => '05', 6 => '06', 7 => '07',
+ 8 => '08', 9 => '09', 10 => '10', 11 => '11', 12 => '12', 13 => '13', 14 => '14', 15 => '15',
+ 16 => '16', 17 => '17', 18 => '18', 19 => '19', 20 => '20', 21 => '21', 22 => '22', 23 => '23',
+ 24 => '24', 25 => '25', 26 => '26', 27 => '27', 28 => '28', 29 => '29', 30 => '30', 31 => '31',
+ 32 => '32', 33 => '33', 34 => '34', 35 => '35', 36 => '36', 37 => '37', 38 => '38', 39 => '39',
+ 40 => '40', 41 => '41', 42 => '42', 43 => '43', 44 => '44', 45 => '45', 46 => '46', 47 => '47',
+ 48 => '48', 49 => '49', 50 => '50', 51 => '51', 52 => '52', 53 => '53', 54 => '54', 55 => '55',
+ 56 => '56', 57 => '57', 58 => '58', 59 => '59', 60 => '60', 61 => '61', 62 => '62', 63 => '63',
+ 64 => '64', 65 => '65', 66 => '66', 67 => '67', 68 => '68', 69 => '69', 70 => '70', 71 => '71',
+ 72 => '72', 73 => '73', 74 => '74', 75 => '75', 76 => '76', 77 => '77', 78 => '78', 79 => '79',
+ 80 => '80', 81 => '81', 82 => '82', 83 => '83', 84 => '84', 85 => '85', 86 => '86', 87 => '87',
+ 88 => '88', 89 => '89', 90 => '90', 91 => '91', 92 => '92', 93 => '93', 94 => '94', 95 => '95',
+ 96 => '96', 97 => '97', 98 => '98', 99 => '99',100 => 'ä', 101 => 'à ', 102 => 'å', 103 => '‡',
+ 104 => 'ˆ', 105 => '‰', 106 => 'Š')
+ ));
$this->setChecksum('code128');
-
}
public function setUtf8StringWrapper(StringWrapperInterface $utf8StringWrapper)
@@ -129,13 +129,13 @@ class Code128 extends AbstractAdapter
switch ($char) {
// Function definition
- case 'Ç' :
- case 'ü' :
- case 'Ã¥' :
+ case 'Ç':
+ case 'ü':
+ case 'Ã¥':
break;
// Switch 1 char between A and B
- case 'é' :
+ case 'é':
if ($set == 'A') {
$read = 'B';
} elseif ($set == 'B') {
@@ -144,32 +144,32 @@ class Code128 extends AbstractAdapter
break;
// Switch to C
- case 'â' :
+ case 'â':
$set = 'C';
$read = 'C';
break;
// Switch to B
- case 'ä' :
+ case 'ä':
$set = 'B';
$read = 'B';
break;
// Switch to A
- case 'Ã ' :
+ case 'Ã ':
$set = 'A';
$read = 'A';
break;
// Doubled start character
- case '‡' :
- case 'ˆ' :
- case '‰' :
+ case '‡':
+ case 'ˆ':
+ case '‰':
return false;
break;
// Chars after the stop character
- case 'Å ' :
+ case 'Å ':
break 2;
default:
@@ -214,7 +214,7 @@ class Code128 extends AbstractAdapter
} elseif ($char == '‰') {
$sum = 105;
} elseif ($usecheck == true) {
- // no start value, unable to detect an proper checksum
+ // no start value, unable to detect a proper checksum
return false;
}
@@ -227,15 +227,15 @@ class Code128 extends AbstractAdapter
switch ($char) {
// Function definition
- case 'Ç' :
- case 'ü' :
- case 'Ã¥' :
+ case 'Ç':
+ case 'ü':
+ case 'Ã¥':
$sum += ($pos * $this->ord128($char, $set));
break;
- case 'é' :
+ case 'é':
$sum += ($pos * $this->ord128($char, $set));
- if ($set == 'A') {
+ if ($set == 'A') {
$read = 'B';
} elseif ($set == 'B') {
$read = 'A';
@@ -243,29 +243,29 @@ class Code128 extends AbstractAdapter
break;
// Switch to C
- case 'â' :
+ case 'â':
$sum += ($pos * $this->ord128($char, $set));
$set = 'C';
$read = 'C';
break;
// Switch to B
- case 'ä' :
+ case 'ä':
$sum += ($pos * $this->ord128($char, $set));
$set = 'B';
$read = 'B';
break;
// Switch to A
- case 'Ã ' :
+ case 'Ã ':
$sum += ($pos * $this->ord128($char, $set));
$set = 'A';
$read = 'A';
break;
- case '‡' :
- case 'ˆ' :
- case '‰' :
+ case '‡':
+ case 'ˆ':
+ case '‰':
return false;
break;
@@ -311,13 +311,13 @@ class Code128 extends AbstractAdapter
{
$value = $this->getUtf8StringWrapper()->substr($value, 0, 1);
switch ($value) {
- case '‡' :
+ case '‡':
return 'A';
break;
- case 'ˆ' :
+ case 'ˆ':
return 'B';
break;
- case '‰' :
+ case '‰':
return 'C';
break;
}
@@ -389,7 +389,7 @@ class Code128 extends AbstractAdapter
}
/**
- * Internal Method to return the ascii value from an code128 integer
+ * Internal Method to return the ascii value from a code128 integer
*
* Table A
* ASCII CODE128
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code25.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code25.php
index 3619f528c36..8235c437d12 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code25.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code25.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code25interleaved.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code25interleaved.php
index 77bc027d975..cb41c76e5f1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code25interleaved.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code25interleaved.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code39.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code39.php
index 9a368c5d403..01208ce2c4a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code39.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code39.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code39ext.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code39ext.php
index b9b14a59c79..e65d491c856 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code39ext.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code39ext.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code93.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code93.php
index 35739a1103a..f312a138637 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code93.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code93.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code93ext.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code93ext.php
index aa8fc07b92d..99503a14772 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code93ext.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code93ext.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean12.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean12.php
index ee45ebb6ba5..4805145a1f9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean12.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean12.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean13.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean13.php
index b1dc05e1450..e271cbea6da 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean13.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean13.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean14.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean14.php
index fe20366ac8f..9d8168bb24a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean14.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean14.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean18.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean18.php
index 774df712ac1..7388b7326da 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean18.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean18.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean2.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean2.php
index 9d8a527a09f..99a87bfe2ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean2.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean2.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean5.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean5.php
index 01f597d15ef..8ef2d519a0a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean5.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean5.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean8.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean8.php
index 6af4cccf9f0..a34c8b45fce 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean8.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Ean8.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin12.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin12.php
index b3c97d3df71..44464445ef5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin12.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin12.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin13.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin13.php
index 049849792ec..b8dcd095b1a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin13.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin13.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin14.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin14.php
index 70e3cc5b5cb..862d3e147e4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin14.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Gtin14.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Identcode.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Identcode.php
index 08c398dd6d4..5b392715560 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Identcode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Identcode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Intelligentmail.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Intelligentmail.php
index 665d2035a44..d26cce68a73 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Intelligentmail.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Intelligentmail.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Issn.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Issn.php
index 52434ed1ba3..e66451a1a06 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Issn.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Issn.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Itf14.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Itf14.php
index 195d84dd2d8..b17eb705dae 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Itf14.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Itf14.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Leitcode.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Leitcode.php
index 29503a92aa5..c1b82c3c28d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Leitcode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Leitcode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Planet.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Planet.php
index ecdff2db295..0708b7c8180 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Planet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Planet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Postnet.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Postnet.php
index acc84da5999..2942d4ca0d5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Postnet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Postnet.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Royalmail.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Royalmail.php
index 538efa6106c..77555ed5a0c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Royalmail.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Royalmail.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Sscc.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Sscc.php
index d3b33637b89..57f9c8a3733 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Sscc.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Sscc.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Upca.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Upca.php
index 4c5f623f142..afb2a7a44e4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Upca.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Upca.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Upce.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Upce.php
index 646c739a70f..32a573f1ce2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Upce.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Upce.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Between.php b/vendor/zendframework/zendframework/library/Zend/Validator/Between.php
index 8b92cfe200d..550ee72d7b2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Between.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Between.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -77,7 +77,7 @@ class Between extends AbstractValidator
}
if (!array_key_exists('min', $options) || !array_key_exists('max', $options)) {
-// throw new Exception\InvalidArgumentException("Missing option. 'min' and 'max' has to be given");
+ // throw new Exception\InvalidArgumentException("Missing option. 'min' and 'max' has to be given");
}
parent::__construct($options);
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Bitwise.php b/vendor/zendframework/zendframework/library/Zend/Validator/Bitwise.php
new file mode 100644
index 00000000000..7f676cff583
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Bitwise.php
@@ -0,0 +1,192 @@
+<?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\Validator;
+
+use Traversable;
+
+class Bitwise extends AbstractValidator
+{
+ const OP_AND = 'and';
+ const OP_XOR = 'xor';
+
+ const NOT_AND = 'notAnd';
+ const NOT_AND_STRICT = 'notAndStrict';
+ const NOT_XOR = 'notXor';
+
+ /**
+ * @var integer
+ */
+ protected $control;
+
+ /**
+ * Validation failure message template definitions
+ *
+ * @var array
+ */
+ protected $messageTemplates = array(
+ self::NOT_AND => "The input has no common bit set with '%control%'",
+ self::NOT_AND_STRICT => "The input doesn't have the same bits set as '%control%'",
+ self::NOT_XOR => "The input has common bit set with '%control%'",
+ );
+
+ /**
+ * Additional variables available for validation failure messages
+ *
+ * @var array
+ */
+ protected $messageVariables = array(
+ 'control' => 'control',
+ );
+
+ /**
+ * @var integer
+ */
+ protected $operator;
+
+ /**
+ * @var boolean
+ */
+ protected $strict = false;
+
+ /**
+ * Sets validator options
+ * Accepts the following option keys:
+ * 'control' => integer
+ * 'operator' =>
+ * 'strict' => boolean
+ *
+ * @param array|Traversable $options
+ */
+ public function __construct($options = null)
+ {
+ if ($options instanceof Traversable) {
+ $options = iterator_to_array($options);
+ }
+
+ if (!is_array($options)) {
+ $options = func_get_args();
+
+ $temp['control'] = array_shift($options);
+
+ if (!empty($options)) {
+ $temp['operator'] = array_shift($options);
+ }
+
+ if (!empty($options)) {
+ $temp['strict'] = array_shift($options);
+ }
+
+ $options = $temp;
+ }
+
+ parent::__construct($options);
+ }
+
+ /**
+ * Returns the control parameter.
+ *
+ * @return integer
+ */
+ public function getControl()
+ {
+ return $this->control;
+ }
+
+ /**
+ * Returns the operator parameter.
+ *
+ * @return string
+ */
+ public function getOperator()
+ {
+ return $this->operator;
+ }
+
+ /**
+ * Returns the strict parameter.
+ *
+ * @return boolean
+ */
+ public function getStrict()
+ {
+ return $this->strict;
+ }
+
+ /**
+ * Returns true if and only if $value is between min and max options, inclusively
+ * if inclusive option is true.
+ *
+ * @param mixed $value
+ * @return bool
+ */
+ public function isValid($value)
+ {
+ $this->setValue($value);
+
+ if (self::OP_AND === $this->operator) {
+ if ($this->strict) {
+ // All the bits set in value must be set in control
+ $this->error(self::NOT_AND_STRICT);
+
+ return (bool) (($this->control & $value) == $value);
+ } else {
+ // At least one of the bits must be common between value and control
+ $this->error(self::NOT_AND);
+
+ return (bool) ($this->control & $value);
+ }
+ } elseif (self::OP_XOR === $this->operator) {
+ $this->error(self::NOT_XOR);
+
+ return (bool) (($this->control ^ $value) === ($this->control | $value));
+ }
+
+ return false;
+ }
+
+ /**
+ * Sets the control parameter.
+ *
+ * @param integer $control
+ * @return Bitwise
+ */
+ public function setControl($control)
+ {
+ $this->control = (int) $control;
+
+ return $this;
+ }
+
+ /**
+ * Sets the operator parameter.
+ *
+ * @param string $operator
+ * @return Bitwise
+ */
+ public function setOperator($operator)
+ {
+ $this->operator = $operator;
+
+ return $this;
+ }
+
+ /**
+ * Sets the strict parameter.
+ *
+ * @param boolean $strict
+ * @return Bitwise
+ */
+ public function setStrict($strict)
+ {
+ $this->strict = (bool) $strict;
+
+ return $this;
+ }
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Validator/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Callback.php b/vendor/zendframework/zendframework/library/Zend/Validator/Callback.php
index e4b389de763..7a5005bb26a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Callback.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Callback.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/CreditCard.php b/vendor/zendframework/zendframework/library/Zend/Validator/CreditCard.php
index e54a17c2e4f..0f637f3796c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/CreditCard.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/CreditCard.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -84,7 +84,7 @@ class CreditCard extends AbstractValidator
self::DINERS_CLUB => array(14),
self::DINERS_CLUB_US => array(16),
self::DISCOVER => array(16),
- self::JCB => array(16),
+ self::JCB => array(15, 16),
self::LASER => array(16, 17, 18, 19),
self::MAESTRO => array(12, 13, 14, 15, 16, 17, 18, 19),
self::MASTERCARD => array(16),
@@ -108,7 +108,7 @@ class CreditCard extends AbstractValidator
'62290', '62291', '622920', '622921', '622922', '622923',
'622924', '622925', '644', '645', '646', '647', '648',
'649', '65'),
- self::JCB => array('3528', '3529', '353', '354', '355', '356', '357', '358'),
+ self::JCB => array('1800', '2131', '3528', '3529', '353', '354', '355', '356', '357', '358'),
self::LASER => array('6304', '6706', '6771', '6709'),
self::MAESTRO => array('5018', '5020', '5038', '6304', '6759', '6761', '6762', '6763',
'6764', '6765', '6766'),
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Csrf.php b/vendor/zendframework/zendframework/library/Zend/Validator/Csrf.php
index 66f41572717..49af145db88 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Csrf.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Csrf.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -39,6 +39,7 @@ class Csrf extends AbstractValidator
/**
* Static cache of the session names to generated hashes
+ * @todo unused, left here to avoid BC breaks
*
* @var array
*/
@@ -117,9 +118,10 @@ class Csrf extends AbstractValidator
{
$this->setValue((string) $value);
- $hash = $this->getValidationToken();
+ $tokenId = $this->getTokenIdFromHash($value);
+ $hash = $this->getValidationToken($tokenId);
- if ($value !== $hash) {
+ if ($this->getTokenFromHash($value) !== $this->getTokenFromHash($hash)) {
$this->error(self::NOT_SAME);
return false;
}
@@ -214,14 +216,7 @@ class Csrf extends AbstractValidator
public function getHash($regenerate = false)
{
if ((null === $this->hash) || $regenerate) {
- if ($regenerate) {
- $this->hash = null;
- } else {
- $this->hash = $this->getValidationToken();
- }
- if (null === $this->hash) {
- $this->generateHash();
- }
+ $this->generateHash();
}
return $this->hash;
}
@@ -270,12 +265,20 @@ class Csrf extends AbstractValidator
protected function initCsrfToken()
{
$session = $this->getSession();
- //$session->setExpirationHops(1, null);
$timeout = $this->getTimeout();
if (null !== $timeout) {
$session->setExpirationSeconds($timeout);
}
- $session->hash = $this->getHash();
+
+ $hash = $this->getHash();
+ $token = $this->getTokenFromHash($hash);
+ $tokenId = $this->getTokenIdFromHash($hash);
+
+ if (! $session->tokenList) {
+ $session->tokenList = array();
+ }
+ $session->tokenList[$tokenId] = $token;
+ $session->hash = $hash; // @todo remove this, left for BC
}
/**
@@ -288,29 +291,81 @@ class Csrf extends AbstractValidator
*/
protected function generateHash()
{
- if (isset(static::$hashCache[$this->getSessionName()])) {
- $this->hash = static::$hashCache[$this->getSessionName()];
- } else {
- $this->hash = md5($this->getSalt() . Rand::getBytes(32) . $this->getName());
- static::$hashCache[$this->getSessionName()] = $this->hash;
- }
+ $token = md5($this->getSalt() . Rand::getBytes(32) . $this->getName());
+
+ $this->hash = $this->formatHash($token, $this->generateTokenId());
+
$this->setValue($this->hash);
$this->initCsrfToken();
}
+ /**
+ * @return string
+ */
+ protected function generateTokenId()
+ {
+ return md5(Rand::getBytes(32));
+ }
+
/**
* Get validation token
*
* Retrieve token from session, if it exists.
*
+ * @param string $tokenId
* @return null|string
*/
- protected function getValidationToken()
+ protected function getValidationToken($tokenId = null)
{
$session = $this->getSession();
- if (isset($session->hash)) {
+
+ /**
+ * if no tokenId is passed we revert to the old behaviour
+ * @todo remove, here for BC
+ */
+ if (! $tokenId && isset($session->hash)) {
return $session->hash;
}
+
+ if ($tokenId && isset($session->tokenList[$tokenId])) {
+ return $this->formatHash($session->tokenList[$tokenId], $tokenId);
+ }
+
return null;
}
+
+ /**
+ * @param $token
+ * @param $tokenId
+ * @return string
+ */
+ protected function formatHash($token, $tokenId)
+ {
+ return sprintf('%s-%s', $token, $tokenId);
+ }
+
+ /**
+ * @param $hash
+ * @return string
+ */
+ protected function getTokenFromHash($hash)
+ {
+ $data = explode('-', $hash);
+ return $data[0] ?: null;
+ }
+
+ /**
+ * @param $hash
+ * @return string
+ */
+ protected function getTokenIdFromHash($hash)
+ {
+ $data = explode('-', $hash);
+
+ if (! isset($data[1])) {
+ return null;
+ }
+
+ return $data[1];
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Date.php b/vendor/zendframework/zendframework/library/Zend/Validator/Date.php
index b5f37e9e0a8..456bde8b1fc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Date.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Date.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,11 +12,25 @@ namespace Zend\Validator;
use DateTime;
use Traversable;
+/**
+ * Validates that a given value is a DateTime instance or can be converted into one.
+ */
class Date extends AbstractValidator
{
+ /**#@+
+ * Validity constants
+ * @var string
+ */
const INVALID = 'dateInvalid';
const INVALID_DATE = 'dateInvalidDate';
const FALSEFORMAT = 'dateFalseFormat';
+ /**#@-*/
+
+ /**
+ * Default format constant
+ * @var string
+ */
+ const FORMAT_DEFAULT = 'Y-m-d';
/**
* Validation failure message template definitions
@@ -24,24 +38,23 @@ class Date extends AbstractValidator
* @var array
*/
protected $messageTemplates = array(
- self::INVALID => "Invalid type given. String, integer, array or DateTime expected",
- self::INVALID_DATE => "The input does not appear to be a valid date",
- self::FALSEFORMAT => "The input does not fit the date format '%format%'",
+ self::INVALID => "Invalid type given. String, integer, array or DateTime expected",
+ self::INVALID_DATE => "The input does not appear to be a valid date",
+ self::FALSEFORMAT => "The input does not fit the date format '%format%'",
);
/**
* @var array
*/
protected $messageVariables = array(
- 'format' => 'format'
+ 'format' => 'format',
);
/**
- * Optional format
- *
- * @var string|null
+ * @var string
*/
- protected $format;
+ protected $format = self::FORMAT_DEFAULT;
+
/**
* Sets validator options
@@ -58,10 +71,6 @@ class Date extends AbstractValidator
$options = $temp;
}
- if (array_key_exists('format', $options)) {
- $this->setFormat($options['format']);
- }
-
parent::__construct($options);
}
@@ -78,79 +87,107 @@ class Date extends AbstractValidator
/**
* Sets the format option
*
+ * Format cannot be null. It will always default to 'Y-m-d', even
+ * if null is provided.
+ *
* @param string $format
* @return Date provides a fluent interface
+ * @todo validate the format
*/
- public function setFormat($format = null)
+ public function setFormat($format = self::FORMAT_DEFAULT)
{
- $this->format = $format;
+ $this->format = (empty($format)) ? self::FORMAT_DEFAULT : $format;
return $this;
}
/**
- * Returns true if $value is a valid date of the format YYYY-MM-DD
- * If optional $format is set the date format is checked
- * according to DateTime
+ * Returns true if $value is a DateTime instance or can be converted into one.
*
* @param string|array|int|DateTime $value
* @return bool
*/
public function isValid($value)
{
- if (!is_string($value)
- && !is_array($value)
- && !is_int($value)
- && !($value instanceof DateTime)
- ) {
- $this->error(self::INVALID);
- return false;
- }
-
$this->setValue($value);
- $format = $this->getFormat();
+ if (!$this->convertToDateTime($value)) {
+ $this->error(self::INVALID_DATE);
+ return false;
+ }
- if ($value instanceof DateTime) {
- return true;
- } elseif (is_int($value)
- || (is_string($value) && null !== $format)
- ) {
- $date = (is_int($value))
- ? date_create("@$value") // from timestamp
- : DateTime::createFromFormat($format, $value);
+ return true;
+ }
- // Invalid dates can show up as warnings (ie. "2007-02-99")
- // and still return a DateTime object
- $errors = DateTime::getLastErrors();
+ /**
+ * Attempts to convert an int, string, or array to a DateTime object
+ *
+ * @param string|int|array $param
+ * @param bool $addErrors
+ * @return bool|DateTime
+ */
+ protected function convertToDateTime($param, $addErrors = true)
+ {
+ if ($param instanceof DateTime) {
+ return $param;
+ }
- if ($errors['warning_count'] > 0) {
- $this->error(self::INVALID_DATE);
- return false;
- }
- if ($date === false) {
- $this->error(self::INVALID_DATE);
- return false;
- }
- } else {
- if (is_array($value)) {
- $value = implode('-', $value);
+ $type = gettype($param);
+ if (!in_array($type, array('string', 'integer', 'array'))) {
+ if ($addErrors) {
+ $this->error(self::INVALID);
}
+ return false;
+ }
- if (!preg_match('/^\d{4}-\d{2}-\d{2}$/', $value)) {
- $this->format = 'Y-m-d';
- $this->error(self::FALSEFORMAT);
- $this->format = null;
- return false;
- }
+ $convertMethod = 'convert' . ucfirst($type);
+ return $this->{$convertMethod}($param, $addErrors);
+ }
+
+ /**
+ * Attempts to convert an integer into a DateTime object
+ *
+ * @param integer $value
+ * @return bool|DateTime
+ */
+ protected function convertInteger($value)
+ {
+ return date_create("@$value");
+ }
- list($year, $month, $day) = sscanf($value, '%d-%d-%d');
+ /**
+ * Attempts to convert a string into a DateTime object
+ *
+ * @param string $value
+ * @param bool $addErrors
+ * @return bool|DateTime
+ */
+ protected function convertString($value, $addErrors = true)
+ {
+ $date = DateTime::createFromFormat($this->format, $value);
- if (!checkdate($month, $day, $year)) {
- $this->error(self::INVALID_DATE);
- return false;
+ // Invalid dates can show up as warnings (ie. "2007-02-99")
+ // and still return a DateTime object.
+ $errors = DateTime::getLastErrors();
+ if ($errors['warning_count'] > 0) {
+ if ($addErrors) {
+ $this->error(self::FALSEFORMAT);
}
+ return false;
}
- return true;
+ return $date;
+ }
+
+ /**
+ * Implodes the array into a string and proxies to {@link convertString()}.
+ *
+ * @param array $value
+ * @param bool $addErrors
+ * @return bool|DateTime
+ * @todo enhance the implosion
+ */
+ protected function convertArray(array $value, $addErrors = true)
+ {
+ return $this->convertString(implode('-', $value), $addErrors);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/DateStep.php b/vendor/zendframework/zendframework/library/Zend/Validator/DateStep.php
index 804b4db7bc2..83c64505b9a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/DateStep.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/DateStep.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,13 +17,18 @@ use Zend\Stdlib\ArrayUtils;
class DateStep extends Date
{
- const NOT_STEP = 'dateStepNotStep';
+ const NOT_STEP = 'dateStepNotStep';
+
+ const FORMAT_DEFAULT = DateTime::ISO8601;
/**
* @var array
*/
protected $messageTemplates = array(
- self::NOT_STEP => "The input is not a valid step"
+ self::INVALID => "Invalid type given. String, integer, array or DateTime expected",
+ self::INVALID_DATE => "The input does not appear to be a valid date",
+ self::FALSEFORMAT => "The input does not fit the date format '%format%'",
+ self::NOT_STEP => "The input is not a valid step",
);
/**
@@ -41,13 +46,6 @@ class DateStep extends Date
*/
protected $step;
- /**
- * Format to use for parsing date strings
- *
- * @var string
- */
- protected $format = DateTime::ISO8601;
-
/**
* Optional timezone to be used when the baseValue
* and validation values do not contain timezone info
@@ -81,21 +79,11 @@ class DateStep extends Date
$options = $temp;
}
- if (isset($options['baseValue'])) {
- $this->setBaseValue($options['baseValue']);
+ if (!isset($options['step'])) {
+ $options['step'] = new DateInterval('P1D');
}
- if (isset($options['step'])) {
- $this->setStep($options['step']);
- } else {
- $this->setStep(new DateInterval('P1D'));
- }
- if (array_key_exists('format', $options)) {
- $this->setFormat($options['format']);
- }
- if (isset($options['timezone'])) {
- $this->setTimezone($options['timezone']);
- } else {
- $this->setTimezone(new DateTimeZone(date_default_timezone_get()));
+ if (!isset($options['timezone'])) {
+ $options['timezone'] = new DateTimeZone(date_default_timezone_get());
}
parent::__construct($options);
@@ -168,36 +156,33 @@ class DateStep extends Date
}
/**
- * Converts an int or string to a DateTime object
+ * Supports formats with ISO week (W) definitions
*
- * @param string|int|\DateTime $param
- * @return \DateTime
- * @throws Exception\InvalidArgumentException
+ * @see Date::convertString()
*/
- protected function convertToDateTime($param)
+ protected function convertString($value, $addErrors = true)
{
- $dateObj = $param;
- if (is_int($param)) {
- // Convert from timestamp
- $dateObj = date_create("@$param");
- } elseif (is_string($param)) {
- // Custom week format support
- if (strpos($this->getFormat(), 'Y-\WW') === 0
- && preg_match('/^([0-9]{4})\-W([0-9]{2})/', $param, $matches)
- ) {
- $dateObj = new DateTime();
- $dateObj->setISODate($matches[1], $matches[2]);
- } else {
- $dateObj = DateTime::createFromFormat(
- $this->getFormat(), $param, $this->getTimezone()
- );
- }
+ // Custom week format support
+ if (strpos($this->format, 'Y-\WW') === 0
+ && preg_match('/^([0-9]{4})\-W([0-9]{2})/', $value, $matches)
+ ) {
+ $date = new DateTime;
+ $date->setISODate($matches[1], $matches[2]);
+ } else {
+ $date = DateTime::createFromFormat($this->format, $value, $this->timezone);
}
- if (!($dateObj instanceof DateTime)) {
- throw new Exception\InvalidArgumentException('Invalid date param given');
+
+ // Invalid dates can show up as warnings (ie. "2007-02-99")
+ // and still return a DateTime object.
+ $errors = DateTime::getLastErrors();
+ if ($errors['warning_count'] > 0) {
+ if ($addErrors) {
+ $this->error(self::FALSEFORMAT);
+ }
+ return false;
}
- return $dateObj;
+ return $date;
}
/**
@@ -209,20 +194,14 @@ class DateStep extends Date
*/
public function isValid($value)
{
- parent::isValid($value);
-
- $this->setValue($value);
-
- $baseDate = $this->convertToDateTime($this->getBaseValue());
- $step = $this->getStep();
-
- // Parse the date
- try {
- $valueDate = $this->convertToDateTime($value);
- } catch (Exception\InvalidArgumentException $ex) {
+ if (!parent::isValid($value)) {
return false;
}
+ $valueDate = $this->convertToDateTime($value, false); // avoid duplicate errors
+ $baseDate = $this->convertToDateTime($this->baseValue, false);
+ $step = $this->getStep();
+
// Same date?
if ($valueDate == $baseDate) {
return true;
@@ -232,11 +211,16 @@ class DateStep extends Date
// Handle intervals of just one date or time unit.
$intervalParts = explode('|', $step->format('%y|%m|%d|%h|%i|%s'));
$partCounts = array_count_values($intervalParts);
+
+ $unitKeys = array('years', 'months', 'days', 'hours', 'minutes', 'seconds');
+ $intervalParts = array_combine($unitKeys, $intervalParts);
+
+ // Get absolute time difference
+ $timeDiff = $valueDate->diff($baseDate, true);
+ $diffParts = array_combine($unitKeys, explode('|', $timeDiff->format('%y|%m|%d|%h|%i|%s')));
+
if (5 === $partCounts["0"]) {
// Find the unit with the non-zero interval
- $unitKeys = array('years', 'months', 'days', 'hours', 'minutes', 'seconds');
- $intervalParts = array_combine($unitKeys, $intervalParts);
-
$intervalUnit = null;
$stepValue = null;
foreach ($intervalParts as $key => $value) {
@@ -247,17 +231,12 @@ class DateStep extends Date
}
}
- // Get absolute time difference
- $timeDiff = $valueDate->diff($baseDate, true);
- $diffParts = explode('|', $timeDiff->format('%y|%m|%d|%h|%i|%s'));
- $diffParts = array_combine($unitKeys, $diffParts);
-
// Check date units
if (in_array($intervalUnit, array('years', 'months', 'days'))) {
switch ($intervalUnit) {
case 'years':
- if ( 0 == $diffParts['months'] && 0 == $diffParts['days']
- && 0 == $diffParts['hours'] && 0 == $diffParts['minutes']
+ if (0 == $diffParts['months'] && 0 == $diffParts['days']
+ && 0 == $diffParts['hours'] && 0 == $diffParts['minutes']
&& 0 == $diffParts['seconds']
) {
if (($diffParts['years'] % $stepValue) === 0) {
@@ -266,7 +245,7 @@ class DateStep extends Date
}
break;
case 'months':
- if ( 0 == $diffParts['days'] && 0 == $diffParts['hours']
+ if (0 == $diffParts['days'] && 0 == $diffParts['hours']
&& 0 == $diffParts['minutes'] && 0 == $diffParts['seconds']
) {
$months = ($diffParts['years'] * 12) + $diffParts['months'];
@@ -276,7 +255,7 @@ class DateStep extends Date
}
break;
case 'days':
- if ( 0 == $diffParts['hours'] && 0 == $diffParts['minutes']
+ if (0 == $diffParts['hours'] && 0 == $diffParts['minutes']
&& 0 == $diffParts['seconds']
) {
$days = $timeDiff->format('%a'); // Total days
@@ -292,7 +271,6 @@ class DateStep extends Date
// Check time units
if (in_array($intervalUnit, array('hours', 'minutes', 'seconds'))) {
-
// Simple test if $stepValue is 1.
if (1 == $stepValue) {
if ('hours' === $intervalUnit
@@ -304,6 +282,10 @@ class DateStep extends Date
} elseif ('seconds' === $intervalUnit) {
return true;
}
+
+ $this->error(self::NOT_STEP);
+
+ return false;
}
// Simple test for same day, when using default baseDate
@@ -327,7 +309,7 @@ class DateStep extends Date
}
break;
case 'seconds':
- $seconds = ($diffParts['hours'] * 60)
+ $seconds = ($diffParts['hours'] * 60 * 60)
+ ($diffParts['minutes'] * 60)
+ $diffParts['seconds'];
if (($seconds % $stepValue) === 0) {
@@ -341,26 +323,154 @@ class DateStep extends Date
}
}
- // Fall back to slower (but accurate) method for complex intervals.
- // Keep adding steps to the base date until a match is found
- // or until the value is exceeded.
- if ($baseDate < $valueDate) {
- while ($baseDate < $valueDate) {
- $baseDate->add($step);
- if ($baseDate == $valueDate) {
- return true;
- }
- }
- } else {
- while ($baseDate > $valueDate) {
- $baseDate->sub($step);
- if ($baseDate == $valueDate) {
- return true;
- }
+ return $this->fallbackIncrementalIterationLogic($baseDate, $valueDate, $intervalParts, $diffParts, $step);
+ }
+
+ /**
+ * Fall back to slower (but accurate) method for complex intervals.
+ * Keep adding steps to the base date until a match is found
+ * or until the value is exceeded.
+ *
+ * This is really slow if the interval is small, especially if the
+ * default base date of 1/1/1970 is used. We can skip a chunk of
+ * iterations by starting at the lower bound of steps needed to reach
+ * the target
+ *
+ * @param DateTime $baseDate
+ * @param DateTime $valueDate
+ * @param int[] $intervalParts
+ * @param int[] $diffParts
+ * @param DateInterval $step
+ *
+ * @return bool
+ */
+ private function fallbackIncrementalIterationLogic(
+ DateTime $baseDate,
+ DateTime $valueDate,
+ array $intervalParts,
+ array $diffParts,
+ DateInterval $step
+ ) {
+ list($minSteps, $requiredIterations) = $this->computeMinStepAndRequiredIterations($intervalParts, $diffParts);
+ $minimumInterval = $this->computeMinimumInterval($intervalParts, $minSteps);
+ $isIncrementalStepping = $baseDate < $valueDate;
+ $dateModificationOperation = $isIncrementalStepping ? 'add' : 'sub';
+
+ for ($offsetIterations = 0; $offsetIterations < $requiredIterations; $offsetIterations += 1) {
+ $baseDate->{$dateModificationOperation}($minimumInterval);
+ }
+
+ while (($isIncrementalStepping && $baseDate < $valueDate)
+ || (! $isIncrementalStepping && $baseDate > $valueDate)
+ ) {
+ $baseDate->{$dateModificationOperation}($step);
+
+ if ($baseDate == $valueDate) {
+ return true;
}
}
$this->error(self::NOT_STEP);
+
return false;
}
+
+ /**
+ * Computes minimum interval to use for iterations while checking steps
+ *
+ * @param int[] $intervalParts
+ * @param int $minSteps
+ *
+ * @return DateInterval
+ */
+ private function computeMinimumInterval(array $intervalParts, $minSteps)
+ {
+ return new DateInterval(sprintf(
+ 'P%dY%dM%dDT%dH%dM%dS',
+ $intervalParts['years'] * $minSteps,
+ $intervalParts['months'] * $minSteps,
+ $intervalParts['days'] * $minSteps,
+ $intervalParts['hours'] * $minSteps,
+ $intervalParts['minutes'] * $minSteps,
+ $intervalParts['seconds'] * $minSteps
+ ));
+ }
+
+ /**
+ * @param int[] $intervalParts
+ * @param int[] $diffParts
+ *
+ * @return int[] (ordered tuple containing minimum steps and required step iterations
+ */
+ private function computeMinStepAndRequiredIterations(array $intervalParts, array $diffParts)
+ {
+ $minSteps = $this->computeMinSteps($intervalParts, $diffParts);
+
+ // If we use PHP_INT_MAX DateInterval::__construct falls over with a bad format error
+ // before we reach the max on 64 bit machines
+ $maxInteger = min(pow(2, 31), PHP_INT_MAX);
+ // check for integer overflow and split $minimum interval if needed
+ $maximumInterval = max($intervalParts);
+ $requiredStepIterations = 1;
+
+ if (($minSteps * $maximumInterval) > $maxInteger) {
+ $requiredStepIterations = ceil(($minSteps * $maximumInterval) / $maxInteger);
+ $minSteps = floor($minSteps / $requiredStepIterations);
+ }
+
+ return array($minSteps, $minSteps ? $requiredStepIterations : 0);
+ }
+
+ /**
+ * Multiply the step interval by the lower bound of steps to reach the target
+ *
+ * @param int[] $intervalParts
+ * @param int[] $diffParts
+ *
+ * @return int
+ */
+ private function computeMinSteps(array $intervalParts, array $diffParts)
+ {
+ $intervalMaxSeconds = $this->computeIntervalMaxSeconds($intervalParts);
+
+ return (0 == $intervalMaxSeconds)
+ ? 0
+ : max(floor($this->computeDiffMinSeconds($diffParts) / $intervalMaxSeconds) - 1, 0);
+ }
+
+ /**
+ * Get upper bound of the given interval in seconds
+ * Converts a given `$intervalParts` array into seconds
+ *
+ * @param int[] $intervalParts
+ *
+ * @return int
+ */
+ private function computeIntervalMaxSeconds(array $intervalParts)
+ {
+ return ($intervalParts['years'] * 60 * 60 * 24 * 366)
+ + ($intervalParts['months'] * 60 * 60 * 24 * 31)
+ + ($intervalParts['days'] * 60 * 60 * 24)
+ + ($intervalParts['hours'] * 60 * 60)
+ + ($intervalParts['minutes'] * 60)
+ + $intervalParts['seconds'];
+ }
+
+ /**
+ * Get lower bound of difference in secondss
+ * Converts a given `$diffParts` array into seconds
+ *
+ * @param int[] $diffParts
+ *
+ * @return int
+ */
+ private function computeDiffMinSeconds(array $diffParts)
+ {
+ return ($diffParts['years'] * 60 * 60 * 24 * 365)
+ + ($diffParts['months'] * 60 * 60 * 24 * 28)
+ + ($diffParts['days'] * 60 * 60 * 24)
+ + ($diffParts['hours'] * 60 * 60)
+ + ($diffParts['minutes'] * 60)
+ + $diffParts['seconds'];
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Db/AbstractDb.php b/vendor/zendframework/zendframework/library/Zend/Validator/Db/AbstractDb.php
index 6270fc6ab00..9dac8885387 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Db/AbstractDb.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Db/AbstractDb.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -189,6 +189,7 @@ abstract class AbstractDb extends AbstractValidator
public function setExclude($exclude)
{
$this->exclude = $exclude;
+ $this->select = null;
return $this;
}
@@ -210,7 +211,8 @@ abstract class AbstractDb extends AbstractValidator
*/
public function setField($field)
{
- $this->field = (string) $field;
+ $this->field = (string) $field;
+ $this->select = null;
return $this;
}
@@ -232,7 +234,8 @@ abstract class AbstractDb extends AbstractValidator
*/
public function setTable($table)
{
- $this->table = (string) $table;
+ $this->table = (string) $table;
+ $this->select = null;
return $this;
}
@@ -255,6 +258,7 @@ abstract class AbstractDb extends AbstractValidator
public function setSchema($schema)
{
$this->schema = $schema;
+ $this->select = null;
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Db/NoRecordExists.php b/vendor/zendframework/zendframework/library/Zend/Validator/Db/NoRecordExists.php
index 8a5dd727fb5..e87fdd6858e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Db/NoRecordExists.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Db/NoRecordExists.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Db/RecordExists.php b/vendor/zendframework/zendframework/library/Zend/Validator/Db/RecordExists.php
index dfae6b2d167..a7d06d33c12 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Db/RecordExists.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Db/RecordExists.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Digits.php b/vendor/zendframework/zendframework/library/Zend/Validator/Digits.php
index a4afe833fce..94210c917d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Digits.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Digits.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php b/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php
index 5fa52bc02db..a20d9999668 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/EmailAddress.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -298,7 +298,7 @@ class EmailAddress extends AbstractValidator
}
foreach ($host as $server) {
- // Search for 0.0.0.0/8, 10.0.0.0/8, 127.0.0.0/8
+ // Search for 0.0.0.0/8, 10.0.0.0/8, 127.0.0.0/8
if (!preg_match('/^(0|10|127)(\.([0-9]|[1-9][0-9]|1([0-9][0-9])|2([0-4][0-9]|5[0-5]))){3}$/', $server) &&
// Search for 100.64.0.0/10
!preg_match('/^100\.(6[0-4]|[7-9][0-9]|1[0-1][0-9]|12[0-7])(\.([0-9]|[1-9][0-9]|1([0-9][0-9])|2([0-4][0-9]|5[0-5]))){2}$/', $server) &&
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/BadMethodCallException.php
index 0e36e037e07..a4aa15f4122 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/BadMethodCallException.php
@@ -3,12 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Validator\Exception;
-class BadMethodCallException extends \BadMethodCallException
- implements ExceptionInterface
-{}
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExceptionInterface.php
index 0bc6317b790..7f4f0b1af53 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Validator\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExtensionNotLoadedException.php
index f9c2bd8bd41..4a6b7c03b66 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExtensionNotLoadedException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Validator\Exception;
class ExtensionNotLoadedException extends RuntimeException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidArgumentException.php
index 7610dc390a8..b6518b03d67 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidArgumentException.php
@@ -3,12 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Validator\Exception;
-class InvalidArgumentException extends \InvalidArgumentException
- implements ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
index b395ddd3408..4e65bd86a18 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Validator\Exception;
class InvalidMagicMimeFileException extends InvalidArgumentException
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/RuntimeException.php
index de98b3d0b52..a6319e05910 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/RuntimeException.php
@@ -3,12 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Validator\Exception;
-class RuntimeException extends \RuntimeException
- implements ExceptionInterface
-{}
+class RuntimeException extends \RuntimeException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Explode.php b/vendor/zendframework/zendframework/library/Zend/Validator/Explode.php
index 8c0ba0efcf7..13b3b019c3f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Explode.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Explode.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -185,8 +185,6 @@ class Explode extends AbstractValidator implements ValidatorPluginManagerAwareIn
$values = array($value);
}
- $retval = true;
- $messages = array();
$validator = $this->getValidator();
if (!$validator) {
@@ -198,17 +196,14 @@ class Explode extends AbstractValidator implements ValidatorPluginManagerAwareIn
foreach ($values as $value) {
if (!$validator->isValid($value)) {
- $messages[] = $validator->getMessages();
- $retval = false;
+ $this->abstractOptions['messages'][] = $validator->getMessages();
if ($this->isBreakOnFirstFailure()) {
- break;
+ return false;
}
}
}
- $this->abstractOptions['messages'] = $messages;
-
- return $retval;
+ return count($this->abstractOptions['messages']) == 0;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Count.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Count.php
index 1672bad19e0..a4ce28e00c8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Count.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Count.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -71,7 +71,7 @@ class Count extends AbstractValidator
* Min limits the file count, when used with max=null it is the maximum file count
* It also accepts an array with the keys 'min' and 'max'
*
- * If $options is a integer, it will be used as maximum file count
+ * If $options is an integer, it will be used as maximum file count
* As Array is accepts the following keys:
* 'min': Minimum filecount
* 'max': Maximum filecount
@@ -121,8 +121,9 @@ class Count extends AbstractValidator
$min = (int) $min;
if (($this->getMax() !== null) && ($min > $this->getMax())) {
- throw new Exception\InvalidArgumentException("The minimum must be less than or equal to the maximum file count, but $min >"
- . " {$this->getMax()}");
+ throw new Exception\InvalidArgumentException(
+ "The minimum must be less than or equal to the maximum file count, but $min > {$this->getMax()}"
+ );
}
$this->options['min'] = $min;
@@ -158,8 +159,9 @@ class Count extends AbstractValidator
$max = (int) $max;
if (($this->getMin() !== null) && ($max < $this->getMin())) {
- throw new Exception\InvalidArgumentException("The maximum must be greater than or equal to the minimum file count, but "
- . "$max < {$this->getMin()}");
+ throw new Exception\InvalidArgumentException(
+ "The maximum must be greater than or equal to the minimum file count, but $max < {$this->getMin()}"
+ );
}
$this->options['max'] = $max;
@@ -192,7 +194,7 @@ class Count extends AbstractValidator
/**
* Returns true if and only if the file count of all checked files is at least min and
* not bigger than max (when max is not null). Attention: When checking with set min you
- * must give all files with the first call, otherwise you will get an false.
+ * must give all files with the first call, otherwise you will get a false.
*
* @param string|array $value Filenames to check for count
* @param array $file File data from \Zend\File\Transfer\Transfer
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Crc32.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Crc32.php
index 737521c22e0..a5f3de8740b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Crc32.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Crc32.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeExtension.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeExtension.php
index 0d24b1857ec..e73d25bdcbc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeExtension.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeExtension.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeMimeType.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeMimeType.php
index dedcee9fccc..f0bd4f8cce3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeMimeType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeMimeType.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Exists.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Exists.php
index c868aefc93f..f141b8240ef 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Exists.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Exists.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Extension.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Extension.php
index 2ceeebc736b..a779832fe9e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Extension.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Extension.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,6 +13,7 @@ use Traversable;
use Zend\Stdlib\ArrayUtils;
use Zend\Validator\AbstractValidator;
use Zend\Validator\Exception;
+
/**
* Validator for the file extension of a file
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/FilesSize.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/FilesSize.php
index f2d2afd0db7..a3101117460 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/FilesSize.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/FilesSize.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Hash.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Hash.php
index b77b1e19f43..99b9bca05af 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Hash.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Hash.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/ImageSize.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/ImageSize.php
index c7714f8dad6..018e5f90834 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/ImageSize.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/ImageSize.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,7 @@ use Zend\Validator\AbstractValidator;
use Zend\Validator\Exception;
/**
- * Validator for the image size of a image file
+ * Validator for the image size of an image file
*/
class ImageSize extends AbstractValidator
{
@@ -130,8 +130,10 @@ class ImageSize extends AbstractValidator
public function setMinWidth($minWidth)
{
if (($this->getMaxWidth() !== null) && ($minWidth > $this->getMaxWidth())) {
- throw new Exception\InvalidArgumentException("The minimum image width must be less than or equal to the "
- . " maximum image width, but {$minWidth} > {$this->getMaxWidth()}");
+ throw new Exception\InvalidArgumentException(
+ "The minimum image width must be less than or equal to the "
+ . " maximum image width, but {$minWidth} > {$this->getMaxWidth()}"
+ );
}
$this->options['minWidth'] = (int) $minWidth;
@@ -158,8 +160,10 @@ class ImageSize extends AbstractValidator
public function setMaxWidth($maxWidth)
{
if (($this->getMinWidth() !== null) && ($maxWidth < $this->getMinWidth())) {
- throw new Exception\InvalidArgumentException("The maximum image width must be greater than or equal to the "
- . "minimum image width, but {$maxWidth} < {$this->getMinWidth()}");
+ throw new Exception\InvalidArgumentException(
+ "The maximum image width must be greater than or equal to the "
+ . "minimum image width, but {$maxWidth} < {$this->getMinWidth()}"
+ );
}
$this->options['maxWidth'] = (int) $maxWidth;
@@ -186,8 +190,10 @@ class ImageSize extends AbstractValidator
public function setMinHeight($minHeight)
{
if (($this->getMaxHeight() !== null) && ($minHeight > $this->getMaxHeight())) {
- throw new Exception\InvalidArgumentException("The minimum image height must be less than or equal to the "
- . " maximum image height, but {$minHeight} > {$this->getMaxHeight()}");
+ throw new Exception\InvalidArgumentException(
+ "The minimum image height must be less than or equal to the "
+ . " maximum image height, but {$minHeight} > {$this->getMaxHeight()}"
+ );
}
$this->options['minHeight'] = (int) $minHeight;
@@ -214,8 +220,10 @@ class ImageSize extends AbstractValidator
public function setMaxHeight($maxHeight)
{
if (($this->getMinHeight() !== null) && ($maxHeight < $this->getMinHeight())) {
- throw new Exception\InvalidArgumentException("The maximum image height must be greater than or equal to the "
- . "minimum image height, but {$maxHeight} < {$this->getMinHeight()}");
+ throw new Exception\InvalidArgumentException(
+ "The maximum image height must be greater than or equal to the "
+ . "minimum image height, but {$maxHeight} < {$this->getMinHeight()}"
+ );
}
$this->options['maxHeight'] = (int) $maxHeight;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/IsCompressed.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/IsCompressed.php
index ccb2ae47440..ebd2e77da91 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/IsCompressed.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/IsCompressed.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -40,7 +40,7 @@ class IsCompressed extends MimeType
*/
public function __construct($options = array())
{
- // http://de.wikipedia.org/wiki/Liste_von_Dateiendungen
+ // http://hul.harvard.edu/ois/systems/wax/wax-public-help/mimetypes.htm
$default = array(
'application/arj',
'application/gnutar',
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/IsImage.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/IsImage.php
index 71be7f33767..a13bc043df2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/IsImage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/IsImage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,7 @@ use Traversable;
use Zend\Stdlib\ArrayUtils;
/**
- * Validator which checks if the file already exists in the directory
+ * Validator which checks if the file is an image
*/
class IsImage extends MimeType
{
@@ -40,8 +40,7 @@ class IsImage extends MimeType
*/
public function __construct($options = array())
{
- // http://de.wikipedia.org/wiki/Liste_von_Dateiendungen
- // http://www.iana.org/assignments/media-types/image/
+ // http://www.iana.org/assignments/media-types/media-types.xhtml#image
$default = array(
'application/cdf',
'application/dicom',
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Md5.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Md5.php
index 5d9fc34b44a..e1d1e973efb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Md5.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Md5.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php
index 53fb948dd43..a91c4dda852 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/NotExists.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/NotExists.php
index 17aa7da749e..e50adef6c78 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/NotExists.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/NotExists.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Sha1.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Sha1.php
index 98413945000..7d172da4353 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Sha1.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Sha1.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Size.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Size.php
index 38022dd823f..e709fb5a826 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Size.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Size.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -64,7 +64,7 @@ class Size extends AbstractValidator
/**
* Sets validator options
*
- * If $options is a integer, it will be used as maximum file size
+ * If $options is an integer, it will be used as maximum file size
* As Array is accepts the following keys:
* 'min': Minimum file size
* 'max': Maximum file size
@@ -131,7 +131,7 @@ class Size extends AbstractValidator
/**
* Sets the minimum file size
*
- * File size can be an integer or an byte string
+ * File size can be an integer or a byte string
* This includes 'B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'
* For example: 2000, 2MB, 0.2GB
*
@@ -149,8 +149,8 @@ class Size extends AbstractValidator
$max = $this->getMax(true);
if (($max !== null) && ($min > $max)) {
throw new Exception\InvalidArgumentException(
- 'The minimum must be less than or equal to the maximum file'
- ." size, but $min > $max");
+ "The minimum must be less than or equal to the maximum file size, but $min > $max"
+ );
}
$this->options['min'] = $min;
@@ -176,7 +176,7 @@ class Size extends AbstractValidator
/**
* Sets the maximum file size
*
- * File size can be an integer or an byte string
+ * File size can be an integer or a byte string
* This includes 'B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'
* For example: 2000, 2MB, 0.2GB
*
@@ -194,8 +194,8 @@ class Size extends AbstractValidator
$min = $this->getMin(true);
if (($min !== null) && ($max < $min)) {
throw new Exception\InvalidArgumentException(
- 'The maximum must be greater than or equal to the minimum file'
- ." size, but $max < $min");
+ "The maximum must be greater than or equal to the minimum file size, but $max < $min"
+ );
}
$this->options['max'] = $max;
@@ -365,6 +365,4 @@ class Size extends AbstractValidator
return $value;
}
-
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Upload.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Upload.php
index 748b482ee5d..1524e4ca6c8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/Upload.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/Upload.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -115,7 +115,7 @@ class Upload extends AbstractValidator
$this->options['files'] = $files;
}
- if ($this->options['files'] === NULL) {
+ if ($this->options['files'] === null) {
$this->options['files'] = array();
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/UploadFile.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/UploadFile.php
index 90f4d75df02..f34958fce2b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/UploadFile.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/UploadFile.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -72,14 +72,11 @@ class UploadFile extends AbstractValidator
}
$this->setValue($filename);
- if (empty($file) || false === stream_resolve_include_path($file)) {
- $this->error(self::FILE_NOT_FOUND);
- return false;
- }
-
switch ($error) {
case UPLOAD_ERR_OK:
- if (!is_uploaded_file($file)) {
+ if (empty($file) || false === is_file($file)) {
+ $this->error(self::FILE_NOT_FOUND);
+ } elseif (! is_uploaded_file($file)) {
$this->error(self::ATTACK);
}
break;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/WordCount.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/WordCount.php
index 23be65bd764..460b06a69e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/File/WordCount.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/File/WordCount.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -65,7 +65,7 @@ class WordCount extends AbstractValidator
* Min limits the word count, when used with max=null it is the maximum word count
* It also accepts an array with the keys 'min' and 'max'
*
- * If $options is a integer, it will be used as maximum word count
+ * If $options is an integer, it will be used as maximum word count
* As Array is accepts the following keys:
* 'min': Minimum word count
* 'max': Maximum word count
@@ -116,8 +116,8 @@ class WordCount extends AbstractValidator
$min = (int) $min;
if (($this->getMax() !== null) && ($min > $this->getMax())) {
throw new Exception\InvalidArgumentException(
- "The minimum must be less than or equal to the maximum word count, but $min >"
- . " {$this->getMax()}");
+ "The minimum must be less than or equal to the maximum word count, but $min > {$this->getMax()}"
+ );
}
$this->options['min'] = $min;
@@ -154,8 +154,8 @@ class WordCount extends AbstractValidator
$max = (int) $max;
if (($this->getMin() !== null) && ($max < $this->getMin())) {
throw new Exception\InvalidArgumentException(
- "The maximum must be greater than or equal to the minimum word count, but "
- . "$max < {$this->getMin()}");
+ "The maximum must be greater than or equal to the minimum word count, but $max < {$this->getMin()}"
+ );
}
$this->options['max'] = $max;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/GreaterThan.php b/vendor/zendframework/zendframework/library/Zend/Validator/GreaterThan.php
index 6a06ae8d250..7f106e8c5d6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/GreaterThan.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/GreaterThan.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Hex.php b/vendor/zendframework/zendframework/library/Zend/Validator/Hex.php
index e7b591c8b87..64ae8930df6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Hex.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Hex.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php
index 1536541f4a6..95abee9e915 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Validator;
-use Zend\Stdlib\ErrorHandler;
use Zend\Stdlib\StringUtils;
/**
@@ -74,41 +73,758 @@ class Hostname extends AbstractValidator
* @var array
*/
protected $validTlds = array(
- 'ac', 'academy', 'actor', 'ad', 'ae', 'aero', 'af', 'ag', 'agency', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar',
- 'arpa', 'as', 'asia', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bar', 'bargains', 'bb', 'bd', 'be', 'berlin', 'best',
- 'bf', 'bg', 'bh', 'bi', 'bike', 'biz', 'bj', 'bl', 'blue', 'bm', 'bn', 'bo', 'boutique', 'bq', 'br', 'bs', 'bt',
- 'build', 'builders', 'buzz', 'bv', 'bw', 'by', 'bz', 'ca', 'cab', 'camera', 'camp', 'cards', 'careers', 'cat',
- 'catering', 'cc', 'cd', 'center', 'ceo', 'cf', 'cg', 'ch', 'cheap', 'christmas', 'ci', 'ck', 'cl', 'cleaning',
- 'clothing', 'club', 'cm', 'cn', 'co', 'codes', 'coffee', 'com', 'community', 'company', 'computer',
- 'construction', 'contractors', 'cool', 'coop', 'cr', 'cruises', 'cu', 'cv', 'cw', 'cx', 'cy', 'cz', 'dance',
- 'dating', 'de', 'democrat', 'diamonds', 'directory', 'dj', 'dk', 'dm', 'do', 'domains', 'dz', 'ec', 'edu',
- 'education', 'ee', 'eg', 'eh', 'email', 'enterprises', 'equipment', 'er', 'es', 'estate', 'et', 'eu', 'events',
- 'expert', 'exposed', 'farm', 'fi', 'fish', 'fj', 'fk', 'flights', 'florist', 'fm', 'fo', 'foundation', 'fr',
- 'futbol', 'ga', 'gallery', 'gb', 'gd', 'ge', 'gf', 'gg', 'gh', 'gi', 'gift', 'gl', 'glass', 'gm', 'gn', 'gov',
- 'gp', 'gq', 'gr', 'graphics', 'gs', 'gt', 'gu', 'guitars', 'guru', 'gw', 'gy', 'hk', 'hm', 'hn', 'holdings',
- 'holiday', 'house', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'immobilien', 'in', 'industries', 'info',
- 'institute', 'int', 'international', 'io', 'iq', 'ir', 'is', 'it', 'je', 'jm', 'jo', 'jobs', 'jp', 'kaufen',
- 'ke', 'kg', 'kh', 'ki', 'kim', 'kitchen', 'kiwi', 'km', 'kn', 'kp', 'kr', 'kred', 'kw', 'ky', 'kz', 'la',
- 'land', 'lb', 'lc', 'li', 'lighting', 'limo', 'link', 'lk', 'lr', 'ls', 'lt', 'lu', 'luxury', 'lv', 'ly', 'ma',
- 'management', 'mango', 'marketing', 'mc', 'md', 'me', 'menu', 'mf', 'mg', 'mh', 'mil', 'mk', 'ml', 'mm', 'mn',
- 'mo', 'mobi', 'moda', 'monash', 'mp', 'mq', 'mr', 'ms', 'mt', 'mu', 'museum', 'mv', 'mw', 'mx', 'my', 'mz',
- 'na', 'nagoya', 'name', 'nc', 'ne', 'net', 'neustar', 'nf', 'ng', 'ni', 'ninja', 'nl', 'no', 'np', 'nr', 'nu',
- 'nz', 'om', 'onl', 'org', 'pa', 'partners', 'parts', 'pe', 'pf', 'pg', 'ph', 'photo', 'photography', 'photos',
- 'pics', 'pink', 'pk', 'pl', 'plumbing', 'pm', 'pn', 'post', 'pr', 'pro', 'productions', 'properties', 'ps',
- 'pt', 'pub', 'pw', 'py', 'qa', 'qpon', 're', 'recipes', 'red', 'rentals', 'repair', 'report', 'reviews', 'rich',
- 'ro', 'rs', 'ru', 'ruhr', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sexy', 'sg', 'sh', 'shiksha', 'shoes', 'si',
- 'singles', 'sj', 'sk', 'sl', 'sm', 'sn', 'so', 'social', 'solar', 'solutions', 'sr', 'ss', 'st', 'su',
- 'supplies', 'supply', 'support', 'sv', 'sx', 'sy', 'systems', 'sz', 'tattoo', 'tc', 'td', 'technology', 'tel',
- 'tf', 'tg', 'th', 'tienda', 'tips', 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'today', 'tokyo', 'tools', 'tp', 'tr',
- 'training', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua', 'ug', 'uk', 'um', 'uno', 'us', 'uy', 'uz', 'va',
- 'vacations', 'vc', 've', 'ventures', 'vg', 'vi', 'viajes', 'villas', 'vision', 'vn', 'voting', 'voyage', 'vu',
- 'wang', 'watch', 'wed', 'wf', 'wien', 'wiki', 'works', 'ws', '测试', 'परीकà¥à¤·à¤¾', '集团', '在线', 'í•œêµ', 'à¦à¦¾à¦°à¦¤',
- 'বাংলা', '公益', 'å…¬å¸', '移动', 'æˆ‘çˆ±ä½ ', 'иÑпытание', 'қаз', 'онлайн', 'Ñайт', 'Ñрб', '테스트', '삼성',
- 'சிஙà¯à®•à®ªà¯à®ªà¯‚à®°à¯', 'дети', 'טעסט', 'ä¸æ–‡ç½‘', 'ä¸ä¿¡', 'ä¸å›½', 'ä¸åœ‹', 'à°à°¾à°°à°¤à±', 'ලංකà·', '測試', 'àªàª¾àª°àª¤', 'à¤à¤¾à¤°à¤¤',
- 'آزمایشی', 'பரிடà¯à®šà¯ˆ', '网络', 'укр', '香港', 'δοκιμή', 'إختبار', 'å°æ¹¾', 'å°ç£', 'мон',
- 'الجزائر', 'عمان', 'ایران', 'امارات', 'بازار', 'پاکستان', 'الاردن', 'بھارت', 'المغرب', 'السعودية', 'سودان', 'مليسيا', 'شبكة', 'გე',
- 'ไทย', 'سورية', 'рф', 'تونس', 'ã¿ã‚“ãª', 'à¨à¨¾à¨°à¨¤', '游æˆ', 'مصر', 'قطر', 'இலஙà¯à®•à¯ˆ', 'இநà¯à®¤à®¿à®¯à®¾', 'æ–°åŠ å¡', 'Ùلسطين',
- 'テスト', '政务', 'xxx', 'xyz', 'ye', 'yt', 'za', 'zm', 'zone', 'zw'
+ 'abogado',
+ 'ac',
+ 'academy',
+ 'accountants',
+ 'active',
+ 'actor',
+ 'ad',
+ 'ae',
+ 'aero',
+ 'af',
+ 'ag',
+ 'agency',
+ 'ai',
+ 'airforce',
+ 'al',
+ 'allfinanz',
+ 'alsace',
+ 'am',
+ 'an',
+ 'android',
+ 'ao',
+ 'aq',
+ 'ar',
+ 'archi',
+ 'army',
+ 'arpa',
+ 'as',
+ 'asia',
+ 'associates',
+ 'at',
+ 'attorney',
+ 'au',
+ 'auction',
+ 'audio',
+ 'autos',
+ 'aw',
+ 'ax',
+ 'axa',
+ 'az',
+ 'ba',
+ 'band',
+ 'bar',
+ 'bargains',
+ 'bayern',
+ 'bb',
+ 'bd',
+ 'be',
+ 'beer',
+ 'berlin',
+ 'best',
+ 'bf',
+ 'bg',
+ 'bh',
+ 'bi',
+ 'bid',
+ 'bike',
+ 'bio',
+ 'biz',
+ 'bj',
+ 'black',
+ 'blackfriday',
+ 'bloomberg',
+ 'blue',
+ 'bm',
+ 'bmw',
+ 'bn',
+ 'bnpparibas',
+ 'bo',
+ 'boo',
+ 'boutique',
+ 'br',
+ 'brussels',
+ 'bs',
+ 'bt',
+ 'budapest',
+ 'build',
+ 'builders',
+ 'business',
+ 'buzz',
+ 'bv',
+ 'bw',
+ 'by',
+ 'bz',
+ 'bzh',
+ 'ca',
+ 'cab',
+ 'cal',
+ 'camera',
+ 'camp',
+ 'cancerresearch',
+ 'capetown',
+ 'capital',
+ 'caravan',
+ 'cards',
+ 'care',
+ 'career',
+ 'careers',
+ 'casa',
+ 'cash',
+ 'cat',
+ 'catering',
+ 'cc',
+ 'cd',
+ 'center',
+ 'ceo',
+ 'cern',
+ 'cf',
+ 'cg',
+ 'ch',
+ 'channel',
+ 'cheap',
+ 'christmas',
+ 'chrome',
+ 'church',
+ 'ci',
+ 'citic',
+ 'city',
+ 'ck',
+ 'cl',
+ 'claims',
+ 'cleaning',
+ 'click',
+ 'clinic',
+ 'clothing',
+ 'club',
+ 'cm',
+ 'cn',
+ 'co',
+ 'coach',
+ 'codes',
+ 'coffee',
+ 'college',
+ 'cologne',
+ 'com',
+ 'community',
+ 'company',
+ 'computer',
+ 'condos',
+ 'construction',
+ 'consulting',
+ 'contractors',
+ 'cooking',
+ 'cool',
+ 'coop',
+ 'country',
+ 'cr',
+ 'credit',
+ 'creditcard',
+ 'cricket',
+ 'crs',
+ 'cruises',
+ 'cu',
+ 'cuisinella',
+ 'cv',
+ 'cw',
+ 'cx',
+ 'cy',
+ 'cymru',
+ 'cz',
+ 'dad',
+ 'dance',
+ 'dating',
+ 'day',
+ 'de',
+ 'deals',
+ 'degree',
+ 'delivery',
+ 'democrat',
+ 'dental',
+ 'dentist',
+ 'desi',
+ 'diamonds',
+ 'diet',
+ 'digital',
+ 'direct',
+ 'directory',
+ 'discount',
+ 'dj',
+ 'dk',
+ 'dm',
+ 'dnp',
+ 'do',
+ 'domains',
+ 'durban',
+ 'dvag',
+ 'dz',
+ 'eat',
+ 'ec',
+ 'edu',
+ 'education',
+ 'ee',
+ 'eg',
+ 'email',
+ 'emerck',
+ 'energy',
+ 'engineer',
+ 'engineering',
+ 'enterprises',
+ 'equipment',
+ 'er',
+ 'es',
+ 'esq',
+ 'estate',
+ 'et',
+ 'eu',
+ 'eus',
+ 'events',
+ 'everbank',
+ 'exchange',
+ 'expert',
+ 'exposed',
+ 'fail',
+ 'farm',
+ 'feedback',
+ 'fi',
+ 'finance',
+ 'financial',
+ 'firmdale',
+ 'fish',
+ 'fishing',
+ 'fitness',
+ 'fj',
+ 'fk',
+ 'flights',
+ 'florist',
+ 'flsmidth',
+ 'fly',
+ 'fm',
+ 'fo',
+ 'foo',
+ 'forsale',
+ 'foundation',
+ 'fr',
+ 'frl',
+ 'frogans',
+ 'fund',
+ 'furniture',
+ 'futbol',
+ 'ga',
+ 'gal',
+ 'gallery',
+ 'gb',
+ 'gbiz',
+ 'gd',
+ 'ge',
+ 'gent',
+ 'gf',
+ 'gg',
+ 'gh',
+ 'gi',
+ 'gift',
+ 'gifts',
+ 'gives',
+ 'gl',
+ 'glass',
+ 'gle',
+ 'global',
+ 'globo',
+ 'gm',
+ 'gmail',
+ 'gmo',
+ 'gmx',
+ 'gn',
+ 'google',
+ 'gop',
+ 'gov',
+ 'gp',
+ 'gq',
+ 'gr',
+ 'graphics',
+ 'gratis',
+ 'green',
+ 'gripe',
+ 'gs',
+ 'gt',
+ 'gu',
+ 'guide',
+ 'guitars',
+ 'guru',
+ 'gw',
+ 'gy',
+ 'hamburg',
+ 'haus',
+ 'healthcare',
+ 'help',
+ 'here',
+ 'hiphop',
+ 'hiv',
+ 'hk',
+ 'hm',
+ 'hn',
+ 'holdings',
+ 'holiday',
+ 'homes',
+ 'horse',
+ 'host',
+ 'hosting',
+ 'house',
+ 'how',
+ 'hr',
+ 'ht',
+ 'hu',
+ 'ibm',
+ 'id',
+ 'ie',
+ 'il',
+ 'im',
+ 'immo',
+ 'immobilien',
+ 'in',
+ 'industries',
+ 'info',
+ 'ing',
+ 'ink',
+ 'institute',
+ 'insure',
+ 'int',
+ 'international',
+ 'investments',
+ 'io',
+ 'iq',
+ 'ir',
+ 'is',
+ 'it',
+ 'je',
+ 'jetzt',
+ 'jm',
+ 'jo',
+ 'jobs',
+ 'joburg',
+ 'jp',
+ 'juegos',
+ 'kaufen',
+ 'ke',
+ 'kg',
+ 'kh',
+ 'ki',
+ 'kim',
+ 'kitchen',
+ 'kiwi',
+ 'km',
+ 'kn',
+ 'koeln',
+ 'kp',
+ 'kr',
+ 'krd',
+ 'kred',
+ 'kw',
+ 'ky',
+ 'kz',
+ 'la',
+ 'lacaixa',
+ 'land',
+ 'lawyer',
+ 'lb',
+ 'lc',
+ 'lds',
+ 'lease',
+ 'legal',
+ 'lgbt',
+ 'li',
+ 'life',
+ 'lighting',
+ 'limited',
+ 'limo',
+ 'link',
+ 'lk',
+ 'loans',
+ 'london',
+ 'lotto',
+ 'lr',
+ 'ls',
+ 'lt',
+ 'ltda',
+ 'lu',
+ 'luxe',
+ 'luxury',
+ 'lv',
+ 'ly',
+ 'ma',
+ 'madrid',
+ 'maison',
+ 'management',
+ 'mango',
+ 'market',
+ 'marketing',
+ 'mc',
+ 'md',
+ 'me',
+ 'media',
+ 'meet',
+ 'melbourne',
+ 'meme',
+ 'memorial',
+ 'menu',
+ 'mg',
+ 'mh',
+ 'miami',
+ 'mil',
+ 'mini',
+ 'mk',
+ 'ml',
+ 'mm',
+ 'mn',
+ 'mo',
+ 'mobi',
+ 'moda',
+ 'moe',
+ 'monash',
+ 'money',
+ 'mormon',
+ 'mortgage',
+ 'moscow',
+ 'motorcycles',
+ 'mov',
+ 'mp',
+ 'mq',
+ 'mr',
+ 'ms',
+ 'mt',
+ 'mu',
+ 'museum',
+ 'mv',
+ 'mw',
+ 'mx',
+ 'my',
+ 'mz',
+ 'na',
+ 'nagoya',
+ 'name',
+ 'navy',
+ 'nc',
+ 'ne',
+ 'net',
+ 'network',
+ 'neustar',
+ 'new',
+ 'nexus',
+ 'nf',
+ 'ng',
+ 'ngo',
+ 'nhk',
+ 'ni',
+ 'ninja',
+ 'nl',
+ 'no',
+ 'np',
+ 'nr',
+ 'nra',
+ 'nrw',
+ 'nu',
+ 'nyc',
+ 'nz',
+ 'okinawa',
+ 'om',
+ 'ong',
+ 'onl',
+ 'ooo',
+ 'org',
+ 'organic',
+ 'otsuka',
+ 'ovh',
+ 'pa',
+ 'paris',
+ 'partners',
+ 'parts',
+ 'party',
+ 'pe',
+ 'pf',
+ 'pg',
+ 'ph',
+ 'pharmacy',
+ 'photo',
+ 'photography',
+ 'photos',
+ 'physio',
+ 'pics',
+ 'pictures',
+ 'pink',
+ 'pizza',
+ 'pk',
+ 'pl',
+ 'place',
+ 'plumbing',
+ 'pm',
+ 'pn',
+ 'pohl',
+ 'poker',
+ 'post',
+ 'pr',
+ 'praxi',
+ 'press',
+ 'pro',
+ 'prod',
+ 'productions',
+ 'prof',
+ 'properties',
+ 'property',
+ 'ps',
+ 'pt',
+ 'pub',
+ 'pw',
+ 'py',
+ 'qa',
+ 'qpon',
+ 'quebec',
+ 're',
+ 'realtor',
+ 'recipes',
+ 'red',
+ 'rehab',
+ 'reise',
+ 'reisen',
+ 'reit',
+ 'ren',
+ 'rentals',
+ 'repair',
+ 'report',
+ 'republican',
+ 'rest',
+ 'restaurant',
+ 'reviews',
+ 'rich',
+ 'rio',
+ 'rip',
+ 'ro',
+ 'rocks',
+ 'rodeo',
+ 'rs',
+ 'rsvp',
+ 'ru',
+ 'ruhr',
+ 'rw',
+ 'ryukyu',
+ 'sa',
+ 'saarland',
+ 'sarl',
+ 'sb',
+ 'sc',
+ 'sca',
+ 'scb',
+ 'schmidt',
+ 'schule',
+ 'science',
+ 'scot',
+ 'sd',
+ 'se',
+ 'services',
+ 'sexy',
+ 'sg',
+ 'sh',
+ 'shiksha',
+ 'shoes',
+ 'si',
+ 'singles',
+ 'sj',
+ 'sk',
+ 'sl',
+ 'sm',
+ 'sn',
+ 'so',
+ 'social',
+ 'software',
+ 'sohu',
+ 'solar',
+ 'solutions',
+ 'soy',
+ 'space',
+ 'spiegel',
+ 'sr',
+ 'st',
+ 'su',
+ 'supplies',
+ 'supply',
+ 'support',
+ 'surf',
+ 'surgery',
+ 'suzuki',
+ 'sv',
+ 'sx',
+ 'sy',
+ 'sydney',
+ 'systems',
+ 'sz',
+ 'taipei',
+ 'tatar',
+ 'tattoo',
+ 'tax',
+ 'tc',
+ 'td',
+ 'technology',
+ 'tel',
+ 'tf',
+ 'tg',
+ 'th',
+ 'tienda',
+ 'tips',
+ 'tirol',
+ 'tj',
+ 'tk',
+ 'tl',
+ 'tm',
+ 'tn',
+ 'to',
+ 'today',
+ 'tokyo',
+ 'tools',
+ 'top',
+ 'town',
+ 'toys',
+ 'tp',
+ 'tr',
+ 'trade',
+ 'training',
+ 'travel',
+ 'tt',
+ 'tui',
+ 'tv',
+ 'tw',
+ 'tz',
+ 'ua',
+ 'ug',
+ 'uk',
+ 'university',
+ 'uno',
+ 'uol',
+ 'us',
+ 'uy',
+ 'uz',
+ 'va',
+ 'vacations',
+ 'vc',
+ 've',
+ 'vegas',
+ 'ventures',
+ 'versicherung',
+ 'vet',
+ 'vg',
+ 'vi',
+ 'viajes',
+ 'villas',
+ 'vision',
+ 'vlaanderen',
+ 'vn',
+ 'vodka',
+ 'vote',
+ 'voting',
+ 'voto',
+ 'voyage',
+ 'vu',
+ 'wales',
+ 'wang',
+ 'watch',
+ 'webcam',
+ 'website',
+ 'wed',
+ 'wedding',
+ 'wf',
+ 'whoswho',
+ 'wien',
+ 'wiki',
+ 'williamhill',
+ 'wme',
+ 'work',
+ 'works',
+ 'world',
+ 'ws',
+ 'wtc',
+ 'wtf',
+ '测试',
+ 'परीकà¥à¤·à¤¾',
+ '集团',
+ '在线',
+ 'í•œêµ',
+ 'à¦à¦¾à¦°à¦¤',
+ 'বাংলা',
+ '公益',
+ 'å…¬å¸',
+ '移动',
+ 'æˆ‘çˆ±ä½ ',
+ 'иÑпытание',
+ 'қаз',
+ 'онлайн',
+ 'Ñайт',
+ 'Ñрб',
+ '테스트',
+ '삼성',
+ 'சிஙà¯à®•à®ªà¯à®ªà¯‚à®°à¯',
+ 'дети',
+ 'טעסט',
+ 'ä¸æ–‡ç½‘',
+ 'ä¸ä¿¡',
+ 'ä¸å›½',
+ 'ä¸åœ‹',
+ 'à°à°¾à°°à°¤à±',
+ 'ලංකà·',
+ '測試',
+ 'àªàª¾àª°àª¤',
+ 'à¤à¤¾à¤°à¤¤',
+ 'آزمایشی',
+ 'பரிடà¯à®šà¯ˆ',
+ '网络',
+ 'укр',
+ '香港',
+ 'δοκιμή',
+ 'إختبار',
+ 'å°æ¹¾',
+ 'å°ç£',
+ 'мон',
+ 'الجزا',
+ 'عمان',
+ 'ایران',
+ 'امارات',
+ 'بازار',
+ 'پاکستا',
+ 'الاردن',
+ 'بھارت',
+ 'المغرب',
+ 'السعودية',
+ 'سودان',
+ 'مليسيا',
+ 'شبكة',
+ 'გე',
+ 'ไทย',
+ 'سورية',
+ 'рф',
+ 'تونس',
+ 'ã¿ã‚“ãª',
+ 'à¨à¨¾à¨°à¨¤',
+ '游æˆ',
+ 'مصر',
+ 'قطر',
+ 'இலஙà¯à®•à¯ˆ',
+ 'இநà¯à®¤à®¿à®¯à®¾',
+ 'æ–°åŠ å¡',
+ 'Ùلسطين',
+ 'テスト',
+ '政务',
+ 'xxx',
+ 'xyz',
+ 'yachts',
+ 'yandex',
+ 'ye',
+ 'yoga',
+ 'yokohama',
+ 'youtube',
+ 'yt',
+ 'za',
+ 'zip',
+ 'zm',
+ 'zone',
+ 'zw'
);
/**
@@ -478,15 +1194,15 @@ class Hostname extends AbstractValidator
$this->setValue($value);
// Check input against IP address schema
- if (preg_match('/^[0-9a-f:.]*$/i', $value) && $this->getIpValidator()
- ->setTranslator($this->getTranslator())
- ->isValid($value)) {
+ if (preg_match('/^[0-9a-f:.]*$/i', $value)
+ && $this->getIpValidator()->setTranslator($this->getTranslator())->isValid($value)
+ ) {
if (!($this->getAllow() & self::ALLOW_IP)) {
$this->error(self::IP_ADDRESS_NOT_ALLOWED);
return false;
- } else {
- return true;
}
+
+ return true;
}
// Local hostnames are allowed to be partial (ending '.')
@@ -504,26 +1220,27 @@ class Hostname extends AbstractValidator
$domainParts = explode('.', $value);
// Prevent partial IP V4 addresses (ending '.')
- if ((count($domainParts) == 4) && preg_match('/^[0-9.a-e:.]*$/i', $value) && $this->getIpValidator()
- ->setTranslator($this->getTranslator())
- ->isValid($value)) {
+ if (count($domainParts) == 4 && preg_match('/^[0-9.a-e:.]*$/i', $value)
+ && $this->getIpValidator()->setTranslator($this->getTranslator())->isValid($value)
+ ) {
$this->error(self::INVALID_LOCAL_NAME);
}
$utf8StrWrapper = StringUtils::getWrapper('UTF-8');
// Check input against DNS hostname schema
- if ((count($domainParts) > 1)
- && ($utf8StrWrapper->strlen($value) >= 4)
- && ($utf8StrWrapper->strlen($value) <= 254))
- {
+ if (count($domainParts) > 1
+ && $utf8StrWrapper->strlen($value) >= 4
+ && $utf8StrWrapper->strlen($value) <= 254
+ ) {
$status = false;
do {
// First check TLD
$matches = array();
- if (preg_match('/([^.]{2,10})$/iu', end($domainParts), $matches)
- || (array_key_exists(end($domainParts), $this->validIdns))) {
+ if (preg_match('/([^.]{2,63})$/iu', end($domainParts), $matches)
+ || (array_key_exists(end($domainParts), $this->validIdns))
+ ) {
reset($domainParts);
// Hostname characters are: *(label dot)(label dot label); max 254 chars
@@ -572,9 +1289,13 @@ class Hostname extends AbstractValidator
}
// Check dash (-) does not start, end or appear in 3rd and 4th positions
- if (($utf8StrWrapper->strpos($domainPart, '-') === 0)
- || (($utf8StrWrapper->strlen($domainPart) > 2) && ($utf8StrWrapper->strpos($domainPart, '-', 2) == 2) && ($utf8StrWrapper->strpos($domainPart, '-', 3) == 3))
- || ($utf8StrWrapper->strpos($domainPart, '-') === ($utf8StrWrapper->strlen($domainPart) - 1))) {
+ if ($utf8StrWrapper->strpos($domainPart, '-') === 0
+ || ($utf8StrWrapper->strlen($domainPart) > 2
+ && $utf8StrWrapper->strpos($domainPart, '-', 2) == 2
+ && $utf8StrWrapper->strpos($domainPart, '-', 3) == 3
+ )
+ || ($utf8StrWrapper->strpos($domainPart, '-') === ($utf8StrWrapper->strlen($domainPart) - 1))
+ ) {
$this->error(self::INVALID_DASH);
$status = false;
break 2;
@@ -583,13 +1304,12 @@ class Hostname extends AbstractValidator
// Check each domain part
$checked = false;
foreach ($regexChars as $regexKey => $regexChar) {
- ErrorHandler::start();
$status = preg_match($regexChar, $domainPart);
- ErrorHandler::stop();
if ($status > 0) {
$length = 63;
if (array_key_exists($this->tld, $this->idnLength)
- && (array_key_exists($regexKey, $this->idnLength[$this->tld]))) {
+ && array_key_exists($regexKey, $this->idnLength[$this->tld])
+ ) {
$length = $this->idnLength[$this->tld];
}
@@ -634,16 +1354,14 @@ class Hostname extends AbstractValidator
if ($this->getAllow() & self::ALLOW_URI) {
if (preg_match("/^([a-zA-Z0-9-._~!$&\'()*+,;=]|%[[:xdigit:]]{2}){1,254}$/i", $value)) {
return true;
- } else {
- $this->error(self::INVALID_URI);
}
+
+ $this->error(self::INVALID_URI);
}
// Check input against local network name schema; last chance to pass validation
- ErrorHandler::start();
$regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}[\x2e]{0,1}){1,254}$/';
$status = preg_match($regexLocal, $value);
- ErrorHandler::stop();
// If the input passes as a local network name, and local network names are allowed, then the
// hostname passes validation
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Biz.php b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Biz.php
index cadf8e3f7b0..fd755c7480d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Biz.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Biz.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Cn.php b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Cn.php
index 2a6418555f7..64f6af61aaf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Cn.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Cn.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Com.php b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Com.php
index a86e806c9ba..93f3834b60f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Com.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Com.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -169,8 +169,6 @@ return array(
68 => '/^[\x{A000}-\x{A48F}]{1,63}$/iu',
69 => '/^[\x{A490}-\x{A4CF}]{1,63}$/iu',
70 => '/^[\x{AC00}-\x{D7AF}]{1,63}$/iu',
- 71 => '/^[\x{D800}-\x{DB7F}]{1,63}$/iu',
- 72 => '/^[\x{DC00}-\x{DFFF}]{1,63}$/iu',
73 => '/^[\x{F900}-\x{FAFF}]{1,63}$/iu',
74 => '/^[\x{FB00}-\x{FB4F}]{1,63}$/iu',
75 => '/^[\x{FB50}-\x{FDFF}]{1,63}$/iu',
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Jp.php b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Jp.php
index f1cf75fb05a..e0d871e5eec 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Jp.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Jp.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Iban.php b/vendor/zendframework/zendframework/library/Zend/Validator/Iban.php
index 6a96f74c0d4..f6d542a1cd6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Iban.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Iban.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Identical.php b/vendor/zendframework/zendframework/library/Zend/Validator/Identical.php
index 25927163be0..cbd19158e8a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Identical.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Identical.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/InArray.php b/vendor/zendframework/zendframework/library/Zend/Validator/InArray.php
index 6c34210e691..f2ac33af30b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/InArray.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/InArray.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -182,13 +182,10 @@ class InArray extends AbstractValidator
$iterator = new RecursiveIteratorIterator(new RecursiveArrayIterator($haystack));
foreach ($iterator as $element) {
if (self::COMPARE_STRICT == $this->strict) {
-
if ($element === $value) {
return true;
}
-
} else {
-
// add protection to prevent string to int vuln's
$el = $element;
if (self::COMPARE_NOT_STRICT_AND_PREVENT_STR_TO_INT_VULNERABILITY == $this->strict
@@ -200,11 +197,9 @@ class InArray extends AbstractValidator
if ($el == $value) {
return true;
}
-
}
}
} else {
-
/**
* If the check is not strict, then, to prevent "asdf" being converted to 0
* and returning a false positive if 0 is in haystack, we type cast
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Ip.php b/vendor/zendframework/zendframework/library/Zend/Validator/Ip.php
index 10ecf5f92e0..aac20828256 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Ip.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Ip.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -97,15 +97,15 @@ class Ip extends AbstractValidator
*/
protected function validateIPv4($value)
{
- if (preg_match('/^([01]{8}.){3}[01]{8}$/i', $value)) {
+ if (preg_match('/^([01]{8}.){3}[01]{8}\z/i', $value)) {
// binary format 00000000.00000000.00000000.00000000
$value = bindec(substr($value, 0, 8)) . '.' . bindec(substr($value, 9, 8)) . '.'
. bindec(substr($value, 18, 8)) . '.' . bindec(substr($value, 27, 8));
- } elseif (preg_match('/^([0-9]{3}.){3}[0-9]{3}$/i', $value)) {
+ } elseif (preg_match('/^([0-9]{3}.){3}[0-9]{3}\z/i', $value)) {
// octet format 777.777.777.777
$value = (int) substr($value, 0, 3) . '.' . (int) substr($value, 4, 3) . '.'
. (int) substr($value, 8, 3) . '.' . (int) substr($value, 12, 3);
- } elseif (preg_match('/^([0-9a-f]{2}.){3}[0-9a-f]{2}$/i', $value)) {
+ } elseif (preg_match('/^([0-9a-f]{2}.){3}[0-9a-f]{2}\z/i', $value)) {
// hex format ff.ff.ff.ff
$value = hexdec(substr($value, 0, 2)) . '.' . hexdec(substr($value, 3, 2)) . '.'
. hexdec(substr($value, 6, 2)) . '.' . hexdec(substr($value, 9, 2));
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/IsInstanceOf.php b/vendor/zendframework/zendframework/library/Zend/Validator/IsInstanceOf.php
index 89219e50c41..d45fabdae99 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/IsInstanceOf.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/IsInstanceOf.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Validator;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Isbn.php b/vendor/zendframework/zendframework/library/Zend/Validator/Isbn.php
index 966153754a7..48ef5b10267 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Isbn.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Isbn.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/LessThan.php b/vendor/zendframework/zendframework/library/Zend/Validator/LessThan.php
index 7925fd8e1bf..0dbaee1a64f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/LessThan.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/LessThan.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/NotEmpty.php b/vendor/zendframework/zendframework/library/Zend/Validator/NotEmpty.php
index 07c9b4a3299..d7d1a8ce04b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/NotEmpty.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/NotEmpty.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -47,6 +47,21 @@ class NotEmpty extends AbstractValidator
self::ALL => 'all',
);
+ /**
+ * Default value for types; value = 493
+ *
+ * @var array
+ */
+ protected $defaultType = array(
+ self::OBJECT,
+ self::SPACE,
+ self::NULL,
+ self::EMPTY_ARRAY,
+ self::STRING,
+ self::FLOAT,
+ self::BOOLEAN
+ );
+
/**
* @var array
*/
@@ -60,9 +75,7 @@ class NotEmpty extends AbstractValidator
*
* @var array
*/
- protected $options = array(
- 'type' => 493, // Internal type to detect
- );
+ protected $options = array();
/**
* Constructor
@@ -71,6 +84,8 @@ class NotEmpty extends AbstractValidator
*/
public function __construct($options = null)
{
+ $this->setType($this->defaultType);
+
if ($options instanceof Traversable) {
$options = ArrayUtils::iteratorToArray($options);
}
@@ -116,13 +131,18 @@ class NotEmpty extends AbstractValidator
}
/**
- * Set the types
- *
- * @param int|array $type
- * @throws Exception\InvalidArgumentException
- * @return NotEmpty
+ * @return int
*/
- public function setType($type = null)
+ public function getDefaultType()
+ {
+ return $this->calculateTypeValue($this->defaultType);
+ }
+
+ /**
+ * @param array|int|string $type
+ * @return int
+ */
+ protected function calculateTypeValue($type)
{
if (is_array($type)) {
$detected = 0;
@@ -139,11 +159,26 @@ class NotEmpty extends AbstractValidator
$type = array_search($type, $this->constants);
}
+ return $type;
+ }
+
+ /**
+ * Set the types
+ *
+ * @param int|array $type
+ * @throws Exception\InvalidArgumentException
+ * @return NotEmpty
+ */
+ public function setType($type = null)
+ {
+ $type = $this->calculateTypeValue($type);
+
if (!is_int($type) || ($type < 0) || ($type > self::ALL)) {
throw new Exception\InvalidArgumentException('Unknown type');
}
$this->options['type'] = $type;
+
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Regex.php b/vendor/zendframework/zendframework/library/Zend/Validator/Regex.php
index af14aac65ec..b8dfb2fa252 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Regex.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Regex.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -98,7 +98,11 @@ class Regex extends AbstractValidator
$error = ErrorHandler::stop();
if (false === $status) {
- throw new Exception\InvalidArgumentException("Internal error parsing the pattern '{$this->pattern}'", 0, $error);
+ throw new Exception\InvalidArgumentException(
+ "Internal error parsing the pattern '{$this->pattern}'",
+ 0,
+ $error
+ );
}
return $this;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Changefreq.php b/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Changefreq.php
index a959b023d31..090d8042e19 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Changefreq.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Changefreq.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Lastmod.php b/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Lastmod.php
index ace679fdc25..49293ab729c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Lastmod.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Lastmod.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Loc.php b/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Loc.php
index 481b286e99c..54919178233 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Loc.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Loc.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Priority.php b/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Priority.php
index d5313f37467..ea536934b5e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Priority.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Priority.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/StaticValidator.php b/vendor/zendframework/zendframework/library/Zend/Validator/StaticValidator.php
index 84eca563539..dea88364cd8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/StaticValidator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/StaticValidator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Step.php b/vendor/zendframework/zendframework/library/Zend/Validator/Step.php
index 8b82bfd4551..84a2b252d64 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Step.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Step.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/StringLength.php b/vendor/zendframework/zendframework/library/Zend/Validator/StringLength.php
index 53a162c6c1b..1e0b9bcb66c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/StringLength.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/StringLength.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -87,8 +87,9 @@ class StringLength extends AbstractValidator
public function setMin($min)
{
if (null !== $this->getMax() && $min > $this->getMax()) {
- throw new Exception\InvalidArgumentException("The minimum must be less than or equal to the maximum length, but $min >"
- . " " . $this->getMax());
+ throw new Exception\InvalidArgumentException(
+ "The minimum must be less than or equal to the maximum length, but $min >" . " " . $this->getMax()
+ );
}
$this->options['min'] = max(0, (int) $min);
@@ -117,8 +118,9 @@ class StringLength extends AbstractValidator
if (null === $max) {
$this->options['max'] = null;
} elseif ($max < $this->getMin()) {
- throw new Exception\InvalidArgumentException("The maximum must be greater than or equal to the minimum length, but "
- . "$max < " . $this->getMin());
+ throw new Exception\InvalidArgumentException(
+ "The maximum must be greater than or equal to the minimum length, but $max < " . $this->getMin()
+ );
} else {
$this->options['max'] = (int) $max;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorAwareInterface.php
index a9fb45d3b5e..fd0af1fd3ce 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*;
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorInterface.php
index 01981d378fa..3439e91a53a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Uri.php b/vendor/zendframework/zendframework/library/Zend/Validator/Uri.php
index 6bd3e7c92cb..a6e5eab2bd0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Uri.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Uri.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorChain.php b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorChain.php
index f52adf14e38..a3b8c5b8440 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorChain.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorChain.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -146,6 +146,14 @@ class ValidatorChain implements
*/
public function attachByName($name, $options = array(), $breakChainOnFailure = false)
{
+ if (isset($options['break_chain_on_failure'])) {
+ $breakChainOnFailure = (bool) $options['break_chain_on_failure'];
+ }
+
+ if (isset($options['breakchainonfailure'])) {
+ $breakChainOnFailure = (bool) $options['breakchainonfailure'];
+ }
+
$validator = $this->plugin($name, $options);
$this->attach($validator, $breakChainOnFailure);
return $this;
@@ -259,7 +267,7 @@ class ValidatorChain implements
*
* Plugin manager (property 'plugins') cannot
* be serialized. On wakeup the property remains unset
- * and next invokation to getPluginManager() sets
+ * and next invocation to getPluginManager() sets
* the default plugin manager instance (ValidatorPluginManager).
*
* @return array
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorInterface.php
index d48aa15863f..6424ef7a632 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php
index bf328ae0613..e16a76377cc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -51,6 +51,7 @@ class ValidatorPluginManager extends AbstractPluginManager
'barcodeupce' => 'Zend\Validator\Barcode\Upce',
'barcode' => 'Zend\Validator\Barcode',
'between' => 'Zend\Validator\Between',
+ 'bitwise' => 'Zend\Validator\Bitwise',
'callback' => 'Zend\Validator\Callback',
'creditcard' => 'Zend\Validator\CreditCard',
'csrf' => 'Zend\Validator\Csrf',
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php
index 4d9c8d09703..b5436b82b43 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/composer.json b/vendor/zendframework/zendframework/library/Zend/Validator/composer.json
index 920f26624ad..2e99da136cb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/composer.json
@@ -6,6 +6,7 @@
"zf2",
"validator"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Validator\\": ""
@@ -13,14 +14,17 @@
},
"target-dir": "Zend/Validator",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-stdlib": "self.version"
},
"require-dev": {
+ "zendframework/zend-db": "self.version",
"zendframework/zend-filter": "self.version",
"zendframework/zend-i18n": "self.version",
"zendframework/zend-math": "self.version",
- "zendframework/zend-servicemanager": "self.version"
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-session": "self.version",
+ "zendframework/zend-uri": "self.version"
},
"suggest": {
"zendframework/zend-db": "Zend\\Db component",
@@ -29,12 +33,13 @@
"zendframework/zend-math": "Zend\\Math component",
"zendframework/zend-resources": "Translations of validator messages",
"zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
+ "zendframework/zend-session": "Zend\\Session component",
"zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Version/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/Version/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Version/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/Version/Version.php b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
index d2c502dd197..7b27667e163 100644
--- a/vendor/zendframework/zendframework/library/Zend/Version/Version.php
+++ b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
@@ -3,12 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Version;
+use Zend\Http;
use Zend\Json\Json;
/**
@@ -19,7 +20,7 @@ final class Version
/**
* Zend Framework version identification - see compareVersion()
*/
- const VERSION = '2.2.9';
+ const VERSION = '2.3.4';
/**
* Github Service Identifier for version information is retrieved from
@@ -52,6 +53,7 @@ final class Version
{
$version = strtolower($version);
$version = preg_replace('/(\d)pr(\d?)/', '$1a$2', $version);
+
return version_compare($version, strtolower(self::VERSION));
}
@@ -67,51 +69,158 @@ final class Version
* the array to a single value, comparing the version numbers with
* version_compare().
*
- * @see http://developer.github.com/v3/git/refs/#get-all-references
- * @link https://api.github.com/repos/zendframework/zf2/git/refs/tags/release-
- * @link http://framework.zend.com/api/zf-version?v=2
- * @param string $service Version Service with which to retrieve the version
+ * @see http://developer.github.com/v3/git/refs/#get-all-references
+ * @link https://api.github.com/repos/zendframework/zf2/git/refs/tags/release-
+ * @link http://framework.zend.com/api/zf-version?v=2
+ * @param string $service Version service with which to retrieve the version
+ * @param Http\Client $httpClient HTTP client with which to retrieve the version
* @return string
*/
- public static function getLatest($service = self::VERSION_SERVICE_ZEND)
+ public static function getLatest($service = self::VERSION_SERVICE_ZEND, Http\Client $httpClient = null)
{
- if (null === static::$latestVersion) {
- static::$latestVersion = 'not available';
- if ($service == self::VERSION_SERVICE_GITHUB) {
- $url = 'https://api.github.com/repos/zendframework/zf2/git/refs/tags/release-';
-
- $apiResponse = Json::decode(file_get_contents($url), Json::TYPE_ARRAY);
-
- // Simplify the API response into a simple array of version numbers
- $tags = array_map(function ($tag) {
- return substr($tag['ref'], 18); // Reliable because we're filtering on 'refs/tags/release-'
- }, $apiResponse);
-
- // Fetch the latest version number from the array
- static::$latestVersion = array_reduce($tags, function ($a, $b) {
- return version_compare($a, $b, '>') ? $a : $b;
- });
- } elseif ($service == self::VERSION_SERVICE_ZEND) {
- $handle = fopen('http://framework.zend.com/api/zf-version?v=2', 'r');
- if (false !== $handle) {
- static::$latestVersion = stream_get_contents($handle);
- fclose($handle);
- }
- }
+ if (null !== self::$latestVersion) {
+ return self::$latestVersion;
+ }
+
+ self::$latestVersion = 'not available';
+
+ if (null === $httpClient && !ini_get('allow_url_fopen')) {
+ trigger_error(
+ sprintf(
+ 'allow_url_fopen is not set, and no Zend\Http\Client ' .
+ 'was passed. You must either set allow_url_fopen in ' .
+ 'your PHP configuration or pass a configured ' .
+ 'Zend\Http\Client as the second argument to %s.',
+ __METHOD__
+ ),
+ E_USER_WARNING
+ );
+
+ return self::$latestVersion;
}
- return static::$latestVersion;
+ $response = false;
+ if ($service === self::VERSION_SERVICE_GITHUB) {
+ $response = self::getLatestFromGithub($httpClient);
+ } elseif ($service === self::VERSION_SERVICE_ZEND) {
+ $response = self::getLatestFromZend($httpClient);
+ } else {
+ trigger_error(
+ sprintf(
+ 'Unknown version service: %s',
+ $service
+ ),
+ E_USER_WARNING
+ );
+ }
+
+ if ($response) {
+ self::$latestVersion = $response;
+ }
+
+ return self::$latestVersion;
}
/**
* Returns true if the running version of Zend Framework is
* the latest (or newer??) than the latest tag on GitHub,
- * which is returned by static::getLatest().
+ * which is returned by self::getLatest().
*
* @return bool
*/
public static function isLatest()
{
- return static::compareVersion(static::getLatest()) < 1;
+ return self::compareVersion(self::getLatest()) < 1;
+ }
+
+ /**
+ * Get the API response to a call from a configured HTTP client
+ *
+ * @param Http\Client $httpClient Configured HTTP client
+ * @return string|false API response or false on error
+ */
+ protected static function getApiResponse(Http\Client $httpClient)
+ {
+ try {
+ $response = $httpClient->send();
+ } catch (Http\Exception\RuntimeException $e) {
+ return false;
+ }
+
+ if (!$response->isSuccess()) {
+ return false;
+ }
+
+ return $response->getBody();
+ }
+
+ /**
+ * Get the latest version from Github
+ *
+ * @param Http\Client $httpClient Configured HTTP client
+ * @return string|null API response or false on error
+ */
+ protected static function getLatestFromGithub(Http\Client $httpClient = null)
+ {
+ $url = 'https://api.github.com/repos/zendframework/zf2/git/refs/tags/release-';
+
+ if ($httpClient === null) {
+ $context = stream_context_create(
+ array(
+ 'http' => array(
+ 'user_agent' => sprintf('Zend-Version/%s', self::VERSION),
+ ),
+ )
+ );
+ $apiResponse = file_get_contents($url, false, $context);
+ } else {
+ $request = new Http\Request();
+ $request->setUri($url);
+ $httpClient->setRequest($request);
+ $apiResponse = self::getApiResponse($httpClient);
+ }
+
+ if (!$apiResponse) {
+ return false;
+ }
+
+ $decodedResponse = Json::decode($apiResponse, Json::TYPE_ARRAY);
+
+ // Simplify the API response into a simple array of version numbers
+ $tags = array_map(function ($tag) {
+ return substr($tag['ref'], 18); // Reliable because we're
+ // filtering on 'refs/tags/release-'
+ }, $decodedResponse);
+
+ // Fetch the latest version number from the array
+ return array_reduce($tags, function ($a, $b) {
+ return version_compare($a, $b, '>') ? $a : $b;
+ });
+ }
+
+ /**
+ * Get the latest version from framework.zend.com
+ *
+ * @param Http\Client $httpClient Configured HTTP client
+ * @return string|null API response or false on error
+ */
+ protected static function getLatestFromZend(Http\Client $httpClient = null)
+ {
+ $url = 'http://framework.zend.com/api/zf-version?v=2';
+
+ if ($httpClient === null) {
+ $apiResponse = file_get_contents($url);
+ } else {
+ $request = new Http\Request();
+ $request->setUri($url);
+ $httpClient->setRequest($request);
+ $apiResponse = self::getApiResponse($httpClient);
+ }
+
+ if (!$apiResponse) {
+ return false;
+ }
+
+ return $apiResponse;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Version/composer.json b/vendor/zendframework/zendframework/library/Zend/Version/composer.json
index 52a09a7ee1f..b3fd61e6fd1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Version/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Version/composer.json
@@ -6,6 +6,7 @@
"zf2",
"version"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\Version\\": ""
@@ -13,15 +14,19 @@
},
"target-dir": "Zend/Version",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.23",
+ "zendframework/zend-json": "self.version"
+ },
+ "suggest": {
+ "zendframework/zend-http": "Allows use of Zend\\Http\\Client to check version information"
},
"suggest": {
"zendframework/zend-json": "To check latest version hosted in GitHub"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/View/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/View/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/BadMethodCallException.php
index 241fa9cf050..8d3e7b1e08d 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,6 @@ namespace Zend\View\Exception;
/**
* Bad method call exception
*/
-class BadMethodCallException
- extends \BadMethodCallException
- implements ExceptionInterface
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/DomainException.php
index d6e0a2dbfc0..b485db6169a 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Exception/DomainException.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Exception/DomainException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,6 @@ namespace Zend\View\Exception;
/**
* Domain exception
*/
-class DomainException
- extends \DomainException
- implements ExceptionInterface
+class DomainException extends \DomainException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/ExceptionInterface.php
index 478a8834f75..469e0f48e25 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Exception/ExceptionInterface.php
@@ -3,11 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Exception;
interface ExceptionInterface
-{}
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/InvalidArgumentException.php
index c926f3d78a4..dd4dbe2b5f1 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,6 @@ namespace Zend\View\Exception;
/**
* Invalid argument exception
*/
-class InvalidArgumentException
- extends \InvalidArgumentException
- implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Exception/InvalidHelperException.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/InvalidHelperException.php
index 94f6f0740fc..49b39232942 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Exception/InvalidHelperException.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Exception/InvalidHelperException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,6 @@ namespace Zend\View\Exception;
/**
* Invalid helper exception
*/
-class InvalidHelperException
- extends \Exception
- implements ExceptionInterface
+class InvalidHelperException extends \Exception implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/RuntimeException.php
index 5abd7fc8be6..efb80bcb9f7 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,8 +12,6 @@ namespace Zend\View\Exception;
/**
* Runtime exception
*/
-class RuntimeException
- extends \RuntimeException
- implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
{
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/UnexpectedValueException.php
new file mode 100644
index 00000000000..b6d04736273
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/View/Exception/UnexpectedValueException.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\View\Exception;
+
+/**
+ * Unexpected value exception
+ */
+class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
+{
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHelper.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHelper.php
index 18ea1a9701e..ba7fe25150f 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHelper.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php
index 9da54a841cf..3cf73e9ff40 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/BasePath.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/BasePath.php
index ddca8c71a75..d71a34534ca 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/BasePath.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/BasePath.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php
index 01dc7c9424f..992f9f3408d 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Cycle.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -54,7 +54,7 @@ class Cycle extends AbstractHelper implements Iterator
public function __invoke(array $data = array(), $name = self::DEFAULT_NAME)
{
if (!empty($data)) {
- $this->data[$name] = $data;
+ $this->data[$name] = $data;
}
$this->setName($name);
@@ -88,7 +88,7 @@ class Cycle extends AbstractHelper implements Iterator
* @param string $name
* @return Cycle
*/
- public function assign(Array $data , $name = self::DEFAULT_NAME)
+ public function assign(array $data, $name = self::DEFAULT_NAME)
{
$this->setName($name);
$this->data[$name] = $data;
@@ -104,17 +104,17 @@ class Cycle extends AbstractHelper implements Iterator
*/
public function setName($name = self::DEFAULT_NAME)
{
- $this->name = $name;
+ $this->name = $name;
- if (!isset($this->data[$this->name])) {
- $this->data[$this->name] = array();
- }
+ if (!isset($this->data[$this->name])) {
+ $this->data[$this->name] = array();
+ }
- if (!isset($this->pointers[$this->name])) {
- $this->rewind();
- }
+ if (!isset($this->pointers[$this->name])) {
+ $this->rewind();
+ }
- return $this;
+ return $this;
}
/**
@@ -127,7 +127,6 @@ class Cycle extends AbstractHelper implements Iterator
return $this->name;
}
-
/**
* Return all elements
*
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/DeclareVars.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/DeclareVars.php
index 229b86e62b6..4be8129dd21 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/DeclareVars.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/DeclareVars.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -24,7 +24,7 @@ class DeclareVars extends AbstractHelper
/**
* Declare template vars to set default values and avoid notices when using strictVars
*
- * Primarily for use when using {@link Zend_View_Abstract::strictVars() Zend_View strictVars()},
+ * Primarily for use when using {@link Zend\View\Variables::setStrictVars()},
* this helper can be used to declare template variables that may or may
* not already be set in the view object, as well as to set default values.
* Arrays passed as arguments to the method will be used to set default
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Doctype.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Doctype.php
index f270756b90e..814fcb186f8 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Doctype.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Doctype.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeCss.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeCss.php
index 0d3b0ecb609..86b5d6cb7b0 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeCss.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeCss.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-
/**
* Helper for escaping values
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtml.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtml.php
index f9ff85f8f09..9bcf1ecffae 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtml.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtml.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-
/**
* Helper for escaping values
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtmlAttr.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtmlAttr.php
index 7b39c7bd5fb..5ed9fe512f2 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtmlAttr.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeHtmlAttr.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-
/**
* Helper for escaping values
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeJs.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeJs.php
index 27d93bb64bf..1ccc0398353 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeJs.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeJs.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-
/**
* Helper for escaping values
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeUrl.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeUrl.php
index bca30e9184c..9b9ae0382ac 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeUrl.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/EscapeUrl.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-
/**
* Helper for escaping values
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Escaper/AbstractHelper.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Escaper/AbstractHelper.php
index 373e7ea9b94..7dc8aa71805 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Escaper/AbstractHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Escaper/AbstractHelper.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -39,9 +39,11 @@ abstract class AbstractHelper extends Helper\AbstractHelper
* Invoke this helper: escape a value
*
* @param mixed $value
- * @param int $recurse Expects one of the recursion constants; used to decide whether or not to recurse the given value when escaping
+ * @param int $recurse Expects one of the recursion constants;
+ * used to decide whether or not to recurse the given value when escaping
* @throws Exception\InvalidArgumentException
- * @return mixed Given a scalar, a scalar value is returned. Given an object, with the $recurse flag not allowing object recursion, returns a string. Otherwise, returns an array.
+ * @return mixed Given a scalar, a scalar value is returned. Given an object, with the $recurse flag not
+ * allowing object recursion, returns a string. Otherwise, returns an array.
*/
public function __invoke($value, $recurse = self::RECURSE_NONE)
{
@@ -100,7 +102,7 @@ abstract class AbstractHelper extends Helper\AbstractHelper
if (null !== $this->escaper) {
throw new Exception\InvalidArgumentException(
'Character encoding settings cannot be changed once the Helper has been used or '
- . ' if a Zend\Escaper\Escaper object (with preset encoding option) is set.'
+ . ' if a Zend\Escaper\Escaper object (with preset encoding option) is set.'
);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/FlashMessenger.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/FlashMessenger.php
index 0a4010e6be1..102de9147f0 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/FlashMessenger.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/FlashMessenger.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -29,6 +29,7 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
PluginFlashMessenger::NAMESPACE_ERROR => 'error',
PluginFlashMessenger::NAMESPACE_SUCCESS => 'success',
PluginFlashMessenger::NAMESPACE_DEFAULT => 'default',
+ PluginFlashMessenger::NAMESPACE_WARNING => 'warning',
);
/**
@@ -101,11 +102,35 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
{
$flashMessenger = $this->getPluginFlashMessenger();
$messages = $flashMessenger->getMessagesFromNamespace($namespace);
+ return $this->renderMessages($namespace, $messages, $classes);
+ }
- if (empty($messages)) {
- return '';
- }
+ /**
+ * Render Current Messages
+ *
+ * @param string $namespace
+ * @param array $classes
+ * @return string
+ */
+ public function renderCurrent($namespace = PluginFlashMessenger::NAMESPACE_DEFAULT, array $classes = array())
+ {
+ $flashMessenger = $this->getPluginFlashMessenger();
+ $messages = $flashMessenger->getCurrentMessagesFromNamespace($namespace);
+ return $this->renderMessages($namespace, $messages, $classes);
+ }
+ /**
+ * Render Messages
+ *
+ * @param array $messages
+ * @param array $classes
+ * @return string
+ */
+ protected function renderMessages(
+ $namespace = PluginFlashMessenger::NAMESPACE_DEFAULT,
+ array $messages = array(),
+ array $classes = array()
+ ) {
// Prepare classes for opening tag
if (empty($classes)) {
if (isset($this->classMessages[$namespace])) {
@@ -115,33 +140,33 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
}
$classes = array($classes);
}
-
// Flatten message array
$escapeHtml = $this->getEscapeHtmlHelper();
$messagesToPrint = array();
-
$translator = $this->getTranslator();
$translatorTextDomain = $this->getTranslatorTextDomain();
-
- array_walk_recursive($messages, function ($item) use (&$messagesToPrint, $escapeHtml, $translator, $translatorTextDomain) {
- if ($translator !== null) {
- $item = $translator->translate(
- $item,
- $translatorTextDomain
- );
+ array_walk_recursive(
+ $messages,
+ function ($item) use (&$messagesToPrint, $escapeHtml, $translator, $translatorTextDomain) {
+ if ($translator !== null) {
+ $item = $translator->translate(
+ $item,
+ $translatorTextDomain
+ );
+ }
+ $messagesToPrint[] = $escapeHtml($item);
}
- $messagesToPrint[] = $escapeHtml($item);
- });
-
+ );
if (empty($messagesToPrint)) {
return '';
}
-
// Generate markup
$markup = sprintf($this->getMessageOpenFormat(), ' class="' . implode(' ', $classes) . '"');
- $markup .= implode(sprintf($this->getMessageSeparatorString(), ' class="' . implode(' ', $classes) . '"'), $messagesToPrint);
+ $markup .= implode(
+ sprintf($this->getMessageSeparatorString(), ' class="' . implode(' ', $classes) . '"'),
+ $messagesToPrint
+ );
$markup .= $this->getMessageCloseString();
-
return $markup;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php
index 48cfb2064f4..a748cf19f2c 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -343,7 +343,7 @@ class Gravatar extends AbstractHtmlElement
/**
* Set src attrib for image.
*
- * You shouldn't set a own url value!
+ * You shouldn't set an own url value!
* It sets value, uses protected method getAvatarUrl.
*
* If already exists, it will be overwritten.
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php
index 5871140d7d1..4e78dcbad95 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -19,23 +19,35 @@ use Zend\View\Exception;
* @see http://www.w3.org/TR/xhtml1/dtds.html
*
* Creates the following virtual methods:
- * @method HeadLink appendStylesheet($href, $media, $conditionalStylesheet, $extras)
- * @method HeadLink offsetSetStylesheet($index, $href, $media, $conditionalStylesheet, $extras)
- * @method HeadLink prependStylesheet($href, $media, $conditionalStylesheet, $extras)
- * @method HeadLink setStylesheet($href, $media, $conditionalStylesheet, $extras)
- * @method HeadLink appendAlternate($href, $type, $title, $extras)
- * @method HeadLink offsetSetAlternate($index, $href, $type, $title, $extras)
- * @method HeadLink prependAlternate($href, $type, $title, $extras)
- * @method HeadLink setAlternate($href, $type, $title, $extras)
+ * @method HeadLink appendStylesheet($href, $media = 'screen', $conditionalStylesheet = '', $extras = array())
+ * @method HeadLink offsetSetStylesheet($index, $href, $media = 'screen', $conditionalStylesheet = '', $extras = array())
+ * @method HeadLink prependStylesheet($href, $media = 'screen', $conditionalStylesheet = '', $extras = array())
+ * @method HeadLink setStylesheet($href, $media = 'screen', $conditionalStylesheet = '', $extras = array())
+ * @method HeadLink appendAlternate($href, $type, $title, $extras = array())
+ * @method HeadLink offsetSetAlternate($index, $href, $type, $title, $extras = array())
+ * @method HeadLink prependAlternate($href, $type, $title, $extras = array())
+ * @method HeadLink setAlternate($href, $type, $title, $extras = array())
*/
class HeadLink extends Placeholder\Container\AbstractStandalone
{
/**
* Allowed attributes
*
- * @var array
+ * @var string[]
*/
- protected $itemKeys = array('charset', 'href', 'hreflang', 'id', 'media', 'rel', 'rev', 'type', 'title', 'extras');
+ protected $itemKeys = array(
+ 'charset',
+ 'href',
+ 'hreflang',
+ 'id',
+ 'media',
+ 'rel',
+ 'rev',
+ 'sizes',
+ 'type',
+ 'title',
+ 'extras'
+ );
/**
* Registry key for placeholder
@@ -144,10 +156,9 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
}
if (1 > $argc) {
- throw new Exception\BadMethodCallException(sprintf(
- '%s requires at least one argument',
- $method
- ));
+ throw new Exception\BadMethodCallException(
+ sprintf('%s requires at least one argument', $method)
+ );
}
if (is_array($args[0])) {
@@ -266,7 +277,6 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
return $this->getContainer()->set($value);
}
-
/**
* Create HTML link element from data item
*
@@ -285,7 +295,11 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
$link .= sprintf(' %s="%s"', $key, ($this->autoEscape) ? $this->escape($value) : $value);
}
} else {
- $link .= sprintf(' %s="%s"', $itemKey, ($this->autoEscape) ? $this->escape($attributes[$itemKey]) : $attributes[$itemKey]);
+ $link .= sprintf(
+ ' %s="%s"',
+ $itemKey,
+ ($this->autoEscape) ? $this->escape($attributes[$itemKey]) : $attributes[$itemKey]
+ );
}
}
}
@@ -302,9 +316,13 @@ class HeadLink extends Placeholder\Container\AbstractStandalone
if (isset($attributes['conditionalStylesheet'])
&& !empty($attributes['conditionalStylesheet'])
- && is_string($attributes['conditionalStylesheet']))
- {
- $link = '<!--[if ' . $attributes['conditionalStylesheet'] . ']> ' . $link . '<![endif]-->';
+ && is_string($attributes['conditionalStylesheet'])
+ ) {
+ // inner wrap with comment end and start if !IE
+ if (str_replace(' ', '', $attributes['conditionalStylesheet']) === '!IE') {
+ $link = '<!-->' . $link . '<!--';
+ }
+ $link = '<!--[if ' . $attributes['conditionalStylesheet'] . ']>' . $link . '<![endif]-->';
}
return $link;
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
index eae1c68b11a..23560effdeb 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -85,8 +85,13 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
* @param string $placement
* @return HeadMeta
*/
- public function __invoke($content = null, $keyValue = null, $keyType = 'name', $modifiers = array(), $placement = Placeholder\Container\AbstractContainer::APPEND)
- {
+ public function __invoke(
+ $content = null,
+ $keyValue = null,
+ $keyType = 'name',
+ $modifiers = array(),
+ $placement = Placeholder\Container\AbstractContainer::APPEND
+ ) {
if ((null !== $content) && (null !== $keyValue)) {
$item = $this->createData($keyType, $keyValue, $content, $modifiers);
$action = strtolower($placement);
@@ -115,11 +120,7 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
*/
public function __call($method, $args)
{
- if (preg_match(
- '/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv|Property|Itemprop)$/',
- $method,
- $matches)
- ) {
+ if (preg_match('/^(?P<action>set|(pre|ap)pend|offsetSet)(?P<type>Name|HttpEquiv|Property|Itemprop)$/', $method, $matches)) {
$action = $matches['action'];
$type = $this->normalizeType($matches['type']);
$argc = count($args);
@@ -267,8 +268,12 @@ class HeadMeta extends Placeholder\Container\AbstractStandalone
if (isset($item->modifiers['conditional'])
&& !empty($item->modifiers['conditional'])
- && is_string($item->modifiers['conditional']))
- {
+ && is_string($item->modifiers['conditional'])
+ ) {
+ // inner wrap with comment end and start if !IE
+ if (str_replace(' ', '', $item->modifiers['conditional']) === '!IE') {
+ $meta = '<!-->' . $meta . '<!--';
+ }
$meta = '<!--[if ' . $this->escape($item->modifiers['conditional']) . ']>' . $meta . '<![endif]-->';
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php
index 60347e6c334..f250f3fc757 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -83,7 +83,13 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
*
* @var array
*/
- protected $optionalAttributes = array('charset', 'defer', 'language', 'src');
+ protected $optionalAttributes = array(
+ 'charset',
+ 'crossorigin',
+ 'defer',
+ 'language',
+ 'src',
+ );
/**
* Required attributes for script tag
@@ -125,8 +131,13 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
* @param string $type Script type and/or array of script attributes
* @return HeadScript
*/
- public function __invoke($mode = self::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
- {
+ public function __invoke(
+ $mode = self::FILE,
+ $spec = null,
+ $placement = 'APPEND',
+ array $attrs = array(),
+ $type = 'text/javascript'
+ ) {
if ((null !== $spec) && is_string($spec)) {
$action = ucfirst(strtolower($mode));
$placement = strtolower($placement);
@@ -260,8 +271,11 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
* @throws Exception\RuntimeException
* @return void
*/
- public function captureStart($captureType = Placeholder\Container\AbstractContainer::APPEND, $type = 'text/javascript', $attrs = array())
- {
+ public function captureStart(
+ $captureType = Placeholder\Container\AbstractContainer::APPEND,
+ $type = 'text/javascript',
+ $attrs = array()
+ ) {
if ($this->captureLock) {
throw new Exception\RuntimeException('Cannot nest headScript captures');
}
@@ -330,8 +344,8 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
foreach ($this->getContainer() as $item) {
if (($item->source === null)
&& array_key_exists('src', $item->attributes)
- && ($file == $item->attributes['src']))
- {
+ && ($file == $item->attributes['src'])
+ ) {
return true;
}
}
@@ -349,8 +363,9 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
{
if ((!$value instanceof stdClass)
|| !isset($value->type)
- || (!isset($value->source) && !isset($value->attributes)))
- {
+ || (!isset($value->source)
+ && !isset($value->attributes))
+ ) {
return false;
}
@@ -372,8 +387,7 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
if (!empty($item->attributes)) {
foreach ($item->attributes as $key => $value) {
if ((!$this->arbitraryAttributesAllowed() && !in_array($key, $this->optionalAttributes))
- || in_array($key, array('conditional', 'noescape')))
- {
+ || in_array($key, array('conditional', 'noescape'))) {
continue;
}
if ('defer' == $key) {
@@ -383,10 +397,11 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
}
}
- $addScriptEscape = !(isset($item->attributes['noescape']) && filter_var($item->attributes['noescape'], FILTER_VALIDATE_BOOLEAN));
+ $addScriptEscape = !(isset($item->attributes['noescape'])
+ && filter_var($item->attributes['noescape'], FILTER_VALIDATE_BOOLEAN));
$type = ($this->autoEscape) ? $this->escape($item->type) : $item->type;
- $html = '<script type="' . $type . '"' . $attrString . '>';
+ $html = '<script type="' . $type . '"' . $attrString . '>';
if (!empty($item->source)) {
$html .= PHP_EOL;
@@ -406,8 +421,12 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
if (isset($item->attributes['conditional'])
&& !empty($item->attributes['conditional'])
- && is_string($item->attributes['conditional']))
- {
+ && is_string($item->attributes['conditional'])
+ ) {
+ // inner wrap with comment end and start if !IE
+ if (str_replace(' ', '', $item->attributes['conditional']) === '!IE') {
+ $html = '<!-->' . $html . '<!--';
+ }
$html = $indent . '<!--[if ' . $item->attributes['conditional'] . ']>' . $html . '<![endif]-->';
} else {
$html = $indent . $html;
@@ -427,7 +446,8 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
{
if (!$this->isValid($value)) {
throw new Exception\InvalidArgumentException(
- 'Invalid argument passed to append(); please use one of the helper methods, appendScript() or appendFile()'
+ 'Invalid argument passed to append(); '
+ . 'please use one of the helper methods, appendScript() or appendFile()'
);
}
@@ -445,7 +465,8 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
{
if (!$this->isValid($value)) {
throw new Exception\InvalidArgumentException(
- 'Invalid argument passed to prepend(); please use one of the helper methods, prependScript() or prependFile()'
+ 'Invalid argument passed to prepend(); '
+ . 'please use one of the helper methods, prependScript() or prependFile()'
);
}
@@ -482,7 +503,8 @@ class HeadScript extends Placeholder\Container\AbstractStandalone
{
if (!$this->isValid($value)) {
throw new Exception\InvalidArgumentException(
- 'Invalid argument passed to offsetSet(); please use one of the helper methods, offsetSetScript() or offsetSetFile()'
+ 'Invalid argument passed to offsetSet(); '
+ . 'please use one of the helper methods, offsetSetScript() or offsetSetFile()'
);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php
index d52ff66ae3c..6e90d4a63d8 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -264,10 +264,7 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
*/
protected function isValid($value)
{
- if ((!$value instanceof stdClass)
- || !isset($value->content)
- || !isset($value->attributes))
- {
+ if ((!$value instanceof stdClass) || !isset($value->content) || !isset($value->attributes)) {
return false;
}
@@ -333,7 +330,11 @@ class HeadStyle extends Placeholder\Container\AbstractStandalone
. '</style>';
if (null == $escapeStart && null == $escapeEnd) {
- $html = '<!--[if ' . $item->attributes['conditional'] . ']> ' . $html . '<![endif]-->';
+ // inner wrap with comment end and start if !IE
+ if (str_replace(' ', '', $item->attributes['conditional']) === '!IE') {
+ $html = '<!-->' . $html . '<!--';
+ }
+ $html = '<!--[if ' . $item->attributes['conditional'] . ']>' . $html . '<![endif]-->';
}
return $html;
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadTitle.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadTitle.php
index 0a349796f9e..dfcf17a842a 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadTitle.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadTitle.php
@@ -3,13 +3,13 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface as Translator;
use Zend\I18n\Translator\TranslatorAwareInterface;
use Zend\View\Exception;
@@ -111,9 +111,7 @@ class HeadTitle extends Placeholder\Container\AbstractStandalone implements
if (null !== ($translator = $this->getTranslator())) {
foreach ($this as $item) {
- $items[] = $translator->translate(
- $item, $this->getTranslatorTextDomain()
- );
+ $items[] = $translator->translate($item, $this->getTranslatorTextDomain());
}
} else {
foreach ($this as $item) {
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HelperInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HelperInterface.php
index b41031050a0..a3deba701a3 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HelperInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HelperInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -27,5 +27,4 @@ interface HelperInterface
* @return Renderer
*/
public function getView();
-
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlFlash.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlFlash.php
index 7b0aafca30c..dc948d1052a 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlFlash.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlFlash.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlList.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlList.php
index 29c79c73c13..318e6c07235 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlList.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlList.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlObject.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlObject.php
index 17c2822f35c..ea4d2dcdfdc 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlObject.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -24,10 +24,18 @@ class HtmlObject extends AbstractHtmlElement
* @throws InvalidArgumentException
* @return string
*/
- public function __invoke($data = null, $type = null, array $attribs = array(), array $params = array(), $content = null)
- {
+ public function __invoke(
+ $data = null,
+ $type = null,
+ array $attribs = array(),
+ array $params = array(),
+ $content = null
+ ) {
if ($data == null || $type == null) {
- throw new InvalidArgumentException('HTMLObject: missing argument. $data and $type are required in htmlObject($data, $type, array $attribs = array(), array $params = array(), $content = null)');
+ throw new InvalidArgumentException(
+ 'HTMLObject: missing argument. $data and $type are required in '
+ . 'htmlObject($data, $type, array $attribs = array(), array $params = array(), $content = null)'
+ );
}
// Merge data and type
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlPage.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlPage.php
index ee170c1b0c1..356132ed5eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlPage.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlPage.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlQuicktime.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlQuicktime.php
index 629d6efa328..cecda28bc90 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlQuicktime.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlQuicktime.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Identity.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Identity.php
index 4fe14537364..e36863aad0c 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Identity.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Identity.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php
index 57dace7d6fe..537d04c1e26 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/InlineScript.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -35,8 +35,13 @@ class InlineScript extends HeadScript
* @param string $type Script type and/or array of script attributes
* @return InlineScript
*/
- public function __invoke($mode = self::FILE, $spec = null, $placement = 'APPEND', array $attrs = array(), $type = 'text/javascript')
- {
+ public function __invoke(
+ $mode = self::FILE,
+ $spec = null,
+ $placement = 'APPEND',
+ array $attrs = array(),
+ $type = 'text/javascript'
+ ) {
return parent::__invoke($mode, $spec, $placement, $attrs, $type);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Json.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Json.php
index 8e42fa8cf22..e30aa59bd2e 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Json.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Json.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Layout.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Layout.php
index 65b630fb248..6554b16939e 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Layout.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Layout.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation.php
index 72f553b8316..f455ef378e9 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,6 +14,7 @@ use Zend\ServiceManager\ServiceLocatorAwareInterface;
use Zend\View\Exception;
use Zend\View\Helper\Navigation\AbstractHelper as AbstractNavigationHelper;
use Zend\View\Helper\Navigation\HelperInterface as NavigationHelper;
+use Zend\View\Renderer\RendererInterface as Renderer;
/**
* Proxy helper for retrieving navigational helpers and forwarding calls
@@ -200,7 +201,8 @@ class Navigation extends AbstractNavigationHelper
if ($this->getInjectTranslator() && !$helper->hasTranslator()) {
$helper->setTranslator(
- $this->getTranslator(), $this->getTranslatorTextDomain()
+ $this->getTranslator(),
+ $this->getTranslatorTextDomain()
);
}
}
@@ -326,4 +328,19 @@ class Navigation extends AbstractNavigationHelper
return $this->plugins;
}
+
+ /**
+ * Set the View object
+ *
+ * @param Renderer $view
+ * @return self
+ */
+ public function setView(Renderer $view)
+ {
+ parent::setView($view);
+ if ($view && $this->plugins) {
+ $this->plugins->setRenderer($view);
+ }
+ return $this;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/AbstractHelper.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/AbstractHelper.php
index a060a0e94e2..87b603207c4 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/AbstractHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/AbstractHelper.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,7 @@ use RecursiveIteratorIterator;
use Zend\EventManager\EventManager;
use Zend\EventManager\EventManagerAwareInterface;
use Zend\EventManager\EventManagerInterface;
-use Zend\I18n\Translator\Translator;
+use Zend\I18n\Translator\TranslatorInterface as Translator;
use Zend\I18n\Translator\TranslatorAwareInterface;
use Zend\Navigation;
use Zend\Navigation\Page\AbstractPage;
@@ -147,7 +147,8 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
{
return call_user_func_array(
array($this->getContainer(), $method),
- $arguments);
+ $arguments
+ );
}
/**
@@ -204,8 +205,12 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
$found = null;
$foundDepth = -1;
- $iterator = new RecursiveIteratorIterator($container, RecursiveIteratorIterator::CHILD_FIRST);
+ $iterator = new RecursiveIteratorIterator(
+ $container,
+ RecursiveIteratorIterator::CHILD_FIRST
+ );
+ /** @var \Zend\Navigation\Page\AbstractPage $page */
foreach ($iterator as $page) {
$currDepth = $iterator->getDepth();
if ($currDepth < $minDepth || !$this->accept($page)) {
@@ -279,8 +284,8 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
if (!$container instanceof Navigation\AbstractContainer) {
throw new Exception\InvalidArgumentException(
- 'Container must be a string alias or an instance of ' .
- 'Zend\Navigation\AbstractContainer'
+ 'Container must be a string alias or an instance of '
+ . 'Zend\Navigation\AbstractContainer'
);
}
}
@@ -388,23 +393,12 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
* Returns an HTML string containing an 'a' element for the given page
*
* @param AbstractPage $page page to generate HTML for
- * @return string
+ * @return string HTML string (<a href="…">Label</a>)
*/
public function htmlify(AbstractPage $page)
{
- // get label and title for translating
- $label = $page->getLabel();
- $title = $page->getTitle();
-
- if (null !== ($translator = $this->getTranslator())) {
- $textDomain = $this->getTranslatorTextDomain();
- if (is_string($label) && !empty($label)) {
- $label = $translator->translate($label, $textDomain);
- }
- if (is_string($title) && !empty($title)) {
- $title = $translator->translate($title, $textDomain);
- }
- }
+ $label = $this->translate($page->getLabel(), $page->getTextDomain());
+ $title = $this->translate($page->getTitle(), $page->getTextDomain());
// get attribs for anchor element
$attribs = array(
@@ -415,9 +409,33 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
'target' => $page->getTarget()
);
+ /** @var \Zend\View\Helper\EscapeHtml $escaper */
$escaper = $this->view->plugin('escapeHtml');
+ $label = $escaper($label);
+
+ return '<a' . $this->htmlAttribs($attribs) . '>' . $label . '</a>';
+ }
+
+ /**
+ * Translate a message (for label, title, …)
+ *
+ * @param string $message ID of the message to translate
+ * @param string $textDomain Text domain (category name for the translations)
+ * @return string Translated message
+ */
+ protected function translate($message, $textDomain = null)
+ {
+ if (is_string($message) && !empty($message)) {
+ if (null !== ($translator = $this->getTranslator())) {
+ if (null === $textDomain) {
+ $textDomain = $this->getTranslatorTextDomain();
+ }
+
+ return $translator->translate($message, $textDomain);
+ }
+ }
- return '<a' . $this->htmlAttribs($attribs) . '>' . $escaper($label) . '</a>';
+ return $message;
}
/**
@@ -689,7 +707,7 @@ abstract class AbstractHelper extends View\Helper\AbstractHtmlElement implements
} else {
throw new Exception\InvalidArgumentException(sprintf(
'$role must be a string, null, or an instance of '
- . 'Zend\Permissions\Role\RoleInterface; %s given',
+ . 'Zend\Permissions\Role\RoleInterface; %s given',
(is_object($role) ? get_class($role) : gettype($role))
));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Breadcrumbs.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Breadcrumbs.php
index 14cd1d92208..1dc1b47b8bb 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Breadcrumbs.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Breadcrumbs.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -107,12 +107,11 @@ class Breadcrumbs extends AbstractHelper
if ($this->getLinkLast()) {
$html = $this->htmlify($active);
} else {
- $html = $active->getLabel();
- if (null !== ($translator = $this->getTranslator())) {
- $html = $translator->translate($html, $this->getTranslatorTextDomain());
- }
+ /** @var \Zend\View\Helper\EscapeHtml $escaper */
$escaper = $this->view->plugin('escapeHtml');
- $html = $escaper($html);
+ $html = $escaper(
+ $this->translate($active->getLabel(), $active->getTextDomain())
+ );
}
// walk back to root
@@ -172,7 +171,10 @@ class Breadcrumbs extends AbstractHelper
}
// put breadcrumb pages in model
- $model = array('pages' => array());
+ $model = array(
+ 'pages' => array(),
+ 'separator' => $this->getSeparator()
+ );
$active = $this->findActive($container);
if ($active) {
$active = $active['page'];
@@ -194,20 +196,21 @@ class Breadcrumbs extends AbstractHelper
$model['pages'] = array_reverse($model['pages']);
}
+ /** @var \Zend\View\Helper\Partial $partialHelper */
+ $partialHelper = $this->view->plugin('partial');
+
if (is_array($partial)) {
if (count($partial) != 2) {
throw new Exception\InvalidArgumentException(
'Unable to render menu: A view partial supplied as '
- . 'an array must contain two values: partial view '
- . 'script and module where script can be found'
+ . 'an array must contain two values: partial view '
+ . 'script and module where script can be found'
);
}
- $partialHelper = $this->view->plugin('partial');
- return $partialHelper($partial[0], /*$partial[1], */$model);
+ return $partialHelper($partial[0], $model);
}
- $partialHelper = $this->view->plugin('partial');
return $partialHelper($partial, $model);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/HelperInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/HelperInterface.php
index 8b52c8c1dad..8e46157dd73 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/HelperInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/HelperInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Links.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Links.php
index 0682f8eb787..656acd8bd8c 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Links.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Links.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,7 +15,6 @@ use Zend\Navigation\AbstractContainer;
use Zend\Navigation\Page\AbstractPage;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\ErrorHandler;
-use Zend\View;
use Zend\View\Exception;
/**
@@ -126,9 +125,7 @@ class Links extends AbstractHelper
$result = preg_match('/find(Rel|Rev)(.+)/', $method, $match);
ErrorHandler::stop();
if ($result) {
- return $this->findRelation($arguments[0],
- strtolower($match[1]),
- strtolower($match[2]));
+ return $this->findRelation($arguments[0], strtolower($match[1]), strtolower($match[2]));
}
return parent::__call($method, $arguments);
@@ -230,7 +227,7 @@ class Links extends AbstractHelper
*
* The form of the returned array:
* <code>
- * // $page denotes an instance of Zend_Navigation_Page
+ * // $page denotes an instance of Zend\Navigation\Page\AbstractPage
* $returned = array(
* 'rel' => array(
* 'alternate' => array($page, $page, $page),
@@ -410,8 +407,7 @@ class Links extends AbstractHelper
{
$found = null;
$break = false;
- $iterator = new RecursiveIteratorIterator($this->findRoot($page),
- RecursiveIteratorIterator::SELF_FIRST);
+ $iterator = new RecursiveIteratorIterator($this->findRoot($page), RecursiveIteratorIterator::SELF_FIRST);
foreach ($iterator as $intermediate) {
if ($intermediate === $page) {
// current page; break at next accepted page
@@ -444,8 +440,9 @@ class Links extends AbstractHelper
$found = null;
$prev = null;
$iterator = new RecursiveIteratorIterator(
- $this->findRoot($page),
- RecursiveIteratorIterator::SELF_FIRST);
+ $this->findRoot($page),
+ RecursiveIteratorIterator::SELF_FIRST
+ );
foreach ($iterator as $intermediate) {
if (!$this->accept($intermediate)) {
continue;
@@ -685,7 +682,7 @@ class Links extends AbstractHelper
} elseif ($mixed instanceof Traversable) {
$mixed = ArrayUtils::iteratorToArray($mixed);
} elseif (is_string($mixed)) {
- // value is a string; make an URI page
+ // value is a string; make a URI page
return AbstractPage::factory(array(
'type' => 'uri',
'uri' => $mixed
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Listener/AclListener.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Listener/AclListener.php
index 5c8656084eb..95c85309246 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Listener/AclListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Listener/AclListener.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php
index a7f6000c3c3..7951c9b3d48 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Menu.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,7 +12,6 @@ namespace Zend\View\Helper\Navigation;
use RecursiveIteratorIterator;
use Zend\Navigation\AbstractContainer;
use Zend\Navigation\Page\AbstractPage;
-use Zend\View;
use Zend\View\Exception;
/**
@@ -62,12 +61,19 @@ class Menu extends AbstractHelper
*/
protected $ulClass = 'navigation';
+ /**
+ * CSS class to use for the active li element
+ *
+ * @var string
+ */
+ protected $liActiveClass = 'active';
+
/**
* View helper entry point:
* Retrieves helper and optionally sets container to operate on
*
* @param AbstractContainer $container [optional] container to operate on
- * @return Menu
+ * @return self
*/
public function __invoke($container = null)
{
@@ -115,6 +121,7 @@ class Menu extends AbstractHelper
* @param int|null $maxDepth maximum depth
* @param bool $escapeLabels Whether or not to escape the labels
* @param bool $addClassToListItem Whether or not page class applied to <li> element
+ * @param string $liActiveClass CSS class for active LI
* @return string
*/
protected function renderDeepestMenu(
@@ -124,7 +131,8 @@ class Menu extends AbstractHelper
$minDepth,
$maxDepth,
$escapeLabels,
- $addClassToListItem
+ $addClassToListItem,
+ $liActiveClass
) {
if (!$active = $this->findActive($container, $minDepth - 1, $maxDepth)) {
return '';
@@ -132,10 +140,10 @@ class Menu extends AbstractHelper
// special case if active page is one below minDepth
if ($active['depth'] < $minDepth) {
- if (!$active['page']->hasPages()) {
+ if (!$active['page']->hasPages(!$this->renderInvisible)) {
return '';
}
- } elseif (!$active['page']->hasPages()) {
+ } elseif (!$active['page']->hasPages(!$this->renderInvisible)) {
// found pages has no children; render siblings
$active['page'] = $active['page']->getParent();
} elseif (is_int($maxDepth) && $active['depth'] +1 > $maxDepth) {
@@ -146,7 +154,7 @@ class Menu extends AbstractHelper
/* @var $escaper \Zend\View\Helper\EscapeHtmlAttr */
$escaper = $this->view->plugin('escapeHtmlAttr');
$ulClass = $ulClass ? ' class="' . $escaper($ulClass) . '"' : '';
- $html = $indent . '<ul' . $ulClass . '>' . self::EOL;
+ $html = $indent . '<ul' . $ulClass . '>' . PHP_EOL;
foreach ($active['page'] as $subPage) {
if (!$this->accept($subPage)) {
@@ -157,7 +165,7 @@ class Menu extends AbstractHelper
$liClasses = array();
// Is page active?
if ($subPage->isActive(true)) {
- $liClasses[] = 'active';
+ $liClasses[] = $liActiveClass;
}
// Add CSS class from page to <li>
if ($addClassToListItem && $subPage->getClass()) {
@@ -165,9 +173,9 @@ class Menu extends AbstractHelper
}
$liClass = empty($liClasses) ? '' : ' class="' . $escaper(implode(' ', $liClasses)) . '"';
- $html .= $indent . ' <li' . $liClass . '>' . self::EOL;
- $html .= $indent . ' ' . $this->htmlify($subPage, $escapeLabels, $addClassToListItem) . self::EOL;
- $html .= $indent . ' </li>' . self::EOL;
+ $html .= $indent . ' <li' . $liClass . '>' . PHP_EOL;
+ $html .= $indent . ' ' . $this->htmlify($subPage, $escapeLabels, $addClassToListItem) . PHP_EOL;
+ $html .= $indent . ' </li>' . PHP_EOL;
}
$html .= $indent . '</ul>';
@@ -201,23 +209,27 @@ class Menu extends AbstractHelper
$options = $this->normalizeOptions($options);
if ($options['onlyActiveBranch'] && !$options['renderParents']) {
- $html = $this->renderDeepestMenu($container,
+ $html = $this->renderDeepestMenu(
+ $container,
$options['ulClass'],
$options['indent'],
$options['minDepth'],
$options['maxDepth'],
$options['escapeLabels'],
- $options['addClassToListItem']
+ $options['addClassToListItem'],
+ $options['liActiveClass']
);
} else {
- $html = $this->renderNormalMenu($container,
+ $html = $this->renderNormalMenu(
+ $container,
$options['ulClass'],
$options['indent'],
$options['minDepth'],
$options['maxDepth'],
$options['onlyActiveBranch'],
$options['escapeLabels'],
- $options['addClassToListItem']
+ $options['addClassToListItem'],
+ $options['liActiveClass']
);
}
@@ -235,6 +247,7 @@ class Menu extends AbstractHelper
* @param bool $onlyActive render only active branch?
* @param bool $escapeLabels Whether or not to escape the labels
* @param bool $addClassToListItem Whether or not page class applied to <li> element
+ * @param string $liActiveClass CSS class for active LI
* @return string
*/
protected function renderNormalMenu(
@@ -245,7 +258,8 @@ class Menu extends AbstractHelper
$maxDepth,
$onlyActive,
$escapeLabels,
- $addClassToListItem
+ $addClassToListItem,
+ $liActiveClass
) {
$html = '';
@@ -262,8 +276,10 @@ class Menu extends AbstractHelper
}
// create iterator
- $iterator = new RecursiveIteratorIterator($container,
- RecursiveIteratorIterator::SELF_FIRST);
+ $iterator = new RecursiveIteratorIterator(
+ $container,
+ RecursiveIteratorIterator::SELF_FIRST
+ );
if (is_int($maxDepth)) {
$iterator->setMaxDepth($maxDepth);
}
@@ -285,7 +301,7 @@ class Menu extends AbstractHelper
$accept = true;
} elseif ($foundPage->getParent()->hasPage($page)) {
// page is a sibling of the active page...
- if (!$foundPage->hasPages() ||
+ if (!$foundPage->hasPages(!$this->renderInvisible) ||
is_int($maxDepth) && $foundDepth + 1 > $maxDepth) {
// accept if active page has no children, or the
// children are too deep to be rendered
@@ -310,26 +326,26 @@ class Menu extends AbstractHelper
} else {
$ulClass = '';
}
- $html .= $myIndent . '<ul' . $ulClass . '>' . self::EOL;
+ $html .= $myIndent . '<ul' . $ulClass . '>' . PHP_EOL;
} elseif ($prevDepth > $depth) {
// close li/ul tags until we're at current depth
for ($i = $prevDepth; $i > $depth; $i--) {
$ind = $indent . str_repeat(' ', $i);
- $html .= $ind . ' </li>' . self::EOL;
- $html .= $ind . '</ul>' . self::EOL;
+ $html .= $ind . ' </li>' . PHP_EOL;
+ $html .= $ind . '</ul>' . PHP_EOL;
}
// close previous li tag
- $html .= $myIndent . ' </li>' . self::EOL;
+ $html .= $myIndent . ' </li>' . PHP_EOL;
} else {
// close previous li tag
- $html .= $myIndent . ' </li>' . self::EOL;
+ $html .= $myIndent . ' </li>' . PHP_EOL;
}
// render li tag and page
$liClasses = array();
// Is page active?
if ($isActive) {
- $liClasses[] = 'active';
+ $liClasses[] = $liActiveClass;
}
// Add CSS class from page to <li>
if ($addClassToListItem && $page->getClass()) {
@@ -337,8 +353,8 @@ class Menu extends AbstractHelper
}
$liClass = empty($liClasses) ? '' : ' class="' . $escaper(implode(' ', $liClasses)) . '"';
- $html .= $myIndent . ' <li' . $liClass . '>' . self::EOL
- . $myIndent . ' ' . $this->htmlify($page, $escapeLabels, $addClassToListItem) . self::EOL;
+ $html .= $myIndent . ' <li' . $liClass . '>' . PHP_EOL
+ . $myIndent . ' ' . $this->htmlify($page, $escapeLabels, $addClassToListItem) . PHP_EOL;
// store as previous depth for next iteration
$prevDepth = $depth;
@@ -348,10 +364,10 @@ class Menu extends AbstractHelper
// done iterating container; close open ul/li tags
for ($i = $prevDepth+1; $i > 0; $i--) {
$myIndent = $indent . str_repeat(' ', $i-1);
- $html .= $myIndent . ' </li>' . self::EOL
- . $myIndent . '</ul>' . self::EOL;
+ $html .= $myIndent . ' </li>' . PHP_EOL
+ . $myIndent . '</ul>' . PHP_EOL;
}
- $html = rtrim($html, self::EOL);
+ $html = rtrim($html, PHP_EOL);
}
return $html;
@@ -399,20 +415,21 @@ class Menu extends AbstractHelper
'container' => $container
);
+ /** @var \Zend\View\Helper\Partial $partialHelper */
+ $partialHelper = $this->view->plugin('partial');
+
if (is_array($partial)) {
if (count($partial) != 2) {
throw new Exception\InvalidArgumentException(
'Unable to render menu: A view partial supplied as '
- . 'an array must contain two values: partial view '
- . 'script and module where script can be found'
+ . 'an array must contain two values: partial view '
+ . 'script and module where script can be found'
);
}
- $partialHelper = $this->view->plugin('partial');
- return $partialHelper($partial[0], /*$partial[1], */$model);
+ return $partialHelper($partial[0], $model);
}
- $partialHelper = $this->view->plugin('partial');
return $partialHelper($partial, $model);
}
@@ -427,29 +444,35 @@ class Menu extends AbstractHelper
* 'minDepth' => null,
* 'maxDepth' => null,
* 'onlyActiveBranch' => true,
- * 'renderParents' => false
+ * 'renderParents' => false,
+ * 'liActiveClass' => $liActiveClass
* ));
* </code>
*
- * @param AbstractContainer $container [optional] container to
- * render. Default is to render
- * the container registered in
- * the helper.
- * @param string $ulClass [optional] CSS class to
- * use for UL element. Default
- * is to use the value from
- * {@link getUlClass()}.
- * @param string|int $indent [optional] indentation as
- * a string or number of
- * spaces. Default is to use
- * the value retrieved from
- * {@link getIndent()}.
+ * @param AbstractContainer $container [optional] container to
+ * render. Default is to render
+ * the container registered in
+ * the helper.
+ * @param string $ulClass [optional] CSS class to
+ * use for UL element. Default
+ * is to use the value from
+ * {@link getUlClass()}.
+ * @param string|int $indent [optional] indentation as
+ * a string or number of
+ * spaces. Default is to use
+ * the value retrieved from
+ * {@link getIndent()}.
+ * @param string $liActiveClass [optional] CSS class to
+ * use for UL element. Default
+ * is to use the value from
+ * {@link getUlClass()}.
* @return string
*/
public function renderSubMenu(
AbstractContainer $container = null,
$ulClass = null,
- $indent = null
+ $indent = null,
+ $liActiveClass = null
) {
return $this->renderMenu($container, array(
'indent' => $indent,
@@ -460,6 +483,7 @@ class Menu extends AbstractHelper
'renderParents' => false,
'escapeLabels' => true,
'addClassToListItem' => false,
+ 'liActiveClass' => $liActiveClass
));
}
@@ -476,25 +500,10 @@ class Menu extends AbstractHelper
*/
public function htmlify(AbstractPage $page, $escapeLabel = true, $addClassToListItem = false)
{
- // get label and title for translating
- $label = $page->getLabel();
- $title = $page->getTitle();
-
- // translate label and title?
- if (null !== ($translator = $this->getTranslator())) {
- $textDomain = $this->getTranslatorTextDomain();
- if (is_string($label) && !empty($label)) {
- $label = $translator->translate($label, $textDomain);
- }
- if (is_string($title) && !empty($title)) {
- $title = $translator->translate($title, $textDomain);
- }
- }
-
// get attribs for element
$attribs = array(
'id' => $page->getId(),
- 'title' => $title,
+ 'title' => $this->translate($page->getTitle(), $page->getTextDomain()),
);
if ($addClassToListItem === false) {
@@ -511,8 +520,10 @@ class Menu extends AbstractHelper
$element = 'span';
}
- $html = '<' . $element . $this->htmlAttribs($attribs) . '>';
+ $html = '<' . $element . $this->htmlAttribs($attribs) . '>';
+ $label = $this->translate($page->getLabel(), $page->getTextDomain());
if ($escapeLabel === true) {
+ /** @var \Zend\View\Helper\EscapeHtml $escaper */
$escaper = $this->view->plugin('escapeHtml');
$html .= $escaper($label);
} else {
@@ -579,6 +590,12 @@ class Menu extends AbstractHelper
$options['addClassToListItem'] = $this->getAddClassToListItem();
}
+ if (isset($options['liActiveClass']) && $options['liActiveClass'] !== null) {
+ $options['liActiveClass'] = (string) $options['liActiveClass'];
+ } else {
+ $options['liActiveClass'] = $this->getLiActiveClass();
+ }
+
return $options;
}
@@ -586,7 +603,7 @@ class Menu extends AbstractHelper
* Sets a flag indicating whether labels should be escaped
*
* @param bool $flag [optional] escape labels
- * @return Menu
+ * @return self
*/
public function escapeLabels($flag = true)
{
@@ -599,7 +616,7 @@ class Menu extends AbstractHelper
*
* @param bool $flag [optional] page class applied to <li> element
* Default is true.
- * @return Menu fluent interface, returns self
+ * @return self fluent interface, returns self
*/
public function setAddClassToListItem($flag = true)
{
@@ -623,7 +640,7 @@ class Menu extends AbstractHelper
* Sets a flag indicating whether only active branch should be rendered
*
* @param bool $flag [optional] render only active branch.
- * @return Menu
+ * @return self
*/
public function setOnlyActiveBranch($flag = true)
{
@@ -652,7 +669,7 @@ class Menu extends AbstractHelper
* values; the partial view script to use,
* and the module where the script can be
* found.
- * @return Menu
+ * @return self
*/
public function setPartial($partial)
{
@@ -679,7 +696,7 @@ class Menu extends AbstractHelper
* See {@link setOnlyActiveBranch()} for more information.
*
* @param bool $flag [optional] render parents when rendering active branch.
- * @return Menu
+ * @return self
*/
public function setRenderParents($flag = true)
{
@@ -704,7 +721,7 @@ class Menu extends AbstractHelper
* Sets CSS class to use for the first 'ul' element when rendering
*
* @param string $ulClass CSS class to set
- * @return Menu
+ * @return self
*/
public function setUlClass($ulClass)
{
@@ -724,4 +741,29 @@ class Menu extends AbstractHelper
{
return $this->ulClass;
}
+
+ /**
+ * Sets CSS class to use for the active 'li' element when rendering
+ *
+ * @param string $liActiveClass CSS class to set
+ * @return self
+ */
+ public function setLiActiveClass($liActiveClass)
+ {
+ if (is_string($liActiveClass)) {
+ $this->liActiveClass = $liActiveClass;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Returns CSS class to use for the active 'li' element when rendering
+ *
+ * @return string
+ */
+ public function getLiActiveClass()
+ {
+ return $this->liActiveClass;
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/PluginManager.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/PluginManager.php
index 8faf86eb3d8..dc0bc01ee7e 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/PluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/PluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Sitemap.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Sitemap.php
index c20bc295129..99d1f43007a 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Sitemap.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Sitemap.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -158,8 +158,7 @@ class Sitemap extends AbstractHelper
$dom->appendChild($urlSet);
// create iterator
- $iterator = new RecursiveIteratorIterator($container,
- RecursiveIteratorIterator::SELF_FIRST);
+ $iterator = new RecursiveIteratorIterator($container, RecursiveIteratorIterator::SELF_FIRST);
$maxDepth = $this->getMaxDepth();
if (is_int($maxDepth)) {
@@ -198,8 +197,7 @@ class Sitemap extends AbstractHelper
}
// put url in 'loc' element
- $urlNode->appendChild($dom->createElementNS(self::SITEMAP_NS,
- 'loc', $url));
+ $urlNode->appendChild($dom->createElementNS(self::SITEMAP_NS, 'loc', $url));
// add 'lastmod' element if a valid lastmod is set in page
if (isset($page->lastmod)) {
@@ -213,8 +211,7 @@ class Sitemap extends AbstractHelper
if (!$this->getUseSitemapValidators() ||
$lastmodValidator->isValid($lastmod)) {
$urlNode->appendChild(
- $dom->createElementNS(self::SITEMAP_NS, 'lastmod',
- $lastmod)
+ $dom->createElementNS(self::SITEMAP_NS, 'lastmod', $lastmod)
);
}
}
@@ -225,8 +222,7 @@ class Sitemap extends AbstractHelper
if (!$this->getUseSitemapValidators() ||
$changefreqValidator->isValid($changefreq)) {
$urlNode->appendChild(
- $dom->createElementNS(self::SITEMAP_NS, 'changefreq',
- $changefreq)
+ $dom->createElementNS(self::SITEMAP_NS, 'changefreq', $changefreq)
);
}
}
@@ -237,8 +233,7 @@ class Sitemap extends AbstractHelper
if (!$this->getUseSitemapValidators() ||
$priorityValidator->isValid($priority)) {
$urlNode->appendChild(
- $dom->createElementNS(self::SITEMAP_NS, 'priority',
- $priority)
+ $dom->createElementNS(self::SITEMAP_NS, 'priority', $priority)
);
}
}
@@ -290,7 +285,6 @@ class Sitemap extends AbstractHelper
}
if (! in_array($url, $this->urls)) {
-
$this->urls[] = $url;
return $this->xmlEscape($url);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/PaginationControl.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/PaginationControl.php
index 9963fdd35fe..65403983a32 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/PaginationControl.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/PaginationControl.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -42,10 +42,17 @@ class PaginationControl extends AbstractHelper
* @throws Exception\InvalidArgumentException if partial is invalid array
* @return string
*/
- public function __invoke(Paginator\Paginator $paginator = null, $scrollingStyle = null, $partial = null, $params = null)
- {
+ public function __invoke(
+ Paginator\Paginator $paginator = null,
+ $scrollingStyle = null,
+ $partial = null,
+ $params = null
+ ) {
if ($paginator === null) {
- if (isset($this->view->paginator) and $this->view->paginator !== null and $this->view->paginator instanceof Paginator\Paginator) {
+ if (isset($this->view->paginator)
+ && $this->view->paginator !== null
+ && $this->view->paginator instanceof Paginator\Paginator
+ ) {
$paginator = $this->view->paginator;
} else {
throw new Exception\RuntimeException('No paginator instance provided or incorrect type');
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Partial.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Partial.php
index 444f161b98d..68ffe677c96 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Partial.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Partial.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -64,8 +64,9 @@ class Partial extends AbstractHelper
/**
* Set object key
*
- * @param string $key
- * @return Partial
+ * @param string|null $key
+ *
+ * @return self
*/
public function setObjectKey($key)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php
index 88441fff294..96a9d3801bc 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -26,6 +26,22 @@ class PartialLoop extends Partial
*/
protected $partialCounter = 0;
+ /**
+ * The current nesting level
+ *
+ * @var int
+ */
+ private $nestingLevel = 0;
+
+ /**
+ * Stack with object keys for each nested level
+ *
+ * @var array indexed by nesting level
+ */
+ private $objectKeyStack = array(
+ 0 => null,
+ );
+
/**
* Renders a template fragment within a variable scope distinct from the
* calling View object.
@@ -43,23 +59,17 @@ class PartialLoop extends Partial
return $this;
}
- if (!is_array($values)) {
- if ($values instanceof Traversable) {
- $values = ArrayUtils::iteratorToArray($values);
- } elseif (is_object($values) && method_exists($values, 'toArray')) {
- $values = $values->toArray();
- } else {
- throw new Exception\InvalidArgumentException('PartialLoop helper requires iterable data');
- }
- }
-
// reset the counter if it's called again
$this->partialCounter = 0;
$content = '';
- foreach ($values as $item) {
+ foreach ($this->extractViewVariables($values) as $item) {
+ $this->nestObjectKey();
+
$this->partialCounter++;
$content .= parent::__invoke($name, $item);
+
+ $this->unNestObjectKey();
}
return $content;
@@ -74,4 +84,78 @@ class PartialLoop extends Partial
{
return $this->partialCounter;
}
+
+ /**
+ * Set object key in this loop and any child loop
+ *
+ * {@inheritDoc}
+ *
+ * @param string|null $key
+ *
+ * @return self
+ */
+ public function setObjectKey($key)
+ {
+ if (null === $key) {
+ unset($this->objectKeyStack[$this->nestingLevel]);
+ } else {
+ $this->objectKeyStack[$this->nestingLevel] = (string) $key;
+ }
+
+ return parent::setObjectKey($key);
+ }
+
+ /**
+ * Increment nestedLevel and default objectKey to parent's value
+ *
+ * @return self
+ */
+ private function nestObjectKey()
+ {
+ $this->nestingLevel += 1;
+
+ $this->setObjectKey($this->getObjectKey());
+
+ return $this;
+ }
+
+ /**
+ * Decrement nestedLevel and restore objectKey to parent's value
+ *
+ * @return self
+ */
+ private function unNestObjectKey()
+ {
+ $this->setObjectKey(null);
+
+ $this->nestingLevel -= 1;
+ $this->objectKey = $this->objectKeyStack[$this->nestingLevel];
+
+ return $this;
+ }
+
+ /**
+ * @param mixed $values
+ *
+ * @return array Variables to populate in the view
+ */
+ private function extractViewVariables($values)
+ {
+ if ($values instanceof Traversable) {
+ return ArrayUtils::iteratorToArray($values, false);
+ }
+
+ if (is_array($values)) {
+ return $values;
+ }
+
+ if (is_object($values) && method_exists($values, 'toArray')) {
+ return $values->toArray();
+ }
+
+ throw new Exception\InvalidArgumentException(sprintf(
+ 'PartialLoop helper requires iterable data, %s given',
+ is_object($values) ? get_class($values) : gettype($values)
+ ));
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder.php
index 297c17a554f..8fda0a88aea 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -43,7 +43,9 @@ class Placeholder extends AbstractHelper
public function __invoke($name = null)
{
if ($name == null) {
- throw new InvalidArgumentException('Placeholder: missing argument. $name is required by placeholder($name)');
+ throw new InvalidArgumentException(
+ 'Placeholder: missing argument. $name is required by placeholder($name)'
+ );
}
$name = (string) $name;
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container.php
index 35220176c87..07619819bc9 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
index 86d5c6689b9..aec2f7d0f7b 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
index 0e47599d104..8c99c95e5a7 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -250,10 +250,12 @@ abstract class AbstractStandalone extends AbstractHelper implements
{
if (!class_exists($name)) {
throw new Exception\DomainException(
- sprintf('%s expects a valid container class name; received "%s", which did not resolve',
+ sprintf(
+ '%s expects a valid container class name; received "%s", which did not resolve',
__METHOD__,
$name
- ));
+ )
+ );
}
if (!in_array('Zend\View\Helper\Placeholder\Container\AbstractContainer', class_parents($name))) {
@@ -365,7 +367,7 @@ abstract class AbstractStandalone extends AbstractHelper implements
/**
* IteratorAggregate: get Iterator
*
- * @return Iterator
+ * @return \Iterator
*/
public function getIterator()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Registry.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Registry.php
index d8766ba45b9..3eb6f25140c 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Registry.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Registry.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -156,10 +156,12 @@ class Registry
{
if (!class_exists($name)) {
throw new Exception\DomainException(
- sprintf('%s expects a valid registry class name; received "%s", which did not resolve',
- __METHOD__,
- $name
- ));
+ sprintf(
+ '%s expects a valid registry class name; received "%s", which did not resolve',
+ __METHOD__,
+ $name
+ )
+ );
}
if (!in_array('Zend\View\Helper\Placeholder\Container\AbstractContainer', class_parents($name))) {
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderChildModel.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderChildModel.php
index d59edfe0557..ee6e5ba31b0 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderChildModel.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderChildModel.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderToPlaceholder.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderToPlaceholder.php
index 3707995b331..cab6c33fcbc 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderToPlaceholder.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderToPlaceholder.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/ServerUrl.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/ServerUrl.php
index ae846a9baf1..2cd80efdbd8 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/ServerUrl.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/ServerUrl.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/FlashMessengerFactory.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/FlashMessengerFactory.php
index fbaf53e8bc9..ba69c448056 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/FlashMessengerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/FlashMessengerFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/IdentityFactory.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/IdentityFactory.php
index a065a1d9dfd..180e37b6963 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/IdentityFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Service/IdentityFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Url.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Url.php
index 3c3a3402d1b..e5a71e951ae 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/Url.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/Url.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -35,7 +35,7 @@ class Url extends AbstractHelper
protected $routeMatch;
/**
- * Generates an url given the name of a route.
+ * Generates a url given the name of a route.
*
* @see Zend\Mvc\Router\RouteInterface::assemble()
* @param string $name Name of the route
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/ViewModel.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/ViewModel.php
index 49b13064962..4cf26607215 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/ViewModel.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/ViewModel.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php b/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php
index 48980d8bc9b..4c67a967c0b 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/HelperPluginManager.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -143,13 +143,29 @@ class HelperPluginManager extends AbstractPluginManager
*/
public function injectTranslator($helper)
{
- if ($helper instanceof TranslatorAwareInterface) {
- $locator = $this->getServiceLocator();
- if ($locator && $locator->has('MvcTranslator')) {
- $helper->setTranslator($locator->get('MvcTranslator'));
- } elseif ($locator && $locator->has('translator')) {
- $helper->setTranslator($locator->get('translator'));
- }
+ if (!$helper instanceof TranslatorAwareInterface) {
+ return;
+ }
+
+ $locator = $this->getServiceLocator();
+
+ if (!$locator) {
+ return;
+ }
+
+ if ($locator->has('MvcTranslator')) {
+ $helper->setTranslator($locator->get('MvcTranslator'));
+ return;
+ }
+
+ if ($locator->has('Zend\I18n\Translator\TranslatorInterface')) {
+ $helper->setTranslator($locator->get('Zend\I18n\Translator\TranslatorInterface'));
+ return;
+ }
+
+ if ($locator->has('Translator')) {
+ $helper->setTranslator($locator->get('Translator'));
+ return;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Model/ClearableModelInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Model/ClearableModelInterface.php
index 2edfe719e95..b72b848a9e0 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Model/ClearableModelInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Model/ClearableModelInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Model/ConsoleModel.php b/vendor/zendframework/zendframework/library/Zend/View/Model/ConsoleModel.php
index 020554429b5..fc446b1e7d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Model/ConsoleModel.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Model/ConsoleModel.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Model;
-
class ConsoleModel extends ViewModel
{
const RESULT = 'result';
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Model/FeedModel.php b/vendor/zendframework/zendframework/library/Zend/View/Model/FeedModel.php
index fc8351cd049..3226e3b8f33 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Model/FeedModel.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Model/FeedModel.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Model/JsonModel.php b/vendor/zendframework/zendframework/library/Zend/View/Model/JsonModel.php
index 191d3f5ec8c..b16fcd5338f 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Model/JsonModel.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Model/JsonModel.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Model/ModelInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Model/ModelInterface.php
index 4d0a30e1788..fa409677d8e 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Model/ModelInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Model/ModelInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -150,7 +150,6 @@ interface ModelInterface extends Countable, IteratorAggregate
*/
public function terminate();
-
/**
* Set flag indicating whether or not append to child with the same capture
*
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Model/RetrievableChildrenInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Model/RetrievableChildrenInterface.php
new file mode 100644
index 00000000000..55f72c869e0
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/View/Model/RetrievableChildrenInterface.php
@@ -0,0 +1,27 @@
+<?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\View\Model;
+
+/**
+ * Interface describing a Retrievable Child Model
+ *
+ * Models implementing this interface provide a way to get there children by capture
+ */
+interface RetrievableChildrenInterface
+{
+ /**
+ * Returns an array of Viewmodels with captureTo value $capture
+ *
+ * @param string $capture
+ * @param bool $recursive search recursive through children, default true
+ * @return array
+ */
+ public function getChildrenByCaptureTo($capture, $recursive = true);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Model/ViewModel.php b/vendor/zendframework/zendframework/library/Zend/View/Model/ViewModel.php
index 15dbf12c987..9179e5d103c 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Model/ViewModel.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Model/ViewModel.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,7 @@ use Zend\View\Exception;
use Zend\View\Model;
use Zend\View\Variables as ViewVariables;
-class ViewModel implements ModelInterface, ClearableModelInterface
+class ViewModel implements ModelInterface, ClearableModelInterface, RetrievableChildrenInterface
{
/**
* What variable a parent model should capture this model to
@@ -58,7 +58,6 @@ class ViewModel implements ModelInterface, ClearableModelInterface
*/
protected $variables = array();
-
/**
* Is this append to child with the same capture?
*
@@ -380,6 +379,30 @@ class ViewModel implements ModelInterface, ClearableModelInterface
return $this;
}
+ /**
+ * Returns an array of Viewmodels with captureTo value $capture
+ *
+ * @param string $capture
+ * @param bool $recursive search recursive through children, default true
+ * @return array
+ */
+ public function getChildrenByCaptureTo($capture, $recursive = true)
+ {
+ $children = array();
+
+ foreach ($this->children as $child) {
+ if ($recursive === true) {
+ $children += $child->getChildrenByCaptureTo($capture);
+ }
+
+ if ($child->captureTo() === $capture) {
+ $children[] = $child;
+ }
+ }
+
+ return $children;
+ }
+
/**
* Set the name of the variable to capture this model to, if it is a child model
*
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Renderer/ConsoleRenderer.php b/vendor/zendframework/zendframework/library/Zend/View/Renderer/ConsoleRenderer.php
index 1b177facedf..c54da407deb 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Renderer/ConsoleRenderer.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Renderer/ConsoleRenderer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,7 @@ use Zend\View\Model\ModelInterface;
use Zend\View\Resolver\ResolverInterface;
/**
- * Abstract class for Zend_View to help enforce private constructs.
+ * Class for Zend\View\Model\ConsoleModel to help enforce private constructs.
*
* Note: all private variables in this class are prefixed with "__". This is to
* mark them as part of the internal implementation, and thus prevent conflict
@@ -60,8 +60,7 @@ class ConsoleRenderer implements RendererInterface, TreeRendererInterface
}
/**
- * Allow custom object initialization when extending Zend_View_Abstract or
- * Zend_View
+ * Allow custom object initialization when extending ConsoleRenderer
*
* Triggered by {@link __construct() the constructor} as its final action.
*
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Renderer/FeedRenderer.php b/vendor/zendframework/zendframework/library/Zend/View/Renderer/FeedRenderer.php
index 92faef4d563..444b8b78645 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Renderer/FeedRenderer.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Renderer/FeedRenderer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -15,7 +15,7 @@ use Zend\View\Model\ModelInterface as Model;
use Zend\View\Resolver\ResolverInterface as Resolver;
/**
- * Interface class for Zend_View compatible template engine implementations
+ * Class for Zend\View\Strategy\FeedStrategy compatible template engine implementations
*/
class FeedRenderer implements RendererInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Renderer/JsonRenderer.php b/vendor/zendframework/zendframework/library/Zend/View/Renderer/JsonRenderer.php
index 9666261db85..edc8f84f4d6 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Renderer/JsonRenderer.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Renderer/JsonRenderer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Renderer/PhpRenderer.php b/vendor/zendframework/zendframework/library/Zend/View/Renderer/PhpRenderer.php
index c5811862906..7d6e9d7e06b 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Renderer/PhpRenderer.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Renderer/PhpRenderer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,7 +22,7 @@ use Zend\View\Resolver\TemplatePathStack;
use Zend\View\Variables;
/**
- * Abstract class for Zend_View to help enforce private constructs.
+ * Class for Zend\View\Strategy\PhpRendererStrategy to help enforce private constructs.
*
* Note: all private variables in this class are prefixed with "__". This is to
* mark them as part of the internal implementation, and thus prevent conflict
@@ -164,8 +164,7 @@ class PhpRenderer implements Renderer, TreeRendererInterface
}
/**
- * Allow custom object initialization when extending Zend_View_Abstract or
- * Zend_View
+ * Allow custom object initialization when extending PhpRenderer
*
* Triggered by {@link __construct() the constructor} as its final action.
*
@@ -504,12 +503,19 @@ class PhpRenderer implements Renderer, TreeRendererInterface
}
try {
ob_start();
- include $this->__file;
+ $includeReturn = include $this->__file;
$this->__content = ob_get_clean();
} catch (\Exception $ex) {
ob_end_clean();
throw $ex;
}
+ if ($includeReturn === false && empty($this->__content)) {
+ throw new Exception\UnexpectedValueException(sprintf(
+ '%s: Unable to render template "%s"; file include failed',
+ __METHOD__,
+ $this->__file
+ ));
+ }
}
$this->setVars(array_pop($this->__varsCache));
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Renderer/RendererInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Renderer/RendererInterface.php
index 1b58036e238..70228c93823 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Renderer/RendererInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Renderer/RendererInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,7 @@ use Zend\View\Model\ModelInterface;
use Zend\View\Resolver\ResolverInterface;
/**
- * Interface class for Zend_View compatible template engine implementations
+ * Interface class for Zend\View\Renderer\* compatible template engine implementations
*/
interface RendererInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Renderer/TreeRendererInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Renderer/TreeRendererInterface.php
index ead6ffcb0cb..c2f18f3d969 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Renderer/TreeRendererInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Renderer/TreeRendererInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Resolver/AggregateResolver.php b/vendor/zendframework/zendframework/library/Zend/View/Resolver/AggregateResolver.php
index f918cbac149..7163b9dde6f 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Resolver/AggregateResolver.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Resolver/AggregateResolver.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Resolver/ResolverInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Resolver/ResolverInterface.php
index 8ffe130c664..d3d8270e1c0 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Resolver/ResolverInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Resolver/ResolverInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplateMapResolver.php b/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplateMapResolver.php
index 61d9ab7a12d..51cb9b9b097 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplateMapResolver.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplateMapResolver.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplatePathStack.php b/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplatePathStack.php
index 359be18f34f..6a5405a80e5 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplatePathStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Resolver/TemplatePathStack.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Strategy/FeedStrategy.php b/vendor/zendframework/zendframework/library/Zend/View/Strategy/FeedStrategy.php
index c139858567d..aec779ea8b2 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Strategy/FeedStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Strategy/FeedStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -97,7 +97,6 @@ class FeedStrategy extends AbstractListenerAggregate
$charset = '';
if ($model instanceof Model\FeedModel) {
-
$feed = $model->getFeed();
$charset = '; charset=' . $feed->getEncoding() . ';';
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Strategy/JsonStrategy.php b/vendor/zendframework/zendframework/library/Zend/View/Strategy/JsonStrategy.php
index 7cf4b91f09a..1a3406b9ed5 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Strategy/JsonStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Strategy/JsonStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Strategy/PhpRendererStrategy.php b/vendor/zendframework/zendframework/library/Zend/View/Strategy/PhpRendererStrategy.php
index e8e04ceb3ac..cf41e630dcf 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Strategy/PhpRendererStrategy.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Strategy/PhpRendererStrategy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Stream.php b/vendor/zendframework/zendframework/library/Zend/View/Stream.php
index a7002dc9189..b4994f2dc52 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Stream.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Stream.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -73,8 +73,8 @@ class Stream
* Convert <?= ?> to long-form <?php echo ?> and <?php ?> to <?php ?>
*
*/
- $this->data = preg_replace('/\<\?\=/', "<?php echo ", $this->data);
- $this->data = preg_replace('/<\?(?!xml|php)/s', '<?php ', $this->data);
+ $this->data = preg_replace('/\<\?\=/', "<?php echo ", $this->data);
+ $this->data = preg_replace('/<\?(?!xml|php)/s', '<?php ', $this->data);
/**
* file_get_contents() won't update PHP's stat cache, so we grab a stat
@@ -109,7 +109,6 @@ class Stream
return $ret;
}
-
/**
* Tells the current position in the stream.
*
@@ -120,7 +119,6 @@ class Stream
return $this->pos;
}
-
/**
* Tells if we are at the end of the stream.
*
@@ -131,7 +129,6 @@ class Stream
return $this->pos >= strlen($this->data);
}
-
/**
* Stream statistics.
*
@@ -142,7 +139,6 @@ class Stream
return $this->stat;
}
-
/**
* Seek to a specific point in the stream.
*
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Variables.php b/vendor/zendframework/zendframework/library/Zend/View/Variables.php
index 6e153ba34bf..d889b3ddad8 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Variables.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Variables.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,7 +12,7 @@ namespace Zend\View;
use ArrayObject;
/**
- * Abstract class for Zend_View to help enforce private constructs.
+ * Class for Zend\View\Renderer\PhpRenderer to help enforce private constructs.
*
* @todo Allow specifying string names for manager, filter chain, variables
* @todo Move escaping into variables object
@@ -134,7 +134,8 @@ class Variables extends ArrayObject
if (!$this->offsetExists($key)) {
if ($this->isStrict()) {
trigger_error(sprintf(
- 'View variable "%s" does not exist', $key
+ 'View variable "%s" does not exist',
+ $key
), E_USER_NOTICE);
}
return null;
diff --git a/vendor/zendframework/zendframework/library/Zend/View/View.php b/vendor/zendframework/zendframework/library/Zend/View/View.php
index aebae58a096..242adea99b0 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/View.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/View.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/ViewEvent.php b/vendor/zendframework/zendframework/library/Zend/View/ViewEvent.php
index 34baa2136f9..84a7a3774ee 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/ViewEvent.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/ViewEvent.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/View/composer.json b/vendor/zendframework/zendframework/library/Zend/View/composer.json
index d61c03a81ce..44bb5c27513 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/View/composer.json
@@ -6,6 +6,7 @@
"zf2",
"view"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\View\\": ""
@@ -13,19 +14,45 @@
},
"target-dir": "Zend/View",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-eventmanager": "self.version",
"zendframework/zend-loader": "self.version",
"zendframework/zend-stdlib": "self.version"
},
+ "require-dev": {
+ "zendframework/zend-authentication": "self.version",
+ "zendframework/zend-escaper": "self.version",
+ "zendframework/zend-feed": "self.version",
+ "zendframework/zend-filter": "self.version",
+ "zendframework/zend-http": "self.version",
+ "zendframework/zend-i18n": "self.version",
+ "zendframework/zend-json": "self.version",
+ "zendframework/zend-mvc": "self.version",
+ "zendframework/zend-navigation": "self.version",
+ "zendframework/zend-paginator": "self.version",
+ "zendframework/zend-permissions-acl": "self.version",
+ "zendframework/zend-servicemanager": "self.version",
+ "zendframework/zend-uri": "self.version"
+ },
"suggest": {
+ "zendframework/zend-authentication": "Zend\\Authentication component",
+ "zendframework/zend-escaper": "Zend\\Escaper component",
+ "zendframework/zend-feed": "Zend\\Feed component",
"zendframework/zend-filter": "Zend\\Filter component",
- "zendframework/zend-servicemanager": "self.version"
+ "zendframework/zend-http": "Zend\\Http component",
+ "zendframework/zend-i18n": "Zend\\I18n component",
+ "zendframework/zend-json": "Zend\\Json component",
+ "zendframework/zend-mvc": "Zend\\Mvc component",
+ "zendframework/zend-navigation": "Zend\\Navigation component",
+ "zendframework/zend-paginator": "Zend\\Paginator component",
+ "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
+ "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+ "zendframework/zend-uri": "Zend\\Uri component"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/AbstractValue.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/AbstractValue.php
index 5c648b92268..bc01223edb3 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/AbstractValue.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/AbstractValue.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -347,7 +347,7 @@ abstract class AbstractValue
case self::XMLRPC_TYPE_STRING:
$xmlrpcValue = new Value\String($value);
break;
- case self::XMLRPC_TYPE_DATETIME: // The value should already be in a iso8601 format
+ case self::XMLRPC_TYPE_DATETIME: // The value should already be in an iso8601 format
$xmlrpcValue = new Value\DateTime($value);
break;
case self::XMLRPC_TYPE_BASE64: // The value should already be base64 encoded
@@ -371,7 +371,11 @@ abstract class AbstractValue
}
if (null === $data) {
- throw new Exception\ValueException('Invalid XML for XML-RPC native '. self::XMLRPC_TYPE_ARRAY .' type: ARRAY tag must contain DATA tag');
+ throw new Exception\ValueException(
+ 'Invalid XML for XML-RPC native '
+ . self::XMLRPC_TYPE_ARRAY
+ . ' type: ARRAY tag must contain DATA tag'
+ );
}
$values = array();
// Parse all the elements of the array from the XML string
@@ -397,7 +401,9 @@ abstract class AbstractValue
$xmlrpcValue = new Value\Struct($values);
break;
default:
- throw new Exception\ValueException('Value type \''. $type .'\' parsed from the XML string is not a known XML-RPC native type');
+ throw new Exception\ValueException(
+ 'Value type \'' . $type . '\' parsed from the XML string is not a known XML-RPC native type'
+ );
break;
}
$xmlrpcValue->_setXML($xml->asXML());
@@ -415,7 +421,11 @@ abstract class AbstractValue
$xml = new \SimpleXMLElement($xml);
} catch (\Exception $e) {
// The given string is not a valid XML
- throw new Exception\ValueException('Failed to create XML-RPC value from XML string: ' . $e->getMessage(), $e->getCode(), $e);
+ throw new Exception\ValueException(
+ 'Failed to create XML-RPC value from XML string: ' . $e->getMessage(),
+ $e->getCode(),
+ $e
+ );
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/CONTRIBUTING.md b/vendor/zendframework/zendframework/library/Zend/XmlRpc/CONTRIBUTING.md
new file mode 100644
index 00000000000..e77f5d2d5b3
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+# CONTRIBUTING
+
+Please don't open pull requests against this repository, please use https://github.com/zendframework/zf2.
\ No newline at end of file
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client.php
index 562354bee52..4dd260f6ce2 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -126,7 +126,7 @@ class Client implements ServerClient
}
- /**
+ /**
* The request of the last method call
*
* @return \Zend\XmlRpc\Request
@@ -197,9 +197,13 @@ class Client implements ServerClient
{
$this->lastRequest = $request;
- iconv_set_encoding('input_encoding', 'UTF-8');
- iconv_set_encoding('output_encoding', 'UTF-8');
- iconv_set_encoding('internal_encoding', 'UTF-8');
+ if (PHP_VERSION_ID < 50600) {
+ iconv_set_encoding('input_encoding', 'UTF-8');
+ iconv_set_encoding('output_encoding', 'UTF-8');
+ iconv_set_encoding('internal_encoding', 'UTF-8');
+ } else {
+ ini_set('default_charset', 'UTF-8');
+ }
$http = $this->getHttpClient();
$httpRequest = $http->getRequest();
@@ -247,7 +251,7 @@ class Client implements ServerClient
* @return mixed
* @throws \Zend\XmlRpc\Client\Exception\FaultException
*/
- public function call($method, $params=array())
+ public function call($method, $params = array())
{
if (!$this->skipSystemLookup() && ('system.' != substr($method, 0, 7))) {
// Ensure empty array/struct params are cast correctly
@@ -319,7 +323,7 @@ class Client implements ServerClient
throw new Client\Exception\FaultException(
$fault->getMessage(),
$fault->getCode()
- );
+ );
}
return $this->lastResponse->getReturnValue();
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
index 03c09959c71..9279478f9b7 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/FaultException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/FaultException.php
index 7f07e03f6f1..f8fc603e68a 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/FaultException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/FaultException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/HttpException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/HttpException.php
index 9078aab3917..2e2a7b74d2a 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/HttpException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/HttpException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/IntrospectException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
index 29bdec9443d..e9b92198ab1 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/IntrospectException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/InvalidArgumentException.php
index f7b237e9c54..3dc6fc6c882 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/RuntimeException.php
index 556feffd270..10cdf6ddaae 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/ServerIntrospection.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/ServerIntrospection.php
index 98fbac6af44..8172cd88bf6 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/ServerIntrospection.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/ServerIntrospection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/ServerProxy.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/ServerProxy.php
index 861b6159050..d4154699c15 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/ServerProxy.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client/ServerProxy.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/BadMethodCallException.php
index db36424ab9e..2fea32b9c27 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/ExceptionInterface.php
index 2443d4fa563..b28a0605b9b 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/InvalidArgumentException.php
index cb2c3d26695..19a12e5b84d 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/RuntimeException.php
index 1ece2b80f0c..e3e64031c02 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/ValueException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/ValueException.php
index af0a6e8b29b..683a8439821 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/ValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Exception/ValueException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Fault.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Fault.php
index bb1880118e2..468a722dcc9 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Fault.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Fault.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/AbstractGenerator.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/AbstractGenerator.php
index 693f026c090..3ee99c4f25c 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/AbstractGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/AbstractGenerator.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/DomDocument.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/DomDocument.php
index 3645e890406..08cbe07e6bf 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/DomDocument.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/DomDocument.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -48,7 +48,7 @@ class DomDocument extends AbstractGenerator
}
/**
- * Close an previously opened XML element
+ * Close a previously opened XML element
*
* Resets $currentElement to the next parent node in the hierarchy
*
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/GeneratorInterface.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/GeneratorInterface.php
index ca2af243b25..6bf712f4e83 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/GeneratorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/GeneratorInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/XmlWriter.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/XmlWriter.php
index f406238cc93..69c75567418 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/XmlWriter.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/XmlWriter.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -57,7 +57,7 @@ class XmlWriter extends AbstractGenerator
}
/**
- * Close an previously opened XML element
+ * Close a previously opened XML element
*
* @param string $name
* @return XmlWriter
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request.php
index 82a7eedbe2c..1217919194b 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Http.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Http.php
index d42a8331dd3..2566d452bd4 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Http.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Http.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php
index bcf748e95cd..efc08793fdb 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request/Stdin.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response.php
index f8537584e41..1d33d6e3b7e 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response/Http.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response/Http.php
index 00ae07cc9c6..311f38213bf 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response/Http.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response/Http.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server.php
index 0fe37e173e8..62f8761272e 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server.php
@@ -3,13 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\XmlRpc;
-use ReflectionClass;
use Zend\Server\AbstractServer;
use Zend\Server\Definition;
use Zend\Server\Reflection;
@@ -330,7 +329,10 @@ class Server extends AbstractServer
} else {
$type = gettype($definition);
}
- throw new Server\Exception\InvalidArgumentException('Unable to load server definition; must be an array or Zend\Server\Definition, received ' . $type, 612);
+ throw new Server\Exception\InvalidArgumentException(
+ 'Unable to load server definition; must be an array or Zend\Server\Definition, received ' . $type,
+ 612
+ );
}
$this->table->clearMethods();
@@ -433,9 +435,8 @@ class Server extends AbstractServer
*/
public function setResponseClass($class)
{
- if (!class_exists($class) || !static::isSubclassOf($class, 'Zend\XmlRpc\Response')) {
+ if (!class_exists($class) || !is_subclass_of($class, 'Zend\XmlRpc\Response')) {
throw new Server\Exception\InvalidArgumentException('Invalid response class');
-
}
$this->responseClass = $class;
return true;
@@ -589,22 +590,14 @@ class Server extends AbstractServer
* @see https://bugs.php.net/bug.php?id=53727
* @see https://github.com/zendframework/zf2/pull/1807
*
+ * @deprecated since zf 2.3 requires PHP >= 5.3.23
+ *
* @param string $className
* @param string $type
* @return bool
*/
protected static function isSubclassOf($className, $type)
{
- if (is_subclass_of($className, $type)) {
- return true;
- }
- if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
- return false;
- }
- if (!interface_exists($type)) {
- return false;
- }
- $r = new ReflectionClass($className);
- return $r->implementsInterface($type);
+ return is_subclass_of($className, $type);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Cache.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Cache.php
index f4e643ea6d0..b148004734f 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Cache.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Cache.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/BadMethodCallException.php
index d0828491ce3..214e4bd872f 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
index f0f3fcdd2e8..5770fc6c11a 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/InvalidArgumentException.php
index 059cab0f0dc..086af1dfe18 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/RuntimeException.php
index 285a40231e8..37e11763b12 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Fault.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Fault.php
index 7705e80e28e..1bf5b35cc83 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Fault.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Fault.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -136,8 +136,8 @@ class Fault extends \Zend\XmlRpc\Fault
{
if (!is_string($class)
|| !class_exists($class)
- || !is_callable(array($class, 'observe')))
- {
+ || !is_callable(array($class, 'observe'))
+ ) {
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/System.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/System.php
index 5b090e8dd25..c6aee9664cf 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/System.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/System.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -80,7 +80,7 @@ class System
* Multicall - boxcar feature of XML-RPC for calling multiple methods
* in a single request.
*
- * Expects a an array of structs representing method calls, each element
+ * Expects an array of structs representing method calls, each element
* having the keys:
* - methodName
* - params
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractCollection.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractCollection.php
index cbea6c3f2c1..c394df60fbb 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractCollection.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractCollection.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use Zend\XmlRpc\AbstractValue;
abstract class AbstractCollection extends AbstractValue
{
-
/**
* Set the value of a collection type (array and struct) native types
*
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractScalar.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractScalar.php
index 3e7b8eacb80..13abd3c51f2 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractScalar.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractScalar.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/ArrayValue.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/ArrayValue.php
index 99d77437b38..93e66348949 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/ArrayValue.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/ArrayValue.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Base64.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Base64.php
index 83c7a60ec5f..84de515e967 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Base64.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Base64.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\XmlRpc\Value;
class Base64 extends AbstractScalar
{
-
/**
* Set the value of a base64 native type
* We keep this value in base64 encoding
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/BigInteger.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/BigInteger.php
index e85ef953712..b7057882e64 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/BigInteger.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/BigInteger.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Boolean.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Boolean.php
index 459669b3096..49d21a77e23 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Boolean.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Boolean.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\XmlRpc\Value;
class Boolean extends AbstractScalar
{
-
/**
* Set the value of a boolean native type
* We hold the boolean type as an integer (0 or 1)
@@ -21,7 +20,7 @@ class Boolean extends AbstractScalar
public function __construct($value)
{
$this->type = self::XMLRPC_TYPE_BOOLEAN;
- // Make sure the value is boolean and then convert it into a integer
+ // Make sure the value is boolean and then convert it into an integer
// The double conversion is because a bug in the ZendOptimizer in PHP version 5.0.4
$this->value = (int)(bool) $value;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/DateTime.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/DateTime.php
index 9ec7253e6d3..fa9e525c8e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/DateTime.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/DateTime.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Double.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Double.php
index f5c2a478c38..4c71d81b739 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Double.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Double.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\XmlRpc\Value;
class Double extends AbstractScalar
{
-
/**
* Set the value of a double native type
*
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Integer.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Integer.php
index 15c24d00276..6a28b2f0e25 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Integer.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Integer.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,7 +13,6 @@ use Zend\XmlRpc\Exception;
class Integer extends AbstractScalar
{
-
/**
* Set the value of an integer native type
*
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Nil.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Nil.php
index 5643a8ce1cc..e3b33b6635e 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Nil.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Nil.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\XmlRpc\Value;
class Nil extends AbstractScalar
{
-
/**
* Set the value of a nil native type
*
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/String.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/String.php
index 77723ede118..9a94505cb86 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/String.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/String.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,7 +11,6 @@ namespace Zend\XmlRpc\Value;
class String extends AbstractScalar
{
-
/**
* Set the value of a string native type
*
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Struct.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Struct.php
index 98ffeb54afe..c58d23f52c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Struct.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Struct.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,7 +12,7 @@ namespace Zend\XmlRpc\Value;
class Struct extends AbstractCollection
{
/**
- * Set the value of an struct native type
+ * Set the value of a struct native type
*
* @param array $value
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/composer.json b/vendor/zendframework/zendframework/library/Zend/XmlRpc/composer.json
index 62727df81b6..b0131ee2558 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/composer.json
@@ -6,6 +6,7 @@
"zf2",
"xmlrpc"
],
+ "homepage": "https://github.com/zendframework/zf2",
"autoload": {
"psr-0": {
"Zend\\XmlRpc\\": ""
@@ -13,16 +14,20 @@
},
"target-dir": "Zend/XmlRpc",
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.23",
"zendframework/zend-http": "self.version",
"zendframework/zend-math": "self.version",
"zendframework/zend-server": "self.version",
- "zendframework/zend-stdlib": "self.version"
+ "zendframework/zend-stdlib": "self.version",
+ "zendframework/zendxml": "1.*"
+ },
+ "suggest": {
+ "zendframework/zend-cache": "To support Zend\\XmlRpc\\Server\\Cache usage"
},
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev",
- "dev-develop": "2.3-dev"
+ "dev-master": "2.3-dev",
+ "dev-develop": "2.4-dev"
}
}
}
diff --git a/vendor/zendframework/zendframework/resources/ZendFramework-logo.png b/vendor/zendframework/zendframework/resources/ZendFramework-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..58bd45850f8263d9de115957e14287a9e8afd086
GIT binary patch
literal 37536
zcmeFYg;$ha)CW3*w4j275+Wd=v`VLlNO!l0DBUrn0Z4bZNJ)3Y015&U(ozG`3=BDR
z-1GQ;_pa}6xa(uBcfD)j*=P6OzrD{xu&T1`b)q{&Fc|E*+{@?cFc={U2E)!GzyrU*
zlC2&G|08sGspkxXaWO&vVR__AxPf2NxX9?bXxP7TaW`|afJwc!e`Rq`&eqJ*Lfyjb
zwWni`g(wUb!zuS%O4DO%b5_M^`elm1{3a24Ya91XrX-qNw`QzslRT+rabS;-Br|I%
z-AyJlYx#PeQf5{zIf>7Q=%bJ%?vYPZ4->CGQ{4K6o56bj<JePPw!LeT%%2#LBv?R(
z|NHqr3;dr2{?7vcXMz9!Sb(~yjUCIpTvy4s2wResYe2=WH17Yc^=?eX-E17%u~!<`
z{PCMaB^pkG`2I(81lm^(8#Yg0x|s9`=YM{;DXU8ctB=&^Lt_8;8^q-&49q{XK~SQ>
zGoR#tPL;O>--5v;$_W$Nwq{;E^`tP#@Ljx$yPP$@jg4pO>FczwM)Tj%)*ItEFyGg1
z;8$`q=v8Hc?OmNRMuNXsi<J@5y4$`J5my=kU!FLk_aAin`li>GGzXoChnyWuyiaRO
zJ=VJvuiXC0HJHw^dL$;%-L}~0c#Q>Fy=a~2XjpgUJ$t!5Z9a^l2dqr-JK!+HQCddk
zj3Ikx9jA7zrP*CXYHeAE2Mo6KB;0w3$}!?nnf<40Sk0n!w?sX+Ja-*d>-2=uB;JWQ
z8#}lHkx7Wcf+1ssqnfn>OMY1GG21Yx<~rW}g#+_%ed<VnQcLMxP{^`(TNQuUV$;Eo
zs8cS(_J#;2Awm;{*&A=nxez)F%}?@3iT%@U;$ZiPXE6onB-`%dmI--oDzm$D2B;NM
zKoS;SP7m9u`E%0KpI_m#_QT4F!enJZ;YbvANKwYbpoMiW^}$-H?DA3Cf`W%VdF?_=
z?mVO>4<4kZk)^qQ!kV%qw-{T>)CCNtDd{eT=PKImn9`L#KbJf&0iD!@PL}lT$ENB?
zUqywEEvZf79Sjdik!5*J$it$H$XzDPJ@OV59Jcvvq`e{lSb>?ULIH8l=Hu-uMn43w
z07rzx)F7M^7Xx!@(8TuN6nCG{z{BI1E#q8tyliu9w)1nj2Iy49%*0^#gy=T-q}LhW
z&|Z;WInve69)Jr8?y#8R(${sLx}NT8(W=DZg3|@bK=*Rmso`gZsAsg?(@}GLHi;V8
zSq#=Ju(bd*Jgi?dLP-?uH}Q@PIvo#AhZ*R9+i_uI$h*GY5^+^eIGt;k@5T#*;f%9k
zF~y<H1h!fjz*$Kx5UZv$E32#mnSnb}Q>FLWy(d3ysmsA=yYvZR@SG-kbBw3wjK}#E
zYlLMllp>?gK)iRM4$hZWz8#W9)Bn;%Q^NdjTF3d{^t#hMHCzu}%L!eZ2IbY<_&FA3
zQBSPk<?UL!v^+O<Nt(Zy<&O_x2lDP>lU(7c&%9*ip?l*Lp?g<_BRu;VOe<2FNv2us
zE!|ip)%fLM4mZMYA^e&)3Co}y`*CX=$A33DJ#)tU+irN>?7=17)h<Uww;PM3<G;g=
zsCMl}6~nIm1+rXl9wyIRj1OBJ9&Hp|NVkJ`yD>>tjDt(-8(P7w{flBtet$i_Qh<Y!
za**7jT!TRF(Zjrv&UhfU%Lq<E`wK!C=?izU<Em;7w1p^lL>wdt+mGjjFjERp4aN@h
zrh^_*IVx^F^M7dguzlbT%cNe)h-kl{rPC%!-<wZJ_U+BX1rbn83<A%}WKDe9#9Q~<
z@=e0^zaBM4WNrzLZ}vt*C51Kx@?PgTFt53ief<_uWi<-6vA}q2{M0LlNTi=kJ*usz
z`b0^|nXH=>x!cfWEGmwBIJxSztl@pKGuGyN^>KUg-DKd2U3c|RWWuu`Y%fT$n~-A1
z1CT=|4g#r)dKh*s>?W`@Wpu<&%YW5x>D|?QKlN0~U5w9K+WuX0n=``^b1Q8fldF`E
z;gA94BqUnMPUtNdA}e?Pxkg{AQXkik-OPIh_^LTIx1u~VcD#Ppo!c@sxBDwjbBzrZ
zjrNPVx`r**30|6<rTb9!>P4LLm%G2Vhg=<WANZrwm9DlAsr{QVZ>yu6^n|_xCn|9O
zzLdr)8p@sD5MiXytM0GVJ#8HqC#}G^CTRR)_o#fUwvJ=omT(ig1fK=EL`x|s=}=0J
z$dh0LYt*^~_jL-ZDA5TveWu?`R&N}S`?iNyBT6mK!~T@fb%uDl+)#K<0N-1r?tP2w
zAyk`(1VAEE=Y@i#uY213o4=rrbQ=EwY;;|i(<h(gb!C`&%Dd@=wp@aD>qA*h^oxSy
z61jGHwskF@f`)HZOrd-eB!I5SP%8K;9hOCpFfESvS9A_o-L*(S)t4-HUk`gRvU}(<
zk@J@Q>r~+3FyHC~z6Wt()!A?cAcmbnvDx`pWtK?ZFZKf*_OVhMoA1|cCvHCx4GZ}%
zP4rCShZ+uWc-EpTWtl+P7F0d5xIv}j;dsYhN0!?rCne_JuJ;Iw#_)C8BhB4Kye^^4
z|FjO6UUuxPoi;-5hdjt&9o+m!N(PbAq7D~c{Kmz=@GQy8By@TuyY~YUcb5f6R=EH2
zo*BopN2B3__;#g#kDuBkc5RKwO#i+O_}+U2X&U%2!O5DzcWE;QNAhZ19-?JsG^u|}
z-fbAqZaC51hK6hA8{H9b{nNC$E|H8@OMD2KY3Tu^sOq`8ovo@pUH2#&n>w!M)(~$W
zlFtextlwb3Xv0x`3)g`e<+ed)5g6=XQL!KwMz@P&a%U3ErfIPJ%^Fm(8!JKAwoK#x
zDl~$xm3Iq-$cRzo!(4w?+ABrmg3oN7J}DKT{V4~^$%Y%$S-%|!H0Ub%lHKMQAw~?0
zH^%*5@LphBLS1V8NF%gcFU9v0VjXrrZVtNA+}MQY{RPyLT)<4KWvHRS&Jg@}i8qC7
znqYWxI%16}++Vp~^o3moH$2qH&Rg7CFO?mex?#<LT;2C571eMAwD<6Vl?o=-L8sE{
zu`l0>s;Vx6;VI}wmOf!b?$s%+J3lz4oW;yHt^NQk<Ir%3A0@;uKlG4MrULEq)6>Qs
zi$q;t`yhvJs6CC*mAiK=K!9`X{6&1B?tj4q-)eD)J(1WSZGZ~V(mh~X%%4xfz%$QU
zNrhmvbLxa11;6@`#`t|mb)kRUx>D&^?hinI%yNdfW&Z1>G01rUN9gxle_~~kBp`B$
z`vminYkj_*G2#4nX%?HsP=~k-dL}!b{V&SIgQ1geO9Dv^(xfm8U1F)<K*oSG%Vd7P
z-)_twH-JTvVglkd6Va%!E1Fek>K|f<Y$8kaqPb+=hilOT(r*fgNYIDu7)Xhz%QvU~
zICSZ8&r-+zf1Q_xuZcdoP<n%o!jTl3U{;vlQ(dR-y^YSSn@up~ahdp-nZY2m`rtpw
z9z!|>>8+EcbNUhU+@boQD(Wz>!`Dh{Id!flDvm7T!x;k#(REVCj2dxIIMt6F2E7BK
z!N{P%Tvi}Um(bi1Pc=O;@aNTih;^o4{6GcRQYJO)>?TfL6aD$l`Ek;Thq#snWI<wx
zTkSurklWS+HGU5dES?0^Fuuh+mJ^qs$OtC-=3C*p3^bhNMKfOW^;vv<d%C*!5NPnn
zzX=+cQ!b15oA~C5E|3TTk6BDj0N`--_Dr$na`JU@&g~^hN5dV47ClRw0SQ7H04B)>
z<>_4Ska4%ag0&zVxdVQ3$GsO@C6;A0@xSlt?VZyb_Htr12I80}i7IIzf{Hd7R3<I-
zYsqLrYIT+9ucZsZy8iyUl_P4}TK=p0gyMdB5uf?+9IK&Qvz{|Nka=QP)V6aK5W>93
zfs}h+@$K`0ln3JZZZrrsUF<}kr|o-nQReh>EFd;WW-;KTe+(p@=gLzTE~}=cv?(K4
zPWh--BoJ+oZ-8oix8A#`H%v|RP~xj|)?z>Z!#@9|)97}^cc6^>2LZV2Uzw&oO7}p_
z!_OuWE9_Yg?&i0kW&3Lnc4lWd0h1WR2?m7)D9*{C#<5&qkSh{a3Ww#yG;a84;vEXP
z{Y`o^b!b>8+ocRz^uoz5`x5acVJM{jKPC9SqIvd1=E?xg;%_#rCg9pZ=~f=;)AyZT
zT7ewM-;F3<W~$^`ui|Pzf@lT3GK-{2zp-=e8$Qp&#*K<W!v(pY6a8<=H%{N<yw3d>
z3@_W!D3VlhyX{b@8@WM26f{vy_Qxu_h#n#MHE24VuRO@2tKq}4{leWNayokzcd<Zb
z9ru=ed164YDGllqDQXY&c_oW&PrEv-u#V(X_@)&EeNGbaMT<7^NrwO$o)6*(fCwmL
zAOcobj+C*3z-iLE8cn386cYuHElj&TJJfzs?Z`<uc;xo(7#U@Pmd8thQk)jk)(3>9
z3?Nn=1ow$VDAT8GVL1*~g=&Z8Bs7U_TE@rX|CNUPDAscK;zn>9Ar7>k=Naa++qQ;x
z+SaAzyU`)$OBSDQr1O<8iY~Zzc|IeL?0KXWn3?(LpHg^_>v}vQp=Mf64zhd=X;Dz6
z5CGYF{wyQ?wecl?fGo0r?>r3+-?^}s%iB_prv!&5A((oA61GWfE3tal4pNA%_1C7j
zf4j&?dzjb?0hQ3I(l-*3cmL&3yG7pChA7lWHf_G(!iI|U6CD+#TDsjB5Lvb#NaZ(q
z>j+PTiPO70M`T$pYu(n(T2JZkp7G5U0)WInzRM6PB0k6&socN%Bj3Z=hR?7Js0qR^
z9g1APe?V3HbdEEafX92x)pxlZK-Q`-=TD&(L8a(ywGVB&_}P`y=H{~thXBz#E2}q*
z8re_n^5^$L)ortvuO2oOsZ`)XQwL2!Yt%3vmv<-AWW5N|eVjhzv+Swueb??(Tg`;t
zWnH2PA84K|e+(H*wtqI{4WvYF&;$sW91GgW{?sg8Bfl~~bZLIErZ{rl@UAgFIA0GT
zm7isW%?8md4p@OoJR#{|NL^(#Ns@5&^e*e&;Q?LL#L#l86b*G0gfdX@UKs{-p;Ue3
z`KzZwA>0~GH%-fx7hN~xX(r9=c9?CNHkQi?J0yp4O9xrO+@-xNkp(3U-g6LYdva|v
znL3v=9Pf#F4530-*NZ6aRstw*OEFP)EdmW63N>c|r(tf4AofqbT3nORzN7(M1K0U<
zSJLRfM48BF!j}De`Q~1l!M{+k%DjRIXybtEmmHxHw{?YVh|BqCv=o;*ZS+J7|FK&-
z6>WewT@Bab?(vKGY!J%rCM%LgUd6?L5Wxkm&+=M-zh8vqO=<*Kz2o;EC_AvH*~7i1
z?(nL#IZEqafBeXOj<^m8CW8Sd7weZ~X^~sX{_V+iMhWwCz_+L<?l4g4e=34{QC0&c
za{x-A44xIH8^W<n2N$yhe3@g%Y5LiGz9mc_Yp+Ff+JN`3A3|qMArv)~9-95>9=Pmr
z6S=8s!tNc+3z|ts@g25)dp=unSEj>G*jn&EU%*uHAYXSqAhA4|{@&^AzwlD31qo{R
z6Gz3zwj!K8=W@Z>N6w83jVP&B6f<DJqY5zy|AU|xWSGu{eY{uDZ9K)*l%LF>*?6-}
z$6_rJ4UhVvNeGVm8!5*5N574Obw3t5>H+Q^Qx#WiTAI~px}63802h7D6=i)gtwgOY
z@Ty?f*Xh3q4xLDKmshw3rX}zLjT|`+z!@)YQ-1*QtA9JBihkZ5fLX~4T#U!iE_wH&
z;&kmfC#~v6Db@C)iR@|RDJ9wt_^4?PG@c@|_3)^&Zf&W*4wt7`7LND>lbEP5B36AW
zB}UJ;>Yd@}>pafYNl2?baTK4~gkpaLF+EQ!r<c6O$1T%!`37f;#Mx#7TN9<J8j1f)
zDD#u8P75v9V#SGk{KC%E&}JjlG@u#?ldz;Q^cVh`HD_+Y)*B_#sS6m37fxFfZRiC?
z1?j#?a~_DVGuZXMN`1HkQ(EIMPi#bqMRqTH<>s1p|Btc*a9Dsr@dNIU5^RZY%G1sM
z?z&OnN@H08^xgddP9eH#^LN)Xw^ubnaTcSj1(hn8FPKfUOl=)D6j?%Iuy0mj`H6$z
z+i;@k*1Qoyx{{`p*I%}{djjJ1rBUWl_wLzJawT6!12rH;w15gj0jjzv(e$!CyMq3!
zokf2M<R}+j!3+JE3kFATbt3w=G<z=NN)k><kGSL5HQZZXSkNSc*&h5rxusfaaU<=a
zU1peRaJzXEO_oPyQ!}ZnoZD#)K*B-Z>8?SSO!(9v@=#}l|JpHZ{tToEQ8oD2PiEXT
z`Z-Fp`Ao-Y3GLU|ra`%F@hPKl;aOFDpYj0U{TDk-_yqu^K+J}?&BXjWKvl^(cFMc;
zBl)^da=Y95a<|)4$!K+fmeJfzoxZu@1y{f1T@L^oG;>h<TJB=<u4(HjP=#`^2SIzS
zVSh-|^cx2|t>e=VgM~%(lF3}d?k>%gEm}mvqu+V^tG60d*++AXO5w>1B6wZ%>i-2X
z0SYTFmk?Vcw}Dzs@RgN24uu7IZMxCbA3XLfasZ7yy@mR#PagL@k*+!VVl-?NdF#Xs
z$`l6&z%=0J`B2<Nm@Q#lp%JO-FHAn+v>p7Jii_CluZHuj2WxrPv;al)&)vnBAh)5i
z57<$FErTfG34Kas+n=8a4kKeX=XZv^P4ARR*mE$+cbRkOSY{_LQhpo%4+ekyUk(Wj
zH5E!2egd{83@;9o={~}Osz|_A#=b*&37Ss6C+c-IjKn{bZUGyk`3Zz!`|t1#2){G|
zup?LwQcQU5t#(S^=<m0mGN&C0hT1HSZw;Rn(7sM{&Ql(+Tv0}-Jo#5J<)fFo->ujK
zQbZ~6DQSVv+usGx)rN2JS4I1}0bNd;#=oMj%o)Yt)xTUyRJ!*KJ<X^ASA^5K;Fh``
zgs_a1;y^<Obt<Ra=rW=5S2uOa+omm8)P!(^Me{(j1`)h<pe>BMJDK19#DF^Efy>>F
ziy0$sUmb5%ebTonW~p~ApvloKw~8LI!0}P}&5x~E&<>86E;coq8198CO>&8)Bs5-V
zsYbSfnx7M8e=_YVnuq+xM-mFKXdK8lXaV5@RQIoK>VZ<|@~7`N5}3<9PU4itRpT&0
zTxFpInn>q;J?c`h#Op2x-T^c+z*=j1E9eKCtYS9GeMsLsj@L7UNnrG^$y;#`aBs3%
z%$*1?KK0#nW~HtMnBF&tLmCYB4<byo5^)U4GA*X6LG}Ny)B4i`(PYie?qya&Zqs2Z
zd(V=L<re#44t3brYL`gzDP|>|J!$CmRC8%GPt4g@Fzk0mG1dFpUP7S_p|vcN!kjrx
znvfWJ{x&T<nD2d8Wj$moTu`BBis3WIV_RSH#_QX#01#+cLIdUfHI<OZ&mbLoz=U;E
zbdsaLOB`$d?nK~|@hwy?x=6Et@Wl7tD`0fwkzC@DVk63tpqr+)L0cOT{zGkIy2TG<
z&8D>?D?KJjc(@85&0%z|nj7dEmwBT+SND&dQr_)bV)OHG0l?>vdUfjcYmp??xQGi<
znhfN!FNbu71Zh=USLaF_ZH~1C3~xzaR<!HE{$5>S-x9!Zj&mZ{K;xef?d0!&3<V2R
ztzLsc!8ejyMe7S23OHJzcSmMgNnVy6Rxr)CboTxy2(jiPBCuAe&<nIJjfW=6$q8<-
zAyrwi_&KSfzvoa&0z)8H(z%~yNIn~0yN8=I;nLhPIE#sk|25H7jf;NLna8aOP3e<~
zpbI<z=`HuOj)dkcwa#b>1`B+$E!tP@Nf-QnT6x9@iR6E%fIhoYoW2bf<1pAE=+jYy
zd`kv_VHas&2iUBG2SYUP8@n*$p{@Rb#iaxb!WkgA%6~vxL6_{_M=0l7X^Wn#LAyO;
zb{rT_x#wzM*#3Y9U}FGu`GeW@EXRc`r+N=qE}|wK>rOmdNGT5tabq=I7Mk3tK;Ud^
z(j3cA95ptgqWj+EZE^jBvL0Xq<WC9(SbJHqLR@2qA;f^EPjMO}jX$3Xc0YKwumeG$
zGyqe8gDAj1l647=qS}F9*1(iTG5`XE&Lrc_)VU!w*75uQ_6n;L72twJML;m$4w7FO
zDlJ`!$?~8wx&&as0tL1evlBoKAB47gMSMGAK#lgNeBDT_(u*560NL6Hzy}{>zM8j?
zM)2QX5EUN(wl~Edr(Y8x_G83_%Y{*P6MZgyYTbE16z6N7%IOg}HDrpM0qPkmU^bDb
zf%(6eGkgCo&-N@E$AKHL_yTMx`fsdO2lv7Jxj?px8V=y+ZCd(3AOcV@zLO@{S4=&U
z#y4Hv4hQ3X6FphOi#!JPl?~rI8=P-|)4#EM2L@a(^YaK1cVXDgtAPhIHQgUb16zyJ
zY@G5(vluo-VK=aiXwftV1X+(jrS}4}8*oNh?Vrr$X~0OoYge$-ZG?<&rI&cKa2?wA
zRa6}&LA_$M;p*c<C}NDjxIKyFTk<sRy&O2dNe81&0V?n<p=fPR3{35TN{FX?maBT*
zOyKa45b&iK=z++^K8<)bdHvR{cmUUNQr*P~Pd;E58Vng|;n5eMw%KMelRrQhUTW)z
zLDE4x6_NiY%VjN)1+BJuAPZoe(yhz({h9vwU`r+a&hKUNzW$0m^xPo13ViA|<i@Y}
z?YX1!H2!lKOghD@H3BNc5|R7)D&I(4zW!5ax5|1cG)h3Ru3GWmR_r72kzE3#iX}OH
zxeDZaDB75TCBaUM!}aE>%C;8GS_m3`;2rLLbMG>0Z)z9v?GhNC9aNG<Qp+=y$~msX
zcoaeW=Qr$O(|}&HJt-z=f?_O4Ok1D(x2=N?lWpyZ07z%~=7b++>hC-VOfsSfLWMI*
z=B}ME%A>0LVP87RoI$EZNi+djzz>*2^*tw~{`jLed*GvJ$l^1akXYdjBcZl4cVDL*
z0$9}c+_K)!2_ZpOqSLHi$rnnKZrk3)6fWLAn@j~%AJA2hUET<zu+C@rJcd+LC^Ec@
zNG`}nas0iZ{uRaj*@32Pu}qWZr*~VFuzN-!E}aR(6#+o0pQfNt+^lB8KCVb~{1unY
zHqp*K3pR%GScxEZQzfu`d=qm?vwaV`K2|dxy8f(ta&DAbzC{9|kEnRiqmb?tF1T!J
zL@K`OftTywz(n)kc$HNeJhA&o3lH9CKV%eHS{j-<q@v25T-OcN3Q27sthd1_<}iSd
zB0sn@<_SJniNj97)ayo9wrH<OvzCm8iyov*u0F&MUxv2d{;eQiybT6eeohWr(9%D7
zOb{B+PR--}VNOIZQ1pEQ3d|+*JQMyZjsvOaqPt_JL1$m7%+8LI#HBNyZ9zQCMA`9<
ziw?RM8u%z!#NKAGcbX9x%pl#Ld8l+G?%3;htfN2Xn`<rltJmG_d)2W}M#uelz<Jp7
zQthR8k~71ZtM1uB>seK0LjxMlbWFPTHz_Q0S#J_g<g8U<3fIpX@PNTrxSL>pZWOg-
z6l{H>5s|$^5>hSOXB!K;r|6_WTWb5$F@JSW2hyOngs+nBvG4Y&9Gf*PsOM;_6NDPk
z@SJAusdZnz%d5G|>nq1F`-}ZZ>=8#RZm1>tfajazDvKM&Y>t`DI)Rsj8$P>ZI0d7a
zg>@Yqs{<)Q({g7O@S2)CWHjhAYJz@DHYvAVI&y66k_>$=1ZOSA-}$jEwU+lJ(d^6=
zAMU!EJ)BeS<L@HkEejhOt66dVNu{3Dovm?$#G~|E6a8)Z+1Hl49xsoMM{wE_Jw^Fl
zGa)=f3f{3yQJy!59`)PGQj?{SnT8o*(6|S~>WWov1glu}5li(eU#*pZZtN5}k9bvY
z&0@Mxa$Y7+x!2}46jh-t5o89%Vv8X%u~#+i0ja_;Eg}h<(j6PlUhZ{wX#d7d{~4!#
zF#)Nght&O|+U{aRaUE;yaqcq_@7_%yJw#h8Q^6hn(!d^*;vBaJ*!yH??c=lk%n3GT
z3D?Akr%B1M;bFh^3Fl2GvcV|rp6#ME5>L$rmh+u^#Xe%B(~@&fmJFs^9<di3r5Zsw
z4vlg=Ze`LZeya4T;Gwo4OT+f%ww#xDF0a;Y80kG7)n#FuP9B%Xmb%*IihtX-O1v7v
z7ROX0wPrCdw)DDCqqC|fBO()}i}KcE-_3Wzr6H5Ey$83xStkQ4EecC|mrp{Uv)#t5
z8S0U4zf-42cK+1dLd<`?_oIT(<&9ChS9M!qI2yiqmhrH?`NPgrK+ki(jSY)OJ+i~C
zP^)+N`>qttsX%p>G0|GhqRgaQx*ooiSUn2N0jAXZb0KJ<;mArCST6T^H~V9$f2H*a
zNHX&p65oE46j$1W+yyDLXt5$=%LCmF%2ruRG1&YK&|=BfgV+H;i&qB>VY$Ec$f$Gv
zD+KIM_;dn0spWNA_zM!B!LP_`-_I1b5F-Jeg^_#$ODWcOw*$=o<D?03a;6ZaX8Zjw
z=-U`^F;hXYgB`W8a}_N_M_&Mq0~=`m*1pr<y=LnE=jGB;%v6y+V2it$T>-ATZ%lKl
z<E6?SaPZgT*43_wSyR{^M4LB4P|6L%fu3{{(fFBNyR~`FpdP@eS<L|XaHoGENN3K@
zNj97&D+WZfT_j_ley1HYqEk5dm5y+e#Ybd&(zXSP%${C51a$wluI9V<ZLa(kgzT;g
zF6G!yb*v|HYEzB%2Tmo-?jBUTP;T0R5uHaA;6uJTiJ#s&XD5((!a{*V@z^I986`cH
zKUz?eeObveJ|0%uE)*m5GI)dqQ-y)<)-5v`cwiimd461WQIQw|$tnX{X_qOD3-Y1T
z>Efw~#hOXDREs@$A*Fu<@c|H)*Ayifv3P7*U$wL~GytI;)8kJV|LildHH21*QaLm4
z(WtnlT%T@Pdf!m80vK|M00NQtH$Rm*dV9>bKyxpm9pF&uLs6SV{alW!o!DHfpE<Rq
zaM0t_yib_cA_$GDaD_^r!l1=Gj>9ZH)rg=kF&V-77~Bp}!#cszn?#G~gd;v%Q0c}k
zq0dAg;VK=qsdF=PAC;ln9tYlX?Plk2lovg2yBVSnGmcWgK=R*aibs=5inVmOc+n$=
z<oqSv;Z`^J4j_cXi+C1Vh)4e_vd(VGIC(c&8p3lOJgXxEe$5{L=MX591J_(>yL(mR
zMp?}ANP^T9bXpGI_k@=F=rY+5dltuoWQqdGQ9(Eze`96K2PyH_<1U}e@22hxR={3z
z8#0wAWvxPqdV=TA^FEK(l8&soVdIa*V0`kA1`P=ND{MvB=1Mu%7a<V7xb1jO317<+
z`05NTVyH>|qG5qcYBvtp)!_4cP#o&1Zbz11cf~&W8kDQki<m4Ef#v!J5s~_|x-0f&
zZ&Vs3_PJ#=G>H7=y;#UN`hefY@H7Z=H1sS<(!*!tm#ZW+%&=v`j)P<>z;DrighgSt
z=w19q;?H(x11rr|O-<fCb+8pef=@2!Cana^6og2fTaYM*^CpU}v&nYxHZKzba32qm
zp9Xdpg5l!Df<^gj<#)pjyC4J9K*V<92uX>p8Et6pYtvBg*We#H1_|3adsD8?lt=td
z%g#-Sj4wqw7U)lwS$MCWDMO`O9(stzaiGA($j3cn`~Zh~u6H;1UST8Uu~d+=J=>+o
zNffegfE=8K-by96KyvQY#j$L~x<idjY+gjYZsd`L>8}ZfjTn(93rRnY*yFrNNeXf9
z0}{jp@WNDX1Y9LPn+;%uZ}@({#m_x%;$pJw!4lwMDmQH4(F;WfXz-zaXeO5R23x`+
z<;SiZu=i<an21zMZp*cnCRJ>I;T6Ss>VVF4;twU@tfU<fr6dDvx5Rp5gg5lw?7|*;
zX1N13=2gM>2&0I-I@RryYYnY+XP0QVQa}L{0%=eqPxpcTk+j;lBlybZa%^YF6WUvJ
zJab@6boAE5>++`iLizzd?{RGviUA%Mz$Dx^auHM$Q0o)h0@}b38TrAVlXh62(4T09
zI0QEE^f+4_$Lrs_**z+t0RLboRGMQxz%%2r{c_!@-ZD6RWhuI5v*3^*4@-Ky{`1o!
zWg0ZF!Gb{h9c6Z1)qg1Mm?9|7CVlmgaHA#6+|Ite-R5t-I$jr?^9yN0TYy=*Gf&(}
zkTc}4pHjMH1;G|i`kZOH?^?`@M0C^^(K}39vr1OrGR}8@QfhC2f{p}~CDqUgM_Qn5
zX{XzX0cqBUQg|VGUepcfK@;ZuVE*pDs|@Vl6QKhPD0)33U`xFy&Vs&M7Stk^K4hM=
zo0WaLl<fx=2bx{X=RLhkO4`2p8A$T37rJC@MjHb)nt^}6`uxj|p3ct{<zh8;S)aG9
z{O_-8;tog`EYtt__onIs9+25)`PK%sQu^+F{^4HThvd@24rvI)4vVo<5X@^ofkall
z56t(PdohV!+HnQ!@&Ydb$H{hK-EV0(O=8(nm+j3&SD6HLAOSAH7LjdCjn)#Ng;BL_
zd74v8Fn`E`8Ys`a3H#W_3R{JGID!lSM3&01H_2RoJplYITF90@n>RvG_BzmYi$Fok
zLYs*gaQ1Y#?(i>2#K4Y0J`P*rzi>6Wq-<TS*{2L?jKHSo-m9Azgf8{30L4pw|2{!L
zJlj^RO7BpceB(y0T@rAV6GuFZ&7qa&RERw6g!bCe5G1PsFs@t%?ySH3=)Zog^JlLv
za*LO(gAZUqL{ga&g@_5vo9d(W9dMWj-T^=NJ48PaieOTpE@|WI4>rcyH^5SRWNM{P
zUZIUBPJZ)A8?i)$J7A^VbK86V`3PxgR{L!it7~LwiGREno@L>x!9Hh(efH`c<n4PS
z$B7+1A$HDs9w_qMNt^ln`3NS{y#qmK6|?n%`d(Q24OmHZJ#G*qA>joCC=tiZC@i(}
z8NY}C#<<Y?gx37QZe!EzoCG<K+@9s`wg#6kUc=lP^?~%tdO42s>Nxu<jX+v3^)K5G
zJ!X9muRng{@+2LTL|8Y1jT#X?#Av8+_)EkT<Nw;yt9Y#QJpW=fhewfH;mcgPV1?GJ
z8!vRg3*{vt=GF|3{~0u55-3&D^VC&cIx~}Gr%}o2dZ!v;?on>>-w0W>Z@>7rx;{^S
zEoQ20ANo4;Em!aIZk@@eS8%s69QwjXZe!9{&zmc-v%&*^%rTq_gZt(yfJ)AVO-{A}
zjA^l#U@?}LXcN696aAJrdQAmu@xgo+^L;4(5Q5M_k8wY@jvLBiF~=W)m<u2FgVjIs
zG``XiJ5a;@du%YI4ao?riv<dqP55bd+~{pJr1v9sKiy5-&M10xBV<YM-mswAXeKu!
zVS=j)bXqbLT&&?W;%7`KEm))2O3-<*`3+yRy;QJ~)`tQ%W#a&CC1LM?J@XE}T%{37
z3r^qvV@~;p@_JzUQ+|2UXZ36`mcM0h+NWhHfAG3H1AT4=bB`*<S6tR>n8Et2+jzOJ
zOkJNpak2W6`raqo3Z{oQK0O!v+};BD6t*h|E>?FR6`>3SuMUb4%o%dSMwrdN*Lc&8
zGLJg^#X}^`aS=YG(Ak-f`L+m(4LifTW(4^O!A8k%qMi``^^A5Pj-IlIE#`H}WvN@*
zon3C=)pLX6{`H&1_+cdvjv=9I6vc@;4{mYOPic|8nmo)L?C|#uA)xgmM!Q2-&zk`=
zn2Vq!WIJxii;3^Dn$5Qc1~i1fl>B^nmd?XN8LTGy${Y4}5ORh;K2R@gef96;ueV&M
zgOALTWdF)kF@$_I_-x9A>+eX;LnYTZ-wNHEp$q~hA!TN9@|TBI^7%uO5rx)yj&|}_
z)yRl883`GJh_-86P$a;11Y<D%yrL)x5lFcne6u9um4He!UgJvoUqvX1?EtI`iuYZ3
z{`|18e-hJ6ftv%X{{H;+_V9;tkZ1&xgPCyzx1}a!sTynh1=J&8in5jT4sY$x2KA{s
z3WMoQKAFLZb??P8<L>KQx4mZr+AIG4_wa#;0d62&x48NPOyw%uGT6b>vPnD;fe83x
zTa8@HC*bE&Wsov}W+9m9``2Rgsu`Hfbe>NjVUNJk0FIC`TtnIU4pFPjQz_~p6|5W4
z|MNuQ2<#eEiIR9^MzH*4@^*N>nx85C>cuKU2SS&5V^<ZV#+EpAtphdCU)n>18S`AT
zZz+^V(OxRl%sQ7aR>XZfJM#XmU^v2X>tB3xL<0c|jSn(4%m^%}{lp174-zWp&lkCo
zV%t}O+Fy7Ii|Eu?^m8Kb_j*X)ko*^rFxn{AZG?vCqr`6HErr?m^>m({=hlq=az-Ra
zvt`fPshQtp8DpCl$hDv?U@%I)+7fGH%(cUuy|d6wl=W2)#_x)Aw&uzx^DLe0>g;?Y
z^USfD$_*<^4G5ht$mup0vSOw4;7xhC%(t3b0dmu5_@ECZ(SgeIg<}KVH-4twV7+&2
zJ8)KMSZY5u_>K0`^LRpHd+hpzL;QCgi8H5U#Oilu*js;A7le5WTH^l;@ba(MR?V>N
zOEk@H-NFn>+;ruDIc)Pw`{BSO=Xb4UdF_3+$Suf2a;zs@e8lIBe3-Yf5PY84D&(S1
z#E-wPcs9&vMe4diW$mpwY1Z80BNpPE*n*(T;HIvbtCpSZ#NA317rq4D&gzBx;+VID
zw_O-!NW~bFc-o6|cwJ-8?_&E@=WD|cTVzXQ-;tGUZ>!}<;%r&(RujXigz_D<N_a)W
zh^$Xrd86O3U%rcZl6a}T!mmURcOOxS&#T@?h8>d=mNR96gTjB7%gRbUsoOG)d}!0p
z@|}Fuigk=LCHzX7#PJ2(jDOYhE>kb+8~SlID5HylN495f(xw1E^KN{de@WeOy-VfO
zdmM2RSQm?0q?+952t!U7mFRZE@y1}wrHik?R;d6-lwFMB71;&G>x9#!sd`J|O4X)~
zQ?=}q)YWvB&(5BAyh~Um;Z)ve1rmQ(G|4X8eArU@7i!f*%4F-|dbzJ`u$Q09SNpcB
zqqf66b@$H9n3KJ*yCbE)k6d?@dTKI!)a(SiXh}iZ?F=bDF{t%=w6Qeu-3E_XDNy&3
z9`)GCkevdDBocRrr`tVD$NCCBH>lU-bTVEg6DV>T9PBpHcOcnhT=crd+Zf||@^v|2
z<MOPH;}+&^oy6G;62}$m>Ba}wM$0wnFBkHnWR!!J?-&1YmP^dUF>{B|n$GA;P)Yxt
zd$&SYo78`r*MO-pPa5pomgP0@T2i%joh5WmE$Me9<4I^Ez}i6&M$S(EEwp&W$N%vf
ztMtpC0lTC4bk<w^rw{zqy2?{8t56bWzL%#G7>lX}GoBIA$H%88wzrI01(uzKAKG&C
zA}xyU4ApZTPco;v&RZK?@A>qnD<7Ti*qvE+Hh4vf%&*~X9}_HSEk8g$rEJ6{ounFd
z?M@+q^ZqJ9GTVF%w$yRjBC5YwMP6RWRq#^wz!5&IVuOM2X(~qfJh@3m46OLRmm?nN
zk#(hpm4>FP{uaPe%#L`6!j?8_K1G^2E+m&Lj#!cq3nj1Imc_6cK4r>%WAcy=T~+f?
za<LIHQ7bQasN2-aUn=0W*IvWiVpP$&sbw^MeV<;=D~z{JoHLR8haAar#n$2U>p_Bz
z(wOZyT656nXLOW^L~aGD9{#wyL_4Rz=&xpTHYgGDT<pbtHL`i-BBzFWRrhPhiF8<9
z&bIC?VIpIHjJVe?W_La;XzxlN&$d^#+-Ra4eDL>=Mau%q`mFVwbA0ux3`LjKgcaSH
zpY>im)!%x{=?lI;Gs_+OSb6vK$m&&CPis9i1imOmAMl0-us)yEBI`<?^dt`beaajR
zhmmE-Zn12Ii<kXjCJ7GOZP-TTkr3x>aI8rCogJ;3&C!hst2L>2%M{HgHYjV$<cM2t
z-8%H*MyaLA#LW4OQKw&T%4)em`a)H}{ST?LHP``J&sFvv+GH`9>-$-{fcj+b`h`10
zz?JEn#hx5>-h||{Pp`!U)AkoKPT45dVqqPB;*hb292~T&9ZU{of<yvkm~sPYg^k@d
zWrV+i(Y$rvC_^c^;i6-L<1`Pwu+yNZP{iPdhfn>R!4d{{lguOD^FL`p6)URC`okFx
z4j+wr;$OG)`)Z1M0?dF;BZ%)?v=0_Yu9YS?*CWKDeWO0%cRA(fdz+~19<aG7|FV<W
zLipv9Dc|;?MSkVXQROzV?FP0<>gyJ_vd1=mEaje28-JNZ?UR0aaFQu-?1VFN!uif#
z@PnS%B3vZnU4+m0QS>-6ISdpFuBQ8rtSQ8?BPSeUyk8guCnUz@?_|7|n2~+p8a7TP
zH;N-z-&pP-OiOOj9h~1MY8hXgSU*?eRPA~tW<oWHns4OVsVTV?&N(huy00rr<<(}0
zan@;CPru#tlfGK)+p>xKA9A9+0?U<g+q)}onw}>%a|6~%fOV~MHTvN^qpPTEmT6)h
z&661FT|>Ff*tCScpsrduSrgo-kw!yw<;1930Y2KKlK#Ed54HLRTW^)OP8kOchOP6o
zTF1VQx~e8Dcgieo)XX%^yYBvQ2tRGyO*?SB%+xk^GHr!xbHyGS6UbD#vFLPQihLDM
zWGZ-BKyulVe<^wSNh4Mg!Z>&2BXrqqJ>vGAPRft-FU_BIvt2|z7xV8K4eGJHXg)4c
z743b5d{2|k;e#K!pj%P%B~W4=+r%Kyi(jLu(k;CYENj!vQ5Xx~U8c}Gi_YAIJW^t)
z(W*m|K@GlePUXNv2~%|tR%IeXr>f36Hr(_|O1OWBaF`5;u|!|`IJdR398bIw04XI$
zX39UkaLjqp-)Td6gR}?kN%vIM_wEl80pMSQ!0$P(c^&k(5}8a)Cey#3@*?xIc#CAK
z&>^mch22V)o$LlYZem`X6t*wx8He<c0<Ahuzo6<{GxE1T_pKG*&%DW!ca-5Qavs#!
zWGHT(i|*$UzfT!JPE}2hern0x9(9%c6N$JOZ2pNRE3{2K{Smmh!5>0xH+rp=zX!hc
z!(~g{Q}s&QBueOaSpQ0OZem<g{{R}(=WZ*V#c{Zz^GgoErxx-HseB6c^nxj0cf9Kl
z<X(;j*cZk2YdJ1)G98M=9KfCxIxjum&-Bt8j(7u#ytS)FrNz~D!Z1CSz>yi|&$`UK
z8@tWlD+k-6*D|f7zCLQ16>h&bjIT}@E)2qWUzku{O(@8R*@$d@>G{xCzoc*JJr>DW
zvdeQ9ICkuNL2G&wd9cIAmmvrd<^<nz8~->xChj!mcljG65oy<&JM%i$r<&U7?=3cz
z2S&`OW&S^CQH^k9;1A~}()L+UEh#-0;OUMwl;@|+sM#_TR7hfXPPm^4p;wrgvO6=H
z@4D=$WlC8Z3AY!*2Ea8PEA^!3>AHtM3@jA;I&U6V8AX5X{tUQ$t$4?1woT|WtR8`A
z`O7vlGv29CsGv?YBv$va$u)YKWx{R8_f%#cMJ)7SquVp{zG2YwmLaR;my_l;fLkA5
zHBGWIvmom1`;mM^13;X;<y++dSYxD$x7;m<UJZYL7J>Ug`cGmX=QQe760_KgbxVkC
zbwz>0>iL-a{g{$%oPH3isp*(I!RzH!QD=*X$1g|w9PQ-*i~RQ3QqLr#p8Z$9TPN9q
z?lGgJ7H`=pOo!NBRa~G+?kJ~u6do+p)wOMW*}Php*be#h?!}rp^BUIIx?`CD*+Z?=
zYk|)yjqOr%Irzw$L`x~yy{oRi4XSg0Fg70jUTMi<KRi0+D)y3UN!U&1i!okJm~z1T
zn`7TgAIoKjCKWZy@w@wuMbea<-T3fY>}?ZHe=Vo&qmAz;={zvSzs-gZO3F?Lk!ORl
zj0;hlU+~KXUDeDi)fUJS+;Gu;y;ExS>*>ezLup)Vt|cEL=*ENlgg0s!ngr~|kvLZm
zjRSwaejG;=HZDLZmtBaleeOe9-v6ZRjxpN*2GDcb>dRa-&nG9d4&lr$a`x(L)l2XX
zb0%klXMYO}NM|x%4&mrlFIMg>CF38ODP(k}WUkg0UafYUv?`ok3%pid^W~El>O&;M
zm!6r{=Su!zDaG#M&VGlrf^Iy^x>l1<iMxu;jiY)WX=Jqjk+?eCJ_-qY3E1WY_Wago
z{(D_9)SSwaF}q_Ihhypok7Kdz=C_wa=3jlEf1sDtsJ&PX;5oOXZ_<pxI28rcmUYu!
zDUFW9j@;>wr^ZX){h5$p)-Ag~N99a^BEbB2ZE#OGUhxO6>#qS!4~Zw9-uUe!nGQiL
zx$%$uB12RUWO?zw{@4wziqgdjb&gMS=ToG<Dl(*ZJj;GLwCL{>gewMf7To{(<G%`f
zk~@3NS+{zI?U{!v62ra&P#1R){{t_ER_(5%;eOr04gFDNRNS21%NGH>#l0Qwr6wt@
zVjg-<%QVd?kKfVR?Wf<6bf$Zo{wXu~xge%wF!K}Ed^=Yl|G~z{Z9-4lq}QS_y9%@f
zh7pq=Xuk6;dVB3hV{-&KGM|!j!Ljj{b9epQU_;ckI7|hq;Yf_P!Hm;NXOA}e=av;s
z2F9W>VW&fPajw-j{hP_Ik@fV*Xi2NFkG9iuW<9bg4UwUEo=@uJO8gx>WQ5dFT_;1v
zZp%lwEk4mnLE>2cp0;O$M+)e>e&@>r-9encEUYW%Bs4LjR>KBeuUo>ue3V_6|Mk2Y
z{^V%C)joWW*1W~P(zq$Z3rX%A9-G*V<7^!f#8<P9Yc6=FYjgY4{bqOv;voRKn8i}y
z-vZ!YY2WkZCV|}Wy1A-C996xG$5C;+_-A~J(F6s4ovXcCuZ%Hr9zz2-Hzpgao0{f^
zBM~io(`xk>^&M!qXUm-pRQs*hUG$cRu4vcYN={L2s^h5$g|tM{2?e%IIE6{pVkA@7
zfp<juw~fidNk+He4YZ|Ydn7HZ`$c7w@uqlP?N%ytViUKq?|s1@_>eOG>6ay8iPqaq
zm-|xGd93djRd$cFxUgY}9Gl(`u^9BEQCV&x7F|H9i4yfO`yUK;B&tr_$6RMph)#A*
zC6H+|A;zICf`|0(xXJyEH{VQ}t_eKW;cdCB+>Ia8$z=J~y->=m$@?M4Y|bM6VOFDv
zLuKtnyj#c`u*6-uwXvnOmrtJkp&~N@JAle*66YrF>%QCCf<*2#7}wMV@sg(Jx4ZE=
zG+bF$xGXU#_i1<QzVg3NZ1dq(ETNCCkE<z233KQFUV&CW&LWQq6!-Djs=}3(rn!6f
zaiDNnLNV0{m)f-N-q7Kl6#yHj9P~w(LJPz<6UQWQnl`Y&Uo6^9G5%%L&h5{+OVxsd
zxZZ@Sal%F4mR;b=BI&c}m^;IrXjC)Yd2JM&OiiA<ZOC0v9BI@oupQ7t((_JXts6{%
zn}z0W3-yzyo&q-C)K*DYiK%7nPq(X_Y0+y(NXK{f<Oz$79}P_Ee6@W3uJtV`eW{SP
zZ9+bJ$_MrxecO_c(;2`YfilJdi9nNusqBqDFWp481UK|jhjMjx7}eYncU>?uN~k(k
zZBtMXfi+u|Uw5EDV^7sN`M+-A&3r`Ctzb(L&r7K?eyyc6=bjt^>RP;O_<ATzWbJv_
z`U#0F41H@NcM5MJoLjm3^YqSRl=nhs&DXA9KE9l&tDL5Ws$XpkX2l*C)cZxRTQMC|
znDLeI?CaglnGYIfS{f*lUygsYaL@WP5NR)?<J8>K^1Ube9@tp)2iL87F6o|soAW-k
zn$u@EA7?I5>S<v@{*9EouySwFj>XU(#T(d~8z)YN`mu)eP=|v3e(Tgt{+JX)M!oGF
z<f^m3Q+QtLUgC8TZVS4>%<Ee_%ttF@5nitDjhBPA!(L8WeKVxmu}AhMrTv9vm)-(1
zA9duiT<2m=a_eQb^)q{-XdC-9-QT=a50X6#y@B|W9)DQ-G6Majx}gBX(+;aERovx%
z>D8za%{U8MSrDndIyZQiz1GsgGxYrE;o`ypw$t?UmU1&*o1D+{re7l1-zaS~)=uxn
zd|v-`gcu64B_B_3G_G1-z3-Q4-rbi{EwI^|@Kn!FBu<QXWxPiGBIoLSf+uf=_2Qv*
zF3l=Ew`auG9PXqA75(!{dJatq$x9(M{Hd6f0@fnGjNlMpHpxxiv$0oWc}t>14zoX-
zzb#V@HG3zTw5XVf?$T3N`FgHXlIA})e*31G@5o))jqE(ZCZU9EdZKaUXsc>_{^_Q&
zyWt*-4&Ci0Y}xcWAL@-!{)J_R>#W_pIgB^O`Yu{RhY~ua0SusH8xi6(p*#8hnw(q;
ztk*;rk4~dp$NUCjjZVKs-;XJlbyLesw!M9wR+H+WaYcDkpS!$R=P|1r6f~N$Sfmw$
zwe(u6G~Ll|W_L=L1s7=7p1;zX^u#1KhF++aRkn~=K2D*zF7hUW#cFW*c~s16v7z^T
zv!)BIW?=DjTx;g&XynAHU6N?b)%iFmfqZ;}i;R0Fd)>B|DWZgaUk0)8c{%>e`;QSU
zUs|8|Fjv@6bcbJ}r(MV|OKp2<ij31uiu2{)*qD;Oc5gYpSXj+AwveBUEfy#<igCNx
zU~^`jiUuroGr+Pg?DNNK_Q*kjn>WFN?x#?~V6E<0hvCf3A>VJ}WskR%4Q8}PL#PxM
zLNmc=%fj);KdM`QmRr@JS-qo~Y`z%(6&kW%{Fcpiqt4huVbXxT#`EB45A}TORPHOC
z`a(7{s=ZQps4n-tzzO-(L8eK7Spwl_$dhQ^i^LdKp>F|oS1hRDcJ)tk5qI4t^&j1$
zma+V`gRfv`Jsuu!5!YyPHp0PO{7Gf>%!;&{tHD@*@2}K3Tq`!ER*uU(_xqdF#59m;
zMke_ZY)|>Xnz?UX(uDcW>zdaSeqi+AASZ*|XA!pbnDZe=0+Yj)`7+y#OhIUG8N(21
zxF_e70JRG6;CT4O96Rk`b(PNdqzsj$s00?NN3&|doi(iwJ>8zg7ANKyw~);U@U?N|
zAEjG6>tgr7%VC|&2a3!j(6*BDTkCAPS+-SAcc0wo+3X7fN;8q8Yb1jQqpZ|D5IRwj
z;_e@S_XS&jPjVy2m_1z=>nnw)hRL!VPMlkR;XVGX%F2T`Zo={;Z7y-4+TW#T!U2Ho
za+0Q33iDCqh)eTwo<U}9@MWE;p82_O-CoR8Gczjq$8d44*ex4b->!KU6>1Zzos@{c
zoRtS7SFMTH<1p|*r00x7`rvR-`k{~K)JSCD*F}zQ^*a+wg&JPb^HbD}BkMk_G_hq1
z4`ML){P0inJYLees=orPo=ZcllHH#1kjc(p2In{=nv3jjBiXR2jexQ8l=t)nRL5g|
zyBQbu3VsMngni`OL{xM43EKG@I5F$c-DS#OkP$2$#8iz2%|hyv$%p5Hg54l8q?n8@
zx$cA{?mS?II>?vqGgo|n;^?G+=PeS`1nu{W&j$BJrqX}=?mB4B$lpY)HD*n?Ht!$>
zbW&TFknRkt<aF1QENH7g=iCa~j(V`tm`>sL3^D(tCvB;DvL!Ykx)@*XdNSIT$Cdd`
zwqa5ja8B5YA;B9)Jr%_S8<COinn_%8>X-{AeeUz4{#SpETJ*)S-D9(aUEXhBb=O+Z
zxV24D@Qt#vepEaA#Sk-7)mGBN&3JOB6oi&%dIJAkU|*hiv4C!pr4u7~T`u=dzoFQ7
zv%b!W0_`+<da;S}6WS|<bBC_Nhfa^pD)~*<%Je<g{aU{Bg=tO%Ek%%E-c=z^(;0tX
zy)9r`yBjPqh_rZj#++379QeQzKZRwa<>~b0KG=$|s)5~h$^!MwdW-sH-Bba6s46+B
z@+h5dHP@@@eQ33ux#nJS_aO@N%unZQW5xnY#6Me`Bx*MVZC5|`L(HV$2tE?JRc7sV
zDdkuJF-SJUZX*wlik)}w0EXdt*gdbzJ^X6AaFQpcALB>usnfD5Q%SE_LJT+3*!op#
zS5V9v{BCI0b&yr~K2PVdWz)QH#zGSfQ>p>EE;6V^j*q{<_27AM1;EkwGC7jboQ3w8
zHlNJs!3rIgumZ3=Iqp4qFN!UK8KdBuf+e<@WnE0>1jbKsC$0Shxngl!Sx!daeLefM
z))UVh-mM4JcgM|Va>`U(6=t-y^}V#)ruBCEMEPC>mOG!r?K2+Kk0QtCSmmDu>FHu+
z#Yb4On=G#qvhK_v^RB={26|ijWfU&V{B9Oa^exOlP{UE_cYVWxL0n&TEz0bK<pNob
z>xAWZvjg>9Sd2etwPdKNSkq808+e`giMe?hzbYMZ2@k(+?>r?*C!wTD+4b|r2v?75
z#`(Ve)n#$LE}sZWiXIcrVn5fFM&Uz&r_TsH)WxJmMrrm=mQY3?ceC|WBTTT`wZZ$6
zKTpZ=72dDe$me`A9TSbe54{O3s4604%T&(%F1L`OCS^2k#IsFgdgU$PfjP3xJJCWT
z%LqB(qxy;?{k7Q7>{eH=2P6xlGD#&okf(Hi-Q<*tM3ihyW6mTeKnb(>6L!Ae@|k#l
z9ou;1H?C}L>0J(#8u`sYUiIqNLHiYvL?ovzZR5kjQ(UJ$f}=DZVSrKd^}$N^p#~xH
z5|E5SqlAHVcIFLiiDV9K1lLN+i@;z1cbCE?C4uoaXwOe?3jU^iCGf59l}(p?+PWW_
z?1JGDW1uIAh?>k3x4n_Z_P_KZaz9Jqj_LfGgYJZ-6+aH~J7`Y7ll1%oNfVjwO{xaK
z&+*)yp}=ZRKSMTunON|F;$n0GKG`i#fk->Eiio&k_rq{M%15N@%zp;2IUSAVgxdzD
zn;6XEnx-FE%9c)}<}Hlfsm^QSiNw7p_5-)2GwgEP?7FymJm$aJPZzh0kUYY^VUVt9
z4<0KU*>;Sn{kvo0u&O1$2=K)GBunC^d}169hS`Z8&&)s%*+Q~5x&Ui4Gu{m}d|Dd4
z#>4!pIDqoa#I<HB6sGy^u4Ub~2U5PYyOy%W(;A~=Ki#g6@1LeKZ9jOsNj@!4kWiKx
z)XXJh%r%YKFC&u=OVDKxtgp0@n@;g@Y`z{IZL^ydJZL_Bwipn!f->)edFUe-Qo?=o
zxfXve=IvLQi<@199r9e|{Wz>L-QS0EN;IgDS(&WpJr})$elN{M*<VpK=ZWL2<WW#s
zQPJPHP+5w+FzVp*()5z}9sRx=z3s5!A?Q?@;rP<Vt;D3>ci^~rNs#`$c`_gk56q(V
zZa)mJ-y937G5PdfTerB?`HS<!)!FjSD*V{lwM3~bc78nKUSTY1d+d%sK86L+e}6Fc
zNTd2LdH8Rp?QiZrVGV?b&GW2vYf`p--c3uR$cqI@0GpCGHr~B+PGqdtLI(K~3F1k7
z3teZTLpIpe*UO%urT<D-@4gjir#`UQ*_*4Y?{u^kIIaADSo-R)rr+=HHzgn_2uP<A
z290zIC?F*kT~bPS$KXRFjg*w2(%m%>5F|%;w;M1JMl+t<@ALbQi(T8f<J5iPb!L>Z
z?oTwmo->ku+2CBbHul?w%ICXlMWgFcZ9&sWXK_Tr5F6EFJo2$G31+IZleSTrUq9GX
z@e#FY8abR#X-lq7Ads`yG86(3OiOVo{?wQFsfHu|UOo28fH6c;V+P?i@5F;(IsYrw
zbtjTb=$C!@&7aXt6nqh-F%GxWOGMc}3txS*{>J|GU2Hq>hIS5Ktuqx`FT|J7ASCu{
z4L>Ed1DE@>Zhd;eIj`m8XLITBt!IsDH}5Z+qci#CgecR#U@`rs&egnaT-!M9Y!~#)
z_9MpDU)WV_f)+5jzZ#o2mZn6}h#*7sk7+}6Tv?x|&=|U$WJxy><6fjG(Q_-BjL%ZT
zw(P1;Lhp>FptaF{x9*(hMgk`JqBTF}={lNOT9?cP6(*)FrRi@O$1$~hB*&-p^u;?u
z*5vc!^RnsB57VRG=PS^Ut(JL<N>K#}%wM2ZakgIXhCoO6=V!K{6G|_m$%w-TNcq9?
zrSOYllgh*r51lzd<Eq8;!e)-+fNQrjthllC&3&_=`y^+1W1(;xyXLkjtLw_vhhYI)
zzPokw94Zg=41j8vaQvKO`0?#g*N?Y9GZ0r&X{Py?)%YoT7kn;O>6RhTdvTsc!H5s9
zd6zarIct(k4&GLEO*k2&Rx~5V!m4R-VZU@PeJyBN48-~bGq!#Ob+91+(5@ZBl$Q74
z2iN6M<na{X+I&3QlD#~B7D-NAu0;d{SmzhrnlEFHqTk<0qfY4CtgvS-+lnyrdZ5md
zrrYMT^kY|b{+pPc7Qaxd8il)ktK1xgtjZ*(_)GBgWtUAlTcp}_$Kd4icz*ooywqWS
zbS`Ve^BgWH4w;1dKR}%}5E!O;^w3~!87|L<s42F%m6nYPNvhrAC0^Y-_;+c;?iTQn
zMfD|*Y$?mBTvMy&wX{`&c^<tbr}26^1lecDHv#V|zf8O}AWK%1WqeHQv?zGYc<dE)
zq5FmUG^?BsU%dv8{cLMe`0P0Gp7&AfJC|D;6b8s28|*d>e`(lY<VbTXE>bowG3JU+
zXU<1cl<dfF8^#-dZ)MG5UyL(&CGg-w?UdsoBkKE=L+g@-(MgvK9}QaCtPGk>FhA#4
z_hpj2JWw)er)cS4L+{1rRe^Um`843&F)a(>m2TQ<i?eJPjkM`V#QUd5F26;8qCcJ-
zuJza1t5vEx7Up01{`&t%MTNQL+r!iSibh|gLryihsdy3OrqXGz>aH)*!+T9V`D?ed
zLCuGtl%r8snKupympB;YO~k$(&h)7IQk|j6>?Awr=30N>amBw0Hs$);JlPF~uD(Sv
z<u)uR5qza6N%>5(=I^|KKk2*32VK7CXO(7G2^PPF#n2Z#U)I~@K&b%Q?%<t@BIfCi
zm1)jhRn_t47sCt*N5~NcH=5QfemaaJ0IrA~!*|(S$XHv%>jUcgvxG-%UE*PPX>-O!
zi2-xo>3Lv)Rg58Kh|F#L{*xRMPj%H7laeek0-uIu%W0^l8j(&%>#?nzJicHRAB?8l
z4WoQzr(_hW7T5Yt)Z1l{KmOK|NE_VOCEI*Usayx@RhTOL$!{o&KWv1X=*~@F^QMrM
ziR20uYs!PCc}E+?r?q1edQ=IXp{ifpbzGiPE)P;CSgfVVW!S!ZDFD6RY%1UyQwLml
zN6k*BkrDS?31wNSot?(?vu0Q0EAjk^VO|#b8XDyvk!Yv=i^elW48DNQT}z>wK*NY@
ziusvg*~5yzgB51)Ytuf6>L@FKQ_8;`)51oMfDarV3k`^;8TWl#M+O*aj_N-)g<wg7
z?8vvxa%;=^kx3?#()(?($G#w0)8D)lb0O&Gg}AP(GklHKa~?tLwtC)NI~IO@^e1dv
zax(Be14lOsFKMtp6y<o7*$~bW^?5a|)VMdHfabk@re_S5AL00zf7xFxt)DEwgq)d+
zNy4AGIdyztcw$Bz;cd+1@mPf~%Y_Ysm~(hJFP9STYnAhc^StLO_LsU+h`@YW{o3ns
zhvm{?euz-pqjDZ`dZBsya*1hF0|O&O0oQ~r;o<+Sg4M!B`GVNvL1atJMq{3i;{_x7
zS#M&&)UBTU!wNyH_|vnj6N`()(I8piY9Ib~boY%yc8()D<Q`XXAq`bWi+g-7m+q<X
zJ#uIW!V)aQk^MAo@elj&<O+Y~?&>!p1Ty`$eOlwdqZ{~{PPSXzV=JD$&3nJnPn*(L
zW*GxX$bg;y!NHEoG-fgrV;rPgX&m;(amuX5GSlcxUR8Tur5>q+1!?al&HmTlAR`;$
z|7t$OOJE+<%czyZdzW$aq}+zjjc8d16~AG%JPf_`c|G3oFUKyxaiRH*^V_|}>{A9T
z5)L$PZj8jV`>9cwcjY-|H@A}Ql?;42Jt)2Kk0Ge8Cic({`bA68m%FQo`SvaH>r$Ez
z_k`bC_Si2BOxA2bto{XKSCH&6-oLDNa=+U)cYgB(J9t2$pIXoCQ5bA>OA**}>5~0;
zOQ|{(%*L2@^@Iymrew_IrO#4e|Jl;h2i%qYOPWOElkDq<;vULnQ7m7XC1l+_S_v2f
zeZG_EXiC|LweVRiTG_aHv|82AtMXY|_q!JnNa@wU*9z@^JGG~V>X6a7vwH6=mF{AT
zel_{%XA=ge6T-J;9l}6jyY~=x{xjwGQ<Hq+zO$ojkP}vVMo@pDL1glZj!=cCfDF+_
zgjf1Iqd=QCF{_@_v2Z5@JY=*fb*u%ay;CV!Qs#R;P8<v-xDOb2+-Z2Lo+U;0u3qF9
zFV<}Oc4cPg2-Ai{kCdCk9n!3CkAG$fOni%4Ii2p&A&mHAcrBGe|3x$QvU#Mt6!6j`
zXMEl}vm&76wBJ<9+jqD6#pP$@?UC%Ho&TQk9X9E&YDN<8ft3D_*B+$%&)uZ*HB-MS
zNYGJY%67?LapgAO`y>7Z@HXs?$c7V1tMPSaF+nhgM4{4_v^!UGWzSG7?V*zQyGlOI
zxypTRomNTa7<Shqgz1DQupQr$(x(rx#Xe}=G_Jt?H*PR4;EBK9?Wy8KWs>!fTq~(R
zLe2f2Z7a8g*U^9RP+3d=x)>Rv<J+%gL-5L@*~dHso`ops6P!}yjZ~-Wlka~kgFpYD
zxpeCDg=g)Z)t=V45d;3=(qCK8vt_?De6Qhi=OuvIipV?WFC@5E>J8s%n7YP_=%k|L
zLqG#X15LkgFJ&=y(QBcefTirJIgxG+k{XTkWwFzq^yXn<9?6#_0d0Dc*egys0~Q;m
z5~TZ{k+SJye2*Th4nz60q34YqSC`L-OkCX(S{~nm3sYna_@^g=c6c_e@;&(jS&&|O
z2YAcxR(nUc$V$(5viSpthrp<wF*=eqIiWtSb`Drvxit=ri0r@@f8O*=;+@7wi4@v0
zi6!58@B1cpC8I%2udo^v7o1?$boid|AVOqr?rByre{#@I_BqnD{IW_*PoMBatDM<~
zVRzS(xx0%L(urI$I@L3IKTvEUfOUmsyHIm?yU85R^E`=M_|)dJfY3L-eK<8`k(J__
zxr!4uLeQLr=?ZX&)N$7}lVr4F`FKCHl_?6gj!Z{9r=|W=Fnz|b2kIq16*F_0i57Sw
z<yP|e<)nmF9F)g>Uh}f7&wPGz-NgWz5Nlx1>H`9Xo|M6R0;+335rQjDRM!x8ZF=zX
zLbNk`PJB}@ZI+#g*P!j-H`DT@kn!=E9iK31uf+xQRa%2~su6{HL5aio((kE_naB1s
zA7LpQ2o5sEpYq{OwUnWb)~n(8FVYh%v|DXRBCj906Y0GALITAte3boxt!PKr{v$b_
za>yIxS06q1flBzyOw_9Jb~Cbc^Fs=iEMs>ZKl$$2um2MI&g-^y)2_`U_ad&ZAC~m+
zMnO(8HE(gmmQQC$xYVa_nNcp^PQaK*Vc4pfzODlA|9lvGeRx3p*GtkeL^HWSn-G0%
z$ZgK^3od5Q2>o`LiY*N2^ISQZHssT*GNL)MVnXT$=Q%1hDOq8!T-XN<xt|2mCXW&_
z6)ky&y9Loc4?nOLn{*$j`cPUnRD>pzjgY7BksoeJFW4Hd78$<`7czx41IyynBD{~k
znar<M{`ep!dHDcTbe=Q8c0iI)HhDVqhBWR;e_(*olb8-BCBtt^z>I7)#JWc^-7X_>
zmrlTRS8LGDJ-%2`HvRp3lhba_bLN{kiY4G|FPgu77lasBT6bjiO+nnWoC3ox&Zo+S
z56Qhx<Up$PFTzzC3^BJeDrg0C9oFjT2kR=)C?W&euPis+rBU(M7Ye|SpoCAvnb(n#
z&-us(?DS~yjlYKF#~N}VYb7;(x?<{vKcR!6+eMri)01~o4MP{ALqj@g6q*}fSx1c#
z<Fv0`Z2K@86MwQwR&1S>QS(GAsZL5Z7e@QaOIdfwE&LH5C3&i?w1V|6I2Rmc<jK<u
z;C;a$S(h>MmiYOf|Jsi1ObYz-I3qDrm^0?<g=%QZZ)xnVwU3|RVQrbxxkLVNqyF`q
z>ueOw*fh!0#GQhvItkf1Og1_M7dtTI?Wkk*>)lZM00jqfBBZEHd0aoY>E*F5Ed&du
zuFPA!WrjvwGlBrjVLY|22ToL{R>N9BZ(3=KRP*b3{&XOu^P)HonGf87kV>(OF;|i5
zmFC?k31*FMC4Zun%iI?InlX$-6qw|&!yjEfV>dsj<tnxoXDV}u@xA84&$-4?{vhd*
zyQsMPvEja>(s^S{husd=Zdr2gLS!{BH`MiN#EgmMv@MFfS;IDaobVC}hbRj8{<b9)
z^k5p(*Bn<6;Qma<%@{R9aF*?-C@@VF=-oHB^C<ziWqk3kU=I?OFyn~il6r<eTayI4
zeidkMH!9w>q?6Gtwk+w6hTK{<UH8dm4+>pr`-b`J-}3@~LY7ZsXkrXxaqM5soz~K*
zo%U%}Du`W1m`i&$6)${+Ebsbh-;eNC9|28)y21Ktv@QlL`$Y3i?bnT!PK9}nJ<T-k
zBxJoBr7*3zj0X|s+LMG>boXfV<r3nqzS1(Tl<!_GvzNb;5k_pjz5{9lhof2lubvdz
zOxiyEIcxc1T))n*aee}9p=r#Y@oMTFHDzdum7X~6No1ZQ4gZv1yYGoYME#f5pPQo!
z_wK|s8+(6Px>{wpzD^-Fqh<px+m-0xq&mz7se$?8UvloT_7-k>QCfMc24qI022rcg
zA51LiC@`TRKeKDo)IsQGI}FO5OX(NI23S|vMT;=A`0Sh(8t^hd14R)|=!gY*g=Hdx
z)aNu6h=zU%(*gOeQ|4aWcq0+`iB{*6U1g%wLNc+vxdJlzr)!78o)v)MnM*Y`r5@m&
zh5`e?DViPrT!_*Yf)&(lI4iYMFP+A^<J+fgpRS~nHxR$07XJ9Rb?)FNX2aUwD`mkk
zo3FQVtt<Uyc3Ot$Uqe1nT0^trZQU_#NKB4OD@XrSF?S=Ktl!wOz?wJEHzSt9TfON5
zdS>-vvR&C$kUP<9bkAxU;FpRC%&{MfkxmVM3tn7QHNX**8me|a+edtP)LxQ{wtT|<
zt>wXD^2d(}SS`TtuqJ1(Cz|PoDtl?EN93iuMIKitwn2U;-v2a6BcDIhX7(2XKRZ5>
z`mdZ8FT~Q?q9YQN-8s&Oyca03M#1K-3>T~L+v7}*+CRH1T^1<Ym_4OlbnX^E;I_7H
zdiz7_sr2oW0TPv(AtDmynTVuQheD`7dpQ&iUwNvbZoilGP6&9J=l7D!KN}kJQeobY
zS8l(<?Q+mlpNtY?X_UA*74II)7~p%~$wWIDyw**7C{itU$Tw!L&+D$0mTtpIDT;fr
zt%(JdJO`8h67?M9?e?kqUpgHN&X2TBb1V`t%Pam5Vw~|C%9|i7no)OGd8opZZ~<cx
zX-LohxlUT-PyhABfblY{85JUlTd$T<a$<36IFfLeDMWIyRqLYAFQWGGsM&6kh?=bb
zgTSoo6T5{defKO~!ib5a0CZdo^0s$9d#2)x$vHyhPmQ2S7Cm{<t`+Gt8?2A2Tvc&E
zO~1Nb!W?$tVqES|aZ?Wip1FjD4$|mgoK*b;L(Jlh0OfYm2|^F|Nxb&d2<6GEhNDvc
zOHRGq*|V-5PB)x>^E|y6>*hH03gAVf8kx1au1d_n6lR;f%9NCxZ3vZ98U2n0Axt7w
z+e#jEX@+8zY^vhsLf+*8B1UEw_Q1qlg#u%gw80(YcrEiciXVn0VivP}sYIuL{wxG<
zV&g-vcQajg(TD+4NWa+0bDqN;rSxoZOH#{^`pD{N<z5x7L`+lKHI}X9zitt|jC+#Q
zLDxFOIA*cx7mXMp)8%2rjq%5N9J*wC=+Z!0{(APPAvY7du-Y43D0!&ePu=N~$ABe&
z+-!&*i@g)uzRQXA6JB|^TE<^KpOrTl-^OhcQ}w!ISWVU~WsRYGl#hlykN1PEaY58q
zbXfU}!J5ZoyGNAs4t;`f+vcy6bvDJ*A3)`JLw1V9O_&1%^<w?6FTSOPlJ9(}Za}#}
zs*MYyZd%=%`tyO<6f@m|5V~CCH5su7v=&+Bx{Qk#xi)q9vz7h2&$F(1-+nq5*?SE`
zJNkCo%fyS=PS2TQ=5RT6B5_pT%?)OUu$3IbmriYZQ{Ma$Ge`&39Pq*0T5?1xF>R%I
zNXqXM8JXlT8RCD(DVwI(A9Zsi0ki4dP2n_v1R7)lKaBTJZT2IX)VBq7YoUr6n1K}6
z0`@8*C!?id(c-W`bQnX)6WtXL+8wHq-0`j=mSDDTgSE1J35LyUjvr%Otd{47B1>xm
z(>U~87ax{#>MG+d8!-m-4<K{p{l+d8CdGf=-}`zls9s}5Uw)2uDv`i4$6^nSXrDLB
zA{pH>_aCR}cedE|rASylaH6P3x*05ecHeU^m0U)oT{Mp`T?@Rl?Fl~|WuoEoFL{gi
zgSq(lYTf$>(^%t7?_00&;B&Zd9miDDpmoDy0Dx9lc_===8~v1*zn(P0yEFIq+^Tvv
zwcCbs&rP{Dd?XiL#%*GsQtn4BH$BxKABM_KQ}uciqVVjMr;B?V=gi&gwJAfA9t`m6
zRV_O3G2n~uRgoOKWYNzxW4-nyXuk$rQC)t2%om6s`!vq1T)gC5e)?@kmXi(4zmYHO
z#CX92eet&tfj619*?lFPjhVt~#gF3lEO+c8zfEa8g-%|_+RxrpNOb?lb7I(J)-vk5
zub9jKhI?aQ#D{G?FmOpO_hKd%a1AW8@aw<UVEV#JEQPW;{G1ZlcX@BRpW|ZL?BQB(
z!*Qh52xh23SS~=zUlx08^JP`cfT$n14Ary58N_(}^@`2N-K2Nblt0NjpmymV67|?L
zio&&~E4=HWqIs;NSnk@257uwR;w*RiCohT83Uh^Q!&gM%$%RO-wwOl-ZSV*IL$iS{
z!k6d5yJazOO$y~vq~fixx?Fkg;nPUStX+04=<C1io%XTpiu*J*z<3suda%{BK1aNJ
zi85SBts}L!xei@()Ko2t7KwSmfUp7aqWSmQQo}balOJfIEu73fi(AAA&p8{=o`H&o
zD?K~TqbV+aIq4s1>b0+g+j<)c990EJ)kTV2vd(qbQPG9GM!N~~l$$!_`E8{n^A{B6
znag_eGv1r3f1aOuxdh~&U)=9<9}wgFngIvE;qaF&p#0G=Z{yWPyhrQ@6iR2mWnC{%
zX1Bcgu%nk7?qzOU8rJF5kmk--im>r_WaL%dqBS_Jp86#q0FhNv;#!bFF7b-=-9Ogn
zgjb$SJ6VNo&OB#EIeYcttzk&$HhD3>6(my>xD9h`#P@o5+@|L9LVmG#5G(Z<Uls0M
z&3FY>zA4U)JwuR?(e?PNNW`KT4J8`=8n646zXUHKoEo^Z%%xBBBxW!-9+R8CqQ=sP
zEl61h9lnSV{;19CQ2-sO@0T6~dCxp&(4x63Ld<u?y@t2!Gw!Ffym`OT*}$#mn_rMP
zHMuIywx0F98Sjq*bnfq)QqLqy|6}6tzT+5Hv`wtd6Pq{rvs@EI%VvKinx`02_9BuN
zzln6Zq+U!G+I2`+_;=+37k){af&S_~aG$b1Sv1X;QrIL{5iV=QwAnc`UKFnTLi0Qo
zVj|Y&5($_A(-t|>14a7#iprC7Q)_`Vv|AF)Qd;Oe#;qymB_-xDGD*!kk*yeP(9kbs
zyXPb>s1xF?Lg9lmtM8(NEvBB>zi|?8V=ab~rSxMv{qh=gAN6|gH{12P8A(<QsOTgU
z;$ULyf7vsY&faZC24acFRqc6G&Y=cX_n96#n!9i(GUdy@{Nyw<|L#^<q&*AGQ@*o-
z_aeczs`oe^JX4-TC0xyiP2(4NYxRtdBua^VmmX<z(e^}MF5jCG&OUNMu~03Xx`c(!
z_SzZeXFYaKR<2?;D8dV)G=&=Kt!4***o8o_W-)A?moCj+BR+O)O#7f8nm@~1?alaF
zqkAM_2NKt?e?;Ew4qNwQH{M;hTB(>wY-V#u-YumJ%aW;PYL6zhSNXuP4g?vpS6Mde
zfvk8NR8!*IaEC~<PW`tRYLYTAEHPa8UCyrieN=A8$GT@B`m@{7da23gtq15>yLQ#m
zo)`Xa-jl!M!e8rtugu&)zPMySdf><>HDAQi-)8$^(Xb8m;-c~NU?)G}Nn=rYp8Ks>
z-F!jjux59_#z6n`E){%s#2t{98*=XjpbAs(h#-FZRpt$IEmIi^xN}P8vr?xCn%E|j
zDc2$$)*1~W|7w=A279O5%wg;*pTC46UmT(7#Sfm$&7T`~i2R+V)xK~tiRrWe{Z%7P
z^_?&rlcC;sb*g1O|CJ^gB)b19^UjG4k_7s!ystmE<H)Y|zT;t{t@vO|HwHS{wL-bX
zwJLv-`GE=+d&W2vWV}>N?S4oPUwdw7Zyyt9M>wi(tZn?bDb9?cXGI=Lz<ikLfA7Hx
z3zH#wFgx_)p$`NX)}W16Y^|x{ePk~E-XgD$XEn>zfCaZ!wRvURk+n{Ph#ggE^RNtE
z5P#qp`r2V=eke@n6OGUiC2|PEmt^u=;;nJnJXiCMH{+iE_nueElX-6uq*OS}-#I19
zgTJcGfv(06kzEg#<?K`@pM{L6Mctg5wT&=36Tj(^exR1b^n{7*hPbOdzddOJW2HnL
zX-}x7j<%$(GY6gfME^ch?UyhIF4@l+d}G<Q6>Ao+z64LTe1`h|N5@UxiJcT8^Co{8
znK_~NmL*wFF(_1dd@X(r-z{OTj}MhApJJ=^^G-uQ+aG7&W@ySWi}fKMZ8v^&z;)D$
zn2D49<pmkvs-ot!KF{U$V0r<KpWmTxu1MamMoe?C-A2*09GA6U5yD!q>|!U0S(Q~c
zmU<%3cCrK7H$l{94;GOHG7jRmN3$cH5Y7V)1utoS3i3R%9k2NnS0V~G#+zR<3J;Q6
zOP#gcVYvPCjakEFqIlJ(&q7IK?q6Nd+`x_;G3FueR_!VxPe-SBE$Re@D$lzpz!3^#
zcwB&aVaBrNB!#fBwU>hC%crzCOcZ&ZU9>oRj{$QdB3ApILD}H5Xon%IV7HV<hupuv
zA1?fwKDky8HE(TdUi?BZ8Bf}bv?#p)@s^~4WyZzCnrgtyAU4z(=SM$hM&3fNA`R6n
zI#yh%-seO~l8~Cp-)*VqY8@@!L>YGW{-ZtLP^h(@c8g7-`Heyn$Are)<0<o_WfNxE
z$3hE|k{oz{T)!_^u`ej@V#@t|q_vx+>Z7=o@}|0C;2A?NF3rED|E^@9&`Rc4D$ZZD
z6{?|$Y0q4jxg4L0u<NalS}$wcGjn4%_bcKPw3w^N8!E&W;rI3pdDob0OEui^ESciy
z(f46|m$~yrOhJMD`2l%M+eW-~hkiE`+T-Wa>|%jllv#e)#|)8UpTHgz{ng@Yu6Q@3
zc1)#Hkd2g{PC&CuromMGAo^Su)StPx@*zU+XGU1)I|Em|I`{tLUhkS*&NR>8#QQ{@
z@+~4Y(r&re8vl31rw}tLKfy)Il*Uu*r>CD6NS{U<reQtzgqkDd`p#apI-K0{$Jnp5
zl~0JtV*F22*ZrrD)=pALQUj*$`%Mw^*2WZOIEq|ltN_)>Lc>?4XggKS9OhFM?4Bi}
zGHG@YD!Sx$4#l37=v>;2JST!uqt-__b>4`PD=qV4WlRm+w5*ZOHZm&|^fJ-h-EdHw
z$c^DOiil~u;+a$xcNdFdi}y|3AGNu+Yr{cXCgb<WOH+P7m*J1{q}fPlXrl%#;{wrs
za6}^clYfnsBzQFn@2SW#tO{cp<u{*&h<2mY6ss1W{4j`{C2PKeBkl%2+;$nG_TbMr
zFIZ8S;b<IMidj%IkR5uFB|KDW|K7WETF@qFf`o(iuguUSS$U1DIXjRAi6k>q$TP!K
z!2dpl`XA6b{q-S59*oYy@Qv85x&qd(HjUum20imRm3KlLho`ekM`7bl-Eg#lig~8@
z=Uj)Y+I5v_{gbtm?CM_)ZJPm~rED@5UUH>w`Ck@Z1MK4O*)w-|3=E5!&9c~ATzgg$
zhCJlkUtw<jB~y{4gehmys33R>l}2=TLV(mOWU|AW3Mw?jHl-NKye7@E7z5{mC1kEy
zN%Jnk;3N$_S6G{+lRXBcPcvNr`p4Iz2@d%2n4-m7O7WqK3$b4f*3*NMV}2DAs==wE
zpzTC0e{cfp3VNK%PUWLLWRC5Ib$jdIz45S-a%U9Poz{(ghGbaX;y^G+LnB<CHE$O=
z1)%}?DuqL{xG3|fmPZ0HW3vS^o92*O(V-!b$}0rpo=X*~92Cyy8LvA=r@6B(ow%(e
z?wKB6987&X?9}$l3@FC$EOdLg=92#UnG$sZMyJTI7qbb;b%o)62b|JdckNk#dn=wc
z<Xo8*7}3cqtG#Cg5eEIhyM^gUEV&&uK4oIqV~98~P`br3Dl&r!)tF{*AD=74ld8J9
z)N$r~Y{vvDD|si>nSj^hCzJsvS^@0n6uNU!s|-o$8j?HX+cSUyW0236WPgr>^WE^x
zwrsT&5eQqnX1BoY8WH|0y`^za@^!W|t^1q)V`=M-MZ^eiQQMCIjtt80;(85t{k$&U
z@WyryZrX~8$BMcAF&o7;)EyXk-fuw%!#L=w_UiB9IFeHb&%Wf^<LZER;|jtgR7^k*
zh2h^;{wjvDv#E#xG^YtS?~9?3uaAo<gm9{c2DyW9yJ(xS=b(UVxBoBYW;4{*7P9qr
zK_1?t(jl;{62Lbla9M0hSU5vU{KAT3E9x-oanF%;1D8;yyvLJy!hpBFUv2v~?CWQc
zqh;5Zh6i^*cR#h+?>HGsV%UEg+d6eksZD#b#=*F=tPgLxC9s<fmqgus9b0@aW(skB
zan2HUZYqm)o>od(vUUkwa~=v>q(OX|!|B+5F_gE$e9okgy@GFbcI$wC;&I*;Kdm10
z1$I_*bC$_ojAw^^=5k9G<1wup?|EXb&b^f6i`wjQ3+q)Fdg$eBc%D$h+gfyZVd??i
zl~v5DRjLxH1VmOkRQgfCgB<^_TR9Rpp`dvzlhox>4arN3`CX(!eHWJ{@XI+z-#Ker
ztQ`}Vk}urcLt3X!eF<B_kX_!Q>e^@+Un1)6SI~>I#j&Mfb|MTyR$=afpR}t=$FAz|
z#^OFzWj;D9x%MmX-%v3vUboQLX&n66;ap^vJ9N;uf*b|h{!__rPTK{Yb+bOcr03qz
zt=%v02_L`|ih3edVMb-eimeEF96NA--YSADp_P4{Gj3C;-M%NpZ?(+Ecyh24Xz~NP
zL{KnW7fqgI+v}}L%@I-3?bX}s9aW^H5VTQe0B=vw$_#K7Rw*!mi#_RXK+W*~D0b50
z;QKok!tsT7!o6T_W_ENey`nTGgrRsZ3Isk)u=nuIMO)PUA5lPrwbVh+iXFz%w&m}$
zD}FUf@N99;+Hdl>+WLjx#)Z7opz3KRjogEQI5IB(wNBk0ev9$G_Kraq`sBCIn%}6v
zr5nmr?fUvSI{=f-k|lPdIN$`cU(Fku-THz#Zx(BZx$$tX7sQQ8-S`sI&E1Xx`=woX
z6|2s)(7OwUII^SSXNOg?Bk<dw&P|^8=&@55YZUDK#)*z2Cty!@)B0M3c=%lZ&2|q8
zp*lbSw+DkE{<?7Hzks$+^v>-wC6Y!h*_PHmobp<AW~>LCBM?{lSw|S>Qv;Sm+2&*P
z66y8sb<z^$kqF77HOihBn*uu;DF?q-Cmhk_`MiE=vmTkZ5n8NNJ<ACTAA7HF+>`^I
z@H*erL9N(eT!E5#XFu>1;2YLjrYSp3+8fSV=!<xN|MB3`>g|(ryD68eMdldCV#y9g
zsYgX1fQx<|P}A>q@kU2(0o~^u%eNO)!y`=hz&iW#jc_39FvE$tn5;D7DR|h;g?yfI
z(mk#mIAJ~{BbHpJ&zlhMk}z$1>+#HIZmQA4`VH-uuMQd>jP}MU%vYbfTM`9;z8v^3
zV~Qk;6mQ_qcXDob3JxtY`V}193RbtvDpk(~6!y@)%gOM`R%blyI{snccBoCX-WFpB
z3As}JFdCyzktTLwq$$8YnL(3mX<X88>7H-|pFchnwt43?dm@2e;%qr`Yn;bWb;Ok@
zz3|Jw%r)36B5W7??_KiR`v<QhyoZSZ@&GPSXb%Ye?^ud8ajeELFLWRc*3oMZ=4BTt
z;j*bG1K)Yyp=oGmhcKr`gpAb&A4;h$)=uZft!L~K7E`RQ8m3fLow`lXiN|K3-1PF!
zlJ-}jo4wxVwT~O?v<ZH9xnujCJ{O#*Jjl7l%nXry_SX6;wQ9Q0l*?(oo1FCIO{~LX
z04f1m^SVaPG~Vy{EJ$P(5tnkMNBo*Twm{Ok_-7|BrYL=nX5Ug1;aCz%UyAAUGco@0
zjV{_;dh`r{fB5rKs6gG;W+)b$c%9(GuiUaE1T{Z9@k~|(`5t9}?teR6{~lSUloSCc
zbf}FCiFe_q&9_#BNno<)fE9=)!;>~RJ`DJe@4rEioiDxCJa>HY&fltYq?=ozmCu8?
z{KE719ab21Oedx!vr=X9{%1HP_Nyl)p^2K?6q#ho=G0wqkW^%3u;<_YS%zzGBpI<U
z{@zTjjlpcHM6QJK#Z#C4Fdt9|?f1)cAWLylIRl~Jr1CE>c>QK4{BtYZKG@VrBcbjY
z*VXiO?JCI_+)Da(J!gE|%b)>}WBf=;_TA$i4*w%SOPh;+3B=}O14D{cyeTlSZgayo
z(?{9)ypI&6u{HW1SS~8Nq$hi{8ln?(h}sZgmdB0jlDNEP+3=dm=TpnO=S5GFzcrB8
z`uR-M*JcUvAyN_!X~&Q?EF`Kmk@sz+X9-x$Mj>!}Hcxhs@%ec{TkF;F{<rH(cB<hU
zWVc|?4S61!AC1@7=lP>$8EL+VM*yBg2N@Naw>qRSwZD;AvT)5FPn!=lFPBJeePFKD
zZ!OK})+;y>eE2DUX2KxQP!=2TgGiwUtsC1}YV*~>;Y{OZvWoKL{SbI(Y4nC3JM=ui
zbnuUFs(~-n%@6;D-H=-Yw>aKaN67aGUk11SasT4T8Mn0|5(RRJIIBk?@F+3au9Ds`
z7irDy00*Yd@~GfeZlhZk-Bo@>Qd^CxnG9$uW73G&&V}T1qk^M>%!l9#TmEJIEPB)8
zZ^f0imIjn4-rERXEx+o~j~Rw~7I80?{Ae?rw7$mFd&HjlXnDMn)c2H*y1d#c^Ek|y
zJi-4l$+PY=j$edW-SPRP(qTmZ1zsXUtRT6u5O56m<*h8Qf8J?_n2Ps;<g*?FcGR8O
zijdtjWk}7E1OMYVv8&&IJDD%#7})>dT=xE82hvy1SpPQ~O+T`lHDjO|Odn$_NoEiW
z4J2-6b4{%0aj-MHl_5@2x3fN1(D=qoq>K=ne&|c-a)}x<9b<W4vpW}@g3VrYl=iW*
zPQZlQYxBlN;F$Pw3VYdxsRZW{<>0uF;WfMkPVTN>&r)D)`$CF{yT>9yE3eYZqHo)&
ze><bZk}0^i&l_<SG_QC_BD{BtPRu7WM}|TN15(@U${AEMxLS_vDrNde!EPoi+)C?%
zaeh=&1noEdy|DK-4#rE?Oki#o{cZ#V;6(QgsIa^=+b@t3#T(XU>}wR$d_VcEQyD?a
zz7z7Q--Ji2+zXvJbPyA%xUDRrQtrd`C$SLR$~U-x@5r?iFk*>%#7}iDOcM_MD!(v4
z`DqW31gegng{TjsjBTqHf$8$+b&AzbE}0^4Mn3(pfD7;Ba&o_V&Csoj`L*sclB&+M
zRTfqSQ(taG7{**w{zXLcb@_6joEnP1O{u>JXEYr*Rk9%z52gCc-^X7uNLq?*!C2mZ
zA_q2+XZK?CSqRnzJd~I3JEFueuN5%Gpo~4HqxB5lIMs%iEF7CYvz6fEQ2}bYEsaHy
z^Q8ehU&63wQ_hW@S*L1f-&7l4_&esB(yYxyOh`^5{C3;BU^a6g)01pHD}r>r-imKL
z#`THu+Sg-(Sw9uCxBhFme)1F$Pvmj?_cn*4>!%GJHU;LXxU&>)X4<f1e)}EL@YT53
z?94m&_d8e4*HiDW_2AxnwgW$hC$r2;r#k=m4J?&8B>3O`KMFR#jk)YwaH^`S7cbfW
zJT(K%#yCy^B70BE>-D`Y&Ot0bHjwXa)uL!0ncPxCfenIjOV@)V=I_o5gP*G(a}#f4
zqF`P#ZFj6Josv`73C9+Ro}0qW-gg4CZapg<qCjL{DHyT5$d1HsxBc&<Bx=ygn3pCQ
zr3lWDd;V=u7P~Y|i`!C*ZT}9aIjOHUT1W2ykDRutYYMB9VR%BdmxliiwN^B8ut|lf
z=ssQx?2ELROX_!vvPClL!Jm?*#dZq!SOScPaC2?;NN8ZAk$fQcaf*W=Hru(ef?I`*
zS}lmV-CTqNo!hZDE3331P-^2k54L5VT=m<wl5tOVDP4E+zMkY1stK>iY_N@N&AWL=
z+A!MGPwVnx^-PGYnXGz9NaTw4Jo+A~fc6agm9_f^^M3?K<E{-D+lct{Ka;Cj8vDy4
z>ttBZ9<Wy!xR2naJ_8z;z4cgoiu!J@f0(7a_?h*}*C+#r`D2L9wam*k;a-YBSyMUL
z#$P(5#^K)&&1|7)u17-2-|HH=RLZYh#U^6C<}i9;f_tu>-_WMEfZi}D4Q$9Ggk3by
z-Z&N(Xx+=zuD`~<)iFr}4cx&mV-d5Qt;bCT`%PlFqI%axJ!q}ieJ83tCPBU@`s`t@
z5>q?rXxcBxD3*M9_+c!znm2)&#XGwsY}zlaa7QQfBm&(!wD*C{R&{8M%qY!Dh_lxl
z1nbIsc=r@>P23-|i8V-^6*!QVULXQK_Y>aF4k1WZ0o~2Y7=j3pt3l(&I_dlW>C$TG
z{nXfQJ5M;zy4J9kD8_f~y|q&f;8CWU&ae14XKd{E7|Yw}-(w!?&?RV>zNYgKmVOis
zx1}zzL-?Ktt~vg**p?2<p)nLNuhQV<Uf$4%rCxGG(|?Pa-w#BsObg4nwsZ>!h<JeL
zy&2?j^{pjh(~WIJGCLx?W(TU6MrJv9K!8nTA;ph71z{-qOT))_s(O(8OKdj><8(^b
zVYHiZK)}1;>Uu)A%mJqcM?i1W_V-e9|3WClns>#oT;A)239oAMSzPMhsN0We2q8F=
z5YTjHmV1;&bN8OLw|0;}>3(C^LN6$Zgalm6+`w&8rm{Ao6dLEH?G0x&zD?f}IQ0)#
z*%aicOSi36_ul2&e8DywXxHn*xM%Yn@%7K!v|_e^v<3yj9O(uA2(h-~vwPeX+zI;-
zH3~SLkEt}BwRY(Jghi+ETkFzO&$aI03@mE4yl^dDl^WDZa$55dUMzQ8MUE$OfFwLq
z5i;tD5xvz5bf1Ouw!}*9)SB8<CyCC$8d7Zj(^~8p9P8?LHL~f<pMXi7cPy(vT)_#?
z<(0?+I8MH&TYhKK;+n6R**VT`!)$;VRUFx=&S>&!uXTDB-O0KAeUbnfP*8N%ljdF)
zINqc<l`bB!Q?jl+`K486;K0`Whkps@%N7<HzR&}`()-0BH9Qwz7twtidkJ^Cf7Se%
zc*zo*V0hxtlLk^;lfIiabLBCe(!DwXeH*+#9LX)O224{b@CbF9%D7$f<NX@F^mkiD
zO(3GZ>pQp>13yFj3h4cQs;&;R^dZ+2&`ScVqOUSXczOD{EQ+#3XEhKD4u0_BtY_PY
zG^6DKv@-9l=RN2APRI5OBYaTKX(lxqRDI|2UZTG8yE!!6rU*|fZ{d;MHu^M%V*Rz6
zUG3e&Z8Q1sf$jK0hQFd5h{<(maGS7HyXPO4BP0~Rj{^~6yiQwKuxA$6;=CylJ{ZK?
zIMjSf|7)YBm9+v5m{LN4(hW<jTIu7M44hMM3INka{tjjsX}R^A4}v+wrcg9^f4sV?
z4bY}Meb<@KxzA*HaTtfR_u87m&XZ+p()G_y)4Hk7F~^@PfVf3!lhYAr_-!iEQGnoA
zDNx<`FeiHa9c}`7m#etnWXI*ocv|_|<Wyyf@zse3$KTz4ZN6=?{Ml{vLO^%qw;i)U
zr-o)Z!ke5*0I>75fNHCN!{FP{K9Y7?)ocQ8H-i9u$xF8?L$6g0Pwh4?p8@v1Zu-aD
zC&Oh7nu$^G7{H!kx&{Gp)=q)j+{%LPSGdEI;f1sVl3ZzPCzdhU2bGP&HH*oeW>?RM
z+SiHxEfPj#=Dy~B_{b4-kMUr3yJ-qu2bf3e(|u6-2vE|71A`&}?zqY2ZAk9Lq~a#S
zYpWQ)Z(d59;&B&z_E#eH-O{(5{@4EsNC&^yV&g<GcF8q=GYa&XlqQ=ca$y~Jd)c${
z5jg%PaR8v1wjU4TPGx^8fVo;j2vrRQ*6<;vX5HKvn4ecMZ_E9}2R)_yKL}F;x4a+|
zf79E+-XUHQ66*TwsKDD)|HG6w^VwT({7>gY7&I)4s_*($yUGkL{{f$?JotCz`~rw0
z6N3Z_IhN!`>EG^y-NHHQQ!*V_V2vhD|MuHX%OZDyrznicZD6NA+9+chf0)ew9E{@w
zubCV?0?L20nCv%Z{!0ZgoVajF0K{jtWqvD_12hUsywoB6?+Ku>Ncekr&$EmWCQ$A9
z;5GCCy!4g(@cscngW*@1>?w6RqNar>ZFQuWh{+2zO!9Z|WmxY&mK3ep<`F5aDrU}U
z!^IH0;m_yyXMOnzoJX*|Q6c63fx`(NWUzEscM0R6SYgME$)MOfwf%n|{A;3*tK>-;
zhG1tz>!8CPHZBE&pyX}^AvquR=L0=1Hyn-g95_8}Q+yFtXZCvvjt<s{6?^X&u2QfI
zhX2eU{yH4!=n&>k2${G~-qV$k1k+1y^g!gW5U?%CvxPd#*ylN!)bk%(F|*=&fCBh0
zbc#pZ^_~DG6D(yR;{N`>rbr3AJ*8z30>FVzR@JE?+So8lsA5M(*O=_^uYs!mZRlLl
zOe9>siWxF-B!z^kK#v`iYSlhgb3{6K=q)#Qqmix<4^kWGe3e7MTn5pW*HH`kW&d^6
z#DSpAV=^llbsH%TfUz3KkZ}s-pof>}E@;QrqZ-d6E~p^>=lJazcbr{Fc_GKgWZrvO
z+rC#gu&`qeX!e%l67E>|d4{UwSM`(D6rX^4Y-X)PA3@EEqY#e(Sd8u8o8VUAgyET9
zNq_N&vu%2CJf-YB^w*#b_2N&HI1q)VIW#;4?bfm|TjJ5OSpHxE^9p`E;rwP1^OFE9
zNYyEW2j*`+DnkhA_-9LNXFG7;Fu~q}okd|uRslE{^h8oFIfoFM7m<N&W1fs5-iknq
zrlz#>Q*g=6$I!ob9yC0@ZWP1}xtu6K?ZB<}li}C?^7ZPDwu{a<TU7#Vw!8I52B`dm
zhKCh@{Rd7Y`3aohG(Ch5f(F<=m!9410tL#D&Jm=Wzzpyt9p*pj<lctj!h#9gPpPh`
z*FmBV(wT>5wCW+Krrncf-bOWR4$tdjEcD4j3;wVA5eJG&Pf7*+4e@WaP=(v|MwrjC
z3OLC|;h5XuO;~J@@Bns&I1f3&9hfkFa%OW%)4RmoCGEQ*Hy6@)b3G^I283r$sR2PB
zQU!#;08$DT7{}m2&BuNoGYb;YY5+X`<k1B*6JHOV(?I?#40wl2Hha%tOIyL4q0na7
z1G8nz1PlaG-T_NEq)td6$J=ALx((@yit#54F9uNqSp@_V)gefEuX4?N%|>iMdd&z|
zXHl#Wb8NVDLwxTwic^tYi)`=51X#-YlSHr<i1nJ0r9syZy8(Yb7h4xSw^|^r(AXiU
zgZbZTUjp`CZje|No4A*HM%qVbvM2B=RDcq8zy`TE170$b2hgV{HQ&s|*6bY7Fd4&U
zeCXUX>9LwBxC&a<uywZkF!&8<?L+%CP{zdVV$>!o;3#1cnqtgZIFO0KE%Vg+^fp}X
zwo*}M0%$qz-#MF(6Pi#1Xw2{jV;$Rm-Q(R0IqJB7kJr*>Id<<t=LBoC%d!9akysos
zE`!@d?N(|J?k?tF_8xT9O#4NS7aUW2S5G?=1SP~4Mpr&<#)lomW62#6xLu&8A5!zR
z++d@F`4i?~>g<pr<Ft%mUOAQA#V;KxkAGFPU|tJg>gC5VzbGBRV5KY1ZvRCWRmes9
z=sQ2P2O*StN&5{?u0lpnmUuThABDEPTD+Fno9+0BD)6+)&e^zlq{pCBz9n<gT=yk;
z;Y0@KlOaxSCAi<zOSPf@6hW(W{uZ5&5@VEpI}Wr-&wyi+73NR#;~#^n`I8Rd==fga
z#eJ0?%fg){f{t)tB2gTbyhH*2KIdm8gmS!8jnw#W6GEHJ3KsM>bdsPf4DS;N1VgEi
zdWQlp`2Fu&t<*}(t8o0`O$dffD%8Cn{15CF;*<mPPj<wbK3CQdt~DqPUIbcT7S7$F
zPjkAX(>L_)0SeUo#DWl^oGgAt#<A+$%{^kMJ8@U{yFdBxa~$p{b7{!r4F%xB@b33P
z&T@VS3phU<vTLlMek5KEN-9ZMp<!JEf~_aA{bvtBI^CydC>!Cd8z%(k4{8L|RGAz#
zb7B?J1pSSRZ;wda=Z5&{=<O<Qfr%M%J_L;C{`Mc?g;%)ttBnj$_YcU6Zt$N1KXLy}
zSpAw?&^xXKZrSD^b+Eh$&01{HRldc->WHrRxe>;}0P*xwH?27yL@Q)!5P3lf9c^?2
ztvH!u^b-wOMNSZ`d6=aV-z=7HTq{{n=55N?1)t6<vOP(Nzy5h^(8fR6jqo%fg17?-
zoeErF;({=z=xJPN_+BrV8UNEWhX7J!^}=(TJ^6XH;)C;H4bE|1t>*U>D@cVmE_%d(
zygLtSMj={r1~t5j0-1<u#(=1UNB{5_J_(4z{E5dOdrAp2LlpZED7VKYTMU0mSRGS}
za^u@z9;IH!LNyN|6Z=8a9=>jYxG*sGi?tV$1U<gc6-7a|xyjDWb7+ZxKL*E-0!e=U
z?fartOlQbHP-JjCc`lbcJQGS7Mu>H)fphkBxPc5ttumc=7f1msKd^m}DuCOATt4{G
z=akwxl?4eNEoc#@<r#~V!=`Jppg3EY-Mt$yc!b&~n%Raap=6iV%}={}t(GTup_+*$
zOQw1#Rh!Sps5Cax5K$!~`!fH-&uheDCTo3sCph-A>sXD4b(9aQhE@XeE^u@s@Pb%x
zJif5_XVzJH1|?(ok8TVRWHY_2hjOT0pR@fi;pp^+mS6pNc_XK5MzPKNsX^ZzLzG@6
z8C1ZAn*7gNI*!KlO-cB}@Ln+6tKkz4L~2!G%tQjgyvYy?SJh~bWFha;FETIZY45xy
zj|F2F9f@DF;=Nq;l{Z*zbS-k&#VM$j-T7F-hr=p~jv;@&&j{!N2j(UAl4tcFio{}K
zBYMT2=Lf8Z6lfy(nP()hqb*8ng7xT_gU3n=(O0H?cz=Z_I}OJ@el5@oaAa+Ff|Wdo
z!-2-tJvEG<1cE<SJh9<)C?coriI>s;mN0`0Sy3sR9@cvrP0~Rb)p8S(g=nJpZ|(3t
znSfE7jsS4HV~RLEqQECGGQ$Ca-jvcTl>SQc49cbh>IPblr0J16F-RyR=C=B;6^GSW
zpAacja8EW|fBor!;;m31a0L7iO$#flUM4H&29+>Bt1Rws?QlHd7M;p6)~p=d|G&pM
zQsjy_E`+3o&3ibIw}o@*^nj)3>=P{W@#Vg}4-+FCH-K_N35CD;J<RH&9AFCq90ZFa
z72Nr{a(0-m7^8$B-OJ`UCW86y?v0_vpOvo^PhRXD9Gj+qFTn0!0v3m$fDg$BHv_QL
z0%Xu~77=WI$39voXo?nWgsK_x#QE<W>XOOX!`;z;P|NaY9KFX1YvEOT1+J<uF$d6d
zJ`kkJ%1490gi#x|*$ak?-pxIcTnG3Ffs!y>M$p7Grp7TUttvI@2L^oeLgJ$*Hwv<3
z=Su^Jz=c7)s!+7oLnue%2Ie;Om+Q0HeY2}QZOnGX@!sTn74DJG;orH5=^$utO!=9b
zyuCNe@(%9go`)6RdRb<5#+>u5oW;V-t)Bo#vu+u<)~sZM|C~6FhBUzz*@4rTF~3Ej
zZR$fv>EFc|#6k3<%Fm<#VD;V&xPxf?#iI9L*FmoL#@rDcO<=kAz}q4HKoDY;y&?mX
zAn!Q6%1<8BTk5}?6((7xL!r7a(dnIZ?*JE67^WA5s{lCpW_gc%kH|ZVkDs3bvm>G5
z|Kjch;7&UuZZ^(9wF__8@~si8F@0Rfv%I^{Kq*t^qOAGj@%dQhVpd5F%N^B<gxgfm
z%Q6+HU3icf!brp-Uf7WQ-rajFmiWtWiLnKlRv;d)ghrE{X@NBsy(WHH6b`mo_VEQP
zFF5jA2_dr|9nBJGh7ID?oo50!-W;0}zZ3(g!iMzv;i~P6H=r%1X$BKb%l9|rxFhaA
z5-JH(pobdo<~)dY2IRm}mCx0)?!JFW=|^>s;xjlpf{)#IbSF8}{0JIP&Px$4@cQCQ
z;(FeL`+PnJ!P7nGdRsak47G3kkbGXQ7>P)6ceIMYZ&H6<vS+u!<deKWsC}=R>-Ey}
zSTG;P$dG6m&e?{SLW){>c>{vUKT(H}qhvTf9Vdh*%upi@NQlAEs`mdR0*V}#f=p6g
z@M&h`LlE+z)N8rL|8z-F@iDz#kT^BW2F$E%&~6|x&BkfJUwlq@PWArAc$;$&nn?EF
zroimZgfS_ofKNeFap{H=A(Syz4vk~~N;(c!FyA%?UKDbiYJ?UCCT_*8_+9g+voOpc
zN{@D3`mZ3c6;NE<4;<)@g}>A4_t*wJsC%q!e@E_$Pw7;{5h$+P2H^Y8$DkY<zdK!E
zZc0a)e~?V54$k_`B?7EKiIQh}EcBNL%D$Y@hhU2ydLAB7)hJ@WM9z?O|KHbj!Pn*T
zsGv<r^fPfEocTn^XHqDL@kDg}R%5K%KQVytH>Zvu@58@1m8R-aF3_WqwS8N;Xzl<x
zk5G(b1ui7_G9Abg)J_!dO?u9>ipNS({jkJRhpd+zf`SfgyrGI%*$~yE27K7faosF}
zg3r=;+kF+x6yo5gO_j-DF5c|n@d7sQGjp)gH-CE=NoGrvIf}}Yj(i3R4}uMn{=qr=
z!A9z3BL*~1hE3M3a8uM?bNgdb6dM?v(9Rip1fBliqB!vqE8gXTe)GPNUi<V;DUh~q
z5oRjQ?hLJ)z`nx?k6KO%myHa|p7#Kx_m|bnx;VcB$IXDsgiLVofZj&E@%p*??2c5x
z5-#*oLEmaAniLS20R-6npOL|||HOL&osN7YB}CpiNrMzD2~z}Ig-17xxBQ?rA$6-c
zwKCh+9dgX_a%T;_BkPz1Xp4clPQPKykerl|Pb^Xfs+#t)^dc+B!d)j=x?A=?h3q+U
z=9ooO3%yL~mU>U-yf6k?(PeRj8>5Iv=q45J5kfFYEX%+lE)jG-i68%`76(F7NWCU+
zn;bdel+g+a1`^kH`M>e(kleHUGyE&#E;6mu)c30Q@F3WXK^6||&XWyYLn~x9ZrsLz
zb4+2>Q_>S%NfSoNo6v{e5K<the_Wny#7Y;_p|)i393^F+%hcanM_X?-3BMJs!qOE#
z`{ON|Jok&@Q|^2DdxUZ$;E4v|Y-a;a)q;@J6g;f}uSanEJoF1U3Lt1))pIhO2f;3J
zMN$>F8^_3$!%7Bt=(UZd$7{Kmq{m?1?P&U>c(p|7+{mHVQCpagaEX*zp!g22BP^&N
zyf~~M)pbSt*pyjqd*KvRX6VXIG-2N{GiPSEUAOMoSiTf_SGqi}V5AM=DJB160qxXV
z(Qo)@!iPvyEPH5R24?D|KNlr?W3KHtF|S#g^%YJGZlljD@RyzOBZ2;9l^-m#_bA8p
z0TT*c>x%ivU#GOJ9h0tWN${5t-hSyQ02VurhM;fjnZM!b5{I)&O&;cOyqN%}wYdd)
zANo}wlefWR1tR*T8j^a%SQ6O6Ue=yfyY)22kx;(mKiV)eAT&AuA_e1rAt;27qUHxY
z;L_*$q-5OXz0LTkUm`8t70hCCKMBCOy&S`{&B-Q&_GtFx!XMA8c0FkY){XE%gD0S1
z?Xx%PQ9=Ee92&CPN_IQYtt5oRhANmFg2CBCP}HA4KMg`D+Ub(TS<Ej6ko0k58%my8
zKxX>1zTrSHdKNh>POje7t9kNUL(bVuT~v3i@decGhGN=rZt~KDU-*B!v*ddMuoJhn
z;eFo?hUzl)_YEtLfSk6F#}z2O;ya_!6WLl@hAU^T9X4idn8)+lF-QuSQ-Gjgw&L`-
zJ?0Bv{hNMTz`w-a_^9qxpu-P51-h(3zVc;m?ygU(s~SFY9T84qd2{(zx$%voAd?ks
zK_&ysv`#zwGr=F{Hhx!VsNpLGY840hnBhTp{8eU!WIc1>5Xx_kC%_g>!xa++hK4MY
zvkX5^NNw!5W4>|SV)n_s+opc6nf5+SzG<)K{KK_=UNSZfe|sNEFkCTXXegGO0KC3n
z+h@H=uRzU+1r}@#40}Kk((t|XMf~fF%<oTJDWCHE#Q|W81qccbGHl$+bU@N+Ub<QJ
z2FEo@X$R_9ju`@rUYn!;Pckul&X~pM@YeWdB!BhG?2}I!9{7Z8b`;sqD#7q-+oZa(
Tj}^c^0Rw}ltDnm{r-UW|HH{Y-
literal 0
HcmV?d00001
diff --git a/vendor/zendframework/zendframework/resources/composer.json b/vendor/zendframework/zendframework/resources/composer.json
index e8a4b6f0078..5f6d5a55b74 100644
--- a/vendor/zendframework/zendframework/resources/composer.json
+++ b/vendor/zendframework/zendframework/resources/composer.json
@@ -9,7 +9,7 @@
],
"target-dir": "Zend/resources",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.23"
}
}
diff --git a/vendor/zendframework/zendframework/resources/languages/ar/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/ar/Zend_Captcha.php
index 4d81f7c7bf3..f7bb0060ca4 100644
--- a/vendor/zendframework/zendframework/resources/languages/ar/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/ar/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/ar/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/ar/Zend_Validate.php
index 9fb8128c36a..7875eaf1a27 100644
--- a/vendor/zendframework/zendframework/resources/languages/ar/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/ar/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/bg/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/bg/Zend_Captcha.php
index bbcf0af0d35..07cd0a1ca18 100644
--- a/vendor/zendframework/zendframework/resources/languages/bg/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/bg/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,12 +11,12 @@
* EN-Revision: 30.Jul.2011
*/
return array(
- // Zend_Captcha_ReCaptcha
+ // Zend\Captcha\ReCaptcha
"Missing captcha fields" => "Ðепопълнена ÑтойноÑÑ‚ на капча",
"Failed to validate captcha" => "Ðе може да валидира капча",
"Captcha value is wrong: %value%" => "СтойноÑтта на капча е грешна: %value%",
- // Zend_Captcha_Word
+ // Zend\Captcha\Word
"Empty captcha value" => "Ðепопълнена ÑтойноÑÑ‚ на капча",
"Captcha ID field is missing" => "ЛипÑващо капча ID поле",
"Captcha value is wrong" => "СтойноÑтта на капча е грешна",
diff --git a/vendor/zendframework/zendframework/resources/languages/bg/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/bg/Zend_Validate.php
index dbe2b727a8b..4afeaa6bf6b 100644
--- a/vendor/zendframework/zendframework/resources/languages/bg/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/bg/Zend_Validate.php
@@ -3,52 +3,61 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/**
- * BG-Revision: 09.Sept.2012
+ * EN-Revision: 16.Jul.2013
*/
return array(
- // Zend_I18n_Validator_Alnum
+ // Zend\I18n\Validator\Alnum
"Invalid type given. String, integer or float expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг, цÑло или реално чиÑло",
"The input contains characters which are non alphabetic and no digits" => "Въведени Ñа Ñимволи, които не Ñа букви или чиÑла",
"The input is an empty string" => "Въведен е празен Ñтринг",
- // Zend_I18n_Validator_Alpha
+ // Zend\I18n\Validator\Alpha
"Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
"The input contains non alphabetic characters" => "Въведени Ñа Ñимволи, които не Ñа букви",
"The input is an empty string" => "Въведен е празен Ñтринг",
- // Zend_I18n_Validator_Float
+ // Zend\I18n\Validator\DateTime
+ "Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
+ "The input does not appear to be a valid datetime" => "Ðе е въведена валидна datetime ÑтойноÑÑ‚",
+
+ // Zend\I18n\Validator\Float
"Invalid type given. String, integer or float expected" => "Зададен е невалиден тип данни. Очаква Ñе цÑло или реално чиÑло",
"The input does not appear to be a float" => "Ðе е въведено реално чиÑло",
- // Zend_I18n_Validator_Int
+ // Zend\I18n\Validator\Int
"Invalid type given. String or integer expected" => "Зададен е невалиден тип данни. Очаква Ñе цÑло чиÑло",
"The input does not appear to be an integer" => "Ðе е въведено цÑло чиÑло",
- // Zend_I18n_Validator_PostCode
+ // Zend\I18n\Validator\PhoneNumber
+ "The input does not match a phone number format" => "Ðе е въведен телефонен номер във валиден формат",
+ "The country provided is currently unsupported" => "Въведената държава в момента не Ñе поддържа",
+ "Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
+
+ // Zend\I18n\Validator\PostCode
"Invalid type given. String or integer expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг или цÑло чиÑло",
"The input does not appear to be a postal code" => "Ðе е въведен валиден пощенÑки код",
"An exception has been raised while validating the input" => "По време на валидациÑта беше върнато изключение",
- // Zend_Validator_Barcode
+ // Zend\Validator\Barcode
"The input failed checksum validation" => "Въведената ÑтойноÑÑ‚ не уÑÐ¿Ñ Ð½Ð° премине валидациÑта на контролната Ñума",
"The input contains invalid characters" => "Въведената ÑтойноÑÑ‚ Ñъдържа невалидни Ñимволи",
"The input should have a length of %length% characters" => "Въведената ÑтойноÑÑ‚ Ñ‚Ñ€Ñбва да има дължина от %length% Ñимвола",
"Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
- // Zend_Validator_Between
+ // Zend\Validator\Between
"The input is not between '%min%' and '%max%', inclusively" => "Въведената ÑтойноÑÑ‚ не е между '%min%' и '%max%' включително",
"The input is not strictly between '%min%' and '%max%'" => "Въведената ÑтойноÑÑ‚ не е точно между '%min%' и '%max%'",
- // Zend_Validator_Callback
+ // Zend\Validator\Callback
"The input is not valid" => "Въведена е невалидна ÑтойноÑÑ‚",
"An exception has been raised within the callback" => "По време на заÑвката беше върнато ново изключение",
- // Zend_Validator_CreditCard
+ // Zend\Validator\CreditCard
"The input seems to contain an invalid checksum" => "Въведената ÑтойноÑÑ‚ Ñъдържа невалидна контролна Ñума",
"The input must contain only digits" => "Въведената ÑтойноÑÑ‚ Ñ‚Ñ€Ñбва да Ñъдържа Ñамо цифри",
"Invalid type given. String expected" => "Зададен е навалиден тип данни. Очаква Ñе Ñтринг",
@@ -57,29 +66,27 @@ return array(
"The input seems to be an invalid creditcard number" => "Въведената ÑтойноÑÑ‚ не е валиден номер на кредитна карта",
"An exception has been raised while validating the input" => "По време на валидациÑта беше върнато ново изключение",
- // Zend_Validator_Csrf
+ // Zend\Validator\Csrf
"The form submitted did not originate from the expected site" => "Формата не е изпратена от Ð¾Ñ‡Ð°ÐºÐ²Ð°Ð½Ð¸Ñ Ñайт",
- // Zend_Validator_Date
+ // Zend\Validator\Date
"Invalid type given. String, integer, array or DateTime expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг, цÑло чиÑло или DateTime",
"The input does not appear to be a valid date" => "Въведена ÑтойноÑÑ‚ не е валидна дата",
"The input does not fit the date format '%format%'" => "Въведена ÑтойноÑÑ‚ не е дата във формат '%format%'",
- // Zend_Validator_DateStep
- "Invalid type given. String, integer, array or DateTime expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг, цÑло чиÑло или DateTime",
- "The input does not appear to be a valid date" => "Въведена ÑтойноÑÑ‚ не е валидна дата",
+ // Zend\Validator\DateStep
"The input is not a valid step" => "Въведена ÑтойноÑÑ‚ не е валидна Ñтъпка",
- // Zend_Validator_Db_AbstractDb
+ // Zend\Validator\Db\AbstractDb
"No record matching the input was found" => "Ðе беше открит Ð·Ð°Ð¿Ð¸Ñ Ñъвпадащ Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÐ½Ð°Ñ‚Ð° ÑтойноÑÑ‚",
"A record matching the input was found" => "Беше открит Ð·Ð°Ð¿Ð¸Ñ Ñъвпадащ Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÐ½Ð°Ñ‚Ð° ÑтойноÑÑ‚",
- // Zend_Validator_Digits
+ // Zend\Validator\Digits
"The input must contain only digits" => "Въведената ÑтойноÑÑ‚ Ñ‚Ñ€Ñбва да Ñъдържа Ñамо цифри",
"The input is an empty string" => "Въведената ÑтойноÑÑ‚ е празен Ñтринг",
"Invalid type given. String, integer or float expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг, цÑло или реално чиÑло",
- // Zend_Validator_EmailAddress
+ // Zend\Validator\EmailAddress
"Invalid type given. String expected" => "Зададен е навалиден тип данни. Очаква Ñе Ñтринг",
"The input is not a valid email address. Use the basic format local-part@hostname" => "Въведената ÑтойноÑÑ‚ не е валиден email Ð°Ð´Ñ€ÐµÑ Ð² Ð±Ð°Ð·Ð¾Ð²Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ local-part@hostname",
"'%hostname%' is not a valid hostname for the email address" => "'%hostname%' не е валидно име на хоÑÑ‚ за Ð²ÑŠÐ²ÐµÐ´ÐµÐ½Ð¸Ñ email адреÑ",
@@ -90,81 +97,81 @@ return array(
"'%localPart%' is not a valid local part for the email address" => "'%localPart%' не е валидна локална чаÑÑ‚ от Ð²ÑŠÐ²ÐµÐ´ÐµÐ½Ð¸Ñ email адреÑ",
"The input exceeds the allowed length" => "Въведената ÑтойноÑÑ‚ надвишава разрешение размер",
- // Zend_Validator_Explode
- "Invalid type given. String expected" => "Зададен е навалиден тип данни. Очаква Ñе Ñтринг",
+ // Zend\Validator\Explode
+ "Invalid type given" => "Зададен е навалиден тип данни",
- // Zend_Validator_File_Count
+ // Zend\Validator\File\Count
"Too many files, maximum '%max%' are allowed but '%count%' are given" => "Твърде много файлове, макÑимум '%max%' Ñа разрешени, но '%count%' Ñа зададени",
"Too few files, minimum '%min%' are expected but '%count%' are given" => "Твърде малко файлове, минимум '%min%' Ñа очаквани, но '%count%' Ñа зададени",
- // Zend_Validator_File_Crc32
- "File '%value%' does not match the given crc32 hashes" => "Файлът '%value%' не Ñъвпада Ñ Ð´Ð°Ð´ÐµÐ½Ð¸Ñ crc32 хаш",
+ // Zend\Validator\File\Crc32
+ "File does not match the given crc32 hashes" => "Файла не Ñъвпада Ñ Ð´Ð°Ð´ÐµÐ½Ð¸Ñ crc32 хаш",
"A crc32 hash could not be evaluated for the given file" => "Този crc32 хаш не може да оцени Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не ÑъщеÑтвува",
+ "File is not readable or does not exist" => "Файла не може да бъде прочетен или не ÑъщеÑтвува",
- // Zend_Validator_File_ExcludeExtension
- "File '%value%' has a false extension" => "Файлът '%value%' има грешно разширение",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не ÑъщеÑтвува",
+ // Zend\Validator\File\ExcludeExtension
+ "File has an incorrect extension" => "Файла има грешно разширение",
+ "File is not readable or does not exist" => "Файла не може да бъде прочетен или не ÑъщеÑтвува",
- // Zend_Validator_File_Exists
- "File '%value%' does not exist" => "Файлът '%value%' не ÑъщеÑтвува",
+ // Zend\Validator\File\Exists
+ "File does not exist" => "Файла не ÑъщеÑтвува",
- // Zend_Validator_File_Extension
- "File '%value%' has a false extension" => "Файлът '%value%' е Ñ Ð³Ñ€ÐµÑˆÐ½Ð¾ разширение",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' е нечетим или не ÑъщеÑтвува",
+ // Zend\Validator\File\Extension
+ "File has an incorrect extension" => "Файла е Ñ Ð³Ñ€ÐµÑˆÐ½Ð¾ разширение",
+ "File is not readable or does not exist" => "Файла е нечетим или не ÑъщеÑтвува",
- // Zend_Validator_File_FilesSize
+ // Zend\Validator\File\FilesSize
"All files in sum should have a maximum size of '%max%' but '%size%' were detected" => "Файлове Ñ‚Ñ€Ñбва да имат общ размер от макÑимум '%max%', но в момента той е '%size%'",
"All files in sum should have a minimum size of '%min%' but '%size%' were detected" => "Файлове Ñ‚Ñ€Ñбва да имат общ размер от минимум '%min%', но в момента той е '%size%'",
"One or more files can not be read" => "Един или повече файлове не могат да бъдат прочетени",
- // Zend_Validator_File_Hash
- "File '%value%' does not match the given hashes" => "Файлът '%value%' не Ñъвпада Ñ Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ…Ð°Ñˆ",
+ // Zend\Validator\File\Hash
+ "File does not match the given hashes" => "Файла не Ñъвпада Ñ Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ…Ð°Ñˆ",
"A hash could not be evaluated for the given file" => "Този хаш не може да оцени Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не ÑъщеÑтвува",
-
- // Zend_Validator_File_ImageSize
- "Maximum allowed width for image '%value%' should be '%maxwidth%' but '%width%' detected" => "МакÑималната ширина на изображението '%value%' Ñ‚Ñ€Ñбва да бъде '%maxwidth%', но в момента е '%width%'",
- "Minimum expected width for image '%value%' should be '%minwidth%' but '%width%' detected" => "Минималната ширина на изображението '%value%' Ñ‚Ñ€Ñбва да бъде '%minwidth%', но в момента е '%width%'",
- "Maximum allowed height for image '%value%' should be '%maxheight%' but '%height%' detected" => "МакÑималната виÑочина на изображението '%value%' Ñ‚Ñ€Ñбва да бъде '%maxheight%', но в момента е '%height%'",
- "Minimum expected height for image '%value%' should be '%minheight%' but '%height%' detected" => "Минималната виÑочина на изображението '%value%' Ñ‚Ñ€Ñбва да бъде '%minheight%', но в момента е '%height%'",
- "The size of image '%value%' could not be detected" => "Размера на изображението '%value%' не може да бъде открит",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не ÑъщеÑтвува",
-
- // Zend_Validator_File_IsCompressed
- "File '%value%' is not compressed, '%type%' detected" => "Файлът '%value%' не е компреÑиран, Ð½ÐµÐ³Ð¾Ð²Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ е '%type%'",
- "The mimetype of file '%value%' could not be detected" => "Ðе може да бъде открит маймтайп формата на '%value%'",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не ÑъщеÑтвува",
-
- // Zend_Validator_File_IsImage
- "File '%value%' is no image, '%type%' detected" => "Файлът '%value%' не е изображение, Ð½ÐµÐ³Ð¾Ð²Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ е '%type%'",
- "The mimetype of file '%value%' could not be detected" => "Ðе може да бъде открит маймтайп формата на '%value%'",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не ÑъщеÑтвува",
-
- // Zend_Validator_File_Md5
- "File '%value%' does not match the given md5 hashes" => "Файлът '%value%' не Ñъвпада Ñ Ð´Ð°Ð´ÐµÐ½Ð¸Ñ md5 хаш",
- "A md5 hash could not be evaluated for the given file" => "Този md5 хаш не може да оцени Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не ÑъщеÑтвува",
-
- // Zend_Validator_File_MimeType
- "File '%value%' has a false mimetype of '%type%'" => "Файлът '%value%' има грешен маймтайп - '%type%'",
- "The mimetype of file '%value%' could not be detected" => "Ðе може да бъде открит маймтайп формата на '%value%'",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не ÑъщеÑтвува",
-
- // Zend_Validator_File_NotExists
- "File '%value%' exists" => "Файлът '%value%' ÑъщеÑтвува",
-
- // Zend_Validator_File_Sha1
- "File '%value%' does not match the given sha1 hashes" => "Файлът '%value%' не Ñъвпада Ñ Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ sha1 хаш",
+ "File is not readable or does not exist" => "Файла не може да бъде прочетен или не ÑъщеÑтвува",
+
+ // Zend\Validator\File\ImageSize
+ "Maximum allowed width for image should be '%maxwidth%' but '%width%' detected" => "МакÑималната ширина на изображението Ñ‚Ñ€Ñбва да бъде '%maxwidth%', но в момента е '%width%'",
+ "Minimum expected width for image should be '%minwidth%' but '%width%' detected" => "Минималната ширина на изображението Ñ‚Ñ€Ñбва да бъде '%minwidth%', но в момента е '%width%'",
+ "Maximum allowed height for image should be '%maxheight%' but '%height%' detected" => "МакÑималната виÑочина на изображението Ñ‚Ñ€Ñбва да бъде '%maxheight%', но в момента е '%height%'",
+ "Minimum expected height for image should be '%minheight%' but '%height%' detected" => "Минималната виÑочина на изображението Ñ‚Ñ€Ñбва да бъде '%minheight%', но в момента е '%height%'",
+ "The size of image could not be detected" => "Размера на изображението не може да бъде открит",
+ "File is not readable or does not exist" => "Файла не може да бъде прочетен или не ÑъщеÑтвува",
+
+ // Zend\Validator\File\IsCompressed
+ "File is not compressed, '%type%' detected" => "Файла не е компреÑиран, Ð½ÐµÐ³Ð¾Ð²Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ е '%type%'",
+ "The mimetype could not be detected from the file" => "Ðе може да бъде открит маймтайп формата на файла",
+ "File is not readable or does not exist" => "Файла не може да бъде прочетен или не ÑъщеÑтвува",
+
+ // Zend\Validator\File\IsImage
+ "File is no image, '%type%' detected" => "Файла не е изображение, Ð½ÐµÐ³Ð¾Ð²Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ е '%type%'",
+ "The mimetype could not be detected from the file" => "Ðе може да бъде открит маймтайп формата на файла",
+ "File is not readable or does not exist" => "Файла не може да бъде прочетен или не ÑъщеÑтвува",
+
+ // Zend\Validator\File\Md5
+ "File does not match the given md5 hashes" => "Файла не Ñъвпада Ñ Ð´Ð°Ð´ÐµÐ½Ð¸Ñ md5 хаш",
+ "An md5 hash could not be evaluated for the given file" => "Този md5 хаш не може да оцени Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»",
+ "File is not readable or does not exist" => "Файла не може да бъде прочетен или не ÑъщеÑтвува",
+
+ // Zend\Validator\File\MimeType
+ "File has an incorrect mimetype of '%type%'" => "Файла има грешен маймтайп - '%type%'",
+ "The mimetype could not be detected from the file" => "Ðе може да бъде открит маймтайп формата на файла",
+ "File is not readable or does not exist" => "Файла не може да бъде прочетен или не ÑъщеÑтвува",
+
+ // Zend\Validator\File\NotExists
+ "File exists" => "Файла ÑъщеÑтвува",
+
+ // Zend\Validator\File\Sha1
+ "File does not match the given sha1 hashes" => "Файла не Ñъвпада Ñ Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ sha1 хаш",
"A sha1 hash could not be evaluated for the given file" => "Този sha1 хаш не може да оцени Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не ÑъщеÑтвува",
+ "File is not readable or does not exist" => "Файла не може да бъде прочетен или не ÑъщеÑтвува",
- // Zend_Validator_File_Size
- "Maximum allowed size for file '%value%' is '%max%' but '%size%' detected" => "МакÑÐ¸Ð¼Ð°Ð»Ð½Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½ размер на файла '%value%' е '%max%', но в момента той е '%size%'",
- "Minimum expected size for file '%value%' is '%min%' but '%size%' detected" => "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»Ð½Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½ размер на файла '%value%' е '%min%', но в момента той е '%size%'",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не ÑъщеÑтвува",
+ // Zend\Validator\File\Size
+ "Maximum allowed size for file is '%max%' but '%size%' detected" => "МакÑÐ¸Ð¼Ð°Ð»Ð½Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½ размер на файла е '%max%', но в момента той е '%size%'",
+ "Minimum expected size for file is '%min%' but '%size%' detected" => "ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»Ð½Ð¸Ñ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½ размер на файла е '%min%', но в момента той е '%size%'",
+ "File is not readable or does not exist" => "Файла не може да бъде прочетен или не ÑъщеÑтвува",
- // Zend_Validator_File_Upload
+ // Zend\Validator\File\Upload
"File '%value%' exceeds the defined ini size" => "Файлът '%value%' надвишава Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€ в ini файла",
"File '%value%' exceeds the defined form size" => "Файлът '%value%' надвишава Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ð²ÑŠÐ² формата размер",
"File '%value%' was only partially uploaded" => "Файлът '%value%' беше качен Ñамо чаÑтично",
@@ -176,20 +183,32 @@ return array(
"File '%value%' was not found" => "Файлът '%value%' не беше открит",
"Unknown error while uploading file '%value%'" => "Възникна грешка при качването на файла '%value%'",
- // Zend_Validator_File_WordCount
+ // Zend\Validator\File\UploadFile
+ "File exceeds the defined ini size" => "Файла надвишава Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€ в ini файла",
+ "File exceeds the defined form size" => "Файла надвишава Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ð²ÑŠÐ² формата размер",
+ "File was only partially uploaded" => "Файла беше качен Ñамо чаÑтично",
+ "File was not uploaded" => "Файла не беше качен",
+ "No temporary directory was found for file" => "Ðе беше открита временна Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ð·Ð° файла",
+ "File can't be written" => "Файла не може да бъде запиÑан",
+ "A PHP extension returned an error while uploading the file" => "PHP изключение беше върнато по време на качването на файла",
+ "File was illegally uploaded. This could be a possible attack" => "Файла беше качен без позволение. Това може да бъде потенциална атака",
+ "File was not found" => "Файла не беше открит",
+ "Unknown error while uploading file" => "Възникна грешка при качването на файла",
+
+ // Zend\Validator\File\WordCount
"Too much words, maximum '%max%' are allowed but '%count%' were counted" => "Твърде много думи, очакват Ñе макÑимум '%max%', но '%count%' бÑха открити",
"Too few words, minimum '%min%' are expected but '%count%' were counted" => "Твърде малко думи, очакват Ñе минимум '%min%' но Ñамо '%count%' бÑха открити",
- "File '%value%' is not readable or does not exist" => "Файлът '%value%' не може да бъде прочетен или не ÑъщеÑтвува",
+ "File is not readable or does not exist" => "Файла не може да бъде прочетен или не ÑъщеÑтвува",
- // Zend_Validator_GreaterThan
+ // Zend\Validator\GreaterThan
"The input is not greater than '%min%'" => "Въведената ÑтойноÑÑ‚ не е по-голÑма от '%min%'",
"The input is not greater or equal than '%min%'" => "Въведената ÑтойноÑÑ‚ не е по-голÑма или равна на '%min%'",
- // Zend_Validator_Hex
+ // Zend\Validator\Hex
"Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
"The input contains non-hexadecimal characters" => "Въведената ÑтойноÑÑ‚ не Ñъдържа Ñамо шеÑтнадеÑетични Ñимволи",
- // Zend_Validator_Hostname
+ // Zend\Validator\Hostname
"The input appears to be a DNS hostname but the given punycode notation cannot be decoded" => "Въведената ÑтойноÑÑ‚ е DNS хоÑÑ‚ име, но Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð¸Ñ Ð¿ÑŽÐ½Ð¸ÐºÐ¾Ð´ не може да бъде декодиран",
"Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
"The input appears to be a DNS hostname but contains a dash in an invalid position" => "Въведената ÑтойноÑÑ‚ е DNS хоÑÑ‚ име, но Ñъдържа тире на непозволено мÑÑто",
@@ -202,66 +221,69 @@ return array(
"The input appears to be a DNS hostname but cannot extract TLD part" => "Въведената ÑтойноÑÑ‚ е DNS хоÑÑ‚ име, но не може да Ñе определи TLD чаÑта",
"The input appears to be a DNS hostname but cannot match TLD against known list" => "Въведената ÑтойноÑÑ‚ е DNS хоÑÑ‚ име, но не приÑÑŠÑтва в лиÑта Ñ Ð¸Ð·Ð²ÐµÑтни TLD",
- // Zend_Validator_Iban
+ // Zend\Validator\Iban
"Unknown country within the IBAN" => "IBAN-а Ñъдържа непозната държава",
"Countries outside the Single Euro Payments Area (SEPA) are not supported" => "Държави извън Single Euro Payments Area (SEPA) не Ñе поддържат",
"The input has a false IBAN format" => "Въведената ÑтойноÑÑ‚ е в грешен IBAN формат",
"The input has failed the IBAN check" => "Въведен е невалиден IBAN",
- // Zend_Validator_Identical
+ // Zend\Validator\Identical
"The two given tokens do not match" => "Двете зададени ÑтойноÑти не Ñъвпадат",
"No token was provided to match against" => "Ðе е зададена ÑтойноÑÑ‚ за Ñравнение",
- // Zend_Validator_InArray
+ // Zend\Validator\InArray
"The input was not found in the haystack" => "Въведената ÑтойноÑÑ‚ не беше открита",
- // Zend_Validator_Ip
+ // Zend\Validator\Ip
"Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
"The input does not appear to be a valid IP address" => "Въведената ÑтойноÑÑ‚ не е валиден IP адреÑ",
- // Zend_Validator_Isbn
+ // Zend\Validator\IsInstanceOf
+ "The input is not an instance of '%className%'" => "Ðе е въведена инÑÑ‚Ð°Ð½Ñ†Ð¸Ñ Ð½Ð° '%className%'",
+
+ // Zend\Validator\Isbn
"Invalid type given. String or integer expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг или цÑло чиÑло",
"The input is not a valid ISBN number" => "Въведената ÑтойноÑÑ‚ не е валиден ISBN номер",
- // Zend_Validator_LessThan
+ // Zend\Validator\LessThan
"The input is not less than '%max%'" => "Въведената ÑтойноÑÑ‚ не е по-малка от '%max%'",
"The input is not less or equal than '%max%'" => "Въведената ÑтойноÑÑ‚ не е по-малка или равна на '%max%'",
- // Zend_Validator_NotEmpty
+ // Zend\Validator\NotEmpty
"Value is required and can't be empty" => "Очакваната ÑтойноÑÑ‚ не може да бъде празна",
"Invalid type given. String, integer, float, boolean or array expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг, цÑло или реално чиÑло, булева ÑтойноÑÑ‚ или маÑив",
- // Zend_Validator_Regex
- "Invalid type given. String, integer or float expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг, цÑло или реално чиÑло",
- "The input does not match against pattern '%pattern%'" => "Въведената ÑтойноÑÑ‚ не Ñъвпада Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° '%pattern%'",
- "There was an internal error while using the pattern '%pattern%'" => "Получена е ÑиÑтемна грешка докато Ñе ползва шаблона '%pattern%'",
+ // Zend\Validator\Regex
+ "Invalid type given. String, integer or float expected" => "Invalid type given. String, integer or float expected",
+ "The input does not match against pattern '%pattern%'" => "The input does not match against pattern '%pattern%'",
+ "There was an internal error while using the pattern '%pattern%'" => "There was an internal error while using the pattern '%pattern%'",
- // Zend_Validator_Sitemap_Changefreq
- "The input is not a valid sitemap changefreq" => "Въведена е невалидна ÑтойноÑÑ‚ за changefreq",
- "Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
+ // Zend\Validator\Sitemap\Changefreq
+ "The input is not a valid sitemap changefreq" => "The input is not a valid sitemap changefreq",
+ "Invalid type given. String expected" => "Invalid type given. String expected",
- // Zend_Validator_Sitemap_Lastmod
+ // Zend\Validator\Sitemap\Lastmod
"The input is not a valid sitemap lastmod" => "Въведена е невалидна ÑтойноÑÑ‚ за lastmod",
"Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
- // Zend_Validator_Sitemap_Loc
+ // Zend\Validator\Sitemap\Loc
"The input is not a valid sitemap location" => "Въведена е невалидна ÑтойноÑÑ‚ за location",
"Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
- // Zend_Validator_Sitemap_Priority
+ // Zend\Validator\Sitemap\Priority
"The input is not a valid sitemap priority" => "Въведена е невалидна ÑтойноÑÑ‚ за priority",
"Invalid type given. Numeric string, integer or float expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг, цÑло или реално чиÑло",
- // Zend_Validator_Step
+ // Zend\Validator\Step
"Invalid value given. Scalar expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñкаларен тип",
"The input is not a valid step" => "Въведената ÑтойноÑÑ‚ не е валидна Ñтъпка",
- // Zend_Validator_StringLength
+ // Zend\Validator\StringLength
"Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
"The input is less than %min% characters long" => "Въведената ÑтойноÑÑ‚ е по-малкa от %min% Ñимвола",
"The input is more than %max% characters long" => "Въведената ÑтойноÑÑ‚ е по-голÑма от %max% Ñимвола",
- // Zend_Validator_Uri
+ // Zend\Validator\Uri
"Invalid type given. String expected" => "Зададен е невалиден тип данни. Очаква Ñе Ñтринг",
"The input does not appear to be a valid Uri" => "Въведената ÑтойноÑÑ‚ не е валиден URI",
);
diff --git a/vendor/zendframework/zendframework/resources/languages/ca/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/ca/Zend_Captcha.php
index 21dd0a99c03..dfea6f2574a 100644
--- a/vendor/zendframework/zendframework/resources/languages/ca/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/ca/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/ca/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/ca/Zend_Validate.php
index 123228aec4b..a7147ed0920 100644
--- a/vendor/zendframework/zendframework/resources/languages/ca/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/ca/Zend_Validate.php
@@ -3,12 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/**
- * EN-Revision: 04.Apr.2013
+ * EN-Revision: 16.Jul.2013
*/
return array(
// Zend\I18n\Validator\Alnum
@@ -21,6 +21,10 @@ return array(
"The input contains non alphabetic characters" => "L'entrada conté carà cters no alfabètics",
"The input is an empty string" => "L'entrada és una cadena buida",
+ // Zend\I18n\Validator\DateTime
+ "Invalid type given. String expected" => "Tipus no và lid donat. S'espera una cadena de text",
+ "The input does not appear to be a valid datetime" => "L'entrada no sembla ser un datetime và lid",
+
// Zend\I18n\Validator\Float
"Invalid type given. String, integer or float expected" => "Tipus no và lid donat. S'espera una cadena de text, un enter o un nombre de precisió simple",
"The input does not appear to be a float" => "L'entrada no sembla ser un nombre de precisió simple",
@@ -29,6 +33,11 @@ return array(
"Invalid type given. String or integer expected" => "Tipus no và lid donat. S'espera una cadena de text o un enter",
"The input does not appear to be an integer" => "L'entrada no sembla ser un nombre enter",
+ // Zend\I18n\Validator\PhoneNumber
+ "The input does not match a phone number format" => "L'entrada no coincideix amb un format de número de telèfon",
+ "The country provided is currently unsupported" => "El paÃs proporcionat no està suportat",
+ "Invalid type given. String expected" => "Tipus no và lid donat. S'espera una cadena de text",
+
// Zend\I18n\Validator\PostCode
"Invalid type given. String or integer expected" => "Tipus no và lid donat. S'espera una cadena de text o un enter",
"The input does not appear to be a postal code" => "L'entrada no sembla ser un codi postal",
@@ -41,8 +50,8 @@ return array(
"Invalid type given. String expected" => "Tipus no và lid donat. S'espera una cadena de text",
// Zend\Validator\Between
- "The input is not between '%min%' and '%max%', inclusively" => "L'entrada no és entre '% min%' i '% max%', inclusivament",
- "The input is not strictly between '%min%' and '%max%'" => "L'entrada no és estrictament entre '% min%' i '%% max'",
+ "The input is not between '%min%' and '%max%', inclusively" => "L'entrada no és entre '%min%' i '%max%', inclusivament",
+ "The input is not strictly between '%min%' and '%max%'" => "L'entrada no és estrictament entre '%min%' i '%max%'",
// Zend\Validator\Callback
"The input is not valid" => "L'entrada no és và lida",
diff --git a/vendor/zendframework/zendframework/resources/languages/cs/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Captcha.php
index 9065f445fe6..78b4d17db0f 100644
--- a/vendor/zendframework/zendframework/resources/languages/cs/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php
index 1085cac679c..a0dd5f37e41 100644
--- a/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/de/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/de/Zend_Captcha.php
index df5ad7e725b..c2f4fd65c2b 100644
--- a/vendor/zendframework/zendframework/resources/languages/de/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/de/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/de/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/de/Zend_Validate.php
index 1b0dc634ff0..b965f9774f3 100644
--- a/vendor/zendframework/zendframework/resources/languages/de/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/de/Zend_Validate.php
@@ -1,16 +1,9 @@
<?php
/**
- * Zend Framework
- * LICENSE
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
+ * Zend Framework (http://framework.zend.com/)
*
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.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
*/
@@ -107,20 +100,20 @@ return array(
"Too few files, minimum '%min%' are expected but '%count%' are given" => "Zu wenige Dateien. Minimal '%min%' wurden erwartet aber nur '%count%' wurden angegeben",
// Zend_Validator_File_Crc32
- "File '%value%' does not match the given crc32 hashes" => "Die Datei '%value%' entspricht nicht den angegebenen Crc32 Hashes",
+ "File does not match the given crc32 hashes" => "Die Datei entspricht nicht den angegebenen Crc32 Hashes",
"A crc32 hash could not be evaluated for the given file" => "Für die angegebene Datei konnte kein Crc32 Hash evaluiert werden",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_File_ExcludeExtension
- "File '%value%' has a false extension" => "Die Datei '%value%' hat einen falschen Dateityp",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "File has an incorrect extension" => "Die Datei hat einen falschen Dateityp",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_File_Exists
- "File '%value%' does not exist" => "Die Datei '%value%' existiert nicht",
+ "File does not exist" => "Die Datei existiert nicht",
// Zend_Validator_File_Extension
- "File '%value%' has a false extension" => "Die Datei '%value%' hat einen falschen Dateityp",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "File has an incorrect extension" => "Die Datei hat einen falschen Dateityp",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_File_FilesSize
"All files in sum should have a maximum size of '%max%' but '%size%' were detected" => "Alle Dateien sollten in Summe eine maximale Größe von '%max%' haben, aber es wurde '%size%' erkannt",
@@ -128,56 +121,68 @@ return array(
"One or more files can not be read" => 'Ein oder mehrere Dateien konnten nicht gelesen werden',
// Zend_Validator_File_Hash
- "File '%value%' does not match the given hashes" => "Die Datei '%value%' entspricht nicht den angegebenen Hashes",
+ "File does not match the given hashes" => "Die Datei entspricht nicht den angegebenen Hashes",
"A hash could not be evaluated for the given file" => "Für die angegebene Datei konnte kein Hash evaluiert werden",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_File_ImageSize
- "Maximum allowed width for image '%value%' should be '%maxwidth%' but '%width%' detected" => "Die maximal erlaubte Breite für das Bild '%value%' ist '%maxwidth%', aber es wurde '%width%' erkannt",
- "Minimum expected width for image '%value%' should be '%minwidth%' but '%width%' detected" => "Die minimal erlaubte Breite für das Bild '%value%' ist '%minwidth%', aber es wurde '%width%' erkannt",
- "Maximum allowed height for image '%value%' should be '%maxheight%' but '%height%' detected" => "Die maximal erlaubte Höhe für das Bild '%value%' ist '%maxheight%', aber es wurde '%height%' erkannt",
- "Minimum expected height for image '%value%' should be '%minheight%' but '%height%' detected" => "Die minimal erlaubte Höhe für das Bild '%value%' ist '%minheight%', aber es wurde '%height%' erkannt",
- "The size of image '%value%' could not be detected" => "Die Größe des Bildes '%value%' konnte nicht erkannt werden",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "Maximum allowed width for image should be '%maxwidth%' but '%width%' detected" => "Die maximal erlaubte Breite für das Bild ist '%maxwidth%', aber es wurde '%width%' erkannt",
+ "Minimum expected width for image should be '%minwidth%' but '%width%' detected" => "Die minimal erlaubte Breite für das Bild ist '%minwidth%', aber es wurde '%width%' erkannt",
+ "Maximum allowed height for image should be '%maxheight%' but '%height%' detected" => "Die maximal erlaubte Höhe für das Bild ist '%maxheight%', aber es wurde '%height%' erkannt",
+ "Minimum expected height for image should be '%minheight%' but '%height%' detected" => "Die minimal erlaubte Höhe für das Bild ist '%minheight%', aber es wurde '%height%' erkannt",
+ "The size of image could not be detected" => "Die Größe des Bildes konnte nicht erkannt werden",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_File_IsCompressed
- "File '%value%' is not compressed, '%type%' detected" => "Die Datei '%value%' ist nicht komprimiert. Es wurde '%type%' erkannt",
- "The mimetype of file '%value%' could not be detected" => "Der Mimetyp der Datei '%value%' konnte nicht erkannt werden",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "File is not compressed, '%type%' detected" => "Die Datei ist nicht komprimiert. Es wurde '%type%' erkannt",
+ "The mimetype could not be detected from the file" => "Der Mimetyp der Datei konnte nicht erkannt werden",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_File_IsImage
- "File '%value%' is no image, '%type%' detected" => "Die Datei '%value%' ist kein Bild. Es wurde '%type%' erkannt",
- "The mimetype of file '%value%' could not be detected" => "Der Mimetyp der Datei '%value%' konnte nicht erkannt werden",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "File is no image, '%type%' detected" => "Die Datei ist kein Bild. Es wurde '%type%' erkannt",
+ "The mimetype could not be detected from the file" => "Der Mimetyp der Datei konnte nicht erkannt werden",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_File_Md5
- "File '%value%' does not match the given md5 hashes" => "Die Datei '%value%' entspricht nicht den angegebenen Md5 Hashes",
+ "File does not match the given md5 hashes" => "Die Datei entspricht nicht den angegebenen Md5 Hashes",
"A md5 hash could not be evaluated for the given file" => "Für die angegebene Datei konnte kein Md5 Hash evaluiert werden",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_File_MimeType
- "File '%value%' has a false mimetype of '%type%'" => "Die Datei '%value%' hat einen falschen Mimetyp von '%type%'",
- "The mimetype of file '%value%' could not be detected" => "Der Mimetyp der Datei '%value%' konnte nicht erkannt werden",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "File has an incorrect mimetype of '%type%'" => "Die Datei hat einen falschen Mimetyp von '%type%'",
+ "The mimetype could not be detected from the file" => "Der Mimetyp der Datei konnte nicht erkannt werden",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_File_NotExists
- "File '%value%' exists" => "Die Datei '%value%' existiert bereits",
+ "File exists" => "Die Datei existiert bereits",
// Zend_Validator_File_Sha1
- "File '%value%' does not match the given sha1 hashes" => "Die Datei '%value%' entspricht nicht den angegebenen Sha1 Hashes",
+ "File does not match the given sha1 hashes" => "Die Datei entspricht nicht den angegebenen Sha1 Hashes",
"A sha1 hash could not be evaluated for the given file" => "Für die angegebene Datei konnte kein Sha1 Hash evaluiert werden",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_File_Size
- "Maximum allowed size for file '%value%' is '%max%' but '%size%' detected" => "Die maximal erlaubte Größe für die Datei '%value%' ist '%max%', aber es wurde '%size%' entdeckt",
- "Minimum expected size for file '%value%' is '%min%' but '%size%' detected" => "Die mindestens erwartete Größe für die Datei '%value%' ist '%min%', aber es wurde '%size%' entdeckt",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "Maximum allowed size for file is '%max%' but '%size%' detected" => "Die maximal erlaubte Größe für die Datei ist '%max%', aber es wurde '%size%' entdeckt",
+ "Minimum expected size for file is '%min%' but '%size%' detected" => "Die mindestens erwartete Größe für die Datei ist '%min%', aber es wurde '%size%' entdeckt",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
+
+ // Zend_Validator_File_UploadFile
+ "File exceeds the defined ini size" => "Die Datei übersteigt die definierte Größe in der Konfiguration",
+ "File exceeds the defined form size" => "Die Datei übersteigt die definierte Größe des Formulars",
+ "File was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen",
+ "File was not uploaded" => "Die Datei wurde nicht hochgeladen",
+ "No temporary directory was found for file" => "Für die Datei wurde kein temporäres Verzeichnis gefunden",
+ "File can't be written" => "Die Datei konnte nicht geschrieben werden",
+ "A PHP extension returned an error while uploading the file" => "Eine PHP Erweiterung hat einen Fehler ausgegeben wärend die Datei hochgeladen wurde",
+ "File was illegally uploaded. This could be a possible attack" => "Die Datei wurde illegal hochgeladen. Dies könnte eine mögliche Attacke sein",
+ "File was not found" => "Die Datei wurde nicht gefunden",
+ "Unknown error while uploading file '%value%'" => "Ein unbekannter Fehler ist aufgetreten wärend die Datei '%value%' hochgeladen wurde",
// Zend_Validator_File_Upload
"File '%value%' exceeds the defined ini size" => "Die Datei '%value%' übersteigt die definierte Größe in der Konfiguration",
"File '%value%' exceeds the defined form size" => "Die Datei '%value%' übersteigt die definierte Größe des Formulars",
"File '%value%' was only partially uploaded" => "Die Datei '%value%' wurde nur teilweise hochgeladen",
- "File '%value%' was not uploaded" => "Die Datei '%value%' wurde nicht hochgeladen",
+ "File '%value%' was not uploaded" => "Die Datei '%value%'wurde nicht hochgeladen",
"No temporary directory was found for file '%value%'" => "Für die Datei '%value%' wurde kein temporäres Verzeichnis gefunden",
"File '%value%' can't be written" => "Die Datei '%value%' konnte nicht geschrieben werden",
"A PHP extension returned an error while uploading the file '%value%'" => "Eine PHP Erweiterung hat einen Fehler ausgegeben wärend die Datei '%value%' hochgeladen wurde",
@@ -187,8 +192,8 @@ return array(
// Zend_Validator_File_WordCount
"Too much words, maximum '%max%' are allowed but '%count%' were counted" => "Zu viele Wörter. Maximal '%max%' sind erlaubt, aber '%count%' wurden gezählt",
- "Too few words, minimum '%min%' are expected but '%count%' were counted" => "Zu wenige Wörter. Mindestens '%min%' wurden erwartet, aber '%count%' wurden gezählt",
- "File '%value%' is not readable or does not exist" => "Die Datei '%value%' konnte nicht gelesen werden oder existiert nicht",
+ "Too few words, minimum '%min%' are expected but '%count%' were counted" => "Zu wenige Wörter. Mindestens '%min%' wurden erwartet, aber '%count%' wurden gezählt",
+ "File is not readable or does not exist" => "Die Datei konnte nicht gelesen werden oder existiert nicht",
// Zend_Validator_GreaterThan
"The input is not greater than '%min%'" => "Der Eingabewert ist nicht größer als '%min%'",
diff --git a/vendor/zendframework/zendframework/resources/languages/en/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/en/Zend_Captcha.php
index a20dd405b62..de7de355b58 100644
--- a/vendor/zendframework/zendframework/resources/languages/en/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/en/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/en/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/en/Zend_Validate.php
index acf366ce203..bf7cffeac18 100644
--- a/vendor/zendframework/zendframework/resources/languages/en/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/en/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -53,6 +53,11 @@ return array(
"The input is not between '%min%' and '%max%', inclusively" => "The input is not between '%min%' and '%max%', inclusively",
"The input is not strictly between '%min%' and '%max%'" => "The input is not strictly between '%min%' and '%max%'",
+ // Zend\Validator\Bitwise
+ "The input has no common bit set with '%control%'" => "The input has no common bit set with '%control%'",
+ "The input doesn't have the same bits set as '%control%'" => "The input doesn't have the same bits set as '%control%'",
+ "The input has common bit set with '%control%'" => "The input has common bit set with '%control%'",
+
// Zend\Validator\Callback
"The input is not valid" => "The input is not valid",
"An exception has been raised within the callback" => "An exception has been raised within the callback",
@@ -75,6 +80,9 @@ return array(
"The input does not fit the date format '%format%'" => "The input does not fit the date format '%format%'",
// Zend\Validator\DateStep
+ "Invalid type given. String, integer, array or DateTime expected" => "Invalid type given. String, integer, array or DateTime expected",
+ "The input does not appear to be a valid date" => "The input does not appear to be a valid date",
+ "The input does not fit the date format '%format%'" => "The input does not fit the date format '%format%'",
"The input is not a valid step" => "The input is not a valid step",
// Zend\Validator\Db\AbstractDb
diff --git a/vendor/zendframework/zendframework/resources/languages/es/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/es/Zend_Captcha.php
new file mode 100644
index 00000000000..318000f33b8
--- /dev/null
+++ b/vendor/zendframework/zendframework/resources/languages/es/Zend_Captcha.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+/**
+ * EN-Revision: 30.Jul.2011
+ */
+return array(
+ // Zend\Captcha\ReCaptcha
+ "Missing captcha fields" => "Faltan campos del captcha",
+ "Failed to validate captcha" => "La validación del captcha falló",
+ "Captcha value is wrong: %value%" => "El valor del captcha es erróneo: %value%",
+
+ // Zend\Captcha\Word
+ "Empty captcha value" => "Valor del captcha vacÃo",
+ "Captcha ID field is missing" => "Falta ell campo ID de captcha",
+ "Captcha value is wrong" => "El valor del captcha es erróneo",
+);
diff --git a/vendor/zendframework/zendframework/resources/languages/es/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/es/Zend_Validate.php
index a1090ad49c7..82b9490c3a2 100644
--- a/vendor/zendframework/zendframework/resources/languages/es/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/es/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,242 +11,279 @@
* EN-Revision: 22075
*/
return array(
- // Zend_Validate_Alnum
- "Invalid type given, value should be float, string, or integer" => "El tipo especificado no es válido, el valor debe ser de tipo float, una cadena de texto o entero",
- "'%value%' contains characters which are non alphabetic and no digits" => "'%value%' contiene caracteres que no son alfabéticos ni dÃgitos",
- "'%value%' is an empty string" => "'%value%' es una cadena de texto vacia",
-
- // Zend_Validate_Alpha
- "Invalid type given, value should be a string" => "El tipo especificado no es válido, el valor debe ser una cadena de texto",
- "'%value%' contains non alphabetic characters" => "'%value%' contiene caracteres no alfabéticos",
- "'%value%' is an empty string" => "'%value%' es una cadena de texto vacia",
-
- // Zend_Validate_Barcode
- "'%value%' failed checksum validation" => "'%value%' Fallo la validación de checksum",
- "'%value%' contains invalid characters" => "'%value%' contiene caracteres no válidos",
- "'%value%' should have a length of %length% characters" => "'%value%' debe tener una longitud de %length% caracteres",
- "Invalid type given, value should be string" => "El tipo especificado no es válido, el valor debe ser una cadena de texto",
-
- // Zend_Validate_Between
- "'%value%' is not between '%min%' and '%max%', inclusively" => "'%value%' no está incluido entre '%min%' y '%max%'",
- "'%value%' is not strictly between '%min%' and '%max%'" => "'%value%' no está exactamente entre '%min%' y '%max%'",
-
- // Zend_Validate_Callback
- "'%value%' is not valid" => "'%value%' no es válido",
- "Failure within the callback, exception returned" => "Falló dentro de la llamada de retorno, ha devuelto una excepción",
-
- // Zend_Validate_Ccnum
- "'%value%' must contain between 13 and 19 digits" => "'%value%' debe contener entre 13 y 19 dÃgitos",
- "Luhn algorithm (mod-10 checksum) failed on '%value%'" => "El algoritmo de Luhn (checksum del módulo 10) fallo en '%value%'",
-
- // Zend_Validate_CreditCard
- "Luhn algorithm (mod-10 checksum) failed on '%value%'" => "El algoritmo de Luhn (checksum del módulo 10) fallo en '%value%'",
- "'%value%' must contain only digits" => "'%value%' debe contener solo dÃgitos",
- "Invalid type given, value should be a string" => "El tipo especificado no es válido, el valor debe ser una cadena de texto",
- "'%value%' contains an invalid amount of digits" => "'%value%' contiene una cantidad inválida de dÃgitos",
- "'%value%' is not from an allowed institute" => "'%value%' no es de una institución autorizada",
- "Validation of '%value%' has been failed by the service" => "La validación de '%value%' fallo por causa del servicio",
- "The service returned a failure while validating '%value%'" => "El servicio devolvió un fallo durante la validación de '%value%'",
-
- // Zend_Validate_Date
- "Invalid type given, value should be string, integer, array or Zend_Date" => "El tipo especificado no es válido, el valor debe ser una cadena de texto, entero, array o un objeto Zend_Date",
- "'%value%' does not appear to be a valid date" => "'%value%' no parece ser una fecha válida",
- "'%value%' does not fit the date format '%format%'" => "'%value%' no se ajusta al formato de fecha '%format%'",
-
- // Zend_Validate_Db_Abstract
- "No record matching %value% was found" => "No fue encontrado ningun registro que coincida con %value%",
- "A record matching %value% was found" => "Se encontro un registro coincidente con %value%",
-
- // Zend_Validate_Digits
- "Invalid type given, value should be string, integer or float" => "El tipo especificado no es válido, el valor debe ser una cadena de texto, entero o float",
- "'%value%' contains characters which are not digits; but only digits are allowed" => "'%value%' contiene caracteres que no son dÃgitos, solo se permiten dÃgitos",
- "'%value%' is an empty string" => "'%value%' es una cadena vacÃa",
-
- // Zend_Validate_EmailAddress
- "Invalid type given, value should be a string" => "El tipo especificado no es válido, el valor debe ser una cadena de texto",
- "'%value%' is not a valid email address in the basic format local-part@hostname" => "'%value%' no es una dirección de correo electrónico válido en el formato local-part@hostname",
- "'%hostname%' is not a valid hostname for email address '%value%'" => "'%hostname%' no es un nombre de host válido para la dirección de correo electrónico '%value%'",
- "'%hostname%' does not appear to have a valid MX record for the email address '%value%'" => "'%hostname%' no parece tener un registro MX válido para la dirección de correo electrónico '%value%'",
- "'%hostname%' is not in a routable network segment. The email address '%value%' should not be resolved from public network." => "'%hostname%' no esta en un segmento de red ruteable. La dirección de correo electrónico '%value%' no se debe poder resolver desde una red pública.",
+ // Zend\I18n\Validator\Alnum
+ "Invalid type given. String, integer or float expected" => "El tipo especificado no es válido. El valor debe ser de tipo punto flotante, cadena de texto o entero",
+ "The input contains characters which are non alphabetic and no digits" => "El valor especificado contiene caracteres que no son alfabéticos ni dÃgitos",
+ "The input is an empty string" => "El valor especificado es una cadena de texto vacia",
+
+ // Zend\I18n\Validator\Alpha
+ "Invalid type given. String expected" => "El tipo especificado no es válido, el valor debe ser una cadena de texto",
+ "The input contains non alphabetic characters" => "La entrada contiene caracteres no alfabéticos",
+ "The input is an empty string" => "El valor especificado es una cadena de texto vacia",
+
+ // Zend\I18n\Validator\DateTime
+ "Invalid type given. String expected" => "El tipo especificado no es válido. El valor debe ser una cadena de texto",
+ "The input does not appear to be a valid datetime" => "El valor especificado no parece ser una fecha válida",
+
+ // Zend\I18n\Validator\Float
+ "Invalid type given. String, integer or float expected" => "El tipo especificado no es válido. El valor debe ser de tipo punto flotante, cadena de texto o entero",
+ "The input does not appear to be a float" => "El valor especificado no parece ser un número de punto flotante",
+
+ // Zend\I18n\Validator\Int
+ "Invalid type given. String or integer expected" => "El tipo especificado no es válido. El valor debe ser de tipo cadena de texto o entero",
+ "The input does not appear to be an integer" => "El valor especificado no parece ser un número entero",
+
+ // Zend\I18n\Validator\PhoneNumber
+ "The input does not match a phone number format" => "La entrada no coincide con el formato de un número de teléfono",
+ "The country provided is currently unsupported" => "El paÃs especificado no está soportado actualmente",
+ "Invalid type given. String expected" => "El tipo especificado no es válido, el valor debe ser una cadena de texto",
+
+ // Zend\I18n\Validator\PostCode
+ "Invalid type given. String or integer expected" => "El tipo especificado no es válido, el valor debe ser una cadena de texto o un número entero",
+ "The input does not appear to be a postal code" => "El valor especificado no parece ser un código postal",
+ "An exception has been raised while validating the input" => "Una excepción ha sido alzada al validar la entrada",
+
+ // Zend\Validator\Barcode
+ "The input failed checksum validation" => "Falló la validación de checksum",
+ "The input contains invalid characters" => "El valor especificado contiene caracteres no válidos",
+ "The input should have a length of %length% characters" => "El valor especificado debe tener una longitud de %length% caracteres",
+ "Invalid type given. String expected" => "El tipo especificado no es válido, el valor debe ser una cadena de texto",
+
+ // Zend\Validator\Between
+ "The input is not between '%min%' and '%max%', inclusively" => "El valor especificado no está incluido entre '%min%' y '%max%' inclusive",
+ "The input is not strictly between '%min%' and '%max%'" => "El valor especificado no está exactamente entre '%min%' y '%max%'",
+
+ // Zend\Validator\Callback
+ "The input is not valid" => "El valor especificado no es válido",
+ "An exception has been raised within the callback" => "Fallo dentro de la llamada de retorno, ha devuelto una excepción",
+
+ // Zend\Validator\CreditCard
+ "The input seems to contain an invalid checksum" => "El valor especificado parece contener un error en el checksum",
+ "The input must contain only digits" => "El valor especificado debe contener solamente dÃgitos",
+ "Invalid type given. String expected" => "El tipo especificado no es válido, el valor debe ser una cadena de texto",
+ "The input contains an invalid amount of digits" => "El valor especificado contiene una cantidad de dÃgitos no válida",
+ "The input is not from an allowed institute" => "El valor especificado no corresponde con una institución permitida",
+ "The input seems to be an invalid credit card number" => "El valor especificado parece ser un número de tarjeta de crédito no válido",
+ "An exception has been raised while validating the input" => "Se ha devuelto una excepción al validar el valor especificado",
+
+ // Zend\Validator\Csrf
+ "The form submitted did not originate from the expected site" => "El formulario enviado no se ha originado desde el sitio esperado",
+
+ // Zend\Validator\Date
+ "Invalid type given. String, integer, array or DateTime expected" => "El tipo especificado no es válido. El valor debe ser cadena de texto, número entero, array u objeto DateTime",
+ "The input does not appear to be a valid date" => "El valor especificado no parece ser una fecha válida",
+ "The input does not fit the date format '%format%'" => "El valor especificado no se ajusta al formato de fecha '%format%'",
+
+ // Zend\Validator\DateStep
+ "The input is not a valid step" => "El valor especificado no es un escalón válido",
+
+ // Zend\Validator\Db\AbstractDb
+ "No record matching the input was found" => "No fue encontrado ningun registro que coincida con el valor especificado",
+ "A record matching the input was found" => "Se encontró un registro coincidente con el valor especificado",
+
+ // Zend\Validator\Digits
+ "The input must contain only digits" => "El valor especificado debe contener solamente dÃgitos",
+ "The input is an empty string" => "El valor especificado está vacÃo",
+ "Invalid type given. String, integer or float expected" => "El tipo especificado no es válido. El valor debe ser una cadena de texto, un número entero, o un número de punto flotante.",
+
+ // Zend\Validator\EmailAddress
+ "Invalid type given. String expected" => "El tipo especificado no es válido, el valor debe ser una cadena de texto",
+ "The input is not a valid email address. Use the basic format local-part@hostname" => "El valor especificado no es una dirección de correo electrónico válido en el formato local-part@hostname",
+ "'%hostname%' is not a valid hostname for the email address" => "'%hostname%' no es un nombre de host válido para la dirección de correo electrónico",
+ "'%hostname%' does not appear to have any valid MX or A records for the email address" => "'%hostname%' no parece tener registros MX o A válidos para la dirección de correo electrónico especificada",
+ "'%hostname%' is not in a routable network segment. The email address should not be resolved from public network" => "'%hostname%' no esta en un segmento de red encaminable. La dirección de correo electrónico especificada no se deberÃa poder resolver desde una red pública",
"'%localPart%' can not be matched against dot-atom format" => "'%localPart%' no es igual al formato dot-atom",
"'%localPart%' can not be matched against quoted-string format" => "'%localPart%' no es igual al formato quoted-string",
- "'%localPart%' is not a valid local part for email address '%value%'" => "'%localPart%' no es una parte local válida para la dirección de correo electrónico '%value%'",
- "'%value%' exceeds the allowed length" => "'%value%' excede la longitud permitida",
+ "'%localPart%' is not a valid local part for the email address" => "'%localPart%' no es una parte local válida para la dirección de correo electrónico especificado",
+ "The input exceeds the allowed length" => "el valor especificado excede la longitud permitida",
- // Zend_Validate_File_Count
+ // Zend\Validator\Explode
+ "Invalid type given" => "El tipo de dato especificado no es válido",
+
+ // Zend\Validator\File\Count
"Too many files, maximum '%max%' are allowed but '%count%' are given" => "Demasiados archivos, se permiten un máximo de '%max%' pero se han especificado '%count%'",
- "Too few files, minimum '%min%' are expected but '%count%' are given" => "Muy pocos archivos, se esperaba un mÃÂnimo de '%min%' pero sólo se han especificado '%count%'",
+ "Too few files, minimum '%min%' are expected but '%count%' are given" => "Muy pocos archivos, se esperaba un mÃnimo de '%min%' pero sólo se han especificado '%count%'",
- // Zend_Validate_File_Crc32
- "File '%value%' does not match the given crc32 hashes" => "El CRC32 del archivo '%value%' es incorrecto",
+ // Zend\Validator\File\Crc32
+ "File does not match the given crc32 hashes" => "El CRC32 del archivo es incorrectos",
"A crc32 hash could not be evaluated for the given file" => "No se ha podido calcular el CRC32 del archivo especificado",
- "File '%value%' could not be found" => "No se ha podido encontrar el archivo '%value%'",
-
- // Zend_Validate_File_ExcludeExtension
- "File '%value%' has a false extension" => "El archivo '%value%' tiene una extensión incorrecta",
- "File '%value%' could not be found" => "No se ha podido encontrar el archivo '%value%'",
+ "File is not readable or does not exist" => "No se ha podido encontrar el archivo o no se puede leer",
- // Zend_Validate_File_ExcludeMimeType
- "File '%value%' has a false mimetype of '%type%'" => "El archivo '%value%' tiene un tipo MIME '%type%' incorrecto",
- "The mimetype of file '%value%' could not be detected" => "No se ha podido determinar el tipo MIME del archivo '%value%'",
- "File '%value%' can not be read" => "El archivo '%value%' no se puede leer",
+ // Zend\Validator\File\ExcludeExtension
+ "File has an incorrect extension" => "El archivo tiene una extensión incorrecta",
+ "File is not readable or does not exist" => "No se ha podido encontrar el archivo o no se puede leer",
- // Zend_Validate_File_Exists
- "File '%value%' does not exist" => "El archivo '%value%' no existe",
+ // Zend\Validator\File\Exists
+ "File does not exist" => "El archivo no existe",
- // Zend_Validate_File_Extension
- "File '%value%' has a false extension" => "El archivo '%value%' tiene una extensión incorrecta",
- "File '%value%' could not be found" => "No se ha podido encontrar el archivo '%value%'",
+ // Zend\Validator\File\Extension
+ "File has an incorrect extension" => "El archivo especificado tiene una extensión incorrecta",
+ "File is not readable or does not exist" => "No se ha podido encontrar el archivo especificado'",
- // Zend_Validate_File_FilesSize
- "All files in sum should have a maximum size of '%max%' but '%size%' were detected" => "Todos los archivos deberÃÂan tener un tamaño máximo de '%max%' pero tiene un tamaño de '%size%'",
- "All files in sum should have a minimum size of '%min%' but '%size%' were detected" => "Todos los archivos deberÃÂan tener un tamaño mÃÂnimo de '%min%' pero tiene un tamaño de '%size%'",
+ // Zend\Validator\File\FilesSize
+ "All files in sum should have a maximum size of '%max%' but '%size%' were detected" => "El conjunto de archivos deberÃa tener un tamaño máximo de '%max%' pero tiene un tamaño de '%size%'",
+ "All files in sum should have a minimum size of '%min%' but '%size%' were detected" => "El conjunto de archivos deberÃa tener un tamaño mÃnimo de '%min%' pero tiene un tamaño de '%size%'",
"One or more files can not be read" => "Uno o más archivos no se pueden leer",
- // Zend_Validate_File_Hash
- "File '%value%' does not match the given hashes" => "El archivo '%value%' no se corresponde con los códigos hash especificados",
+ // Zend\Validator\File\Hash
+ "File does not match the given hashes" => "El archivo no se corresponde con los códigos hash especificados",
"A hash could not be evaluated for the given file" => "No se ha podido evaluar ningún código hash para el archivo especificado",
- "File '%value%' could not be found" => "No se ha podido encontrar el archivo '%value%'",
-
- // Zend_Validate_File_ImageSize
- "Maximum allowed width for image '%value%' should be '%maxwidth%' but '%width%' detected" => "El ancho máxima para la imagen '%value%' deberÃÂa ser '%maxwidth%' pero es de '%width%'",
- "Minimum expected width for image '%value%' should be '%minwidth%' but '%width%' detected" => "El ancho mÃÂnima para la imagen '%value%' deberÃÂa ser '%minwidth%' pero es de '%width%'",
- "Maximum allowed height for image '%value%' should be '%maxheight%' but '%height%' detected" => "La altura máxima para la imagen '%value%' deberÃÂa ser '%maxheight%' pero es de '%height%'",
- "Minimum expected height for image '%value%' should be '%minheight%' but '%height%' detected" => "La altura mÃÂnima para la imagen '%value%' deberÃÂa ser '%minheight%' pero es de '%height%'",
- "The size of image '%value%' could not be detected" => "No se ha podido determinar el tamaño de la imagen '%value%'",
- "File '%value%' can not be read" => "El archivo '%value%' no se puede leer",
-
- // Zend_Validate_File_IsCompressed
- "File '%value%' is not compressed, '%type%' detected" => "El archivo '%value%' no está comprimido, '%type%' detectado",
- "The mimetype of file '%value%' could not be detected" => "No se ha podido determinar el tipo MIME del archivo '%value%'",
- "File '%value%' can not be read" => "El archivo '%value%' no se puede leer",
-
- // Zend_Validate_File_IsImage
- "File '%value%' is no image, '%type%' detected" => "El archivo '%value%' no es una imagen, '%type%' detectado",
- "The mimetype of file '%value%' could not be detected" => "No se ha podido determinar el tipo MIME del archivo '%value%'",
- "File '%value%' can not be read" => "El archivo '%value%' no se puede leer",
-
- // Zend_Validate_File_Md5
- "File '%value%' does not match the given md5 hashes" => "El archivo '%value%' no se corresponde con el MD5 especificado",
- "A md5 hash could not be evaluated for the given file" => "No se ha podido calcular el MD5 del archivo especificado",
- "File '%value%' could not be found" => "No se ha podido encontrar el archivo '%value%'",
-
- // Zend_Validate_File_MimeType
- "File '%value%' has a false mimetype of '%type%'" => "El archivo '%value%' tiene un tipo MIME '%type%' falso",
- "The mimetype of file '%value%' could not be detected" => "No se ha podido determinar el tipo MIME del archivo '%value%'",
- "File '%value%' can not be read" => "El archivo '%value%' no se puede leer",
-
- // Zend_Validate_File_NotExists
- "File '%value%' exists" => "El archivo '%value%' existe",
-
- // Zend_Validate_File_Sha1
- "File '%value%' does not match the given sha1 hashes" => "El archivo '%value%' no es igual al SHA1 especificado",
- "A sha1 hash could not be evaluated for the given file" => "No se ha podido calcular el SHA1 del archivo especificado",
- "File '%value%' could not be found" => "No se ha podido encontrar el archivo '%value%'",
-
- // Zend_Validate_File_Size
- "Maximum allowed size for file '%value%' is '%max%' but '%size%' detected" => "El tamaño máximo permitido para el archivo '%value%' es '%max%' pero se ha detectado un tamaño de '%size%'",
- "Minimum expected size for file '%value%' is '%min%' but '%size%' detected" => "El tamaño mÃÂnimo permitido para el archivo '%value%' es '%min%' pero se ha detectado un tamaño de '%size%'",
- "File '%value%' could not be found" => "No se ha podido encontrar el archivo '%value%'",
-
- // Zend_Validate_File_Upload
+ "File is not readable or does not exist" => "El archivo no se puede leer o no existe",
+
+ // Zend\Validator\File\ImageSize
+ "Maximum allowed width for image should be '%maxwidth%' but '%width%' detected" => "El ancho máximo para la imagen deberÃa ser '%maxwidth%' pero es '%width%'",
+ "Minimum expected width for image should be '%minwidth%' but '%width%' detected" => "El ancho mÃnimo para la imagen deberÃa ser '%minwidth%' pero es '%width%'",
+ "Maximum allowed height for image should be '%maxheight%' but '%height%' detected" => "La altura máxima para la imagen deberÃa ser '%maxheight%' pero es '%height%'",
+ "Minimum expected height for image should be '%minheight%' but '%height%' detected" => "La altura mÃnima para la imagen deberÃa ser '%minheight%' pero es '%height%'",
+ "The size of image could not be detected" => "No se ha podido determinar el tamaño de la imagen",
+ "File is not readable or does not exist" => "El archivo no se puede leer o no existe",
+
+ // Zend\Validator\File\IsCompressed
+ "File is not compressed, '%type%' detected" => "El archivo no está comprimido, '%type%' detectado",
+ "The mimetype could not be detected from the file" => "No se ha podido determinar el tipo MIME del archivo",
+ "File is not readable or does not exist" => "El archivo no se puede leer o no existe",
+
+ // Zend\Validator\File\IsImage
+ "File is no image, '%type%' detected" => "El archivo no es una imagen, '%type%' detectado",
+ "The mimetype could not be detected from the file" => "No se ha podido determinar el tipo MIME del archivo",
+ "File is not readable or does not exist" => "El archivo no se puede leer o no existe",
+
+ // Zend\Validator\File\Md5
+ "File does not match the given md5 hashes" => "El archivo no se corresponde con el MD5 especificado",
+ "An md5 hash could not be evaluated for the given file" => "No se ha podido calcular el MD5 del archivo especificado",
+ "File is not readable or does not exist" => "El archivo no se puede leer o no existe",
+
+ // Zend\Validator\File\MimeType
+ "File has an incorrect mimetype of '%type%'" => "El archivo tiene un tipo MIME '%type%' incorrecto",
+ "The mimetype could not be detected from the file" => "No se ha podido determinar el tipo MIME del archivo",
+ "File is not readable or does not exist" => "El archivo no se puede leer o no existe",
+
+ // Zend\Validator\File\NotExists
+ "File exists" => "El archivo existe",
+
+ // Zend\Validator\File\Sha1
+ "File does not match the given sha1 hashes" => "El archivo no coincide los hashes sha1 dados",
+ "A sha1 hash could not be evaluated for the given file" => "Un hash sha1 no pudo ser evaluado para el archivo dado",
+ "File is not readable or does not exist" => "El archivo no se puede leer o no existe",
+
+ // Zend\Validator\File\Size
+ "Maximum allowed size for file is '%max%' but '%size%' detected" => "El tamaño máximo permitido para el archivo es '%max%' pero se ha detectado un tamaño de '%size%'",
+ "Minimum expected size for file is '%min%' but '%size%' detected" => "El tamaño mÃnimo permitido para el archivo es '%min%' pero se ha detectado un tamaño de '%size%'",
+ "File is not readable or does not exist" => "No se ha podido encontrar el archivo o no se puede leer",
+
+ // Zend\Validator\File\Upload
"File '%value%' exceeds the defined ini size" => "El tamaño del archivo '%value%' excede el valor definido en el ini",
"File '%value%' exceeds the defined form size" => "El archivo '%value%' excede el tamaño definido en el formulario",
"File '%value%' was only partially uploaded" => "El archivo '%value%' ha sido sólo parcialmente subido",
"File '%value%' was not uploaded" => "El archivo '%value%' no ha sido subido",
"No temporary directory was found for file '%value%'" => "No se ha encontrado el directorio temporal para el archivo '%value%'",
"File '%value%' can't be written" => "No se puede escribir en el archivo '%value%'",
- "A PHP extension returned an error while uploading the file '%value%'" => "Una extensión PHP devolvió un error mientras se subÃÂa el archivo '%value%'",
- "File '%value%' was illegally uploaded. This could be a possible attack" => "El archivo '%value%' ha sido subido ilegalmente, lo cual podrÃÂa ser un ataque",
+ "A PHP extension returned an error while uploading the file '%value%'" => "Una extensión PHP devolvió un error mientras se subÃa el archivo '%value%'",
+ "File '%value%' was illegally uploaded. This could be a possible attack" => "El archivo '%value%' ha sido subido ilegalmente. Esto podrÃa indicar un ataque",
"File '%value%' was not found" => "Archivo '%value%' no encontrado",
- "Unknown error while uploading file '%value%'" => "error desconocido al intentar subir el archivo '%value%'",
-
- // Zend_Validate_File_WordCount
- "Too much words, maximum '%max%' are allowed but '%count%' were counted" => "Demasiadas palabras, sólo se permiten '%max%' pero se han contado '%count%'",
- "Too few words, minimum '%min%' are expected but '%count%' were counted" => "Demasiado pocas palabras, se esperaban al menos '%min%' pero se han contado '%count%'",
- "File '%value%' could not be found" => "No se ha podido encontrar el archivo '%value%'",
-
- // Zend_Validate_Float
- "Invalid type given, value should be float, string, or integer" => "El tipo especificado no es válido, el valor deberÃÂa ser de tipo float, una cadena de texto o un entero",
- "'%value%' does not appear to be a float" => "'%value%' no parece ser un float",
-
-// Zend_Validate_GreaterThan
- "'%value%' is not greater than '%min%'" => "'%value%' no es mayor que '%min%'",
-
- // Zend_Validate_Hex
- "Invalid type given, value should be a string" => "El tipo especificado es incorrecto, el valor deberÃÂa ser una cadena de texto",
- "'%value%' has not only hexadecimal digit characters" => "'%value%' no consta únicamente de dÃÂgitos y caracteres hexadecimales",
-
- // Zend_Validate_Hostname
- "Invalid type given, value should be a string" => "El tipo especificado es incorrecto, el valor deberÃÂa ser una cadena de texto",
- "'%value%' appears to be an IP address, but IP addresses are not allowed" => "'%value%' parece una dirección IP, pero éstas no están permitidas",
- "'%value%' appears to be a DNS hostname but cannot match TLD against known list" => "'%value%' parece ser un nombre de dominio DNS pero el TLD no es válido",
- "'%value%' appears to be a DNS hostname but contains a dash in an invalid position" => "'%value%' parece ser un nombre de dominio DNS pero contiene una barra en una posición inválida",
- "'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'" => "'%value%' parece ser un nombre de dominio DNS pero su formato no se corresponde con el correcto para el TLD '%tld%'",
- "'%value%' appears to be a DNS hostname but cannot extract TLD part" => "'%value%' parece ser un nombre de dominio DNS pero no se puede extraer la parte del TLD",
- "'%value%' does not match the expected structure for a DNS hostname" => "'%value%' no se corresponde con la estructura esperada para un nombre de dominio DNS",
- "'%value%' does not appear to be a valid local network name" => "'%value%' no parece ser un nombre de área local válido",
- "'%value%' appears to be a local network name but local network names are not allowed" => "'%value%' parece ser un nombre de área local pero no se permiten nombres de área local",
- "'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded" => "'%value%' parece ser un nombre de dominio DNS pero no se puede decodificar la notación de punycode",
-
- // Zend_Validate_Iban
- "Unknown country within the IBAN '%value%'" => "PaÃÂs desconocido dentro del IBAN '%value%'",
- "'%value%' has a false IBAN format" => "'%value%' tiene un formato falso de IBAN",
- "'%value%' has failed the IBAN check" => "La prueba de validación de IBAN de '%value%' ha fallado",
-
- // Zend_Validate_Identical
+ "Unknown error while uploading file '%value%'" => "Error desconocido al intentar subir el archivo '%value%'",
+
+ // Zend\Validator\File\UploadFile
+ "File exceeds the defined ini size" => "El tamaño del archivo excede el valor definido en el ini",
+ "File exceeds the defined form size" => "El archivo excede el tamaño definido en el formulario",
+ "File was only partially uploaded" => "El archivo fue sólo parcialmente subido",
+ "File was not uploaded" => "El archivo no ha sido subido",
+ "No temporary directory was found for file" => "No se ha encontrado el directorio temporal para el archivo",
+ "File can't be written" => "No se puede escribir en el archivo",
+ "A PHP extension returned an error while uploading the file" => "Una extensión PHP devolvió un error mientras se subÃa el archivo",
+ "File was illegally uploaded. This could be a possible attack" => "El archivo ha sido subido ilegalmente. Esto podrÃa indicar un ataque",
+ "File was not found" => "Archivo no encontrado",
+ "Unknown error while uploading file" => "Error desconocido al intentar subir el archivo",
+
+ // Zend\Validator\File\WordCount
+ "Too many words, maximum '%max%' are allowed but '%count%' were counted" => "Demasiadas palabras, sólo se permiten '%max%' pero se han contado '%count%'",
+ "Too few words, minimum '%min%' are expected but '%count%' were counted" => "Muy pocas palabras, se esperaban al menos '%min%' pero se han contado '%count%'",
+ "File is not readable or does not exist" => "No se ha podido encontrar o leer el archivo",
+
+ // Zend\Validator\GreaterThan
+ "The input is not greater than '%min%'" => "El valor especificado no es más grande que '%min%'",
+ "The input is not greater or equal than '%min%'" => "El valor especificado no es más grande o igual que '%min%'",
+
+ // Zend\Validator\Hex
+ "Invalid type given. String expected" => "El tipo especificado es incorrecto, el valor deberÃa ser una cadena de texto",
+ "The input contains non-hexadecimal characters" => "El valor especificado no consta únicamente de dÃgitos y caracteres hexadecimales",
+
+ // Zend\Validator\Hostname
+ "The input appears to be a DNS hostname but the given punycode notation cannot be decoded" => "La entrada parece ser un nombre de host de DNS pero la notación de punycode no puede ser decodificada",
+ "Invalid type given. String expected" => "El tipo especificado es incorrecto, el valor deberÃa ser una cadena de texto",
+ "The input appears to be a DNS hostname but contains a dash in an invalid position" => "El valor especificado parece ser un nombre de dominio DNS pero contiene un guión en una posición inválida",
+ "The input does not match the expected structure for a DNS hostname" => "El valor especificado no se corresponde con la estructura esperada para un nombre de dominio DNS",
+ "The input appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'" => "El valor especificado parece ser un nombre de dominio DNS pero no se puede extraer la parte del TLD",
+ "The input does not appear to be a valid local network name" => "El valor especificado no parece ser un nombre de área local válido",
+ "The input does not appear to be a valid URI hostname" => "El valor especificado no parece ser un nombre de host URI válido",
+ "The input appears to be an IP address, but IP addresses are not allowed" => "El valor especificado parece ser una dirección IP, pero direcciones IP no están permitidas",
+ "The input appears to be a local network name but local network names are not allowed" => "El valor especificado parece ser un nombre de red local, pero nombres de red local no están permitidos",
+ "The input appears to be a DNS hostname but cannot extract TLD part" => "El valor especificado parece ser un nombre de dominio DNS pero no se puede extraer la parte del TLD",
+ "The input appears to be a DNS hostname but cannot match TLD against known list" => "El valor especificado parece ser un nombre de dominio válido pero no se puede encontrar el TLD en una lista conocida",
+
+ // Zend\Validator\Iban
+ "Unknown country within the IBAN" => "PaÃs desconocido dentro del IBAN'",
+ "Countries outside the Single Euro Payments Area (SEPA) are not supported" => "Los paÃses fuera de la Zona Única de Pagos en Euros (SEPA) no están permitidos",
+ "The input has a false IBAN format" => "El valor especificado tiene un formato falso de IBAN",
+ "The input has failed the IBAN check" => "La prueba de validación de IBAN ha fallado",
+
+ // Zend\Validator\Identical
"The two given tokens do not match" => "Las dos muestras especificados no concuerdan",
"No token was provided to match against" => "No se ha especificado ninguna muestra a comprobar",
- // Zend_Validate_InArray
- "'%value%' was not found in the haystack" => "No se ha encontrado '%value%' en el argumento especificado",
-
- // Zend_Validate_Int
- "Invalid type given, value should be string or integer" => "El tipo especificado es inválido, el valor deberÃÂa ser una cadena de texto o un entero",
- "'%value%' does not appear to be an integer" => "'%value%' no parece ser un entero",
+ // Zend\Validator\InArray
+ "The input was not found in the haystack" => "El valor no se encuentra dentro de los valores permitidos",
- // Zend_Validate_Ip
- "Invalid type given, value should be a string" => "El tipo especificado es incorrecto, el valor deberÃÂa ser una cadena de texto",
- "'%value%' does not appear to be a valid IP address" => "'%value%' no parece ser una dirección IP válida",
+ // Zend\Validator\Ip
+ "Invalid type given. String expected" => "El tipo especificado es incorrecto. El valor deberÃa ser una cadena de texto",
+ "The input does not appear to be a valid IP address" => "El valor especificado no parece ser una dirección IP válida",
- // Zend_Validate_Isbn
- "Invalid type given, value should be string or integer" => "El tipo especificado es inválido, el valor deberÃÂa ser una cadena de texto o un entero",
- "'%value%' is not a valid ISBN number" => "El número ISBN especificado ('%value%') no es válido",
+ // Zend\Validator\IsInstanceOf
+ "The input is not an instance of '%className%'" => "El valor especificado no es una instancia de '%className%'",
- // Zend_Validate_LessThan
- "'%value%' is not less than '%max%'" => "'%value%' no es menor que '%max%'",
+ // Zend\Validator\Isbn
+ "Invalid type given. String or integer expected" => "El tipo especificado es inválido. El valor deberÃa ser una cadena de texto o un entero",
+ "The input is not a valid ISBN number" => "El número ISBN especificado no es válido",
- // Zend_Validate_NotEmpty
- "Invalid type given, value should be float, string, array, boolean or integer" => "El tipo especificado es inválido, el valor deberÃÂa ser un float, una cadena de texto, un array, un boolean o un entero",
- "Value is required and can't be empty" => "Se requiere un valor y éste no puede estar vacÃÂo",
+ // Zend\Validator\LessThan
+ "The input is not less than '%max%'" => "El valor especificado no es menor que '%max%'",
+ "The input is not less or equal than '%max%'" => "El valor especificado no es menor o igual que '%max%'",
- // Zend_Validate_PostCode
- "Invalid type given. The value should be a string or a integer" => "El tipo especificado es incorrecto, el valor deberÃÂa ser una cadena de texto",
- "'%value%' does not appear to be a postal code" => "'%value%' no parece ser un código postal",
+ // Zend\Validator\NotEmpty
+ "Value is required and can't be empty" => "Se requiere un valor y éste no puede estar vacÃo",
+ "Invalid type given. String, integer, float, boolean or array expected" => "El tipo especificado es inválido, el valor deberÃa ser punto floatante, cadena de texto, array, booleano o entero",
- // Zend_Validate_Regex
- "Invalid type given, value should be string, integer or float" => "El tipo especificado es incorrecto, el valor deberÃÂa ser de tipo float, una cadena de texto o un entero",
- "'%value%' does not match against pattern '%pattern%'" => "'%value%' no concuerda con el patrón '%pattern%' especificado",
+ // Zend\Validator\Regex
+ "Invalid type given. String, integer or float expected" => "El tipo especificado es incorrecto, el valor deberÃa ser de punto floatante, cadena de texto o entero",
+ "The input does not match against pattern '%pattern%'" => "El valor especificado no concuerda con el patrón '%pattern%' especificado",
"There was an internal error while using the pattern '%pattern%'" => "Se ha producido un error interno al usar el patrón '%pattern%' especificado",
- // Zend_Validate_Sitemap_Changefreq
- "'%value%' is not a valid sitemap changefreq" => "'%value%' no es una especificación válida de frecuencia de cambio",
- "Invalid type given, the value should be a string" => "El tipo especificado es inválido, el valor deberÃÂa ser una cadena de texto",
+ // Zend\Validator\Sitemap\Changefreq
+ "The input is not a valid sitemap changefreq" => "El valor especificado no es una especificación válida de frecuencia de cambio",
+ "Invalid type given. String expected" => "El tipo especificado es inválido, el valor deberÃa ser una cadena de texto",
+
+ // Zend\Validator\Sitemap\Lastmod
+ "The input is not a valid sitemap lastmod" => "El valor especificado no es un lastmod de mapa web válido",
+ "Invalid type given. String expected" => "El tipo especificado es inválido, el valor deberÃa ser una cadena de texto",
+
+ // Zend\Validator\Sitemap\Loc
+ "The input is not a valid sitemap location" => "El valor especificado no es una ubicación de mapa web válida",
+ "Invalid type given. String expected" => "El tipo especificado es inválido, el valor deberÃa ser una cadena de texto",
- // Zend_Validate_Sitemap_Lastmod
- "'%value%' is not a valid sitemap lastmod" => "'%value%' no es un lastmod de mapa web válido",
- "Invalid type given, the value should be a string" => "El tipo especificado es inválido, el valor deberÃÂa ser una cadena de texto",
+ // Zend\Validator\Sitemap\Priority
+ "The input is not a valid sitemap priority" => "El valor especificado no es una prioridad de mapa web válida",
+ "Invalid type given. Numeric string, integer or float expected" => "El tipo especificado es inválido, el valor deberÃa ser una cadena de texto, un número entero, o un número de punto flotante",
- // Zend_Validate_Sitemap_Loc
- "'%value%' is not a valid sitemap location" => "'%value%' no es una ubicación de mapa web válida",
- "Invalid type given, the value should be a string" => "El tipo especificado es inválido, el valor deberÃÂa ser una cadena de texto",
+ // Zend\Validator\Step
+ "Invalid value given. Scalar expected" => "El valor especificado no es válido, deberÃa ser escalar",
+ "The input is not a valid step" => "El valor especificado no es un escalon válido",
- // Zend_Validate_Sitemap_Priority
- "'%value%' is not a valid sitemap priority" => "'%value%' no es una prioridad de mapa web válida",
- "Invalid type given, the value should be a integer, a float or a numeric string" => "El tipo especificado es inválido, el valor deberÃÂa ser un entero, un float o una cadena de texto numérica",
+ // Zend\Validator\StringLength
+ "Invalid type given. String expected" => "El tipo especificado es incorrecto, el valor deberÃa ser una cadena de texto",
+ "The input is less than %min% characters long" => "El valor especificado tiene menos de '%min%' caracteres",
+ "The input is more than %max% characters long" => "El valor especificado tiene más de '%max%' caracteres",
- // Zend_Validate_StringLength
- "Invalid type given, value should be a string" => "El tipo especificado es incorrecto, el valor deberÃÂa ser una cadena de texto",
- "'%value%' is less than %min% characters long" => "'%value%' tiene menos de '%min%' caracteres",
- "'%value%' is more than %max% characters long" => "'%value%' tiene más de '%max%' caracteres",
+ // Zend\Validator\Uri
+ "Invalid type given. String expected" => "El tipo especificado es incorrecto, el valor deberÃa ser una cadena de texto",
+ "The input does not appear to be a valid Uri" => "El valor especificado no parece ser un Uri válido",
);
diff --git a/vendor/zendframework/zendframework/resources/languages/fi/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/fi/Zend_Validate.php
index 27f33165b31..3bb4074a485 100644
--- a/vendor/zendframework/zendframework/resources/languages/fi/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/fi/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/fr/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/fr/Zend_Captcha.php
index 34d534777e0..0b52ca25a0f 100644
--- a/vendor/zendframework/zendframework/resources/languages/fr/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/fr/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php
index 1db4deb7666..b5a21c8d055 100644
--- a/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/fr/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/hr/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/hr/Zend_Validate.php
index 972661dddbd..6980de28268 100644
--- a/vendor/zendframework/zendframework/resources/languages/hr/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/hr/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/hu/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/hu/Zend_Captcha.php
index a9b71889eb2..0914be2fcff 100644
--- a/vendor/zendframework/zendframework/resources/languages/hu/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/hu/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/hu/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/hu/Zend_Validate.php
index 3b547563024..6bd92c79b81 100644
--- a/vendor/zendframework/zendframework/resources/languages/hu/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/hu/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/id/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/id/Zend_Captcha.php
new file mode 100644
index 00000000000..8cf5e6f62d0
--- /dev/null
+++ b/vendor/zendframework/zendframework/resources/languages/id/Zend_Captcha.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+/**
+ * ID-Revision: 08.Dec.2013
+ */
+return array(
+ // Zend\Captcha\ReCaptcha
+ "Missing captcha fields" => "Tidak ada bidang captcha",
+ "Failed to validate captcha" => "Gagal memvalidasi captcha",
+ "Captcha value is wrong: %value%" => "Nilai captcha salah: %value%",
+
+ // Zend\Captcha\AbstractWord
+ "Empty captcha value" => "Nilai captcha kosong",
+ "Captcha ID field is missing" => "Bidang Captcha ID tidak ada",
+ "Captcha value is wrong" => "Nilai Captcha salah",
+);
diff --git a/vendor/zendframework/zendframework/resources/languages/id/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/id/Zend_Validate.php
new file mode 100644
index 00000000000..fbe429cd708
--- /dev/null
+++ b/vendor/zendframework/zendframework/resources/languages/id/Zend_Validate.php
@@ -0,0 +1,251 @@
+<?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
+ */
+
+/**
+ * ID-Revision: 08.Dec.2013
+ */
+return array(
+ // Zend\I18n\Validator\Alnum
+ "Invalid type given. String, integer or float expected" => "Tipe yang diberikan tidak valid. Diharapkan String, integer, atau float",
+ "The input contains characters which are non alphabetic and no digits" => "Isian berisi karakter yang non abjad dan tidak ada angka",
+ "The input is an empty string" => "Isian adalah string kosong",
+
+ // Zend\I18n\Validator\Alpha
+ "Invalid type given. String expected" => "Tipe yang diberikan tidak valid. Diharapkan string",
+ "The input contains non alphabetic characters" => "Isian berisi karakter non abjad",
+
+ // Zend\I18n\Validator\DateTime
+ "The input does not appear to be a valid datetime" => "Isian tidak tampak sebagai datetime yang valid",
+
+ // Zend\I18n\Validator\Float
+ "The input does not appear to be a float" => "Isian tidak tampak sebagai float",
+
+ // Zend\I18n\Validator\Int
+ "Invalid type given. String or integer expected" => "Tipe yang diberikan tidak valid. Diharapkan string atau integer",
+ "The input does not appear to be an integer" => "Isian tidak tampak sebagai integer",
+
+ // Zend\I18n\Validator\PhoneNumber
+ "The input does not match a phone number format" => "Isian tidak cocok dengan format nomor telepon",
+ "The country provided is currently unsupported" => "Negara yang diisikan saat ini tidak didukung",
+
+ // Zend\I18n\Validator\PostCode
+ "The input does not appear to be a postal code" => "Isian tidak tampak sebagai kode pos",
+ "An exception has been raised while validating the input" => "Eksepsi muncul pada saat memvalidasi isian",
+
+ // Zend\Validator\Barcode
+ "The input failed checksum validation" => "Isian gagal memvalidasi checksum",
+ "The input contains invalid characters" => "Isian mengandung karakter yang tidak valid",
+ "The input should have a length of %length% characters" => "Isian harus memiliki panjang panjang %length% karakter",
+
+ // Zend\Validator\Between
+ "The input is not between '%min%' and '%max%', inclusively" => "Isian tidak berada di antara '%min%' and '%max%', inklusif",
+ "The input is not strictly between '%min%' and '%max%'" => "Isian tidak ketat berada di antara '%min%' dan '%max%'",
+
+ // Zend\Validator\Callback
+ "The input is not valid" => "Isian tidak valid",
+ "An exception has been raised within the callback" => "Eksepsi muncul dalam callback",
+
+ // Zend\Validator\CreditCard
+ "The input seems to contain an invalid checksum" => "Isian tampaknya mengandung checksum yang tidak valid",
+ "The input must contain only digits" => "Isian harus berisi angka saja",
+ "The input contains an invalid amount of digits" => "Isian berisi jumlah digit yang tidak valid",
+ "The input is not from an allowed institute" => "Isian tidak berasal dari lembaga yang diperbolehkan",
+ "The input seems to be an invalid credit card number" => "Isian tampaknya nomor kartu kredit yang tidak valid",
+
+ // Zend\Validator\Csrf
+ "The form submitted did not originate from the expected site" => "Form yang disubmit tidak berasal dari situs yang diharapkan",
+
+ // Zend\Validator\Date
+ "Invalid type given. String, integer, array or DateTime expected" => "Tipe yang diberikan tidak valid. Diharapkan String, integer, array, atau DateTime",
+ "The input does not appear to be a valid date" => "Isian tidak tampak sebagai tanggal yang valid",
+ "The input does not fit the date format '%format%'" => "Isian tidak sesuai dengan format tangal '%format%'",
+
+ // Zend\Validator\DateStep
+ "The input is not a valid step" => "Isian bukan langkah yang valid",
+
+ // Zend\Validator\Db\AbstractDb
+ "No record matching the input was found" => "Tidak ada catatan pencocokan isian yang ditemukan",
+ "A record matching the input was found" => "Sebuah catatan pencocokan isian ditemukan",
+
+ // Zend\Validator\Digits
+
+ // Zend\Validator\EmailAddress
+ "The input is not a valid email address. Use the basic format local-part@hostname" => "Isian bukan alamat email yang valid. Gunakan format bagian-lokal@hostname",
+ "'%hostname%' is not a valid hostname for the email address" => "'%hostname%' adalah hostname yang tidak valid untuk alamat email",
+ "'%hostname%' does not appear to have any valid MX or A records for the email address" => "'%hostname%' tidak tampak untuk memiliki MX atau A records yang valid untuk alamat email",
+ "'%hostname%' is not in a routable network segment. The email address should not be resolved from public network" => "'%hostname%' tidak dalam segment jaringan yang terjangkau. alamat email seharusnya dapat dicapai oleh jaringan publik",
+ "'%localPart%' can not be matched against dot-atom format" => "'%localPart%' tidak dapat dicocokkan dengan format dot-atom",
+ "'%localPart%' can not be matched against quoted-string format" => "'%localPart%' tidak dapat dicocokkan dengan format quoted-string",
+ "'%localPart%' is not a valid local part for the email address" => "'%localPart%' adalah bagian local yang tidak valid untuk email address",
+ "The input exceeds the allowed length" => "Isian melebihi panjang yang diperbolehkan",
+
+ // Zend\Validator\Explode
+ "Invalid type given" => "Tipe yang diberikan tidak valid",
+
+ // Zend\Validator\File\Count
+ "Too many files, maximum '%max%' are allowed but '%count%' are given" => "Terlalu banyak berkas, maksimal '%max%' diperbolehkan tetapi '%count%' diberikan",
+ "Too few files, minimum '%min%' are expected but '%count%' are given" => "Terlalu sedikit berkas, minimal '%min%' diperbolehkan tetapi '%count%' diberikan",
+
+ // Zend\Validator\File\Crc32
+ "File does not match the given crc32 hashes" => "Berkas tidak cocok dengan hash crc32 diberikan",
+ "A crc32 hash could not be evaluated for the given file" => "Sebuah hash crc32 tidak dapat dievaluasi untuk berkas yang diberikan",
+ "File is not readable or does not exist" => "Berkas tidak terbaca atau tidak ada",
+
+ // Zend\Validator\File\ExcludeExtension
+ "File has an incorrect extension" => "Ekstensi berkas salah",
+
+ // Zend\Validator\File\Exists
+ "File does not exist" => "Berkas tidak ada",
+
+ // Zend\Validator\File\Extension
+
+ // Zend\Validator\File\FilesSize
+ "All files in sum should have a maximum size of '%max%' but '%size%' were detected" => "Semua berkas yang dijumlahkan harus memiliki ukuran maksimal '%max%' tapi ukuran '%size%' terdeteksi",
+ "All files in sum should have a minimum size of '%min%' but '%size%' were detected" => "Semua berkas yang dijumlahkan harus memiliki ukuran minimal '%min%' tapi ukuran '%size%' terdeteksi",
+ "One or more files can not be read" => "Satu atau beberapa berkas tidak dapat dibaca",
+
+ // Zend\Validator\File\Hash
+ "File does not match the given hashes" => "Berkas tidak cocok dengan hash yang diberikan",
+ "A hash could not be evaluated for the given file" => "Sebuah hash tidak dapat dievaluasi untuk berkas yang diberikan",
+
+ // Zend\Validator\File\ImageSize
+ "Maximum allowed width for image should be '%maxwidth%' but '%width%' detected" => "Lebar maksimal yang diharapkan untuk gambar seharusnya '%maxwidth%' tetapi '%width%' terdeteksi",
+ "Minimum expected width for image should be '%minwidth%' but '%width%' detected" => "Lebar minimal yang diharapkan untuk gambar seharusnya '%minwidth%' tetapi '%width%' terdeteksi",
+ "Maximum allowed height for image should be '%maxheight%' but '%height%' detected" => "Tinggi maksimal yang diharapkan untuk gambar seharusnya '%maxheight%' tetapi '%height%' terdeteksi",
+ "Minimum expected height for image should be '%minheight%' but '%height%' detected" => "Tinggi minimal yang diharapkan untuk gambar seharusnya '%minheight%' tetapi '%height%' terdeteksi",
+ "The size of image could not be detected" => "Ukuran gambar tidak dapat terdeteksi",
+
+ // Zend\Validator\File\IsCompressed
+ "File is not compressed, '%type%' detected" => "Bukan berkas terkompresi, '%type%' terdeteksi",
+ "The mimetype could not be detected from the file" => "Mimetype tidak dapat terdeteksi dari berkas",
+
+ // Zend\Validator\File\IsImage
+ "File is no image, '%type%' detected" => "Berkas bukan gambar, '%type%' terdeteksi",
+
+ // Zend\Validator\File\Md5
+ "File does not match the given md5 hashes" => "Berkas tidak cocok dengan hash md5 diberikan",
+ "An md5 hash could not be evaluated for the given file" => "Md5 hash tidak dapat dievaluasi dari berkas yang diberikan",
+
+ // Zend\Validator\File\MimeType
+ "File has an incorrect mimetype of '%type%'" => "Berkas mempunyai mimetype yang tidak cocok dengan '%type%'",
+
+ // Zend\Validator\File\NotExists
+
+ // Zend\Validator\File\Sha1
+ "File does not match the given sha1 hashes" => "Berkas tidak cocok dengan hash sha1 diberikan",
+ "A sha1 hash could not be evaluated for the given file" => "Sebuah hash sha1 tidak dapat dievaluasi untuk berkas yang diberikan",
+
+ // Zend\Validator\File\Size
+ "Maximum allowed size for file is '%max%' but '%size%' detected" => "Ukuran maksimal yang diharapkan adalah '%min%' tetapi '%size%' terdeteksi",
+ "Minimum expected size for file is '%min%' but '%size%' detected" => "Ukuran minimal yang diharapkan adalah '%min%' tetapi '%size%' terdeteksi",
+
+ // Zend\Validator\File\Upload
+ "File '%value%' exceeds the defined ini size" => "Berkas '%value%' melebihi ukuran ini yang didefinisikan",
+ "File '%value%' exceeds the defined form size" => "Berkas '%value%' melebihi ukuran form yang didefinisikan",
+ "File '%value%' was only partially uploaded" => "Berkas '%value%' hanya sebagian terupload",
+ "File '%value%' was not uploaded" => "Berkas '%value%' tidak dapat terupload",
+ "No temporary directory was found for file '%value%'" => "Tidak ada direktori sementara yang ditemukan untuk berkas '%value%'",
+ "File '%value%' can't be written" => "Berkas '%value%' tidak dapat ditulis",
+ "A PHP extension returned an error while uploading the file '%value%'" => "Ekstensi PHP mengembalikan galat pada saat upload berkas '%value%'",
+ "File '%value%' was illegally uploaded. This could be a possible attack" => "Berkas '%value%' secara ilegal diunggah. Hal ini bisa menjadi kemungkinan serangan",
+ "File '%value%' was not found" => "Berkas '%value%' tidak ditemukan",
+ "Unknown error while uploading file '%value%'" => "Galat tidak diketahui pada saat proses mengupload berkas '%value%'",
+
+ // Zend\Validator\File\UploadFile
+ "File exceeds the defined ini size" => "Berkas melebihi ukuran ini yang didefinisikan",
+ "File exceeds the defined form size" => "Berkas melebihi ukuran form yang didefinisikan",
+ "File was only partially uploaded" => "Berkas hanya sebagian terupload",
+ "File was not uploaded" => "Berkas tidak dapat terupload",
+ "No temporary directory was found for file" => "Tidak ada direktori sementara yang ditemukan untuk berkas",
+ "File can't be written" => "Berkas tidak dapat ditulis",
+ "A PHP extension returned an error while uploading the file" => "Ekstensi PHP mengembalikan galat pada saat upload berkas",
+ "File was illegally uploaded. This could be a possible attack" => "Berkas secara ilegal diunggah. Hal ini bisa menjadi kemungkinan serangan",
+ "File was not found" => "Berkas tidak ditemukan",
+ "Unknown error while uploading file" => "Galat tidak diketahui pada saat unggah berkas",
+
+ // Zend\Validator\File\WordCount
+ "Too many words, maximum '%max%' are allowed but '%count%' were counted" => "Terlalu banyak kata, maksimal '%min%' diharapkan tetapi '%count%' terdeteksi",
+ "Too few words, minimum '%min%' are expected but '%count%' were counted" => "Terlalu sedikit kata, minimal '%min%' diharapkan tetapi '%count%' terdeteksi",
+
+ // Zend\Validator\GreaterThan
+ "The input is not greater than '%min%'" => "Isian tidak lebih besar dari '%min%'",
+ "The input is not greater or equal than '%min%'" => "Isian tidak lebih besar atau sama dengan '%min%'",
+
+ // Zend\Validator\Hex
+ "The input contains non-hexadecimal characters" => "Isian berisi karakter non-heksadesimal",
+
+ // Zend\Validator\Hostname
+ "The input appears to be a DNS hostname but the given punycode notation cannot be decoded" => "Isian tampaknya menjadi nama host DNS tetapi notasi punycode diberikan tidak dapat diterjemahkan",
+ "The input appears to be a DNS hostname but contains a dash in an invalid position" => "Isian tampaknya menjadi nama host DNS tetapi berisi dash dalam posisi yang tidak valid",
+ "The input does not match the expected structure for a DNS hostname" => "Isian tidak cocok dengan struktur untuk hostname DNS yang diharapkan",
+ "The input appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'" => "Isian tampaknya berupa hostname DNS tetapi tidak dapat cocok dengan skema hostname untuk TLD '%tld%'",
+ "The input does not appear to be a valid local network name" => "Isian tidak tampak sebagai nama jaringan lokal yang diperbolehkan",
+ "The input does not appear to be a valid URI hostname" => "Isian tidak tampak sebagai hostname URI yang valid",
+ "The input appears to be an IP address, but IP addresses are not allowed" => "Isian tampaknya berupa IP address, tetapi IP Address tidak diperbolehkan",
+ "The input appears to be a local network name but local network names are not allowed" => "Isian tampaknya menjadi nama jaringan lokal namun nama-nama jaringan lokal tidak diperbolehkan",
+ "The input appears to be a DNS hostname but cannot extract TLD part" => "Isian tampaknya menjadi hostname DNS tetapi tidak dapat mengekstrak bagian TLD",
+ "The input appears to be a DNS hostname but cannot match TLD against known list" => "Isian tampaknya menjadi hostname DNS tapi tidak bisa cocok dengan TLD yang dikenal",
+
+ // Zend\Validator\Iban
+ "Unknown country within the IBAN" => "Negara tidak diketahui dalam IBAN",
+ "Countries outside the Single Euro Payments Area (SEPA) are not supported" => "Negara-negara di luar Single Euro Payments Area (SEPA) tidak didukung",
+ "The input has a false IBAN format" => "Isian mempunyai IBAN format yang salah",
+ "The input has failed the IBAN check" => "Isian telah gagal cek IBAN",
+
+ // Zend\Validator\Identical
+ "The two given tokens do not match" => "Dua token yang diberikan tidak cocok",
+ "No token was provided to match against" => "Tidak ada token yang diberikan untuk dibandingkan",
+
+ // Zend\Validator\InArray
+ "The input was not found in the haystack" => "Isian tidak ditemukan di dalam haystack",
+
+ // Zend\Validator\Ip
+ "The input does not appear to be a valid IP address" => "Isian tidak tampak sebagai IP address yang valid",
+
+ // Zend\Validator\IsInstanceOf
+ "The input is not an instance of '%className%'" => "Isian bukanlah instance dari '%ClassName%'",
+
+ // Zend\Validator\Isbn
+ "The input is not a valid ISBN number" => "Isian adalah ISBN number yang tidak valid",
+
+ // Zend\Validator\LessThan
+ "The input is not less than '%max%'" => "Isian tidak kurang dari '%max%'",
+ "The input is not less or equal than '%max%'" => "Isian tidak kurang atau sama dengan '%max%'",
+
+ // Zend\Validator\NotEmpty
+ "Value is required and can't be empty" => "Nilai diperlukan dan tidak boleh kosong",
+ "Invalid type given. String, integer, float, boolean or array expected" => "Tipe tidak valid. Diharapkan string, integer, float, boolean, atau array",
+
+ // Zend\Validator\Regex
+ "The input does not match against pattern '%pattern%'" => "Isian tidak cocok dengan pola '%pattern%'",
+ "There was an internal error while using the pattern '%pattern%'" => "Terjadi galat internal saat menggunakan pola '%pattern%'",
+
+ // Zend\Validator\Sitemap\Changefreq
+ "The input is not a valid sitemap changefreq" => "Isian adalah changefreq sitemap yang tidak valid",
+
+ // Zend\Validator\Sitemap\Lastmod
+ "The input is not a valid sitemap lastmod" => "Isian adalah lastmod sitemap yang tidak valid",
+
+ // Zend\Validator\Sitemap\Loc
+ "The input is not a valid sitemap location" => "Isian adalah lokasi sitemap yang tidak valid",
+
+ // Zend\Validator\Sitemap\Priority
+ "The input is not a valid sitemap priority" => "Isian adalah prioritas sitemap yang tidak valid",
+ "Invalid type given. Numeric string, integer or float expected" => "Tipe yang diberikan tidak valid. Diharapkan numeric string, integer, atau float",
+
+ // Zend\Validator\Step
+ "Invalid value given. Scalar expected" => "Tipe yang diberikan tidak valid. Diharapkan scalar",
+
+ // Zend\Validator\StringLength
+ "The input is less than %min% characters long" => "Isian kurang dari %min% panjang karakter",
+ "The input is more than %max% characters long" => "Isian lebih dari %max% panjang karakter",
+
+ // Zend\Validator\Uri
+ "The input does not appear to be a valid Uri" => "Isian tidak tampak sebagai Uri yang valid",
+);
diff --git a/vendor/zendframework/zendframework/resources/languages/it/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/it/Zend_Captcha.php
index 41324285c90..7867b168225 100644
--- a/vendor/zendframework/zendframework/resources/languages/it/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/it/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/it/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/it/Zend_Validate.php
index 9e51eee3a71..dc537567692 100644
--- a/vendor/zendframework/zendframework/resources/languages/it/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/it/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/ja/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/ja/Zend_Captcha.php
index dbb0ad4d439..e2144c6f608 100644
--- a/vendor/zendframework/zendframework/resources/languages/ja/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/ja/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php
index 0759edb23fd..3cf14490be9 100644
--- a/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/nl/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/nl/Zend_Validate.php
index 535afc78e0c..49b35327623 100644
--- a/vendor/zendframework/zendframework/resources/languages/nl/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/nl/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/no/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/no/Zend_Captcha.php
index 05c5a7ec0c1..282d4b9f69b 100644
--- a/vendor/zendframework/zendframework/resources/languages/no/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/no/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/no/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/no/Zend_Validate.php
index 284b82e8597..3e65f36a36d 100644
--- a/vendor/zendframework/zendframework/resources/languages/no/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/no/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/pl/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/pl/Zend_Captcha.php
index 2259461684f..f53caf9f303 100644
--- a/vendor/zendframework/zendframework/resources/languages/pl/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/pl/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/pl/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/pl/Zend_Validate.php
index 10618ce0478..5e59aecd44e 100644
--- a/vendor/zendframework/zendframework/resources/languages/pl/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/pl/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -123,7 +123,7 @@ return array(
// Zend\Validator\File\ImageSize
"Maximum allowed width for image should be '%maxwidth%' but '%width%' detected" => "Plik ma szerokość '%width%'. Maksymalna szerokość to '%maxwidth%'",
- "Minimum expected width for image should be '%minwidth%' but '%width%' detected" => "Plik ma szerokość '%width%'. Minimalna szerokość to '%maxwidth%'",
+ "Minimum expected width for image should be '%minwidth%' but '%width%' detected" => "Plik ma szerokość '%width%'. Minimalna szerokość to '%minwidth%'",
"Maximum allowed height for image should be '%maxheight%' but '%height%' detected" => "Plik ma wysokość '%height%'. Maksymalna wysokość to '%maxheight%'",
"Minimum expected height for image should be '%minheight%' but '%height%' detected" => "Plik ma wysokość '%height%'. Minimalna wysokość to '%minheight%'",
"The size of image could not be detected" => "Nie można określić rozmiaru pliku",
@@ -185,8 +185,8 @@ return array(
"File is not readable or does not exist" => "Plik nie istnieje lub nie można go odczytać",
// Zend\Validator\GreaterThan
- "The input is not greater than '%min%'" => "Podana wartość nie jest większe niż '%min%'",
- "The input is not greater or equal than '%min%'" => "Podana wartość nie jest większe lub równa od '%min%'",
+ "The input is not greater than '%min%'" => "Podana wartość nie jest większa niż '%min%'",
+ "The input is not greater or equal than '%min%'" => "Podana wartość nie jest większa lub równa od '%min%'",
// Zend\Validator\Hex
"The input contains non-hexadecimal characters" => "Wartość nie jest wartością heksadecymalną",
diff --git a/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Captcha.php
index c8d8f2634f2..34bc26e9349 100644
--- a/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Validate.php
index 153f228f98b..4ab09be5314 100644
--- a/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/ru/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/ru/Zend_Captcha.php
new file mode 100644
index 00000000000..4bb97182ed4
--- /dev/null
+++ b/vendor/zendframework/zendframework/resources/languages/ru/Zend_Captcha.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+/**
+ * EN-Revision: 16.May.2014
+ */
+return array(
+ // Zend\Captcha\ReCaptcha
+ "Missing captcha fields" => "Ðе хватает полей captcha",
+ "Failed to validate captcha" => "Captcha не прошла проверку",
+ "Captcha value is wrong: %value%" => "Ðе корректное значение captcha: %value%",
+
+ // Zend\Captcha\Word
+ "Empty captcha value" => "ПуÑтое значение captcha",
+ "Captcha ID field is missing" => "Ðе хватает Ð¿Ð¾Ð»Ñ captcha ID",
+ "Captcha value is wrong" => "Ðе корректное значение captcha",
+);
diff --git a/vendor/zendframework/zendframework/resources/languages/ru/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/ru/Zend_Validate.php
index 1af75359de6..48cf6a51e48 100644
--- a/vendor/zendframework/zendframework/resources/languages/ru/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/ru/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/se/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/se/Zend_Captcha.php
index 59422bb7dc2..690318d002b 100644
--- a/vendor/zendframework/zendframework/resources/languages/se/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/se/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/se/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/se/Zend_Validate.php
index 7a46df4a962..4d53400f68b 100644
--- a/vendor/zendframework/zendframework/resources/languages/se/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/se/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/sk/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/sk/Zend_Captcha.php
index 66f164775a2..794c525853f 100644
--- a/vendor/zendframework/zendframework/resources/languages/sk/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/sk/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/sk/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/sk/Zend_Validate.php
index 646c100e6f3..5acf8e023c8 100644
--- a/vendor/zendframework/zendframework/resources/languages/sk/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/sk/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/sl/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/sl/Zend_Captcha.php
index 34b570b5472..31b5046c3d1 100644
--- a/vendor/zendframework/zendframework/resources/languages/sl/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/sl/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/sl/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/sl/Zend_Validate.php
index 5057d5671ab..68f65fd0480 100644
--- a/vendor/zendframework/zendframework/resources/languages/sl/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/sl/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/sr/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/sr/Zend_Validate.php
index ce182270ef9..385869b7cd5 100644
--- a/vendor/zendframework/zendframework/resources/languages/sr/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/sr/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -222,7 +222,7 @@ return array(
"Value is required and can't be empty" => "Vrednost je obavezna i ne sme biti prazna",
// Zend_Validate_PostCode
- "Invalid type given. The value should be a string or a integer" => "Nevalidan tip. Vrednost treba da bude tekst ili ceo broj",
+ "Invalid type given. The value should be a string or an integer" => "Nevalidan tip. Vrednost treba da bude tekst ili ceo broj",
"'%value%' does not appear to be a postal code" => "'%value%' nije poštanski broj",
// Zend_Validate_Regex
@@ -244,7 +244,7 @@ return array(
// Zend_Validate_Sitemap_Priority
"'%value%' is not a valid sitemap priority" => "'%value%' nije validan prioritet mape sajta",
- "Invalid type given, the value should be a integer, a float or a numeric string" => "Nevalidan tip, vrednost treba da bude broj ili numeriÄki niz",
+ "Invalid type given, the value should be an integer, a float or a numeric string" => "Nevalidan tip, vrednost treba da bude broj ili numeriÄki niz",
// Zend_Validate_StringLength
"Invalid type given, value should be a string" => "Nevalidan tip, vrednost treba da bude tekst",
diff --git a/vendor/zendframework/zendframework/resources/languages/tr/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/tr/Zend_Captcha.php
index 5314ab824b5..4399d7c7c79 100644
--- a/vendor/zendframework/zendframework/resources/languages/tr/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/tr/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/tr/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/tr/Zend_Validate.php
index 4177ffff453..cecc1d7fa20 100644
--- a/vendor/zendframework/zendframework/resources/languages/tr/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/tr/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/uk/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/uk/Zend_Captcha.php
index 44a1d66384b..f93818383cf 100644
--- a/vendor/zendframework/zendframework/resources/languages/uk/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/uk/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/uk/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/uk/Zend_Validate.php
index 10a9393535a..6926f7ed886 100644
--- a/vendor/zendframework/zendframework/resources/languages/uk/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/uk/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/zh/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/zh/Zend_Captcha.php
index 25335e848f8..d79dea08b0b 100644
--- a/vendor/zendframework/zendframework/resources/languages/zh/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/zh/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/zh/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/zh/Zend_Validate.php
index 2fa1ea77493..cd6c8a2f2ae 100644
--- a/vendor/zendframework/zendframework/resources/languages/zh/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/zh/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php
index e4e58692b73..0cdfcf89179 100644
--- a/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Captcha.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Validate.php
index f163ecc7f60..af05c392349 100644
--- a/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/zh_TW/Zend_Validate.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
--
GitLab