From 76c133a16380668588513848ba3aad9ce2e36ee1 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Fri, 7 Mar 2014 12:16:02 -0500
Subject: [PATCH] Upgrade to Zend Framework 2.2.6.
---
composer.json | 2 +-
composer.lock | 19 +-
vendor/autoload.php | 2 +-
vendor/composer/autoload_real.php | 8 +-
vendor/composer/installed.json | 241 +++++++--------
.../zendframework/zendframework/CHANGELOG.md | 153 ++++++++++
.../zendframework/CONTRIBUTING.md | 16 +-
vendor/zendframework/zendframework/INSTALL.md | 2 +-
.../zendframework/zendframework/LICENSE.txt | 2 +-
.../zendframework/zendframework/README-GIT.md | 2 +-
vendor/zendframework/zendframework/README.md | 50 +--
.../zendframework/bin/check-cs.sh | 2 +-
.../zendframework/bin/classmap_generator.php | 2 +-
.../zendframework/bin/pluginmap_generator.php | 2 +-
.../bin/templatemap_generator.php | 4 +-
.../zendframework/zendframework/composer.json | 3 +-
.../Adapter/AbstractAdapter.php | 2 +-
.../Adapter/AdapterInterface.php | 2 +-
.../Zend/Authentication/Adapter/DbTable.php | 2 +-
.../Adapter/DbTable/AbstractAdapter.php | 2 +-
.../Adapter/DbTable/CallbackCheckAdapter.php | 2 +-
.../DbTable/CredentialTreatmentAdapter.php | 2 +-
.../DbTable/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../DbTable/Exception/RuntimeException.php | 2 +-
.../Zend/Authentication/Adapter/Digest.php | 2 +-
.../Adapter/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Adapter/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../Zend/Authentication/Adapter/Http.php | 2 +-
.../Adapter/Http/ApacheResolver.php | 2 +-
.../Http/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Http/Exception/RuntimeException.php | 2 +-
.../Adapter/Http/FileResolver.php | 2 +-
.../Adapter/Http/ResolverInterface.php | 2 +-
.../Zend/Authentication/Adapter/Ldap.php | 2 +-
.../Adapter/ValidatableAdapterInterface.php | 2 +-
.../Authentication/AuthenticationService.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../library/Zend/Authentication/Result.php | 2 +-
.../Zend/Authentication/Storage/Chain.php | 3 +-
.../Authentication/Storage/NonPersistent.php | 2 +-
.../Zend/Authentication/Storage/Session.php | 2 +-
.../Storage/StorageInterface.php | 2 +-
.../Validator/Authentication.php | 2 +-
.../library/Zend/Barcode/Barcode.php | 2 +-
.../Barcode/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Barcode/Exception/OutOfRangeException.php | 2 +-
.../Exception/RendererCreationException.php | 2 +-
.../Barcode/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../Zend/Barcode/Object/AbstractObject.php | 2 +-
.../library/Zend/Barcode/Object/Codabar.php | 2 +-
.../library/Zend/Barcode/Object/Code128.php | 5 +-
.../library/Zend/Barcode/Object/Code25.php | 2 +-
.../Zend/Barcode/Object/Code25interleaved.php | 2 +-
.../library/Zend/Barcode/Object/Code39.php | 2 +-
.../library/Zend/Barcode/Object/Ean13.php | 2 +-
.../library/Zend/Barcode/Object/Ean2.php | 2 +-
.../library/Zend/Barcode/Object/Ean5.php | 2 +-
.../library/Zend/Barcode/Object/Ean8.php | 2 +-
.../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 | 2 +-
.../library/Zend/Barcode/Object/Itf14.php | 2 +-
.../library/Zend/Barcode/Object/Leitcode.php | 2 +-
.../Zend/Barcode/Object/ObjectInterface.php | 2 +-
.../library/Zend/Barcode/Object/Planet.php | 2 +-
.../library/Zend/Barcode/Object/Postnet.php | 2 +-
.../library/Zend/Barcode/Object/Royalmail.php | 2 +-
.../library/Zend/Barcode/Object/Upca.php | 2 +-
.../library/Zend/Barcode/Object/Upce.php | 2 +-
.../Zend/Barcode/ObjectPluginManager.php | 2 +-
.../Barcode/Renderer/AbstractRenderer.php | 30 +-
.../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 | 115 ++++---
.../library/Zend/Barcode/Renderer/Pdf.php | 2 +-
.../Barcode/Renderer/RendererInterface.php | 2 +-
.../library/Zend/Barcode/Renderer/Svg.php | 37 ++-
.../Zend/Barcode/RendererPluginManager.php | 2 +-
.../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 | 2 +-
.../Zend/Cache/Pattern/CallbackCache.php | 2 +-
.../Zend/Cache/Pattern/CaptureCache.php | 6 +-
.../library/Zend/Cache/Pattern/ClassCache.php | 2 +-
.../Zend/Cache/Pattern/ObjectCache.php | 2 +-
.../Zend/Cache/Pattern/OutputCache.php | 2 +-
.../Zend/Cache/Pattern/PatternInterface.php | 2 +-
.../Zend/Cache/Pattern/PatternOptions.php | 2 +-
.../library/Zend/Cache/PatternFactory.php | 2 +-
.../Zend/Cache/PatternPluginManager.php | 4 +-
.../StorageCacheAbstractServiceFactory.php | 2 +-
.../Cache/Service/StorageCacheFactory.php | 2 +-
.../Cache/Storage/Adapter/AbstractAdapter.php | 2 +-
.../Storage/Adapter/AbstractZendServer.php | 5 +-
.../Cache/Storage/Adapter/AdapterOptions.php | 2 +-
.../Zend/Cache/Storage/Adapter/Apc.php | 3 +-
.../Cache/Storage/Adapter/ApcIterator.php | 2 +-
.../Zend/Cache/Storage/Adapter/ApcOptions.php | 2 +-
.../Zend/Cache/Storage/Adapter/Dba.php | 4 +-
.../Cache/Storage/Adapter/DbaIterator.php | 2 +-
.../Zend/Cache/Storage/Adapter/DbaOptions.php | 2 +-
.../Zend/Cache/Storage/Adapter/Filesystem.php | 9 +-
.../Storage/Adapter/FilesystemIterator.php | 2 +-
.../Storage/Adapter/FilesystemOptions.php | 2 +-
.../Cache/Storage/Adapter/KeyListIterator.php | 2 +-
.../Zend/Cache/Storage/Adapter/Memcached.php | 2 +-
.../Storage/Adapter/MemcachedOptions.php | 4 +-
.../Adapter/MemcachedResourceManager.php | 2 +-
.../Zend/Cache/Storage/Adapter/Memory.php | 2 +-
.../Cache/Storage/Adapter/MemoryOptions.php | 2 +-
.../Zend/Cache/Storage/Adapter/Redis.php | 4 +-
.../Cache/Storage/Adapter/RedisOptions.php | 4 +-
.../Storage/Adapter/RedisResourceManager.php | 5 +-
.../Zend/Cache/Storage/Adapter/Session.php | 2 +-
.../Cache/Storage/Adapter/SessionOptions.php | 3 +-
.../Zend/Cache/Storage/Adapter/WinCache.php | 2 +-
.../Cache/Storage/Adapter/WinCacheOptions.php | 2 +-
.../Zend/Cache/Storage/Adapter/XCache.php | 2 +-
.../Cache/Storage/Adapter/XCacheOptions.php | 2 +-
.../Cache/Storage/Adapter/ZendServerDisk.php | 4 +-
.../Cache/Storage/Adapter/ZendServerShm.php | 4 +-
.../Cache/Storage/AdapterPluginManager.php | 2 +-
.../AvailableSpaceCapableInterface.php | 2 +-
.../Zend/Cache/Storage/Capabilities.php | 2 +-
.../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 | 2 +-
.../Cache/Storage/OptimizableInterface.php | 2 +-
.../Cache/Storage/Plugin/AbstractPlugin.php | 2 +-
.../Storage/Plugin/ClearExpiredByFactor.php | 3 +-
.../Cache/Storage/Plugin/ExceptionHandler.php | 2 +-
.../Cache/Storage/Plugin/IgnoreUserAbort.php | 2 +-
.../Cache/Storage/Plugin/OptimizeByFactor.php | 3 +-
.../Cache/Storage/Plugin/PluginInterface.php | 2 +-
.../Cache/Storage/Plugin/PluginOptions.php | 2 +-
.../Zend/Cache/Storage/Plugin/Serializer.php | 3 +-
.../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 | 2 +-
.../library/Zend/Captcha/AbstractAdapter.php | 2 +-
.../library/Zend/Captcha/AbstractWord.php | 2 +-
.../library/Zend/Captcha/AdapterInterface.php | 2 +-
.../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 | 2 +-
.../Exception/NoFontProvidedException.php | 2 +-
.../Captcha/Exception/RuntimeException.php | 2 +-
.../library/Zend/Captcha/Factory.php | 2 +-
.../library/Zend/Captcha/Figlet.php | 2 +-
.../library/Zend/Captcha/Image.php | 3 +-
.../library/Zend/Captcha/ReCaptcha.php | 2 +-
.../Code/Annotation/AnnotationCollection.php | 2 +-
.../Code/Annotation/AnnotationInterface.php | 2 +-
.../Code/Annotation/AnnotationManager.php | 2 +-
.../Parser/DoctrineAnnotationParser.php | 2 +-
.../Parser/GenericAnnotationParser.php | 2 +-
.../Annotation/Parser/ParserInterface.php | 2 +-
.../Code/Exception/BadMethodCallException.php | 2 +-
.../Code/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Zend/Code/Exception/RuntimeException.php | 2 +-
.../Zend/Code/Generator/AbstractGenerator.php | 2 +-
.../Generator/AbstractMemberGenerator.php | 3 +-
.../Zend/Code/Generator/BodyGenerator.php | 2 +-
.../Zend/Code/Generator/ClassGenerator.php | 23 +-
.../Zend/Code/Generator/DocBlock/Tag.php | 2 +-
.../Code/Generator/DocBlock/Tag/AuthorTag.php | 2 +-
.../Generator/DocBlock/Tag/LicenseTag.php | 2 +-
.../Code/Generator/DocBlock/Tag/ParamTag.php | 2 +-
.../Code/Generator/DocBlock/Tag/ReturnTag.php | 2 +-
.../Zend/Code/Generator/DocBlockGenerator.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Generator/Exception/RuntimeException.php | 2 +-
.../Zend/Code/Generator/FileGenerator.php | 2 +-
.../Code/Generator/FileGeneratorRegistry.php | 2 +-
.../Code/Generator/GeneratorInterface.php | 2 +-
.../Zend/Code/Generator/MethodGenerator.php | 2 +-
.../Code/Generator/ParameterGenerator.php | 2 +-
.../Zend/Code/Generator/PropertyGenerator.php | 2 +-
.../Code/Generator/PropertyValueGenerator.php | 2 +-
.../Zend/Code/Generator/ValueGenerator.php | 2 +-
.../library/Zend/Code/NameInformation.php | 2 +-
.../Zend/Code/Reflection/ClassReflection.php | 12 +-
.../Reflection/DocBlock/Tag/AuthorTag.php | 2 +-
.../Reflection/DocBlock/Tag/GenericTag.php | 2 +-
.../Reflection/DocBlock/Tag/LicenseTag.php | 2 +-
.../Reflection/DocBlock/Tag/MethodTag.php | 2 +-
.../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 | 2 +-
.../Reflection/DocBlock/Tag/ThrowsTag.php | 2 +-
.../Code/Reflection/DocBlock/TagManager.php | 2 +-
.../Code/Reflection/DocBlockReflection.php | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Reflection/Exception/RuntimeException.php | 2 +-
.../Zend/Code/Reflection/FileReflection.php | 2 +-
.../Code/Reflection/FunctionReflection.php | 10 +-
.../Zend/Code/Reflection/MethodReflection.php | 18 +-
.../Code/Reflection/ParameterReflection.php | 2 +-
.../Code/Reflection/PropertyReflection.php | 2 +-
.../Code/Reflection/ReflectionInterface.php | 2 +-
.../Scanner/AggregateDirectoryScanner.php | 2 +-
.../Zend/Code/Scanner/AnnotationScanner.php | 2 +-
.../Zend/Code/Scanner/CachingFileScanner.php | 2 +-
.../Zend/Code/Scanner/ClassScanner.php | 2 +-
.../Zend/Code/Scanner/ConstantScanner.php | 2 +-
.../Zend/Code/Scanner/DerivedClassScanner.php | 2 +-
.../Zend/Code/Scanner/DirectoryScanner.php | 2 +-
.../Zend/Code/Scanner/DocBlockScanner.php | 2 +-
.../library/Zend/Code/Scanner/FileScanner.php | 2 +-
.../Zend/Code/Scanner/FunctionScanner.php | 2 +-
.../Zend/Code/Scanner/MethodScanner.php | 5 +-
.../Zend/Code/Scanner/ParameterScanner.php | 4 +-
.../Zend/Code/Scanner/PropertyScanner.php | 2 +-
.../Zend/Code/Scanner/ScannerInterface.php | 2 +-
.../Zend/Code/Scanner/TokenArrayScanner.php | 2 +-
.../library/Zend/Code/Scanner/Util.php | 2 +-
.../Zend/Code/Scanner/ValueScanner.php | 2 +-
.../library/Zend/Config/Config.php | 2 +-
.../Config/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Config/Exception/RuntimeException.php | 2 +-
.../library/Zend/Config/Factory.php | 2 +-
.../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 | 101 +++---
.../Zend/Config/Processor/Translator.php | 2 +-
.../library/Zend/Config/Reader/Ini.php | 2 +-
.../library/Zend/Config/Reader/Json.php | 2 +-
.../Zend/Config/Reader/ReaderInterface.php | 2 +-
.../library/Zend/Config/Reader/Xml.php | 2 +-
.../library/Zend/Config/Reader/Yaml.php | 2 +-
.../Zend/Config/ReaderPluginManager.php | 2 +-
.../Zend/Config/Writer/AbstractWriter.php | 2 +-
.../library/Zend/Config/Writer/Ini.php | 2 +-
.../library/Zend/Config/Writer/Json.php | 2 +-
.../library/Zend/Config/Writer/PhpArray.php | 2 +-
.../Zend/Config/Writer/WriterInterface.php | 2 +-
.../library/Zend/Config/Writer/Xml.php | 2 +-
.../library/Zend/Config/Writer/Yaml.php | 2 +-
.../Zend/Config/WriterPluginManager.php | 2 +-
.../Zend/Console/Adapter/AbstractAdapter.php | 2 +-
.../Zend/Console/Adapter/AdapterInterface.php | 2 +-
.../library/Zend/Console/Adapter/Posix.php | 2 +-
.../library/Zend/Console/Adapter/Virtual.php | 2 +-
.../library/Zend/Console/Adapter/Windows.php | 2 +-
.../Zend/Console/Adapter/WindowsAnsicon.php | 2 +-
.../library/Zend/Console/Charset/Ascii.php | 2 +-
.../Zend/Console/Charset/AsciiExtended.php | 2 +-
.../Zend/Console/Charset/CharsetInterface.php | 2 +-
.../library/Zend/Console/Charset/DECSG.php | 2 +-
.../library/Zend/Console/Charset/Utf8.php | 2 +-
.../Zend/Console/Charset/Utf8Heavy.php | 2 +-
.../library/Zend/Console/Color/Xterm256.php | 2 +-
.../library/Zend/Console/ColorInterface.php | 2 +-
.../library/Zend/Console/Console.php | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Console/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Console/Exception/RuntimeException.php | 2 +-
.../library/Zend/Console/Getopt.php | 2 +-
.../Zend/Console/Prompt/AbstractPrompt.php | 2 +-
.../library/Zend/Console/Prompt/Char.php | 2 +-
.../library/Zend/Console/Prompt/Confirm.php | 2 +-
.../library/Zend/Console/Prompt/Line.php | 2 +-
.../library/Zend/Console/Prompt/Number.php | 2 +-
.../Zend/Console/Prompt/PromptInterface.php | 2 +-
.../library/Zend/Console/Prompt/Select.php | 2 +-
.../library/Zend/Console/Request.php | 2 +-
.../library/Zend/Console/Response.php | 2 +-
.../library/Zend/Crypt/BlockCipher.php | 7 +-
.../Crypt/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Zend/Crypt/Exception/RuntimeException.php | 2 +-
.../zendframework/library/Zend/Crypt/Hash.php | 2 +-
.../zendframework/library/Zend/Crypt/Hmac.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Derivation/Exception/RuntimeException.php | 2 +-
.../Zend/Crypt/Key/Derivation/Pbkdf2.php | 2 +-
.../Zend/Crypt/Key/Derivation/SaltedS2k.php | 2 +-
.../Zend/Crypt/Key/Derivation/Scrypt.php | 3 +-
.../library/Zend/Crypt/Password/Apache.php | 3 +-
.../library/Zend/Crypt/Password/Bcrypt.php | 2 +-
.../Password/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Password/Exception/RuntimeException.php | 2 +-
.../Zend/Crypt/Password/PasswordInterface.php | 2 +-
.../Zend/Crypt/PublicKey/DiffieHellman.php | 2 +-
.../library/Zend/Crypt/PublicKey/Rsa.php | 3 +-
.../Zend/Crypt/PublicKey/Rsa/AbstractKey.php | 2 +-
.../Rsa/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Rsa/Exception/RuntimeException.php | 2 +-
.../Zend/Crypt/PublicKey/Rsa/PrivateKey.php | 2 +-
.../Zend/Crypt/PublicKey/Rsa/PublicKey.php | 2 +-
.../Zend/Crypt/PublicKey/RsaOptions.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Symmetric/Exception/RuntimeException.php | 2 +-
.../library/Zend/Crypt/Symmetric/Mcrypt.php | 25 +-
.../Symmetric/Padding/PaddingInterface.php | 2 +-
.../Zend/Crypt/Symmetric/Padding/Pkcs7.php | 2 +-
.../Crypt/Symmetric/PaddingPluginManager.php | 2 +-
.../Crypt/Symmetric/SymmetricInterface.php | 2 +-
.../Zend/Crypt/SymmetricPluginManager.php | 2 +-
.../library/Zend/Crypt/Utils.php | 2 +-
.../library/Zend/Db/Adapter/Adapter.php | 2 +-
.../Adapter/AdapterAbstractServiceFactory.php | 2 +-
.../Zend/Db/Adapter/AdapterAwareInterface.php | 2 +-
.../Zend/Db/Adapter/AdapterAwareTrait.php | 3 +-
.../Zend/Db/Adapter/AdapterInterface.php | 2 +-
.../Zend/Db/Adapter/AdapterServiceFactory.php | 2 +-
.../Db/Adapter/Driver/ConnectionInterface.php | 2 +-
.../Db/Adapter/Driver/DriverInterface.php | 2 +-
.../Driver/Feature/AbstractFeature.php | 2 +-
.../Driver/Feature/DriverFeatureInterface.php | 2 +-
.../Db/Adapter/Driver/IbmDb2/Connection.php | 25 +-
.../Zend/Db/Adapter/Driver/IbmDb2/IbmDb2.php | 2 +-
.../Zend/Db/Adapter/Driver/IbmDb2/Result.php | 2 +-
.../Db/Adapter/Driver/IbmDb2/Statement.php | 2 +-
.../Db/Adapter/Driver/Mysqli/Connection.php | 2 +-
.../Zend/Db/Adapter/Driver/Mysqli/Mysqli.php | 2 +-
.../Zend/Db/Adapter/Driver/Mysqli/Result.php | 2 +-
.../Db/Adapter/Driver/Mysqli/Statement.php | 2 +-
.../Db/Adapter/Driver/Oci8/Connection.php | 9 +-
.../Zend/Db/Adapter/Driver/Oci8/Oci8.php | 2 +-
.../Zend/Db/Adapter/Driver/Oci8/Result.php | 2 +-
.../Zend/Db/Adapter/Driver/Oci8/Statement.php | 2 +-
.../Zend/Db/Adapter/Driver/Pdo/Connection.php | 4 +-
.../Driver/Pdo/Feature/OracleRowCounter.php | 2 +-
.../Driver/Pdo/Feature/SqliteRowCounter.php | 2 +-
.../Zend/Db/Adapter/Driver/Pdo/Pdo.php | 2 +-
.../Zend/Db/Adapter/Driver/Pdo/Result.php | 4 +-
.../Zend/Db/Adapter/Driver/Pdo/Statement.php | 17 +-
.../Db/Adapter/Driver/Pgsql/Connection.php | 4 +-
.../Zend/Db/Adapter/Driver/Pgsql/Pgsql.php | 7 +-
.../Zend/Db/Adapter/Driver/Pgsql/Result.php | 2 +-
.../Db/Adapter/Driver/Pgsql/Statement.php | 2 +-
.../Db/Adapter/Driver/ResultInterface.php | 2 +-
.../Db/Adapter/Driver/Sqlsrv/Connection.php | 2 +-
.../Sqlsrv/Exception/ErrorException.php | 2 +-
.../Sqlsrv/Exception/ExceptionInterface.php | 2 +-
.../Zend/Db/Adapter/Driver/Sqlsrv/Result.php | 2 +-
.../Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php | 2 +-
.../Db/Adapter/Driver/Sqlsrv/Statement.php | 2 +-
.../Db/Adapter/Driver/StatementInterface.php | 2 +-
.../Db/Adapter/Exception/ErrorException.php | 2 +-
.../Adapter/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../InvalidConnectionParametersException.php | 2 +-
.../Exception/InvalidQueryException.php | 2 +-
.../Db/Adapter/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../Zend/Db/Adapter/ParameterContainer.php | 2 +-
.../Zend/Db/Adapter/Platform/IbmDb2.php | 2 +-
.../Zend/Db/Adapter/Platform/Mysql.php | 2 +-
.../Zend/Db/Adapter/Platform/Oracle.php | 2 +-
.../Db/Adapter/Platform/PlatformInterface.php | 2 +-
.../Zend/Db/Adapter/Platform/Postgresql.php | 2 +-
.../Zend/Db/Adapter/Platform/Sql92.php | 2 +-
.../Zend/Db/Adapter/Platform/SqlServer.php | 2 +-
.../Zend/Db/Adapter/Platform/Sqlite.php | 26 +-
.../Zend/Db/Adapter/Profiler/Profiler.php | 2 +-
.../Profiler/ProfilerAwareInterface.php | 2 +-
.../Db/Adapter/Profiler/ProfilerInterface.php | 2 +-
.../Zend/Db/Adapter/StatementContainer.php | 2 +-
.../Adapter/StatementContainerInterface.php | 2 +-
.../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 | 2 +-
.../Zend/Db/Metadata/MetadataInterface.php | 2 +-
.../Metadata/Object/AbstractTableObject.php | 2 +-
.../Zend/Db/Metadata/Object/ColumnObject.php | 2 +-
.../Metadata/Object/ConstraintKeyObject.php | 250 +++++++++++++++
.../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 | 2 +-
.../Zend/Db/Metadata/Source/MysqlMetadata.php | 2 +-
.../Db/Metadata/Source/PostgresqlMetadata.php | 2 +-
.../Db/Metadata/Source/SqlServerMetadata.php | 2 +-
.../Db/Metadata/Source/SqliteMetadata.php | 2 +-
.../Zend/Db/ResultSet/AbstractResultSet.php | 2 +-
.../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 | 13 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../RowGateway/Exception/RuntimeException.php | 2 +-
.../Db/RowGateway/Feature/AbstractFeature.php | 2 +-
.../Zend/Db/RowGateway/Feature/FeatureSet.php | 2 +-
.../library/Zend/Db/RowGateway/RowGateway.php | 2 +-
.../Db/RowGateway/RowGatewayInterface.php | 2 +-
.../library/Zend/Db/Sql/AbstractSql.php | 2 +-
.../library/Zend/Db/Sql/Ddl/AlterTable.php | 2 +-
.../Zend/Db/Sql/Ddl/Column/BigInteger.php | 2 +-
.../library/Zend/Db/Sql/Ddl/Column/Blob.php | 2 +-
.../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 | 2 +-
.../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 | 3 +-
.../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 | 2 +-
.../library/Zend/Db/Sql/Ddl/CreateTable.php | 11 +-
.../library/Zend/Db/Sql/Ddl/DropTable.php | 2 +-
.../library/Zend/Db/Sql/Ddl/SqlInterface.php | 2 +-
.../library/Zend/Db/Sql/Delete.php | 2 +-
.../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 | 2 +-
.../library/Zend/Db/Sql/Having.php | 2 +-
.../library/Zend/Db/Sql/Insert.php | 4 +-
.../library/Zend/Db/Sql/Literal.php | 2 +-
.../Zend/Db/Sql/Platform/AbstractPlatform.php | 2 +-
.../Mysql/Ddl/CreateTableDecorator.php | 3 +-
.../Zend/Db/Sql/Platform/Mysql/Mysql.php | 2 +-
.../Db/Sql/Platform/Mysql/SelectDecorator.php | 2 +-
.../Zend/Db/Sql/Platform/Oracle/Oracle.php | 2 +-
.../Sql/Platform/Oracle/SelectDecorator.php | 2 +-
.../library/Zend/Db/Sql/Platform/Platform.php | 2 +-
.../Platform/PlatformDecoratorInterface.php | 2 +-
.../Platform/SqlServer/SelectDecorator.php | 2 +-
.../Db/Sql/Platform/SqlServer/SqlServer.php | 2 +-
.../library/Zend/Db/Sql/Predicate/Between.php | 2 +-
.../Zend/Db/Sql/Predicate/Expression.php | 2 +-
.../library/Zend/Db/Sql/Predicate/In.php | 2 +-
.../Zend/Db/Sql/Predicate/IsNotNull.php | 2 +-
.../library/Zend/Db/Sql/Predicate/IsNull.php | 2 +-
.../library/Zend/Db/Sql/Predicate/Like.php | 2 +-
.../library/Zend/Db/Sql/Predicate/Literal.php | 2 +-
.../library/Zend/Db/Sql/Predicate/NotIn.php | 2 +-
.../library/Zend/Db/Sql/Predicate/NotLike.php | 2 +-
.../Zend/Db/Sql/Predicate/Operator.php | 2 +-
.../Zend/Db/Sql/Predicate/Predicate.php | 20 +-
.../Db/Sql/Predicate/PredicateInterface.php | 2 +-
.../Zend/Db/Sql/Predicate/PredicateSet.php | 2 +-
.../Zend/Db/Sql/PreparableSqlInterface.php | 2 +-
.../library/Zend/Db/Sql/Select.php | 6 +-
.../zendframework/library/Zend/Db/Sql/Sql.php | 2 +-
.../library/Zend/Db/Sql/SqlInterface.php | 2 +-
.../library/Zend/Db/Sql/TableIdentifier.php | 2 +-
.../library/Zend/Db/Sql/Update.php | 2 +-
.../library/Zend/Db/Sql/Where.php | 2 +-
.../Db/TableGateway/AbstractTableGateway.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/RuntimeException.php | 2 +-
.../TableGateway/Feature/AbstractFeature.php | 2 +-
.../Db/TableGateway/Feature/EventFeature.php | 2 +-
.../EventFeature/TableGatewayEvent.php | 2 +-
.../Db/TableGateway/Feature/FeatureSet.php | 7 +-
.../Feature/GlobalAdapterFeature.php | 2 +-
.../Feature/MasterSlaveFeature.php | 2 +-
.../TableGateway/Feature/MetadataFeature.php | 2 +-
.../Feature/RowGatewayFeature.php | 2 +-
.../TableGateway/Feature/SequenceFeature.php | 2 +-
.../Zend/Db/TableGateway/TableGateway.php | 2 +-
.../Db/TableGateway/TableGatewayInterface.php | 2 +-
.../library/Zend/Debug/Debug.php | 2 +-
.../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 | 2 +-
.../Zend/Di/Definition/Builder/PhpClass.php | 2 +-
.../Zend/Di/Definition/BuilderDefinition.php | 2 +-
.../Zend/Di/Definition/ClassDefinition.php | 2 +-
.../Zend/Di/Definition/CompilerDefinition.php | 5 +-
.../Di/Definition/DefinitionInterface.php | 2 +-
.../Di/Definition/IntrospectionStrategy.php | 2 +-
.../Zend/Di/Definition/PartialMarker.php | 2 +-
.../Zend/Di/Definition/RuntimeDefinition.php | 54 ++--
.../library/Zend/Di/DefinitionList.php | 2 +-
.../Zend/Di/DependencyInjectionInterface.php | 2 +-
.../zendframework/library/Zend/Di/Di.php | 40 ++-
.../library/Zend/Di/Display/Console.php | 2 +-
.../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 | 2 +-
.../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/Dom/Css2Xpath.php | 2 +-
.../Dom/Exception/BadMethodCallException.php | 2 +-
.../Zend/Dom/Exception/ExceptionInterface.php | 2 +-
.../Zend/Dom/Exception/RuntimeException.php | 2 +-
.../library/Zend/Dom/NodeList.php | 2 +-
.../zendframework/library/Zend/Dom/Query.php | 2 +-
.../library/Zend/Escaper/Escaper.php | 3 +-
.../Escaper/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Escaper/Exception/RuntimeException.php | 2 +-
.../AbstractListenerAggregate.php | 2 +-
.../library/Zend/EventManager/Event.php | 2 +-
.../Zend/EventManager/EventInterface.php | 2 +-
.../Zend/EventManager/EventManager.php | 2 +-
.../EventManagerAwareInterface.php | 2 +-
.../EventManager/EventManagerAwareTrait.php | 3 +-
.../EventManager/EventManagerInterface.php | 2 +-
.../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 | 2 +-
.../Zend/EventManager/ResponseCollection.php | 2 +-
.../SharedEventAggregateAwareInterface.php | 2 +-
.../Zend/EventManager/SharedEventManager.php | 2 +-
.../SharedEventManagerAwareInterface.php | 2 +-
.../SharedEventManagerInterface.php | 2 +-
.../SharedListenerAggregateInterface.php | 2 +-
.../Zend/EventManager/StaticEventManager.php | 2 +-
.../Feed/Exception/BadMethodCallException.php | 2 +-
.../Feed/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Zend/Feed/Exception/RuntimeException.php | 2 +-
.../Feed/PubSubHubbub/AbstractCallback.php | 2 +-
.../Feed/PubSubHubbub/CallbackInterface.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/RuntimeException.php | 2 +-
.../Zend/Feed/PubSubHubbub/HttpResponse.php | 2 +-
.../Feed/PubSubHubbub/Model/AbstractModel.php | 2 +-
.../Feed/PubSubHubbub/Model/Subscription.php | 2 +-
.../SubscriptionPersistenceInterface.php | 2 +-
.../Zend/Feed/PubSubHubbub/PubSubHubbub.php | 2 +-
.../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 | 2 +-
.../library/Zend/Feed/Reader/Collection.php | 2 +-
.../Reader/Collection/AbstractCollection.php | 2 +-
.../Zend/Feed/Reader/Collection/Author.php | 2 +-
.../Zend/Feed/Reader/Collection/Category.php | 2 +-
.../Feed/Reader/Collection/Collection.php | 2 +-
.../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 | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Reader/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Reader/Exception/RuntimeException.php | 2 +-
.../Feed/Reader/Extension/AbstractEntry.php | 2 +-
.../Feed/Reader/Extension/AbstractFeed.php | 2 +-
.../Zend/Feed/Reader/Extension/Atom/Entry.php | 2 +-
.../Zend/Feed/Reader/Extension/Atom/Feed.php | 2 +-
.../Feed/Reader/Extension/Content/Entry.php | 2 +-
.../Extension/CreativeCommons/Entry.php | 2 +-
.../Reader/Extension/CreativeCommons/Feed.php | 2 +-
.../Reader/Extension/DublinCore/Entry.php | 2 +-
.../Feed/Reader/Extension/DublinCore/Feed.php | 2 +-
.../Feed/Reader/Extension/Podcast/Entry.php | 2 +-
.../Feed/Reader/Extension/Podcast/Feed.php | 2 +-
.../Feed/Reader/Extension/Slash/Entry.php | 2 +-
.../Reader/Extension/Syndication/Feed.php | 2 +-
.../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 | 2 +-
.../library/Zend/Feed/Reader/Feed/Atom.php | 2 +-
.../Zend/Feed/Reader/Feed/Atom/Source.php | 2 +-
.../Zend/Feed/Reader/Feed/FeedInterface.php | 2 +-
.../library/Zend/Feed/Reader/Feed/Rss.php | 2 +-
.../library/Zend/Feed/Reader/FeedSet.php | 2 +-
.../Zend/Feed/Reader/Http/ClientInterface.php | 2 +-
.../Feed/Reader/Http/ResponseInterface.php | 2 +-
.../library/Zend/Feed/Reader/Reader.php | 2 +-
.../zendframework/library/Zend/Feed/Uri.php | 2 +-
.../library/Zend/Feed/Writer/AbstractFeed.php | 2 +-
.../library/Zend/Feed/Writer/Deleted.php | 2 +-
.../library/Zend/Feed/Writer/Entry.php | 3 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Writer/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Writer/Exception/RuntimeException.php | 2 +-
.../Writer/Extension/AbstractRenderer.php | 2 +-
.../Writer/Extension/Atom/Renderer/Feed.php | 2 +-
.../Extension/Content/Renderer/Entry.php | 2 +-
.../Extension/DublinCore/Renderer/Entry.php | 2 +-
.../Extension/DublinCore/Renderer/Feed.php | 2 +-
.../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 | 2 +-
.../Writer/Extension/RendererInterface.php | 2 +-
.../Writer/Extension/Slash/Renderer/Entry.php | 2 +-
.../Extension/Threading/Renderer/Entry.php | 2 +-
.../WellFormedWeb/Renderer/Entry.php | 2 +-
.../Zend/Feed/Writer/ExtensionManager.php | 2 +-
.../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 | 2 +-
.../Writer/Renderer/Entry/Atom/Deleted.php | 2 +-
.../Writer/Renderer/Entry/AtomDeleted.php | 2 +-
.../Zend/Feed/Writer/Renderer/Entry/Rss.php | 2 +-
.../Writer/Renderer/Feed/AbstractAtom.php | 2 +-
.../Zend/Feed/Writer/Renderer/Feed/Atom.php | 2 +-
.../Renderer/Feed/Atom/AbstractAtom.php | 2 +-
.../Feed/Writer/Renderer/Feed/Atom/Source.php | 2 +-
.../Feed/Writer/Renderer/Feed/AtomSource.php | 2 +-
.../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/File/ClassFileLocator.php | 2 +-
.../File/Exception/BadMethodCallException.php | 2 +-
.../File/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Zend/File/Exception/RuntimeException.php | 2 +-
.../library/Zend/File/PhpClassFile.php | 2 +-
.../File/Transfer/Adapter/AbstractAdapter.php | 2 +-
.../Transfer/Adapter/FilterPluginManager.php | 2 +-
.../Zend/File/Transfer/Adapter/Http.php | 2 +-
.../Adapter/ValidatorPluginManager.php | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Transfer/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/PhpEnvironmentException.php | 2 +-
.../Transfer/Exception/RuntimeException.php | 2 +-
.../library/Zend/File/Transfer/Transfer.php | 2 +-
.../library/Zend/Filter/AbstractFilter.php | 2 +-
.../library/Zend/Filter/AbstractUnicode.php | 2 +-
.../library/Zend/Filter/BaseName.php | 2 +-
.../library/Zend/Filter/Boolean.php | 2 +-
.../library/Zend/Filter/Callback.php | 2 +-
.../library/Zend/Filter/Compress.php | 2 +-
.../Compress/AbstractCompressionAlgorithm.php | 2 +-
.../library/Zend/Filter/Compress/Bz2.php | 6 +-
.../CompressionAlgorithmInterface.php | 2 +-
.../library/Zend/Filter/Compress/Gz.php | 8 +-
.../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 | 2 +-
.../library/Zend/Filter/Compress/Zip.php | 2 +-
.../library/Zend/Filter/DateTimeFormatter.php | 2 +-
.../library/Zend/Filter/Decompress.php | 2 +-
.../library/Zend/Filter/Decrypt.php | 2 +-
.../library/Zend/Filter/Digits.php | 2 +-
.../zendframework/library/Zend/Filter/Dir.php | 2 +-
.../library/Zend/Filter/Encrypt.php | 2 +-
.../Zend/Filter/Encrypt/BlockCipher.php | 2 +-
.../Encrypt/EncryptionAlgorithmInterface.php | 2 +-
.../library/Zend/Filter/Encrypt/Openssl.php | 2 +-
.../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 | 2 +-
.../library/Zend/Filter/File/Encrypt.php | 2 +-
.../library/Zend/Filter/File/LowerCase.php | 2 +-
.../library/Zend/Filter/File/Rename.php | 2 +-
.../library/Zend/Filter/File/RenameUpload.php | 2 +-
.../library/Zend/Filter/File/UpperCase.php | 2 +-
.../library/Zend/Filter/FilterChain.php | 2 +-
.../library/Zend/Filter/FilterInterface.php | 2 +-
.../Zend/Filter/FilterPluginManager.php | 2 +-
.../library/Zend/Filter/HtmlEntities.php | 2 +-
.../library/Zend/Filter/Inflector.php | 2 +-
.../zendframework/library/Zend/Filter/Int.php | 2 +-
.../library/Zend/Filter/Null.php | 2 +-
.../library/Zend/Filter/PregReplace.php | 2 +-
.../library/Zend/Filter/RealPath.php | 2 +-
.../library/Zend/Filter/StaticFilter.php | 2 +-
.../library/Zend/Filter/StringToLower.php | 2 +-
.../library/Zend/Filter/StringToUpper.php | 2 +-
.../library/Zend/Filter/StringTrim.php | 2 +-
.../library/Zend/Filter/StripNewlines.php | 2 +-
.../library/Zend/Filter/StripTags.php | 4 +-
.../library/Zend/Filter/UriNormalize.php | 4 +-
.../Zend/Filter/Word/AbstractSeparator.php | 2 +-
.../Zend/Filter/Word/CamelCaseToDash.php | 2 +-
.../Zend/Filter/Word/CamelCaseToSeparator.php | 2 +-
.../Filter/Word/CamelCaseToUnderscore.php | 2 +-
.../Zend/Filter/Word/DashToCamelCase.php | 2 +-
.../Zend/Filter/Word/DashToSeparator.php | 2 +-
.../Zend/Filter/Word/DashToUnderscore.php | 2 +-
.../Zend/Filter/Word/SeparatorToCamelCase.php | 2 +-
.../Zend/Filter/Word/SeparatorToDash.php | 2 +-
.../Zend/Filter/Word/SeparatorToSeparator.php | 2 +-
.../Filter/Word/UnderscoreToCamelCase.php | 2 +-
.../Zend/Filter/Word/UnderscoreToDash.php | 2 +-
.../Filter/Word/UnderscoreToSeparator.php | 2 +-
.../library/Zend/Filter/composer.json | 3 +-
.../AbstractAnnotationsListener.php | 4 +-
.../Annotation/AbstractArrayAnnotation.php | 2 +-
.../AbstractArrayOrStringAnnotation.php | 2 +-
.../Annotation/AbstractStringAnnotation.php | 2 +-
.../Zend/Form/Annotation/AllowEmpty.php | 2 +-
.../Form/Annotation/AnnotationBuilder.php | 2 +-
.../Zend/Form/Annotation/Attributes.php | 2 +-
.../Zend/Form/Annotation/ComposedObject.php | 2 +-
.../Annotation/ElementAnnotationsListener.php | 2 +-
.../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 | 4 +-
.../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/Element.php | 2 +-
.../library/Zend/Form/Element/Button.php | 2 +-
.../library/Zend/Form/Element/Captcha.php | 2 +-
.../library/Zend/Form/Element/Checkbox.php | 2 +-
.../library/Zend/Form/Element/Collection.php | 170 +++++------
.../library/Zend/Form/Element/Color.php | 2 +-
.../library/Zend/Form/Element/Csrf.php | 2 +-
.../library/Zend/Form/Element/Date.php | 3 +-
.../library/Zend/Form/Element/DateSelect.php | 2 +-
.../library/Zend/Form/Element/DateTime.php | 2 +-
.../Zend/Form/Element/DateTimeLocal.php | 2 +-
.../Zend/Form/Element/DateTimeSelect.php | 4 +-
.../library/Zend/Form/Element/Email.php | 2 +-
.../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 | 2 +-
.../library/Zend/Form/Element/MonthSelect.php | 2 +-
.../Zend/Form/Element/MultiCheckbox.php | 2 +-
.../library/Zend/Form/Element/Number.php | 4 +-
.../library/Zend/Form/Element/Password.php | 2 +-
.../library/Zend/Form/Element/Radio.php | 2 +-
.../library/Zend/Form/Element/Range.php | 2 +-
.../library/Zend/Form/Element/Select.php | 2 +-
.../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 | 2 +-
.../Form/ElementAttributeRemovalInterface.php | 2 +-
.../library/Zend/Form/ElementInterface.php | 2 +-
.../Form/ElementPrepareAwareInterface.php | 2 +-
.../Form/Exception/BadMethodCallException.php | 2 +-
.../Zend/Form/Exception/DomainException.php | 2 +-
.../Form/Exception/ExceptionInterface.php | 2 +-
.../Exception/ExtensionNotLoadedException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/InvalidElementException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../library/Zend/Form/Factory.php | 2 +-
.../library/Zend/Form/Fieldset.php | 39 +--
.../library/Zend/Form/FieldsetInterface.php | 2 +-
.../Form/FieldsetPrepareAwareInterface.php | 7 +-
.../zendframework/library/Zend/Form/Form.php | 32 +-
.../Zend/Form/FormAbstractServiceFactory.php | 26 +-
.../library/Zend/Form/FormElementManager.php | 2 +-
.../Zend/Form/FormFactoryAwareInterface.php | 2 +-
.../Zend/Form/FormFactoryAwareTrait.php | 3 +-
.../library/Zend/Form/FormInterface.php | 2 +-
.../Zend/Form/View/Helper/AbstractHelper.php | 3 +-
.../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 | 2 +-
.../library/Zend/Form/View/Helper/Form.php | 2 +-
.../Zend/Form/View/Helper/FormButton.php | 2 +-
.../Zend/Form/View/Helper/FormCaptcha.php | 2 +-
.../Zend/Form/View/Helper/FormCheckbox.php | 2 +-
.../Zend/Form/View/Helper/FormCollection.php | 23 +-
.../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 | 2 +-
.../Zend/Form/View/Helper/FormElement.php | 2 +-
.../Form/View/Helper/FormElementErrors.php | 2 +-
.../Zend/Form/View/Helper/FormEmail.php | 2 +-
.../Zend/Form/View/Helper/FormFile.php | 3 +-
.../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 | 2 +-
.../Zend/Form/View/Helper/FormMonth.php | 2 +-
.../Zend/Form/View/Helper/FormMonthSelect.php | 2 +-
.../Form/View/Helper/FormMultiCheckbox.php | 2 +-
.../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 | 3 +-
.../Zend/Form/View/Helper/FormSearch.php | 2 +-
.../Zend/Form/View/Helper/FormSelect.php | 2 +-
.../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 | 2 +-
.../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 | 2 +-
.../library/Zend/Http/AbstractMessage.php | 2 +-
.../library/Zend/Http/Client.php | 2 +-
.../Http/Client/Adapter/AdapterInterface.php | 2 +-
.../library/Zend/Http/Client/Adapter/Curl.php | 2 +-
.../Adapter/Exception/ExceptionInterface.php | 2 +-
.../Exception/InitializationException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Adapter/Exception/OutOfRangeException.php | 2 +-
.../Adapter/Exception/RuntimeException.php | 2 +-
.../Adapter/Exception/TimeoutException.php | 2 +-
.../Zend/Http/Client/Adapter/Proxy.php | 2 +-
.../Zend/Http/Client/Adapter/Socket.php | 15 +-
.../Http/Client/Adapter/StreamInterface.php | 2 +-
.../library/Zend/Http/Client/Adapter/Test.php | 2 +-
.../library/Zend/Http/Client/Cookies.php | 2 +-
.../Client/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Client/Exception/OutOfRangeException.php | 2 +-
.../Client/Exception/RuntimeException.php | 2 +-
.../library/Zend/Http/ClientStatic.php | 3 +-
.../library/Zend/Http/Cookies.php | 14 +-
.../Http/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Http/Exception/OutOfRangeException.php | 2 +-
.../Zend/Http/Exception/RuntimeException.php | 2 +-
.../Zend/Http/Header/AbstractAccept.php | 4 +-
.../library/Zend/Http/Header/AbstractDate.php | 2 +-
.../Zend/Http/Header/AbstractLocation.php | 2 +-
.../library/Zend/Http/Header/Accept.php | 2 +-
.../FieldValuePart/AbstractFieldValuePart.php | 2 +-
.../FieldValuePart/AcceptFieldValuePart.php | 2 +-
.../FieldValuePart/CharsetFieldValuePart.php | 2 +-
.../FieldValuePart/EncodingFieldValuePart.php | 2 +-
.../FieldValuePart/LanguageFieldValuePart.php | 2 +-
.../Zend/Http/Header/AcceptCharset.php | 2 +-
.../Zend/Http/Header/AcceptEncoding.php | 2 +-
.../Zend/Http/Header/AcceptLanguage.php | 2 +-
.../library/Zend/Http/Header/AcceptRanges.php | 2 +-
.../library/Zend/Http/Header/Age.php | 2 +-
.../library/Zend/Http/Header/Allow.php | 2 +-
.../Zend/Http/Header/AuthenticationInfo.php | 2 +-
.../Zend/Http/Header/Authorization.php | 2 +-
.../library/Zend/Http/Header/CacheControl.php | 2 +-
.../library/Zend/Http/Header/Connection.php | 2 +-
.../Zend/Http/Header/ContentDisposition.php | 2 +-
.../Zend/Http/Header/ContentEncoding.php | 2 +-
.../Zend/Http/Header/ContentLanguage.php | 2 +-
.../Zend/Http/Header/ContentLength.php | 2 +-
.../Zend/Http/Header/ContentLocation.php | 2 +-
.../library/Zend/Http/Header/ContentMD5.php | 2 +-
.../library/Zend/Http/Header/ContentRange.php | 2 +-
.../Http/Header/ContentTransferEncoding.php | 2 +-
.../library/Zend/Http/Header/ContentType.php | 2 +-
.../library/Zend/Http/Header/Cookie.php | 2 +-
.../library/Zend/Http/Header/Date.php | 2 +-
.../library/Zend/Http/Header/Etag.php | 2 +-
.../Header/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Header/Exception/RuntimeException.php | 2 +-
.../library/Zend/Http/Header/Expect.php | 2 +-
.../library/Zend/Http/Header/Expires.php | 2 +-
.../library/Zend/Http/Header/From.php | 2 +-
.../Zend/Http/Header/GenericHeader.php | 2 +-
.../Zend/Http/Header/GenericMultiHeader.php | 2 +-
.../Zend/Http/Header/HeaderInterface.php | 2 +-
.../library/Zend/Http/Header/Host.php | 2 +-
.../library/Zend/Http/Header/IfMatch.php | 2 +-
.../Zend/Http/Header/IfModifiedSince.php | 2 +-
.../library/Zend/Http/Header/IfNoneMatch.php | 2 +-
.../library/Zend/Http/Header/IfRange.php | 2 +-
.../Zend/Http/Header/IfUnmodifiedSince.php | 2 +-
.../library/Zend/Http/Header/KeepAlive.php | 2 +-
.../library/Zend/Http/Header/LastModified.php | 2 +-
.../library/Zend/Http/Header/Location.php | 2 +-
.../library/Zend/Http/Header/MaxForwards.php | 2 +-
.../Http/Header/MultipleHeaderInterface.php | 2 +-
.../library/Zend/Http/Header/Pragma.php | 2 +-
.../Zend/Http/Header/ProxyAuthenticate.php | 2 +-
.../Zend/Http/Header/ProxyAuthorization.php | 2 +-
.../library/Zend/Http/Header/Range.php | 2 +-
.../library/Zend/Http/Header/Referer.php | 2 +-
.../library/Zend/Http/Header/Refresh.php | 2 +-
.../library/Zend/Http/Header/RetryAfter.php | 2 +-
.../library/Zend/Http/Header/Server.php | 2 +-
.../library/Zend/Http/Header/SetCookie.php | 25 +-
.../library/Zend/Http/Header/TE.php | 2 +-
.../library/Zend/Http/Header/Trailer.php | 2 +-
.../Zend/Http/Header/TransferEncoding.php | 2 +-
.../library/Zend/Http/Header/Upgrade.php | 2 +-
.../library/Zend/Http/Header/UserAgent.php | 2 +-
.../library/Zend/Http/Header/Vary.php | 2 +-
.../library/Zend/Http/Header/Via.php | 2 +-
.../Zend/Http/Header/WWWAuthenticate.php | 2 +-
.../library/Zend/Http/Header/Warning.php | 2 +-
.../library/Zend/Http/HeaderLoader.php | 2 +-
.../library/Zend/Http/Headers.php | 9 +-
.../Http/PhpEnvironment/RemoteAddress.php | 10 +-
.../Zend/Http/PhpEnvironment/Request.php | 11 +-
.../Zend/Http/PhpEnvironment/Response.php | 2 +-
.../library/Zend/Http/Request.php | 22 +-
.../library/Zend/Http/Response.php | 2 +-
.../library/Zend/Http/Response/Stream.php | 2 +-
.../I18n/Exception/ExceptionInterface.php | 2 +-
.../Exception/ExtensionNotLoadedException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../I18n/Exception/OutOfBoundsException.php | 2 +-
.../Zend/I18n/Exception/ParseException.php | 2 +-
.../Zend/I18n/Exception/RangeException.php | 2 +-
.../Zend/I18n/Exception/RuntimeException.php | 2 +-
.../Zend/I18n/Filter/AbstractLocale.php | 2 +-
.../library/Zend/I18n/Filter/Alnum.php | 2 +-
.../library/Zend/I18n/Filter/Alpha.php | 2 +-
.../library/Zend/I18n/Filter/NumberFormat.php | 2 +-
.../Translator/Loader/FileLoaderInterface.php | 2 +-
.../Zend/I18n/Translator/Loader/Gettext.php | 2 +-
.../Zend/I18n/Translator/Loader/Ini.php | 2 +-
.../Zend/I18n/Translator/Loader/PhpArray.php | 2 +-
.../Loader/RemoteLoaderInterface.php | 2 +-
.../I18n/Translator/LoaderPluginManager.php | 2 +-
.../Zend/I18n/Translator/Plural/Parser.php | 2 +-
.../Zend/I18n/Translator/Plural/Rule.php | 2 +-
.../Zend/I18n/Translator/Plural/Symbol.php | 2 +-
.../Zend/I18n/Translator/TextDomain.php | 2 +-
.../Zend/I18n/Translator/Translator.php | 2 +-
.../Translator/TranslatorAwareInterface.php | 2 +-
.../I18n/Translator/TranslatorAwareTrait.php | 3 +-
.../Translator/TranslatorServiceFactory.php | 2 +-
.../library/Zend/I18n/Validator/Alnum.php | 2 +-
.../library/Zend/I18n/Validator/Alpha.php | 2 +-
.../library/Zend/I18n/Validator/DateTime.php | 2 +-
.../library/Zend/I18n/Validator/Float.php | 2 +-
.../library/Zend/I18n/Validator/Int.php | 2 +-
.../Zend/I18n/Validator/PhoneNumber.php | 4 +-
.../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 | 2 +-
.../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 | 4 +-
.../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 | 2 +-
.../Zend/I18n/View/Helper/CurrencyFormat.php | 2 +-
.../Zend/I18n/View/Helper/DateFormat.php | 2 +-
.../Zend/I18n/View/Helper/NumberFormat.php | 2 +-
.../library/Zend/I18n/View/Helper/Plural.php | 2 +-
.../Zend/I18n/View/Helper/Translate.php | 2 +-
.../Zend/I18n/View/Helper/TranslatePlural.php | 2 +-
.../library/Zend/I18n/View/HelperConfig.php | 2 +-
.../library/Zend/InputFilter/ArrayInput.php | 2 +-
.../Zend/InputFilter/BaseInputFilter.php | 53 +++-
.../InputFilter/CollectionInputFilter.php | 27 +-
.../InputFilter/EmptyContextInterface.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/RuntimeException.php | 2 +-
.../library/Zend/InputFilter/Factory.php | 5 +-
.../library/Zend/InputFilter/FileInput.php | 2 +-
.../library/Zend/InputFilter/Input.php | 2 +-
.../library/Zend/InputFilter/InputFilter.php | 2 +-
.../InputFilter/InputFilterAwareInterface.php | 2 +-
.../InputFilter/InputFilterAwareTrait.php | 3 +-
.../Zend/InputFilter/InputFilterInterface.php | 2 +-
.../InputFilter/InputFilterPluginManager.php | 3 +-
.../InputFilterProviderInterface.php | 2 +-
.../Zend/InputFilter/InputInterface.php | 2 +-
.../InputFilter/InputProviderInterface.php | 2 +-
.../InputFilter/ReplaceableInputInterface.php | 19 ++
.../UnknownInputsCapableInterface.php | 2 +-
.../library/Zend/Json/Decoder.php | 4 +-
.../library/Zend/Json/Encoder.php | 4 +-
.../Json/Exception/BadMethodCallException.php | 2 +-
.../Json/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Json/Exception/RecursionException.php | 2 +-
.../Zend/Json/Exception/RuntimeException.php | 2 +-
.../zendframework/library/Zend/Json/Expr.php | 2 +-
.../zendframework/library/Zend/Json/Json.php | 11 +-
.../library/Zend/Json/Server/Cache.php | 2 +-
.../library/Zend/Json/Server/Client.php | 4 +-
.../library/Zend/Json/Server/Error.php | 2 +-
.../Json/Server/Exception/ErrorException.php | 2 +-
.../Server/Exception/ExceptionInterface.php | 2 +-
.../Json/Server/Exception/HttpException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Server/Exception/RuntimeException.php | 2 +-
.../library/Zend/Json/Server/Request.php | 2 +-
.../library/Zend/Json/Server/Request/Http.php | 2 +-
.../library/Zend/Json/Server/Response.php | 2 +-
.../Zend/Json/Server/Response/Http.php | 2 +-
.../library/Zend/Json/Server/Server.php | 31 +-
.../library/Zend/Json/Server/Smd.php | 5 +-
.../library/Zend/Json/Server/Smd/Service.php | 7 +-
.../library/Zend/Ldap/Attribute.php | 4 +-
.../library/Zend/Ldap/Collection.php | 2 +-
.../Zend/Ldap/Collection/DefaultIterator.php | 2 +-
.../library/Zend/Ldap/Converter/Converter.php | 2 +-
.../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 | 4 +-
.../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 | 2 +-
.../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 | 2 +-
.../AttributeType/AttributeTypeInterface.php | 2 +-
.../Node/Schema/AttributeType/OpenLdap.php | 2 +-
.../Schema/ObjectClass/ActiveDirectory.php | 2 +-
.../ObjectClass/ObjectClassInterface.php | 2 +-
.../Ldap/Node/Schema/ObjectClass/OpenLdap.php | 2 +-
.../Zend/Ldap/Node/Schema/OpenLdap.php | 2 +-
.../library/Zend/Loader/AutoloaderFactory.php | 2 +-
.../Zend/Loader/ClassMapAutoloader.php | 9 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Zend/Loader/Exception/DomainException.php | 2 +-
.../Loader/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Loader/Exception/InvalidPathException.php | 2 +-
.../MissingResourceNamespaceException.php | 2 +-
.../Exception/PluginLoaderException.php | 2 +-
.../Loader/Exception/RuntimeException.php | 2 +-
.../Loader/Exception/SecurityException.php | 2 +-
.../library/Zend/Loader/ModuleAutoloader.php | 12 +-
.../library/Zend/Loader/PluginClassLoader.php | 2 +-
.../Zend/Loader/PluginClassLocator.php | 2 +-
.../library/Zend/Loader/ShortNameLocator.php | 2 +-
.../library/Zend/Loader/SplAutoloader.php | 2 +-
.../Zend/Loader/StandardAutoloader.php | 3 +-
.../Zend/Log/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Zend/Log/Exception/RuntimeException.php | 2 +-
.../Zend/Log/Filter/FilterInterface.php | 2 +-
.../library/Zend/Log/Filter/Mock.php | 2 +-
.../library/Zend/Log/Filter/Priority.php | 2 +-
.../library/Zend/Log/Filter/Regex.php | 2 +-
.../Zend/Log/Filter/SuppressFilter.php | 2 +-
.../library/Zend/Log/Filter/Validator.php | 4 +-
.../library/Zend/Log/Formatter/Base.php | 18 +-
.../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 | 2 +-
.../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 | 54 ++--
.../Zend/Log/LoggerAbstractServiceFactory.php | 14 +-
.../library/Zend/Log/LoggerAwareInterface.php | 3 +-
.../library/Zend/Log/LoggerAwareTrait.php | 3 +-
.../library/Zend/Log/LoggerInterface.php | 2 +-
.../library/Zend/Log/LoggerServiceFactory.php | 2 +-
.../library/Zend/Log/Processor/Backtrace.php | 4 +-
.../Zend/Log/Processor/ProcessorInterface.php | 2 +-
.../library/Zend/Log/Processor/RequestId.php | 2 +-
.../Zend/Log/ProcessorPluginManager.php | 2 +-
.../Zend/Log/Writer/AbstractWriter.php | 2 +-
.../library/Zend/Log/Writer/ChromePhp.php | 2 +-
.../Log/Writer/ChromePhp/ChromePhpBridge.php | 2 +-
.../Writer/ChromePhp/ChromePhpInterface.php | 2 +-
.../library/Zend/Log/Writer/Db.php | 2 +-
.../Zend/Log/Writer/FilterPluginManager.php | 2 +-
.../Zend/Log/Writer/FingersCrossed.php | 4 +-
.../library/Zend/Log/Writer/FirePhp.php | 2 +-
.../Zend/Log/Writer/FirePhp/FirePhpBridge.php | 2 +-
.../Log/Writer/FirePhp/FirePhpInterface.php | 2 +-
.../Log/Writer/FormatterPluginManager.php | 2 +-
.../library/Zend/Log/Writer/Mail.php | 2 +-
.../library/Zend/Log/Writer/Mock.php | 2 +-
.../library/Zend/Log/Writer/MongoDB.php | 2 +-
.../library/Zend/Log/Writer/Null.php | 2 +-
.../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/Mail/Address.php | 2 +-
.../Zend/Mail/Address/AddressInterface.php | 2 +-
.../library/Zend/Mail/AddressList.php | 2 +-
.../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 | 2 +-
.../library/Zend/Mail/Header/Bcc.php | 2 +-
.../library/Zend/Mail/Header/Cc.php | 2 +-
.../Mail/Header/ContentTransferEncoding.php | 6 +-
.../library/Zend/Mail/Header/ContentType.php | 2 +-
.../library/Zend/Mail/Header/Date.php | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Header/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Header/Exception/RuntimeException.php | 2 +-
.../library/Zend/Mail/Header/From.php | 2 +-
.../Zend/Mail/Header/GenericHeader.php | 2 +-
.../Zend/Mail/Header/GenericMultiHeader.php | 2 +-
.../Zend/Mail/Header/HeaderInterface.php | 2 +-
.../library/Zend/Mail/Header/HeaderLoader.php | 2 +-
.../library/Zend/Mail/Header/HeaderWrap.php | 2 +-
.../library/Zend/Mail/Header/MessageId.php | 2 +-
.../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 | 2 +-
.../library/Zend/Mail/Message.php | 2 +-
.../Zend/Mail/Protocol/AbstractProtocol.php | 2 +-
.../Protocol/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Protocol/Exception/RuntimeException.php | 2 +-
.../library/Zend/Mail/Protocol/Imap.php | 2 +-
.../library/Zend/Mail/Protocol/Pop3.php | 2 +-
.../library/Zend/Mail/Protocol/Smtp.php | 7 +-
.../Zend/Mail/Protocol/Smtp/Auth/Crammd5.php | 2 +-
.../Zend/Mail/Protocol/Smtp/Auth/Login.php | 2 +-
.../Zend/Mail/Protocol/Smtp/Auth/Plain.php | 2 +-
.../Zend/Mail/Protocol/SmtpPluginManager.php | 2 +-
.../library/Zend/Mail/Storage.php | 2 +-
.../Zend/Mail/Storage/AbstractStorage.php | 2 +-
.../Storage/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/OutOfBoundsException.php | 2 +-
.../Storage/Exception/RuntimeException.php | 2 +-
.../library/Zend/Mail/Storage/Folder.php | 2 +-
.../Mail/Storage/Folder/FolderInterface.php | 2 +-
.../Zend/Mail/Storage/Folder/Maildir.php | 2 +-
.../library/Zend/Mail/Storage/Folder/Mbox.php | 2 +-
.../library/Zend/Mail/Storage/Imap.php | 2 +-
.../library/Zend/Mail/Storage/Maildir.php | 2 +-
.../library/Zend/Mail/Storage/Mbox.php | 2 +-
.../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 | 2 +-
.../Part/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Part/Exception/RuntimeException.php | 2 +-
.../library/Zend/Mail/Storage/Part/File.php | 2 +-
.../Zend/Mail/Storage/Part/PartInterface.php | 2 +-
.../library/Zend/Mail/Storage/Pop3.php | 2 +-
.../Zend/Mail/Storage/Writable/Maildir.php | 2 +-
.../Storage/Writable/WritableInterface.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Transport/Exception/RuntimeException.php | 2 +-
.../library/Zend/Mail/Transport/File.php | 2 +-
.../Zend/Mail/Transport/FileOptions.php | 2 +-
.../library/Zend/Mail/Transport/Sendmail.php | 2 +-
.../library/Zend/Mail/Transport/Smtp.php | 2 +-
.../Zend/Mail/Transport/SmtpOptions.php | 2 +-
.../Mail/Transport/TransportInterface.php | 2 +-
.../BigInteger/Adapter/AdapterInterface.php | 2 +-
.../Zend/Math/BigInteger/Adapter/Bcmath.php | 2 +-
.../Zend/Math/BigInteger/Adapter/Gmp.php | 2 +-
.../Math/BigInteger/AdapterPluginManager.php | 2 +-
.../Zend/Math/BigInteger/BigInteger.php | 2 +-
.../Exception/DivisionByZeroException.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../BigInteger/Exception/RuntimeException.php | 2 +-
.../Zend/Math/Exception/DomainException.php | 2 +-
.../Math/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Zend/Math/Exception/RuntimeException.php | 2 +-
.../zendframework/library/Zend/Math/Rand.php | 22 +-
.../library/Zend/Math/Source/HashTiming.php | 2 +-
.../library/Zend/Math/composer.json | 5 +-
.../Memory/Container/AbstractContainer.php | 2 +-
.../Memory/Container/AccessController.php | 2 +-
.../Memory/Container/ContainerInterface.php | 2 +-
.../library/Zend/Memory/Container/Locked.php | 2 +-
.../library/Zend/Memory/Container/Movable.php | 2 +-
.../Memory/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Memory/Exception/RuntimeException.php | 2 +-
.../library/Zend/Memory/MemoryManager.php | 2 +-
.../library/Zend/Memory/Value.php | 2 +-
.../library/Zend/Mime/Decode.php | 2 +-
.../Mime/Exception/ExceptionInterface.php | 2 +-
.../Zend/Mime/Exception/RuntimeException.php | 2 +-
.../library/Zend/Mime/Message.php | 2 +-
.../zendframework/library/Zend/Mime/Mime.php | 8 +-
.../zendframework/library/Zend/Mime/Part.php | 16 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../MissingDependencyModuleException.php | 2 +-
.../Exception/RuntimeException.php | 2 +-
.../Feature/AutoloaderProviderInterface.php | 2 +-
.../Feature/BootstrapListenerInterface.php | 4 +-
.../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/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 | 2 +-
.../ModuleManager/Listener/ConfigListener.php | 2 +-
.../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 | 2 +-
.../Listener/LocatorRegistrationListener.php | 2 +-
.../ModuleDependencyCheckerListener.php | 2 +-
.../Listener/ModuleLoaderListener.php | 2 +-
.../Listener/ModuleResolverListener.php | 2 +-
.../Listener/OnBootstrapListener.php | 2 +-
.../Listener/ServiceListener.php | 2 +-
.../Listener/ServiceListenerInterface.php | 2 +-
.../Zend/ModuleManager/ModuleEvent.php | 2 +-
.../Zend/ModuleManager/ModuleManager.php | 2 +-
.../ModuleManager/ModuleManagerInterface.php | 2 +-
.../library/Zend/Mvc/Application.php | 2 +-
.../library/Zend/Mvc/ApplicationInterface.php | 2 +-
.../Controller/AbstractActionController.php | 2 +-
.../Mvc/Controller/AbstractController.php | 2 +-
.../Controller/AbstractRestfulController.php | 2 +-
.../Zend/Mvc/Controller/ControllerManager.php | 2 +-
.../Mvc/Controller/Plugin/AbstractPlugin.php | 2 +-
.../Plugin/AcceptableViewModelSelector.php | 3 +-
.../Controller/Plugin/FilePostRedirectGet.php | 28 +-
.../Mvc/Controller/Plugin/FlashMessenger.php | 85 +++++-
.../Zend/Mvc/Controller/Plugin/Forward.php | 14 +-
.../Zend/Mvc/Controller/Plugin/Identity.php | 2 +-
.../Zend/Mvc/Controller/Plugin/Layout.php | 2 +-
.../Zend/Mvc/Controller/Plugin/Params.php | 3 +-
.../Mvc/Controller/Plugin/PluginInterface.php | 2 +-
.../Mvc/Controller/Plugin/PostRedirectGet.php | 4 +-
.../Zend/Mvc/Controller/Plugin/Redirect.php | 2 +-
.../Plugin/Service/ForwardFactory.php | 2 +-
.../Plugin/Service/IdentityFactory.php | 2 +-
.../Zend/Mvc/Controller/Plugin/Url.php | 2 +-
.../Zend/Mvc/Controller/PluginManager.php | 2 +-
.../library/Zend/Mvc/DispatchListener.php | 2 +-
.../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/Translator.php | 2 +-
.../Mvc/InjectApplicationEventInterface.php | 2 +-
.../library/Zend/Mvc/ModuleRouteListener.php | 2 +-
.../library/Zend/Mvc/MvcEvent.php | 2 +-
.../ResponseSender/AbstractResponseSender.php | 4 +-
.../ResponseSender/ConsoleResponseSender.php | 2 +-
.../Mvc/ResponseSender/HttpResponseSender.php | 3 +-
.../PhpEnvironmentResponseSender.php | 3 +-
.../ResponseSenderInterface.php | 3 +-
.../Mvc/ResponseSender/SendResponseEvent.php | 2 +-
.../SimpleStreamResponseSender.php | 3 +-
.../library/Zend/Mvc/RouteListener.php | 3 +-
.../Zend/Mvc/Router/Console/Catchall.php | 1 -
.../Mvc/Router/Console/RouteInterface.php | 4 +-
.../Zend/Mvc/Router/Console/RouteMatch.php | 4 +-
.../Mvc/Router/Console/SimpleRouteStack.php | 2 +-
.../Router/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Mvc/Router/Exception/RuntimeException.php | 2 +-
.../library/Zend/Mvc/Router/Http/Chain.php | 2 +-
.../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 | 2 +-
.../library/Zend/Mvc/Router/Http/Query.php | 3 +-
.../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 | 11 +-
.../Http/TranslatorAwareTreeRouteStack.php | 4 +-
.../Zend/Mvc/Router/Http/TreeRouteStack.php | 6 +-
.../library/Zend/Mvc/Router/Http/Wildcard.php | 2 +-
.../library/Zend/Mvc/Router/PriorityList.php | 2 +-
.../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 | 4 +-
.../library/Zend/Mvc/SendResponseListener.php | 3 +-
.../Service/AbstractPluginManagerFactory.php | 2 +-
.../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 | 3 +-
.../ControllerPluginManagerFactory.php | 17 +-
.../DiAbstractServiceFactoryFactory.php | 2 +-
.../library/Zend/Mvc/Service/DiFactory.php | 2 +-
.../Service/DiServiceInitializerFactory.php | 2 +-
.../DiStrictAbstractServiceFactory.php | 2 +-
.../DiStrictAbstractServiceFactoryFactory.php | 3 +-
.../Zend/Mvc/Service/EventManagerFactory.php | 2 +-
.../Zend/Mvc/Service/FilterManagerFactory.php | 17 +-
.../Mvc/Service/FormElementManagerFactory.php | 2 +-
.../Mvc/Service/HttpViewManagerFactory.php | 2 +-
.../Mvc/Service/HydratorManagerFactory.php | 4 +-
.../Mvc/Service/InputFilterManagerFactory.php | 4 +-
.../Zend/Mvc/Service/ModuleManagerFactory.php | 2 +-
.../Service/PaginatorPluginManagerFactory.php | 16 +-
.../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 | 2 +-
.../Zend/Mvc/Service/ServiceManagerConfig.php | 2 +-
.../Mvc/Service/TranslatorServiceFactory.php | 2 +-
.../Mvc/Service/ValidatorManagerFactory.php | 17 +-
.../Mvc/Service/ViewFeedRendererFactory.php | 2 +-
.../Mvc/Service/ViewFeedStrategyFactory.php | 2 +-
.../Mvc/Service/ViewHelperManagerFactory.php | 2 +-
.../Mvc/Service/ViewJsonRendererFactory.php | 2 +-
.../Mvc/Service/ViewJsonStrategyFactory.php | 2 +-
.../Zend/Mvc/Service/ViewManagerFactory.php | 2 +-
.../Zend/Mvc/Service/ViewResolverFactory.php | 2 +-
.../ViewTemplateMapResolverFactory.php | 2 +-
.../Service/ViewTemplatePathStackFactory.php | 2 +-
.../View/Console/CreateViewModelListener.php | 2 +-
.../View/Console/DefaultRenderingStrategy.php | 3 +-
.../Mvc/View/Console/ExceptionStrategy.php | 2 +-
.../InjectNamedConsoleParamsListener.php | 2 +-
.../View/Console/InjectViewModelListener.php | 3 +-
.../View/Console/RouteNotFoundStrategy.php | 3 +-
.../Zend/Mvc/View/Console/ViewManager.php | 2 +-
.../Mvc/View/Http/CreateViewModelListener.php | 6 +-
.../View/Http/DefaultRenderingStrategy.php | 2 +-
.../Zend/Mvc/View/Http/ExceptionStrategy.php | 2 +-
.../Http/InjectRoutematchParamsListener.php | 4 +-
.../Mvc/View/Http/InjectTemplateListener.php | 2 +-
.../Mvc/View/Http/InjectViewModelListener.php | 2 +-
.../Mvc/View/Http/RouteNotFoundStrategy.php | 2 +-
.../Zend/Mvc/View/Http/ViewManager.php | 3 +-
.../Zend/Mvc/View/SendResponseListener.php | 2 +-
.../Zend/Navigation/AbstractContainer.php | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Navigation/Exception/DomainException.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/OutOfBoundsException.php | 2 +-
.../library/Zend/Navigation/Navigation.php | 2 +-
.../Zend/Navigation/Page/AbstractPage.php | 2 +-
.../library/Zend/Navigation/Page/Mvc.php | 2 +-
.../library/Zend/Navigation/Page/Uri.php | 2 +-
.../Service/AbstractNavigationFactory.php | 2 +-
.../Service/ConstructedNavigationFactory.php | 2 +-
.../Service/DefaultNavigationFactory.php | 2 +-
.../Zend/Navigation/View/HelperConfig.php | 2 +-
.../Paginator/Adapter/AdapterInterface.php | 2 +-
.../Zend/Paginator/Adapter/ArrayAdapter.php | 2 +-
.../Zend/Paginator/Adapter/DbSelect.php | 2 +-
.../Zend/Paginator/Adapter/DbTableGateway.php | 3 +-
.../Adapter/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Adapter/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../Zend/Paginator/Adapter/Iterator.php | 2 +-
.../library/Zend/Paginator/Adapter/Null.php | 2 +-
.../Adapter/Service/DbSelectFactory.php | 2 +-
.../Paginator/AdapterAggregateInterface.php | 2 +-
.../Zend/Paginator/AdapterPluginManager.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Paginator/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../library/Zend/Paginator/Factory.php | 2 +-
.../library/Zend/Paginator/Paginator.php | 2 +-
.../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 | 2 +-
.../library/Zend/Permissions/Acl/Acl.php | 2 +-
.../Zend/Permissions/Acl/AclInterface.php | 2 +-
.../Acl/Assertion/AssertionInterface.php | 2 +-
.../Acl/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Acl/Exception/RuntimeException.php | 2 +-
.../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 +-
.../Permissions/Rbac/AbstractIterator.php | 4 +-
.../Zend/Permissions/Rbac/AbstractRole.php | 2 +-
.../Permissions/Rbac/AssertionInterface.php | 2 +-
.../Rbac/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../library/Zend/Permissions/Rbac/Rbac.php | 4 +-
.../library/Zend/Permissions/Rbac/Role.php | 2 +-
.../Zend/Permissions/Rbac/RoleInterface.php | 2 +-
.../ProgressBar/Adapter/AbstractAdapter.php | 2 +-
.../Zend/ProgressBar/Adapter/Console.php | 3 +-
.../Adapter/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Adapter/Exception/RuntimeException.php | 2 +-
.../Zend/ProgressBar/Adapter/JsPull.php | 2 +-
.../Zend/ProgressBar/Adapter/JsPush.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/OutOfRangeException.php | 2 +-
.../Exception/PhpEnvironmentException.php | 2 +-
.../Exception/RuntimeException.php | 2 +-
.../library/Zend/ProgressBar/ProgressBar.php | 3 +-
.../Upload/AbstractUploadHandler.php | 2 +-
.../Zend/ProgressBar/Upload/ApcProgress.php | 4 +-
.../ProgressBar/Upload/SessionProgress.php | 4 +-
.../Upload/UploadHandlerInterface.php | 4 +-
.../ProgressBar/Upload/UploadProgress.php | 4 +-
.../Serializer/Adapter/AbstractAdapter.php | 2 +-
.../Serializer/Adapter/AdapterInterface.php | 2 +-
.../Serializer/Adapter/AdapterOptions.php | 2 +-
.../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 | 2 +-
.../Zend/Serializer/Adapter/PhpSerialize.php | 2 +-
.../Zend/Serializer/Adapter/PythonPickle.php | 2 +-
.../Adapter/PythonPickleOptions.php | 2 +-
.../library/Zend/Serializer/Adapter/Wddx.php | 2 +-
.../Zend/Serializer/Adapter/WddxOptions.php | 2 +-
.../Zend/Serializer/AdapterPluginManager.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/ExtensionNotLoadedException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Serializer/Exception/RuntimeException.php | 2 +-
.../library/Zend/Serializer/Serializer.php | 2 +-
.../library/Zend/Server/AbstractServer.php | 2 +-
.../library/Zend/Server/Cache.php | 2 +-
.../library/Zend/Server/Client.php | 2 +-
.../library/Zend/Server/Definition.php | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Server/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Server/Exception/RuntimeException.php | 2 +-
.../library/Zend/Server/Method/Callback.php | 2 +-
.../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 | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Reflection/Exception/RuntimeException.php | 2 +-
.../library/Zend/Server/Reflection/Node.php | 2 +-
.../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 +-
.../AbstractFactoryInterface.php | 2 +-
.../ServiceManager/AbstractPluginManager.php | 4 +-
.../library/Zend/ServiceManager/Config.php | 2 +-
.../Zend/ServiceManager/ConfigInterface.php | 2 +-
.../DelegatorFactoryInterface.php | 2 +-
.../Di/DiAbstractServiceFactory.php | 4 +-
.../Di/DiInstanceManagerProxy.php | 2 +-
.../ServiceManager/Di/DiServiceFactory.php | 2 +-
.../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 | 2 +-
.../ServiceLocatorAwareInterface.php | 2 +-
.../ServiceLocatorAwareTrait.php | 3 +-
.../ServiceLocatorInterface.php | 2 +-
.../Zend/ServiceManager/ServiceManager.php | 10 +-
.../ServiceManagerAwareInterface.php | 2 +-
.../Zend/Session/AbstractContainer.php | 15 +-
.../library/Zend/Session/AbstractManager.php | 2 +-
.../Zend/Session/Config/ConfigInterface.php | 2 +-
.../Zend/Session/Config/SessionConfig.php | 2 +-
.../Zend/Session/Config/StandardConfig.php | 3 +-
.../library/Zend/Session/Container.php | 2 +-
.../Container/PhpReferenceCompatibility.php | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Session/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Session/Exception/RuntimeException.php | 2 +-
.../library/Zend/Session/ManagerInterface.php | 2 +-
.../Zend/Session/SaveHandler/Cache.php | 2 +-
.../Session/SaveHandler/DbTableGateway.php | 2 +-
.../SaveHandler/DbTableGatewayOptions.php | 2 +-
.../Zend/Session/SaveHandler/MongoDB.php | 2 +-
.../Session/SaveHandler/MongoDBOptions.php | 2 +-
.../SaveHandler/SaveHandlerInterface.php | 2 +-
.../ContainerAbstractServiceFactory.php | 2 +-
.../Session/Service/SessionConfigFactory.php | 2 +-
.../Session/Service/SessionManagerFactory.php | 2 +-
.../Zend/Session/Service/StorageFactory.php | 2 +-
.../library/Zend/Session/SessionManager.php | 2 +-
.../Storage/AbstractSessionArrayStorage.php | 2 +-
.../Zend/Session/Storage/ArrayStorage.php | 2 +-
.../library/Zend/Session/Storage/Factory.php | 2 +-
.../Session/Storage/SessionArrayStorage.php | 2 +-
.../PhpReferenceCompatibility.php | 2 +-
.../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/Soap/AutoDiscover.php | 4 +-
.../DiscoveryStrategyInterface.php | 2 +-
.../DiscoveryStrategy/ReflectionDiscovery.php | 2 +-
.../library/Zend/Soap/Client.php | 2 +-
.../library/Zend/Soap/Client/Common.php | 2 +-
.../library/Zend/Soap/Client/DotNet.php | 2 +-
.../library/Zend/Soap/Client/Local.php | 2 +-
.../Soap/Exception/BadMethodCallException.php | 2 +-
.../Soap/Exception/ExceptionInterface.php | 2 +-
.../Exception/ExtensionNotLoadedException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Zend/Soap/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../library/Zend/Soap/Server.php | 2 +-
.../Soap/Server/DocumentLiteralWrapper.php | 2 +-
.../zendframework/library/Zend/Soap/Wsdl.php | 2 +-
.../AbstractComplexTypeStrategy.php | 2 +-
.../Soap/Wsdl/ComplexTypeStrategy/AnyType.php | 2 +-
.../ArrayOfTypeComplex.php | 2 +-
.../ArrayOfTypeSequence.php | 2 +-
.../ComplexTypeStrategyInterface.php | 2 +-
.../Wsdl/ComplexTypeStrategy/Composite.php | 2 +-
.../DefaultComplexType.php | 2 +-
.../library/Zend/Stdlib/AbstractOptions.php | 2 +-
.../library/Zend/Stdlib/ArrayObject.php | 2 +-
.../ArrayObject/PhpLegacyCompatibility.php | 2 +-
.../ArrayObject/PhpReferenceCompatibility.php | 2 +-
.../Stdlib/ArraySerializableInterface.php | 2 +-
.../library/Zend/Stdlib/ArrayStack.php | 2 +-
.../library/Zend/Stdlib/ArrayUtils.php | 16 +-
.../library/Zend/Stdlib/CallbackHandler.php | 3 +-
.../library/Zend/Stdlib/DateTime.php | 2 +-
.../Zend/Stdlib/DispatchableInterface.php | 2 +-
.../library/Zend/Stdlib/ErrorHandler.php | 2 +-
.../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 +-
.../library/Zend/Stdlib/Glob.php | 4 +-
.../Zend/Stdlib/Hydrator/AbstractHydrator.php | 3 +-
.../Hydrator/Aggregate/AggregateHydrator.php | 4 +-
.../Hydrator/Aggregate/ExtractEvent.php | 2 +-
.../Hydrator/Aggregate/HydrateEvent.php | 2 +-
.../Hydrator/Aggregate/HydratorListener.php | 2 +-
.../Stdlib/Hydrator/ArraySerializable.php | 2 +-
.../Zend/Stdlib/Hydrator/ClassMethods.php | 3 +-
.../Hydrator/Filter/FilterComposite.php | 2 +-
.../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 | 3 +-
.../Filter/OptionalParametersFilter.php | 2 +-
.../Hydrator/HydratorAwareInterface.php | 2 +-
.../Stdlib/Hydrator/HydratorInterface.php | 2 +-
.../Hydrator/HydratorOptionsInterface.php | 2 +-
.../Stdlib/Hydrator/HydratorPluginManager.php | 2 +-
.../Zend/Stdlib/Hydrator/ObjectProperty.php | 2 +-
.../Zend/Stdlib/Hydrator/Reflection.php | 2 +-
.../Hydrator/Strategy/ClosureStrategy.php | 2 +-
.../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/Message.php | 2 +-
.../library/Zend/Stdlib/MessageInterface.php | 2 +-
.../Zend/Stdlib/ParameterObjectInterface.php | 2 +-
.../library/Zend/Stdlib/Parameters.php | 2 +-
.../Zend/Stdlib/ParametersInterface.php | 2 +-
.../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 | 2 +-
.../library/Zend/Stdlib/SplPriorityQueue.php | 2 +-
.../library/Zend/Stdlib/SplQueue.php | 2 +-
.../library/Zend/Stdlib/SplStack.php | 2 +-
.../library/Zend/Stdlib/StringUtils.php | 3 +-
.../StringWrapper/AbstractStringWrapper.php | 2 +-
.../Zend/Stdlib/StringWrapper/Iconv.php | 2 +-
.../Zend/Stdlib/StringWrapper/Intl.php | 9 +-
.../Zend/Stdlib/StringWrapper/MbString.php | 2 +-
.../Zend/Stdlib/StringWrapper/Native.php | 2 +-
.../StringWrapper/StringWrapperInterface.php | 2 +-
.../Zend/Stdlib/compatibility/autoload.php | 2 +-
.../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 | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Zend/Tag/Cloud/Decorator/HtmlCloud.php | 2 +-
.../Zend/Tag/Cloud/Decorator/HtmlTag.php | 2 +-
.../Zend/Tag/Cloud/DecoratorPluginManager.php | 2 +-
.../Zend/Tag/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../InvalidAttributeNameException.php | 2 +-
.../Exception/InvalidElementNameException.php | 2 +-
.../Tag/Exception/OutOfBoundsException.php | 2 +-
.../zendframework/library/Zend/Tag/Item.php | 2 +-
.../library/Zend/Tag/ItemList.php | 2 +-
.../library/Zend/Tag/TaggableInterface.php | 2 +-
.../AbstractConsoleControllerTestCase.php | 2 +-
.../Controller/AbstractControllerTestCase.php | 4 +-
.../AbstractHttpControllerTestCase.php | 95 ++++--
.../library/Zend/Test/Util/ModuleLoader.php | 2 +-
.../library/Zend/Test/composer.json | 1 +
.../Text/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Text/Exception/OutOfBoundsException.php | 2 +-
.../Zend/Text/Exception/OverflowException.php | 2 +-
.../Zend/Text/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../Figlet/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Figlet/Exception/RuntimeException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../library/Zend/Text/Figlet/Figlet.php | 3 +-
.../Zend/Text/Figlet/zend-framework.flf | 2 +-
.../library/Zend/Text/MultiByte.php | 2 +-
.../library/Zend/Text/Table/Column.php | 2 +-
.../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 | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Exception/InvalidDecoratorException.php | 2 +-
.../Table/Exception/OutOfBoundsException.php | 2 +-
.../Table/Exception/OverflowException.php | 2 +-
.../Exception/UnexpectedValueException.php | 2 +-
.../library/Zend/Text/Table/Row.php | 2 +-
.../library/Zend/Text/Table/Table.php | 2 +-
.../Zend/Uri/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../Uri/Exception/InvalidUriException.php | 2 +-
.../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 | 25 +-
.../library/Zend/Uri/UriFactory.php | 3 +-
.../library/Zend/Uri/UriInterface.php | 2 +-
.../Zend/Validator/AbstractValidator.php | 4 +-
.../library/Zend/Validator/Barcode.php | 2 +-
.../Validator/Barcode/AbstractAdapter.php | 2 +-
.../Validator/Barcode/AdapterInterface.php | 2 +-
.../Zend/Validator/Barcode/Codabar.php | 2 +-
.../Zend/Validator/Barcode/Code128.php | 2 +-
.../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 | 2 +-
.../library/Zend/Validator/Callback.php | 2 +-
.../library/Zend/Validator/CreditCard.php | 2 +-
.../library/Zend/Validator/Csrf.php | 2 +-
.../library/Zend/Validator/Date.php | 2 +-
.../library/Zend/Validator/DateStep.php | 3 +-
.../library/Zend/Validator/Db/AbstractDb.php | 3 +-
.../Zend/Validator/Db/NoRecordExists.php | 2 +-
.../Zend/Validator/Db/RecordExists.php | 2 +-
.../library/Zend/Validator/Digits.php | 2 +-
.../library/Zend/Validator/EmailAddress.php | 2 +-
.../Exception/BadMethodCallException.php | 2 +-
.../Exception/ExceptionInterface.php | 2 +-
.../Exception/ExtensionNotLoadedException.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../InvalidMagicMimeFileException.php | 2 +-
.../Validator/Exception/RuntimeException.php | 2 +-
.../library/Zend/Validator/Explode.php | 2 +-
.../library/Zend/Validator/File/Count.php | 2 +-
.../library/Zend/Validator/File/Crc32.php | 4 +-
.../Zend/Validator/File/ExcludeExtension.php | 4 +-
.../Zend/Validator/File/ExcludeMimeType.php | 4 +-
.../library/Zend/Validator/File/Exists.php | 2 +-
.../library/Zend/Validator/File/Extension.php | 4 +-
.../library/Zend/Validator/File/FilesSize.php | 4 +-
.../library/Zend/Validator/File/Hash.php | 4 +-
.../library/Zend/Validator/File/ImageSize.php | 4 +-
.../Zend/Validator/File/IsCompressed.php | 2 +-
.../library/Zend/Validator/File/IsImage.php | 2 +-
.../library/Zend/Validator/File/Md5.php | 4 +-
.../library/Zend/Validator/File/MimeType.php | 4 +-
.../library/Zend/Validator/File/NotExists.php | 2 +-
.../library/Zend/Validator/File/Sha1.php | 4 +-
.../library/Zend/Validator/File/Size.php | 4 +-
.../library/Zend/Validator/File/Upload.php | 2 +-
.../Zend/Validator/File/UploadFile.php | 4 +-
.../library/Zend/Validator/File/WordCount.php | 4 +-
.../library/Zend/Validator/GreaterThan.php | 2 +-
.../library/Zend/Validator/Hex.php | 2 +-
.../library/Zend/Validator/Hostname.php | 125 +++++---
.../library/Zend/Validator/Hostname/Biz.php | 2 +-
.../library/Zend/Validator/Hostname/Cn.php | 2 +-
.../library/Zend/Validator/Hostname/Com.php | 2 +-
.../library/Zend/Validator/Hostname/Jp.php | 2 +-
.../library/Zend/Validator/Iban.php | 4 +-
.../library/Zend/Validator/Identical.php | 2 +-
.../library/Zend/Validator/InArray.php | 4 +-
.../library/Zend/Validator/Ip.php | 2 +-
.../library/Zend/Validator/IsInstanceOf.php | 2 +-
.../library/Zend/Validator/Isbn.php | 2 +-
.../library/Zend/Validator/LessThan.php | 2 +-
.../library/Zend/Validator/NotEmpty.php | 65 ++--
.../library/Zend/Validator/Regex.php | 2 +-
.../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 | 2 +-
.../Translator/TranslatorAwareInterface.php | 2 +-
.../Translator/TranslatorInterface.php | 2 +-
.../library/Zend/Validator/Uri.php | 2 +-
.../library/Zend/Validator/ValidatorChain.php | 2 +-
.../Zend/Validator/ValidatorInterface.php | 2 +-
.../Zend/Validator/ValidatorPluginManager.php | 2 +-
.../ValidatorPluginManagerAwareInterface.php | 2 +-
.../library/Zend/Version/Version.php | 8 +-
.../View/Exception/BadMethodCallException.php | 2 +-
.../Zend/View/Exception/DomainException.php | 2 +-
.../View/Exception/ExceptionInterface.php | 2 +-
.../Exception/InvalidArgumentException.php | 2 +-
.../View/Exception/InvalidHelperException.php | 2 +-
.../Zend/View/Exception/RuntimeException.php | 2 +-
.../Zend/View/Helper/AbstractHelper.php | 3 +-
.../Zend/View/Helper/AbstractHtmlElement.php | 2 +-
.../library/Zend/View/Helper/BasePath.php | 2 +-
.../library/Zend/View/Helper/Cycle.php | 2 +-
.../library/Zend/View/Helper/DeclareVars.php | 2 +-
.../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 | 2 +-
.../Zend/View/Helper/FlashMessenger.php | 8 +-
.../library/Zend/View/Helper/Gravatar.php | 2 +-
.../library/Zend/View/Helper/HeadLink.php | 2 +-
.../library/Zend/View/Helper/HeadMeta.php | 2 +-
.../library/Zend/View/Helper/HeadScript.php | 2 +-
.../library/Zend/View/Helper/HeadStyle.php | 2 +-
.../library/Zend/View/Helper/HeadTitle.php | 2 +-
.../Zend/View/Helper/HelperInterface.php | 2 +-
.../library/Zend/View/Helper/HtmlFlash.php | 2 +-
.../library/Zend/View/Helper/HtmlList.php | 2 +-
.../library/Zend/View/Helper/HtmlObject.php | 2 +-
.../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 | 2 +-
.../library/Zend/View/Helper/Json.php | 2 +-
.../library/Zend/View/Helper/Layout.php | 2 +-
.../library/Zend/View/Helper/Navigation.php | 2 +-
.../View/Helper/Navigation/AbstractHelper.php | 2 +-
.../View/Helper/Navigation/Breadcrumbs.php | 2 +-
.../Helper/Navigation/HelperInterface.php | 2 +-
.../Zend/View/Helper/Navigation/Links.php | 2 +-
.../Navigation/Listener/AclListener.php | 2 +-
.../Zend/View/Helper/Navigation/Menu.php | 2 +-
.../View/Helper/Navigation/PluginManager.php | 2 +-
.../Zend/View/Helper/Navigation/Sitemap.php | 2 +-
.../Zend/View/Helper/PaginationControl.php | 2 +-
.../library/Zend/View/Helper/Partial.php | 2 +-
.../library/Zend/View/Helper/PartialLoop.php | 3 +-
.../library/Zend/View/Helper/Placeholder.php | 2 +-
.../View/Helper/Placeholder/Container.php | 2 +-
.../Container/AbstractContainer.php | 2 +-
.../Container/AbstractStandalone.php | 3 +-
.../Zend/View/Helper/Placeholder/Registry.php | 2 +-
.../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 | 2 +-
.../View/Model/ClearableModelInterface.php | 2 +-
.../library/Zend/View/Model/ConsoleModel.php | 2 +-
.../library/Zend/View/Model/FeedModel.php | 2 +-
.../library/Zend/View/Model/JsonModel.php | 2 +-
.../Zend/View/Model/ModelInterface.php | 2 +-
.../library/Zend/View/Model/ViewModel.php | 2 +-
.../Zend/View/Renderer/ConsoleRenderer.php | 2 +-
.../Zend/View/Renderer/FeedRenderer.php | 2 +-
.../Zend/View/Renderer/JsonRenderer.php | 2 +-
.../Zend/View/Renderer/PhpRenderer.php | 2 +-
.../Zend/View/Renderer/RendererInterface.php | 2 +-
.../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 | 3 +-
.../View/Strategy/PhpRendererStrategy.php | 2 +-
.../library/Zend/View/Stream.php | 4 +-
.../library/Zend/View/Variables.php | 2 +-
.../zendframework/library/Zend/View/View.php | 4 +-
.../library/Zend/View/ViewEvent.php | 2 +-
.../library/Zend/XmlRpc/AbstractValue.php | 5 +-
.../library/Zend/XmlRpc/Client.php | 3 +-
.../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 | 11 +-
.../XmlRpc/Generator/AbstractGenerator.php | 2 +-
.../Zend/XmlRpc/Generator/DomDocument.php | 2 +-
.../XmlRpc/Generator/GeneratorInterface.php | 2 +-
.../Zend/XmlRpc/Generator/XmlWriter.php | 2 +-
.../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 | 27 +-
.../library/Zend/XmlRpc/Response/Http.php | 2 +-
.../library/Zend/XmlRpc/Server.php | 2 +-
.../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 | 2 +-
.../library/Zend/XmlRpc/Server/System.php | 2 +-
.../Zend/XmlRpc/Value/AbstractCollection.php | 2 +-
.../Zend/XmlRpc/Value/AbstractScalar.php | 2 +-
.../library/Zend/XmlRpc/Value/ArrayValue.php | 2 +-
.../library/Zend/XmlRpc/Value/Base64.php | 2 +-
.../library/Zend/XmlRpc/Value/BigInteger.php | 2 +-
.../library/Zend/XmlRpc/Value/Boolean.php | 2 +-
.../library/Zend/XmlRpc/Value/DateTime.php | 2 +-
.../library/Zend/XmlRpc/Value/Double.php | 2 +-
.../library/Zend/XmlRpc/Value/Integer.php | 2 +-
.../library/Zend/XmlRpc/Value/Nil.php | 2 +-
.../library/Zend/XmlRpc/Value/String.php | 2 +-
.../library/Zend/XmlRpc/Value/Struct.php | 2 +-
.../resources/languages/ar/Zend_Captcha.php | 2 +-
.../resources/languages/ar/Zend_Validate.php | 2 +-
.../resources/languages/bg/Zend_Captcha.php | 2 +-
.../resources/languages/bg/Zend_Validate.php | 2 +-
.../resources/languages/ca/Zend_Captcha.php | 2 +-
.../resources/languages/ca/Zend_Validate.php | 2 +-
.../resources/languages/cs/Zend_Captcha.php | 18 +-
.../resources/languages/cs/Zend_Validate.php | 133 ++++----
.../resources/languages/de/Zend_Captcha.php | 2 +-
.../resources/languages/de/Zend_Validate.php | 2 +-
.../resources/languages/en/Zend_Captcha.php | 2 +-
.../resources/languages/en/Zend_Validate.php | 2 +-
.../resources/languages/es/Zend_Validate.php | 2 +-
.../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 | 23 ++
.../resources/languages/hu/Zend_Validate.php | 289 ++++++++++++++++++
.../resources/languages/it/Zend_Captcha.php | 2 +-
.../resources/languages/it/Zend_Validate.php | 2 +-
.../resources/languages/ja/Zend_Captcha.php | 23 ++
.../resources/languages/ja/Zend_Validate.php | 246 ++++++++-------
.../resources/languages/nl/Zend_Validate.php | 228 +++++++-------
.../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 | 2 +-
.../languages/pt_BR/Zend_Captcha.php | 2 +-
.../languages/pt_BR/Zend_Validate.php | 2 +-
.../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 | 2 +-
.../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 +-
2328 files changed, 4827 insertions(+), 3581 deletions(-)
create mode 100644 vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ConstraintKeyObject.php
create mode 100644 vendor/zendframework/zendframework/library/Zend/InputFilter/ReplaceableInputInterface.php
create mode 100644 vendor/zendframework/zendframework/resources/languages/hu/Zend_Captcha.php
create mode 100644 vendor/zendframework/zendframework/resources/languages/hu/Zend_Validate.php
create mode 100644 vendor/zendframework/zendframework/resources/languages/ja/Zend_Captcha.php
diff --git a/composer.json b/composer.json
index a41f73b8a81..82491884518 100644
--- a/composer.json
+++ b/composer.json
@@ -63,7 +63,7 @@
"pear-pear.php.net/validate_ispn": "*",
"serialssolutions/summon": "dev-master",
"symfony/yaml": "*",
- "zendframework/zendframework": "2.2.5",
+ "zendframework/zendframework": "2.2.6",
"zendframework/zendrest": "2.*",
"zendframework/zendservice-amazon": "2.*",
"jasig/phpCAS": "dev-master"
diff --git a/composer.lock b/composer.lock
index 138d23ae410..ae51158ea68 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "030554dc6af0899fae74f8d7d3232f7d",
+ "hash": "62e7c688185a99c2490f6124b718e711",
"packages": [
{
"name": "aferrandini/phpqrcode",
@@ -439,20 +439,21 @@
},
{
"name": "zendframework/zendframework",
- "version": "2.2.5",
+ "version": "2.2.6",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf2.git",
- "reference": "4a7cf6a4cf791244e14aa0ca49d1f06916b63202"
+ "reference": "5eae447d46b00a280573b94c398b2f46f45a6903"
},
"dist": {
"type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-4a7cf6a4cf791244e14aa0ca49d1f06916b63202-zip-2661de.zip",
- "reference": "2.2.5",
- "shasum": "3c699626517e16aa7b3d9a0c811fe41a2586179d"
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-5eae447d46b00a280573b94c398b2f46f45a6903-zip-cbc7a8.zip",
+ "reference": "2.2.6",
+ "shasum": "fd15c9f720744a28ea2a93dda737ca37bd3c40b2"
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.3",
+ "zendframework/zendxml": "~1.0-dev"
},
"replace": {
"zendframework/zend-authentication": "self.version",
@@ -550,10 +551,10 @@
"zf2"
],
"support": {
- "source": "https://github.com/zendframework/zf2/tree/release-2.2.5",
+ "source": "https://github.com/zendframework/zf2/tree/release-2.2.6",
"issues": "https://github.com/zendframework/zf2/issues"
},
- "time": "2013-10-31 15:48:16"
+ "time": "2014-03-06 17:27:03"
},
{
"name": "zendframework/zendrest",
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 1f796fcbf7c..0987e74db38 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit9ee7ba4e6cff0856449c435048dbd9d7::getLoader();
+return ComposerAutoloaderInit502e65633e467adf7b2b307a2c523e82::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index e62efa95ede..25ae6e4ffa5 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit9ee7ba4e6cff0856449c435048dbd9d7
+class ComposerAutoloaderInit502e65633e467adf7b2b307a2c523e82
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit9ee7ba4e6cff0856449c435048dbd9d7
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit9ee7ba4e6cff0856449c435048dbd9d7', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit502e65633e467adf7b2b307a2c523e82', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit9ee7ba4e6cff0856449c435048dbd9d7', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit502e65633e467adf7b2b307a2c523e82', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -51,7 +51,7 @@ class ComposerAutoloaderInit9ee7ba4e6cff0856449c435048dbd9d7
}
}
-function composerRequire9ee7ba4e6cff0856449c435048dbd9d7($file)
+function composerRequire502e65633e467adf7b2b307a2c523e82($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index da2af1bcd34..0ce19a75297 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -302,126 +302,6 @@
"issues": "https://github.com/zendframework/ZendService_Amazon/issues"
}
},
- {
- "name": "zendframework/zendframework",
- "version": "2.2.5",
- "version_normalized": "2.2.5.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zf2.git",
- "reference": "4a7cf6a4cf791244e14aa0ca49d1f06916b63202"
- },
- "dist": {
- "type": "zip",
- "url": "https://packages.zendframework.com/composer/zendframework-zendframework-4a7cf6a4cf791244e14aa0ca49d1f06916b63202-zip-2661de.zip",
- "reference": "2.2.5",
- "shasum": "3c699626517e16aa7b3d9a0c811fe41a2586179d"
- },
- "require": {
- "php": ">=5.3.3"
- },
- "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": "2013-10-31 15:48:16",
- "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.5",
- "issues": "https://github.com/zendframework/zf2/issues"
- }
- },
{
"name": "serialssolutions/summon",
"version": "dev-master",
@@ -730,5 +610,126 @@
"php",
"qrcode"
]
+ },
+ {
+ "name": "zendframework/zendframework",
+ "version": "2.2.6",
+ "version_normalized": "2.2.6.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/zf2.git",
+ "reference": "5eae447d46b00a280573b94c398b2f46f45a6903"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://packages.zendframework.com/composer/zendframework-zendframework-5eae447d46b00a280573b94c398b2f46f45a6903-zip-cbc7a8.zip",
+ "reference": "2.2.6",
+ "shasum": "fd15c9f720744a28ea2a93dda737ca37bd3c40b2"
+ },
+ "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": "2014-03-06 17:27:03",
+ "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.6",
+ "issues": "https://github.com/zendframework/zf2/issues"
+ }
}
]
diff --git a/vendor/zendframework/zendframework/CHANGELOG.md b/vendor/zendframework/zendframework/CHANGELOG.md
index 277792d2a05..b649751014a 100644
--- a/vendor/zendframework/zendframework/CHANGELOG.md
+++ b/vendor/zendframework/zendframework/CHANGELOG.md
@@ -1,5 +1,146 @@
# CHANGELOG
+## 2.2.6 (2014-03-06)
+
+- [4490: Nonvalid literal value for the boolean type, PDO](https://github.com/zendframework/zf2/pull/4490)
+- [4993: Zend\Db\TableGateway\Feature\FeatureSet::addFeature() at line 69](https://github.com/zendframework/zf2/issues/4993)
+- [5125: Method scanner fixed](https://github.com/zendframework/zf2/pull/5125)
+- [5174: SequenceFeature](https://github.com/zendframework/zf2/issues/5174)
+- [5186: Minor bugfix: Added missing composer dependency (ServiceManager) to Math package](https://github.com/zendframework/zf2/pull/5186)
+- [5221: - Create temporary table instead of create table temporary](https://github.com/zendframework/zf2/pull/5221)
+- [5314: Enable persistent connections for IbmDb2.](https://github.com/zendframework/zf2/pull/5314)
+- [5322: Fixing a bug that causes fatal error when a RowGateway's primary key wer...](https://github.com/zendframework/zf2/pull/5322)
+- [5375: Fixes default type == string](https://github.com/zendframework/zf2/pull/5375)
+- [5383: fix for #4614 breaks error handler using Zend\Log](https://github.com/zendframework/zf2/pull/5383)
+- [5385: Resolves #4708 - adding transparent background support to barcode](https://github.com/zendframework/zf2/pull/5385)
+- [5387: fixes #5062 - No longer throw Filename cannot be empty error](https://github.com/zendframework/zf2/pull/5387)
+- [5401: fixed typos](https://github.com/zendframework/zf2/pull/5401)
+- [5402: Update range of mobile](https://github.com/zendframework/zf2/pull/5402)
+- [5409: [rbac\ Typo](https://github.com/zendframework/zf2/pull/5409)
+- [5411: Update Czech validator messages ](https://github.com/zendframework/zf2/pull/5411)
+- [5412: Zend\Test needs Zend\Console as dependency](https://github.com/zendframework/zf2/pull/5412)
+- [5418: Added isset check for REMOTE_ADDR](https://github.com/zendframework/zf2/pull/5418)
+- [5421: fix typo & wording](https://github.com/zendframework/zf2/pull/5421)
+- [5422: Fix emails that contain lines that start with periods](https://github.com/zendframework/zf2/pull/5422)
+- [5423: Zend\Http\Header\SetCookie not compatible with older versions of pcre (and therefore CentOS)](https://github.com/zendframework/zf2/pull/5423)
+- [5424: Issue 3104: Form\Element "x-..." attributes](https://github.com/zendframework/zf2/pull/5424)
+- [5425: Issue 3249: FormFile does not allow "value" as an attribute](https://github.com/zendframework/zf2/pull/5425)
+- [5432: Problem with Forward Plugin](https://github.com/zendframework/zf2/pull/5432)
+- [5438: fix typo](https://github.com/zendframework/zf2/pull/5438)
+- [5444: fix indentation](https://github.com/zendframework/zf2/pull/5444)
+- [5445: Fixing issue with ModuleAutoloader on Windows](https://github.com/zendframework/zf2/pull/5445)
+- [5447: Di circular dependancies](https://github.com/zendframework/zf2/pull/5447)
+- [5451: Remove duplicate: zend-stdlib is already required](https://github.com/zendframework/zf2/pull/5451)
+- [5452: update master's resources/ja Zend_Validate.php message for 2.2](https://github.com/zendframework/zf2/pull/5452)
+- [5453: add resources/languages/ja/Zend_Captcha.php with Japanese translated](https://github.com/zendframework/zf2/pull/5453)
+- [5457: Zend\Db\Adapter\Driver\PdoResult::current patch](https://github.com/zendframework/zf2/pull/5457)
+- [5464: remove unused use](https://github.com/zendframework/zf2/pull/5464)
+- [5468: Add security disclosure info to README/CONTRIBUTING docs](https://github.com/zendframework/zf2/pull/5468)
+- [5471: Fix typehint for getServiceLocator().](https://github.com/zendframework/zf2/pull/5471)
+- [5472: remove unused use statements](https://github.com/zendframework/zf2/pull/5472)
+- [5476: Zend\Http\Header\SetCookie changed to support empty cookies](https://github.com/zendframework/zf2/pull/5476)
+- [5479: Add element input filters before form input filters](https://github.com/zendframework/zf2/pull/5479)
+- [5495: Hotfix/multiple nested collection test](https://github.com/zendframework/zf2/pull/5495)
+- [5497: fix for fprg](https://github.com/zendframework/zf2/pull/5497)
+- [5499: #5465 use strlen instead of empty](https://github.com/zendframework/zf2/pull/5499)
+- [5502: Update collection recursive extract and populating nested fieldsets](https://github.com/zendframework/zf2/pull/5502)
+- [5507: Fixed usage of imported namespace.](https://github.com/zendframework/zf2/pull/5507)
+- [5508: Specify correct return type for `Pdo\Connection::getLastGeneratedValue`](https://github.com/zendframework/zf2/pull/5508)
+- [5523: [Http\ Fixes](https://github.com/zendframework/zf2/pull/5523)
+- [5534: Added ability to set form option useInputFilterDefaults in factory via s...](https://github.com/zendframework/zf2/pull/5534)
+- [5546: Zend/Mvc/Router encoding issue (Fixes #5516)](https://github.com/zendframework/zf2/pull/5546)
+- [5551: Fix Zend\Form\Element\Number $inclusive is always true (Fix for #5549)](https://github.com/zendframework/zf2/pull/5551)
+- [5552: Add driver options to the Oci8 Db adapter](https://github.com/zendframework/zf2/pull/5552)
+- [5555: [Hotfix\ Validator\File classes behaviour with empty value](https://github.com/zendframework/zf2/pull/5555)
+- [5567: Fixes #4670](https://github.com/zendframework/zf2/pull/5567)
+- [5570: fix #5428 only read the stream contents once](https://github.com/zendframework/zf2/pull/5570)
+- [5575: Fix graphme_substr for PHP >= 5.4.18 or >=5.5.1](https://github.com/zendframework/zf2/pull/5575)
+- [5576: Enable Travis Fast finishing](https://github.com/zendframework/zf2/pull/5576)
+- [5577: Fix for #4707 pgsql getLastGeneratedValue() Problem](https://github.com/zendframework/zf2/pull/5577)
+- [5588: More lenient db detection in Logger abstract factory](https://github.com/zendframework/zf2/pull/5588)
+- [5597: Fix zend server cache](https://github.com/zendframework/zf2/pull/5597)
+- [5609: Allow RuntimeDefinition to still process explicit classes](https://github.com/zendframework/zf2/pull/5609)
+- [5613: Test rewrite for avoid test skip. Related #5592](https://github.com/zendframework/zf2/pull/5613)
+- [5614: Fixed issue with Math\Rand::getInteger() on ranges close to PHP_INT_MAX](https://github.com/zendframework/zf2/pull/5614)
+- [5623: Adding attributes to fieldsets. Legends are optional for fieldsets.](https://github.com/zendframework/zf2/pull/5623)
+- [5633: Giving a Warning namespaces to FlashMessager](https://github.com/zendframework/zf2/pull/5633)
+- [5636: Fix for the implementation of Collection Element](https://github.com/zendframework/zf2/pull/5636)
+- [5641: [Hotfix\ FilePostRedirectGet plugin and form collections](https://github.com/zendframework/zf2/pull/5641)
+- [5644: Addressing issue #5624. Implemented fix and added test case.](https://github.com/zendframework/zf2/pull/5644)
+- [5645: Update InArray.php](https://github.com/zendframework/zf2/pull/5645)
+- [5647: Adding Hungarian translations](https://github.com/zendframework/zf2/pull/5647)
+- [5659: Fix a fatal error when assert WWW-Authenticate header is sent - Hotfix/5658](https://github.com/zendframework/zf2/pull/5659)
+- [5669: Fix bug in InjectTemplateListenerTest](https://github.com/zendframework/zf2/pull/5669)
+- [5672: [cs\ cleanup master](https://github.com/zendframework/zf2/pull/5672)
+- [5677: SetCookie With expiry of over 2038 fail on 32bit systems](https://github.com/zendframework/zf2/pull/5677)
+- [5680: Update BlockCipher.php](https://github.com/zendframework/zf2/pull/5680)
+- [5691: Input Factory supports "break_on_failure" option](https://github.com/zendframework/zf2/pull/5691)
+- [5707: update userguide manual link](https://github.com/zendframework/zf2/pull/5707)
+- [5714: Change hardcoded event name by its constant.](https://github.com/zendframework/zf2/pull/5714)
+- [5718: added a submodule loading to testCanLoadMultipleModules](https://github.com/zendframework/zf2/pull/5718)
+- [5729: Fixed module loader to work with *.tar modules in IIS7.5 on Win 2008 R2](https://github.com/zendframework/zf2/pull/5729)
+- [5739: [BUGFIX\ DI fails with CompilerDefinition; solves #5738](https://github.com/zendframework/zf2/pull/5739)
+- [5746: Remove hydrator from collections](https://github.com/zendframework/zf2/pull/5746)
+- [5749: shortcircuit rendering if no messages](https://github.com/zendframework/zf2/pull/5749)
+- [5750: Change error message when no role found](https://github.com/zendframework/zf2/pull/5750)
+- [5752: Get an abstract defined service from an alias](https://github.com/zendframework/zf2/pull/5752)
+- [5754: Fixed gz decompress check for false](https://github.com/zendframework/zf2/pull/5754)
+- [5755: More explicit name for requested name](https://github.com/zendframework/zf2/pull/5755)
+- [5761: fixed typo](https://github.com/zendframework/zf2/pull/5761)
+- [5762: remove unneeded createService functions that actually do same with base class ( AbstractPluginManagerFactory )](https://github.com/zendframework/zf2/pull/5762)
+- [5768: FIX #5767 Zend\Db\Sql\Select: getRawState('order') is inconsistent](https://github.com/zendframework/zf2/pull/5768)
+- [5771: Fix escaped special chars in urlencoded parameters string incorrectly normalized](https://github.com/zendframework/zf2/pull/5771)
+- [5772: Zend\Config\Processor\Token converts boolean to string](https://github.com/zendframework/zf2/issues/5772)
+- [5773: Hotfix for #5772: token processor should not cast booleans to strings](https://github.com/zendframework/zf2/pull/5773)
+- [5775: Update Predicate.php](https://github.com/zendframework/zf2/pull/5775)
+- [5781: Support PHPUnit 3.8+ compatibility](https://github.com/zendframework/zf2/pull/5781)
+- [5782: remove unneeded key "name" under "input_filter" per-element in FormAbstractServiceFactoryTest](https://github.com/zendframework/zf2/pull/5782)
+- [5786: Correct references toPHPUnit_Runner_Version::VERSION](https://github.com/zendframework/zf2/pull/5786)
+- [5788: Zend\Filter\Compress\Bz2 and Gz should be fully PHP >= 5.4 compatible](https://github.com/zendframework/zf2/issues/5788)
+- [5796: \Zend\Form\Element\Email, with multiple=true leads to “Array to string conversion”](https://github.com/zendframework/zf2/issues/5796)
+- [5808: Fixes #5796](https://github.com/zendframework/zf2/pull/5808)
+- [5813: Fixed the classmap autoloader to work under Windows in Phar files.](https://github.com/zendframework/zf2/pull/5813)
+- [5814: Fix validate non required fields in CollectionInputFilter](https://github.com/zendframework/zf2/pull/5814)
+- [5815: Usage of a function in loops should be avoided](https://github.com/zendframework/zf2/pull/5815)
+- [5820: [Zend\InputFilter\InputFilter\ SetValidationGroup() VALIDATE_ALL not working recursively](https://github.com/zendframework/zf2/pull/5820)
+- [5824: Remove HTTP client restriction on cookies](https://github.com/zendframework/zf2/pull/5824)
+- [5830: Run Travis build also on PHP 5.6](https://github.com/zendframework/zf2/pull/5830)
+- [5831: Fixes #4926](https://github.com/zendframework/zf2/pull/5831)
+- [5833: Avoid function usage in loops](https://github.com/zendframework/zf2/pull/5833)
+- [5836: Fixes #3773](https://github.com/zendframework/zf2/pull/5836)
+- [5838: Fix Zend\Test for custom response usage](https://github.com/zendframework/zf2/pull/5838)
+- [5839: [Zend\Filter\Compress\ added PHP 5.4 support for strings in Bz2 and Gz decompress](https://github.com/zendframework/zf2/pull/5839)
+- [5846: Enabling the Request object to generate the correct scheme for SSL URI ](https://github.com/zendframework/zf2/pull/5846)
+- [5848: Test and quick fix #5847](https://github.com/zendframework/zf2/pull/5848)
+- [5861: Post/Redirect/Get should keep query parameters](https://github.com/zendframework/zf2/pull/5861)
+- [5868: Fixes #4993](https://github.com/zendframework/zf2/pull/5868)
+- [5870: SSL CA File support.](https://github.com/zendframework/zf2/pull/5870)
+- [5871: Add processor support to the Logger options.](https://github.com/zendframework/zf2/pull/5871)
+- [5874: Update NotEmpty validator to use bitmasking](https://github.com/zendframework/zf2/pull/5874)
+- [5879: Update NotEmptyTest tests to use data providers where possible](https://github.com/zendframework/zf2/pull/5879)
+- [5883: Fixes #5648](https://github.com/zendframework/zf2/pull/5883)
+- [5887: Fixed bug that didn't allow the connection to the SQLite database to be closed](https://github.com/zendframework/zf2/pull/5887)
+- [5890: Hotfix/5640 for bug in nested Zend\Form\Element\Collection::extract() recursion](https://github.com/zendframework/zf2/pull/5890)
+- [5891: Nicaraguan phone numbering plan](https://github.com/zendframework/zf2/pull/5891)
+- [5892: Case-insensitive country for the PhoneNumber validator class](https://github.com/zendframework/zf2/pull/5892)
+- [5893: Fix bug in json prettyprint](https://github.com/zendframework/zf2/pull/5893)
+- [5899: fix cs from #5613](https://github.com/zendframework/zf2/pull/5899)
+- [5900: Fix for #5894 - .il Domain checking](https://github.com/zendframework/zf2/pull/5900)
+- [5903: Re-added ConstraintKeyObject which is consumed from the AbstractSource w/ test (Fixes #3512)](https://github.com/zendframework/zf2/pull/5903)
+- [5912: clone problem in datetimeselect form element clone method](https://github.com/zendframework/zf2/issues/5912)
+- [5913: Hotfix for #5912: wrong datetime select form element cloning logic](https://github.com/zendframework/zf2/pull/5913)
+- [5916: Zend\Http: Unit tests for multi-line headers](https://github.com/zendframework/zf2/pull/5916)
+
+### SECURITY UPDATES
+
+- **ZF2014-01:** Potential XXE/XEE attacks using PHP functions:
+ `simplexml_load_*`, `DOMDocument::loadXML`, and `xml_parse`. A new component,
+ `ZendXml`, was introduced to mitigate XML eXternal Entity and XML Entity
+ Expansion vectors that are present in older versions of libxml2 and/or PHP.
+ `Zend\Json\Json::fromXml()` and `Zend\XmlRpc`'s `Response` and `Fault` classes
+ were potentially vulnerable to these attacks. If you use either of these
+ components, we recommend upgrading immediately.
+
## 2.2.5 (2013-10-31)
- [4604: Zend\Json\Server\Server::addFunction instantiates new class even an object was given as callable](https://github.com/zendframework/zf2/issues/4604)
@@ -461,6 +602,18 @@ users.
The above change will only affect you if you were manually injecting a
translator instance into your validators.
+## 2.1.6 (06 Mar 2014):
+
+### SECURITY UPDATES
+
+- **ZF2014-01:** Potential XXE/XEE attacks using PHP functions:
+ `simplexml_load_*`, `DOMDocument::loadXML`, and `xml_parse`. A new component,
+ `ZendXml`, was introduced to mitigate XML eXternal Entity and XML Entity
+ Expansion vectors that are present in older versions of libxml2 and/or PHP.
+ `Zend\Json\Json::fromXml()` and `Zend\XmlRpc`'s `Response` and `Fault` classes
+ were potentially vulnerable to these attacks. If you use either of these
+ components, we recommend upgrading immediately.
+
## 2.1.5 (17 Apr 2013):
- 2536: `Zend\Validate` translations out of date
diff --git a/vendor/zendframework/zendframework/CONTRIBUTING.md b/vendor/zendframework/zendframework/CONTRIBUTING.md
index 6342bcb6377..ccfb8a243b5 100644
--- a/vendor/zendframework/zendframework/CONTRIBUTING.md
+++ b/vendor/zendframework/zendframework/CONTRIBUTING.md
@@ -19,7 +19,21 @@ read/subscribe to the following resources:
If you are working on new features, or refactoring an existing
component, please create a proposal. You can do this in on the RFC's
-page, http://framework.zend.com/wiki/display/ZFDEV2/RFC%27s.
+page, http://framework.zend.com/wiki/display/ZFDEV2/RFC%27s.
+
+## Reporting Potential Security Issues
+
+If you have encountered a potential security vulnerability in Zend Framework, please report it to us at [zf-security@zend.com](mailto:zf-security@zend.com). We will work with you to verify the vulnerability and patch it.
+
+When reporting issues, please provide the following information:
+
+- Component(s) affected
+- A description indicating how to reproduce the issue
+- A summary of the security vulnerability and impact
+
+We request that you contact us via the email address above and give the project contributors a chance to resolve the vulnerability and issue a new release prior to any public exposure; this helps protect Zend Framework users and provides them with a chance to upgrade and/or update in order to protect their applications.
+
+For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
## RUNNING TESTS
diff --git a/vendor/zendframework/zendframework/INSTALL.md b/vendor/zendframework/zendframework/INSTALL.md
index 40f980b7507..370c5bf0cee 100644
--- a/vendor/zendframework/zendframework/INSTALL.md
+++ b/vendor/zendframework/zendframework/INSTALL.md
@@ -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.0/en/user-guide/overview.html
+http://framework.zend.com/manual/2.2/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 5f05cdc9f5e..5ad81e922d5 100644
--- a/vendor/zendframework/zendframework/LICENSE.txt
+++ b/vendor/zendframework/zendframework/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2013, Zend Technologies USA, Inc.
+Copyright (c) 2005-2014, 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-GIT.md b/vendor/zendframework/zendframework/README-GIT.md
index 1b4399adc06..250cec1ee25 100644
--- a/vendor/zendframework/zendframework/README-GIT.md
+++ b/vendor/zendframework/zendframework/README-GIT.md
@@ -74,7 +74,7 @@ repository.
### Pre-Commit Hook (Optional)
The ZF2 Travis-CI will confirm that code style standards are met
-by using ```php-cs-fixer``` (https://github.com/fabpot/PHP-CS-Fixer) during it's build runs.
+by using ```php-cs-fixer``` (https://github.com/fabpot/PHP-CS-Fixer) during its build runs.
To reduce the number of red Travis-CI builds, the following Git pre-commit hook
can help catch code style issues before committing. Save it as
diff --git a/vendor/zendframework/zendframework/README.md b/vendor/zendframework/zendframework/README.md
index 5457133fe1e..214fa123810 100644
--- a/vendor/zendframework/zendframework/README.md
+++ b/vendor/zendframework/zendframework/README.md
@@ -5,35 +5,23 @@ Develop: [. Essentially, the class
-was not checking if `$_SERVER['REMOTE_ADDR']` was one of the trusted proxies
-configured, and as a result, `getIpAddressFromProxy()` could return an untrusted
-IP address.
+**This release contains security updates:**
-The class was updated to check if `$_SERVER['REMOTE_ADDR']` is in the list of
-trusted proxies, and, if so, will return that value immediately before
-consulting the values in the `X-Forwarded-For` header.
-
-If you use the `RemoteAddr` `Zend\Session` validator, and are configuring
-trusted proxies, we recommend updating to 2.2.5 or later immediately.
-
-### UPDATES IN 2.2.5
-
-- [#5343](https://github.com/zendframework/zf2/pull/5343) removed the
- DateTimeFormatter filter from DateTime form elements. This was done
- due to the fact that it led to unexpected behavior when non-date inputs were
- provided. However, since the DateTime element already incorporates a
- DateValidator that accepts a date format, validation can still work as
- expected.
+- **ZF2014-01:** Potential XXE/XEE attacks using PHP functions:
+ `simplexml_load_*`, `DOMDocument::loadXML`, and `xml_parse`. A new component,
+ `ZendXml`, was introduced to mitigate XML eXternal Entity and XML Entity
+ Expansion vectors that are present in older versions of libxml2 and/or PHP.
+ `Zend\Json\Json::fromXml()` and `Zend\XmlRpc`'s `Response` and `Fault` classes
+ were potentially vulnerable to these attacks. If you use either of these
+ components, we recommend upgrading immediately.
Please see [CHANGELOG.md](CHANGELOG.md).
@@ -69,6 +57,20 @@ If you would like to be notified of new releases, you can subscribe to
the fw-announce mailing list by sending a blank message to
<fw-announce-subscribe@lists.zend.com>.
+## Reporting Potential Security Issues
+
+If you have encountered a potential security vulnerability in Zend Framework, please report it to us at [zf-security@zend.com](mailto:zf-security@zend.com). We will work with you to verify the vulnerability and patch it.
+
+When reporting issues, please provide the following information:
+
+- Component(s) affected
+- A description indicating how to reproduce the issue
+- A summary of the security vulnerability and impact
+
+We request that you contact us via the email address above and give the project contributors a chance to resolve the vulnerability and issue a new release prior to any public exposure; this helps protect Zend Framework users and provides them with a chance to upgrade and/or update in order to protect their applications.
+
+For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
+
### LICENSE
The files in this archive are released under the Zend Framework license.
diff --git a/vendor/zendframework/zendframework/bin/check-cs.sh b/vendor/zendframework/zendframework/bin/check-cs.sh
index 86cd6fc3b49..e2e9709f591 100644
--- a/vendor/zendframework/zendframework/bin/check-cs.sh
+++ b/vendor/zendframework/zendframework/bin/check-cs.sh
@@ -2,7 +2,7 @@
FIXER_PATH="`dirname $0`/../vendor/fabpot/php-cs-fixer/php-cs-fixer"
-libraryCS=$(php $FIXER_PATH fix -v --dry-run --level=psr2 ./library)
+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" ]];
diff --git a/vendor/zendframework/zendframework/bin/classmap_generator.php b/vendor/zendframework/zendframework/bin/classmap_generator.php
index bfd5eb8ff6f..cb6f0086384 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/bin/pluginmap_generator.php b/vendor/zendframework/zendframework/bin/pluginmap_generator.php
index 733e284ab1e..fc20622bfe7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/bin/templatemap_generator.php b/vendor/zendframework/zendframework/bin/templatemap_generator.php
index 1cbec65eca4..d56832fdaf3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -177,7 +177,7 @@ foreach ($l as $file) {
// Add in relative path to library
$filename = $relativePathForMap . $filename;
- $baseName = $file->getBasename('.' . $file->getExtension());
+ $baseName = $file->getBasename('.' . pathinfo($file->getFilename(), PATHINFO_EXTENSION));
$mapName = str_replace(str_replace(DIRECTORY_SEPARATOR, '/', realpath($viewPath)) . '/', '', str_replace(DIRECTORY_SEPARATOR, '/', $file->getPath()) . '/' . $baseName);
$map->{$mapName} = $filename;
}
diff --git a/vendor/zendframework/zendframework/composer.json b/vendor/zendframework/zendframework/composer.json
index bea42c3c828..b8abf6a46ff 100644
--- a/vendor/zendframework/zendframework/composer.json
+++ b/vendor/zendframework/zendframework/composer.json
@@ -9,7 +9,8 @@
"homepage": "http://framework.zend.com/",
"license": "BSD-3-Clause",
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.3",
+ "zendframework/zendxml": "~1.0-dev"
},
"require-dev": {
"doctrine/annotations": ">=1.0",
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/AbstractAdapter.php
index 6671a40f594..e57910de848 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/AdapterInterface.php
index bd4c77314bb..d23d0793668 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a9a54b2bb4e..917fa3fd43f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 46b3b61df9a..7b99d16a00b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CallbackCheckAdapter.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CallbackCheckAdapter.php
index 3608e97b420..9527569a8f2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CredentialTreatmentAdapter.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/CredentialTreatmentAdapter.php
index 10b07211a50..8b7cbd3a44d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/ExceptionInterface.php
index c205de32f8b..615645732bc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/InvalidArgumentException.php
index 76c620593ca..87bf01401b7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/DbTable/Exception/RuntimeException.php
index 332a477fad6..bf4cc273b3a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 79e933595e1..5c3c838a13c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/ExceptionInterface.php
index 27893d69a92..b8da27fad08 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/InvalidArgumentException.php
index 5c41b9270c3..c2f0105d5d9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Exception/RuntimeException.php
index d6f396ce91b..79109367a9a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a2220291976..962403dabaf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d5e2fbfa227..636043000c8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ApacheResolver.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ApacheResolver.php
index b5a9dd9b23a..58bcb46f5f0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/ExceptionInterface.php
index 95276df85b7..0bfa484f25b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php
index 2cb4c416434..5e8fe751f8f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ee952debaed..94a9f9e141c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c69813c92be..2bb58567455 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ResolverInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/Http/ResolverInterface.php
index 25172347350..b236f845881 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 074d3b93a0a..320e6c58157 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ValidatableAdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Adapter/ValidatableAdapterInterface.php
index 75c95c5a2fa..3c4f01b2c7d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ee67311d095..212747db80f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/AuthenticationService.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/AuthenticationService.php
@@ -3,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-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/ExceptionInterface.php
index 0b60145454f..d995a645388 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Exception/InvalidArgumentException.php
index d3e9024ea8f..851fb73c017 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a20415cd905..78bc6730810 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 52cdca0be2c..e126929080b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 954aec5a1a0..00f23f6cc55 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e04da6e9af4..8d995a2c0ab 100644
--- a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Chain.php
+++ b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/Chain.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Authentication\Storage;
-use Zend\Authentication\Storage\StorageInterface;
use Zend\Stdlib\PriorityQueue;
class Chain implements StorageInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/NonPersistent.php b/vendor/zendframework/zendframework/library/Zend/Authentication/Storage/NonPersistent.php
index 4f9a4a8dc01..8d12049390c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5e0fec3c8bf..6c66bec8f67 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a780ac52c9f..4a9d41b9e64 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 906841e9af2..d8bb0a84dd3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Barcode.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Barcode.php
index 1547a58ac2a..20516db3e37 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/ExceptionInterface.php
index 5912f45ec9f..f421ceb947a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1b3dda383b5..284818e925a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/OutOfRangeException.php
index 3e86c50310d..0227ed6c933 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 89432814512..a4136856f7b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Exception/RuntimeException.php
index c34a44ad860..36ac0148f85 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6cfe98b370e..df3495840c3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractObject.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/AbstractObject.php
index 9ca423d6c56..0fcf7723f85 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Codabar.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Codabar.php
index b6e14b2cfe1..56a2b9ea30c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Code128.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code128.php
index fed351e6cd3..2961c2ba912 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -208,7 +208,8 @@ class Code128 extends AbstractObject
$currentCharset = null;
$result = array();
- for ($pos = 0; $pos < strlen($string); $pos++) {
+ $strlen = strlen($string);
+ for ($pos = 0; $pos < $strlen; $pos++) {
$char = $string[$pos];
$code = null;
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code25.php
index 2efbb58f6fb..2f32ca7af05 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e02d38b7c9b..ec8624d9449 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Code39.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Code39.php
index e626c9f5af3..c70e289eb58 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0abd26c540c..d2920e61f57 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Ean2.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean2.php
index 03668bbfd6f..ac632c03d55 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Ean5.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean5.php
index 2f265ef5eb9..a285ef565f3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Ean8.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Ean8.php
index cbdeba9e240..4798a11c883 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Error.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Error.php
index ee7e00e2db9..15c36bcab2e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9a5b28059b6..64f3ea56e0e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7b1bbd5823d..d0488d79903 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ea0714ca41d..340b724ea47 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d008e86e57c..be38887c7d1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6642105b5e5..f56edfedf5d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bc106391359..735c7d56c28 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4e7268cf491..14d50e6d59b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Itf14.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Itf14.php
index e342fb16aec..8fed5f554ff 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Leitcode.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Leitcode.php
index d91a9da3a81..800567b94cf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ObjectInterface.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/ObjectInterface.php
index 3fe4500edb3..836e0138ee6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 91b0d8c4ebf..0fd2a52f145 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Postnet.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Postnet.php
index 4f3c9f1d17e..46c777a3ed6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Royalmail.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Royalmail.php
index ed38d7b8570..fe85257dd2c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Upca.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upca.php
index ba701395b09..ff3469651a2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Upce.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Object/Upce.php
index 228f8693d57..679fc698eed 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ObjectPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Barcode/ObjectPluginManager.php
index 991c4b5f60a..40345f83bfb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 185bf2541e3..df65748dc81 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -79,6 +79,12 @@ abstract class AbstractRenderer implements RendererInterface
*/
protected $resource;
+ /**
+ * Show a transparent background
+ * @var Boolean
+ */
+ protected $transparentBackground = false;
+
/**
* Constructor
* @param array|Traversable $options
@@ -135,6 +141,28 @@ abstract class AbstractRenderer implements RendererInterface
return $this->rendererNamespace;
}
+ /**
+ * Set whether background should be transparent
+ * Will work for SVG and Image (png and gif only)
+ *
+ * @param $bool
+ * @return $this
+ */
+ public function setTransparentBackground($bool)
+ {
+ $this->transparentBackground = $bool;
+
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function getTransparentBackground()
+ {
+ return $this->transparentBackground;
+ }
+
/**
* Retrieve renderer type
* @return string
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 e43523a66c5..f7f4d44547e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 682f2f630d4..bbdb502b1b0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a5328632c9d..2d3d7ce8d80 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6e2cde4a412..2eb1c34596f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b8f2b4afa2a..8fa8d64fd8f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2d032918660..c0323dc1fc8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,8 +22,8 @@ class Image extends AbstractRenderer
* @var array
*/
protected $allowedImageType = array('png',
- 'jpeg',
- 'gif' );
+ 'jpeg',
+ 'gif' );
/**
* Image format
@@ -194,22 +194,7 @@ class Image extends AbstractRenderer
$barcodeWidth = $this->barcode->getWidth(true);
$barcodeHeight = $this->barcode->getHeight(true);
- if ($this->resource !== null) {
- $foreColor = $this->barcode->getForeColor();
- $backgroundColor = $this->barcode->getBackgroundColor();
- $this->imageBackgroundColor = imagecolorallocate(
- $this->resource,
- ($backgroundColor & 0xFF0000) >> 16,
- ($backgroundColor & 0x00FF00) >> 8,
- $backgroundColor & 0x0000FF
- );
- $this->imageForeColor = imagecolorallocate(
- $this->resource,
- ($foreColor & 0xFF0000) >> 16,
- ($foreColor & 0x00FF00) >> 8,
- $foreColor & 0x0000FF
- );
- } else {
+ if (is_null($this->resource)) {
$width = $barcodeWidth;
$height = $barcodeHeight;
if ($this->userWidth && $this->barcode->getType() != 'error') {
@@ -219,32 +204,44 @@ class Image extends AbstractRenderer
$height = $this->userHeight;
}
- $foreColor = $this->barcode->getForeColor();
- $backgroundColor = $this->barcode->getBackgroundColor();
$this->resource = imagecreatetruecolor($width, $height);
- $this->imageBackgroundColor = imagecolorallocate(
- $this->resource,
- ($backgroundColor & 0xFF0000) >> 16,
- ($backgroundColor & 0x00FF00) >> 8,
- $backgroundColor & 0x0000FF
- );
- $this->imageForeColor = imagecolorallocate(
- $this->resource,
- ($foreColor & 0xFF0000) >> 16,
- ($foreColor & 0x00FF00) >> 8,
- $foreColor & 0x0000FF
- );
$white = imagecolorallocate($this->resource, 255, 255, 255);
imagefilledrectangle($this->resource, 0, 0, $width - 1, $height - 1, $white);
}
+
+ $foreColor = $this->barcode->getForeColor();
+ $this->imageForeColor = imagecolorallocate(
+ $this->resource,
+ ($foreColor & 0xFF0000) >> 16,
+ ($foreColor & 0x00FF00) >> 8,
+ $foreColor & 0x0000FF
+ );
+
+ $backgroundColor = $this->barcode->getBackgroundColor();
+ $this->imageBackgroundColor = imagecolorallocate(
+ $this->resource,
+ ($backgroundColor & 0xFF0000) >> 16,
+ ($backgroundColor & 0x00FF00) >> 8,
+ $backgroundColor & 0x0000FF
+ );
+
+ // JPEG does not support transparency, if transparentBackground is true and
+ // image type is JPEG, ignore transparency
+ if($this->getImageType() != "jpeg" && $this->transparentBackground) {
+ imagecolortransparent($this->resource, $this->imageBackgroundColor);
+ }
+
$this->adjustPosition(imagesy($this->resource), imagesx($this->resource));
- imagefilledrectangle($this->resource,
- $this->leftOffset,
- $this->topOffset,
- $this->leftOffset + $barcodeWidth - 1,
- $this->topOffset + $barcodeHeight - 1,
- $this->imageBackgroundColor);
+
+ imagefilledrectangle(
+ $this->resource,
+ $this->leftOffset,
+ $this->topOffset,
+ $this->leftOffset + $barcodeWidth - 1,
+ $this->topOffset + $barcodeHeight - 1,
+ $this->imageBackgroundColor
+ );
}
/**
@@ -330,18 +327,18 @@ class Image extends AbstractRenderer
protected function drawPolygon($points, $color, $filled = true)
{
$newPoints = array($points[0][0] + $this->leftOffset,
- $points[0][1] + $this->topOffset,
- $points[1][0] + $this->leftOffset,
- $points[1][1] + $this->topOffset,
- $points[2][0] + $this->leftOffset,
- $points[2][1] + $this->topOffset,
- $points[3][0] + $this->leftOffset,
- $points[3][1] + $this->topOffset, );
+ $points[0][1] + $this->topOffset,
+ $points[1][0] + $this->leftOffset,
+ $points[1][1] + $this->topOffset,
+ $points[2][0] + $this->leftOffset,
+ $points[2][1] + $this->topOffset,
+ $points[3][0] + $this->leftOffset,
+ $points[3][1] + $this->topOffset, );
$allocatedColor = imagecolorallocate($this->resource,
- ($color & 0xFF0000) >> 16,
- ($color & 0x00FF00) >> 8,
- $color & 0x0000FF );
+ ($color & 0xFF0000) >> 16,
+ ($color & 0x00FF00) >> 8,
+ $color & 0x0000FF );
if ($filled) {
imagefilledpolygon($this->resource, $newPoints, 4, $allocatedColor);
@@ -365,9 +362,9 @@ class Image extends AbstractRenderer
protected function drawText($text, $size, $position, $font, $color, $alignment = 'center', $orientation = 0)
{
$allocatedColor = imagecolorallocate($this->resource,
- ($color & 0xFF0000) >> 16,
- ($color & 0x00FF00) >> 8,
- $color & 0x0000FF );
+ ($color & 0xFF0000) >> 16,
+ ($color & 0x00FF00) >> 8,
+ $color & 0x0000FF );
if ($font == null) {
$font = 3;
@@ -422,13 +419,13 @@ class Image extends AbstractRenderer
break;
}
imagettftext($this->resource,
- $size,
- $orientation,
- $position[0] - ($width * cos(pi() * $orientation / 180)),
- $position[1] + ($width * sin(pi() * $orientation / 180)),
- $allocatedColor,
- $font,
- $text);
+ $size,
+ $orientation,
+ $position[0] - ($width * cos(pi() * $orientation / 180)),
+ $position[1] + ($width * sin(pi() * $orientation / 180)),
+ $allocatedColor,
+ $font,
+ $text);
}
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Pdf.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Pdf.php
index c87bd2d5328..b44cadfed04 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RendererInterface.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/RendererInterface.php
index 4da43624d5c..db162dfbd07 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Svg.php b/vendor/zendframework/zendframework/library/Zend/Barcode/Renderer/Svg.php
index 53ecbbb5053..8562a57dabb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -43,6 +43,13 @@ class Svg extends AbstractRenderer
*/
protected $userWidth = 0;
+
+ /**
+ * Flag to determime if drawPolygon has been run once already
+ * @var bool
+ */
+ protected $drawPolygonExecuted = false;
+
/**
* Set height of the result image
* @param null|int $value
@@ -152,12 +159,17 @@ class Svg extends AbstractRenderer
}
$this->adjustPosition($height, $width);
- $this->appendRootElement('rect',
- array('x' => $this->leftOffset,
- 'y' => $this->topOffset,
- 'width' => ($this->leftOffset + $barcodeWidth - 1),
- 'height' => ($this->topOffset + $barcodeHeight - 1),
- 'fill' => $imageBackgroundColor));
+ $rect = array('x' => $this->leftOffset,
+ 'y' => $this->topOffset,
+ 'width' => ($this->leftOffset + $barcodeWidth - 1),
+ 'height' => ($this->topOffset + $barcodeHeight - 1),
+ 'fill' => $imageBackgroundColor);
+
+ if($this->transparentBackground) {
+ $rect['fill-opacity'] = 0;
+ }
+
+ $this->appendRootElement('rect', $rect);
}
protected function readRootElement()
@@ -309,6 +321,17 @@ class Svg extends AbstractRenderer
$newPoints = implode(' ', $newPoints);
$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) {
+ $attributes['fill-opacity'] = '0';
+ }
+ $this->drawPolygonExecuted = true;
+ }
+
$this->appendRootElement('polygon', $attributes);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Barcode/RendererPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Barcode/RendererPluginManager.php
index 93258e46a4b..0c8c2f8aee0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Cache/Exception/BadMethodCallException.php
index fbe09a08f2d..dc8af1fc5f6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b69d5d59232..1457349d5a0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 da04aaf62ee..17621c5aec7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 88c6d2ab5ac..b3b8eeb33e9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6851799fce6..f0fbf67b252 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0b829e47045..94f6ec0f95d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bee42a41f82..24564ef67d2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2d410a7b922..a8a3c198f49 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b05df45060c..a72f506854a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 55f88051e86..9b168bee26e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 976246cd4a5..92855748f8c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d987928a444..5e769bae409 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/AbstractPattern.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/AbstractPattern.php
@@ -3,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-2014 Zend Technologies USA 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/CallbackCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CallbackCache.php
index 694aec0e989..a01cbe2c8e6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CaptureCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/CaptureCache.php
index a57ae05ede6..b0c13633def 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -359,7 +359,7 @@ class CaptureCache extends AbstractPattern
if (!$res) {
$oct = ($perm === false) ? '777' : decoct($perm);
- $err = ErrorHandler::stop();
+ ErrorHandler::stop();
throw new Exception\RuntimeException(
"mkdir('{$path}', 0{$oct}, false) failed"
);
@@ -367,7 +367,7 @@ class CaptureCache extends AbstractPattern
if ($perm !== false && !chmod($path, $perm)) {
$oct = decoct($perm);
- $err = ErrorHandler::stop();
+ ErrorHandler::stop();
throw new Exception\RuntimeException(
"chmod('{$path}', 0{$oct}) failed"
);
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/ClassCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/ClassCache.php
index 32561e723c0..238feed5ef2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ca5f0570dbd..07e137dd7ef 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/OutputCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/OutputCache.php
index 826839b46d9..549e17122b8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ebaf29a903a..7c4be85ebde 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PatternOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Pattern/PatternOptions.php
index f9a9f469fb9..07ed2106b9e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PatternFactory.php b/vendor/zendframework/zendframework/library/Zend/Cache/PatternFactory.php
index 8422edb76bb..dceed0032f0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d8a33db093f..7d5d0e1a697 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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;
/**
* Plugin manager implementation for cache pattern adapters
*
- * Enforces that adatpers retrieved are instances of
+ * Enforces that retrieved adapters are instances of
* Pattern\PatternInterface. Additionally, it registers a number of default
* patterns available.
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Cache/Service/StorageCacheAbstractServiceFactory.php
index 992151373e7..66eb6505e52 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 745ca022cf1..f2c20499367 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3c2ea41d00d..2487415e215 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractZendServer.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
index 9e20d58ae5d..22933beb0c7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -39,9 +39,8 @@ abstract class AbstractZendServer extends AbstractAdapter
$prefix = ($namespace === '') ? '' : $namespace . self::NAMESPACE_SEPARATOR;
$result = $this->zdcFetch($prefix . $normalizedKey);
- if ($result === false) {
+ if ($result === null) {
$success = false;
- $result = null;
} else {
$success = true;
$casToken = $result;
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 2d1b1bc3033..8a6ebd7dcd7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Apc.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Apc.php
index 2196ff5f43e..f99223cd1a5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -601,7 +601,6 @@ class Apc extends AbstractAdapter implements
$namespace = $options->getNamespace();
$prefix = ($namespace === '') ? '' : $namespace . $options->getNamespaceSeparator();
$internalKey = $prefix . $normalizedKey;
- $ttl = $options->getTtl();
$value = (int) $value;
$newValue = apc_inc($internalKey, $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 66ac993ae9c..2454d7439f7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ApcOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/ApcOptions.php
index 4d9d7595c72..0299d9446c2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Dba.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Dba.php
index 2c8fab3fced..2c80783888f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -142,7 +142,7 @@ class Dba extends AbstractAdapter implements
$events->detach($handle);
}
};
- $handle = $events->attach('option', $callback);
+ $events->attach('option', $callback);
}
return $this->totalSpace;
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 6befd7ac9a4..a895ce545b8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DbaOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/DbaOptions.php
index 06ff1856e94..13172b74984 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d2ed44ec1f5..aee3f835ce0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -413,7 +413,7 @@ class Filesystem extends AbstractAdapter implements
$events->detach($handle);
}
};
- $handle = $events->attach('option', $callback);
+ $events->attach('option', $callback);
}
return $this->totalSpace;
@@ -536,7 +536,6 @@ class Filesystem extends AbstractAdapter implements
*/
protected function internalGetItems(array & $normalizedKeys)
{
- $options = $this->getOptions();
$keys = $normalizedKeys; // Don't change argument passed by reference
$result = array();
while ($keys) {
@@ -1467,7 +1466,7 @@ class Filesystem extends AbstractAdapter implements
if (!$res) {
$oct = ($perm === false) ? '777' : decoct($perm);
- $err = ErrorHandler::stop();
+ ErrorHandler::stop();
throw new Exception\RuntimeException(
"mkdir('{$path}', 0{$oct}, false) failed"
);
@@ -1475,7 +1474,7 @@ class Filesystem extends AbstractAdapter implements
if ($perm !== false && !chmod($path, $perm)) {
$oct = decoct($perm);
- $err = ErrorHandler::stop();
+ ErrorHandler::stop();
throw new Exception\RuntimeException(
"chmod('{$path}', 0{$oct}) failed"
);
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 800e038adaa..4ab0f93f3e9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FilesystemOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
index 9dec56c3872..bfafb1a5d8b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/KeyListIterator.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/KeyListIterator.php
index 862995cf29c..b16a32ae0f6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Memcached.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memcached.php
index 34c0a52cb0c..a07257c28ce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/MemcachedOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
index 4cf8219bb3e..ceff8c4363d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -200,7 +200,7 @@ class MemcachedOptions extends AdapterOptions
public function setPersistentId($persistentId)
{
$this->triggerOptionEvent('persistent_id', $persistentId);
- $this->getResourceManager()->setPersistentId($this->getPersistentId(), $persistentId);
+ $this->getResourceManager()->setPersistentId($this->getResourceId(), $persistentId);
return $this;
}
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 9461bb15d28..8f4370222ea 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Memory.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/Memory.php
index f0f6a1ac2bf..9301363312c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/MemoryOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/MemoryOptions.php
index 203ad9d0c7c..be48418c645 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b7e5726cd39..2ce9062c43b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -12,9 +12,7 @@ namespace Zend\Cache\Storage\Adapter;
use Redis as RedisResource;
use RedisException as RedisResourceException;
use stdClass;
-use Zend\Cache\Storage\Adapter\AbstractAdapter;
use Zend\Cache\Exception;
-use Zend\Cache\Storage\AvailableSpaceCapableInterface;
use Zend\Cache\Storage\Capabilities;
use Zend\Cache\Storage\FlushableInterface;
use Zend\Cache\Storage\TotalSpaceCapableInterface;
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 9cd4ad0f3b2..f5e67487503 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisOptions.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Cache\Storage\Adapter;
-use Redis as RedisResource;
use Zend\Cache\Exception;
-use Zend\Cache\Storage\Adapter\AdapterOptions;
class RedisOptions extends AdapterOptions
{
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 3b96b4af82f..b19b833894f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/RedisResourceManager.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Cache\Storage\Adapter;
use Redis as RedisResource;
-use RedisException as RedisResourceException;
use ReflectionClass;
use Traversable;
use Zend\Cache\Exception;
@@ -94,7 +93,7 @@ class RedisResourceManager
$redis = $resource['resource'];
if ($resource['persistent_id'] !== '') {
//connect or reuse persistent connection
- $success = $redis->pconnect($server['host'], $server['port'], $server['timeout'], $server['persistend_id']);
+ $success = $redis->pconnect($server['host'], $server['port'], $server['timeout'], $server['persistent_id']);
} elseif ($server['port']) {
$success = $redis->connect($server['host'], $server['port'], $server['timeout']);
} elseif ($server['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 072ec21129f..bf6f45d3fb9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SessionOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/SessionOptions.php
index 6bbaf4065b5..8e4c6d5c90b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/SessionOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/SessionOptions.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Cache\Storage\Adapter;
-use Zend\Cache\Exception;
use Zend\Session\Container as SessionContainer;
/**
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 729157329da..85ea5bda34f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/WinCacheOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
index c42e6c4d17c..43ef9c2e16d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/WinCacheOptions.php
@@ -3,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-2014 Zend Technologies USA 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/XCache.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCache.php
index ea34b606295..f0aa52062b3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/XCacheOptions.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Adapter/XCacheOptions.php
index 7dfcf38237d..4c97136b755 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a83abcb2632..7ee8a32c99d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -149,7 +149,7 @@ class ZendServerDisk extends AbstractZendServer implements
* Fetch a single item from Zend Data Disk Cache
*
* @param string $internalKey
- * @return mixed The stored value or FALSE if item wasn't found
+ * @return mixed The stored value or NULL if item wasn't found
* @throws Exception\RuntimeException
*/
protected function zdcFetch($internalKey)
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 6ada0dc982a..e312b2480df 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -104,7 +104,7 @@ class ZendServerShm extends AbstractZendServer implements
* Fetch a single item from Zend Data SHM Cache
*
* @param string $internalKey
- * @return mixed The stored value or FALSE if item wasn't found
+ * @return mixed The stored value or NULL if item wasn't found
* @throws Exception\RuntimeException
*/
protected function zdcFetch($internalKey)
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AdapterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AdapterPluginManager.php
index 9f133fb0e94..ee7db4f6539 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AvailableSpaceCapableInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/AvailableSpaceCapableInterface.php
index 074cafe073c..5088fe255a9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3c00dd1b1d0..c81e08cbdff 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ClearByNamespaceInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/ClearByNamespaceInterface.php
index 7415936aa88..15fb4e75660 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d50983ad4eb..eb2fb5e0b9f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a7c8a561bea..6f7b0a36a7a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a9e3c2a82e7..62c32f4f827 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ac53fba7dfe..e9ffb4a0c20 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 82ccd2f3461..6c72541e6bf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 acb2fa7903a..68c4ba2cad4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 eb246a3f9b1..c08381e7a58 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/OptimizableInterface.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/OptimizableInterface.php
index 0440403045e..0f57022fbe1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6aabd49a731..0e1ab90cb44 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 64155701ec7..ae4d0ede285 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ClearExpiredByFactor.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Cache\Storage\Plugin;
-use Zend\Cache\Exception;
use Zend\Cache\Storage\ClearExpiredInterface;
use Zend\Cache\Storage\PostEvent;
use Zend\EventManager\EventManagerInterface;
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 b634983471b..2b0d705590f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/IgnoreUserAbort.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
index 67888093c96..107f6788d14 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
@@ -3,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-2014 Zend Technologies USA 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/OptimizeByFactor.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
index b0ba023e90b..f870d85eb5d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/OptimizeByFactor.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Cache\Storage\Plugin;
-use Zend\Cache\Exception;
use Zend\Cache\Storage\OptimizableInterface;
use Zend\Cache\Storage\PostEvent;
use Zend\EventManager\EventManagerInterface;
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 2cade27fef1..af3d007ca4c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a5b8120c1dd..a1db1661b11 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Serializer.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/Serializer.php
index df7db5b13be..c0e71b4bee1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/Serializer.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/Plugin/Serializer.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Cache\Storage\Plugin;
use stdClass;
-use Zend\Cache\Exception;
use Zend\Cache\Storage\Capabilities;
use Zend\Cache\Storage\Event;
use Zend\Cache\Storage\PostEvent;
diff --git a/vendor/zendframework/zendframework/library/Zend/Cache/Storage/PluginManager.php b/vendor/zendframework/zendframework/library/Zend/Cache/Storage/PluginManager.php
index 0a1693d91a7..a799a37d345 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9800e0a24eb..9302b0814ea 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f1fb22b10ea..c89ca5bef21 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7c3fc6cba91..3917b0e41ca 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b8fff572cd8..be543e82f61 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5779e9d09ba..db4946d700f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Cache/StorageFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Cache/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Captcha/AbstractAdapter.php
index 6247ff90ebf..11784d69e7a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7c0a942bc01..5ad8036611f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ef8989828d2..227daa5c768 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Dumb.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Dumb.php
index 8409ec89205..9461adf0c29 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c2374c3f015..ac900097b4c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 baeb937a85d..a42e6a86908 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 883fc2d1f7f..78c31911402 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f38ceb5a8df..718091a974a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ae00058dc14..56dfeaddbb1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/NoFontProvidedException.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/NoFontProvidedException.php
index 409d78be6a6..eaf0447255c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c6cdf96efa1..d3b960980d5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Factory.php b/vendor/zendframework/zendframework/library/Zend/Captcha/Factory.php
index 3232e3a6129..04f15d868d4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3388bdecae3..002f5f3072d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 68a6e963a02..ce9183715af 100644
--- a/vendor/zendframework/zendframework/library/Zend/Captcha/Image.php
+++ b/vendor/zendframework/zendframework/library/Zend/Captcha/Image.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Captcha;
use DirectoryIterator;
-use Zend\Captcha\Exception;
use Zend\Stdlib\ErrorHandler;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Captcha/ReCaptcha.php b/vendor/zendframework/zendframework/library/Zend/Captcha/ReCaptcha.php
index 64d2f56ff77..7e5c019348f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AnnotationCollection.php b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationCollection.php
index a10c8bf910a..7b9aa51da6c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 86d84b04c20..a8b23d3d9c4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AnnotationManager.php b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/AnnotationManager.php
index 00e58b10bbf..81676ed55a1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DoctrineAnnotationParser.php b/vendor/zendframework/zendframework/library/Zend/Code/Annotation/Parser/DoctrineAnnotationParser.php
index 7406d4192b7..5168e3278cd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6e64da96325..b3f75662477 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7e36eac96ad..bb6746e80ca 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Code/Exception/BadMethodCallException.php
index ff55f29b9a7..921eefde3c8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Exception/ExceptionInterface.php
index 83547a8ef26..de32f2498f2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Code/Exception/InvalidArgumentException.php
index 66e0d531123..88469503a88 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Code/Exception/RuntimeException.php
index bc645369c05..afacbee68d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/AbstractGenerator.php
index 0ad7c081dd1..3dc6de56751 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e425bbd55db..ad981ed9111 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Code\Generator;
-use Zend\Code\Generator\Exception;
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 b9103c3da76..4851e5ca4d7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1d3dc6232de..843409c71d2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -593,14 +593,14 @@ class ClassGenerator extends AbstractGenerator
{
$methodName = $method->getName();
- if (isset($this->methods[$methodName])) {
+ if ($this->hasMethod($methodName)) {
throw new Exception\InvalidArgumentException(sprintf(
'A method by name %s already exists in this class.',
$methodName
));
}
- $this->methods[$methodName] = $method;
+ $this->methods[strtolower($methodName)] = $method;
return $this;
}
@@ -618,13 +618,7 @@ class ClassGenerator extends AbstractGenerator
*/
public function getMethod($methodName)
{
- foreach ($this->methods as $method) {
- if ($method->getName() == $methodName) {
- return $method;
- }
- }
-
- return false;
+ return $this->hasMethod($methodName) ? $this->methods[strtolower($methodName)] : false;
}
/**
@@ -633,11 +627,8 @@ class ClassGenerator extends AbstractGenerator
*/
public function removeMethod($methodName)
{
- foreach ($this->methods as $key => $method) {
- if ($method->getName() == $methodName) {
- unset($this->methods[$key]);
- break;
- }
+ if ($this->hasMethod($methodName)) {
+ unset($this->methods[strtolower($methodName)]);
}
return $this;
@@ -649,7 +640,7 @@ class ClassGenerator extends AbstractGenerator
*/
public function hasMethod($methodName)
{
- return isset($this->methods[$methodName]);
+ return isset($this->methods[strtolower($methodName)]);
}
/**
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 e5426bf8fef..016070f628e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag.php
@@ -3,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-2014 Zend Technologies USA 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/DocBlock/Tag/AuthorTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/AuthorTag.php
index bced4e2d5cb..a4b97c4d588 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,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-2014 Zend Technologies USA 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/DocBlock/Tag/LicenseTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
index d6149c31037..b2e5993ab79 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,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-2014 Zend Technologies USA 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/DocBlock/Tag/ParamTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
index 175df2f18b8..217d6a5230b 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,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-2014 Zend Technologies USA 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/DocBlock/Tag/ReturnTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
index 8ff364b457b..dedac3fcb2f 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,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-2014 Zend Technologies USA 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/DocBlockGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
index 78f0b7febfc..2b7436dd426 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Generator/DocBlockGenerator.php
@@ -3,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-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/ExceptionInterface.php
index 77981f87216..3858c3ef571 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/InvalidArgumentException.php
index a854e42c340..29b270abb39 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/Exception/RuntimeException.php
index 4018fca782f..698a496470f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FileGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGenerator.php
index 8894ccc1443..b5c112d6f12 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FileGeneratorRegistry.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/FileGeneratorRegistry.php
index 27538e85b4a..164cc525435 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e9e587a6c58..77e1eb8c803 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cb246f33907..a42ba5d00e1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ParameterGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ParameterGenerator.php
index ef4eb5a3ad9..d27276c7e5f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PropertyGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/PropertyGenerator.php
index 1e9ad3aa690..748e58166a4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PropertyValueGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/PropertyValueGenerator.php
index 227b55cd2a6..91ace7b6b64 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ValueGenerator.php b/vendor/zendframework/zendframework/library/Zend/Code/Generator/ValueGenerator.php
index 6150da8b6b8..1c2b226e2ab 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/NameInformation.php b/vendor/zendframework/zendframework/library/Zend/Code/NameInformation.php
index dc4a85c8eee..bae2fc36b8c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ClassReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ClassReflection.php
index a5c13952bc6..4bbc5b34902 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Code\Reflection;
use ReflectionClass;
use Zend\Code\Annotation\AnnotationCollection;
use Zend\Code\Annotation\AnnotationManager;
-use Zend\Code\Reflection\FileReflection;
use Zend\Code\Scanner\AnnotationScanner;
use Zend\Code\Scanner\FileScanner;
@@ -112,8 +111,13 @@ class ClassReflection extends ReflectionClass implements ReflectionInterface
*/
public function getContents($includeDocBlock = true)
{
- $filename = $this->getFileName();
- $filelines = file($filename);
+ $fileName = $this->getFileName();
+
+ if (false === $fileName || ! file_exists($fileName)) {
+ return '';
+ }
+
+ $filelines = file($fileName);
$startnum = $this->getStartLine($includeDocBlock);
$endnum = $this->getEndLine() - $this->getStartLine();
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 9d21f7af592..9afdee0878c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3f3124931e0..43473bd3882 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,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-2014 Zend Technologies USA 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/LicenseTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/LicenseTag.php
index 76ae619b96a..d1148ef6213 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d07d4950d6f..1b002980a6f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ParamTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ParamTag.php
index 1fddda34a93..b11a16e4ef2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2e277cf044d..01bea4b9d44 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8d5231ed36b..a15ffd21502 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b8f99c0abef..f43d7e2e3f9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 08d5cf9f581..6edc86d3974 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,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-2014 Zend Technologies USA 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/ThrowsTag.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/Tag/ThrowsTag.php
index 14b6e25f63e..25453460fa1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 761b39c6a1c..2c987e99842 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/TagManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlock/TagManager.php
@@ -3,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-2014 Zend Technologies USA 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/DocBlockReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/DocBlockReflection.php
index 3b2257e927f..15616da43ef 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/BadMethodCallException.php
index a1eae8cbd81..3e6a93bc885 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/ExceptionInterface.php
index 40d791e96ed..9920957b2fd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/InvalidArgumentException.php
index 096ee5beaf2..2a83d9a0bb7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/Exception/RuntimeException.php
index aae5e0f8d49..4e050bccf82 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FileReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FileReflection.php
index 122198e9329..d48ab943261 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FunctionReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FunctionReflection.php
index 75b7ab8ea70..3ef87303728 100644
--- a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FunctionReflection.php
+++ b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/FunctionReflection.php
@@ -3,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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -59,9 +59,15 @@ class FunctionReflection extends ReflectionFunction implements ReflectionInterfa
*/
public function getContents($includeDocBlock = true)
{
+ $fileName = $this->getFileName();
+
+ if (false === $fileName || ! file_exists($fileName)) {
+ return '';
+ }
+
return implode("\n",
array_splice(
- file($this->getFileName()),
+ file($fileName),
$this->getStartLine($includeDocBlock),
($this->getEndLine() - $this->getStartLine()),
true
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/MethodReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/MethodReflection.php
index 81a7bd5e34b..b9570c91187 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -125,7 +125,13 @@ class MethodReflection extends PhpReflectionMethod implements ReflectionInterfac
*/
public function getContents($includeDocBlock = true)
{
- $fileContents = file($this->getFileName());
+ $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());
@@ -139,8 +145,14 @@ class MethodReflection extends PhpReflectionMethod implements ReflectionInterfac
*/
public function getBody()
{
+ $fileName = $this->getDeclaringClass()->getFileName();
+
+ if (false === $fileName || ! file_exists($fileName)) {
+ return '';
+ }
+
$lines = array_slice(
- file($this->getDeclaringClass()->getFileName(), FILE_IGNORE_NEW_LINES),
+ file($fileName, FILE_IGNORE_NEW_LINES),
$this->getStartLine(),
($this->getEndLine() - $this->getStartLine()),
true
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ParameterReflection.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ParameterReflection.php
index 4b8b067f314..e6239abce72 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e9cecfee730..cbf2dff13f1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ReflectionInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Reflection/ReflectionInterface.php
index 862576a0d0c..3298d4e6c44 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AggregateDirectoryScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/AggregateDirectoryScanner.php
index b7928ad7e59..f7f1549f9d1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AnnotationScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/AnnotationScanner.php
index 4770b6d9be4..fdb0641c53e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CachingFileScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/CachingFileScanner.php
index e88aa03fdbe..9da4156a9c6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ClassScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ClassScanner.php
index ae02f24a9d9..b872ffeff25 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ConstantScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ConstantScanner.php
index 02617c710bc..ddff716ccf9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DerivedClassScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/DerivedClassScanner.php
index 76156bab2c2..6c8463ede28 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4bae2267260..b1a0223daa3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2e594cbfe29..fd76728a987 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FileScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/FileScanner.php
index 0c435e30e98..40d2182f04a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FunctionScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/FunctionScanner.php
index a5a8a043b3e..dbb082b23bc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6e39320dcd5..6ff4f9be9b1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -490,6 +490,9 @@ class MethodScanner implements ScannerInterface
goto SCANNER_CONTINUE_SIGNATURE;
case ')':
$parentCount--;
+ if($parentCount > 0) {
+ goto SCANNER_CONTINUE_SIGNATURE;
+ }
if ($parentCount === 0) {
if ($infos) {
$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 97de25e9622..caf485f1350 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -196,7 +196,7 @@ class ParameterScanner
}
if ($this->name !== null) {
- $this->defaultValue .= (is_string($token)) ? $token : $token[1];
+ $this->defaultValue .= trim((is_string($token)) ? $token : $token[1]);
}
SCANNER_CONTINUE:
diff --git a/vendor/zendframework/zendframework/library/Zend/Code/Scanner/PropertyScanner.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/PropertyScanner.php
index 0ba37f6f331..2f832daa712 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ScannerInterface.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/ScannerInterface.php
index 4909ae2ee95..8acb04ecd46 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1f16f9743ed..3bbf201b4fc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Util.php b/vendor/zendframework/zendframework/library/Zend/Code/Scanner/Util.php
index 0ed7fc5524e..e54ae0b8833 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a48cfd970d2..d0826cc2453 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Config.php b/vendor/zendframework/zendframework/library/Zend/Config/Config.php
index a1e1f7d65fe..dd85f3d5535 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Config/Exception/ExceptionInterface.php
index 92272f8d161..5824f01f5c1 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Config/Exception/InvalidArgumentException.php
index 0d15e1f15b0..ed733922f4b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Config/Exception/RuntimeException.php
index d91923ced8c..d247775b754 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Factory.php b/vendor/zendframework/zendframework/library/Zend/Config/Factory.php
index 86fe6b6a3ce..ba7ef07427a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Constant.php b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Constant.php
index 265c937db2c..28f76b9a757 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7740a26cbd8..99909f289a9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 aafe0991e45..6aa28e91c03 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 386e2517ebb..9a7905f2190 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fb85b53f97d..2af2e1b3f49 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -176,17 +176,30 @@ class Token implements ProcessorInterface
/**
* Build replacement map
+ *
+ * @return array
*/
protected function buildMap()
{
- if (!$this->suffix && !$this->prefix) {
- $this->map = $this->tokens;
- } else {
- $this->map = array();
- foreach ($this->tokens as $token => $value) {
- $this->map[$this->prefix . $token . $this->suffix] = $value;
+ if (null === $this->map) {
+ if (!$this->suffix && !$this->prefix) {
+ $this->map = $this->tokens;
+ } else {
+ $this->map = array();
+
+ foreach ($this->tokens as $token => $value) {
+ $this->map[$this->prefix . $token . $this->suffix] = $value;
+ }
+ }
+
+ foreach (array_keys($this->map) as $key) {
+ if (empty($key)) {
+ unset($this->map[$key]);
+ }
}
}
+
+ return $this->map;
}
/**
@@ -198,28 +211,7 @@ class Token implements ProcessorInterface
*/
public function process(Config $config)
{
- if ($config->isReadOnly()) {
- throw new Exception\InvalidArgumentException('Cannot process config because it is read-only');
- }
-
- if ($this->map === null) {
- $this->buildMap();
- }
-
- /**
- * Walk through config and replace values
- */
- $keys = array_keys($this->map);
- $values = array_values($this->map);
- foreach ($config as $key => $val) {
- if ($val instanceof Config) {
- $this->process($val);
- } else {
- $config->$key = str_replace($keys, $values, $val);
- }
- }
-
- return $config;
+ return $this->doProcess($config, $this->buildMap());
}
/**
@@ -230,12 +222,53 @@ class Token implements ProcessorInterface
*/
public function processValue($value)
{
- if ($this->map === null) {
- $this->buildMap();
+ return $this->doProcess($value, $this->buildMap());
+ }
+
+ /**
+ * Applies replacement map to the given value by modifying the value itself
+ *
+ * @param mixed $value
+ * @param array $replacements
+ *
+ * @return mixed
+ *
+ * @throws Exception\InvalidArgumentException if the provided value is a read-only {@see Config}
+ */
+ private function doProcess($value, array $replacements)
+ {
+ if ($value instanceof Config) {
+ if ($value->isReadOnly()) {
+ throw new Exception\InvalidArgumentException('Cannot process config because it is read-only');
+ }
+
+ foreach ($value as $key => $val) {
+ $value->$key = $this->doProcess($val, $replacements);
+ }
+
+ return $value;
+ }
+
+ if ($value instanceof Traversable || is_array($value)) {
+ foreach ($value as & $val) {
+ $val = $this->doProcess($val, $replacements);
+ }
+
+ return $value;
+ }
+
+ if (!is_string($value) && (is_bool($value) || is_numeric($value))) {
+ $stringVal = (string) $value;
+ $changedVal = strtr($value, $this->map);
+
+ // replace the value only if a string replacement occurred
+ if ($changedVal !== $stringVal) {
+ return $changedVal;
+ }
+
+ return $value;
}
- $keys = array_keys($this->map);
- $values = array_values($this->map);
- return str_replace($keys, $values, $value);
+ return strtr((string) $value, $this->map);
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Config/Processor/Translator.php b/vendor/zendframework/zendframework/library/Zend/Config/Processor/Translator.php
index db9691d1972..62a25216922 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Ini.php b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Ini.php
index 8f682d28847..b44ab5380a1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Json.php b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Json.php
index 3166e6b0e47..407e2aafa58 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9061c57a857..0393fe0528a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ad81764c626..369b0b4f48d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Yaml.php b/vendor/zendframework/zendframework/library/Zend/Config/Reader/Yaml.php
index 9ccbb9685c8..67fe6fcb1ab 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ReaderPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Config/ReaderPluginManager.php
index 8b0a3ee048f..3e74a5640c0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractWriter.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/AbstractWriter.php
index 5c7d69896a4..fa94a6b8672 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Ini.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Ini.php
index 1fffa8f16af..9244f73e62a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4048ee8e1ff..04548495b7d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 478a006ad8d..fa33604d95c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Config/Writer/PhpArray.php
+++ b/vendor/zendframework/zendframework/library/Zend/Config/Writer/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/WriterInterface.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/WriterInterface.php
index d121b8847da..afbecd104b1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 41a5ca51d78..3f46c7d9f32 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Yaml.php b/vendor/zendframework/zendframework/library/Zend/Config/Writer/Yaml.php
index be2aa07a048..7170841ce0e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/WriterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Config/WriterPluginManager.php
index d3d709ed9ea..d6733452fd1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AbstractAdapter.php
index 5cf5ae9d273..d79a2815d51 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/AdapterInterface.php
index eb3f8d3e441..2fa1eb870f7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Posix.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Posix.php
index 7e5c5059e0c..5f07863c5d2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Virtual.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/Virtual.php
index bd983cb1370..f1b1eb95e36 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9ba1b9cdd76..22ef674b116 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/WindowsAnsicon.php b/vendor/zendframework/zendframework/library/Zend/Console/Adapter/WindowsAnsicon.php
index 850c8f11fd7..591b3fd2183 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Ascii.php b/vendor/zendframework/zendframework/library/Zend/Console/Charset/Ascii.php
index 4bda2853dbc..072c2d690a9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AsciiExtended.php b/vendor/zendframework/zendframework/library/Zend/Console/Charset/AsciiExtended.php
index 8561d718dde..e8e071fb008 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CharsetInterface.php b/vendor/zendframework/zendframework/library/Zend/Console/Charset/CharsetInterface.php
index 138f6425a9a..c64656c1d64 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 038809aa2e4..3bb3d609836 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Utf8.php b/vendor/zendframework/zendframework/library/Zend/Console/Charset/Utf8.php
index 634e7b4f37c..f8827934ab3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Utf8Heavy.php b/vendor/zendframework/zendframework/library/Zend/Console/Charset/Utf8Heavy.php
index cad5ac711a2..ca51452f233 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Color/Xterm256.php b/vendor/zendframework/zendframework/library/Zend/Console/Color/Xterm256.php
index b3d3ba4da05..1728014ede1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ColorInterface.php b/vendor/zendframework/zendframework/library/Zend/Console/ColorInterface.php
index fa5d32174d9..b2cc770b4e0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 527684264fa..20f4872fc35 100644
--- a/vendor/zendframework/zendframework/library/Zend/Console/Console.php
+++ b/vendor/zendframework/zendframework/library/Zend/Console/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Console/Exception/BadMethodCallException.php
index f95109cccc2..ac0d6fb6bad 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Console/Exception/ExceptionInterface.php
index b0893dd28c1..70d8baf8150 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3380d5cfe5f..ad3b4e97b9f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 21e27710145..6551912c493 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 617d8fd5ac1..e7ecf91a3dc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractPrompt.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/AbstractPrompt.php
index 7ccb28ce0f4..cd717cf35ca 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 648ff2c7132..7a7dde1f271 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Confirm.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Confirm.php
index 93399e3d79e..77db665d067 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Line.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Line.php
index 45a885a9a3f..4abcd5e9f9e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Number.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Number.php
index 7bb299bb728..8ce53300532 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4f1ece40b69..a4f1376f8b8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Select.php b/vendor/zendframework/zendframework/library/Zend/Console/Prompt/Select.php
index 6eb5e42ac58..896a8c10dd1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Request.php b/vendor/zendframework/zendframework/library/Zend/Console/Request.php
index 16d6bf0d312..57b48bb2cb1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 df580c9800a..9ed1362947b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BlockCipher.php b/vendor/zendframework/zendframework/library/Zend/Crypt/BlockCipher.php
index 25d2ab5367b..03cc12da82e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Crypt/BlockCipher.php
+++ b/vendor/zendframework/zendframework/library/Zend/Crypt/BlockCipher.php
@@ -3,16 +3,14 @@
* 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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Crypt;
-use Zend\Crypt\Hmac;
use Zend\Crypt\Key\Derivation\Pbkdf2;
use Zend\Crypt\Symmetric\SymmetricInterface;
-use Zend\Crypt\Utils;
use Zend\Math\Rand;
/**
@@ -358,7 +356,8 @@ class BlockCipher
*/
public function encrypt($data)
{
- if (empty($data)) {
+ // 0 (as integer), 0.0 (as float) & '0' (as string) will return false, though these should be allowed
+ if (!is_string($data) || $data === '') {
throw new Exception\InvalidArgumentException('The data to encrypt cannot be empty');
}
if (empty($this->cipher)) {
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/ExceptionInterface.php
index eeecc5e5d18..ef937436149 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 37446d65c01..bb7f4e1e4fe 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Exception/RuntimeException.php
index c316b902743..db07a4e6e07 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Hash.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Hash.php
index a06f2c93049..ccbd15d3bb0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b0aed19e54d..54cce7bff2f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/ExceptionInterface.php
index 92c9b92057e..31bdfff9871 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/InvalidArgumentException.php
index 25a931595f2..e4c2512743e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Exception/RuntimeException.php
index 189904574d5..9421317c5bb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Pbkdf2.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Pbkdf2.php
index 74748f9d9f1..8d216d646a9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d7da1bb1154..9e3229b082e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Scrypt.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Key/Derivation/Scrypt.php
index af04a4c9ae8..6140cb85d6f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Crypt\Key\Derivation;
-use Zend\Crypt\Key\Derivation\Pbkdf2;
/**
* Scrypt key derivation function
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Apache.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Apache.php
index 63b39b9d07c..3d907610a54 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Crypt\Password;
use Traversable;
use Zend\Math\Rand;
-use Zend\Stdlib\ArrayUtils;
/**
* Apache password authentication
diff --git a/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Bcrypt.php
index 8dfa3cb262e..851f1091564 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Password/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/ExceptionInterface.php
index a8ae021e30d..1ac342ba582 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Password/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/InvalidArgumentException.php
index 92c3b0c09b8..b71b5ef291d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Password/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/Exception/RuntimeException.php
index f18b4e91542..d854046d11b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Password/PasswordInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Password/PasswordInterface.php
index 392987936ba..1f7683eacc8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f88308ab66c..3332886cb00 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa.php
index 03b1f177514..44faaa7d787 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Crypt\PublicKey;
use Traversable;
use Zend\Crypt\PublicKey\Rsa\Exception;
-use Zend\Crypt\PublicKey\RsaOptions;
use Zend\Stdlib\ArrayUtils;
/**
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 9777f5458e4..5051c771641 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bfca848095e..3ad4156c167 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/InvalidArgumentException.php
index 73e942023e1..03561e86830 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/Exception/RuntimeException.php
index caea88fda26..3ac77fd43a4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PrivateKey.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/Rsa/PrivateKey.php
index 37b3e9f40ff..54ebd5f5ff5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1fce4b13e09..82e8404f41f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RsaOptions.php b/vendor/zendframework/zendframework/library/Zend/Crypt/PublicKey/RsaOptions.php
index 6e883f103e6..b268cfdc392 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/ExceptionInterface.php
index 8d604f31976..c7ddf38d1a5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/InvalidArgumentException.php
index 4f8e44a1677..d157cfffd72 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Exception/RuntimeException.php
index 90c1488dee4..152634ca67d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Mcrypt.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/Mcrypt.php
index 776408088fa..7410a8d8d7d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -219,6 +219,7 @@ class Mcrypt implements SymmetricInterface
/**
* Set the encryption key
+ * If the key is longer than maximum supported, it will be truncated by getKey().
*
* @param string $key
* @throws Exception\InvalidArgumentException
@@ -226,13 +227,25 @@ class Mcrypt implements SymmetricInterface
*/
public function setKey($key)
{
- if (empty($key)) {
+ $keyLen = strlen($key);
+
+ if (!$keyLen) {
throw new Exception\InvalidArgumentException('The key cannot be empty');
}
- if (strlen($key) < $this->getKeySize()) {
- throw new Exception\InvalidArgumentException(
- 'The size of the key must be at least of ' . $this->getKeySize() . ' bytes'
- );
+ $keySizes = mcrypt_module_get_supported_key_sizes($this->supportedAlgos[$this->algo]);
+ $maxKey = $this->getKeySize();
+
+ /*
+ * blowfish has $keySizes empty, meaning it can have arbitrary key length.
+ * 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");
+ }
}
$this->key = $key;
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 24924a7b904..24050c311c2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9589aa5072a..1c8066b4bd7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PaddingPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Crypt/Symmetric/PaddingPluginManager.php
index 736447ab2ce..48ae0690d14 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2410dd9c028..7e0ce06d921 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SymmetricPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Crypt/SymmetricPluginManager.php
index 6a8e73a92d2..5f49cccc26b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b9663363ae5..ff013dcbcaf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Adapter.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Adapter.php
index 8a948b67af6..01d1edabfe5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AdapterAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAbstractServiceFactory.php
index db99251fe1c..42800a2ce92 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 92cbbe3944d..95443a9a0df 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b0d9c497b36..3df7b36b110 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAwareTrait.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterAwareTrait.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Db\Adapter;
-use Zend\Db\Adapter\Adapter;
trait AdapterAwareTrait
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterInterface.php
index 1af603e1bb9..0f51e8dd5f7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AdapterServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/AdapterServiceFactory.php
index 8d995a645d4..f0619ad8e77 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1beb4fb2a2b..2e27fd68893 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 98d6b3ada09..98bbc835df7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8252923495e..699ba2af201 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DriverFeatureInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Feature/DriverFeatureInterface.php
index 5e2146f4e77..10c96f7731d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0d344150622..50c161537d3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -162,18 +162,17 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
return null;
};
- $connection = array();
- $connection['database'] = $findParameterValue(array('database', 'db'));
- $connection['username'] = $findParameterValue(array('username', 'uid', 'UID'));
- $connection['password'] = $findParameterValue(array('password', 'pwd', 'PWD'));
- $connection['options'] = (isset($p['driver_options']) ? $p['driver_options'] : array());
-
- $this->resource = db2_connect(
- $connection['database'],
- $connection['username'],
- $connection['password'],
- $connection['options']
- );
+ $database = $findParameterValue(array('database', 'db'));
+ $username = $findParameterValue(array('username', 'uid', 'UID'));
+ $password = $findParameterValue(array('password', 'pwd', 'PWD'));
+ $isPersistent = $findParameterValue(array('persistent', 'PERSISTENT', 'Persistent'));
+ $options = (isset($p['driver_options']) ? $p['driver_options'] : array());
+
+ if ($isPersistent) {
+ $this->resource = db2_pconnect($database, $username, $password, $options);
+ } else {
+ $this->resource = db2_connect($database, $username, $password, $options);
+ }
if ($this->resource === false) {
throw new Exception\RuntimeException(sprintf(
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 fab7c5b779b..1f97bb8c010 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/IbmDb2/Result.php
index 711917c510e..add4e1e3f16 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 362f7a8896f..029a9ed276f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 190000dea46..fb7ddde3ee7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Mysqli.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Mysqli.php
index 4199d600a2c..8c1be74b1e0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Result.php
index d0ec8191c4c..7cd1118ceb8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
index a3184f6c252..5d750adcf3e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Oci8/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Connection.php
index 0092bc75ecb..053afd44527 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -184,17 +184,18 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
$password = $findParameterValue(array('password'));
$connectionString = $findParameterValue(array('connection_string', 'connectionstring', 'connection', 'hostname', 'instance'));
$characterSet = $findParameterValue(array('character_set', 'charset', 'encoding'));
+ $sessionMode = $findParameterValue(array('session_mode'));
// connection modifiers
$isUnique = $findParameterValue(array('unique'));
$isPersistent = $findParameterValue(array('persistent'));
if ($isUnique == true) {
- $this->resource = oci_new_connect($username, $password, $connectionString, $characterSet);
+ $this->resource = oci_new_connect($username, $password, $connectionString, $characterSet, $sessionMode);
} elseif ($isPersistent == true) {
- $this->resource = oci_pconnect($username, $password, $connectionString, $characterSet);
+ $this->resource = oci_pconnect($username, $password, $connectionString, $characterSet, $sessionMode);
} else {
- $this->resource = oci_connect($username, $password, $connectionString, $characterSet);
+ $this->resource = oci_connect($username, $password, $connectionString, $characterSet, $sessionMode);
}
if (!$this->resource) {
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 0e8d49e3051..0b074b2971f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Oci8/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Result.php
index 375dc3705eb..98217d8a34f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Oci8/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Oci8/Statement.php
index 8dc7388b233..a9ebd0ca02f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Pdo/Connection.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Connection.php
index 2ece6759009..127455a0484 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -419,7 +419,7 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
* Get last generated id
*
* @param string $name
- * @return int|null|false
+ * @return string|null|false
*/
public function getLastGeneratedValue($name = null)
{
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 1d614606b41..3ad4e9f62a1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Pdo/Feature/SqliteRowCounter.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php
index 08f80b71b5f..98bb2901bf4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Pdo/Pdo.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Pdo.php
index bcae2c6fa55..1d0fb8a9842 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Pdo/Result.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pdo/Result.php
index b73c5b5d31c..8a6879d8546 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -77,6 +77,7 @@ class Result implements Iterator, ResultInterface
$this->resource = $resource;
$this->generatedValue = $generatedValue;
$this->rowCount = $rowCount;
+
return $this;
}
@@ -117,6 +118,7 @@ class Result implements Iterator, ResultInterface
}
$this->currentData = $this->resource->fetch(\PDO::FETCH_ASSOC);
+ $this->currentComplete = true;
return $this->currentData;
}
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 ae22ed54b71..a52f94c6df7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -242,7 +242,11 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
if ($this->profiler) {
$this->profiler->profilerFinish();
}
- throw new Exception\InvalidQueryException('Statement could not be executed', null, $e);
+ throw new Exception\InvalidQueryException(
+ 'Statement could not be executed (' . implode(' - ', $this->resource->errorInfo()) . ')',
+ null,
+ $e
+ );
}
if ($this->profiler) {
@@ -264,7 +268,11 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
$parameters = $this->parameterContainer->getNamedArray();
foreach ($parameters as $name => &$value) {
- $type = \PDO::PARAM_STR;
+ if (is_bool($value)) {
+ $type = \PDO::PARAM_BOOL;
+ } else {
+ $type = \PDO::PARAM_STR;
+ }
if ($this->parameterContainer->offsetHasErrata($name)) {
switch ($this->parameterContainer->offsetGetErrata($name)) {
case ParameterContainer::TYPE_INTEGER:
@@ -276,9 +284,6 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
case ParameterContainer::TYPE_LOB:
$type = \PDO::PARAM_LOB;
break;
- case (is_bool($value)):
- $type = \PDO::PARAM_BOOL;
- break;
}
}
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 96906793761..c6200e9c11b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -277,8 +277,6 @@ class Connection implements ConnectionInterface, Profiler\ProfilerAwareInterface
$this->profiler->profilerFinish($sql);
}
- //var_dump(pg_result_status($resultResource));
-
// if the returnValue is something other than a pg result resource, bypass wrapping it
if ($resultResource === false) {
throw new Exception\InvalidQueryException(pg_errormessage());
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 f30255e9b10..36e5e0f294f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -217,10 +217,11 @@ class Pgsql implements DriverInterface, Profiler\ProfilerAwareInterface
/**
* Get last generated value
*
+ * @param string $name
* @return mixed
*/
- public function getLastGeneratedValue()
+ public function getLastGeneratedValue($name = null)
{
- return $this->connection->getLastGeneratedValue();
+ return $this->connection->getLastGeneratedValue($name);
}
}
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 b007bc4a7c4..9a7f5685f14 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php
index 9b2eb501632..c105a6647ed 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e0fa5954ddd..cb1f4078499 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ac790652cef..8ce6138a388 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ErrorException.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ErrorException.php
index f5ee3bc9ec9..8330559fed0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ExceptionInterface.php
index 221d330e980..a7168e8d6e0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 77a22d8fdb0..f7fa0ffb8b4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Sqlsrv.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Sqlsrv.php
index ea7dcb35daf..bf8af428a70 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Statement.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
index 43a1e00da25..e3e157d3bd1 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
@@ -3,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-2014 Zend Technologies USA 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/StatementInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Driver/StatementInterface.php
index afb37f2e061..e6fab35726a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ErrorException.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/ErrorException.php
index 5c63b3e8f9b..125550a24ce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 32263c84575..3f3660d99e0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 50dea0db97d..5cf7a4bfa38 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 53487be5d14..152038a48ce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidQueryException.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Exception/InvalidQueryException.php
index ebda2c6d7f0..1372237fe17 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cfe1c3e6b8a..e1ff785998e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 72eccb247a0..46859f26d2f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cefe0eea45a..491b4ad746f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/IbmDb2.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/IbmDb2.php
index 67742134034..a888cb6d26a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Mysql.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Mysql.php
index 3b16f260e46..6e02f083abc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9081243d3f6..828a2d64502 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PlatformInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/PlatformInterface.php
index 2eddb8e78ce..d8ec05b2be0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 71247a5fc41..e4d1ce59c87 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Sql92.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Sql92.php
index 681774c4d64..e1e95ded5ba 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SqlServer.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/SqlServer.php
index 2d24234918a..9588046abb7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Sqlite.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/Platform/Sqlite.php
index f4dc7697090..4b1877100ba 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -107,12 +107,16 @@ class Sqlite implements PlatformInterface
*/
public function quoteValue($value)
{
- if ($this->resource instanceof DriverInterface) {
- $this->resource = $this->resource->getConnection()->getResource();
+ $resource = $this->resource;
+
+ if ($resource instanceof DriverInterface) {
+ $resource = $resource->getConnection()->getResource();
}
- if ($this->resource instanceof \PDO) {
- return $this->resource->quote($value);
+
+ if ($resource instanceof \PDO) {
+ return $resource->quote($value);
}
+
trigger_error(
'Attempting to quote a value in ' . __CLASS__ . ' without extension/driver support '
. 'can introduce security vulnerabilities in a production environment.'
@@ -130,12 +134,16 @@ class Sqlite implements PlatformInterface
*/
public function quoteTrustedValue($value)
{
- if ($this->resource instanceof DriverInterface) {
- $this->resource = $this->resource->getConnection()->getResource();
+ $resource = $this->resource;
+
+ if ($resource instanceof DriverInterface) {
+ $resource = $resource->getConnection()->getResource();
}
- if ($this->resource instanceof \PDO) {
- return $this->resource->quote($value);
+
+ if ($resource instanceof \PDO) {
+ return $resource->quote($value);
}
+
return '\'' . addcslashes($value, "\x00\n\r\\'\"\x1a") . '\'';
}
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 8a0c6d2b32e..5115e3f3f16 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e55c1e45a82..a0b631d94b6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 65e71b756db..5f8ee90e21f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 35bbf8b2dc1..e1f033b07ec 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/StatementContainerInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Adapter/StatementContainerInterface.php
index fd3266bfa62..098d6a6fdec 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ErrorException.php b/vendor/zendframework/zendframework/library/Zend/Db/Exception/ErrorException.php
index 478ac1f93d3..f6915a8c2b9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 17e22a03b01..9f480dd4e98 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f48c46bf4d2..efeba3a770f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7f6517adc5b..57ed5847699 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2b80c015472..9671d8a4663 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4ad8016997c..06382f73858 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/MetadataInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/MetadataInterface.php
index d25b9f83e15..cc82db2fefb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractTableObject.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/AbstractTableObject.php
index d332efde0c2..17da65d1eb1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ColumnObject.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ColumnObject.php
index c242e517192..34ebb41dba4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ConstraintKeyObject.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ConstraintKeyObject.php
new file mode 100644
index 00000000000..c0a4d265520
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Object/ConstraintKeyObject.php
@@ -0,0 +1,250 @@
+<?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\Db\Metadata\Object;
+
+class ConstraintKeyObject
+{
+ const FK_CASCADE = 'CASCADE';
+ const FK_SET_NULL = 'SET NULL';
+ const FK_NO_ACTION = 'NO ACTION';
+ const FK_RESTRICT = 'RESTRICT';
+ const FK_SET_DEFAULT = 'SET DEFAULT';
+
+ /**
+ *
+ * @var string
+ */
+ protected $columnName = null;
+
+ /**
+ *
+ * @var int
+ */
+ protected $ordinalPosition = null;
+
+ /**
+ *
+ * @var bool
+ */
+ protected $positionInUniqueConstraint = null;
+
+ /**
+ *
+ * @var string
+ */
+ protected $referencedTableSchema = null;
+
+ /**
+ *
+ * @var string
+ */
+ protected $referencedTableName = null;
+
+ /**
+ *
+ * @var string
+ */
+ protected $referencedColumnName = null;
+
+ /**
+ *
+ * @var string
+ */
+ protected $foreignKeyUpdateRule = null;
+
+ /**
+ *
+ * @var string
+ */
+ protected $foreignKeyDeleteRule = null;
+
+ /**
+ * Constructor
+ *
+ * @param string $column
+ */
+ public function __construct($column)
+ {
+ $this->setColumnName($column);
+ }
+
+ /**
+ * Get column name
+ *
+ * @return string
+ */
+ public function getColumnName()
+ {
+ return $this->columnName;
+ }
+
+ /**
+ * Set column name
+ *
+ * @param string $columnName
+ * @return ConstraintKeyObject
+ */
+ public function setColumnName($columnName)
+ {
+ $this->columnName = $columnName;
+ return $this;
+ }
+
+ /**
+ * Get ordinal position
+ *
+ * @return int
+ */
+ public function getOrdinalPosition()
+ {
+ return $this->ordinalPosition;
+ }
+
+ /**
+ * Set ordinal position
+ *
+ * @param int $ordinalPosition
+ * @return ConstraintKeyObject
+ */
+ public function setOrdinalPosition($ordinalPosition)
+ {
+ $this->ordinalPosition = $ordinalPosition;
+ return $this;
+ }
+
+ /**
+ * Get position in unique constraint
+ *
+ * @return bool
+ */
+ public function getPositionInUniqueConstraint()
+ {
+ return $this->positionInUniqueConstraint;
+ }
+
+ /**
+ * Set position in unique constraint
+ *
+ * @param bool $positionInUniqueConstraint
+ * @return ConstraintKeyObject
+ */
+ public function setPositionInUniqueConstraint($positionInUniqueConstraint)
+ {
+ $this->positionInUniqueConstraint = $positionInUniqueConstraint;
+ return $this;
+ }
+
+ /**
+ * Get referencred table schema
+ *
+ * @return string
+ */
+ public function getReferencedTableSchema()
+ {
+ return $this->referencedTableSchema;
+ }
+
+ /**
+ * Set referenced table schema
+ *
+ * @param string $referencedTableSchema
+ * @return ConstraintKeyObject
+ */
+ public function setReferencedTableSchema($referencedTableSchema)
+ {
+ $this->referencedTableSchema = $referencedTableSchema;
+ return $this;
+ }
+
+ /**
+ * Get referenced table name
+ *
+ * @return string
+ */
+ public function getReferencedTableName()
+ {
+ return $this->referencedTableName;
+ }
+
+ /**
+ * Set Referenced table name
+ *
+ * @param string $referencedTableName
+ * @return ConstraintKeyObject
+ */
+ public function setReferencedTableName($referencedTableName)
+ {
+ $this->referencedTableName = $referencedTableName;
+ return $this;
+ }
+
+ /**
+ * Get referenced column name
+ *
+ * @return string
+ */
+ public function getReferencedColumnName()
+ {
+ return $this->referencedColumnName;
+ }
+
+ /**
+ * Set referenced column name
+ *
+ * @param string $referencedColumnName
+ * @return ConstraintKeyObject
+ */
+ public function setReferencedColumnName($referencedColumnName)
+ {
+ $this->referencedColumnName = $referencedColumnName;
+ return $this;
+ }
+
+ /**
+ * set foreign key update rule
+ *
+ * @param string $foreignKeyUpdateRule
+ */
+ public function setForeignKeyUpdateRule($foreignKeyUpdateRule)
+ {
+ $this->foreignKeyUpdateRule = $foreignKeyUpdateRule;
+ }
+
+ /**
+ * Get foreign key update rule
+ *
+ * @return string
+ */
+ public function getForeignKeyUpdateRule()
+ {
+ return $this->foreignKeyUpdateRule;
+ }
+
+ /**
+ * Set foreign key delete rule
+ *
+ * @param string $foreignKeyDeleteRule
+ */
+ public function setForeignKeyDeleteRule($foreignKeyDeleteRule)
+ {
+ $this->foreignKeyDeleteRule = $foreignKeyDeleteRule;
+ }
+
+ /**
+ * get foreign key delete rule
+ *
+ * @return string
+ */
+ public function getForeignKeyDeleteRule()
+ {
+ 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 655dd974ed7..089c5ea1fb5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cc5ea2e37ab..8735fbfc8c3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 360e0deca0b..eece8c4f42c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f4b29ec6dff..5130e9ecc62 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9e6c614b7f0..6d3063781b9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/MysqlMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/MysqlMetadata.php
index 180e37dae32..ac9642f9c1f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PostgresqlMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/PostgresqlMetadata.php
index b7545b00948..6fb731b4b55 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SqlServerMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqlServerMetadata.php
index 186ef94486f..16937bc5d9f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SqliteMetadata.php b/vendor/zendframework/zendframework/library/Zend/Db/Metadata/Source/SqliteMetadata.php
index 46ef4f8b31b..16589616973 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractResultSet.php b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/AbstractResultSet.php
index 2e783738eb6..0074ebfbfe3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/AbstractResultSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/AbstractResultSet.php
@@ -3,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-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/ResultSet/Exception/ExceptionInterface.php
index b54ce8844c0..7f7648b33fd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c50a5dc0ac4..42f3c93ae35 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 081f4028b00..f201ac10f7f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d4d7b9632f2..a4bd9162982 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f212a25de5f..2286410c659 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f3839cbafdd..c2bbd73b273 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d7589fff833..4183bbf2c2e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -132,12 +132,15 @@ abstract class AbstractRowGateway implements ArrayAccess, Countable, RowGatewayI
$data = $this->data;
$where = array();
+ $isPkModified = false;
// primary key is always an array even if its a single column
foreach ($this->primaryKeyColumn as $pkColumn) {
$where[$pkColumn] = $this->primaryKeyData[$pkColumn];
if ($data[$pkColumn] == $this->primaryKeyData[$pkColumn]) {
unset($data[$pkColumn]);
+ } else {
+ $isPkModified = true;
}
}
@@ -146,6 +149,14 @@ abstract class AbstractRowGateway implements ArrayAccess, Countable, RowGatewayI
$rowsAffected = $result->getAffectedRows();
unset($statement, $result); // cleanup
+ // If one or more primary keys are modified, we update the where clause
+ if ($isPkModified) {
+ foreach ($this->primaryKeyColumn as $pkColumn) {
+ if ($data[$pkColumn] != $this->primaryKeyData[$pkColumn]) {
+ $where[$pkColumn] = $data[$pkColumn];
+ }
+ }
+ }
} else {
// INSERT
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 c100f338139..7bb37fc982c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1ae3e702e0d..7db3117deea 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a006f9db81f..0b698c64585 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0bb91a66633..c52e7fc2a92 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FeatureSet.php b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/Feature/FeatureSet.php
index 9ded5351654..de3b2344fb0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7c9fc775667..1415d6995e7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RowGatewayInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/RowGateway/RowGatewayInterface.php
index 3ffb5d68e37..e0a20b554d4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5153e26b96c..aad983d582e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/AbstractSql.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/AbstractSql.php
@@ -3,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-2014 Zend Technologies USA 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/AlterTable.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/AlterTable.php
index 60fb4b08217..0c9d630f9ee 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BigInteger.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/BigInteger.php
index 53ae6ee1265..d915a948f30 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 db879b5c082..1892ca6039b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Boolean.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Boolean.php
index d6255e53d2c..36c07187cbd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3f1315a5eb7..507cfe2c609 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1451275b587..de2f852b0d0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3ea33e666a8..331e5254f44 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Date.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/Column/Date.php
index 930b89a3a5a..489a11439e2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1983099ac2d..8a0ff25e3c7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6fe3751bb98..e866abcf558 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 670a7276720..5e424285c0d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ee07aafb301..3e407090937 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,13 +3,12 @@
* 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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Db\Sql\Ddl\Column;
-use Zend\Db\Sql\Ddl\Column\Column;
class Text extends Column
{
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 60c11ad554a..68d3c66484e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7da9a362df0..49a718c78cb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9212d805417..19909fadb22 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c0fa1ff71ef..1afbeb39cbd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 73fd27682ae..bcb96439432 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c29df551f48..1d0c0cad473 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 597c72c9391..84124a4d0a1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 adb496cbe70..8d871054e18 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CreateTable.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Ddl/CreateTable.php
index bc707e006f7..45bfd982d9d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -39,7 +39,7 @@ class CreateTable extends AbstractSql implements SqlInterface
* @var array
*/
protected $specifications = array(
- self::TABLE => 'CREATE TABLE %1$s (',
+ self::TABLE => 'CREATE %1$sTABLE %2$s (',
self::COLUMNS => array(
"\n %1\$s" => array(
array(1 => '%1$s', 'combinedby' => ",\n ")
@@ -156,6 +156,7 @@ class CreateTable extends AbstractSql implements SqlInterface
$parameters
);
+
if ($specification
&& is_array($parameters[$name])
&& ($parameters[$name] != array(array()))
@@ -173,6 +174,7 @@ class CreateTable extends AbstractSql implements SqlInterface
}
}
+
// remove last ,
if (count($sqls) > 2) {
array_pop($sqls);
@@ -187,8 +189,11 @@ class CreateTable extends AbstractSql implements SqlInterface
{
$ret = array();
if ($this->isTemporary) {
- $ret[] = 'TEMPORARY';
+ $ret[] = 'TEMPORARY ';
+ } else {
+ $ret[] = '';
}
+
$ret[] = $adapterPlatform->quoteIdentifier($this->table);
return $ret;
}
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 ff7eea34603..e38425c6bbb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d911134616a..761312458a9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d7452f9688d..bc66e22f851 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Exception/ExceptionInterface.php
index 63c77e815a3..337266de87a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c22196b251c..0892d68b7fa 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7c1550cb552..b6546b09083 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1a40441e7ce..b9f935b409c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2777ba3bf5d..5efa90308be 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Having.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Having.php
index d3bb4911548..bf440f3d643 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Insert.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Insert.php
index 0b08cbc9a73..63f94a54701 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -91,7 +91,7 @@ class Insert extends AbstractSql implements SqlInterface, PreparableSqlInterface
*/
public function values(array $values, $flag = self::VALUES_SET)
{
- if ($values == null) {
+ if (!is_array($values)) {
throw new Exception\InvalidArgumentException('values() expects an array of values');
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Literal.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Literal.php
index 5b12adf758d..ba67415a3d4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b65c404ab42..c5ddd6ce608 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Ddl/CreateTableDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
index 47d3ba129c9..d9cfa15563f 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,13 +3,12 @@
* 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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Db\Sql\Platform\Mysql\Ddl;
-use Zend\Db\Adapter\Driver\DriverInterface;
use Zend\Db\Adapter\Platform\PlatformInterface;
use Zend\Db\Sql\Ddl\CreateTable;
use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
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 fbf974a7a48..80455869a41 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 73e8d25e4bb..c2dda940abf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Oracle/Oracle.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/Oracle.php
index c3f7b51bb01..e8dee3ceb3b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Oracle/SelectDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Oracle/SelectDecorator.php
index 660a7e74b3a..69c1700978f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Platform.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/Platform.php
index 19f9800d213..1342c731a16 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PlatformDecoratorInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/PlatformDecoratorInterface.php
index c1daba74e7e..2ff7c97ce6d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SelectDecorator.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SelectDecorator.php
index 2b649cdcdf6..838ce588cf0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SqlServer.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Platform/SqlServer/SqlServer.php
index 3ee9d7c1c7c..4ee2ec2fb2c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Between.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Between.php
index 4516c9e2cde..686b65db58d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 042c4d90128..58ceadbfc9e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/In.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/In.php
index 5928ecf002b..569d8dac0e5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/IsNotNull.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/IsNotNull.php
index 137b8f78ee6..e09f34912a0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f53f94cac5e..007586d14f9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Like.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Like.php
index 3f53ab0968e..ba5e6479387 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Literal.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/Literal.php
index b50dc6fe184..cb4c080c833 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/NotIn.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/NotIn.php
index 5f8289409e7..ec04c186ac0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/NotLike.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/NotLike.php
index b3963d83914..329de23ed76 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cc2765cf67b..acd941406df 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ee0c83594e8..b3a02420ccb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -216,6 +216,24 @@ class Predicate extends PredicateSet
return $this;
}
+ /**
+ * Create "notLike" predicate
+ *
+ * Utilizes In predicate
+ *
+ * @param string $identifier
+ * @param string $notLike
+ * @return Predicate
+ */
+ public function notLike($identifier, $notLike)
+ {
+ $this->addPredicate(
+ new NotLike($identifier, $notLike),
+ ($this->nextPredicateCombineOperator) ? : $this->defaultCombination
+ );
+ $this->nextPredicateCombineOperator = null;
+ return $this;
+ }
/**
* Create an expression, with parameter placeholders
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 203f4707645..5d4eac6d200 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PredicateSet.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/PredicateSet.php
index 3dccad95ac2..59faf569e1e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/PredicateSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Predicate/PredicateSet.php
@@ -3,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-2014 Zend Technologies USA 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/PreparableSqlInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/PreparableSqlInterface.php
index b20bb2e2f28..b8c3a50d9ce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Select.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Select.php
index dea84756c09..dad582f54e2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -128,7 +128,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
protected $where = null;
/**
- * @var null|string
+ * @var array
*/
protected $order = array();
@@ -499,7 +499,7 @@ class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
$this->offset = null;
break;
case self::ORDER:
- $this->order = null;
+ $this->order = array();
break;
case self::COMBINE:
$this->combine = array();
diff --git a/vendor/zendframework/zendframework/library/Zend/Db/Sql/Sql.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Sql.php
index 940ba464a14..e80c7281aed 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SqlInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/SqlInterface.php
index 902680256df..d36419e5d29 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/TableIdentifier.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/TableIdentifier.php
index e368b2bd771..48771228196 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Update.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Update.php
index b5455f0045c..e484501668d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Where.php b/vendor/zendframework/zendframework/library/Zend/Db/Sql/Where.php
index 8e9705b6612..23426a93846 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractTableGateway.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/AbstractTableGateway.php
index c673687858f..94b685aa539 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Exception/ExceptionInterface.php
index 240922dbe0c..ecd3085ac6d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 11ae9223418..1f967a59477 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 56d3a96fd4e..3c79b9f0ff8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4d9503e503b..e3d4c319aad 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/EventFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature.php
index b0699be6e62..08e3cffbdca 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/EventFeature/TableGatewayEvent.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/EventFeature/TableGatewayEvent.php
index af7531eeffd..e6a20f83408 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FeatureSet.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/FeatureSet.php
index faa0f62cfec..498db1ad7f5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/FeatureSet.php
+++ b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/FeatureSet.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Db\TableGateway\Feature;
use Zend\Db\TableGateway\AbstractTableGateway;
+use Zend\Db\TableGateway\TableGatewayInterface;
class FeatureSet
{
@@ -65,8 +66,10 @@ class FeatureSet
public function addFeature(AbstractFeature $feature)
{
+ if ($this->tableGateway instanceof TableGatewayInterface) {
+ $feature->setTableGateway($this->tableGateway);
+ }
$this->features[] = $feature;
- $feature->setTableGateway($feature);
return $this;
}
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 94b847f88d5..f1fa78eb32f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/MasterSlaveFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MasterSlaveFeature.php
index 77902c53900..7c12dc8f732 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/MetadataFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/MetadataFeature.php
index 3bd74f20731..b8841588836 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RowGatewayFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/RowGatewayFeature.php
index 13f9239150a..b3c467ac499 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SequenceFeature.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/Feature/SequenceFeature.php
index b5d8ab6cf27..a896c5d38ac 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/TableGateway.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/TableGateway.php
index 781646f2f98..e1aaaf326a3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/TableGatewayInterface.php b/vendor/zendframework/zendframework/library/Zend/Db/TableGateway/TableGatewayInterface.php
index a7f2b45c409..0a77e0f1d77 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Debug/Debug.php b/vendor/zendframework/zendframework/library/Zend/Debug/Debug.php
index 0f8aac25d1e..b423b4ce6d1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Config.php b/vendor/zendframework/zendframework/library/Zend/Di/Config.php
index 7a94729d79f..b1773050459 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 369e0132f58..8534c021510 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a4cf9259d7e..d0aed5310d5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 65113b7f249..5e64f5b38ff 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 41e6f242d45..c0e3e60a234 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PhpClass.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/Builder/PhpClass.php
index 9cc669e81e5..80d4197a288 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8191e96dfbf..6ad935a0743 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0d3fd52d7f6..42281503f7f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CompilerDefinition.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/CompilerDefinition.php
index b980d17b192..0f0681d1765 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Code\Scanner\AggregateDirectoryScanner;
use Zend\Code\Scanner\DerivedClassScanner;
use Zend\Code\Scanner\DirectoryScanner;
use Zend\Code\Scanner\FileScanner;
-use Zend\Di\Definition\Annotation;
/**
* Class definitions based on a set of directories to be scanned
@@ -386,7 +385,7 @@ class CompilerDefinition implements DefinitionInterface
return false;
}
- return (array_key_exists($method, $this->classes[$class]));
+ return (array_key_exists($method, $this->classes[$class]['parameters']));
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Definition/DefinitionInterface.php b/vendor/zendframework/zendframework/library/Zend/Di/Definition/DefinitionInterface.php
index 135e2bde780..420bb459d1c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e7c487f906a..c34fbbb99dd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7e8b91c4463..4a40728f0be 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8d685994492..7097e2cfcc9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Di\Definition;
use Zend\Code\Annotation\AnnotationCollection;
use Zend\Code\Reflection;
-use Zend\Di\Definition\Annotation;
use Zend\Di\Di;
/**
@@ -90,7 +89,7 @@ class RuntimeDefinition implements DefinitionInterface
*/
public function forceLoadClass($class)
{
- $this->processClass($class);
+ $this->processClass($class, true);
}
/**
@@ -118,10 +117,7 @@ class RuntimeDefinition implements DefinitionInterface
*/
public function getClassSupertypes($class)
{
- if (!array_key_exists($class, $this->classes)) {
- $this->processClass($class);
- }
-
+ $this->processClass($class);
return $this->classes[$class]['supertypes'];
}
@@ -130,10 +126,7 @@ class RuntimeDefinition implements DefinitionInterface
*/
public function getInstantiator($class)
{
- if (!array_key_exists($class, $this->classes)) {
- $this->processClass($class);
- }
-
+ $this->processClass($class);
return $this->classes[$class]['instantiator'];
}
@@ -142,10 +135,7 @@ class RuntimeDefinition implements DefinitionInterface
*/
public function hasMethods($class)
{
- if (!array_key_exists($class, $this->classes)) {
- $this->processClass($class);
- }
-
+ $this->processClass($class);
return (count($this->classes[$class]['methods']) > 0);
}
@@ -154,10 +144,7 @@ class RuntimeDefinition implements DefinitionInterface
*/
public function hasMethod($class, $method)
{
- if (!array_key_exists($class, $this->classes)) {
- $this->processClass($class);
- }
-
+ $this->processClass($class);
return isset($this->classes[$class]['methods'][$method]);
}
@@ -166,10 +153,7 @@ class RuntimeDefinition implements DefinitionInterface
*/
public function getMethods($class)
{
- if (!array_key_exists($class, $this->classes)) {
- $this->processClass($class);
- }
-
+ $this->processClass($class);
return $this->classes[$class]['methods'];
}
@@ -178,10 +162,7 @@ class RuntimeDefinition implements DefinitionInterface
*/
public function hasMethodParameters($class, $method)
{
- if (!isset($this->classes[$class])) {
- return false;
- }
-
+ $this->processClass($class);
return (array_key_exists($method, $this->classes[$class]['parameters']));
}
@@ -190,18 +171,27 @@ class RuntimeDefinition implements DefinitionInterface
*/
public function getMethodParameters($class, $method)
{
- if (!is_array($this->classes[$class])) {
- $this->processClass($class);
- }
-
+ $this->processClass($class);
return $this->classes[$class]['parameters'][$method];
}
/**
* @param string $class
*/
- protected function processClass($class)
+ protected function hasProcessedClass($class)
{
+ return array_key_exists($class, $this->classes) && is_array($this->classes[$class]);
+ }
+
+ /**
+ * @param string $class
+ * @param bool $forceLoad
+ */
+ protected function processClass($class, $forceLoad = false)
+ {
+ if (!$forceLoad && $this->hasProcessedClass($class)) {
+ return;
+ }
$strategy = $this->introspectionStrategy; // localize for readability
/** @var $rClass \Zend\Code\Reflection\ClassReflection */
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/DefinitionList.php b/vendor/zendframework/zendframework/library/Zend/Di/DefinitionList.php
index 33345ee2a0f..efe190e57f7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 dd12a369bae..b821876136b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 aa440dcd959..d9a092e0248 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -41,6 +41,13 @@ class Di implements DependencyInjectionInterface
*/
protected $currentDependencies = array();
+ /**
+ * All the dependenent aliases
+ *
+ * @var array
+ */
+ protected $currentAliasDependenencies = array();
+
/**
* All the class references [dependency][source]
*
@@ -767,13 +774,21 @@ class Di implements DependencyInjectionInterface
$resolvedParams[$index] = $computedParams['value'][$fqParamPos];
} elseif (isset($computedParams['retrieval'][$fqParamPos])) {
// detect circular dependencies! (they can only happen in instantiators)
- if ($isInstantiator && in_array($computedParams['retrieval'][$fqParamPos][1], $this->currentDependencies)) {
- throw new Exception\CircularDependencyException(
- "Circular dependency detected: $class depends on {$value[1]} and viceversa"
- );
+ if ($isInstantiator && in_array($computedParams['retrieval'][$fqParamPos][1], $this->currentDependencies)
+ && (!isset($alias) || in_array($computedParams['retrieval'][$fqParamPos][0], $this->currentAliasDependenencies))
+ ) {
+ $msg = "Circular dependency detected: $class depends on {$value[1]} and viceversa";
+ if (isset($alias)) {
+ $msg .= " (Aliased as $alias)";
+ }
+ throw new Exception\CircularDependencyException($msg);
}
array_push($this->currentDependencies, $class);
+ if(isset($alias)) {
+ array_push($this->currentAliasDependenencies, $alias);
+ }
+
$dConfig = $this->instanceManager->getConfig($computedParams['retrieval'][$fqParamPos][0]);
try {
@@ -786,6 +801,9 @@ 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)) {
+ 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(
@@ -797,6 +815,9 @@ class Di implements DependencyInjectionInterface
} else {
//finally ( be aware to do at the end of flow)
array_pop($this->currentDependencies);
+ if(isset($alias)) {
+ array_pop($this->currentAliasDependenencies);
+ }
return false;
}
} catch (ServiceManagerException $e) {
@@ -804,6 +825,9 @@ 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)) {
+ 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(
@@ -815,10 +839,16 @@ class Di implements DependencyInjectionInterface
} else {
//finally ( be aware to do at the end of flow)
array_pop($this->currentDependencies);
+ if(isset($alias)) {
+ array_pop($this->currentAliasDependenencies);
+ }
return false;
}
}
array_pop($this->currentDependencies);
+ if(isset($alias)) {
+ array_pop($this->currentAliasDependenencies);
+ }
} elseif (!array_key_exists($fqParamPos, $computedParams['optional'])) {
if ($methodRequirementType & self::RESOLVE_STRICT) {
// if this item was not marked as optional,
diff --git a/vendor/zendframework/zendframework/library/Zend/Di/Display/Console.php b/vendor/zendframework/zendframework/library/Zend/Di/Display/Console.php
index 26b062532b4..44ecad32ba8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CircularDependencyException.php b/vendor/zendframework/zendframework/library/Zend/Di/Exception/CircularDependencyException.php
index 84012f9fd4a..8cb9eae3f6a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b6b380ea2da..6ba93ba651b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 02cf66d4f37..ae0ba771b27 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ae7c0abaa57..435cab35d50 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d80f06e97cf..ccd958bf458 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bcb1e3f5bbe..dc0f3ba91bd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8a0ad80e486..abfecd58e66 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d2656ab9904..76ce99afc7f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c33f1d559f9..1097cae7767 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3d314a2086f..e7aa43a2721 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e204090b426..63ff594624a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/LocatorInterface.php b/vendor/zendframework/zendframework/library/Zend/Di/LocatorInterface.php
index b4758d456a0..88a12f6ccaf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fd7d097b4fe..aa93a3df93b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 97bb4df6f88..be0c3cb1d50 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a7182590db6..82e8ca191ef 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 10e3c20a547..aeb5f93acb3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 32e2370ba7b..fe5e1257260 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Css2Xpath.php b/vendor/zendframework/zendframework/library/Zend/Dom/Css2Xpath.php
index 0b3a7752b53..53c2fd395f7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Dom/Exception/BadMethodCallException.php
index efa6f2c243e..df3eb1fda7b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ff866f023b9..f342f8fe65c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 229e8e69cb1..6cd15e22070 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 51a54abd692..97a0178af6f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Query.php b/vendor/zendframework/zendframework/library/Zend/Dom/Query.php
index 3fbc10c4fc9..28c0d40f9f4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Dom/Query.php
+++ b/vendor/zendframework/zendframework/library/Zend/Dom/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Escaper.php b/vendor/zendframework/zendframework/library/Zend/Escaper/Escaper.php
index 38ab113e9db..28acfe05224 100644
--- a/vendor/zendframework/zendframework/library/Zend/Escaper/Escaper.php
+++ b/vendor/zendframework/zendframework/library/Zend/Escaper/Escaper.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Escaper;
-use Zend\Escaper\Exception;
/**
* Context specific methods for use in secure output escaping
diff --git a/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/ExceptionInterface.php
index 364dd67e939..7d3a5f6d00d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Escaper/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Escaper/Exception/InvalidArgumentException.php
index 78c4da7993c..c7958b96d68 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 dec2501d298..b421756279f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractListenerAggregate.php b/vendor/zendframework/zendframework/library/Zend/EventManager/AbstractListenerAggregate.php
index 4d4a443d0d8..9a35d790ec5 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/AbstractListenerAggregate.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/AbstractListenerAggregate.php
@@ -3,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-2014 Zend Technologies USA 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/Event.php b/vendor/zendframework/zendframework/library/Zend/EventManager/Event.php
index 31037b9f14f..766ee188e47 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/EventInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/EventInterface.php
index 7974f6e9ac8..c1d0de701d5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 de51b1e96ad..64a25724e6f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/EventManagerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerAwareInterface.php
index 16d8ba921be..a5c25f25fa6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 97012be8377..faa82445d47 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerAwareTrait.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerAwareTrait.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\EventManager;
-use \Zend\EventManager\ProvidesEvents;
trait EventManagerAwareTrait
{
diff --git a/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/EventManagerInterface.php
index e17d21b0f04..24f77de96b3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/EventsCapableInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/EventsCapableInterface.php
index 401744598ec..d94b8d0fdb5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 491ae7ca7af..180f481be26 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 adc364983db..68cd6c3617a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 44ec2aacd4b..2a4a6b53302 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a416b4c2586..e76659425e5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2e4b1c6a11c..b69fc2cb927 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c8055cd0f0b..60f811fb1e9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a2703602866..d79a5de97ce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 047dd18cf42..4bac5b57411 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4d10e71da02..cd0eef4ce58 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fabedc03cd8..bd287e49ceb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ea46333a1f4..0da7a0bddf6 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/ProvidesEvents.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/ProvidesEvents.php
@@ -3,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-2014 Zend Technologies USA 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/ResponseCollection.php b/vendor/zendframework/zendframework/library/Zend/EventManager/ResponseCollection.php
index 5131d1d402a..b9fb7353b8e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 69b2b7915a4..d5701ba1ad3 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventAggregateAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventAggregateAwareInterface.php
@@ -3,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-2014 Zend Technologies USA 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/SharedEventManager.php b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManager.php
index 2d1c29a0a5e..c673b38ceaf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SharedEventManagerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedEventManagerAwareInterface.php
index c982948a689..09e5c98c12a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ee4e0fec902..02710cf6778 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SharedListenerAggregateInterface.php b/vendor/zendframework/zendframework/library/Zend/EventManager/SharedListenerAggregateInterface.php
index 0fd127022bd..2c997db3f05 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/StaticEventManager.php b/vendor/zendframework/zendframework/library/Zend/EventManager/StaticEventManager.php
index 4458efafb2f..4273bdf359c 100644
--- a/vendor/zendframework/zendframework/library/Zend/EventManager/StaticEventManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/EventManager/StaticEventManager.php
@@ -3,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-2014 Zend Technologies USA 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/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/BadMethodCallException.php
index 34ab71874bd..ef0173a5b2e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/ExceptionInterface.php
index f4cf0a0ba5e..8abcfa9e767 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/InvalidArgumentException.php
index 09930c9b519..c601ef63129 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Exception/RuntimeException.php
index 27a32c6bbf2..824a6db4d80 100644
--- a/vendor/zendframework/zendframework/library/Zend/Feed/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Feed/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractCallback.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/AbstractCallback.php
index b3ab1907465..7645cb90519 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 050c2746088..8873c3db48b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 75d710cd709..845ae2cd388 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/InvalidArgumentException.php
index 0b2339f1310..23f8df104f6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Exception/RuntimeException.php
index 23e154411b7..209842bd692 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HttpResponse.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/HttpResponse.php
index d820cf9f143..0c4c7417207 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 023fe8ed67d..92e688133e3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a7a4596b36b..9571106a407 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 717591b0fc1..77b2e71f9d6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PubSubHubbub.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
index 1d941426769..f96236c9b30 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Publisher.php b/vendor/zendframework/zendframework/library/Zend/Feed/PubSubHubbub/Publisher.php
index 0156b638314..916ffcad592 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7171694d20a..265fe776b16 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4e15e58dbae..5ec8af2fe14 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 026fe3b9a25..edee6953bc2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 797562eaa03..cf8a9361b1f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6a5cee33a56..57ed45d3eca 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Collection.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection.php
index 7385655e1ef..172eecce153 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Collection/AbstractCollection.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/AbstractCollection.php
index bf7d7ab2b75..2466a0a9a94 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Collection/Author.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Author.php
index 15aa32834be..1c773d021e8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Collection/Category.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Category.php
index 2739bc83394..15112ceae32 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Collection/Collection.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Collection/Collection.php
index 0e9d242dd3c..e3a6ae3d789 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractEntry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Entry/AbstractEntry.php
index 68ff4f94859..241a8cdba0a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fcd5f60f90f..ed61a21e5f4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 29b437a2ca2..86fea3ec585 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 274d0d5865b..27337b1b0ca 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/BadMethodCallException.php
index 3994b0ceb69..ee1ef94cba2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/ExceptionInterface.php
index 09abac6d308..8fc904aeed0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/InvalidArgumentException.php
index 5860322ab52..ad7e928dad9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Exception/RuntimeException.php
index f0590fb43c8..706a485810b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractEntry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/AbstractEntry.php
index 0f0333b9f52..15e7574dfe4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 75089253602..1bea2e49800 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Atom/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Entry.php
index d68577cdf72..aa91a5c9c34 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Atom/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Atom/Feed.php
index 83e9ccae7c8..986d23fdb35 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 88fd850b25a..f48a360f2b3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CreativeCommons/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php
index 0352102c634..6770b4fe0e7 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,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-2014 Zend Technologies USA 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/CreativeCommons/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php
index d2a50496078..103bce7f94e 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,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-2014 Zend Technologies USA 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/DublinCore/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php
index 7ec5304e953..2713353cada 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DublinCore/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php
index 61959c4a06d..2738ac732b3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 584fd375d2c..c97e64ff47e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b80bec9c31c..66b13a48b2b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Slash/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Slash/Entry.php
index abd7eda905a..2c47568f91a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Syndication/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Syndication/Feed.php
index ae659d64f7a..429c7bfd0a7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Thread/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Extension/Thread/Entry.php
index ceaee85bd57..d3bc3158716 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cc52bc9088c..6d5a9770538 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b6fa68db510..9103643a301 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6ae9b6798e1..4bbb91d9e9c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8222ee2c1c6..45d3b26b5cf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 643818405c2..0d5f2b835a4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Atom.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom.php
index cc394385411..02a8f6244db 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Atom/Source.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Atom/Source.php
index 3055dc3215f..fada1285926 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FeedInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/FeedInterface.php
index c66bb7bff27..4ba3293d49e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Rss.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Feed/Rss.php
index 61ce229ba44..0237a531c22 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FeedSet.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/FeedSet.php
index c9476208d28..a432ac3be5e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ClientInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Reader/Http/ClientInterface.php
index dc0f5f694da..43932f76127 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5027f200545..39c51724b95 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7f8a25c20d8..6c222bb5281 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Uri.php b/vendor/zendframework/zendframework/library/Zend/Feed/Uri.php
index c2403c5b75a..940bce11ab0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 389a987d2fe..b96a5302dce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Deleted.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Deleted.php
index b9ff321210d..b4a6567a0d7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Entry.php
index 88a6fea320e..797f4bcd0f5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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;
use DateTime;
use Zend\Feed\Uri;
-use Zend\Feed\Writer\Exception;
/**
*/
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 e969d219e09..e03851184b7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/ExceptionInterface.php
index dbcd27964b2..c2ed59bebcf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 971eead3862..377d378db0a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Exception/RuntimeException.php
index 2c37bdaf68b..6de3df500e3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractRenderer.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/AbstractRenderer.php
index 7927e735ea0..5e4eb8c82f8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1d7023e311d..f790259588c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Content/Renderer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php
index 8785fb7320b..6d64bc2fc3e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DublinCore/Renderer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php
index fffefd54f28..d7ca4fda74c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DublinCore/Renderer/Feed.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php
index ceb3fac3f3d..e888fbd0737 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/ITunes/Entry.php
index f136293e873..1b7b64aa5b0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7e6c5ac55e4..22c54db6e61 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b46d10c5373..bc57d1daa2f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9799681a0c3..d5b565780de 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RendererInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/RendererInterface.php
index 032313d6fd3..e72346c2053 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 80adb515a60..cb08828cc65 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Threading/Renderer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php
index ee66b8f2635..bbf4595ed87 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/WellFormedWeb/Renderer/Entry.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php
index f5da0b0d27c..be13b71d95e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExtensionManager.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManager.php
index 0bb4ce0ff03..5310050a0d2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExtensionManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/ExtensionManagerInterface.php
index 358e187a86a..0f7e023fec4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 575794eb3f5..1155c84d2d1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0922082c66c..99f2698a2ac 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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;
use Countable;
use Iterator;
-use Zend\Feed\Writer\Renderer;
/**
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Feed/Writer/FeedFactory.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/FeedFactory.php
index 9cf8fbae627..15e7a3468c1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f981f49a013..e1045019836 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 de4c631a40c..28b325d40c0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Deleted.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php
index cde7067ef78..65ace00bd7c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AtomDeleted.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/AtomDeleted.php
index f7cbd9ac9b9..1ed4aa3d9e5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Rss.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Entry/Rss.php
index f00960d55d1..2338cdc2134 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2ff11129ac4..e7ad9f56ba7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom.php
index ecc58d584b2..87b6b94ac0c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 366ae0bbca9..379cd5c9f74 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Source.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php
index 5f42a9b09db..006c6ae4aec 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AtomSource.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/AtomSource.php
index fa9f33835f7..739c6f72991 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Rss.php b/vendor/zendframework/zendframework/library/Zend/Feed/Writer/Renderer/Feed/Rss.php
index 9719c07ecf6..75c502e3236 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b9d47c3f102..b2e0e00a32e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ff4534db16a..f0b4dcacb5c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 806d5906d4c..8dd20df90d6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ccd69d4d01d..ae8e153642e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ClassFileLocator.php b/vendor/zendframework/zendframework/library/Zend/File/ClassFileLocator.php
index b4d93fe1396..5a1ff998d2a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/File/Exception/BadMethodCallException.php
index 818d1a9939e..87a60ab676e 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/File/Exception/ExceptionInterface.php
index 2388469da7f..851724f2ab2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 07f0ab42ff9..83ae6a93e8e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/File/Exception/RuntimeException.php
index 478d86872fd..533cb0f0cb1 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PhpClassFile.php b/vendor/zendframework/zendframework/library/Zend/File/PhpClassFile.php
index 309d63e96f2..82503cf361c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0bec4da1a83..5bcf12b76a8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FilterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/FilterPluginManager.php
index 5229da355ba..28da7ee4a08 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 082f012f825..827420c7d1c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ValidatorPluginManager.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Adapter/ValidatorPluginManager.php
index e5a3617bfdb..f24f5d459c2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9bf2917d198..4fb1a5acca3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/ExceptionInterface.php
index 283cf3b6609..accae642f7f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/InvalidArgumentException.php
index 993a00d936e..064acb03af7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PhpEnvironmentException.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
index c7ca44ee163..412b894ff0a 100644
--- a/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/PhpEnvironmentException.php
@@ -3,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-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Exception/RuntimeException.php
index 1fa150ff9ae..045d424c5ac 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Transfer.php b/vendor/zendframework/zendframework/library/Zend/File/Transfer/Transfer.php
index d480d49c8c7..bdd44c37ebb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractFilter.php b/vendor/zendframework/zendframework/library/Zend/Filter/AbstractFilter.php
index 22e805eb488..a52bcfa7390 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractUnicode.php b/vendor/zendframework/zendframework/library/Zend/Filter/AbstractUnicode.php
index 1c399c6689d..685608f7d7e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5d2ed0db891..6391286cba8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Boolean.php b/vendor/zendframework/zendframework/library/Zend/Filter/Boolean.php
index 9de8b9363d4..4e4ea1fed17 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Callback.php b/vendor/zendframework/zendframework/library/Zend/Filter/Callback.php
index c41399242bf..3fbb00e64dd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress.php
index 4c61179e014..4b04f925971 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractCompressionAlgorithm.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/AbstractCompressionAlgorithm.php
index 079d083d0a9..b97e68cf123 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 376bbd45250..79716118b30 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -133,7 +133,9 @@ class Bz2 extends AbstractCompressionAlgorithm
public function decompress($content)
{
$archive = $this->getArchive();
- if (file_exists($content)) {
+
+ //check if there are null byte characters before doing a file_exists check
+ if (!strstr($content, "\0") && file_exists($content)) {
$archive = $content;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/CompressionAlgorithmInterface.php
index a582c0342c4..cf4e5f3cb17 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5e8d50a9667..aa0721af257 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -165,7 +165,9 @@ class Gz extends AbstractCompressionAlgorithm
{
$archive = $this->getArchive();
$mode = $this->getMode();
- if (file_exists($content)) {
+
+ //check if there are null byte characters before doing a file_exists check
+ if (!strstr($content, "\0") && file_exists($content)) {
$archive = $content;
}
@@ -190,7 +192,7 @@ class Gz extends AbstractCompressionAlgorithm
$compressed = gzuncompress($content);
}
- if (!$compressed) {
+ if ($compressed === false) {
throw new Exception\RuntimeException('Error during decompression');
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Lzf.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Lzf.php
index 30ebb81757e..ea4fd0c60d5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0de26b2b7cd..f8fb845884b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 22864285ee1..33a9c616274 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 10a0cc15ff0..16ca08e2e65 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Zip.php b/vendor/zendframework/zendframework/library/Zend/Filter/Compress/Zip.php
index f0e94982eee..81403534212 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DateTimeFormatter.php b/vendor/zendframework/zendframework/library/Zend/Filter/DateTimeFormatter.php
index fa484a8cb4a..740da2d0885 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Decompress.php b/vendor/zendframework/zendframework/library/Zend/Filter/Decompress.php
index 8a45e0be507..9b821bf1eb4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Decrypt.php b/vendor/zendframework/zendframework/library/Zend/Filter/Decrypt.php
index f73cf09add6..360c479a37e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Digits.php b/vendor/zendframework/zendframework/library/Zend/Filter/Digits.php
index 71905854e1c..325bb758ba9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Dir.php b/vendor/zendframework/zendframework/library/Zend/Filter/Dir.php
index 2f08e751763..16e580e7dc8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt.php
index d03104ea7bd..93dc87a134e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BlockCipher.php b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/BlockCipher.php
index 1415ed7a2cd..5f625c83ca2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/EncryptionAlgorithmInterface.php b/vendor/zendframework/zendframework/library/Zend/Filter/Encrypt/EncryptionAlgorithmInterface.php
index c6afa4371b2..faf0c518ccc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4e433a2be7d..fe6b11342d8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Filter/Exception/BadMethodCallException.php
index a7c9d43a284..ae0d3f843c2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e047c0b256a..4a37739b6bc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 14d67ea7e7a..dd0be926b86 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 95c858a5af4..7a24b86c786 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 913de98d6ee..52b1c8ab12e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 76a3f116466..d8b160be7f3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8f8de27d36a..c5970d53355 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Encrypt.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/Encrypt.php
index 038e5e00825..446126118ca 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/LowerCase.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/LowerCase.php
index 27874e09ddc..d903a51f3a4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Rename.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/Rename.php
index 55a68834c37..41e363eda87 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RenameUpload.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/RenameUpload.php
index ff6756850d4..09d42ec9095 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/UpperCase.php b/vendor/zendframework/zendframework/library/Zend/Filter/File/UpperCase.php
index 69f7e84a540..dde7930d08a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FilterChain.php b/vendor/zendframework/zendframework/library/Zend/Filter/FilterChain.php
index 92ce1ddc45e..4202ffbe11c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/FilterChain.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FilterInterface.php b/vendor/zendframework/zendframework/library/Zend/Filter/FilterInterface.php
index 7acf2e8b377..2b3c163538a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0f07483f8fa..f01248eb43f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HtmlEntities.php b/vendor/zendframework/zendframework/library/Zend/Filter/HtmlEntities.php
index 962fb389736..2b249f2059a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Inflector.php b/vendor/zendframework/zendframework/library/Zend/Filter/Inflector.php
index eca78a5657f..0b18a5c77f5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Int.php b/vendor/zendframework/zendframework/library/Zend/Filter/Int.php
index 515ad0d2f79..12c10eee44c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Null.php b/vendor/zendframework/zendframework/library/Zend/Filter/Null.php
index a47e86c2380..6b7c653c09d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f5e4d756899..1bbbcf0a625 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RealPath.php b/vendor/zendframework/zendframework/library/Zend/Filter/RealPath.php
index 61717e80158..d90766d53eb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/StaticFilter.php b/vendor/zendframework/zendframework/library/Zend/Filter/StaticFilter.php
index ee319d61eda..2847137b64b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c95f53346af..1b162961cce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/StringToUpper.php b/vendor/zendframework/zendframework/library/Zend/Filter/StringToUpper.php
index 22f0d29aff6..951a4f60b1f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/StringTrim.php b/vendor/zendframework/zendframework/library/Zend/Filter/StringTrim.php
index a85fcf9b84e..db6172667f6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/StripNewlines.php b/vendor/zendframework/zendframework/library/Zend/Filter/StripNewlines.php
index 0459a88a787..0c8a922e235 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/StripTags.php b/vendor/zendframework/zendframework/library/Zend/Filter/StripTags.php
index cb58dbf0701..3f95f6aabee 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -282,7 +282,7 @@ class StripTags extends AbstractFilter
foreach ($matches[1] as $index => $attributeName) {
$attributeName = strtolower($attributeName);
$attributeDelimiter = empty($matches[2][$index]) ? $matches[4][$index] : $matches[2][$index];
- $attributeValue = empty($matches[3][$index]) ? $matches[5][$index] : $matches[3][$index];
+ $attributeValue = (strlen($matches[3][$index]) == 0) ? $matches[5][$index] : $matches[3][$index];
// If the attribute is not allowed, then remove it entirely
if (!array_key_exists($attributeName, $this->tagsAllowed[$tagName])
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php b/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php
index a3c89c752e2..6dfe5840c85 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.php
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/UriNormalize.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Filter;
-use Zend\Filter\AbstractFilter;
-use Zend\Filter\Exception\InvalidArgumentException;
use Zend\Uri\Exception\ExceptionInterface as UriException;
use Zend\Uri\UriFactory;
use Zend\Uri\Uri;
diff --git a/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/AbstractSeparator.php
index 3031d3b281b..2fe70d3d4ab 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CamelCaseToDash.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToDash.php
index 1663f436755..f2d1c3462f0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e97ab67bf85..f50c88e39cb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CamelCaseToUnderscore.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/CamelCaseToUnderscore.php
index e5b6ef43c81..fb28b6c56b8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d0780c026f5..4d211a01f14 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a8d65147f03..1fd43470ee4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DashToUnderscore.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/DashToUnderscore.php
index 79bed6cafbb..b7d56941156 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 88c5b8e8afb..ce63cf31a98 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SeparatorToDash.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/SeparatorToDash.php
index c2b491d6433..3558a75bcee 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a1d1135e6c1..90e465b455d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/UnderscoreToCamelCase.php b/vendor/zendframework/zendframework/library/Zend/Filter/Word/UnderscoreToCamelCase.php
index 3bcc8b38772..fc9c5138fda 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ae61134e0f8..1a39ebec31a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f6fe6af5727..86d35a28bed 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a069522019f..10454ed308a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Filter/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Filter/composer.json
@@ -23,8 +23,7 @@
"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-stdlib": "Zend\\Stdlib component"
+ "zendframework/zend-crypt": "Zend\\Crypt component"
},
"extra": {
"branch-alias": {
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractAnnotationsListener.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractAnnotationsListener.php
index d45d59c341f..62685edcc30 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Form\Annotation;
use ReflectionClass;
use Zend\EventManager\AbstractListenerAggregate;
-use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
/**
* Base annotations listener.
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractArrayAnnotation.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AbstractArrayAnnotation.php
index 64f53d04a6a..d6d8b315d77 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 15d799e226f..04e3733a2dd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ffd22469f03..a327ae5c16b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fec8ab0d534..eb3a0b70ef3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b674ca21631..53ca47da1f7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/AnnotationBuilder.php
@@ -3,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-2014 Zend Technologies USA 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/Attributes.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Attributes.php
index 2336d54baa8..2a6398f55f0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 72d13178c2b..4284c41f351 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ElementAnnotationsListener.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ElementAnnotationsListener.php
index 16b8ad8e249..1cc05ee3e90 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ElementAnnotationsListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ElementAnnotationsListener.php
@@ -3,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-2014 Zend Technologies USA 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/ErrorMessage.php b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/ErrorMessage.php
index bd502379744..e9ae743c691 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 17158ad91fe..317d976bd55 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 54f27a3d74c..e43b88dd739 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ee9c89cff1c..d7573f7e90b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4a0f15acd07..4adf57866bf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f44bdf2eac1..c7f5e45d158 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7957ea80424..c01e29e1648 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 926059b6a25..0ba09013fd0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3aa54d9ca9d..63927832a6a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 75fc5799196..19cfb154aa5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Object.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Annotation/Object.php
@@ -3,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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -16,7 +16,7 @@ namespace Zend\Form\Annotation;
* Use this annotation to specify an object to use as the bound object of a form or fieldset
*
* @Annotation
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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 a5accda923f..26743b8401a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bcf66bbcddb..666370aba10 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a561b166b0b..9fd0f5dd11c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1e7d7745f73..85e5c7b14ad 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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 fe04b130ead..61cb6632711 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Form/Element.php
index 858e9caa468..37e9263c126 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Button.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Button.php
index cc65090e575..93b9360b1de 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2a43b804b69..92f43158a75 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 87447ad01d2..0f2b46b3b6c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Collection.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Collection.php
index f02bd174193..6d3a9253132 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Form\ElementInterface;
use Zend\Form\Exception;
use Zend\Form\Fieldset;
use Zend\Form\FieldsetInterface;
-use Zend\Form\FieldsetPrepareAwareInterface;
use Zend\Form\FormInterface;
use Zend\Stdlib\ArrayUtils;
-class Collection extends Fieldset implements FieldsetPrepareAwareInterface
+class Collection extends Fieldset
{
/**
* Default template placeholder
@@ -82,6 +81,20 @@ class Collection extends Fieldset implements FieldsetPrepareAwareInterface
*/
protected $templateElement;
+ /**
+ * The index of the last child element or fieldset
+ *
+ * @var int
+ */
+ protected $lastChildIndex = -1;
+
+ /**
+ * Should child elements must be created on self::prepareElement()?
+ *
+ * @var bool
+ */
+ protected $shouldCreateChildrenOnPrepareElement = true;
+
/**
* Accepted options for Collection:
* - target_element: an array or element used in the collection
@@ -184,68 +197,38 @@ class Collection extends Fieldset implements FieldsetPrepareAwareInterface
// Can't do anything with empty data
if (empty($data)) {
+ $this->shouldCreateChildrenOnPrepareElement = false;
return;
}
- if (count($data) < $this->getCount()) {
- if (!$this->allowRemove) {
- 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.',
- get_class($this)
- )
- );
- }
-
- // If there are less data and that allowRemove is true, we remove elements that are not presents
- $this->setCount(count($data));
- foreach ($this->byName as $name => $elementOrFieldset) {
- if (isset($data[$name])) {
- continue;
- }
-
- $this->remove($name);
- }
- }
-
- if ($this->targetElement instanceof FieldsetInterface) {
- foreach ($this->byName as $name => $fieldset) {
- if (isset($data[$name])) {
- $fieldset->populateValues($data[$name]);
- unset($data[$name]);
- }
- }
- } else {
- foreach ($this->byName as $name => $element) {
- $element->setAttribute('value', $data[$name]);
- unset($data[$name]);
- }
+ 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.',
+ get_class($this)
+ )
+ );
}
- // If there are still data, this means that elements or fieldsets were dynamically added. If allowed by the user, add them
- if (!empty($data) && $this->allowAdd) {
- foreach ($data as $key => $value) {
- $elementOrFieldset = $this->createNewTargetElementInstance();
- $elementOrFieldset->setName($key);
+ foreach ($data as $key => $value) {
+ if ($this->has($key)) {
+ $elementOrFieldset = $this->get($key);
+ } else {
+ $elementOrFieldset = $this->addNewTargetElementInstance($key);
- if ($elementOrFieldset instanceof FieldsetInterface) {
- $elementOrFieldset->populateValues($value);
- } else {
- $elementOrFieldset->setAttribute('value', $value);
+ if ($key > $this->lastChildIndex) {
+ $this->lastChildIndex = $key;
}
+ }
- $this->add($elementOrFieldset);
+ if ($elementOrFieldset instanceof FieldsetInterface) {
+ $elementOrFieldset->populateValues($value);
+ } else {
+ $elementOrFieldset->setAttribute('value', $value);
}
- } elseif (!empty($data) && !$this->allowAdd) {
- throw new Exception\DomainException(sprintf(
- 'There are more elements than specified in the collection (%s). Either set the allow_add option ' .
- 'to true, or re-submit the form.',
- get_class($this)
- )
- );
}
- if (! $this->createNewObjects()) {
+ if (!$this->createNewObjects()) {
$this->replaceTemplateObjects();
}
}
@@ -472,6 +455,14 @@ class Collection extends Fieldset implements FieldsetPrepareAwareInterface
*/
public function prepareElement(FormInterface $form)
{
+ if (true === $this->shouldCreateChildrenOnPrepareElement) {
+ if ($this->targetElement !== null && $this->count > 0) {
+ while ($this->count > $this->lastChildIndex + 1) {
+ $this->addNewTargetElementInstance(++$this->lastChildIndex);
+ }
+ }
+ }
+
// Create a template that will also be prepared
if ($this->shouldCreateTemplate) {
$templateElement = $this->getTemplateElement();
@@ -510,7 +501,7 @@ class Collection extends Fieldset implements FieldsetPrepareAwareInterface
$targetElement = clone $this->targetElement;
$targetElement->object = $value;
$values[$key] = $targetElement->extract();
- if (! $this->createNewObjects() && $this->has($key)) {
+ if (!$this->createNewObjects() && $this->has($key)) {
$fieldset = $this->get($key);
if ($fieldset instanceof Fieldset && $fieldset->allowObjectBinding($value)) {
$fieldset->setObject($value);
@@ -519,24 +510,20 @@ class Collection extends Fieldset implements FieldsetPrepareAwareInterface
}
}
- // Recursively extract and populate values for nested fieldsets
- foreach ($this->fieldsets as $fieldset) {
- $name = $fieldset->getName();
- if (isset($values[$name])) {
- $object = $values[$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)) {
- $fieldset->setObject($childObject);
- $values[$name][$childName] = $fieldset->extract();
- }
+ 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();
}
}
}
@@ -547,30 +534,39 @@ class Collection extends Fieldset implements FieldsetPrepareAwareInterface
}
/**
- * If both count and targetElement are set, add them to the fieldset
+ * Create a new instance of the target element
*
- * @return void
+ * @return ElementInterface
*/
- public function prepareFieldset()
+ protected function createNewTargetElementInstance()
{
- if ($this->targetElement !== null) {
- for ($i = 0; $i != $this->count; ++$i) {
- $elementOrFieldset = $this->createNewTargetElementInstance();
- $elementOrFieldset->setName($i);
-
- $this->add($elementOrFieldset);
- }
- }
+ return clone $this->targetElement;
}
/**
- * Create a new instance of the target element
+ * Add a new instance of the target element
*
* @return ElementInterface
+ * @throws Exception\DomainException
*/
- protected function createNewTargetElementInstance()
+ protected function addNewTargetElementInstance($name)
{
- return clone $this->targetElement;
+ $this->shouldCreateChildrenOnPrepareElement = false;
+
+ $elementOrFieldset = $this->createNewTargetElementInstance();
+ $elementOrFieldset->setName($name);
+
+ $this->add($elementOrFieldset);
+
+ if (!$this->allowAdd && $this->count() > $this->count) {
+ throw new Exception\DomainException(sprintf(
+ 'There are more elements than specified in the collection (%s). Either set the allow_add option ' .
+ 'to true, or re-submit the form.',
+ get_class($this)
+ ));
+ }
+
+ return $elementOrFieldset;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Color.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Color.php
index bedc5bb59e6..b11a7db3a63 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Csrf.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Csrf.php
index f6ead1d829a..1ff15aec990 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3bb1a3a1734..a81908b0de0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Date.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Form\Element;
use DateInterval;
use Zend\Form\Element;
use Zend\Form\Element\DateTime as DateTimeElement;
-use Zend\Validator\Date as DateValidator;
use Zend\Validator\DateStep as DateStepValidator;
class Date extends DateTimeElement
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateSelect.php
index 85b536cf9cb..680e32e371e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DateTime.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/DateTime.php
index 8ed1a430d89..1a7ff598208 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c35fde8fb44..f27cdb80cea 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e336c32e501..8a91c63f711 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -319,7 +319,7 @@ class DateTimeSelect extends DateSelect
$this->dayElement = clone $this->dayElement;
$this->monthElement = clone $this->monthElement;
$this->yearElement = clone $this->yearElement;
- $this->hourElement = clone $this->monthElement;
+ $this->hourElement = clone $this->hourElement;
$this->minuteElement = clone $this->minuteElement;
$this->secondElement = clone $this->secondElement;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Element/Email.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Email.php
index 3f818c8f14b..69d36fb6f68 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/File.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/File.php
index bc75b2ef1cb..ecfaa7e5ab0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ddf4aba8a68..6d950db0235 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e1c8f503f3b..96e50fc00d5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 70a39b046dc..518833b1787 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Month.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Month.php
@@ -3,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-2014 Zend Technologies USA 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/MonthSelect.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/MonthSelect.php
index eb527cf3c7c..ac26136d944 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/MultiCheckbox.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/MultiCheckbox.php
index 40bb8a847ef..4d1db7d0e60 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Number.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Number.php
index eb7a45cb289..d17aa453c3f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Number.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -49,7 +49,7 @@ class Number extends Element implements InputProviderInterface
));
$inclusive = true;
- if (!empty($this->attributes['inclusive'])) {
+ if (isset($this->attributes['inclusive'])) {
$inclusive = $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 18b971b1012..0bea1c50930 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bbdd4b52a96..0093c1019a1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Range.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Range.php
index bb99fdad237..05fb5f98db1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Select.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Select.php
index 5b9f830955f..cc3ea0f397d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Submit.php b/vendor/zendframework/zendframework/library/Zend/Form/Element/Submit.php
index 9c04726c018..3f1507e8ea0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1d229103ed8..aff287622b3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7c002a70f6d..a2fe2d3c991 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 06d7ae034bb..cec60016725 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Time.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Form\Element;
use DateInterval;
use Zend\Form\Element;
-use Zend\Validator\Date as DateValidator;
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 7d092371c85..d951761464c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9e740e44d26..8ddf250bcc4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Element/Week.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Element/Week.php
@@ -3,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-2014 Zend Technologies USA 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/ElementAttributeRemovalInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/ElementAttributeRemovalInterface.php
index ef3550d85d3..768a48b4986 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 597f35601a4..3ddb028a9fb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ElementPrepareAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/ElementPrepareAwareInterface.php
index ea074f24699..1e62addd4ac 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7d6d1a0cc69..3d641b317c3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/DomainException.php
index 4ef4a7a41df..642cd4553f0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExceptionInterface.php
index ac9716e2c7e..3519a47f1ff 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExtensionNotLoadedException.php
index 2b2d54f46fa..8d58b282dba 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidArgumentException.php
index 495e924e241..7632be43c36 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidElementException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidElementException.php
index b33a3455ef9..278dbfa89a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidElementException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Exception/InvalidElementException.php
@@ -3,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-2014 Zend Technologies USA 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/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Form/Exception/UnexpectedValueException.php
index 6ee9819715c..3c7a9e67eaf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Factory.php b/vendor/zendframework/zendframework/library/Zend/Form/Factory.php
index 9afd8abacc0..8c00e3f84da 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Fieldset.php b/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
index 4a6bf5b495c..258d5d38f8e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/Fieldset.php
@@ -3,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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -180,15 +180,11 @@ class Fieldset extends Element implements FieldsetInterface
$this->byName[$name] = $elementOrFieldset;
if ($elementOrFieldset instanceof FieldsetInterface) {
- if ($elementOrFieldset instanceof FieldsetPrepareAwareInterface) {
- $elementOrFieldset->prepareFieldset();
- }
-
$this->fieldsets[$name] = $elementOrFieldset;
- return $this;
+ } else {
+ $this->elements[$name] = $elementOrFieldset;
}
- $this->elements[$name] = $elementOrFieldset;
return $this;
}
@@ -390,19 +386,28 @@ class Fieldset extends Element implements FieldsetInterface
));
}
- foreach ($data as $name => $value) {
- if (!$this->has($name)) {
- continue;
- }
-
- $element = $this->get($name);
+ foreach ($this->byName as $name => $elementOrFieldset) {
+ $valueExists = array_key_exists($name, $data);
- if ($element instanceof FieldsetInterface && is_array($value)) {
- $element->populateValues($value);
- continue;
+ if ($elementOrFieldset instanceof FieldsetInterface) {
+ if ($valueExists && is_array($data[$name])) {
+ $elementOrFieldset->populateValues($data[$name]);
+ continue;
+ } elseif ($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;
+ }
}
- $element->setValue($value);
+ if ($valueExists) {
+ $elementOrFieldset->setValue($data[$name]);
+ }
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FieldsetInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/FieldsetInterface.php
index a2c08b81091..f2e16b904b6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9b4e31966f5..b1584c810f2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/FieldsetPrepareAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/FieldsetPrepareAwareInterface.php
@@ -3,12 +3,17 @@
* 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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Form;
+/**
+ * Deprecated by https://github.com/zendframework/zf2/pull/5636
+ *
+ * @deprecated
+ */
interface FieldsetPrepareAwareInterface
{
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/Form.php b/vendor/zendframework/zendframework/library/Zend/Form/Form.php
index 5f06a7ed576..637fbf0d28b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,13 +11,13 @@ namespace Zend\Form;
use Traversable;
use Zend\Form\Element\Collection;
-use Zend\Form\Exception;
use Zend\InputFilter\CollectionInputFilter;
use Zend\InputFilter\InputFilter;
use Zend\InputFilter\InputFilterAwareInterface;
use Zend\InputFilter\InputFilterInterface;
use Zend\InputFilter\InputFilterProviderInterface;
use Zend\InputFilter\InputProviderInterface;
+use Zend\InputFilter\ReplaceableInputInterface;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\Hydrator\HydratorInterface;
@@ -108,6 +108,13 @@ class Form extends Fieldset implements FormInterface
*/
protected $preferFormInputFilter = true;
+ /**
+ * Has preferFormInputFilter been set with setPreferFormInputFilter?
+ *
+ * @var bool
+ */
+ protected $hasSetPreferFormInputFilter = false;
+
/**
* Are the form elements/fieldsets wrapped by the form name ?
*
@@ -139,6 +146,10 @@ class Form extends Fieldset implements FormInterface
$this->setPreferFormInputFilter($options['prefer_form_input_filter']);
}
+ if (isset($options['use_input_filter_defaults'])) {
+ $this->setUseInputFilterDefaults($options['use_input_filter_defaults']);
+ }
+
return $this;
}
@@ -643,6 +654,11 @@ class Form extends Fieldset implements FormInterface
$this->hasValidated = false;
$this->hasAddedInputFilterDefaults = false;
$this->filter = $inputFilter;
+
+ if (false === $this->hasSetPreferFormInputFilter) {
+ $this->preferFormInputFilter = false;
+ }
+
return $this;
}
@@ -712,6 +728,7 @@ class Form extends Fieldset implements FormInterface
public function setPreferFormInputFilter($preferFormInputFilter)
{
$this->preferFormInputFilter = (bool) $preferFormInputFilter;
+ $this->hasSetPreferFormInputFilter = true;
return $this;
}
@@ -756,13 +773,20 @@ class Form extends Fieldset implements FormInterface
continue;
}
// Create a new empty default input for this element
- $spec = array('name' => $name, 'required' => false);
+ $spec = array('name' => $name, 'required' => false);
+ $input = $inputFactory->createInput($spec);
} else {
// Create an input based on the specification returned from the element
$spec = $element->getInputSpecification();
+ $input = $inputFactory->createInput($spec);
+
+ if ($inputFilter->has($name) && $inputFilter instanceof ReplaceableInputInterface) {
+ $input->merge($inputFilter->get($name));
+ $inputFilter->replace($input, $name);
+ continue;
+ }
}
- $input = $inputFactory->createInput($spec);
$inputFilter->add($input, $name);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FormAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Form/FormAbstractServiceFactory.php
index ab77744e5d4..c7c9016426d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -33,36 +33,36 @@ class FormAbstractServiceFactory implements AbstractFactoryInterface
/**
* Can we create the requested service?
*
- * @param ServiceLocatorInterface $services
+ * @param ServiceLocatorInterface $serviceLocator
* @param string $name Service name (as resolved by ServiceManager)
- * @param string $rName Name by which service was requested
+ * @param string $requestedName Name by which service was requested
* @return bool
*/
- public function canCreateServiceWithName(ServiceLocatorInterface $services, $name, $rName)
+ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
{
- $config = $this->getConfig($services);
+ $config = $this->getConfig($serviceLocator);
if (empty($config)) {
return false;
}
- return (isset($config[$rName]) && is_array($config[$rName]) && !empty($config[$rName]));
+ return (isset($config[$requestedName]) && is_array($config[$requestedName]) && !empty($config[$requestedName]));
}
/**
* Create a form
*
- * @param ServiceLocatorInterface $services
+ * @param ServiceLocatorInterface $serviceLocator
* @param string $name Service name (as resolved by ServiceManager)
- * @param string $rName Name by which service was requested
+ * @param string $requestedName Name by which service was requested
* @return Form
*/
- public function createServiceWithName(ServiceLocatorInterface $services, $name, $rName)
+ public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
{
- $config = $this->getConfig($services);
- $config = $config[$rName];
- $factory = $this->getFormFactory($services);
+ $config = $this->getConfig($serviceLocator);
+ $config = $config[$requestedName];
+ $factory = $this->getFormFactory($serviceLocator);
- $this->marshalInputFilter($config, $services, $factory);
+ $this->marshalInputFilter($config, $serviceLocator, $factory);
return $factory->createForm($config);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FormElementManager.php b/vendor/zendframework/zendframework/library/Zend/Form/FormElementManager.php
index 679c89b3442..f9ffaf9d36e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FormFactoryAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/FormFactoryAwareInterface.php
index 0548f23967b..e5e6f501344 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ca85b319fa0..1684ca1f069 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Form;
-use \Zend\Form\Factory;
trait FormFactoryAwareTrait
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Form/FormInterface.php b/vendor/zendframework/zendframework/library/Zend/Form/FormInterface.php
index 1163bc1e377..25acfdb100b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractHelper.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/AbstractHelper.php
index 97b9568de40..e4079572cd8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -351,6 +351,7 @@ abstract class AbstractHelper extends BaseAbstractHelper
if (!isset($this->validGlobalAttributes[$attribute])
&& !isset($this->validTagAttributes[$attribute])
&& 'data-' != substr($attribute, 0, 5)
+ && 'x-' != substr($attribute, 0, 2)
) {
// Invalid attribute for the current tag
unset($attributes[$key]);
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 76b80cf788e..b27e641f963 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a3da394967a..1f49fe21cab 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cd25c00a6a2..d8273111309 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d36571d6b2d..d848fb0edc1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d5d18d3f7e5..7106dbe066a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 45b8e4ff7b8..c2f56074a59 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 87d24378137..3eb1d487699 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 db907bf2605..cc2107bf5e7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Form.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/Form.php
index 7fb1c172bf9..666b968dced 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FormButton.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormButton.php
index 0170bf9add8..08c13290969 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FormCaptcha.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormCaptcha.php
index f361cb31c8c..0ffb6e6d04c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ccdf951ed5c..97a1023c3f8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bd036a65e96..4a8e7510823 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -80,6 +80,7 @@ class FormCollection extends AbstractHelper
return '';
}
+ $attributes = $element->getAttributes();
$markup = '';
$templateMarkup = '';
$escapeHtmlHelper = $this->getEscapeHtmlHelper();
@@ -106,6 +107,7 @@ class FormCollection extends AbstractHelper
// Every collection is wrapped by a fieldset if needed
if ($this->shouldWrap) {
$label = $element->getLabel();
+ $legend = '';
if (!empty($label)) {
@@ -118,12 +120,23 @@ class FormCollection extends AbstractHelper
$label = $escapeHtmlHelper($label);
- $markup = sprintf(
- '<fieldset><legend>%s</legend>%s</fieldset>',
- $label,
- $markup
+ $legend = sprintf(
+ '<legend>%s</legend>',
+ $label
);
}
+
+ $attributesString = $this->createAttributesString($attributes);
+ if (!empty($attributesString)) {
+ $attributesString = ' ' . $attributesString;
+ }
+
+ $markup = sprintf(
+ '<fieldset%s>%s%s</fieldset>',
+ $attributesString,
+ $legend,
+ $markup
+ );
}
return $markup;
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 1056a021f05..ebf955fa1aa 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4ab6a2c5593..6e21eb629f4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 44600e39600..bd9e5e34ce8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a3692313e40..4c2b615c6bc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c6f25898498..d072e809080 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a2228dafd11..c5c4042c09c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FormElement.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElement.php
index d125999d371..08e7886babe 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElement.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElement.php
@@ -3,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-2014 Zend Technologies USA 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/FormElementErrors.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormElementErrors.php
index d75fd712c6f..662b083f5f4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FormEmail.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormEmail.php
index 2a0101c4dc6..e03930ebb65 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 083734993a0..e75b34d8b5a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -28,7 +28,6 @@ class FormFile extends FormInput
'multiple' => true,
'required' => true,
'type' => true,
- 'value' => true,
);
/**
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 8c8eaae8265..f478b2a6a52 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8e6f6e4f84f..e5bc26ce9cb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 93f56abdef8..5a2f5adcea3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 384d180ee66..8c97b5e3b48 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FormMonth.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormMonth.php
index 79b35d2b85f..a0881b40a3a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 dbea5d698f8..f3cfa2136c8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 00bed6c02ca..1f3c0466925 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FormNumber.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormNumber.php
index 95cbde02d83..a19c89affeb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fa9b7263c2f..a2683f69cbc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 17273b23869..97405006d50 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3c3a49b82c2..e2d7cf68e88 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 614330a429f..53e2988b82c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3f9c6fe6e6c..83f366266cb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormRow.php
@@ -3,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-2014 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\Form\View\Helper;
use Zend\Form\Element\Button;
use Zend\Form\ElementInterface;
use Zend\Form\Exception;
-use Zend\Form\View\Helper\AbstractHelper;
class FormRow extends AbstractHelper
{
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 19c7a2808e7..80e08620a37 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 962dc69cc58..14aca714f54 100644
--- a/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSelect.php
+++ b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSelect.php
@@ -3,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-2014 Zend Technologies USA 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/FormSubmit.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormSubmit.php
index 310b651a422..926028d8c99 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 421379716c8..746f0e156da 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2cbeb4820c0..0e57c051277 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e5bf832ee7a..32011b2c548 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FormTime.php b/vendor/zendframework/zendframework/library/Zend/Form/View/Helper/FormTime.php
index 8945b88e349..cf8fbc32876 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f0a3f018f3f..90df9965b13 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 08fa5fbab5b..4fe6758c99e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 95d49d58f9e..7c3710d61d3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractMessage.php b/vendor/zendframework/zendframework/library/Zend/Http/AbstractMessage.php
index 7faab662566..0c607e8a4d9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Http/Client.php
index 003fabad5a1..2c608eeb3ad 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/AdapterInterface.php
index ae608048744..9e423ebbe7b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4f911db583f..e54a55e2e23 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Curl.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Curl.php
@@ -3,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-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/ExceptionInterface.php
index 9bb3fb3f319..11905999348 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InitializationException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/InitializationException.php
index 6fea4a1c43f..e4fe2da6898 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/InvalidArgumentException.php
index 361790a19ca..9ed2417b971 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/OutOfRangeException.php
index c126a3f25db..9239a997336 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/RuntimeException.php
index d26da0cd59a..a40ba5e8122 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/TimeoutException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Exception/TimeoutException.php
index 7928b0c789d..f205246a130 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 413f2c7b2f8..1e77a08fe5f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Socket.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Adapter/Socket.php
index d6d09a6bfef..8ef2415155e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -66,6 +66,7 @@ class Socket implements HttpAdapter, StreamInterface
'sslcert' => null,
'sslpassphrase' => null,
'sslverifypeer' => true,
+ 'sslcafile' => null,
'sslcapath' => null,
'sslallowselfsigned' => false,
'sslusecontext' => false
@@ -205,6 +206,12 @@ class Socket implements HttpAdapter, StreamInterface
}
}
+ if ($this->config['sslcafile']) {
+ if (!stream_context_set_option($context, 'ssl', 'cafile', $this->config['sslcafile'])) {
+ throw new AdapterException\RuntimeException('Unable to set sslcafile option');
+ }
+ }
+
if ($this->config['sslcapath']) {
if (!stream_context_set_option($context, 'ssl', 'capath', $this->config['sslcapath'])) {
throw new AdapterException\RuntimeException('Unable to set sslcapath option');
@@ -287,7 +294,11 @@ class Socket implements HttpAdapter, StreamInterface
if ((! $errorString) && $this->config['sslverifypeer']) {
// There's good chance our error is due to sslcapath not being properly set
- if (! ($this->config['sslcapath'] && is_dir($this->config['sslcapath']))) {
+ if (! ($this->config['sslcafile'] || $this->config['sslcapath'])) {
+ $errorString = 'make sure the "sslcafile" or "sslcapath" option are properly set for the environment.';
+ } elseif ($this->config['sslcafile'] && !is_file($this->config['sslcafile'])) {
+ $errorString = 'make sure the "sslcafile" option points to a valid SSL certificate file';
+ } elseif ($this->config['sslcapath'] && !is_dir($this->config['sslcapath'])) {
$errorString = 'make sure the "sslcapath" option points to a valid SSL certificate directory';
}
}
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 ecfc83bcc33..6dd1a5045de 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1be5b43cae9..b57e88e26d2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Cookies.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Cookies.php
index fafb3fa3a6b..e8ecd633627 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Client/Cookies.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Client/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/ExceptionInterface.php
index dbb0d985a0f..5e9723b97c1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/InvalidArgumentException.php
index 9e0221d285b..bfe9b72aec2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/OutOfRangeException.php
index 309f575b2e3..24e255a3807 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Client/Exception/RuntimeException.php
index 24cff1bcfa7..34ef3b2236e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ClientStatic.php b/vendor/zendframework/zendframework/library/Zend/Http/ClientStatic.php
index 970a0733c3c..5d626e1bf16 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/ClientStatic.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/ClientStatic.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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;
-use Zend\Http\Client;
/**
* Http static client
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Cookies.php b/vendor/zendframework/zendframework/library/Zend/Http/Cookies.php
index ba38326a6e0..499e9f3897c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Http;
use ArrayIterator;
use Zend\Http\Header\SetCookie;
-use Zend\Http\Response;
use Zend\Uri;
@@ -183,10 +182,11 @@ class Cookies extends Headers
// 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))
+ 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);
@@ -218,7 +218,9 @@ class Cookies extends Headers
// Get correct cookie path
$path = $uri->getPath();
$path = substr($path, 0, strrpos($path, '/'));
- if (! $path) $path = '/';
+ if (! $path) {
+ $path = '/';
+ }
if (isset($this->cookies[$uri->getHost()][$path][$cookieName])) {
$cookie = $this->cookies[$uri->getHost()][$path][$cookieName];
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Exception/ExceptionInterface.php
index e3a35bfc988..b58caddf889 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a0f18445d6b..fb20cde7dc3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ad931ff0193..4faf9667e41 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Exception/OutOfRangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Http/Exception/RuntimeException.php
index 2a2770206fc..9f1ed68eefe 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 23be958e452..2f912919bfd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -290,7 +290,7 @@ abstract class AbstractAccept implements HeaderInterface
* Match a media string against this header
*
* @param array|string $matchAgainst
- * @return AcceptFieldValuePart|bool The matched value or false
+ * @return Accept\FieldValuePart\AcceptFieldValuePart|bool The matched value or false
*/
public function match($matchAgainst)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractDate.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractDate.php
index 1882cf27855..5990dc4fa3b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 79cfbeb90fc..d7381d8a706 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractLocation.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/AbstractLocation.php
@@ -3,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-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept.php
index 38af3d68a0e..2c344d352fc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 73372730952..6e129acdf43 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AcceptFieldValuePart.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/AcceptFieldValuePart.php
index 083b6d1f932..d14bedb13ec 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CharsetFieldValuePart.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/CharsetFieldValuePart.php
index d03f0cf9718..9a4e76fb759 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/EncodingFieldValuePart.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/EncodingFieldValuePart.php
index 9c83c395734..7413f093d2e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/LanguageFieldValuePart.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Accept/FieldValuePart/LanguageFieldValuePart.php
index 5ea7c5747ac..9f8ba704e67 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AcceptCharset.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptCharset.php
index b4f76b96bfe..5c49c93d282 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 be17348aa86..b5771b0f19e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AcceptLanguage.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptLanguage.php
index a131ad24685..f36473a3577 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AcceptRanges.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AcceptRanges.php
index 732a161ee04..0dd275cc578 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Age.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Age.php
index e1e7b10378f..985fd180c17 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Allow.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Allow.php
index e0b42f1fa00..87da3977cdb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AuthenticationInfo.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/AuthenticationInfo.php
index d7815a7e7bf..e59eaf61c7e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Authorization.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Authorization.php
index 5c3b2766d50..aeee2441aa0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CacheControl.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/CacheControl.php
index e9b8c4bc604..a048450cbc4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Connection.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Connection.php
index 39333baaf95..16cb1258be9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ContentDisposition.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentDisposition.php
index 4358b92f5ca..4dd3f969e4a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ContentEncoding.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentEncoding.php
index 5a16279b249..38e350606f3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ContentLanguage.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLanguage.php
index f14748d3bd2..fcd5e1e12bc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ContentLength.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLength.php
index e764394641a..b07f322c087 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ContentLocation.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentLocation.php
index bf21fc76323..018761d2bf4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2ce8d1864ba..47792290ae1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ContentRange.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentRange.php
index 88a9c7e7b74..09146756d96 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ContentTransferEncoding.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentTransferEncoding.php
index 370a2ef6d44..37258bb4424 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ContentType.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentType.php
index 38f9ddea585..f05119b57e4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/ContentType.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Cookie.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Cookie.php
index 1875563af1c..0a737a24f68 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Date.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Date.php
index daaf0c63200..f310da10939 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 39c6ee6295a..c1cfc0dde1c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/ExceptionInterface.php
index dcfc83e2b99..14e429cf532 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Exception/InvalidArgumentException.php
index ca7e8aad7f1..aaf366e37d1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7e0c5b5e465..097b381912f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6e86b49728d..41150eaaaf6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Expires.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Expires.php
index 70e52a32454..82e8d89c488 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 45380af7dab..b1177dbd267 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/GenericHeader.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/GenericHeader.php
index 80b0bb9ee09..81fa5217b74 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 49cc10217a3..62e1c271122 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3b36e10b1a1..1cd2e4654a5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a136da10049..7a177cfa20f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/IfMatch.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfMatch.php
index 33b41dc4542..546b6aa86d9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/IfModifiedSince.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfModifiedSince.php
index 23690ae5cb6..d8d9f9a6256 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5d9b38d2f78..9275d0836d4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/IfRange.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfRange.php
index aa7767ec0af..7524d464969 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/IfUnmodifiedSince.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/IfUnmodifiedSince.php
index 237cb9fa71e..2615596af53 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 563aa6da8da..dad3e9318f2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/LastModified.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/LastModified.php
index 797164e6bd1..d9ea8bdb6e7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 299b67b1eeb..8d391ebf58d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/Location.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/Location.php
@@ -3,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-2014 Zend Technologies USA 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/MaxForwards.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/MaxForwards.php
index 6107401c6bb..1f1c14c5960 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/MultipleHeaderInterface.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/MultipleHeaderInterface.php
index 3a14c90839c..3034f7b4a4d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Pragma.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Pragma.php
index 6debc287d4c..a00cdab0959 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ProxyAuthenticate.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ProxyAuthenticate.php
index 995b5db70d7..ec63906fc16 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ProxyAuthorization.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/ProxyAuthorization.php
index 65265a4ba24..942bbe30228 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Range.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Range.php
index 5c44e79e472..8dc93fb2f8f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Referer.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Referer.php
index 586074e8980..cde2f8615ce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 20c3fe1cdd3..fd19aa57be4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RetryAfter.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/RetryAfter.php
index 71178231b33..cdd239aa42c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bea2c95f9e8..e81f0d43a40 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SetCookie.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php
index e03bd23df41..51bbb645120 100644
--- a/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.php
+++ b/vendor/zendframework/zendframework/library/Zend/Http/Header/SetCookie.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Header;
-use Closure;
use Zend\Uri\UriFactory;
/**
@@ -97,7 +96,6 @@ class SetCookie implements MultipleHeaderInterface
*/
public static function fromString($headerLine, $bypassHeaderFieldName = false)
{
- /* @var $setCookieProcessor Closure */
static $setCookieProcessor = null;
if ($setCookieProcessor === null) {
@@ -107,7 +105,7 @@ class SetCookie implements MultipleHeaderInterface
$keyValuePairs = preg_split('#;\s*#', $headerLine);
foreach ($keyValuePairs as $keyValue) {
- if (preg_match('#^(?<headerKey>[^=]+)=\s*("?)(?<headerValue>[^"]+)\2#',$keyValue,$matches)) {
+ if (preg_match('#^(?P<headerKey>[^=]+)=\s*("?)(?P<headerValue>[^"]*)\2#', $keyValue, $matches)) {
$headerKey = $matches['headerKey'];
$headerValue= $matches['headerValue'];
} else {
@@ -262,10 +260,6 @@ class SetCookie implements MultipleHeaderInterface
*/
public function setName($name)
{
- if ($name !== null && preg_match("/[=,; \t\r\n\013\014]/", $name)) {
- throw new Exception\InvalidArgumentException("Cookie name cannot contain these characters: =,; \\t\\r\\n\\013\\014 ({$name})");
- }
-
$this->name = $name;
return $this;
}
@@ -360,15 +354,24 @@ class SetCookie implements MultipleHeaderInterface
return $this;
}
+ $tsExpires = $expires;
if (is_string($expires)) {
- $expires = strtotime($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) {
+ $tsExpires = PHP_INT_MAX;
+ }
+ }
}
- if (!is_int($expires) || $expires < 0) {
+ if (!is_int($tsExpires) || $tsExpires < 0) {
throw new Exception\InvalidArgumentException('Invalid expires time specified');
}
- $this->expires = $expires;
+ $this->expires = $tsExpires;
return $this;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Header/TE.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/TE.php
index e56dae6d169..0afe87014e7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Trailer.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Trailer.php
index ea5951d315c..0dd90ef7af8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/TransferEncoding.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/TransferEncoding.php
index 9c0997f480f..d3489394e10 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Upgrade.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Upgrade.php
index f9cd143d93e..84f7cefc00c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/UserAgent.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/UserAgent.php
index f7df7c4142d..e83762a9e07 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Vary.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Vary.php
index a8fed2e63ff..701001796f5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Via.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Via.php
index 11e9b3a7453..b29b5b24111 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/WWWAuthenticate.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/WWWAuthenticate.php
index 2f758482ca8..630ddd949c8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Warning.php b/vendor/zendframework/zendframework/library/Zend/Http/Header/Warning.php
index 14ab438c7e9..4e3f7456cbe 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HeaderLoader.php b/vendor/zendframework/zendframework/library/Zend/Http/HeaderLoader.php
index 036fdbb15f0..21f95bf797c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Headers.php b/vendor/zendframework/zendframework/library/Zend/Http/Headers.php
index 6843fe12a92..440b5be3275 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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 Countable;
use Iterator;
use Traversable;
-use Zend\Http\HeaderLoader;
use Zend\Loader\PluginClassLocator;
/**
@@ -69,16 +68,16 @@ class Headers implements Countable, Iterator
'name' => $matches['name'],
'line' => trim($line)
);
- } elseif (preg_match('/^\s+.*$/', $line, $matches)) {
+ } elseif (preg_match('/^(?P<ws>\s+).*$/', $line, $matches)) {
// continuation: append to current line
- $current['line'] .= trim($line);
+ $current['line'] .= "\r\n" . $matches['ws'] . trim($line);
} elseif (preg_match('/^\s*$/', $line)) {
// empty line indicates end of headers
break;
} else {
// Line does not match header format!
throw new Exception\RuntimeException(sprintf(
- 'Line "%s"does not match header format!',
+ 'Line "%s" does not match header format!',
$line
));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/RemoteAddress.php b/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/RemoteAddress.php
index 4941b5dca66..077768ab8fb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -101,7 +101,7 @@ class RemoteAddress
if ($ip) {
return $ip;
}
-
+
// direct IP address
if (isset($_SERVER['REMOTE_ADDR'])) {
return $_SERVER['REMOTE_ADDR'];
@@ -118,8 +118,8 @@ class RemoteAddress
*/
protected function getIpAddressFromProxy()
{
- if (!$this->useProxy
- || !in_array($_SERVER['REMOTE_ADDR'], $this->trustedProxies)
+ if (!$this->useProxy
+ || (isset($_SERVER['REMOTE_ADDR']) && !in_array($_SERVER['REMOTE_ADDR'], $this->trustedProxies))
) {
return false;
}
@@ -135,7 +135,7 @@ class RemoteAddress
$ips = array_map('trim', $ips);
// remove trusted proxy IPs
$ips = array_diff($ips, $this->trustedProxies);
-
+
// Any left?
if (empty($ips)) {
return false;
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Request.php b/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Request.php
index 9b57fcad7c9..4a6cf81c50a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -251,8 +251,13 @@ class Request extends HttpRequest
$uri = new HttpUri();
// URI scheme
- $scheme = (!empty($this->serverParams['HTTPS'])
- && $this->serverParams['HTTPS'] !== 'off') ? 'https' : 'http';
+ if ((!empty($this->serverParams['HTTPS']) && $this->serverParams['HTTPS'] !== 'off')
+ || (!empty($this->serverParams['HTTP_X_FORWARDED_PROTO']) && $this->serverParams['HTTP_X_FORWARDED_PROTO'] == 'https')
+ ) {
+ $scheme = 'https';
+ } else {
+ $scheme = 'http';
+ }
$uri->setScheme($scheme);
// URI host & port
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Response.php b/vendor/zendframework/zendframework/library/Zend/Http/PhpEnvironment/Response.php
index f0400927a65..1ffbdb1e22c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3740b711312..71d36805fe7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -25,16 +25,16 @@ class Request extends AbstractMessage implements RequestInterface
/**#@+
* @const string METHOD constant names
*/
- const METHOD_OPTIONS = 'OPTIONS';
- const METHOD_GET = 'GET';
- const METHOD_HEAD = 'HEAD';
- const METHOD_POST = 'POST';
- const METHOD_PUT = 'PUT';
- const METHOD_DELETE = 'DELETE';
- const METHOD_TRACE = 'TRACE';
- const METHOD_CONNECT = 'CONNECT';
- const METHOD_PATCH = 'PATCH';
- const METHOD_PROPFIND= 'PROPFIND';
+ const METHOD_OPTIONS = 'OPTIONS';
+ const METHOD_GET = 'GET';
+ const METHOD_HEAD = 'HEAD';
+ const METHOD_POST = 'POST';
+ const METHOD_PUT = 'PUT';
+ const METHOD_DELETE = 'DELETE';
+ const METHOD_TRACE = 'TRACE';
+ const METHOD_CONNECT = 'CONNECT';
+ const METHOD_PATCH = 'PATCH';
+ const METHOD_PROPFIND = 'PROPFIND';
/**#@-*/
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Http/Response.php b/vendor/zendframework/zendframework/library/Zend/Http/Response.php
index a43bbaf6b62..9c9c50e5037 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Response/Stream.php b/vendor/zendframework/zendframework/library/Zend/Http/Response/Stream.php
index 94c61e46cd3..4da7a3f652b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExceptionInterface.php
index 2c12c3f3290..5c776b725f7 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ExtensionNotLoadedException.php
index 39bb5a90501..2bbc075627f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/InvalidArgumentException.php
index 5b879e1a30d..022a12809fe 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/OutOfBoundsException.php
index c07d3013367..0d49688129c 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ParseException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ParseException.php
index d1f6b9e6cf3..7e442a66f09 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ParseException.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/ParseException.php
@@ -3,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-2014 Zend Technologies USA 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/Exception/RangeException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RangeException.php
index 3999e93414a..aec816a27fe 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RangeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RangeException.php
@@ -3,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-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RuntimeException.php
index 37ed3364c6a..b49473e3c58 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractLocale.php b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/AbstractLocale.php
index 0e5d262877a..14b3c11fa99 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8eb31083008..3a20232f32d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Alpha.php b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/Alpha.php
index 91654515c37..ea990497453 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/NumberFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberFormat.php
index 7c626790765..6ea1f1d5e7d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Filter/NumberFormat.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Filter/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FileLoaderInterface.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/FileLoaderInterface.php
index 27025bc8cbf..f21125e9389 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ca156526680..cf952b5f778 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Ini.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/Ini.php
index 02a9ecac20e..4943ac99b44 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PhpArray.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/PhpArray.php
index f93d92e3aaf..4765720cf5e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RemoteLoaderInterface.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Loader/RemoteLoaderInterface.php
index e85794d70ac..59b0046d61b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a2df197be90..0649cd82dbf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Plural/Parser.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Parser.php
index 2929b56c3b6..d3e872e3c5e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Plural/Rule.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Rule.php
index 39f2aa15054..98e29cf6000 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Plural/Symbol.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Plural/Symbol.php
index d5e2b3c1145..31d6606c720 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/TextDomain.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TextDomain.php
index e33b7079797..a4aceb0152a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Translator.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/Translator.php
index 5b2c1566dbf..c746ddce035 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/TranslatorAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareInterface.php
index afe42153e3b..a69b0045938 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/TranslatorAwareTrait.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareTrait.php
index d5bcefb6cdf..016b18ac10d 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareTrait.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorAwareTrait.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\I18n\Translator;
-use Zend\I18n\Translator\Translator;
trait TranslatorAwareTrait
{
diff --git a/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/I18n/Translator/TranslatorServiceFactory.php
index 7ce4e6287c5..8a14ffed699 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a8c90472573..f983a642f28 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b2d119e15cc..c79729933ec 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 aa563950c6c..fd453efa45e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Float.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Float.php
index dd1d4cd8419..d1026caafb5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Int.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/Int.php
index 2c91a89f94d..c6f90ca81f6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php
index 12260edd4f8..729a4fbdf90 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber.php
@@ -3,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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -151,7 +151,7 @@ class PhoneNumber extends AbstractValidator
*/
public function setCountry($country)
{
- $this->country = $country;
+ $this->country = strtoupper($country);
return $this;
}
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 80bace7b682..a8e32bfaabd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 528b12a2ccf..54ccdbb0697 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ffaf012c556..8cacd8c0730 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a0efc8604b5..c4a25e332e9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fce27ced418..f3f62c88350 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7fbb0b37877..4d5c2f2d087 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e08c9fbcc25..765acf2ec1b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 497732f0223..af34426b671 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 760bf3084b1..a9c8632ee21 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 25489f839e5..2cdb5efb879 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9f7b7d18633..21686cbac3e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4be4f8f2f0d..e79f2b23c8c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 48ef9fbe18d..129c543a10f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b5ade6fc4f2..a5493c5fc66 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 75c53482d28..36b90a0ac94 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 be93b0f263c..f62ef58eb6a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c089c7453a7..aacdbc9e01e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ec6c441c8d0..eff89300b6c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4680bcf7c9d..9924303c86a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6165ca101dd..ae0020a410b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 02df9959524..2d9d9a5802a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 228737169b2..4e8c4fcbda2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0d70a4c3198..755ff41e96f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2e91f6d6fd9..d71589d0ba5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b79c921b2c7..d45f86293f9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e82474c570e..7a65486cc3d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0ac4a683a92..9db45422b21 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e2e5b4a3013..0dabeae002d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 89be909be3e..a81a711b8a2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 69e67543667..ec24739335b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 38607b0add4..00d334c172c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c33944ce068..55a9d552b0c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2d008ee425a..f6e49d4a2c9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e316531e75b..1cac6f552a0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 eeb103181ad..288b0d00e6e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 31a63bf6c67..713e28fddaa 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f179f054d25..0d7388e4c2b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b709d616865..d5565fccffb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c3d2ec72350..f0589c91c24 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6ef2463b135..2ccb05cffea 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 48cb31900f3..dadad9ff4b2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c863c64a8e8..a16c372abee 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b86454d7778..c688aa2b30c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 da35666d88c..932f83fcb20 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 985e7e4993e..8cccec24db2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0faddb67a01..b3249d9a6b2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0553e6d1d7a..28ed30d0986 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 afb6e020797..bb37839a663 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8e622e1cc17..dd31fc8c518 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d2e915fec27..8b57518fadf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3bae74571ca..e0fbd208ae2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4ba1da8663e..f98f612436d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d488a45df6a..f8b783d1e68 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6c1c8a29bc3..d31c642cf0b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9a091f3699e..0522f3a2fe6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7437c35adf9..c2e33cfe606 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d33b7c76b6d..4d67877a518 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 57acb293441..7ca1c02ab95 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a7ca72eb383..46fb12cbacf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 eafbda10464..8ad41576ed8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3908120893a..dc76f783a51 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 480a9ef62fd..e059b3e85f3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3849ab3475f..43184e26988 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d4d53b0bb22..5137004557c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 512a05c9db9..61fa0254501 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 74de1b82588..561f303ab2d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 db0f14e8f25..c9640759f39 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e8fc7b2fda2..8601f009907 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 19c4818b3c8..3450c5aed29 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 218d34f4183..4d6cf27cac3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6ae62de11bf..fb92b5b3bf1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1b466f9c5f8..05b987ff086 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 40abe3e63fe..175587aaf22 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8e36855fd45..0ac6b7851bd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/GA.php b/vendor/zendframework/zendframework/library/Zend/I18n/Validator/PhoneNumber/GA.php
index 427944fc38f..89efc1a7ec0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5dd126f4ce7..c79d084ce02 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 91e4cc3074e..5402120e7c4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a726a95cce5..8574f7fe13d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 05ce19803b8..2cf36618dfa 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 753b25fcb83..ed54147597b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 006da5d1e41..cd575022d9c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ca3969a35c8..6847168bed8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0a6e9f75837..074467e1c54 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 82b4d218ff2..d4b834bdc44 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0c9652ddc1f..d1df586c330 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 91b0525bd5f..75ab3436cc7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e8b7ca8d2c0..df5d25311f5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 154fca45c89..f279291acd3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f8888910493..f417e17a6a3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2b68a97ff79..f897375f930 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e06df20eefc..661a13e03b4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 95e9ba800fe..1d97f5138ef 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 05aafbdac21..4d8ad36b073 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e64f974f14c..d6737460a59 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 263f90ae643..a4c032f812b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e2aea06c1a1..90abff5766d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 67b44e48645..c1d2661567e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 553a52ee366..05f70715b0e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8c948c103f4..416da05441d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 760da9e8d0b..293a3fa6150 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 51042b3b12a..d36f15a2908 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5fd4c46a76d..1968e8f9ab7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8ae9ad89a50..1b1d63bd35c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9ff6179f138..e660e274811 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e3e77e70258..6ca5e96acce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ead710e6767..517e49fa8a6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e20abce526e..9274de6a000 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d1bad4dffe3..71f2f6984ae 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 aaa942026d8..d70e08ebd68 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2210b9ce397..efd7f97ed80 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 45c1ed94bca..31d8ab5a456 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 50cf07b73c4..49f198d6a2c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f9ab2ce9222..25820b21d16 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 848fdb927a8..ebd1b0c9ef4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 48a88b6fe12..3b9b43fb59b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6eab46bec2e..97c0af26a7d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b7ff1c84e91..6f54c236c6c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 dddbdccac43..c005ef8e77f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5457668f7d4..3c3363399ae 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 81f4cb5f898..ad19cafcbae 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d8216e580ed..ea8b6fe1829 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 92297940269..0ba5df16112 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 836b2911d8b..618b55d566f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ec585da3e38..52a0819978a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7d59ef7768e..8bd033c643d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a36053f6295..bf27ab78def 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7486a452046..739737f556d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 33bd6a69877..6547a6c715c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 af1219570da..f5073759fa7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5483a8510c6..b054f55ef6d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c42cb7be0d8..aee8dc9faf9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 efbe4507a0a..9d73e5152bd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ccaade2ebae..0855a57a3d0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7daeb65c8bb..7e887cfabc8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 48f2a7ff30e..c2212dcd7c1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3166f00e0eb..7c490dee647 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1b2a2610b30..fbc80ff7717 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3997e430170..55dd233e343 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 222ddb63b80..5a26015bbcb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 95302768aa3..b4a462cb5a0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1b18538c170..5fe3a4f9c44 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 dc85a6b300a..fef63884480 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9f88eadd449..282bccb11ea 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 52d4294febc..33e5258ace8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4729ba4c16e..1dbd32af8bd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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' => '/^[268]\\d{7}$/',
'fixed' => '/^(?:28[2-57-9]|8[2-57-9]\\d)\\d{5}$/',
- 'mobile' => '/^6[236]\\d{6}$/',
+ 'mobile' => '/^6[2356]\\d{6}$/',
'emergency' => '/^999$/',
),
'possible' => array(
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 5343caff6b7..aa93d4560a5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 875fe07d30e..1224eb1d944 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 484d8d9861e..1a8e84c2abb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1ef77f036a8..1587038d837 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c648ef384b6..320a3015de0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7be716a9bfe..1884219dba3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 40e0a52ef29..fd58c0a6180 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fa02009369b..193fcec451a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1b200a251a9..fe04bb4b503 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 645e0a754d4..09a5cc4c769 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 33ce8ff5eb8..dc3c66d1927 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 aca0423a45c..ca55c4d8570 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a0457ffacab..000d5de258d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 34dff2ece46..447ceaf9cc4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ae085996788..5cc97acbbc2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 70496c960f4..2e892aff205 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 06db4a8cd87..0deba4720c9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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' => '/^8\\d{7}$/',
+ 'mobile' => '/^[78]\\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 bdd10016708..770efefc4cd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e875d05a98f..9a35d2cb6a2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7149188d8e7..3e50c534cde 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 39f3f92117a..584755f44ca 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 da37b2c1f26..d215c2e7edb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3631a0fcd82..35b2dfbf0e6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3667e8cded7..079f91282f6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 36268063eaf..e12308bb9c5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6baf211b279..677e9e77a96 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bb76accd50a..b145f73ee28 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8c8b7d01ce5..9b670bca80a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ce66d7d6f9a..63c83e67744 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cd3953bd55c..8bc537ddc7e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bfe378e5a07..727adf867f8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a63aaeabf60..c47eae2bcdc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 96906921e6d..f0cb29d066e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bba95830c3e..7e98744f6c1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a2c05fa6db7..01ca673441c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cdbc23e07f5..dbb7e2a328c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 76887ff02ee..7fd69d0f764 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 684c88efde7..3d139c1b70f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 60089077339..5281602b326 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9cabe23dbbd..b51f28fccc5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 72ca48b64d4..35c2eeff935 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 21bbe1713b4..6a4e91cae4f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5f988f7e967..c75e3e2acc8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 851fa279974..375f84befa1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 29269739873..ea109869179 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bb635726e6c..3127bc4c74e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e0946de2523..ac1258093d5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c38a5000256..1019aa411fd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 70c1b85b9d2..8bfd363e17e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2303d4b1a93..789f0d8072f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fdcd5540b25..ff155ebaf62 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3a4b4261e18..32ebd5ccda2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1bc006ce63f..0f5ac7d571a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 369ddac995d..021a8c317e3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5a44a120ea2..31ecb9a3870 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 21d81d19313..b1cb398ef8f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 504ea11adc6..a8400a35e8a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 56f3c0d7937..73468fc83d3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8215a0ce9f0..e1055dbf8f1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 476a06b9368..e6204120f3c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 eebc6104f54..2f0e5f18d9d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f29e6885a50..1a58b86ada8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 67777eb599b..2036019cf91 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3d5e0ee57be..1200fe57dd2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 891cfc2c4f5..a111f2e1823 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3c167c39f16..832f9f83558 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 37535fa549c..efbff3a5537 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3b0348aaa41..2b546e314b7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3fa440fd772..1542a109ce9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d498d6ea80c..ffbac87c0ac 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8cd880a4273..b316d81bfef 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b9ff152ab7c..94f7f38c616 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ed96ba0f27e..a974e155e51 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9dbd4e4c4f0..4c76aa71864 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 12c1306fffb..d0b4bf799af 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 748e0754b49..663c946eb9a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5fac559030c..aa34f107f0b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4407c069ae4..1bdc22827b7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c86ebe63203..9f11578c5ae 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a9ed3c7f2ea..3c4ea482c6e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 985f114e06f..30ae376af34 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 eefdb7d0684..ef0f7b5d231 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 24f21eb2942..991caec3fd7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7e4af3acd89..6e3a5c7dfc1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cdee15a4996..365826d1f5d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 af8efd17005..fc911554fe0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3102321d1d4..6a064f8acca 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d2816b9c8a4..604e063ad09 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0f492706332..a1f8010dd79 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0b3ae7fa5ba..ea46f114e0c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0970f51c1ad..7ba438b8fa6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e9d09ed194b..8dd7c1a4127 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f7d6aff5f61..3d0a9de363f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 09e137d38f4..a09d92f02d9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3796a506b28..416090e9e46 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9ef1c7acef8..e53ffcf3efc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 818eb683a42..149d854903d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9fbac98b30e..6818e722229 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4ad577e6b2d..a1ab059cb72 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d1461e6c3da..23c0a6f1ea0 100644
--- a/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/AbstractTranslatorHelper.php
@@ -3,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-2014 Zend Technologies USA 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/CurrencyFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/CurrencyFormat.php
index ee7347db9f5..e2c7d83c263 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DateFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/DateFormat.php
index c7dffb697bd..acf3b195d2a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/NumberFormat.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/NumberFormat.php
index ab775f5efd5..eb6301a8a4b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Plural.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Plural.php
index 4bff0f24c29..a366b27f7b7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Translate.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/Helper/Translate.php
index 9992124bf82..5b7a508346a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1bf184f0117..f5d5e723870 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HelperConfig.php b/vendor/zendframework/zendframework/library/Zend/I18n/View/HelperConfig.php
index 437661d2e43..e7ac22df278 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ArrayInput.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/ArrayInput.php
index 5dec0151b1b..7a32f64bca7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BaseInputFilter.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/BaseInputFilter.php
index 7064c156811..38e9de03e3a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -18,7 +18,11 @@ use Zend\Stdlib\InitializableInterface;
* @todo How should we deal with required input when data is missing?
* should a message be returned? if so, what message?
*/
-class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInterface, InitializableInterface
+class BaseInputFilter implements
+ InputFilterInterface,
+ UnknownInputsCapableInterface,
+ InitializableInterface,
+ ReplaceableInputInterface
{
protected $data;
protected $inputs = array();
@@ -84,6 +88,38 @@ class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInter
return $this;
}
+ /**
+ * Replace a named input
+ *
+ * @param InputInterface|InputFilterInterface $input
+ * @param string $name Name of the input to replace
+ * @throws Exception\InvalidArgumentException
+ * @return self
+ */
+ public function replace($input, $name)
+ {
+ if (!$input instanceof InputInterface && !$input instanceof InputFilterInterface) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects an instance of %s or %s as its first argument; received "%s"',
+ __METHOD__,
+ 'Zend\InputFilter\InputInterface',
+ 'Zend\InputFilter\InputFilterInterface',
+ (is_object($input) ? get_class($input) : gettype($input))
+ ));
+ }
+
+ if (!array_key_exists($name, $this->inputs)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s: no input found matching "%s"',
+ __METHOD__,
+ $name
+ ));
+ }
+
+ $this->inputs[$name] = $input;
+ return $this;
+ }
+
/**
* Retrieve a named input
*
@@ -339,6 +375,11 @@ class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInter
{
if ($name === self::VALIDATE_ALL) {
$this->validationGroup = null;
+ foreach($this->getInputs() as $input) {
+ if ($input instanceof InputFilterInterface) {
+ $input->setValidationGroup(self::VALIDATE_ALL);
+ }
+ }
return $this;
}
@@ -350,6 +391,14 @@ class BaseInputFilter implements InputFilterInterface, UnknownInputsCapableInter
} else {
$inputs[] = $key;
+ if (!$this->inputs[$key] instanceof InputFilterInterface) {
+ throw new Exception\InvalidArgumentException(
+ sprintf(
+ 'Input "%s" must implement InputFilterInterface',
+ $key
+ )
+ );
+ }
// Recursively populate validation groups for sub input filters
$this->inputs[$key]->setValidationGroup($value);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/CollectionInputFilter.php
index f947fef69c3..44b6f443468 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -48,6 +48,11 @@ class CollectionInputFilter extends InputFilter
*/
protected $collectionRawValues = array();
+ /*
+ * @var array
+ */
+ protected $collectionMessages = array();
+
/**
* @var BaseInputFilter
*/
@@ -159,7 +164,6 @@ class CollectionInputFilter extends InputFilter
if ($this->isRequired) {
$valid = false;
}
- return $valid;
}
if (count($this->collectionData) < $this->getCount()) {
@@ -174,7 +178,7 @@ class CollectionInputFilter extends InputFilter
$this->data = $data;
$this->populate();
- if ($this->validateInputs($inputs)) {
+ if ($this->validateInputs($inputs, $data)) {
$this->collectionValidInputs[$key] = $this->validInputs;
} else {
$this->collectionInvalidInputs[$key] = $this->invalidInputs;
@@ -183,6 +187,7 @@ class CollectionInputFilter extends InputFilter
$values = array();
$rawValues = array();
+ $messages = array();
foreach ($inputs as $name) {
$input = $this->inputs[$name];
@@ -193,9 +198,17 @@ class CollectionInputFilter extends InputFilter
}
$values[$name] = $input->getValue($this->data);
$rawValues[$name] = $input->getRawValue();
+ $tmpMessages = $input->getMessages();
+ if (!empty($tmpMessages)) {
+ $messages[$name] = $tmpMessages;
+ }
}
$this->collectionValues[$key] = $values;
$this->collectionRawValues[$key] = $rawValues;
+
+ if (!empty($messages)) {
+ $this->collectionMessages[$key] = $messages;
+ }
}
return $valid;
@@ -259,12 +272,6 @@ class CollectionInputFilter extends InputFilter
*/
public function getMessages()
{
- $messages = array();
- foreach ($this->getInvalidInput() as $key => $inputs) {
- foreach ($inputs as $name => $input) {
- $messages[$key][$name] = $input->getMessages();
- }
- }
- return $messages;
+ return $this->collectionMessages;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/EmptyContextInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/EmptyContextInterface.php
index 72933b1862d..0a2270d7fc2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d2c2451cf98..848fa2e520e 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/InvalidArgumentException.php
index db88b36a10f..3fcec0c68d2 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/RuntimeException.php
index 207d7776955..45ef3ee857f 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Factory.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php
index 65400adebb0..6ac6bc2be5c 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/Factory.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -225,6 +225,9 @@ class Factory
case 'fallback_value':
$input->setFallbackValue($value);
break;
+ case 'break_on_failure':
+ $input->setBreakOnFailure($value);
+ break;
case 'filters':
if ($value instanceof FilterChain) {
$input->setFilterChain($value);
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/FileInput.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/FileInput.php
index 76a8bd4d095..41d2e4934e4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 da84df9e174..ab2eab14dc5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InputFilter.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilter.php
index 27060c8f1ab..29073e91287 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2da66cf1149..bf4f2011570 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 94c9d4c77d4..cab399e4436 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\InputFilter;
-use Zend\InputFilter\InputFilterInterface;
trait InputFilterAwareTrait
{
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterInterface.php
index e7f4f11c941..41bbfcfb44c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 757e3dc258d..de1038aafc8 100644
--- a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterPluginManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterPluginManager.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\InputFilter;
-use Zend\InputFilter\Exception;
use Zend\ServiceManager\AbstractPluginManager;
use Zend\ServiceManager\ConfigInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/InputFilterProviderInterface.php
index 8811cc0c67d..3b57cc8be44 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6144ac11dc1..85637654280 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5f596ede869..f5298a19565 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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
new file mode 100644
index 00000000000..dcb3f834ed8
--- /dev/null
+++ b/vendor/zendframework/zendframework/library/Zend/InputFilter/ReplaceableInputInterface.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\InputFilter;
+
+/**
+ * Mark an input as able to be replaced by another when merging input filters.
+ *
+ */
+interface ReplaceableInputInterface
+{
+ public function replace($input, $name);
+}
diff --git a/vendor/zendframework/zendframework/library/Zend/InputFilter/UnknownInputsCapableInterface.php b/vendor/zendframework/zendframework/library/Zend/InputFilter/UnknownInputsCapableInterface.php
index f2067961fdb..1890307bed9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Decoder.php b/vendor/zendframework/zendframework/library/Zend/Json/Decoder.php
index 59c92f92085..ecfca74b414 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -443,7 +443,7 @@ class Decoder
* Solar Framework by Paul M. Jones
*
* @link http://solarphp.com/
- * @link http://svn.solarphp.com/core/trunk/Solar/Json.php
+ * @link https://github.com/solarphp/core/blob/master/Solar/Json.php
* @param string $chrs
* @return string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Encoder.php b/vendor/zendframework/zendframework/library/Zend/Json/Encoder.php
index 190edc635a9..ecc471f9054 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -436,7 +436,7 @@ class Encoder
* Solar Framework by Paul M. Jones
*
* @link http://solarphp.com/
- * @link http://svn.solarphp.com/core/trunk/Solar/JSON.php
+ * @link https://github.com/solarphp/core/blob/master/Solar/Json.php
* @param string $value
* @return string
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Json/Exception/BadMethodCallException.php
index 8777b2f6067..9d2e9636f00 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Json/Exception/ExceptionInterface.php
index 42761276afe..6ba43cf7f6d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Json/Exception/InvalidArgumentException.php
index 1d9a4037235..5673dd595b2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RecursionException.php b/vendor/zendframework/zendframework/library/Zend/Json/Exception/RecursionException.php
index fb56bcbc89e..6f9c979b521 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Exception/RecursionException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Exception/RecursionException.php
@@ -3,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-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Json/Exception/RuntimeException.php
index 2d69323f824..b83c5250edc 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Expr.php b/vendor/zendframework/zendframework/library/Zend/Json/Expr.php
index 7305c53d07a..c112de7fc4d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 02a792bfce7..1bb15794867 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Json;
use SimpleXMLElement;
use Zend\Json\Exception\RecursionException;
use Zend\Json\Exception\RuntimeException;
+use ZendXml\Security as XmlSecurity;
/**
* Class for encoding to and decoding from JSON.
@@ -311,10 +312,10 @@ class Json
public static function fromXml($xmlStringContents, $ignoreXmlAttributes = true)
{
// Load the XML formatted string into a Simple XML Element object.
- $simpleXmlElementObject = simplexml_load_string($xmlStringContents);
+ $simpleXmlElementObject = XmlSecurity::scan($xmlStringContents);
// If it is not a valid XML content, throw an exception.
- if ($simpleXmlElementObject == null) {
+ if (!$simpleXmlElementObject) {
throw new RuntimeException('Function fromXml was called with an invalid XML formatted string.');
} // End of if ($simpleXmlElementObject == null)
@@ -369,10 +370,12 @@ class Json
} else {
$result .= ($inLiteral ? '' : $prefix) . $token;
+ //remove escaped backslash sequences causing false positives in next check
+ $token = str_replace('\\', '', $token);
// Count # of unescaped double-quotes in token, subtract # of
// escaped double-quotes and if the result is odd then we are
// inside a string literal
- if ((substr_count($token, "\"")-substr_count($token, "\\\"")) % 2 != 0) {
+ if ((substr_count($token, '"')-substr_count($token, '\\"')) % 2 != 0) {
$inLiteral = !$inLiteral;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Cache.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Cache.php
index 1f2e0e48820..ebcb340b227 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Client.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Client.php
index ed863d27763..04efb54be8f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -144,7 +144,7 @@ class Client implements ServerClient
$this->lastResponse = $response;
- // import all response data form JSON HTTP response
+ // import all response data from JSON HTTP response
$response->loadJson($httpResponse->getBody());
return $response;
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Error.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Error.php
index 87104364e0b..7a350de7d89 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ErrorException.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/ErrorException.php
index 98c55249c4f..f7e614c4387 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/ExceptionInterface.php
index cf6a1222f83..a91d60dd5d7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/HttpException.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/HttpException.php
index 2e301ba2d3e..8ad3d039419 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/InvalidArgumentException.php
index 6a2289f1389..adf60dc3a42 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Exception/RuntimeException.php
index f11f92b5fd1..a6edcab474d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Request.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Request.php
index 21b455f1b6f..398db24b689 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Request/Http.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Request/Http.php
index d90fcd664f1..1cc43efb09f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e2000a8c3ec..30566fdef07 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Http.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Response/Http.php
index ce672d58858..71b2d1a02f9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1da0bff9124..78e26312aac 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -361,17 +361,34 @@ class Server extends AbstractServer
*/
protected function _getDefaultParams(array $args, array $params)
{
- $defaultParams = array_slice($params, count($args));
- foreach ($defaultParams as $param) {
- $value = null;
- if (array_key_exists('default', $param)) {
- $value = $param['default'];
+ if (false === $this->isAssociative($args)) {
+ $params = array_slice($params, count($args));
+ }
+
+ foreach ($params as $param) {
+ if (isset($args[$param['name']]) || !array_key_exists('default', $param)) {
+ continue;
}
- $args[$param['name']] = $value;
+
+ $args[$param['name']] = $param['default'];
}
+
return $args;
}
+ /**
+ * check whether array is associative or not
+ *
+ * @param array $array
+ * @return bool
+ */
+ private function isAssociative(array $array)
+ {
+ $keys = array_keys($array);
+
+ return ($keys != array_keys($keys));
+ }
+
/**
* Get method param type
*
diff --git a/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd.php b/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd.php
index 6857f4bd086..c04c44064af 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -373,11 +373,12 @@ class Smd
return $this->toDojoArray();
}
+ $description = $this->getDescription();
$transport = $this->getTransport();
$envelope = $this->getEnvelope();
$contentType = $this->getContentType();
$SMDVersion = static::SMD_VERSION;
- $service = compact('transport', 'envelope', 'contentType', 'SMDVersion');
+ $service = compact('transport', 'envelope', 'contentType', 'SMDVersion', 'description');
if (null !== ($target = $this->getTarget())) {
$service['target'] = $target;
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 9cec38cc916..51e49a30ed5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd/Service.php
+++ b/vendor/zendframework/zendframework/library/Zend/Json/Server/Smd/Service.php
@@ -3,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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -395,12 +395,13 @@ class Service
$transport = $this->getTransport();
$parameters = $this->getParams();
$returns = $this->getReturn();
+ $name = $this->getName();
if (empty($target)) {
- return compact('envelope', 'transport', 'parameters', 'returns');
+ return compact('envelope', 'transport', 'name', 'parameters', 'returns');
}
- return $paramInfo = compact('envelope', 'target', 'transport', 'parameters', 'returns');
+ return compact('envelope', 'target', 'transport', 'name', 'parameters', 'returns');
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Attribute.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Attribute.php
index 56fabc6b9dc..c2984f3c70a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -335,7 +335,7 @@ class Attribute
{
$values = static::getAttribute($data, $attribName, $index);
if (is_array($values)) {
- for ($i = 0; $i < count($values); $i++) {
+ for ($i = 0, $count = count($values); $i < $count; $i++) {
$newVal = static::valueFromLdapDateTime($values[$i]);
if ($newVal !== null) {
$values[$i] = $newVal;
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Collection.php
index 9f7bef654ec..a460d269342 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 82b0ca7c37b..1a30db54be4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7b7f0833f83..8932343b045 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ConverterException.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Converter/Exception/ConverterException.php
index 868abbc2e4a..eae8f5dfe12 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 980b8462815..39d9cdff7e1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 150a877d6b2..f54cc47df04 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 01ae20cf1bc..9a13f45158e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 988e9ee8758..0ca0721fb9c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 caf0d51117c..c028787f6da 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 457fe1b7751..8d5ed4b4359 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4d6cf657710..e1b7f306352 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ee36329b100..84800795346 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e074e53975c..ac79bd49b4d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c64108263da..89f063e01f3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c353e0de2f0..f04cd641b10 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Ldap\Filter;
-use Zend\Ldap\Filter\Exception;
/**
* 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 b444b6e2918..beeb4ce2157 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4d9bce6cc69..f5ff231ff3c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b7fb1cbaf00..0ed114218d1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 844149b3f23..89b5059c540 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -24,7 +24,7 @@ class MaskFilter extends StringFilter
{
$args = func_get_args();
array_shift($args);
- for ($i = 0; $i < count($args); $i++) {
+ for ($i = 0, $count = count($args); $i < $count; $i++) {
$args[$i] = static::escapeValue($args[$i]);
}
$filter = vsprintf($mask, $args);
diff --git a/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/NotFilter.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Filter/NotFilter.php
index a03bd73e935..b2a236018f3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c349ddd4e0e..215a51f4736 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c939b23fd9a..9f98cf8eb56 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6deafa83191..10454b8b6d9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Ldif/Encoder.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Ldif/Encoder.php
index ea08fb35d77..02fa92b2c81 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d7e3cff3b3d..01e9dc82956 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a5162bc9c7e..5e14c97ff41 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 da67dbccb39..1b6a361dbcb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f46eabbc0fc..5185a636c54 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 94a55d21402..213df1ddb92 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a536a2c0a94..b786b09e3e6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 56fcd95bce5..2c765fc6bf8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6842265db2c..eb96ac2b40e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2b447a1fef1..20d2b0cc272 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 384c4d614ed..5f5e164841f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 222ea1ef053..946ab51355d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e359474051a..94256df8554 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AttributeTypeInterface.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php
index 18736e9d576..83ad8f2f067 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c3bf7d2dd12..d71924b14e7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a2cd5f5b9c2..b29e70eb1ed 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ObjectClassInterface.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/ObjectClass/ObjectClassInterface.php
index ed354d9e226..0a317f265eb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0b155a86cd1..0f5a88efce6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/OpenLdap.php b/vendor/zendframework/zendframework/library/Zend/Ldap/Node/Schema/OpenLdap.php
index 7a183e61683..3c97d3ac652 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AutoloaderFactory.php b/vendor/zendframework/zendframework/library/Zend/Loader/AutoloaderFactory.php
index 27ab200f3cf..609086c18bb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/AutoloaderFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/AutoloaderFactory.php
@@ -3,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-2014 Zend Technologies USA 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/ClassMapAutoloader.php b/vendor/zendframework/zendframework/library/Zend/Loader/ClassMapAutoloader.php
index 216aae6f735..58b6378dbe2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -197,11 +197,12 @@ class ClassMapAutoloader implements SplAutoloader
*/
public static function realPharPath($path)
{
- if (strpos($path, 'phar:///') !== 0) {
+ if (!preg_match('|^phar:(/{2,3})|',$path, $match)) {
return;
}
- $parts = explode('/', str_replace(array('/', '\\'), '/', substr($path, 8)));
+ $prefixLength = 5 + strlen($match[1]);
+ $parts = explode('/', str_replace(array('/', '\\'), '/', substr($path, $prefixLength)));
$parts = array_values(array_filter($parts, function ($p) {
return ($p !== '' && $p !== '.');
}));
@@ -213,7 +214,7 @@ class ClassMapAutoloader implements SplAutoloader
}
});
- if (file_exists($realPath = 'phar:///' . implode('/', $parts))) {
+ if (file_exists($realPath = str_pad('phar:', $prefixLength, '/') . implode('/', $parts))) {
return $realPath;
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/BadMethodCallException.php
index b81099ad9b2..3ae448817f7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3da81b0181e..74cb19a817b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/ExceptionInterface.php
index cbdf7c403f4..d66e3942b45 100644
--- a/vendor/zendframework/zendframework/library/Zend/Loader/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Loader/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/InvalidArgumentException.php
index d0076c2fbe0..1abb4c43862 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidPathException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/InvalidPathException.php
index 8b94045222d..ac1b43e4427 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/MissingResourceNamespaceException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/MissingResourceNamespaceException.php
index 43fbd03f1e1..3269207b81b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PluginLoaderException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/PluginLoaderException.php
index 9b3bf21e264..49f393a7cc2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d0c322d8505..b028169b7d4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SecurityException.php b/vendor/zendframework/zendframework/library/Zend/Loader/Exception/SecurityException.php
index 13ca1a19124..39e7e59318e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ModuleAutoloader.php b/vendor/zendframework/zendframework/library/Zend/Loader/ModuleAutoloader.php
index 053770e137b..2aa6938bad3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -185,6 +185,16 @@ class ModuleAutoloader implements SplAutoloader
foreach ($this->paths as $path) {
$path = $path . $moduleClassPath;
+ if ($path == '.' || substr($path, 0, 2) == './' || substr($path, 0, 2) == '.\\') {
+ $basePath = realpath('.');
+
+ if (false === $basePath) {
+ $basePath = getcwd();
+ }
+
+ $path = rtrim($basePath, '\/\\') . substr($path, 1);
+ }
+
$classLoaded = $this->loadModuleFromDir($path, $class);
if ($classLoaded) {
return $classLoaded;
diff --git a/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLoader.php b/vendor/zendframework/zendframework/library/Zend/Loader/PluginClassLoader.php
index a2223d5305c..637014444af 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0c79601077b..e141586c00c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4428cd58744..f0ee23c7b83 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 214066b698f..58798948a8f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/StandardAutoloader.php b/vendor/zendframework/zendframework/library/Zend/Loader/StandardAutoloader.php
index 204db8732ef..3e722473780 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -89,6 +89,7 @@ class StandardAutoloader implements SplAutoloader
case self::AUTOREGISTER_ZF:
if ($pairs) {
$this->registerNamespace('Zend', dirname(__DIR__));
+ $this->registerNamespace('ZendXml', dirname(dirname((__DIR__))) . '/ZendXml');
}
break;
case self::LOAD_NS:
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/Exception/ExceptionInterface.php
index fa8fd2ec493..20917bed743 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Log/Exception/InvalidArgumentException.php
index dc89c8ac7da..8bb0920f7e3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Log/Exception/RuntimeException.php
index 90a47e8caa7..57522ceeec7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FilterInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/Filter/FilterInterface.php
index 748ea47eeb1..dc72777d69c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 031fa2225bc..f35c62313fd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 726d20e9bbc..e52f8062086 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Regex.php b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Regex.php
index 43b3555ec96..6d055bd1b00 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SuppressFilter.php b/vendor/zendframework/zendframework/library/Zend/Log/Filter/SuppressFilter.php
index 419154f589d..23cf4a5ae8c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Validator.php b/vendor/zendframework/zendframework/library/Zend/Log/Filter/Validator.php
index 4e94db8316e..651ea882191 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -39,7 +39,7 @@ class Validator implements FilterInterface
}
if (!$validator instanceof ZendValidator) {
throw new Exception\InvalidArgumentException(sprintf(
- 'Parameter of type %s is invalid; must implements Zend\Validator\ValidatorInterface',
+ 'Parameter of type %s is invalid; must implement Zend\Validator\ValidatorInterface',
(is_object($validator) ? get_class($validator) : gettype($validator))
));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/Base.php
index 85f9b17fbde..54e0cd83581 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Log\Formatter;
use DateTime;
use Traversable;
-use Zend\Stdlib\ErrorHandler;
class Base implements FormatterInterface
{
@@ -54,7 +53,7 @@ class Base implements FormatterInterface
{
foreach ($event as $key => $value) {
// Keep extra as an array
- if ('extra' === $key) {
+ if ('extra' === $key && is_array($value)) {
$event[$key] = self::format($value);
} else {
$event[$key] = $this->normalize($value);
@@ -84,21 +83,24 @@ class Base implements FormatterInterface
$jsonFlags |= defined('JSON_UNESCAPED_UNICODE') ? JSON_UNESCAPED_UNICODE : 0;
}
- ErrorHandler::start();
+ // Error suppression is used in several of these cases as a fix for each of
+ // #5383 and #4616. Without it, #4616 fails whenever recursion occurs during
+ // json_encode() operations; usage of a dedicated error handler callback
+ // causes #5383 to fail when the Logger is being used as an error handler.
+ // The only viable solution here is error suppression, ugly as it may be.
if ($value instanceof DateTime) {
$value = $value->format($this->getDateTimeFormat());
} elseif ($value instanceof Traversable) {
- $value = json_encode(iterator_to_array($value), $jsonFlags);
+ $value = @json_encode(iterator_to_array($value), $jsonFlags);
} elseif (is_array($value)) {
- $value = json_encode($value, $jsonFlags);
+ $value = @json_encode($value, $jsonFlags);
} elseif (is_object($value) && !method_exists($value, '__toString')) {
- $value = sprintf('object(%s) %s', get_class($value), json_encode($value));
+ $value = sprintf('object(%s) %s', get_class($value), @json_encode($value));
} elseif (is_resource($value)) {
$value = sprintf('resource(%s)', get_resource_type($value));
} elseif (!is_object($value)) {
$value = gettype($value);
}
- ErrorHandler::stop();
return (string) $value;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ChromePhp.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/ChromePhp.php
index 7814fb460fd..671429b02f2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 08280129d67..256bb1c0f7d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 334ac0c489a..287d6977858 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d1fb46988ee..28d8211893a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FirePhp.php b/vendor/zendframework/zendframework/library/Zend/Log/Formatter/FirePhp.php
index 1e21b8973e6..4e15a982507 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fc46feeda5a..975c3ec4934 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 62e09e5c202..531ea76429a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5d3570637cf..ae4abf73ec5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 914888196dc..462b30f7e9b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -125,40 +125,54 @@ class Logger implements LoggerInterface
*/
public function __construct($options = null)
{
- $this->writers = new SplPriorityQueue();
+ $this->writers = new SplPriorityQueue();
+ $this->processors = new SplPriorityQueue();
if ($options instanceof Traversable) {
$options = ArrayUtils::iteratorToArray($options);
}
- if (is_array($options)) {
- if (isset($options['writers']) && is_array($options['writers'])) {
- foreach ($options['writers'] as $writer) {
-
- if (!isset($writer['name'])) {
- throw new Exception\InvalidArgumentException('Options must contain a name for the writer');
- }
+ if (!$options) {
+ return;
+ }
- $priority = (isset($writer['priority'])) ? $writer['priority'] : null;
- $writerOptions = (isset($writer['options'])) ? $writer['options'] : null;
+ if (!is_array($options)) {
+ throw new Exception\InvalidArgumentException('Options must be an array or an object implementing \Traversable ');
+ }
- $this->addWriter($writer['name'], $priority, $writerOptions);
+ if (isset($options['writers']) && is_array($options['writers'])) {
+ foreach ($options['writers'] as $writer) {
+ if (!isset($writer['name'])) {
+ throw new Exception\InvalidArgumentException('Options must contain a name for the writer');
}
- }
- if (isset($options['exceptionhandler']) && $options['exceptionhandler'] === true) {
- static::registerExceptionHandler($this);
+ $priority = (isset($writer['priority'])) ? $writer['priority'] : null;
+ $writerOptions = (isset($writer['options'])) ? $writer['options'] : null;
+
+ $this->addWriter($writer['name'], $priority, $writerOptions);
}
+ }
- if (isset($options['errorhandler']) && $options['errorhandler'] === true) {
- static::registerErrorHandler($this);
+ if (isset($options['processors']) && is_array($options['processors'])) {
+ foreach ($options['processors'] as $processor) {
+ if (!isset($processor['name'])) {
+ throw new Exception\InvalidArgumentException('Options must contain a name for the processor');
+ }
+
+ $priority = (isset($processor['priority'])) ? $processor['priority'] : null;
+ $processorOptions = (isset($processor['options'])) ? $processor['options'] : null;
+
+ $this->addProcessor($processor['name'], $priority, $processorOptions);
}
+ }
- } elseif ($options) {
- throw new Exception\InvalidArgumentException('Options must be an array or an object implementing \Traversable ');
+ if (isset($options['exceptionhandler']) && $options['exceptionhandler'] === true) {
+ static::registerExceptionHandler($this);
}
- $this->processors = new SplPriorityQueue();
+ if (isset($options['errorhandler']) && $options['errorhandler'] === true) {
+ static::registerErrorHandler($this);
+ }
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAbstractServiceFactory.php
index e392877bdf1..ce2eea3be2a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAbstractServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAbstractServiceFactory.php
@@ -3,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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -95,19 +95,11 @@ class LoggerAbstractServiceFactory implements AbstractFactoryInterface
}
foreach ($config['writers'] as $index => $writerConfig) {
- if (!isset($writerConfig['name'])
- || strtolower($writerConfig['name']) != 'db'
+ if (!isset($writerConfig['options']['db'])
+ || !is_string($writerConfig['options']['db'])
) {
continue;
}
- if (!isset($writerConfig['options'])
- || !isset($writerConfig['options']['db'])
- ) {
- continue;
- }
- if (!is_string($writerConfig['options']['db'])) {
- continue;
- }
if (!$services->has($writerConfig['options']['db'])) {
continue;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareInterface.php
index f0c720f99c8..c23bc321a59 100644
--- a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareInterface.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Log;
-use Zend\Log\LoggerInterface;
/**
* Logger aware interface
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareTrait.php b/vendor/zendframework/zendframework/library/Zend/Log/LoggerAwareTrait.php
index 70152481484..c28bdb9bc6c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Log;
-use Zend\Log\LoggerInterface;
trait LoggerAwareTrait
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/LoggerInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/LoggerInterface.php
index dc849ad41ed..a2fc6eb5d0a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a2896ae308e..0fc47c05869 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e827bbfcade..1ede1ea046f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -60,7 +60,7 @@ class Backtrace implements ProcessorInterface
}
/**
- * Provide backtrace as slim as posible
+ * Provide backtrace as slim as possible
*
* @return array:
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Processor/ProcessorInterface.php b/vendor/zendframework/zendframework/library/Zend/Log/Processor/ProcessorInterface.php
index af97e2754d6..ca1c20fc944 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RequestId.php b/vendor/zendframework/zendframework/library/Zend/Log/Processor/RequestId.php
index 61520b21203..5cf18ed48e6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ProcessorPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Log/ProcessorPluginManager.php
index 3b2a850026f..6e9b50aeab6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractWriter.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/AbstractWriter.php
index 49630ba2010..e4c2499014f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/ChromePhp.php
index 97f8522bb45..aa536314965 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ae2e5fa2d3c..05de1de8329 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 184a48fc519..772fe0b7727 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1340b27575c..a8d1b156c43 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FilterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FilterPluginManager.php
index 4bb59c92295..d2c569b8a52 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 270fa451fde..ee8d3026a68 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Log\Writer;
@@ -15,8 +15,6 @@ use Zend\Log\Filter\FilterInterface;
use Zend\Log\Filter\Priority as PriorityFilter;
use Zend\Log\Formatter\FormatterInterface;
use Zend\Log\Logger;
-use Zend\Log\Writer\AbstractWriter;
-use Zend\Log\Writer\WriterInterface;
use Zend\Log\WriterPluginManager;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp.php
index 8539420f64f..3a6b766424e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FirePhpBridge.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/FirePhp/FirePhpBridge.php
index 3d9cbc7f40a..0b8dc81cb49 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d415d0b535b..523c5b92a46 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3abc4487260..374f1e5b87c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 337bc38e0c6..4ceca29abd3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Mock.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Mock.php
index 89338155a96..2059c535576 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1725ce53dc3..ee472b90dc8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Null.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Null.php
index 4c70d3b0a76..0b1aee24684 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Stream.php b/vendor/zendframework/zendframework/library/Zend/Log/Writer/Stream.php
index 1f84861d460..36a16b62070 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b0e7f896a74..121f1fb0bdd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8501f5c42d6..e2e6ed68141 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e5058910cfe..6f2cf9026aa 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 058520f0f95..934f08b1ecd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Mail/Address.php
index 385b9d86383..526826a929a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2b88b81c126..4f23c5f8aae 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8aab186ac6f..acf5bde8964 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Exception/BadMethodCallException.php
index 2734fa851c0..6a11063b380 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8de22d7810b..a3b14dd60dd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 088232fa49a..e1ebc9902c9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5c5790053e5..30c58a5b3ab 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 71754b1fff1..1e94c8e4962 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c82b09c26f0..339d3a4021d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0a34619e587..4ccd38bba3f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Bcc.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Bcc.php
index 53f8a746c60..b03611fe409 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 af35edc6151..07c6668c564 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0d20f011e27..d331383be7f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mail\Header;
-use Zend\Mail\Headers;
class ContentTransferEncoding implements HeaderInterface
{
@@ -92,6 +91,9 @@ class ContentTransferEncoding implements HeaderInterface
*/
public function setTransferEncoding($transferEncoding)
{
+ // Per RFC 1521, the value of the header is not case sensitive
+ $transferEncoding = strtolower($transferEncoding);
+
if (!in_array($transferEncoding, self::$allowedTransferEncodings)) {
throw new Exception\InvalidArgumentException(sprintf(
'%s expects one of "'. implode(', ', self::$allowedTransferEncodings) . '"; received "%s"',
diff --git a/vendor/zendframework/zendframework/library/Zend/Mail/Header/ContentType.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/ContentType.php
index ab8a373ecf0..1983acd7699 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Date.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Date.php
index 2f2cae88d82..4c62da8daab 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ee9160a0fea..ebd63ca63bf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/ExceptionInterface.php
index 46751bd5ca9..a6333e03fd0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5cf3345c283..f7ec234a3f4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/Exception/RuntimeException.php
index 5c9316c9d36..532440e77ad 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/From.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/From.php
index fa7859e040c..463f1c6d01b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8db9d943e1f..3824604ab93 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a77ba43d531..318acd600d2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HeaderInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderInterface.php
index 35803cf9bfa..37919eca770 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HeaderLoader.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/HeaderLoader.php
index e0208b91156..aa33fc0dab9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4ea98f6a171..30c223f2cba 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 27ef7156397..fbb7cd5aa2f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mail/Header/MessageId.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mail/Header/MessageId.php
@@ -3,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-2014 Zend Technologies USA 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/MimeVersion.php b/vendor/zendframework/zendframework/library/Zend/Mail/Header/MimeVersion.php
index 52474e4a4fe..c6b34e50fd9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 36f0b70f817..dae4c7eb667 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5ff26cd8a17..3efbe42e87c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b9fa5e6db8d..ca977b29f21 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 20d329e2a88..c8840baaedc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 734bd3e0aef..475cee3b40b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0a149340814..50daa82f9e3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a26bca2be1a..78f69a4a80c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7e5daa58a13..1b60c1d0a6f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3ae0fccbc9c..bba7039a9d1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Message.php b/vendor/zendframework/zendframework/library/Zend/Mail/Message.php
index 04c39a629a8..283b4391b4e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractProtocol.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/AbstractProtocol.php
index 25e2b0656d0..07d477d4369 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/ExceptionInterface.php
index 66a5c23f20a..a19ba3a3a0c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2f5ca3beac5..f7532513abb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Exception/RuntimeException.php
index 6d9207c0433..6822f1cebbd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Imap.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Imap.php
index 0cc90c37f0a..4228174fedc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Pop3.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Pop3.php
index 0b4e8970fc6..4434bd1bd72 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Smtp.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp.php
index 6e31b3767de..909c5b771e9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -282,6 +282,11 @@ class Smtp extends AbstractProtocol
$this->_send('DATA');
$this->_expect(354, 120); // Timeout set for 2 minutes as per RFC 2821 4.5.3.2
+ // Ensure newlines are CRLF (\r\n)
+ if (PHP_EOL === "\n") {
+ $data = str_replace("\n", "\r\n", str_replace("\r", '', $data));
+ }
+
foreach (explode(self::EOL, $data) as $line) {
if (strpos($line, '.') === 0) {
// Escape lines prefixed with a '.'
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 5b5ca611c7e..9666df10164 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Smtp/Auth/Login.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Login.php
index bcc2c8c45eb..79158e67ace 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Smtp/Auth/Plain.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php
index 97d028dc873..335ba407dcc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SmtpPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Mail/Protocol/SmtpPluginManager.php
index 0aad2a5b959..b84272b2532 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 85ea79ee360..bcad4e364a2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5da0c19e814..032adb948dc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/ExceptionInterface.php
index 8425b8abd0c..630637c3b34 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 afee6a40293..4d9be4409d4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/OutOfBoundsException.php
index 59889d2741f..714d7d39ed2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Exception/RuntimeException.php
index d641e90760e..965fcd8810f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder.php
index 094cd800e9d..4d5c316ef05 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e94b525c329..d334f45ca88 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Maildir.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Maildir.php
index a28585553d5..f45fa63d91e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Mbox.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Folder/Mbox.php
index aae3e1839e9..ffc536dcaa7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Imap.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Imap.php
index 9ef870dc4d7..93a3cfef445 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Maildir.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Maildir.php
index 3e625339174..1b4c3fbcf53 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Mbox.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Mbox.php
index d6452091513..847c3c0e0b2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Message.php
index 13dc9aaf981..53c858f7d1d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8ae8ed69627..98933dfe2ea 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 76da37a33d0..7dd7067d616 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c75f4f4848f..d46d7d14be5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/ExceptionInterface.php
index ea6a77eec71..d0cfeefbe9f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6e53aa00939..2681c5e5c4d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/Exception/RuntimeException.php
index 7f8385bd9bf..7ee120ea68b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/File.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/File.php
index 53d415bde90..b119c8e3c4d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PartInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Part/PartInterface.php
index ab90d1fd0b2..d0cd78ef7eb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Pop3.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Pop3.php
index 1043b915742..4e5b698fb02 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Writable/Maildir.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/Maildir.php
index 46d8630ec6d..1b269395514 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Writable/WritableInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Storage/Writable/WritableInterface.php
index cad542b1c4f..de00e8b48b9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/ExceptionInterface.php
index fb51811d26d..db249c653f3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4384df4b82b..75d29aacd67 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Exception/RuntimeException.php
index 3a184da2f55..1b577210149 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/File.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/File.php
index cf3258c7505..78eea6e6040 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FileOptions.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/FileOptions.php
index 1ad0e75c4f1..8bcae3e8657 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Sendmail.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Sendmail.php
index fbe8583fd01..0378ee3743d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Smtp.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/Smtp.php
index ddfaecfa020..62277ef4402 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SmtpOptions.php b/vendor/zendframework/zendframework/library/Zend/Mail/Transport/SmtpOptions.php
index 795c3fb947c..a3039c344cd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e087ec6daad..cded3c6d115 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Adapter/AdapterInterface.php
index 1906263ed21..6a0eb120adf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e18a5356911..d3bc289ad0e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d866da89fb8..788786abc9c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AdapterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/AdapterPluginManager.php
index fae1cb82b06..f86bdb24b40 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 efaf058e35a..f633b821f48 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e186a342531..6caaa9b5d4c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/ExceptionInterface.php
index 1bf6d66dbff..22625dbe0da 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/InvalidArgumentException.php
index f8716986b16..f5fc36ce8ee 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Math/BigInteger/Exception/RuntimeException.php
index c1beeb4e391..c3f1a2e6f70 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Math/Exception/DomainException.php
index 8599ad172f1..e536f7002e5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Math/Exception/ExceptionInterface.php
index 9f7ec76aa91..dfe206dea92 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Math/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Math/Exception/InvalidArgumentException.php
index 64596ee2a3c..a1d66bd2a82 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Math/Exception/RuntimeException.php
index cc145e62338..4e10bab5bc5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Rand.php b/vendor/zendframework/zendframework/library/Zend/Math/Rand.php
index 95b71cde824..996a84a6c4e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -130,13 +130,21 @@ abstract class Rand
'The supplied range is too great to generate'
);
}
- $log = log($range, 2);
- $bytes = (int) ($log / 8) + 1;
- $bits = (int) $log + 1;
- $filter = (int) (1 << $bits) - 1;
+
+ // calculate number of bits required to store range on this machine
+ $r = $range;
+ $bits = 0;
+ while ($r >>= 1) {
+ $bits++;
+ }
+
+ $bits = (int) max($bits, 1);
+ $bytes = (int) max(ceil($bits / 8), 1);
+ $filter = (int) ((1 << $bits) - 1);
+
do {
- $rnd = hexdec(bin2hex(self::getBytes($bytes, $strong)));
- $rnd = $rnd & $filter;
+ $rnd = hexdec(bin2hex(static::getBytes($bytes, $strong)));
+ $rnd &= $filter;
} while ($rnd > $range);
return ($min + $rnd);
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/Source/HashTiming.php b/vendor/zendframework/zendframework/library/Zend/Math/Source/HashTiming.php
index 2dd0e8250aa..b83c197d457 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Math\Source;
diff --git a/vendor/zendframework/zendframework/library/Zend/Math/composer.json b/vendor/zendframework/zendframework/library/Zend/Math/composer.json
index 4af222154dd..5a0fae22638 100644
--- a/vendor/zendframework/zendframework/library/Zend/Math/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Math/composer.json
@@ -16,7 +16,10 @@
"php": ">=5.3.3"
},
"suggest": {
- "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable"
+ "ext-bcmath": "If using the bcmath functionality",
+ "ext-gmp": "If using the gmp functionality",
+ "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
+ "zendframework/zend-servicemanager": ">= current version, if using the BigInteger::factory functionality"
},
"extra": {
"branch-alias": {
diff --git a/vendor/zendframework/zendframework/library/Zend/Memory/Container/AbstractContainer.php b/vendor/zendframework/zendframework/library/Zend/Memory/Container/AbstractContainer.php
index c162e837993..079bda814fe 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 47dd881e2b0..47055611542 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ContainerInterface.php b/vendor/zendframework/zendframework/library/Zend/Memory/Container/ContainerInterface.php
index 02fdadfcd68..fd78a581d12 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7eb95b3946f..12cf62c71fc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Movable.php b/vendor/zendframework/zendframework/library/Zend/Memory/Container/Movable.php
index 24568164f1f..a45e096a2d6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3884357016c..299ceb95321 100644
--- a/vendor/zendframework/zendframework/library/Zend/Memory/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Memory/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Memory/Exception/InvalidArgumentException.php
index 7a38188f9ea..c35534b00d7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cf3695453d8..ecf52c077dd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c2c8dea7f30..ab0b8cd11c9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Value.php b/vendor/zendframework/zendframework/library/Zend/Memory/Value.php
index 0c8de61496e..5615891f865 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Decode.php b/vendor/zendframework/zendframework/library/Zend/Mime/Decode.php
index f20d30031f3..738b877a2dd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 57e25687119..8611e8442a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mime/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mime/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Mime/Exception/RuntimeException.php
index cdbe5fcae1d..5dea87b5569 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Message.php b/vendor/zendframework/zendframework/library/Zend/Mime/Message.php
index 197668a01db..b32b5261be7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Mime.php b/vendor/zendframework/zendframework/library/Zend/Mime/Mime.php
index bf4fe1f3fa6..4223aa61f8a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -55,7 +55,7 @@ class Mime
"\xEF","\xF0","\xF1","\xF2","\xF3","\xF4","\xF5","\xF6",
"\xF7","\xF8","\xF9","\xFA","\xFB","\xFC","\xFD","\xFE",
"\xFF"
- );
+ );
public static $qpReplaceValues = array(
"=00","=01","=02","=03","=04","=05","=06","=07",
@@ -79,7 +79,7 @@ class Mime
"=EF","=F0","=F1","=F2","=F3","=F4","=F5","=F6",
"=F7","=F8","=F9","=FA","=FB","=FC","=FD","=FE",
"=FF"
- );
+ );
public static $qpKeysString =
"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA0\xA1\xA2\xA3\xA4\xA5\xA6\xA7\xA8\xA9\xAA\xAB\xAC\xAD\xAE\xAF\xB0\xB1\xB2\xB3\xB4\xB5\xB6\xB7\xB8\xB9\xBA\xBB\xBC\xBD\xBE\xBF\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9\xDA\xDB\xDC\xDD\xDE\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF";
@@ -208,7 +208,7 @@ class Mime
}
// assemble the lines together by pre- and appending delimiters, charset, encoding.
- for ($i = 0; $i < count($lines); $i++) {
+ for ($i = 0, $count = count($lines); $i < $count; $i++) {
$lines[$i] = " " . $prefix . $lines[$i] . "?=";
}
$str = trim(implode($lineEnd, $lines));
diff --git a/vendor/zendframework/zendframework/library/Zend/Mime/Part.php b/vendor/zendframework/zendframework/library/Zend/Mime/Part.php
index 0744534ce30..2fde6ccffce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -26,6 +26,7 @@ class Part
public $language;
protected $content;
protected $isStream = false;
+ protected $filters = array();
/**
@@ -79,6 +80,9 @@ class Part
//stream_filter_remove(); // ??? is that right?
switch ($this->encoding) {
case Mime::ENCODING_QUOTEDPRINTABLE:
+ if (array_key_exists(Mime::ENCODING_QUOTEDPRINTABLE, $this->filters)) {
+ stream_filter_remove($this->filters[Mime::ENCODING_QUOTEDPRINTABLE]);
+ }
$filter = stream_filter_append(
$this->content,
'convert.quoted-printable-encode',
@@ -88,11 +92,15 @@ class Part
'line-break-chars' => $EOL
)
);
+ $this->filters[Mime::ENCODING_QUOTEDPRINTABLE] = $filter;
if (!is_resource($filter)) {
throw new Exception\RuntimeException('Failed to append quoted-printable filter');
}
break;
case Mime::ENCODING_BASE64:
+ if (array_key_exists(Mime::ENCODING_BASE64,$this->filters)) {
+ stream_filter_remove($this->filters[Mime::ENCODING_BASE64]);
+ }
$filter = stream_filter_append(
$this->content,
'convert.base64-encode',
@@ -102,6 +110,7 @@ class Part
'line-break-chars' => $EOL
)
);
+ $this->filters[Mime::ENCODING_BASE64] = $filter;
if (!is_resource($filter)) {
throw new Exception\RuntimeException('Failed to append base64 filter');
}
@@ -120,7 +129,10 @@ class Part
public function getContent($EOL = Mime::LINEEND)
{
if ($this->isStream) {
- return stream_get_contents($this->getEncodedStream($EOL));
+ $encodedStream = $this->getEncodedStream($EOL);
+ $encodedStreamContents = stream_get_contents($encodedStream);
+ rewind($encodedStream);
+ return $encodedStreamContents;
}
return Mime::encode($this->content, $this->encoding, $EOL);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Exception/ExceptionInterface.php
index f8fee48da36..f673f1666d2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9e1ccd95c91..2616bdcc36f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 73476b07ed3..add17e8c966 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4091ab93141..358f55530cc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b5374f5d7bb..894ebd40e0a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ba32b3833c1..e898d61efa6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\ModuleManager\Feature;
use Zend\EventManager\EventInterface;
/**
- * Boostrap listener provider interface
+ * Bootstrap listener provider interface
*/
interface BootstrapListenerInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/ConfigProviderInterface.php
index bca1d369be6..259cb639470 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a05fb691211..f1989ab1bd9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c567182cc99..610c75800e0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 325c78521b1..1202d10b69a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 28c54d7d207..ccb18c6ba4a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c01ea76589a..0f851887c14 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 684d8df8906..be1305ee3ce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cbea88ca31c..364b228d5ff 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 06418b89ee9..628e5f23dda 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f20e7996839..61c8da6a2a7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2bcb5afd941..5074829fa02 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7d238ed5739..5a85affce77 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RouteProviderInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Feature/RouteProviderInterface.php
index 790098ad54d..95dbaf9aae9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2a103b4afa9..94e7885369c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 237de1af80a..91f1f9b4a37 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 80da43587dd..a79cae03d8f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1245b36551b..d7356acc9de 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 abe95cf1775..791b7011d1b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 dec64125735..60d05a1771f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ConfigListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigListener.php
index f19729b3022..bdd6fbe4973 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ConfigMergerInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ConfigMergerInterface.php
index bd53771753f..9b86a4f9f02 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a85a1602556..dae7d5eaed8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 222ee0d84d9..f52be43d085 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5240f91dd94..94d597eb712 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 200fa5b023b..b5a2710e7f6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5d9c601af15..884961f88c2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 00c976aa7ed..a32206cdafb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/LocatorRegistrationListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
index 95e50ddb50e..b3bc1410698 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ModuleDependencyCheckerListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ModuleDependencyCheckerListener.php
index 66e7963f8dc..636ba92d07b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7d81df55b32..9e8bdf5686a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 979fb5ed2a0..6e841155ff9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 297d4fd3949..332dd94fd7b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ServiceListener.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ServiceListener.php
index 6fd359110b1..973778cea3b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ServiceListenerInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/Listener/ServiceListenerInterface.php
index 80e3a98334f..3de7660f175 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e29dd8e2834..0f83266ae21 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ModuleManager.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManager.php
index 20b79892f1b..865b9876527 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ModuleManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/ModuleManager/ModuleManagerInterface.php
index 3a9d2234f6b..8d38187264f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Application.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Application.php
index 093a299b7b7..02ca3d9e542 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ApplicationInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ApplicationInterface.php
index c37e9dbbfcf..d259a6ed880 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ApplicationInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ApplicationInterface.php
@@ -3,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-2014 Zend Technologies USA 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/AbstractActionController.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractActionController.php
index 9539108d39c..f933b83ed24 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractController.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractController.php
index 41a3ce9e38f..d29ee7dc5e0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractRestfulController.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/AbstractRestfulController.php
index f868594e43e..0d3517eccfc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Controller;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/ControllerManager.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/ControllerManager.php
index 3e1d1e62486..ff142a12cec 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractPlugin.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/AbstractPlugin.php
index b4790f3f26e..6c6e3ae4745 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1f38960bcbd..fffab0ed7fc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Mvc\Controller\Plugin;
use Zend\Http\Header\Accept\FieldValuePart\AbstractFieldValuePart;
use Zend\Http\Request;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
use Zend\Mvc\InjectApplicationEventInterface;
use Zend\Mvc\MvcEvent;
use Zend\Mvc\Exception\DomainException;
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 b88950506bb..9250ad78366 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,6 +17,7 @@ use Zend\InputFilter\FileInput;
use Zend\InputFilter\InputFilterInterface;
use Zend\Mvc\Exception\RuntimeException;
use Zend\Session\Container;
+use Zend\Stdlib\ArrayUtils;
use Zend\Validator\ValidatorChain;
/**
@@ -62,6 +63,12 @@ class FilePostRedirectGet extends AbstractPlugin
{
$container = $this->getSessionContainer();
$request = $this->getController()->getRequest();
+ $postFiles = $request->getFiles()->toArray();
+ $postOther = $request->getPost()->toArray();
+ $post = ArrayUtils::merge($postOther, $postFiles, true);
+
+ // Fill form with the data first, collections may alter the form/filter structure
+ $form->setData($post);
// Change required flag to false for any previously uploaded files
$inputFilter = $form->getInputFilter();
@@ -78,12 +85,6 @@ class FilePostRedirectGet extends AbstractPlugin
);
// Run the form validations/filters and retrieve any errors
- $postFiles = $request->getFiles()->toArray();
- $postOther = $request->getPost()->toArray();
- $post = array_merge_recursive($postOther, $postFiles);
-
- // Validate form, and capture data and errors
- $form->setData($post);
$isValid = $form->isValid();
$data = $form->getData(FormInterface::VALUES_AS_ARRAY);
$errors = (!$isValid) ? $form->getMessages() : null;
@@ -91,11 +92,12 @@ class FilePostRedirectGet extends AbstractPlugin
// Merge and replace previous files with new valid files
$prevFileData = $this->getEmptyUploadData($inputFilter, $previousFiles);
$newFileData = $this->getNonEmptyUploadData($inputFilter, $data);
- $postFiles = array_merge_recursive(
+ $postFiles = ArrayUtils::merge(
$prevFileData ?: array(),
- $newFileData ?: array()
+ $newFileData ?: array(),
+ true
);
- $post = array_merge_recursive($postOther, $postFiles);
+ $post = ArrayUtils::merge($postOther, $postFiles, true);
// Save form data in session
$container->setExpirationHops(1, array('post', 'errors', 'isValid'));
@@ -129,6 +131,9 @@ class FilePostRedirectGet extends AbstractPlugin
unset($container->errors);
unset($container->isValid);
+ // Fill form with the data first, collections may alter the form/filter structure
+ $form->setData($post);
+
// Remove File Input validators and filters on previously uploaded files
// in case $form->isValid() or $form->bindValues() is run
$inputFilter = $form->getInputFilter();
@@ -145,8 +150,7 @@ class FilePostRedirectGet extends AbstractPlugin
}
);
- // Fill form with previous info and state
- $form->setData($post);
+ // set previous state
$form->isValid(); // re-validate to bind values
if (null !== $errors) {
$form->setMessages($errors); // overwrite messages
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 f340f91333f..6ddee2dd7eb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -31,6 +31,11 @@ class FlashMessenger extends AbstractPlugin implements IteratorAggregate, Counta
*/
const NAMESPACE_SUCCESS = 'success';
+ /**
+ * Warning messages namespace
+ */
+ const NAMESPACE_WARNING = 'warning';
+
/**
* Error messages namespace
*/
@@ -204,6 +209,22 @@ class FlashMessenger extends AbstractPlugin implements IteratorAggregate, Counta
return $this;
}
+ /**
+ * Add a message with "warning" type
+ *
+ * @param string $message
+ * @return FlashMessenger
+ */
+ public function addWarningMessage($message)
+ {
+ $namespace = $this->getNamespace();
+ $this->setNamespace(self::NAMESPACE_WARNING);
+ $this->addMessage($message);
+ $this->setNamespace($namespace);
+
+ return $this;
+ }
+
/**
* Add a message with "error" type
*
@@ -262,6 +283,21 @@ class FlashMessenger extends AbstractPlugin implements IteratorAggregate, Counta
return $hasMessages;
}
+ /**
+ * Whether "warning" namespace has messages
+ *
+ * @return bool
+ */
+ public function hasWarningMessages()
+ {
+ $namespace = $this->getNamespace();
+ $this->setNamespace(self::NAMESPACE_WARNING);
+ $hasMessages = $this->hasMessages();
+ $this->setNamespace($namespace);
+
+ return $hasMessages;
+ }
+
/**
* Whether "error" namespace has messages
*
@@ -321,6 +357,21 @@ class FlashMessenger extends AbstractPlugin implements IteratorAggregate, Counta
return $messages;
}
+ /**
+ * Get messages from "warning" namespace
+ *
+ * @return array
+ */
+ public function getWarningMessages()
+ {
+ $namespace = $this->getNamespace();
+ $this->setNamespace(self::NAMESPACE_WARNING);
+ $messages = $this->getMessages();
+ $this->setNamespace($namespace);
+
+ return $messages;
+ }
+
/**
* Get messages from "error" namespace
*
@@ -431,6 +482,22 @@ class FlashMessenger extends AbstractPlugin implements IteratorAggregate, Counta
return $hasMessages;
}
+ /**
+ * Check to see if messages have been added to "warning"
+ * namespace within this request
+ *
+ * @return bool
+ */
+ public function hasCurrentWarningMessages()
+ {
+ $namespace = $this->getNamespace();
+ $this->setNamespace(self::NAMESPACE_WARNING);
+ $hasMessages = $this->hasCurrentMessages();
+ $this->setNamespace($namespace);
+
+ return $hasMessages;
+ }
+
/**
* Check to see if messages have been added to "error"
* namespace within this request
@@ -497,6 +564,22 @@ class FlashMessenger extends AbstractPlugin implements IteratorAggregate, Counta
return $messages;
}
+ /**
+ * Get messages that have been added to the "warning"
+ * namespace within this request
+ *
+ * @return array
+ */
+ public function getCurrentWarningMessages()
+ {
+ $namespace = $this->getNamespace();
+ $this->setNamespace(self::NAMESPACE_WARNING);
+ $messages = $this->getCurrentMessages();
+ $this->setNamespace($namespace);
+
+ return $messages;
+ }
+
/**
* Get messages that have been added to the "error"
* namespace within this request
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 4f48cf2c77a..2b1b65e467e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -176,11 +176,19 @@ class Forward extends AbstractPlugin
$events = $sharedEvents->getListeners($id, $eventName);
foreach ($events as $currentEvent) {
$currentCallback = $currentEvent->getCallback();
- if (!isset($currentCallback[0])) {
+
+ // If we have an array, grab the object
+ if (is_array($currentCallback)) {
+ $currentCallback = array_shift($currentCallback);
+ }
+
+ // This routine is only valid for object callbacks
+ if (!is_object($currentCallback)) {
continue;
}
+
foreach ($classArray as $class) {
- if (is_a($currentCallback[0], $class)) {
+ if (is_a($currentCallback, $class)) {
$sharedEvents->detach($id, $currentEvent);
$results[$id][$eventName][] = $currentEvent;
}
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 366ed950688..5c30d699d63 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f26df7bdad7..ccdd2f2179f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bfe4c65a63c..7642b05fff3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Params.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Params.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Controller\Plugin;
-use Zend\Mvc\Controller\Plugin\AbstractPlugin;
use Zend\Mvc\Exception\RuntimeException;
use Zend\Mvc\InjectApplicationEventInterface;
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 e349b5e8c29..ba4d7378a72 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1123c4116e1..a2b67efa751 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -95,7 +95,7 @@ class PostRedirectGet extends AbstractPlugin
{
$controller = $this->getController();
$params = array();
- $options = array();
+ $options = array('query' => $controller->params()->fromQuery());
$reuseMatchedParams = false;
if (null === $redirect) {
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 588912184bd..10eb029f40f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4d974d4c374..ff47bfe8112 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/IdentityFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Controller/Plugin/Service/IdentityFactory.php
index 24f18260ee4..a59c6a624ca 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 49c0a407ad6..4eb313517da 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3ef6a56691b..ec53bb0c1ab 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f0bd63a61de..e27fc8cfd91 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Exception/DomainException.php
index f22d26b21fa..fdf8dbf1391 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 22a3e7b8ea4..8fd5cd55288 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d8ff683ed92..cc81ee999e7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 65c23d61260..83e484b8d7d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6f150cfe73f..4961c9ce73a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fb24071a223..e741a16a01c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 805f6ef50bd..cabf55da84b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Translator.php b/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/Translator.php
index 6849e50d006..ac7f2944a3a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/Translator.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/I18n/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InjectApplicationEventInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/InjectApplicationEventInterface.php
index ce2cf62c6fc..ba3be137d7c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8abb40629ed..f9c4dc6ab38 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 06c7dfa873a..896cdbf4f7b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 013e921c361..edfbd4f8002 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -17,7 +17,7 @@ abstract class AbstractResponseSender implements ResponseSenderInterface
* Send HTTP headers
*
* @param SendResponseEvent $event
- * @return PhpEnvironmentResponseSender
+ * @return self
*/
public function sendHeaders(SendResponseEvent $event)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ConsoleResponseSender.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ConsoleResponseSender.php
index 0756adfa117..c921dfa97fb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 46d8fb4b163..2f07bbd1033 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/HttpResponseSender.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/HttpResponseSender.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\ResponseSender;
use Zend\Http\Response;
-use Zend\Mvc\ResponseSender\SendResponseEvent;
class HttpResponseSender extends AbstractResponseSender
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php
index fd178a5f55e..94833d238e3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/PhpEnvironmentResponseSender.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\ResponseSender;
use Zend\Http\PhpEnvironment\Response;
-use Zend\Mvc\ResponseSender\SendResponseEvent;
class PhpEnvironmentResponseSender extends HttpResponseSender
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/ResponseSenderInterface.php
index 7ede12dff84..b1a76dd30bf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\ResponseSender;
-use Zend\Mvc\ResponseSender\SendResponseEvent;
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 9af372ddf20..696c22a0396 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e873fdaac7f..2cd90c50a08 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/SimpleStreamResponseSender.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/ResponseSender/SimpleStreamResponseSender.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\ResponseSender;
-use Zend\Http\Header\MultipleHeaderInterface;
use Zend\Http\Response\Stream;
class SimpleStreamResponseSender extends AbstractResponseSender
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/RouteListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/RouteListener.php
index 71ee3bf8cfb..a5095ba8ea2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Mvc;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\ListenerAggregateInterface;
-use Zend\Mvc\Application;
class RouteListener implements ListenerAggregateInterface
{
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 f3a5652014d..f80488201cd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/Catchall.php
@@ -15,7 +15,6 @@ namespace Zend\Mvc\Router\Console;
use Traversable;
use Zend\Console\Request as ConsoleRequest;
use Zend\Filter\FilterChain;
-use Zend\Mvc\Router\Exception;
use Zend\Stdlib\RequestInterface as Request;
use Zend\Validator\ValidatorChain;
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 167de70d2ae..b35be0a996b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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 6a7fb6bd32a..b5af6a8beca 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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/SimpleRouteStack.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
index 62ee9967100..9ad7fa5dd91 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Exception/ExceptionInterface.php
index 8591b479011..d2eda183e15 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7e1a643f0fb..ab3432c0245 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1c9544cac31..243a4bb6882 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 dc970ec6fbf..0a98618e47f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Hostname.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Hostname.php
index 3ce4d750437..0b4de2cef13 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7bbd81e0ba8..528536a0b8f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 de2628a0ca9..27b3b642f71 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 53eeb06078b..40ad4cd9a24 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Query.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Query.php
index e7a322a8817..c25964f23f2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Mvc\Router\Http;
use Traversable;
use Zend\Mvc\Router\Exception;
-use Zend\Mvc\Router\Http\RouteMatch;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\RequestInterface as Request;
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 bbbdec3518f..d2f70370469 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d52926a0aea..a9987758a8c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9c7d8b0e9f5..39c8823557b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0971ee50936..707f8ea117c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 244b10ebd04..3fa393f5e7b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Segment.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/Segment.php
@@ -3,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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -428,11 +428,12 @@ class Segment implements RouteInterface
*/
protected function encode($value)
{
- if (!isset(static::$cacheEncode[$value])) {
- static::$cacheEncode[$value] = rawurlencode($value);
- static::$cacheEncode[$value] = strtr(static::$cacheEncode[$value], static::$urlencodeCorrectionMap);
+ $key = (string) $value;
+ if (!isset(static::$cacheEncode[$key])) {
+ static::$cacheEncode[$key] = rawurlencode($value);
+ static::$cacheEncode[$key] = strtr(static::$cacheEncode[$key], static::$urlencodeCorrectionMap);
}
- return static::$cacheEncode[$value];
+ return static::$cacheEncode[$key];
}
/**
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 35326718bc8..118732bd0bd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
@@ -3,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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -154,7 +154,7 @@ class TranslatorAwareTreeRouteStack extends TreeRouteStack implements Translator
*
* @see TranslatorAwareInterface::setTranslatorTextDomain()
* @param string $textDomain
- * @return mixed
+ * @return self
*/
public function setTranslatorTextDomain($textDomain = 'default')
{
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 c6b8c94f7c0..da18421d002 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -148,6 +148,10 @@ class TreeRouteStack extends SimpleRouteStack
$chainRoutes = array_merge(array($specs), $specs['chain_routes']);
unset($chainRoutes[0]['chain_routes']);
+ if (isset($specs['child_routes'])) {
+ unset($chainRoutes[0]['child_routes']);
+ }
+
$options = array(
'routes' => $chainRoutes,
'route_plugins' => $this->routePluginManager,
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 436fe093a17..ce8f6251f42 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 15cd823a708..2cb7f586191 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Router/PriorityList.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/PriorityList.php
@@ -3,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-2014 Zend Technologies USA 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/RouteInterface.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Router/RouteInterface.php
index c845e569c7e..a5374bc3d11 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9cbeff44bed..94cf57dd76a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 312cff3439b..b3fbca3a58c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6dc624100e4..4eb5b10c87a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3a7d868ff19..798bbf539ad 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -254,7 +254,7 @@ class SimpleRouteStack implements RouteStackInterface
* Create a route from array specifications.
*
* @param array|Traversable $specs
- * @return SimpleRouteStack
+ * @return RouteInterface
* @throws Exception\InvalidArgumentException
*/
protected function routeFromArray($specs)
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/SendResponseListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/SendResponseListener.php
index c01084d65d1..2e5847eb634 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\EventManager\EventManager;
use Zend\EventManager\EventManagerAwareInterface;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\ListenerAggregateInterface;
-use Zend\Mvc\MvcEvent;
use Zend\Mvc\ResponseSender\ConsoleResponseSender;
use Zend\Mvc\ResponseSender\HttpResponseSender;
use Zend\Mvc\ResponseSender\PhpEnvironmentResponseSender;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
index 3432b23e53f..44e9fcfed18 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
@@ -3,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-2014 Zend Technologies USA 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/ApplicationFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ApplicationFactory.php
index efa6500f60f..6bb3c58431e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 60572ee7ea7..4fbc2bf32ed 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 08571bd8d78..79ffa399c99 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7d884dd2305..1bd8c939415 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 791e3317cd2..b55729077cf 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerLoaderFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerLoaderFactory.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Service;
use Zend\Mvc\Controller\ControllerManager;
-use Zend\Mvc\Service\DiStrictAbstractServiceFactory;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
index 35534935afb..048f9a35392 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ControllerPluginManagerFactory.php
@@ -3,28 +3,13 @@
* 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-2014 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\Mvc\Controller\PluginManager;
-use Zend\ServiceManager\ServiceLocatorInterface;
-
class ControllerPluginManagerFactory extends AbstractPluginManagerFactory
{
const PLUGIN_MANAGER_CLASS = 'Zend\Mvc\Controller\PluginManager';
-
- /**
- * Create and return the MVC controller plugin manager
- *
- * @param ServiceLocatorInterface $serviceLocator
- * @return PluginManager
- */
- public function createService(ServiceLocatorInterface $serviceLocator)
- {
- $plugins = parent::createService($serviceLocator);
- return $plugins;
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php
index 0f5168809a0..75bf207d915 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4da63ba2b76..4bc11566898 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a9da09c9b43..f6cb47d6284 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DiStrictAbstractServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactory.php
index 1d043be806c..eb6df3d5141 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DiStrictAbstractServiceFactoryFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.php
index d6b4652b79c..70100c29735 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Service;
-use Zend\ServiceManager\Di\DiAbstractServiceFactory;
use Zend\ServiceManager\FactoryInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/EventManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/EventManagerFactory.php
index 01c250c769f..7941cb761b8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 34ffb97dd84..a6a53603dd3 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FilterManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FilterManagerFactory.php
@@ -3,28 +3,13 @@
* 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-2014 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\ConfigInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-
class FilterManagerFactory extends AbstractPluginManagerFactory
{
const PLUGIN_MANAGER_CLASS = 'Zend\Filter\FilterPluginManager';
-
- /**
- * Create and return the filter plugin manager
- *
- * @param ServiceLocatorInterface $serviceLocator
- * @return \Zend\Filter\FilterPluginManager
- */
- public function createService(ServiceLocatorInterface $serviceLocator)
- {
- $plugins = parent::createService($serviceLocator);
- return $plugins;
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FormElementManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/FormElementManagerFactory.php
index 2369550fff8..fd5400f30c9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fddd005f216..928c3da5b3d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 80b4e4255c9..561d00c75d9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HydratorManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/HydratorManagerFactory.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Service;
-use Zend\ServiceManager\ConfigInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
class HydratorManagerFactory extends AbstractPluginManagerFactory
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/InputFilterManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/InputFilterManagerFactory.php
index c914e6b7586..61cf6888c41 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/InputFilterManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/InputFilterManagerFactory.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\Service;
-use Zend\ServiceManager\ConfigInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
class InputFilterManagerFactory extends AbstractPluginManagerFactory
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ModuleManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ModuleManagerFactory.php
index 1465ac73a2c..e8acea5e01d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PaginatorPluginManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
index 86fc9cc919a..2f8db4c95d7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/PaginatorPluginManagerFactory.php
@@ -3,27 +3,13 @@
* 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-2014 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\ServiceLocatorInterface;
-
class PaginatorPluginManagerFactory extends AbstractPluginManagerFactory
{
const PLUGIN_MANAGER_CLASS = 'Zend\Paginator\AdapterPluginManager';
-
- /**
- * Create and return the MVC controller plugin manager
- *
- * @param ServiceLocatorInterface $serviceLocator
- * @return \Zend\Paginator\AdapterPluginManager
- */
- public function createService(ServiceLocatorInterface $serviceLocator)
- {
- $plugins = parent::createService($serviceLocator);
- return $plugins;
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RequestFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RequestFactory.php
index 729a71ecada..84201bd56ab 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fa66f8fca57..9f7b74a5612 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8e12562eef9..c37f606fc1a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 76bea595339..2a760e6b308 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/RouterFactory.php
@@ -3,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-2014 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\Mvc\Service;
use Zend\Console\Console;
use Zend\Mvc\Router\Console\SimpleRouteStack as ConsoleRouter;
-use Zend\Mvc\Router\Http\TreeRouteStack as HttpRouter;
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 463dbee146f..aee001c54b5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 469b673f320..6a96895477f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ServiceManagerConfig.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ServiceManagerConfig.php
index 2514bf2153c..16066259d29 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/TranslatorServiceFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/TranslatorServiceFactory.php
index 09ad72066df..f4ae420e294 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/TranslatorServiceFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ValidatorManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ValidatorManagerFactory.php
index 7ee8159099a..0fe09f0c84c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ValidatorManagerFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ValidatorManagerFactory.php
@@ -3,28 +3,13 @@
* 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-2014 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\ConfigInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-
class ValidatorManagerFactory extends AbstractPluginManagerFactory
{
const PLUGIN_MANAGER_CLASS = 'Zend\Validator\ValidatorPluginManager';
-
- /**
- * Create and return the validator plugin manager
- *
- * @param ServiceLocatorInterface $serviceLocator
- * @return \Zend\Validator\ValidatorPluginManager
- */
- public function createService(ServiceLocatorInterface $serviceLocator)
- {
- $plugins = parent::createService($serviceLocator);
- return $plugins;
- }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewFeedRendererFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewFeedRendererFactory.php
index 160b972dac9..94047892860 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewFeedRendererFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewFeedRendererFactory.php
@@ -3,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-2014 Zend Technologies USA 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 8a50910171c..56ab2556a40 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c1b8004f227..b9a074e2986 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ViewJsonRendererFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewJsonRendererFactory.php
index fd39c292d4d..d1c4ee44649 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewJsonRendererFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewJsonRendererFactory.php
@@ -3,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-2014 Zend Technologies USA 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/ViewJsonStrategyFactory.php b/vendor/zendframework/zendframework/library/Zend/Mvc/Service/ViewJsonStrategyFactory.php
index 05b8806daf0..63be77d1dfc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0d6e2667912..008eb4a2216 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 981651f7942..166ce1a245c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b49c1e65d04..1df38dbd973 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ce507cac8bd..153200bb646 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/CreateViewModelListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/CreateViewModelListener.php
index 4e9d67e6aa1..91eaf6d621e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4fd597f4d0d..63579f03c8a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\View\Console;
use Zend\Console\Response as ConsoleResponse;
use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\ResponseInterface as Response;
use Zend\View\Model\ConsoleModel as ConsoleViewModel;
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 a920f8d1739..128f250f17b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InjectNamedConsoleParamsListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectNamedConsoleParamsListener.php
index 39901af241b..18919365fc0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 18ec885916e..154e80b31d5 100644
--- a/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectViewModelListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Console/InjectViewModelListener.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Mvc\View\Console;
-use Zend\EventManager\ListenerAggregateInterface;
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 f3bf9a52b9f..dbee881bdc0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Console\Response as ConsoleResponse;
use Zend\Console\Request as ConsoleRequest;
use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
-use Zend\EventManager\ListenerAggregateInterface;
use Zend\ModuleManager\ModuleManagerInterface;
use Zend\ModuleManager\Feature\ConsoleBannerProviderInterface;
use Zend\ModuleManager\Feature\ConsoleUsageProviderInterface;
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 0b9c828a561..2ca26438f25 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8bffadb0f28..d2282eb2efc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -22,8 +22,8 @@ class CreateViewModelListener extends AbstractListenerAggregate
*/
public function attach(Events $events)
{
- $this->listeners[] = $events->attach('dispatch', array($this, 'createViewModelFromArray'), -80);
- $this->listeners[] = $events->attach('dispatch', array($this, 'createViewModelFromNull'), -80);
+ $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'createViewModelFromArray'), -80);
+ $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'createViewModelFromNull'), -80);
}
/**
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 37269cccc83..0407d1a6563 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionStrategy.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/ExceptionStrategy.php
index bb81fd81090..1f888cd6d2c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d1403876b60..f68f0308d6e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -29,7 +29,7 @@ class InjectRoutematchParamsListener extends AbstractListenerAggregate
*/
public function attach(EventManagerInterface $events)
{
- $this->listeners[] = $events->attach('dispatch', array($this, 'injectParams'), 90);
+ $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'injectParams'), 90);
}
/**
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 7aacfa1b9e4..0b7273db669 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InjectViewModelListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/Http/InjectViewModelListener.php
index 770e4746e89..2115984a676 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0fde9b68f40..718e774df32 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0355347bf8e..219549ad7f2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\ListenerAggregateInterface;
use Zend\Mvc\MvcEvent;
-use Zend\Mvc\View\SendResponseListener;
use Zend\ServiceManager\ServiceManager;
use Zend\View\HelperPluginManager as ViewHelperManager;
use Zend\View\Renderer\PhpRenderer as ViewPhpRenderer;
diff --git a/vendor/zendframework/zendframework/library/Zend/Mvc/View/SendResponseListener.php b/vendor/zendframework/zendframework/library/Zend/Mvc/View/SendResponseListener.php
index 5c580c01107..275fb8c592c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractContainer.php b/vendor/zendframework/zendframework/library/Zend/Navigation/AbstractContainer.php
index ccfacdfea41..9decd2e6337 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/BadMethodCallException.php
index 1ec83be14f7..efdf6e13dd1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/DomainException.php
index 0527d65368c..a08649c23df 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/ExceptionInterface.php
index 7c42ce0313c..97e89ded7ba 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/InvalidArgumentException.php
index 0ea730859d2..f1fd848b0bd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Exception/OutOfBoundsException.php
index c52fbd92532..82856e8d629 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Navigation.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Navigation.php
index f256f185fed..dede898e6b8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4059bebf959..77b07dae143 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Mvc.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Mvc.php
index cdda1c478d1..099d6b0b51e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Uri.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Uri.php
index 338e937be53..6c5a992063b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Page/Uri.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Page/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractNavigationFactory.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Service/AbstractNavigationFactory.php
index f5af421edc2..9ef00e0c382 100644
--- a/vendor/zendframework/zendframework/library/Zend/Navigation/Service/AbstractNavigationFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Navigation/Service/AbstractNavigationFactory.php
@@ -3,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-2014 Zend Technologies USA 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/ConstructedNavigationFactory.php b/vendor/zendframework/zendframework/library/Zend/Navigation/Service/ConstructedNavigationFactory.php
index 373c5887b18..363c2b2e7ac 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f1f55280f1a..771666d785b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0f468ea3443..68c00b19310 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AdapterInterface.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/AdapterInterface.php
index daa08dc6eb3..49368465f23 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ArrayAdapter.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/ArrayAdapter.php
index 55ccb83056d..a713b19d5fb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DbSelect.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbSelect.php
index c9ade7292ba..0c024e4ba71 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DbTableGateway.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbTableGateway.php
index b667ee0e3d5..7c165adc81e 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/DbTableGateway.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Paginator\Adapter;
use Zend\Db\Sql\Where;
use Zend\Db\TableGateway\TableGateway;
-use Zend\Paginator\Adapter\DbSelect;
class DbTableGateway extends DbSelect
{
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 dcd478f2896..c0d9f171ee5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/InvalidArgumentException.php
index e3d18ac45fb..4626282daf7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/RuntimeException.php
index cb38a06830e..b6dd6a4fcc4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Exception/UnexpectedValueException.php
index 98869b58993..d01c5e9531f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Iterator.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Iterator.php
index addc109ab41..8b2e760a9d7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Null.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Null.php
index e7e075ed053..557c03c8868 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DbSelectFactory.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Adapter/Service/DbSelectFactory.php
index a10880507f9..ea95a325cd8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AdapterAggregateInterface.php b/vendor/zendframework/zendframework/library/Zend/Paginator/AdapterAggregateInterface.php
index 01f619e1c5a..4b50b458085 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f7d5315267e..040d20b724c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/ExceptionInterface.php
index 0f750a32ae5..526b716f537 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/InvalidArgumentException.php
index 2de78590a5b..8779f1fceeb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/RuntimeException.php
index fb622869135..ed9c15ec9b7 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/UnexpectedValueException.php
index f3f97685a11..3fe9c76236d 100644
--- a/vendor/zendframework/zendframework/library/Zend/Paginator/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Paginator/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Factory.php b/vendor/zendframework/zendframework/library/Zend/Paginator/Factory.php
index def67688a97..790f51b717e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 939a3fe5189..6be3df8d194 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/All.php b/vendor/zendframework/zendframework/library/Zend/Paginator/ScrollingStyle/All.php
index 7ce226727f3..c22d807a1f3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3a3947b9190..07d0e344775 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 96e1079facc..705d2e9e1f3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0daa6140ba3..eeb92c92358 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e75edc65c30..57fed038788 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d5ad687d65d..09e78335a60 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5b0bb3cad37..c3b1ec3ab9e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Acl.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Acl.php
index a9cad33928a..3140fbfa4b1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AclInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/AclInterface.php
index 88c0917ed65..2f730d19b55 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AssertionInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Assertion/AssertionInterface.php
index 84ab695e4fb..f43823a2348 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/ExceptionInterface.php
index c1cec52119c..7d356abddd0 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/InvalidArgumentException.php
index e88ec390a1f..8cf10bee0cb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Exception/RuntimeException.php
index 608b35ae169..9b8795660dc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/GenericResource.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Acl/Resource/GenericResource.php
index b9b8946741b..019e2871841 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1e98f46d6a3..f761c2ed70c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e2c17b2c62e..2f7463f89b4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9cbb8474345..3c38ec07593 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 588de55885d..55c8375934d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractIterator.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractIterator.php
index 4f922ec1619..f7720143904 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -90,7 +90,7 @@ abstract class AbstractIterator implements RecursiveIterator
/**
* (PHP 5 >= 5.1.0)<br/>
* Returns an iterator for the current entry.
- * @link http://php.net/manual/en/recursiveiterator.getRoles.php
+ * @link http://php.net/manual/en/recursiveiterator.getchildren.php
* @return RecursiveIterator An iterator for the current entry.
*/
public function getChildren()
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractRole.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/AbstractRole.php
index fff1a9acd9c..d3d6ea7664c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b94e0aa56a2..0a01addc04b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Exception/ExceptionInterface.php
index abeb69b2def..c94f8b804dd 100644
--- a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Exception/InvalidArgumentException.php
index a53b3950ddb..9c89a682901 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Rbac.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Rbac.php
index d13978122b5..aa903e6e648 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -116,7 +116,7 @@ class Rbac extends AbstractIterator
}
throw new Exception\InvalidArgumentException(sprintf(
- 'No child with name "%s" could be found',
+ 'No role with name "%s" could be found',
is_object($objectOrName) ? $objectOrName->getName() : $objectOrName
));
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Role.php b/vendor/zendframework/zendframework/library/Zend/Permissions/Rbac/Role.php
index 212bd0d06c7..9daa1d74353 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c0d0787d3d3..fd8a65c5fc3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/AbstractAdapter.php
index 672e2b26cea..53f9d2897a3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8bd3788afad..64e8e10da62 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Console.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ProgressBar\Adapter;
-use Zend\ProgressBar\Adapter\Exception;
use Zend\Stdlib\ErrorHandler;
use Zend\Stdlib\StringUtils;
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 5fa70304bf0..e64d3afdce6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d47def50a87..18e3045295c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
index 8091121bf27..64069fe3f48 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/JsPull.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Adapter/JsPull.php
index e1626c77e60..f5f63f07183 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 11ab2f8a55f..cf417468e64 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/ExceptionInterface.php
index 614c14d730d..d89fbc01eb6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b1c30d00657..ff5b89b0e5b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/OutOfRangeException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/OutOfRangeException.php
index bcae9b5ad60..72a7543e94f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6177d90d929..65823a236eb 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/PhpEnvironmentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/PhpEnvironmentException.php
@@ -3,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-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Exception/RuntimeException.php
index 8fcb1339e9f..d22dd114e1a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ProgressBar.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php
index f802dbe32e1..424a0d3c794 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/ProgressBar.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ProgressBar;
-use Zend\ProgressBar\Exception;
use Zend\Session;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
index e182e015cfc..1474c4c2b40 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ApcProgress.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/ApcProgress.php
index eeb01d3628a..236e3767af6 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/ApcProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/ApcProgress.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ProgressBar\Upload;
-use Traversable;
use Zend\ProgressBar\Exception;
-use Zend\Stdlib\ArrayUtils;
/**
* Progress Bar Upload Handler for the APC extension
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.php
index 064acba5138..3c8cfbede25 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/SessionProgress.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ProgressBar\Upload;
-use Traversable;
use Zend\ProgressBar\Exception;
-use Zend\Stdlib\ArrayUtils;
/**
* Progress Bar Upload Handler for PHP 5.4+ Session Upload Progress handling
diff --git a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php
index 6286829d106..9c97469396f 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadHandlerInterface.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ProgressBar\Upload;
-use Traversable;
-use Zend\Stdlib\ArrayUtils;
/**
* 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 1aaf5bb0674..871de58dfc6 100644
--- a/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadProgress.php
+++ b/vendor/zendframework/zendframework/library/Zend/ProgressBar/Upload/UploadProgress.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ProgressBar\Upload;
-use Traversable;
use Zend\ProgressBar\Exception;
-use Zend\Stdlib\ArrayUtils;
/**
* Progress Bar Upload Handler for the UploadProgress extension
diff --git a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/AbstractAdapter.php
index 5ef78ab294f..de5ae4a3e58 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3f3434117ab..132304f4bb2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0c286dec9eb..594884d6a72 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/IgBinary.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/IgBinary.php
index 9c7f78214f0..391cb3ebbe9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a6b9f8b325c..025c19efaed 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a83bee367a0..e6bc3c910b9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 03bb7504e97..01734e3978b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6e484ad7dc4..d2f672f8b60 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PhpSerialize.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PhpSerialize.php
index d715cdce2f7..3fef17e4aaa 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PythonPickle.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickle.php
index 9894224b02c..db0fea920f0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PythonPickleOptions.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/PythonPickleOptions.php
index 82e46900c30..b43f2ab7263 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6781a975fd4..b848cee1709 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 361af4cf77f..e403731ae03 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/WddxOptions.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/Adapter/WddxOptions.php
@@ -3,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-2014 Zend Technologies USA 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/AdapterPluginManager.php b/vendor/zendframework/zendframework/library/Zend/Serializer/AdapterPluginManager.php
index 0c57a81004e..5be62ce6b3d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExceptionInterface.php
index 1cdef0e482c..6620aa6a865 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php
index 4533e30e905..798c1256349 100644
--- a/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Serializer/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/InvalidArgumentException.php
index e4231ca5e43..3a0215acf5e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Exception/RuntimeException.php
index 7a7efb11b68..9e1ac51ff35 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Serializer.php b/vendor/zendframework/zendframework/library/Zend/Serializer/Serializer.php
index cf2e28f4cf7..5cc6bdc55bc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractServer.php b/vendor/zendframework/zendframework/library/Zend/Server/AbstractServer.php
index 85b0171d082..e52deefd169 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Cache.php b/vendor/zendframework/zendframework/library/Zend/Server/Cache.php
index 96fec0c2bab..2f61fa0404e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Client.php b/vendor/zendframework/zendframework/library/Zend/Server/Client.php
index c4e224a5aa1..203b9c011d1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f969ce8dda9..1cf6e09d5b5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1151b0e911f..39d8281e306 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Server/Exception/ExceptionInterface.php
index ab0219c47bf..65974b9d9cc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5c309490e5f..9683e6dc81a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Server/Exception/RuntimeException.php
index 4b076645f11..4dc22a4022f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Server/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Callback.php b/vendor/zendframework/zendframework/library/Zend/Server/Method/Callback.php
index 74f4f3851e6..6f0ae26d1bf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Definition.php b/vendor/zendframework/zendframework/library/Zend/Server/Method/Definition.php
index 2908c2135c5..661259776c4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f4c4c63ef8d..a867ec97294 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0c8fe89ceca..61380b9864f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 db85debb52c..729efbf7378 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 828a0d6b2ea..1f288316d66 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/BadMethodCallException.php
index 54649ef4c73..7c8f83a70f9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/ExceptionInterface.php
index a97f54f632f..ee5507ae692 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/InvalidArgumentException.php
index 41cb2f0be6c..74bd70de890 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Exception/RuntimeException.php
index 017fda72e7e..75bfeee5b5a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Node.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Node.php
index 87d788b1b41..f6e13472982 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Prototype.php b/vendor/zendframework/zendframework/library/Zend/Server/Reflection/Prototype.php
index b75779906d8..416995bff8e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 146d64c307c..7c04798961b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 70984855045..2595ce56d3a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 31e09a3a753..af63f5064b5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c5f8fb31ca9..e076e93bebe 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 42b1e97445f..64f0fb956a6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0d622024ad6..56e5269bb6b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractFactoryInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/AbstractFactoryInterface.php
index 64ab7598e9e..f54205b25a3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3fb7f8dfd0c..cd5d5c91d48 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -142,7 +142,7 @@ abstract class AbstractPluginManager extends ServiceManager implements ServiceLo
/**
* Get the main plugin manager. Useful for fetching dependencies from within factories.
*
- * @return mixed
+ * @return ServiceLocatorInterface
*/
public function getServiceLocator()
{
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Config.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Config.php
index f0a3e3ee23b..c64bb0e7c36 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 68e7d2754ea..1593312a3af 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4180a94dbb2..27ad5f1fb7d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 71bf76703b0..616ed25670c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -36,7 +36,7 @@ class DiAbstractServiceFactory extends DiServiceFactory implements AbstractFacto
/**
* {@inheritDoc}
*/
- public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $serviceName, $requestedName)
+ public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
{
$this->serviceLocator = $serviceLocator;
if ($requestedName) {
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiInstanceManagerProxy.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiInstanceManagerProxy.php
index 4f1cdb1e3d4..cdd4bf9fa65 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0139f1cef87..c64784c58d2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DiServiceInitializer.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/Di/DiServiceInitializer.php
index f3c0627c362..6bfe8d2eaf3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fa6d1f10daa..d50ef311ad5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 73c34fe1992..f5451f804ac 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8c9869dbe90..d72a170d667 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 64f59ed40e7..d997c62ee7a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6e44f9c9bf7..8958b6310bf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 822a895b108..1ce28f1fc7c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4226e75bb71..caf843d7559 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 877aa629b43..e02b24099a7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6b681225a0d..8fd7dc44916 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0db23f34cb2..b12061b54a5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ServiceManager;
-use Zend\ServiceManager\ServiceLocatorInterface;
interface InitializerInterface
{
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/MutableCreationOptionsInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/MutableCreationOptionsInterface.php
index fe91532bbbf..785e6e84e59 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 eb033680b91..3be5506b15e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6861d6e9820..e390181853f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ServiceLocatorAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorAwareInterface.php
index cd666803d74..7f53ada01da 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fdc155abd43..17f6069d854 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\ServiceManager;
-use Zend\ServiceManager\ServiceLocatorInterface;
trait ServiceLocatorAwareTrait
{
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceLocatorInterface.php
index 46064c840fc..b9a04e5dc1f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2480eeb559e..65d612fe489 100644
--- a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManager.php
+++ b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManager.php
@@ -3,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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -501,6 +501,14 @@ class ServiceManager implements ServiceLocatorInterface
|| $this->canCreateFromAbstractFactory($cName, $name)
) {
$instance = $this->create(array($cName, $name));
+ } elseif ($isAlias && $this->canCreateFromAbstractFactory($name, $cName)) {
+ /*
+ * case of an alias leading to an abstract factory :
+ * 'my-alias' => 'my-abstract-defined-service'
+ * $name = 'my-alias'
+ * $cName = 'my-abstract-defined-service'
+ */
+ $instance = $this->create(array($name, $cName));
} elseif ($usePeeringServiceManagers && !$this->retrieveFromPeeringManagerFirst) {
$instance = $this->retrieveFromPeeringManager($name);
}
diff --git a/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManagerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/ServiceManager/ServiceManagerAwareInterface.php
index 4f6a0cc986d..320f6bc69ef 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractContainer.php b/vendor/zendframework/zendframework/library/Zend/Session/AbstractContainer.php
index 28611a2086a..e3cc1078e90 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -598,4 +598,17 @@ abstract class AbstractContainer extends ArrayObject
return $this;
}
+
+ /**
+ * Creates a copy of the specific container name
+ *
+ * @return array
+ */
+ public function getArrayCopy()
+ {
+ $storage = $this->verifyNamespace();
+ $container = $storage[$this->getName()];
+
+ return $container->getArrayCopy();
+ }
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/AbstractManager.php b/vendor/zendframework/zendframework/library/Zend/Session/AbstractManager.php
index 856441f32e6..7f94be15e94 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ConfigInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/Config/ConfigInterface.php
index 48908e6c8d9..a71b891e71f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 755f8487a93..e909e5043e3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/StandardConfig.php b/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php
index bda078ba3fe..805691fd7d4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Config/StandardConfig.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Config;
use Traversable;
-use Zend\Session\Config\ConfigInterface;
use Zend\Session\Exception;
use Zend\Validator\Hostname as HostnameValidator;
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/Container.php b/vendor/zendframework/zendframework/library/Zend/Session/Container.php
index 80ae76217d3..53e2eb0b9f9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Container.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Container/PhpReferenceCompatibility.php b/vendor/zendframework/zendframework/library/Zend/Session/Container/PhpReferenceCompatibility.php
index a332c30dd8a..a367fba8031 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Container/PhpReferenceCompatibility.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Container/PhpReferenceCompatibility.php
@@ -3,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-2014 Zend Technologies USA 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/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Session/Exception/BadMethodCallException.php
index 1ab287e2823..8d31d387133 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/Exception/ExceptionInterface.php
index 1afd964c1fc..4466e36d849 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Session/Exception/InvalidArgumentException.php
index 873268e8079..f90ab4161b1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Session/Exception/RuntimeException.php
index 7e2c1b00021..be4cf0e2a9a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ManagerInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/ManagerInterface.php
index 9f66290453e..2038c6928b5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 871807fe9de..c5ad2707474 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9d62e3c1e98..7d791192da9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DbTableGatewayOptions.php b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/DbTableGatewayOptions.php
index e1398269247..ad55c73c751 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/MongoDB.php b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDB.php
index 87ee33522e0..2edabd282cd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/MongoDBOptions.php b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/MongoDBOptions.php
index aad7dfdbb6a..7eb7c95cc79 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SaveHandlerInterface.php b/vendor/zendframework/zendframework/library/Zend/Session/SaveHandler/SaveHandlerInterface.php
index 4851c0c0114..5ee7dd4985b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 33c64518c02..cb4ecd7e479 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c84baf13784..0da49842b79 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SessionManagerFactory.php b/vendor/zendframework/zendframework/library/Zend/Session/Service/SessionManagerFactory.php
index 81a0d6e011c..f69e2987597 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/StorageFactory.php b/vendor/zendframework/zendframework/library/Zend/Session/Service/StorageFactory.php
index 667cd7ed2b6..6222e75adc7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SessionManager.php b/vendor/zendframework/zendframework/library/Zend/Session/SessionManager.php
index 863f3f1347d..545befd3ce9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractSessionArrayStorage.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/AbstractSessionArrayStorage.php
index 984bd49f960..604954aee0d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ArrayStorage.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/ArrayStorage.php
index 4c897fbafd4..f0d70647254 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Factory.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/Factory.php
index a32b973c30c..0e6c4ea3bb2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8d24a47ef9a..0362077f777 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage.php
@@ -3,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-2014 Zend Technologies USA 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/PhpReferenceCompatibility.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage/PhpReferenceCompatibility.php
index ddff335ab1d..3a3b29477f4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage/PhpReferenceCompatibility.php
+++ b/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionArrayStorage/PhpReferenceCompatibility.php
@@ -3,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-2014 Zend Technologies USA 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/SessionStorage.php b/vendor/zendframework/zendframework/library/Zend/Session/Storage/SessionStorage.php
index 1a762aca4c1..231fb7ffd34 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c29714b4cd8..8323eed48e3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2fff8ddf304..4070bc5f574 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e64d8b673eb..5b1bf92ed82 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2a4622ceb97..d8870059e82 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3e1e19c298d..fcbe9bca4a3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 febc28cc581..5774c98f3ed 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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;
diff --git a/vendor/zendframework/zendframework/library/Zend/Session/compatibility/autoload.php b/vendor/zendframework/zendframework/library/Zend/Session/compatibility/autoload.php
index 38e3e29db80..3ecffe7fcaa 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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/Soap/AutoDiscover.php b/vendor/zendframework/zendframework/library/Zend/Soap/AutoDiscover.php
index 82852f84ac4..8fde138f0e7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Soap;
use Zend\Server\Reflection;
use Zend\Soap\AutoDiscover\DiscoveryStrategy\DiscoveryStrategyInterface as DiscoveryStrategy;
use Zend\Soap\AutoDiscover\DiscoveryStrategy\ReflectionDiscovery;
-use Zend\Soap\Exception;
-use Zend\Soap\Wsdl;
use Zend\Soap\Wsdl\ComplexTypeStrategy\ComplexTypeStrategyInterface as ComplexTypeStrategy;
use Zend\Uri;
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 22f33dbf15b..fccbd95daac 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 44559de9fa9..abc7688b00b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client.php
index 7766a497d07..6bb794b20c5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bf9eb5c8841..fae2466b69a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DotNet.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client/DotNet.php
index b65e167be38..a44d7d2f5d1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Local.php b/vendor/zendframework/zendframework/library/Zend/Soap/Client/Local.php
index 6c6342065c3..61c11cfa8e2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 30af2d0cfab..bf954c6b4b8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExceptionInterface.php
index e1bc31c0e49..aa1f1a9e8ec 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/ExtensionNotLoadedException.php
index 94bb9efe770..887aa4614db 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/InvalidArgumentException.php
index c71eec6f64b..5994b95044c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/RuntimeException.php
index b1290234cf1..4cf9bfc9db0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Soap/Exception/UnexpectedValueException.php
index a3133d351d7..58ef42bcc5d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Server.php b/vendor/zendframework/zendframework/library/Zend/Soap/Server.php
index 6cc0a0e6e14..39e228a2faf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Server/DocumentLiteralWrapper.php b/vendor/zendframework/zendframework/library/Zend/Soap/Server/DocumentLiteralWrapper.php
index 7c30208bdbd..fcf4c20a34b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d830a56e9d0..aac4263bfb5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractComplexTypeStrategy.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AbstractComplexTypeStrategy.php
index 36bc8bfc34e..3af11bb178e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AnyType.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/AnyType.php
index 26365054049..17774147d7c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b9b4a4c733c..487a969973d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ArrayOfTypeSequence.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
index 0c223bda1b4..c9248e2a6dc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ComplexTypeStrategyInterface.php b/vendor/zendframework/zendframework/library/Zend/Soap/Wsdl/ComplexTypeStrategy/ComplexTypeStrategyInterface.php
index 1324ecf55a7..47aece3738d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ea8f0a1272f..784e73f64cd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 779cd2bf289..ce45fbd9cfa 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractOptions.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/AbstractOptions.php
index 0e68c29e11c..ffe471a5119 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ArrayObject.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject.php
index 806c128fc76..2bebaf8dd93 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject.php
@@ -3,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-2014 Zend Technologies USA 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/ArrayObject/PhpLegacyCompatibility.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpLegacyCompatibility.php
index 9a71605e728..b34f21cb74c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpLegacyCompatibility.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpLegacyCompatibility.php
@@ -3,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-2014 Zend Technologies USA 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/ArrayObject/PhpReferenceCompatibility.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php
index e25257c761b..a6d7b9abba4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArrayObject/PhpReferenceCompatibility.php
@@ -3,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-2014 Zend Technologies USA 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/ArraySerializableInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ArraySerializableInterface.php
index 7bd6f6eddb5..222f57b0a18 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 559d65e3f0a..0fcceb954f5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4261d2e65fa..8da7a9cdb8e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -245,23 +245,23 @@ abstract class ArrayUtils
/**
* Merge two arrays together.
*
- * If an integer key exists in both arrays, the value from the second array
- * will be appended the the first array. If both values are arrays, they
- * are merged together, else the value of the second array overwrites the
- * one of the first array.
+ * If an integer key exists in both arrays and preserveNumericKeys is false, the value
+ * from the second array will be appended to the first array. If both values are arrays, they
+ * are merged together, else the value of the second array overwrites the one of the first array.
*
* @param array $a
* @param array $b
+ * @param bool $preserveNumericKeys
* @return array
*/
- public static function merge(array $a, array $b)
+ 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)) {
+ if (is_int($key) && !$preserveNumericKeys) {
$a[] = $value;
} elseif (is_array($value) && is_array($a[$key])) {
- $a[$key] = static::merge($a[$key], $value);
+ $a[$key] = static::merge($a[$key], $value, $preserveNumericKeys);
} else {
$a[$key] = $value;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.php
index f1ac4a65b36..303558adfe2 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/CallbackHandler.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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;
-use Closure;
use ReflectionClass;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/DateTime.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/DateTime.php
index 5c88ad4732c..64a39f62faa 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 296e1301ad1..b8bfdac168a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5096f53d9d3..6a63ee22fc1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Exception/BadMethodCallException.php
index 6cf1c9ecc07..4b06b388527 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2744570f28f..3178c15340b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0424a4ea9a8..d43eb3078a8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b883641a63d..3955952f80f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9efb0e09b5a..534d1906a8d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 30e97e83bda..bfc1070a1c8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 55e07d6a977..8becb252bde 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 20c065587d2..bb52eb874a6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Glob.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Glob.php
index a9e29fd0c68..5a821be9e0c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Glob.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Glob.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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;
-use Zend\Stdlib\Exception;
-use Zend\Stdlib\ErrorHandler;
/**
* Wrapper for glob with fallback if GLOB_BRACE is not available.
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/AbstractHydrator.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/AbstractHydrator.php
index 729260f910f..6397a86a017 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Stdlib\Hydrator;
use ArrayObject;
use Zend\Stdlib\Exception;
use Zend\Stdlib\Hydrator\Filter\FilterComposite;
-use Zend\Stdlib\Hydrator\StrategyEnabledInterface;
use Zend\Stdlib\Hydrator\Strategy\StrategyInterface;
abstract class AbstractHydrator implements HydratorInterface, StrategyEnabledInterface
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 bdcf1eb0adf..335f5648ac8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Stdlib\Hydrator\Aggregate;
use Zend\EventManager\EventManager;
use Zend\EventManager\EventManagerAwareInterface;
use Zend\EventManager\EventManagerInterface;
-use Zend\Stdlib\Exception;
-use Zend\Stdlib\Hydrator\Filter\FilterComposite;
use Zend\Stdlib\Hydrator\HydratorInterface;
/**
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 dfdfbcfb6b5..7e199397a5a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/ExtractEvent.php
@@ -3,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-2014 Zend Technologies USA 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/HydrateEvent.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php
index 11bab023797..0cc48abee07 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydrateEvent.php
@@ -3,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-2014 Zend Technologies USA 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/HydratorListener.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
index 0ce5ddac03a..d2d8ff46acb 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Aggregate/HydratorListener.php
@@ -3,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-2014 Zend Technologies USA 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/ArraySerializable.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ArraySerializable.php
index d9631122e15..6331af0087f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ClassMethods.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php
index a3d76ceffb6..ec3fc6ffb9f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ClassMethods.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Hydrator;
-use ReflectionMethod;
use Traversable;
use Zend\Stdlib\Exception;
use Zend\Stdlib\ArrayUtils;
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 35bb437c076..49cd785d4a7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Hydrator\Filter;
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 30bd3575a13..7e2ebaaea6b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\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 18f3597a65a..e3fbc8c078a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\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 d112396ec01..8a303f8f3ec 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\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 dfc23f97f20..48011fe055f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\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 233ae139f6f..736212b5b95 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\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 a61cd5a3d61..0f8db0714aa 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\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 7f4e05289f3..25ed587dbd9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Stdlib\Hydrator\Filter;
use ReflectionException;
use ReflectionMethod;
use Zend\Stdlib\Exception\InvalidArgumentException;
-use Zend\Stdlib\Hydrator\Filter\FilterInterface;
class NumberOfParameterFilter implements FilterInterface
{
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 9fa1de07e19..b78a21b1d25 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Hydrator\Filter;
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorAwareInterface.php
index f2784b3bb28..598af9f1eaf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HydratorInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorInterface.php
index c6b3e89e20a..7d65bb08510 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorInterface.php
@@ -3,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-2014 Zend Technologies USA 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/HydratorOptionsInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/HydratorOptionsInterface.php
index 740cfb435de..0830b758184 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0e9892a2529..3b01f0c994d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ObjectProperty.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ObjectProperty.php
index c0bf569a2fe..c53dafb156a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ObjectProperty.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/ObjectProperty.php
@@ -3,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-2014 Zend Technologies USA 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/Reflection.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Reflection.php
index fae361aab78..3e9cfd0cc22 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ClosureStrategy.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/ClosureStrategy.php
index e2b32a640c3..a5cb3413a4b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DefaultStrategy.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php
index d98f1f4c727..d455f177d80 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 67b323ad6a0..71375bb9788 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8a16355fb38..03208b3eef7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 41fda04c4ec..9cb0f4ab633 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 39a71ebf236..f50343c25be 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Message.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/Message.php
index 3e3f1f5be51..c6c1c825c69 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0abb1ff6b8a..8d94e146bb1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ParameterObjectInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ParameterObjectInterface.php
index 416b8c2985f..e03f4e6c456 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 be72f3fd98d..e33e4e482c2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ParametersInterface.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/ParametersInterface.php
index e955b2ac7ac..7dcd6677841 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PriorityQueue.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/PriorityQueue.php
index 21cca340a13..869af132f23 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8427bc08f3a..674111e3124 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4a2252de4e0..210e486907b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1c2ea76b19a..69b8818ae50 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cf5d0edd4ee..2ddc9787aba 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SplPriorityQueue.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/SplPriorityQueue.php
index 5baa967ff93..404e4c243f3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/SplQueue.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/SplQueue.php
index e18ebc68218..fe06b88472f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3bb8f679601..1b17acc72f1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2945f9aa627..e468a8f294c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringUtils.php
+++ b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringUtils.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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;
-use Zend\Stdlib\ErrorHandler;
use Zend\Stdlib\StringWrapper\StringWrapperInterface;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/AbstractStringWrapper.php
index e22649e7fa2..d3e8830d654 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Iconv.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/Iconv.php
index 35dc39a1c91..d240eaaddb1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1c3973bb9da..77596c84738 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -65,7 +65,12 @@ class Intl extends AbstractStringWrapper
*/
public function substr($str, $offset = 0, $length = null)
{
- return grapheme_substr($str, $offset, $length);
+ // Due fix of PHP #62759 The third argument returns an empty string if is 0 or null.
+ if ($length !== null) {
+ return grapheme_substr($str, $offset, $length);
+ }
+
+ return grapheme_substr($str, $offset);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/MbString.php b/vendor/zendframework/zendframework/library/Zend/Stdlib/StringWrapper/MbString.php
index cc47d6ee32e..fad66295607 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 978b731118d..d6e55b10865 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 974b0be4899..a22c4e55730 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cfc5696262e..1a237d227ee 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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/Tag/Cloud.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud.php
index 33c4a7c54be..af108c5d316 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 20da4c6830c..3510b28b128 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 bc4c38292ac..d33db3c225a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0d75eef66b0..b2e61d76e34 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1b07b6153b7..312e8aeee39 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 df89300517b..45c50c49f20 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/Exception/InvalidArgumentException.php
index 6b36583f3f4..8279d2ea9c9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HtmlCloud.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
index 8afa63476bb..d1822cdada2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HtmlTag.php b/vendor/zendframework/zendframework/library/Zend/Tag/Cloud/Decorator/HtmlTag.php
index 29935603589..ebbe8dad860 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 77c1fe4e9d8..0e212878505 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/ExceptionInterface.php
index a700fa403da..cd99c4e5318 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 070a9e3e8b8..8d25185a22b 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidAttributeNameException.php b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidAttributeNameException.php
index 9d43088d6cd..8e5abfc62bc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidElementNameException.php b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/InvalidElementNameException.php
index bd6fb356b33..a9e1c6f9fd7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Tag/Exception/OutOfBoundsException.php
index 31614fe6417..98e24c06c40 100644
--- a/vendor/zendframework/zendframework/library/Zend/Tag/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Tag/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Item.php b/vendor/zendframework/zendframework/library/Zend/Tag/Item.php
index 4f41de55fd0..35effba901d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ac12db9de63..7585260176c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c118b2c6633..3a475ac9d7c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
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 b394dc00f07..d1f1ea2155c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Test\PHPUnit\Controller;
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 e4ef0c2dcf0..8fd550ce6ea 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Test\PHPUnit\Controller;
@@ -181,7 +181,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
*/
public function getResponse()
{
- return $this->getApplication()->getResponse();
+ return $this->getApplication()->getMvcEvent()->getResponse();
}
/**
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 ab4335f1017..12cca473036 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
+++ b/vendor/zendframework/zendframework/library/Zend/Test/PHPUnit/Controller/AbstractHttpControllerTestCase.php
@@ -3,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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\Test\PHPUnit\Controller;
@@ -88,15 +88,30 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$header
));
}
- if ($match != $responseHeader->getFieldValue()) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+
+ if (!$responseHeader instanceof \ArrayIterator) {
+ $responseHeader = array($responseHeader);
+ }
+
+ $headerMatched = false;
+
+ foreach ($responseHeader as $currentHeader) {
+ if ($match == $currentHeader->getFieldValue()) {
+ $headerMatched = true;
+ break;
+ }
+ }
+
+ if (!$headerMatched) {
+ throw new \PHPUnit_Framework_ExpectationFailedException(sprintf(
'Failed asserting response header "%s" exists and contains "%s", actual content is "%s"',
$header,
$match,
- $responseHeader->getFieldValue()
+ $currentHeader->getFieldValue()
));
}
- $this->assertEquals($match, $responseHeader->getFieldValue());
+
+ $this->assertEquals($match, $currentHeader->getFieldValue());
}
/**
@@ -114,14 +129,22 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$header
));
}
- if ($match == $responseHeader->getFieldValue()) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting response header "%s" DOES NOT CONTAIN "%s"',
- $header,
- $match
- ));
+
+ if (!$responseHeader instanceof \ArrayIterator) {
+ $responseHeader = array($responseHeader);
+ }
+
+ foreach ($responseHeader as $currentHeader) {
+ if ($match == $currentHeader->getFieldValue()) {
+ throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+ 'Failed asserting response header "%s" DOES NOT CONTAIN "%s"',
+ $header,
+ $match
+ ));
+ }
}
- $this->assertNotEquals($match, $responseHeader->getFieldValue());
+
+ $this->assertNotEquals($match, $currentHeader->getFieldValue());
}
/**
@@ -139,15 +162,31 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$header
));
}
- if (!preg_match($pattern, $responseHeader->getFieldValue())) {
+
+ if (!$responseHeader instanceof \ArrayIterator) {
+ $responseHeader = array($responseHeader);
+ }
+
+ $headerMatched = false;
+
+ foreach ($responseHeader as $currentHeader) {
+ $headerMatched = (bool) preg_match($pattern, $currentHeader->getFieldValue());
+
+ if ($headerMatched) {
+ break;
+ }
+ }
+
+ if (!$headerMatched) {
throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
'Failed asserting response header "%s" exists and matches regex "%s", actual content is "%s"',
$header,
$pattern,
- $responseHeader->getFieldValue()
+ $currentHeader->getFieldValue()
));
}
- $this->assertTrue((bool) preg_match($pattern, $responseHeader->getFieldValue()));
+
+ $this->assertTrue($headerMatched);
}
/**
@@ -165,14 +204,26 @@ abstract class AbstractHttpControllerTestCase extends AbstractControllerTestCase
$header
));
}
- if (preg_match($pattern, $responseHeader->getFieldValue())) {
- throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
- 'Failed asserting response header "%s" DOES NOT MATCH regex "%s"',
- $header,
- $pattern
- ));
+
+ if (!$responseHeader instanceof \ArrayIterator) {
+ $responseHeader = array($responseHeader);
}
- $this->assertFalse((bool) preg_match($pattern, $responseHeader->getFieldValue()));
+
+ $headerMatched = false;
+
+ foreach ($responseHeader as $currentHeader) {
+ $headerMatched = (bool) preg_match($pattern, $currentHeader->getFieldValue());
+
+ if ($headerMatched) {
+ throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+ 'Failed asserting response header "%s" DOES NOT MATCH regex "%s"',
+ $header,
+ $pattern
+ ));
+ }
+ }
+
+ $this->assertFalse($headerMatched);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/Util/ModuleLoader.php b/vendor/zendframework/zendframework/library/Zend/Test/Util/ModuleLoader.php
index 010a0d25ead..05d36068398 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Test\Util;
diff --git a/vendor/zendframework/zendframework/library/Zend/Test/composer.json b/vendor/zendframework/zendframework/library/Zend/Test/composer.json
index 926f12ba8f9..99bba1c3720 100644
--- a/vendor/zendframework/zendframework/library/Zend/Test/composer.json
+++ b/vendor/zendframework/zendframework/library/Zend/Test/composer.json
@@ -15,6 +15,7 @@
"require": {
"php": ">=5.3.3",
"phpunit/PHPUnit": "3.7.*",
+ "zendframework/zend-console": "self.version",
"zendframework/zend-dom": "self.version",
"zendframework/zend-eventmanager": "self.version",
"zendframework/zend-http": "self.version",
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/ExceptionInterface.php
index 422bd8e5dd7..d104ef1125f 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/InvalidArgumentException.php
index 4731aed4d89..72c9764b87a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/OutOfBoundsException.php
index 7d73e2e4e92..1897dffc01a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/OutOfBoundsException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/OverflowException.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/OverflowException.php
index 50638a19680..bb2e7d6f974 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/OverflowException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/RuntimeException.php
index 1754aeb5d1d..7677c1e813a 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Text/Exception/UnexpectedValueException.php
index 9fae2203c55..e5e0c648ec8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Exception/UnexpectedValueException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Figlet/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/ExceptionInterface.php
index 0c35340113b..eded63a1710 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Figlet/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/InvalidArgumentException.php
index 28287c2bcff..266e5dc3cc0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Figlet/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/RuntimeException.php
index f732623aac2..2334e8a6a69 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Figlet/Exception/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Exception/UnexpectedValueException.php
index 302d336ff4a..d7a54c8a199 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Figlet/Figlet.php b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/Figlet.php
index e2ccb363ab8..b5ffca7e444 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Figlet;
use Traversable;
use Zend\Stdlib\ArrayUtils;
-use Zend\Stdlib\ErrorHandler;
use Zend\Stdlib\StringUtils;
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/zend-framework.flf b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/zend-framework.flf
index 81727b80699..5d7445cf4e4 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Figlet/zend-framework.flf
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Figlet/zend-framework.flf
@@ -17,7 +17,7 @@ Version: 1.0
obtain it through the world-wide-web, please send an email
to license@zend.com so we can send you a copy immediately.
- Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
-------------------------------------------------------------------------------
diff --git a/vendor/zendframework/zendframework/library/Zend/Text/MultiByte.php b/vendor/zendframework/zendframework/library/Zend/Text/MultiByte.php
index d82e3aa1f43..04bc869d984 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 833b9377c4d..154749e74e9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Ascii.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Decorator/Ascii.php
index 98620bacfed..6d049ae8014 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 49996b7864c..0b4bf087975 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7f819b08192..31d0b5e3092 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 93e4d6e7e34..cb12a9d69fe 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0525b6d2a00..e936230e80f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8318568f652..a3f0112a3a1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/InvalidArgumentException.php
index d495d2ceb1d..5577ab61c17 100644
--- a/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Text/Table/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/InvalidDecoratorException.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/InvalidDecoratorException.php
index bc2a509ae69..7e61bb2e970 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/OutOfBoundsException.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/OutOfBoundsException.php
index d902079ce21..542a487632e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/OverflowException.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/OverflowException.php
index 8438bd9a361..0ea8017d4e7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/UnexpectedValueException.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Exception/UnexpectedValueException.php
index 9d182aa6a6d..d9a8c4bd99d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Row.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Row.php
index ee3fa5f7c5f..7af59288bf8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Table.php b/vendor/zendframework/zendframework/library/Zend/Text/Table/Table.php
index 0c58e15d06e..2dd7672ce20 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/ExceptionInterface.php
index 3a5aa413a39..3d29c18def9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidArgumentException.php
index d3db9dabdbb..e8d91ebf444 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidUriException.php b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriException.php
index fc5fec30816..9a6cc1d3021 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidUriPartException.php b/vendor/zendframework/zendframework/library/Zend/Uri/Exception/InvalidUriPartException.php
index 1d093a6907f..0daf5b083d1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c67907ea549..71c21875a0b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 fe0d3d8ad5d..a24851b1f37 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 cbdf7350d1a..8463f995c4d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 32e7be5fc30..cf8a1b18f5b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -20,10 +20,14 @@ class Uri implements UriInterface
/**
* Character classes defined in RFC-3986
*/
- const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
- const CHAR_GEN_DELIMS = ':\/\?#\[\]@';
- const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
- const CHAR_RESERVED = ':\/\?#\[\]@!\$&\'\(\)\*\+,;=';
+ const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
+ const CHAR_GEN_DELIMS = ':\/\?#\[\]@';
+ const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
+ const CHAR_RESERVED = ':\/\?#\[\]@!\$&\'\(\)\*\+,;=';
+ /**
+ * Not in the spec - those characters have special meaning in urlencoded query parameters
+ */
+ const CHAR_QUERY_DELIMS = '!\$\'\(\)\*\,';
/**
* Host part types represented as binary masks
@@ -1304,7 +1308,7 @@ class Uri implements UriInterface
$query = self::encodeQueryFragment(
self::decodeUrlEncodedChars(
$query,
- '/[' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]/'
+ '/[' . self::CHAR_UNRESERVED . self::CHAR_QUERY_DELIMS . ':@\/\?]/'
)
);
@@ -1321,7 +1325,14 @@ class Uri implements UriInterface
*/
protected static function normalizeFragment($fragment)
{
- return static::normalizeQuery($fragment);
+ $fragment = self::encodeQueryFragment(
+ self::decodeUrlEncodedChars(
+ $fragment,
+ '/[' . self::CHAR_UNRESERVED . self::CHAR_SUB_DELIMS . '%:@\/\?]/'
+ )
+ );
+
+ return $fragment;
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/UriFactory.php b/vendor/zendframework/zendframework/library/Zend/Uri/UriFactory.php
index 2198b390cea..d6b65a12e50 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/UriFactory.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/UriFactory.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Uri;
-use Zend\Uri\Uri;
/**
* URI Factory Class
diff --git a/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php b/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php
index 2b17079ee79..db97c66cdc9 100644
--- a/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Uri/UriInterface.php
@@ -3,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-2014 Zend Technologies USA 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/AbstractValidator.php b/vendor/zendframework/zendframework/library/Zend/Validator/AbstractValidator.php
index 7aa2dfe55dc..8ab827f6939 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -156,7 +156,7 @@ abstract class AbstractValidator implements
*/
public function getMessages()
{
- return array_unique($this->abstractOptions['messages']);
+ return array_unique($this->abstractOptions['messages'], SORT_REGULAR);
}
/**
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Barcode.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode.php
index 28c0b30c89a..f86003eb83b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractAdapter.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/AbstractAdapter.php
index 196106c8ea6..1222d87ed8a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 703e5ea45ea..33d24496038 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 43770376926..1a3011c10d0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1d462295cf6..49195368f28 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Code25.php b/vendor/zendframework/zendframework/library/Zend/Validator/Barcode/Code25.php
index b17fe7c7218..3619f528c36 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d6810857f23..77bc027d975 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7e5c2de7b54..9a368c5d403 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 59e0d80ffb7..b9b14a59c79 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d9040c26d6a..35739a1103a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 1c0e804bd2e..aa8fc07b92d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a3b90c5f63b..ee45ebb6ba5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8c8f1d1301b..b1dc05e1450 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4082974cfb3..fe20366ac8f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0ca965d5d05..774df712ac1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5e344125481..9d8a527a09f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 93a9ffdb26f..01f597d15ef 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 28fa7e0135d..6af4cccf9f0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5fc57189fa9..b3c97d3df71 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6e01481339a..049849792ec 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a3ace580ab5..70e3cc5b5cb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8db7cce8980..08c398dd6d4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 14f332345c4..665d2035a44 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d4290e3b2f9..52434ed1ba3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 904e48a2200..195d84dd2d8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 24606cb4746..29503a92aa5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 82347532c4c..ecdff2db295 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5fd617c1fd7..acc84da5999 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 abfd99b1b58..538efa6106c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 de0cddd0089..d3b33637b89 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c4744db8bbb..4c5f623f142 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a2ea65d5e1d..646c739a70f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f31c5310c04..8b92cfe200d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Callback.php b/vendor/zendframework/zendframework/library/Zend/Validator/Callback.php
index 30c1b7cd898..e4b389de763 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8dd34617567..e54a17c2e4f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Csrf.php b/vendor/zendframework/zendframework/library/Zend/Validator/Csrf.php
index 50b51b853df..66f41572717 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Date.php b/vendor/zendframework/zendframework/library/Zend/Validator/Date.php
index 83a2a597ab4..b5f37e9e0a8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DateStep.php b/vendor/zendframework/zendframework/library/Zend/Validator/DateStep.php
index a85a58756c0..804b4db7bc2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,7 +14,6 @@ use DateTime;
use DateTimeZone;
use Traversable;
use Zend\Stdlib\ArrayUtils;
-use Zend\Validator\Exception;
class DateStep extends Date
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Db/AbstractDb.php b/vendor/zendframework/zendframework/library/Zend/Validator/Db/AbstractDb.php
index aeab82a98ce..6270fc6ab00 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Validator\Db;
use Traversable;
use Zend\Db\Adapter\Adapter as DbAdapter;
-use Zend\Db\Adapter\Driver\DriverInterface as DbDriverInterface;
use Zend\Db\Sql\Select;
use Zend\Db\Sql\Sql;
use Zend\Db\Sql\TableIdentifier;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Db/NoRecordExists.php b/vendor/zendframework/zendframework/library/Zend/Validator/Db/NoRecordExists.php
index 6fc7cd07a0d..8a5dd727fb5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 825804856bf..dfae6b2d167 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 602b1c489ec..a4afe833fce 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 40255e9bb73..5fa52bc02db 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/BadMethodCallException.php
index 790b9775599..0e36e037e07 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/BadMethodCallException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExceptionInterface.php
index 76d354cf9f6..0bc6317b790 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExtensionNotLoadedException.php
index eb64face845..f9c2bd8bd41 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/ExtensionNotLoadedException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidArgumentException.php
index 30dca0dde49..7610dc390a8 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidArgumentException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidMagicMimeFileException.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
index 31b63a24528..b395ddd3408 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/InvalidMagicMimeFileException.php
@@ -3,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-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/Validator/Exception/RuntimeException.php
index 7261efe92c2..de98b3d0b52 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Exception/RuntimeException.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Explode.php b/vendor/zendframework/zendframework/library/Zend/Validator/Explode.php
index ffa691a8d78..8c0ba0efcf7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Count.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Count.php
index 4cb5202636d..1672bad19e0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Crc32.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Crc32.php
index 32199d38cdf..737521c22e0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -104,7 +104,7 @@ class Crc32 extends Hash
$this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(self::NOT_FOUND);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeExtension.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeExtension.php
index d7442921595..0d24b1857ec 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -59,7 +59,7 @@ class ExcludeExtension extends Extension
$this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(self::NOT_FOUND);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeMimeType.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/ExcludeMimeType.php
index 176d9488036..dedcee9fccc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -54,7 +54,7 @@ class ExcludeMimeType extends MimeType
$this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(self::NOT_READABLE);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Exists.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Exists.php
index e9bea8c9d43..c868aefc93f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6854762c310..2ceeebc736b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -195,7 +195,7 @@ class Extension extends AbstractValidator
$this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(self::NOT_FOUND);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/FilesSize.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/FilesSize.php
index 30862fe88cd..f2d2afd0db7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -96,7 +96,7 @@ class FilesSize extends Size
$size = $this->getSize();
foreach ($value as $files) {
// Is file readable ?
- if (false === stream_resolve_include_path($files)) {
+ if (empty($files) || false === stream_resolve_include_path($files)) {
$this->throwError($file, self::NOT_READABLE);
continue;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Hash.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Hash.php
index fff47a92c87..b77b1e19f43 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -148,7 +148,7 @@ class Hash extends AbstractValidator
$this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(self::NOT_FOUND);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/ImageSize.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/ImageSize.php
index ad92e627caa..c7714f8dad6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -343,7 +343,7 @@ class ImageSize extends AbstractValidator
$this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(self::NOT_READABLE);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/IsCompressed.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/IsCompressed.php
index 624b919233f..ccb2ae47440 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/IsImage.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/IsImage.php
index 0f0e02a6260..71be7f33767 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Md5.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Md5.php
index 028a5cf9eab..5d9fc34b44a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -104,7 +104,7 @@ class Md5 extends Hash
$this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(self::NOT_FOUND);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/MimeType.php
index 28a5a3471ee..53fb948dd43 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -368,7 +368,7 @@ class MimeType extends AbstractValidator
$this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(static::NOT_READABLE);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/NotExists.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/NotExists.php
index df13531d8d2..17aa7da749e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9f29615640b..98413945000 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -104,7 +104,7 @@ class Sha1 extends Hash
$this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(self::NOT_FOUND);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Size.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Size.php
index 4cf9e20fa2f..38022dd823f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -253,7 +253,7 @@ class Size extends AbstractValidator
$this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(self::NOT_FOUND);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/Upload.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/Upload.php
index 24bc743dd37..748b482ee5d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/UploadFile.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/UploadFile.php
index 39f17db1747..90f4d75df02 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -72,7 +72,7 @@ class UploadFile extends AbstractValidator
}
$this->setValue($filename);
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(self::FILE_NOT_FOUND);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/File/WordCount.php b/vendor/zendframework/zendframework/library/Zend/Validator/File/WordCount.php
index b40aceeb490..23be65bd764 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -191,7 +191,7 @@ class WordCount extends AbstractValidator
$this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($file)) {
+ if (empty($file) || false === stream_resolve_include_path($file)) {
$this->error(self::NOT_FOUND);
return false;
}
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/GreaterThan.php b/vendor/zendframework/zendframework/library/Zend/Validator/GreaterThan.php
index 2684d48c3bc..6a06ae8d250 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 32311db16b0..e7b591c8b87 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0ad73721827..1536541f4a6 100644
--- a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname.php
+++ b/vendor/zendframework/zendframework/library/Zend/Validator/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -74,25 +74,41 @@ class Hostname extends AbstractValidator
* @var array
*/
protected $validTlds = array(
- 'ac', 'ad', 'ae', 'aero', 'af', 'ag', 'ai', 'al', 'am', 'an', 'ao', 'aq', 'ar', 'arpa',
- 'as', 'asia', 'at', 'au', 'aw', 'ax', 'az', 'ba', 'bb', 'bd', 'be', 'bf', 'bg', 'bh', 'bi',
- 'biz', 'bj', 'bm', 'bn', 'bo', 'br', 'bs', 'bt', 'bv', 'bw', 'by', 'bz', 'ca', 'cat', 'cc',
- 'cd', 'cf', 'cg', 'ch', 'ci', 'ck', 'cl', 'cm', 'cn', 'co', 'com', 'coop', 'cr', 'cu',
- 'cv', 'cx', 'cy', 'cz', 'de', 'dj', 'dk', 'dm', 'do', 'dz', 'ec', 'edu', 'ee', 'eg', 'er',
- 'es', 'et', 'eu', 'fi', 'fj', 'fk', 'fm', 'fo', 'fr', 'ga', 'gb', 'gd', 'ge', 'gf', 'gg',
- 'gh', 'gi', 'gl', 'gm', 'gn', 'gov', 'gp', 'gq', 'gr', 'gs', 'gt', 'gu', 'gw', 'gy', 'hk',
- 'hm', 'hn', 'hr', 'ht', 'hu', 'id', 'ie', 'il', 'im', 'in', 'info', 'int', 'io', 'iq',
- 'ir', 'is', 'it', 'je', 'jm', 'jo', 'jobs', 'jp', 'ke', 'kg', 'kh', 'ki', 'km', 'kn', 'kp',
- 'kr', 'kw', 'ky', 'kz', 'la', 'lb', 'lc', 'li', 'lk', 'lr', 'ls', 'lt', 'lu', 'lv', 'ly',
- 'ma', 'mc', 'md', 'me', 'mg', 'mh', 'mil', 'mk', 'ml', 'mm', 'mn', 'mo', 'mobi', 'mp',
- 'mq', 'mr', 'ms', 'mt', 'mu', 'museum', 'mv', 'mw', 'mx', 'my', 'mz', 'na', 'name', 'nc',
- 'ne', 'net', 'nf', 'ng', 'ni', 'nl', 'no', 'np', 'nr', 'nu', 'nz', 'om', 'org', 'pa', 'pe',
- 'pf', 'pg', 'ph', 'pk', 'pl', 'pm', 'pn', 'pr', 'pro', 'ps', 'pt', 'pw', 'py', 'qa', 're',
- 'ro', 'rs', 'ru', 'rw', 'sa', 'sb', 'sc', 'sd', 'se', 'sg', 'sh', 'si', 'sj', 'sk', 'sl',
- 'sm', 'sn', 'so', 'sr', 'st', 'su', 'sv', 'sy', 'sz', 'tc', 'td', 'tel', 'tf', 'tg', 'th',
- 'tj', 'tk', 'tl', 'tm', 'tn', 'to', 'tp', 'tr', 'travel', 'tt', 'tv', 'tw', 'tz', 'ua',
- 'ug', 'uk', 'um', 'us', 'uy', 'uz', 'va', 'vc', 've', 'vg', 'vi', 'vn', 'vu', 'wf', 'ws',
- 'xxx', 'ye', 'yt', 'yu', 'za', 'zm', 'zw'
+ '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'
);
/**
@@ -115,6 +131,7 @@ class Hostname extends AbstractValidator
* (.FI) Finland http://www.ficora.fi/en/index/palvelut/fiverkkotunnukset/aakkostenkaytto.html
* (.GR) Greece https://grweb.ics.forth.gr/CharacterTable1_en.jsp
* (.HU) Hungary http://www.domain.hu/domain/English/szabalyzat/szabalyzat.html
+ * (.IL) Israel http://www.isoc.org.il/domains/il-domain-rules.html
* (.INFO) International http://www.nic.info/info/idn
* (.IO) British Indian Ocean Territory http://www.nic.io/IO-IDN-Policy.pdf
* (.IR) Iran http://www.nic.ir/Allowable_Characters_dot-iran
@@ -172,6 +189,8 @@ class Hostname extends AbstractValidator
'GR' => array(1 => '/^[\x{002d}0-9a-zΆΈΉΊΌΎ-ΡΣ-ÏŽá¼€-ἕἘ-á¼á¼ -ὅὈ-á½á½-ὗὙὛá½á½Ÿ-ώᾀ-ᾴᾶ-ᾼῂῃῄῆ-á¿Œá¿-á¿“á¿–-Ίῠ-Ῥῲῳῴῶ-ῼ]{1,63}$/iu'),
'HK' => 'Hostname/Cn.php',
'HU' => array(1 => '/^[\x{002d}0-9a-záéÃóöúüőű]{1,63}$/iu'),
+ 'IL' => array(1 => '/^[\x{002d}0-9\x{05D0}-\x{05EA}]{1,63}$/iu',
+ 2 => '/^[\x{002d}0-9a-z]{1,63}$/i'),
'INFO'=> array(1 => '/^[\x{002d}0-9a-zäåæéöøü]{1,63}$/iu',
2 => '/^[\x{002d}0-9a-záéÃóöúüőű]{1,63}$/iu',
3 => '/^[\x{002d}0-9a-záæéÃðóöúýþ]{1,63}$/iu',
@@ -251,6 +270,10 @@ class Hostname extends AbstractValidator
'UA' => array(1 => '/^[\x{002d}0-9a-zабвгдежзийклмнопрÑтуфхцчшщъыьÑÑŽÑÑёђѓєѕіїјљњћќÑўџґӂʼ]{1,63}$/iu'),
'VE' => array(1 => '/^[\x{002d}0-9a-záéÃóúüñ]{1,63}$/iu'),
'VN' => array(1 => '/^[ÀÃÂÃÈÉÊÌÃÒÓÔÕÙÚÃà áâãèéêìÃòóôõùúýĂăÄÄ‘Ä¨Ä©Å¨Å©Æ Æ¡Æ¯Æ°\x{1EA0}-\x{1EF9}]{1,63}$/iu'),
+ 'мон' => array(1 => '/^[\x{002d}0-9\x{0430}-\x{044F}]{1,63}$/iu'),
+ 'Ñрб' => array(1 => '/^[\x{002d}0-9а-ик-шђјљњћџ]{1,63}$/iu'),
+ 'Ñайт' => array(1 => '/^[\x{002d}0-9а-ÑÑ‘Ñ–Ñ—Ñйўґг]{1,63}$/iu'),
+ 'онлайн' => array(1 => '/^[\x{002d}0-9а-ÑÑ‘Ñ–Ñ—Ñйўґг]{1,63}$/iu'),
'ä¸å›½' => 'Hostname/Cn.php',
'ä¸åœ‹' => 'Hostname/Cn.php',
'ලංකà·' => array(1 => '/^[\x{0d80}-\x{0dff}]{1,63}$/iu'),
@@ -266,6 +289,7 @@ class Hostname extends AbstractValidator
'مصر' => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
'இலஙà¯à®•à¯ˆ' => array(1 => '/^[\x{0b80}-\x{0bff}]{1,63}$/iu'),
'Ùلسطين' => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
+ 'شبكة' => array(1 => '/^[\x{0621}-\x{0624}\x{0626}-\x{063A}\x{0641}\x{0642}\x{0644}-\x{0648}\x{067E}\x{0686}\x{0698}\x{06A9}\x{06AF}\x{06CC}\x{06F0}-\x{06F9}]{1,30}$/iu'),
);
protected $idnLength = array(
@@ -284,6 +308,7 @@ class Hostname extends AbstractValidator
'تونس' => array(1 => 30),
'مصر' => array(1 => 30),
'Ùلسطين' => array(1 => 30),
+ 'شبكة' => array(1 => 30),
'ä¸å›½' => array(1 => 20),
'ä¸åœ‹' => array(1 => 20),
'香港' => array(1 => 20),
@@ -352,6 +377,7 @@ class Hostname extends AbstractValidator
}
/**
+ *
* @param Ip $ipValidator OPTIONAL
* @return Hostname;
*/
@@ -452,8 +478,9 @@ 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;
@@ -477,21 +504,26 @@ 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) && (strlen($value) >= 4) && (strlen($value) <= 254)) {
- $utf8StrWrapper = StringUtils::getWrapper('UTF-8');
- $status = false;
+ 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})$/i', end($domainParts), $matches) ||
- (array_key_exists(end($domainParts), $this->validIdns))) {
+ if (preg_match('/([^.]{2,10})$/iu', end($domainParts), $matches)
+ || (array_key_exists(end($domainParts), $this->validIdns))) {
reset($domainParts);
// Hostname characters are: *(label dot)(label dot label); max 254 chars
@@ -500,26 +532,31 @@ class Hostname extends AbstractValidator
// ldh: alpha / digit / dash
// Match TLD against known list
- $this->tld = strtolower($matches[1]);
+ $this->tld = strtoupper($matches[1]);
if ($this->getTldCheck()) {
- if (!in_array($this->tld, $this->validTlds)) {
+ if (!in_array(strtolower($this->tld), $this->validTlds)
+ && !in_array($this->tld, $this->validTlds)) {
$this->error(self::UNKNOWN_TLD);
$status = false;
break;
}
+ // We have already validated that the TLD is fine. We don't want it to go through the below
+ // checks as new UTF-8 TLDs will incorrectly fail if there is no IDN regex for it.
+ array_pop($domainParts);
}
/**
* Match against IDN hostnames
* Note: Keep label regex short to avoid issues with long patterns when matching IDN hostnames
+ *
* @see Hostname\Interface
*/
$regexChars = array(0 => '/^[a-z0-9\x2d]{1,63}$/i');
- if ($this->getIdnCheck() && isset($this->validIdns[strtoupper($this->tld)])) {
- if (is_string($this->validIdns[strtoupper($this->tld)])) {
- $regexChars += include __DIR__ .'/'. $this->validIdns[strtoupper($this->tld)];
+ if ($this->getIdnCheck() && isset($this->validIdns[$this->tld])) {
+ if (is_string($this->validIdns[$this->tld])) {
+ $regexChars += include __DIR__ . '/' . $this->validIdns[$this->tld];
} else {
- $regexChars += $this->validIdns[strtoupper($this->tld)];
+ $regexChars += $this->validIdns[$this->tld];
}
}
@@ -535,9 +572,9 @@ class Hostname extends AbstractValidator
}
// Check dash (-) does not start, end or appear in 3rd and 4th positions
- if ((strpos($domainPart, '-') === 0)
- || ((strlen($domainPart) > 2) && (strpos($domainPart, '-', 2) == 2) && (strpos($domainPart, '-', 3) == 3))
- || (strpos($domainPart, '-') === (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;
@@ -551,13 +588,14 @@ class Hostname extends AbstractValidator
ErrorHandler::stop();
if ($status > 0) {
$length = 63;
- if (array_key_exists(strtoupper($this->tld), $this->idnLength)
- && (array_key_exists($regexKey, $this->idnLength[strtoupper($this->tld)]))) {
- $length = $this->idnLength[strtoupper($this->tld)];
+ if (array_key_exists($this->tld, $this->idnLength)
+ && (array_key_exists($regexKey, $this->idnLength[$this->tld]))) {
+ $length = $this->idnLength[$this->tld];
}
if ($utf8StrWrapper->strlen($domainPart) > $length) {
$this->error(self::INVALID_HOSTNAME);
+ $status = false;
} else {
$checked = true;
break;
@@ -589,6 +627,7 @@ class Hostname extends AbstractValidator
}
} elseif ($this->getAllow() & self::ALLOW_DNS) {
$this->error(self::INVALID_HOSTNAME);
+ $status = false;
}
// Check for URI Syntax (RFC3986)
@@ -628,10 +667,10 @@ class Hostname extends AbstractValidator
/**
* Decodes a punycode encoded string to it's original utf8 string
- * In case of a decoding failure the original string is returned
+ * Returns false in case of a decoding failure.
*
* @param string $encoded Punycode encoded string to decode
- * @return string
+ * @return string|false
*/
protected function decodePunycode($encoded)
{
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Biz.php b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Biz.php
index b28440c0f33..cadf8e3f7b0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3263af09af8..2a6418555f7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8d5c9f311d2..a86e806c9ba 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Jp.php b/vendor/zendframework/zendframework/library/Zend/Validator/Hostname/Jp.php
index 08a19655e6b..f1cf75fb05a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 58f7ae29174..6a96f74c0d4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Validator;
use Traversable;
use Zend\Stdlib\ArrayUtils;
-use Zend\Validator\AbstractValidator;
-use Zend\Validator\Exception;
/**
* Validates IBAN Numbers (International Bank Account Numbers)
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Identical.php b/vendor/zendframework/zendframework/library/Zend/Validator/Identical.php
index a43d375246a..25927163be0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d4392e00191..6c34210e691 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -173,7 +173,7 @@ class InArray extends AbstractValidator
// we type cast the input to a string
if (self::COMPARE_NOT_STRICT_AND_PREVENT_STR_TO_INT_VULNERABILITY == $this->strict
&& (is_int($value) || is_float($value))) {
- $value =(string) $value;
+ $value = (string) $value;
}
$this->setValue($value);
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Ip.php b/vendor/zendframework/zendframework/library/Zend/Validator/Ip.php
index 88f3ae1c6c0..10ecf5f92e0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/IsInstanceOf.php b/vendor/zendframework/zendframework/library/Zend/Validator/IsInstanceOf.php
index e823efd1f4a..89219e50c41 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\Validator;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Isbn.php b/vendor/zendframework/zendframework/library/Zend/Validator/Isbn.php
index f1ef0dc7833..966153754a7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 7aaef5b1942..7925fd8e1bf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 99da975c8a1..07c9b4a3299 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -14,19 +14,19 @@ use Zend\Stdlib\ArrayUtils;
class NotEmpty extends AbstractValidator
{
- const BOOLEAN = 1;
- const INTEGER = 2;
- const FLOAT = 4;
- const STRING = 8;
- const ZERO = 16;
- const EMPTY_ARRAY = 32;
- const NULL = 64;
- const PHP = 127;
- const SPACE = 128;
- const OBJECT = 256;
- const OBJECT_STRING = 512;
- const OBJECT_COUNT = 1024;
- const ALL = 2047;
+ const BOOLEAN = 0x001;
+ const INTEGER = 0x002;
+ const FLOAT = 0x004;
+ const STRING = 0x008;
+ const ZERO = 0x010;
+ const EMPTY_ARRAY = 0x020;
+ const NULL = 0x040;
+ const PHP = 0x07F;
+ const SPACE = 0x080;
+ const OBJECT = 0x100;
+ const OBJECT_STRING = 0x200;
+ const OBJECT_COUNT = 0x400;
+ const ALL = 0x7FF;
const INVALID = 'notEmptyInvalid';
const IS_EMPTY = 'isEmpty';
@@ -128,9 +128,9 @@ class NotEmpty extends AbstractValidator
$detected = 0;
foreach ($type as $value) {
if (is_int($value)) {
- $detected += $value;
+ $detected |= $value;
} elseif (in_array($value, $this->constants)) {
- $detected += array_search($value, $this->constants);
+ $detected |= array_search($value, $this->constants);
}
}
@@ -167,8 +167,7 @@ class NotEmpty extends AbstractValidator
$object = false;
// OBJECT_COUNT (countable object)
- if ($type >= self::OBJECT_COUNT) {
- $type -= self::OBJECT_COUNT;
+ if ($type & self::OBJECT_COUNT) {
$object = true;
if (is_object($value) && ($value instanceof \Countable) && (count($value) == 0)) {
@@ -178,8 +177,7 @@ class NotEmpty extends AbstractValidator
}
// OBJECT_STRING (object's toString)
- if ($type >= self::OBJECT_STRING) {
- $type -= self::OBJECT_STRING;
+ if ($type & self::OBJECT_STRING) {
$object = true;
if ((is_object($value) && (!method_exists($value, '__toString'))) ||
@@ -190,8 +188,7 @@ class NotEmpty extends AbstractValidator
}
// OBJECT (object)
- if ($type >= self::OBJECT) {
- $type -= self::OBJECT;
+ if ($type & self::OBJECT) {
// fall trough, objects are always not empty
} elseif ($object === false) {
// object not allowed but object given -> return false
@@ -202,8 +199,7 @@ class NotEmpty extends AbstractValidator
}
// SPACE (' ')
- if ($type >= self::SPACE) {
- $type -= self::SPACE;
+ if ($type & self::SPACE) {
if (is_string($value) && (preg_match('/^\s+$/s', $value))) {
$this->error(self::IS_EMPTY);
return false;
@@ -211,8 +207,7 @@ class NotEmpty extends AbstractValidator
}
// NULL (null)
- if ($type >= self::NULL) {
- $type -= self::NULL;
+ if ($type & self::NULL) {
if ($value === null) {
$this->error(self::IS_EMPTY);
return false;
@@ -220,8 +215,7 @@ class NotEmpty extends AbstractValidator
}
// EMPTY_ARRAY (array())
- if ($type >= self::EMPTY_ARRAY) {
- $type -= self::EMPTY_ARRAY;
+ if ($type & self::EMPTY_ARRAY) {
if (is_array($value) && ($value == array())) {
$this->error(self::IS_EMPTY);
return false;
@@ -229,8 +223,7 @@ class NotEmpty extends AbstractValidator
}
// ZERO ('0')
- if ($type >= self::ZERO) {
- $type -= self::ZERO;
+ if ($type & self::ZERO) {
if (is_string($value) && ($value == '0')) {
$this->error(self::IS_EMPTY);
return false;
@@ -238,8 +231,7 @@ class NotEmpty extends AbstractValidator
}
// STRING ('')
- if ($type >= self::STRING) {
- $type -= self::STRING;
+ if ($type & self::STRING) {
if (is_string($value) && ($value == '')) {
$this->error(self::IS_EMPTY);
return false;
@@ -247,8 +239,7 @@ class NotEmpty extends AbstractValidator
}
// FLOAT (0.0)
- if ($type >= self::FLOAT) {
- $type -= self::FLOAT;
+ if ($type & self::FLOAT) {
if (is_float($value) && ($value == 0.0)) {
$this->error(self::IS_EMPTY);
return false;
@@ -256,8 +247,7 @@ class NotEmpty extends AbstractValidator
}
// INTEGER (0)
- if ($type >= self::INTEGER) {
- $type -= self::INTEGER;
+ if ($type & self::INTEGER) {
if (is_int($value) && ($value == 0)) {
$this->error(self::IS_EMPTY);
return false;
@@ -265,8 +255,7 @@ class NotEmpty extends AbstractValidator
}
// BOOLEAN (false)
- if ($type >= self::BOOLEAN) {
- $type -= self::BOOLEAN;
+ if ($type & self::BOOLEAN) {
if (is_bool($value) && ($value == false)) {
$this->error(self::IS_EMPTY);
return false;
diff --git a/vendor/zendframework/zendframework/library/Zend/Validator/Regex.php b/vendor/zendframework/zendframework/library/Zend/Validator/Regex.php
index 9a0e9f07e6d..af14aac65ec 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Changefreq.php b/vendor/zendframework/zendframework/library/Zend/Validator/Sitemap/Changefreq.php
index 66ad90a9b89..a959b023d31 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 379824515f5..ace679fdc25 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 ace2d66b5f6..481b286e99c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4c7d0f99289..d5313f37467 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 49aac37858a..84eca563539 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0e699e7423a..8b82bfd4551 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 64cf646d9a4..53a162c6c1b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/TranslatorAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/Translator/TranslatorAwareInterface.php
index 7089da2d92f..a9fb45d3b5e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 e800b29504a..01981d378fa 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4e9c0f70cbc..6bd3e7c92cb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d3aa1980644..f52adf14e38 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ValidatorInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorInterface.php
index d234a1e664e..d48aa15863f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8e4aee85884..bf328ae0613 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ValidatorPluginManagerAwareInterface.php b/vendor/zendframework/zendframework/library/Zend/Validator/ValidatorPluginManagerAwareInterface.php
index ffce9f85b97..4d9c8d09703 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
diff --git a/vendor/zendframework/zendframework/library/Zend/Version/Version.php b/vendor/zendframework/zendframework/library/Zend/Version/Version.php
index 5325fb1158b..1df3d85ea6c 100644
--- a/vendor/zendframework/zendframework/library/Zend/Version/Version.php
+++ b/vendor/zendframework/zendframework/library/Zend/Version/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -19,15 +19,15 @@ final class Version
/**
* Zend Framework version identification - see compareVersion()
*/
- const VERSION = '2.2.5';
+ const VERSION = '2.2.6';
/**
- * Github Service Identifier for version information is retreived from
+ * Github Service Identifier for version information is retrieved from
*/
const VERSION_SERVICE_GITHUB = 'GITHUB';
/**
- * Zend (framework.zend.com) Service Identifier for version information is retreived from
+ * Zend (framework.zend.com) Service Identifier for version information is retrieved from
*/
const VERSION_SERVICE_ZEND = 'ZEND';
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Exception/BadMethodCallException.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/BadMethodCallException.php
index af309aaad1a..241fa9cf050 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/DomainException.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/DomainException.php
index e52fc73968e..d6e0a2dbfc0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/ExceptionInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/ExceptionInterface.php
index 753e6a0220e..478a8834f75 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Exception/ExceptionInterface.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidArgumentException.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/InvalidArgumentException.php
index 8acb643936a..c926f3d78a4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/InvalidHelperException.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/InvalidHelperException.php
index 7926eac9cf3..94f6f0740fc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Exception/RuntimeException.php b/vendor/zendframework/zendframework/library/Zend/View/Exception/RuntimeException.php
index fc50ac03477..5abd7fc8be6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractHelper.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHelper.php
index 6dce9330cb5..18ea1a9701e 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHelper.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHelper.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-use Zend\View\Helper\HelperInterface;
use Zend\View\Renderer\RendererInterface as Renderer;
abstract class AbstractHelper implements HelperInterface
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/AbstractHtmlElement.php
index 1df5a60113a..3be8cab745e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b2fd3d6c7e7..ddca8c71a75 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c3b750ebccc..01dc7c9424f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DeclareVars.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/DeclareVars.php
index c3194851511..229b86e62b6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Doctype.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Doctype.php
index cb052ea8e2c..f270756b90e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c3396a4c241..0d3b0ecb609 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-use Zend\View\Helper\Escaper;
/**
* 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 3e16cf21d01..f9ff85f8f09 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-use Zend\View\Helper\Escaper;
/**
* 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 d94883f32a8..7b39c7bd5fb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-use Zend\View\Helper\Escaper;
/**
* 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 590e457bcb2..27d93bb64bf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-use Zend\View\Helper\Escaper;
/**
* 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 90e845e7d56..bca30e9184c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-use Zend\View\Helper\Escaper;
/**
* 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 2fbdfa51f4f..373e7ea9b94 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FlashMessenger.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/FlashMessenger.php
index 4af4c33a981..0a4010e6be1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Helper;
use Zend\Mvc\Controller\Plugin\FlashMessenger as PluginFlashMessenger;
use Zend\ServiceManager\ServiceLocatorAwareInterface;
use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\View\Helper\AbstractHelper;
-use Zend\View\Helper\EscapeHtml;
use Zend\I18n\View\Helper\AbstractTranslatorHelper;
/**
@@ -104,6 +102,10 @@ class FlashMessenger extends AbstractTranslatorHelper implements ServiceLocatorA
$flashMessenger = $this->getPluginFlashMessenger();
$messages = $flashMessenger->getMessagesFromNamespace($namespace);
+ if (empty($messages)) {
+ return '';
+ }
+
// Prepare classes for opening tag
if (empty($classes)) {
if (isset($this->classMessages[$namespace])) {
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Gravatar.php
index 52bdb0477c0..48cfb2064f4 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HeadLink.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadLink.php
index 872cc669e5e..5871140d7d1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HeadMeta.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadMeta.php
index 4feecd79495..eae1c68b11a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HeadScript.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadScript.php
index f2bea24a3f3..60347e6c334 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HeadStyle.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadStyle.php
index fa81431e1d4..d52ff66ae3c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HeadTitle.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadTitle.php
index 900ae5e146d..0a349796f9e 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadTitle.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/HeadTitle.php
@@ -3,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-2014 Zend Technologies USA 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/HelperInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HelperInterface.php
index f2106dc15c1..b41031050a0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HtmlFlash.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlFlash.php
index 24bcb580f2e..7b0aafca30c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a1dc4ef51c6..29c79c73c13 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0652d837ff9..17c2822f35c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HtmlPage.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/HtmlPage.php
index f776260cc39..ee170c1b0c1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f2a3fe79be6..629d6efa328 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b18015130df..4fe14537364 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 3096870582a..57dace7d6fe 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Json.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Json.php
index b555e80f257..8e42fa8cf22 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5b4dc47e352..65b630fb248 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 caf0f71e8b5..72f553b8316 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractHelper.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/AbstractHelper.php
index b8c4ee53625..a060a0e94e2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Breadcrumbs.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Breadcrumbs.php
index a52350ee90f..14cd1d92208 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/HelperInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/HelperInterface.php
index 06a47f7e77a..8b52c8c1dad 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a974586e260..0682f8eb787 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Listener/AclListener.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/Listener/AclListener.php
index 2b3e766c66b..5c8656084eb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 88806857c35..0e0256e642f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PluginManager.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Navigation/PluginManager.php
index 29ec332947f..8faf86eb3d8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f8243de2d8d..c20bc295129 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PaginationControl.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/PaginationControl.php
index b35cd6826a1..9963fdd35fe 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Partial.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Partial.php
index da745ed1884..444f161b98d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/PartialLoop.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php
index 7ea3b315ad5..88441fff294 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Helper/PartialLoop.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\View\Helper;
-use Iterator;
use Traversable;
use Zend\Stdlib\ArrayUtils;
use Zend\View\Exception;
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder.php
index b4dae054090..297c17a554f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/Placeholder/Container.php
index eff1a325160..35220176c87 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 24e76882719..86d5c6689b9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 5ab9ed67318..0e47599d104 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -169,7 +169,6 @@ abstract class AbstractStandalone extends AbstractHelper implements
if ($this->getView() instanceof RendererInterface
&& method_exists($this->getView(), 'getEncoding')
) {
- $enc = $this->getView()->getEncoding();
$escaper = $this->getView()->plugin('escapeHtml');
return $escaper((string) $string);
}
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 4725ba0821a..d8766ba45b9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RenderChildModel.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/RenderChildModel.php
index 62fab196a2f..d59edfe0557 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 048a9cb2c83..3707995b331 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4cc0e7216e7..ae846a9baf1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 b25d80c5483..fbaf53e8bc9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f7b1750a5b7..a065a1d9dfd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 86629a16187..3c3a3402d1b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -13,9 +13,7 @@ use Traversable;
use Zend\Mvc\ModuleRouteListener;
use Zend\Mvc\Router\RouteMatch;
use Zend\Mvc\Router\RouteStackInterface;
-use Zend\Stdlib\ArrayUtils;
use Zend\View\Exception;
-use Zend\Stdlib\Exception as StdlibException;
/**
* Helper for making easy links and getting urls that depend on the routes and router.
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Helper/ViewModel.php b/vendor/zendframework/zendframework/library/Zend/View/Helper/ViewModel.php
index f183df3967b..49b13064962 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 84053c2f32b..48980d8bc9b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ClearableModelInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Model/ClearableModelInterface.php
index a035500103c..2edfe719e95 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 20b057588a2..020554429b5 100644
--- a/vendor/zendframework/zendframework/library/Zend/View/Model/ConsoleModel.php
+++ b/vendor/zendframework/zendframework/library/Zend/View/Model/ConsoleModel.php
@@ -3,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-2014 Zend Technologies USA 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/FeedModel.php b/vendor/zendframework/zendframework/library/Zend/View/Model/FeedModel.php
index 4a1cdc3f336..fc8351cd049 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 667d1a244e2..191d3f5ec8c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 804fdbc3444..4d0a30e1788 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ViewModel.php b/vendor/zendframework/zendframework/library/Zend/View/Model/ViewModel.php
index 8d17894ae32..15dbf12c987 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/ConsoleRenderer.php b/vendor/zendframework/zendframework/library/Zend/View/Renderer/ConsoleRenderer.php
index 8b08ad6cbd2..1b177facedf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/FeedRenderer.php b/vendor/zendframework/zendframework/library/Zend/View/Renderer/FeedRenderer.php
index 3e488a952db..92faef4d563 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/JsonRenderer.php b/vendor/zendframework/zendframework/library/Zend/View/Renderer/JsonRenderer.php
index 60a1952040e..9666261db85 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2923589f87b..c5811862906 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/RendererInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Renderer/RendererInterface.php
index 79405b636bd..1b58036e238 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/TreeRendererInterface.php b/vendor/zendframework/zendframework/library/Zend/View/Renderer/TreeRendererInterface.php
index 3407a9fd756..ead6ffcb0cb 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2dc907ae22a..f918cbac149 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 37d9dd3e4ef..8ffe130c664 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6c649def1fd..61d9ab7a12d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 980c84b866d..359be18f34f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9072d4c76e7..c139858567d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\Strategy;
use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
use Zend\Feed\Writer\Feed;
-use Zend\Http\Request as HttpRequest;
use Zend\View\Model;
use Zend\View\Renderer\FeedRenderer;
use Zend\View\ViewEvent;
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Strategy/JsonStrategy.php b/vendor/zendframework/zendframework/library/Zend/View/Strategy/JsonStrategy.php
index 49d7860a5f1..7cf4b91f09a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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\View\Strategy;
use Zend\EventManager\AbstractListenerAggregate;
use Zend\EventManager\EventManagerInterface;
-use Zend\Http\Request as HttpRequest;
use Zend\View\Model;
use Zend\View\Renderer\JsonRenderer;
use Zend\View\ViewEvent;
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Strategy/PhpRendererStrategy.php b/vendor/zendframework/zendframework/library/Zend/View/Strategy/PhpRendererStrategy.php
index 2a8db5d2b7b..e8e04ceb3ac 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 915382b83bc..a7002dc9189 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -155,7 +155,7 @@ class Stream
switch ($whence) {
case SEEK_SET:
if ($offset < strlen($this->data) && $offset >= 0) {
- $this->pos = $offset;
+ $this->pos = $offset;
return true;
} else {
return false;
diff --git a/vendor/zendframework/zendframework/library/Zend/View/Variables.php b/vendor/zendframework/zendframework/library/Zend/View/Variables.php
index f917389ec70..6e153ba34bf 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/View.php b/vendor/zendframework/zendframework/library/Zend/View/View.php
index c2f4cb21dff..aebae58a096 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -182,7 +182,7 @@ class View implements EventManagerAwareInterface
}
$event->setRenderer($renderer);
- $results = $events->trigger(ViewEvent::EVENT_RENDERER_POST, $event);
+ $events->trigger(ViewEvent::EVENT_RENDERER_POST, $event);
// If EVENT_RENDERER or EVENT_RENDERER_POST changed the model, make sure
// we use this new model instead of the current $model
diff --git a/vendor/zendframework/zendframework/library/Zend/View/ViewEvent.php b/vendor/zendframework/zendframework/library/Zend/View/ViewEvent.php
index 2392f1d326f..34baa2136f9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractValue.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/AbstractValue.php
index e5e63a1e3ef..5c648b92268 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -445,6 +445,9 @@ abstract class AbstractValue
// If no type was specified, the default is string
if (!$type) {
$type = self::XMLRPC_TYPE_STRING;
+ if (empty($value) and preg_match('#^<value>.*</value>$#', $xml->asXML())) {
+ $value = str_replace(array('<value>', '</value>'), '', $xml->asXML());
+ }
}
}
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Client.php
index 77687fe023a..562354bee52 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 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;
use Zend\Http;
use Zend\Server\Client as ServerClient;
-use Zend\XmlRpc\AbstractValue;
/**
* An XML-RPC client implementation
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 bcf8b4a267e..03c09959c71 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c8cdf0c21e1..7f07e03f6f1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d7778be1e69..9078aab3917 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f8aa6090b33..29bdec9443d 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 4fffcdb22aa..f7b237e9c54 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 8bd793344eb..556feffd270 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 79faf834488..98fbac6af44 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 dc065daceb8..861b6159050 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 dbdee8d70ea..db36424ab9e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 f422b3d9313..2443d4fa563 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 af09df633de..cb2c3d26695 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 67194e953d4..1ece2b80f0c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 96c5f3fa541..af0a6e8b29b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 2480baa3c00..bb1880118e2 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Fault.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Fault.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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @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\XmlRpc;
use SimpleXMLElement;
+use ZendXml\Security as XmlSecurity;
/**
* XMLRPC Faults
@@ -180,10 +181,10 @@ class Fault
$xmlErrorsFlag = libxml_use_internal_errors(true);
try {
- $xml = new SimpleXMLElement($fault);
- } catch (\Exception $e) {
- // Not valid XML
- throw new Exception\InvalidArgumentException('Failed to parse XML fault: ' . $e->getMessage(), 500, $e);
+ $xml = XmlSecurity::scan($fault);
+ } catch (\ZendXml\Exception\RuntimeException $e) {
+ // Unsecure XML
+ throw new Exception\RuntimeException('Failed to parse XML fault: ' . $e->getMessage(), 500, $e);
}
if (!$xml instanceof SimpleXMLElement) {
$errors = libxml_get_errors();
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/AbstractGenerator.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/AbstractGenerator.php
index 3fb78c8292c..693f026c090 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0ef16dba1e2..3645e890406 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/GeneratorInterface.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Generator/GeneratorInterface.php
index eab37855788..ca2af243b25 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0196ef8a5c6..f406238cc93 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Request.php
index f1a1db8a004..82a7eedbe2c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c8425d3ef98..d42a8331dd3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 6d3ce934dc9..bcf748e95cd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 eccd4d3ebbf..f8537584e41 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response.php
@@ -3,12 +3,14 @@
* 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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
namespace Zend\XmlRpc;
+use ZendXml\Security as XmlSecurity;
+
/**
* XmlRpc Response
*
@@ -151,28 +153,9 @@ class Response
return false;
}
- // @see ZF-12293 - disable external entities for security purposes
- $loadEntities = libxml_disable_entity_loader(true);
- $useInternalXmlErrors = libxml_use_internal_errors(true);
try {
- $dom = new \DOMDocument;
- $dom->loadXML($response);
- foreach ($dom->childNodes as $child) {
- if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
- throw new Exception\ValueException(
- 'Invalid XML: Detected use of illegal DOCTYPE'
- );
- }
- }
- // TODO: Locate why this passes tests but a simplexml import doesn't
- //$xml = simplexml_import_dom($dom);
- $xml = new \SimpleXMLElement($response);
- libxml_disable_entity_loader($loadEntities);
- libxml_use_internal_errors($useInternalXmlErrors);
- } catch (\Exception $e) {
- libxml_disable_entity_loader($loadEntities);
- libxml_use_internal_errors($useInternalXmlErrors);
- // Not valid XML
+ $xml = XmlSecurity::scan($response);
+ } catch (\ZendXml\Exception\RuntimeException $e) {
$this->fault = new Fault(651);
$this->fault->setEncoding($this->getEncoding());
return false;
diff --git a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response/Http.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Response/Http.php
index 2fe3d4f7360..00ae07cc9c6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 9746184b86c..0fe37e173e8 100644
--- a/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server.php
+++ b/vendor/zendframework/zendframework/library/Zend/XmlRpc/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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Cache.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/Cache.php
index 9bf293de354..f4e643ea6d0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 499eb1c9a3d..d0828491ce3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 d90fcfccf81..f0f3fcdd2e8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 91159c358b8..059cab0f0dc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 a82f5232cef..285a40231e8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0518ec00c91..7705e80e28e 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/System.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Server/System.php
index 6675b7e1d5d..5b090e8dd25 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractCollection.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractCollection.php
index a6fba7fc760..cbea6c3f2c1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/AbstractScalar.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/AbstractScalar.php
index e28df2a56cf..3e7b8eacb80 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 09e24d21358..99d77437b38 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 03dfd6bf4e1..83c7a60ec5f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/BigInteger.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/BigInteger.php
index 3ec15ff1916..e85ef953712 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 c7ab613a74c..459669b3096 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/DateTime.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/DateTime.php
index 4a0e4bb471a..9ec7253e6d3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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 0687d433102..f5c2a478c38 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Integer.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Integer.php
index 38189f4a4af..15c24d00276 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Nil.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Nil.php
index cfaf7a0825f..5643a8ce1cc 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/String.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/String.php
index 3a72683f0aa..77723ede118 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA 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/Struct.php b/vendor/zendframework/zendframework/library/Zend/XmlRpc/Value/Struct.php
index 45d080e39ad..98ffeb54afe 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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_Captcha.php b/vendor/zendframework/zendframework/resources/languages/ar/Zend_Captcha.php
index 89b8aae06dd..4d81f7c7bf3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 f44ea49ca38..9fb8128c36a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 6df39100ac5..bbcf0af0d35 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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_Validate.php b/vendor/zendframework/zendframework/resources/languages/bg/Zend_Validate.php
index 6e735146299..dbe2b727a8b 100644
--- a/vendor/zendframework/zendframework/resources/languages/bg/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/bg/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-2014 Zend 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_Captcha.php b/vendor/zendframework/zendframework/resources/languages/ca/Zend_Captcha.php
index eadea10b9c4..21dd0a99c03 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 ee8ecf16979..123228aec4b 100644
--- a/vendor/zendframework/zendframework/resources/languages/ca/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/ca/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-2014 Zend 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_Captcha.php b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Captcha.php
index 7dbed9b1e2e..9065f445fe6 100644
--- a/vendor/zendframework/zendframework/resources/languages/cs/Zend_Captcha.php
+++ b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Captcha.php
@@ -3,21 +3,21 @@
* 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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/**
- * CS-Revision: 28.Mar.2013
+ * CS-Revision: 4.Nov.2013
*/
return array(
- // Zend_Captcha_AbstractWord
- "Empty captcha value" => "Hodnota captcha nebyla zadána",
- "Captcha ID field is missing" => "Chybà pole captcha ID",
- "Captcha value is wrong" => "Chybná hodnota captcha",
-
- // Zend_Captcha_ReCaptcha
- "Missing captcha fields" => "Chybà captcha pole",
+ // Zend\Captcha\ReCaptcha
+ "Missing captcha fields" => "Chybà pole captcha",
"Failed to validate captcha" => "Captchu se nepodařilo ověřit",
"Captcha value is wrong: %value%" => "Hodnota captchy nenà správná: %value%",
+
+ // Zend\Captcha\Word
+ "Empty captcha value" => "Hodnota captcha nebyla zadána",
+ "Captcha ID field is missing" => "Chybà pole captcha ID",
+ "Captcha value is wrong" => "Hodnota captchy nenà správná",
);
diff --git a/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php
index fedaa39f423..1085cac679c 100644
--- a/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/cs/Zend_Validate.php
@@ -3,81 +3,90 @@
* 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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/**
- * CS-Revision: 28.Mar.2013
+ * CS-Revision: 4.Nov.2013
*/
return array(
- // Zend_I18n_Validator_Alnum
+ // Zend\I18n\Validator\Alnum
"Invalid type given. String, integer or float expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec, celé nebo desetinné ÄÃslo",
"The input contains characters which are non alphabetic and no digits" => "Hodnota obsahuje i jiné znaky než pÃsmena a ÄÃslice",
"The input is an empty string" => "Hodnota je prázdný řetězec",
- // Zend_I18n_Validator_Alpha
+ // Zend\I18n\Validator\Alpha
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
"The input contains non alphabetic characters" => "Hodnota obsahuje i jiné znaky než pÃsmena",
"The input is an empty string" => "Hodnota je prázdný řetězec",
- // Zend_I18n_Validator_Float
+ // Zend\I18n\Validator\DateTime
+ "Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
+ "The input does not appear to be a valid datetime" => "Hodnota nevypadá jako platný datum a Äas",
+
+ // Zend\I18n\Validator\Float
"Invalid type given. String, integer or float expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec, celé nebo desetinné ÄÃslo",
"The input does not appear to be a float" => "Hodnota nevypadá jako desetinné ÄÃslo",
- // Zend_I18n_Validator_Int
+ // Zend\I18n\Validator\Int
"Invalid type given. String or integer expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec nebo celé ÄÃslo",
"The input does not appear to be an integer" => "Hodnota nevypadá jako celé ÄÃslo",
- // Zend_I18n_Validator_PostCode
+ // Zend\I18n\Validator\PhoneNumber
+ "The input does not match a phone number format" => "Hodnota neodpovÃdá formátu telefonnÃho ÄÃsla",
+ "The country provided is currently unsupported" => "ZemÄ› je v souÄasné dobÄ› nepodporována",
+ "Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
+
+ // Zend\I18n\Validator\PostCode
"Invalid type given. String or integer expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec nebo celé ÄÃslo",
"The input does not appear to be a postal code" => "Hodnota nevypadá jako PSČ",
"An exception has been raised while validating the input" => "Během kontroly hodnoty byla vyvolána výjimka",
- // Zend_Validator_Barcode
+ // Zend\Validator\Barcode
"The input failed checksum validation" => "Hodnota má chybný kontrolnà souÄet",
"The input contains invalid characters" => "Hodnota obsahuje neplatné znaky",
"The input should have a length of %length% characters" => "Hodnota by mÄ›la mÃt délku %length% znaků",
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
- // Zend_Validator_Between
+ // Zend\Validator\Between
"The input is not between '%min%' and '%max%', inclusively" => "Hodnota nenà mezi '%min%' a '%max%', vÄetnÄ›",
"The input is not strictly between '%min%' and '%max%'" => "Hodnota nenà přesně mezi '%min%' a '%max%'",
- // Zend_Validator_Callback
+ // Zend\Validator\Callback
"The input is not valid" => "Hodnota nenà platná",
"An exception has been raised within the callback" => "Během volánà byla vyvolána výjimka",
- // Zend_Validator_CreditCard
+ // Zend\Validator\CreditCard
"The input seems to contain an invalid checksum" => "Hodnota obsahuje neplatný kontrolnà souÄet",
"The input must contain only digits" => "Hodnota musà obsahovat pouze ÄÃslice",
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
"The input contains an invalid amount of digits" => "Hodnota obsahuje neplatný poÄet ÄÃslic",
"The input is not from an allowed institute" => "Hodnota nenà od povolené spoleÄnosti",
- "The input seems to be an invalid creditcard number" => "Hodnota nenà platné ÄÃslo kreditnà karty",
+ "The input seems to be an invalid credit card number" => "Hodnota nenà platné ÄÃslo kreditnà karty",
"An exception has been raised while validating the input" => "Během validace byla vyvolána výjimka",
- // Zend_Validator_Csrf
+ // Zend\Validator\Csrf
"The form submitted did not originate from the expected site" => "Odeslaný formulář nepocházà z předpokládané internetové stránky",
- // Zend_Validator_Date
+ // Zend\Validator\Date
"Invalid type given. String, integer, array or DateTime expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec, ÄÃslo, pole nebo objekt DateTime",
"The input does not appear to be a valid date" => "Hodnota nevypadá jako platné datum",
"The input does not fit the date format '%format%'" => "Hodnota neodpovÃdá formátu data '%format%'",
- // Zend_Validator_DateStep
+ // Zend\Validator\DateStep
"The input is not a valid step" => "Hodnota nenà platný krok",
- // Zend_Validator_Db_Abstract
+ // Zend\Validator\Db\AbstractDb
"No record matching the input was found" => "Nebyl nalezen žádný záznam odpovÃdajÃcà hodnotÄ›",
"A record matching the input was found" => "Byl nalezen záznam odpovÃdajÃcà hodnotÄ›",
- // Zend_Validator_Digits
+ // Zend\Validator\Digits
"The input must contain only digits" => "Hodnota musà obsahovat pouze ÄÃslice",
"The input is an empty string" => "Hodnota je prázdný řetězec",
"Invalid type given. String, integer or float expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec, celé nebo desetinné ÄÃslo",
- // Zend_Validator_EmailAddress
+ // Zend\Validator\EmailAddress
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
"The input is not a valid email address. Use the basic format local-part@hostname" => "Hodnota nenà platná emailová adresa ve formátu local-part@hostname",
"'%hostname%' is not a valid hostname for the email address" => "'%hostname%' nenà platné hostname pro emailovou adresu",
@@ -88,40 +97,40 @@ return array(
"'%localPart%' is not a valid local part for the email address" => "'%localPart%' nenà platná 'local part' pro emailovou adresu",
"The input exceeds the allowed length" => "Hodnota pÅ™ekroÄila povolenou délku",
- // Zend_Validator_Explode
- "Invalid type given." => "Chybný typ.",
+ // Zend\Validator\Explode
+ "Invalid type given" => "Chybný typ",
- // Zend_Validator_File_Count
+ // Zend\Validator\File\Count
"Too many files, maximum '%max%' are allowed but '%count%' are given" => "PÅ™ÃliÅ¡ mnoho souborů. Maximum je '%max%', ale bylo zadáno '%count%'",
"Too few files, minimum '%min%' are expected but '%count%' are given" => "PÅ™ÃliÅ¡ málo souborů. Minimum je '%min%', ale byl zadáno jen '%count%'",
- // Zend_Validator_File_Crc32
+ // Zend\Validator\File\Crc32
"File does not match the given crc32 hashes" => "Soubor neodpovÃdá zadanému crc32 hashi",
"A crc32 hash could not be evaluated for the given file" => "Pro zadaný soubor nemohl být vypoÄÃtán crc32 hash",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_File_ExcludeExtension
+ // Zend\Validator\File\ExcludeExtension
"File has an incorrect extension" => "Soubor má nesprávnou pÅ™Ãponu",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_File_Exists
+ // Zend\Validator\File\Exists
"File does not exist" => "Soubor neexistuje",
- // Zend_Validator_File_Extension
+ // Zend\Validator\File\Extension
"File has an incorrect extension" => "Soubor má nesprávnou pÅ™Ãponu",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_File_FilesSize
+ // Zend\Validator\File\FilesSize
"All files in sum should have a maximum size of '%max%' but '%size%' were detected" => "SouÄet velikostà vÅ¡ech souborů by mÄ›l být maximálnÄ› '%max%', ale je '%size%'",
"All files in sum should have a minimum size of '%min%' but '%size%' were detected" => "SouÄet velikostà vÅ¡ech souborů by mÄ›l být nejménÄ› '%min%', ale je '%size%'",
"One or more files can not be read" => "Jeden nebo vÃce souborů nenà možné naÄÃst",
- // Zend_Validator_File_Hash
+ // Zend\Validator\File\Hash
"File does not match the given hashes" => "Soubor neodpovÃdané danému hashi",
"A hash could not be evaluated for the given file" => "Hash nemohl být pro daný soubor vypoÄÃtán",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_File_ImageSize
+ // Zend\Validator\File\ImageSize
"Maximum allowed width for image should be '%maxwidth%' but '%width%' detected" => "Maximálnà šÃÅ™ka obrázku by mÄ›la být '%maxwidth%', ale je '%width%'",
"Minimum expected width for image should be '%minwidth%' but '%width%' detected" => "Minimálnà šÃÅ™ka obrázku by mÄ›la být '%minwidth%', ale je '%width%'",
"Maximum allowed height for image should be '%maxheight%' but '%height%' detected" => "Maximálnà výška obrázku by měla být '%maxheight%', ale je '%height%'",
@@ -129,40 +138,40 @@ return array(
"The size of image could not be detected" => "Rozměry obrázku nebylo možné zjistit",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_File_IsCompressed
+ // Zend\Validator\File\IsCompressed
"File is not compressed, '%type%' detected" => "Soubor nenà komprimovaný, ale '%type%'",
"The mimetype could not be detected from the file" => "Mimetyp souboru nebylo možné zjistit",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_File_IsImage
+ // Zend\Validator\File\IsImage
"File is no image, '%type%' detected" => "Soubor nenà obrázek, ale '%type%'",
"The mimetype could not be detected from the file" => "Mimetyp souboru nebylo možné zjistit",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_File_Md5
+ // Zend\Validator\File\Md5
"File does not match the given md5 hashes" => "Soubor neodpovÃdá danému md5 hashi",
"An md5 hash could not be evaluated for the given file" => "md5 hash nemohl být pro daný soubor vypoÄÃtán",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_File_MimeType
+ // Zend\Validator\File\MimeType
"File has an incorrect mimetype of '%type%'" => "Soubor má neplatný mimetyp '%type%'",
"The mimetype could not be detected from the file" => "Mimetyp souboru nebylo možné zjistit",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_File_NotExists
+ // Zend\Validator\File\NotExists
"File exists" => "Soubor již existuje",
- // Zend_Validator_File_Sha1
+ // Zend\Validator\File\Sha1
"File does not match the given sha1 hashes" => "Soubor neodpovÃdá danému sha1 hashi",
"A sha1 hash could not be evaluated for the given file" => "sha1 hash nemohl být pro daný soubor vypoÄÃtán",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_File_Size
+ // Zend\Validator\File\Size
"Maximum allowed size for file is '%max%' but '%size%' detected" => "Maximálnà velikost souboru by měla být '%max%', ale je '%size%'",
"Minimum expected size for file is '%min%' but '%size%' detected" => "Minimálnà velikost souboru by měla být '%min%', ale je '%size%'",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_File_Upload
+ // Zend\Validator\File\Upload
"File '%value%' exceeds the defined ini size" => "Soubor '%value%' pÅ™ekroÄil velikost definovanou v ini souboru",
"File '%value%' exceeds the defined form size" => "Soubor '%value%' pÅ™ekroÄil velikost definovanou ve formuláři",
"File '%value%' was only partially uploaded" => "Soubor '%value%' byl nahrán jen ÄásteÄnÄ›",
@@ -174,7 +183,7 @@ return array(
"File '%value%' was not found" => "Soubor '%value%' nebyl nalezen",
"Unknown error while uploading file '%value%'" => "Během nahrávánà souboru '%value%' došlo k neznámé chybě",
- // Zend_Validator_File_UploadFile
+ // Zend\Validator\File\UploadFile
"File exceeds the defined ini size" => "Soubor pÅ™ekroÄil velikost definovanou v ini souboru",
"File exceeds the defined form size" => "Soubor pÅ™ekroÄil velikost definovanou ve formuláře",
"File was only partially uploaded" => "Soubor byl nahrán jen ÄásteÄnÄ›",
@@ -186,20 +195,20 @@ return array(
"File was not found" => "Soubor nebyl nalezen",
"Unknown error while uploading file" => "Během nahrávánà souboru došlo k neznámé chybě",
- // Zend_Validator_File_WordCount
- "Too much words, maximum '%max%' are allowed but '%count%' were counted" => "PÅ™ÃliÅ¡ mnoho slov. Je jich dovoleno maximálnÄ› '%max%', ale bylo zadáno '%count%'",
+ // Zend\Validator\File\WordCount
+ "Too many words, maximum '%max%' are allowed but '%count%' were counted" => "PÅ™ÃliÅ¡ mnoho slov. Je jich dovoleno maximálnÄ› '%max%', ale bylo zadáno '%count%'",
"Too few words, minimum '%min%' are expected but '%count%' were counted" => "PÅ™ÃliÅ¡ málo slov. Musà jich být alespoň '%min%', ale bylo zadáno jen '%count%'",
"File is not readable or does not exist" => "Soubor nenà Äitelný nebo neexistuje",
- // Zend_Validator_GreaterThan
+ // Zend\Validator\GreaterThan
"The input is not greater than '%min%'" => "Hodnota nenà většà než '%min%'",
"The input is not greater or equal than '%min%'" => "Hodnota nenà většà nebo rovna '%min%'",
- // Zend_Validator_Hex
+ // Zend\Validator\Hex
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
"The input contains non-hexadecimal characters" => "Hodnota neobsahuje jen znaky hexadecimálnÃch ÄÃsel",
- // Zend_Validator_Hostname
+ // Zend\Validator\Hostname
"The input appears to be a DNS hostname but the given punycode notation cannot be decoded" => "Hodnota vypadá jako DNS hostname ale zadanou punycode notaci nenà možné dekódovat",
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
"The input appears to be a DNS hostname but contains a dash in an invalid position" => "Hodnota vypadá jako hostname, ale obsahuje pomlÄku na nedovoleném mÃstÄ›",
@@ -212,69 +221,69 @@ return array(
"The input appears to be a DNS hostname but cannot extract TLD part" => "Hodnota sice vypadá jako hostname, ale nemohu urÄit TLD",
"The input appears to be a DNS hostname but cannot match TLD against known list" => "Hodnota vypadá jako hostname, ale nemohl být ověřen proti známým TLD",
- // Zend_Validator_Iban
+ // Zend\Validator\Iban
"Unknown country within the IBAN" => "Neznámý stát v IBAN",
"Countries outside the Single Euro Payments Area (SEPA) are not supported" => "Státy mimo jednotný evropský platebnà prostor nejsou podporovány",
"The input has a false IBAN format" => "Hodnota nenà platný formát IBAN",
"The input has failed the IBAN check" => "Hodnota neprošlo kontrolou IBAN",
- // Zend_Validator_Identical
- "The two given tokens do not match" => "Zadané položky nejsou shodné",
- "No token was provided to match against" => "Nebyla zadána položka pro porovnánÃ",
+ // Zend\Validator\Identical
+ "The two given tokens do not match" => "Zadané hodnoty nejsou shodné",
+ "No token was provided to match against" => "Nebyla zadána hodnota pro porovnánÃ",
- // Zend_Validator_InArray
+ // Zend\Validator\InArray
"The input was not found in the haystack" => "Hodnota nebyla nalezena v seznamu",
- // Zend_Validator_Ip
+ // Zend\Validator\Ip
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
"The input does not appear to be a valid IP address" => "Hodnota nevypadá jako platná IP adresa",
- // Zend_Validator_Isbn
+ // Zend\Validator\IsInstanceOf
+ "The input is not an instance of '%className%'" => "Hodnota nenà instancà tÅ™Ãdy '%className%'",
+
+ // Zend\Validator\Isbn
"Invalid type given. String or integer expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec nebo celé ÄÃslo",
"The input is not a valid ISBN number" => "Hodnota nenà platné ISBN",
- // Zend_Validator_IsInstanceOf
- "The input is not an instance of '%className%'" => "Hodnota nenà instancà tÅ™Ãdy '%className%'",
-
- // Zend_Validator_LessThan
+ // Zend\Validator\LessThan
"The input is not less than '%max%'" => "Hodnota nenà menšà než '%max%'",
"The input is not less or equal than '%max%'" => "Hodnota nenà menšà nebo rovna '%max%'",
- // Zend_Validator_NotEmpty
+ // Zend\Validator\NotEmpty
"Value is required and can't be empty" => "Položka je povinná a nesmà být prázdná",
"Invalid type given. String, integer, float, boolean or array expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec, celé nebo desetinné ÄÃslo, boolean nebo pole",
- // Zend_Validator_Regex
+ // Zend\Validator\Regex
"Invalid type given. String, integer or float expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec, celé nebo desetinné ÄÃslo",
"The input does not match against pattern '%pattern%'" => "Hodnota neodpovÃdá Å¡ablonÄ› '%pattern%'",
"There was an internal error while using the pattern '%pattern%'" => "Během zpracovánà šablony '%pattern%' došlo k internà chybě",
- // Zend_Validator_Sitemap_Changefreq
+ // Zend\Validator\Sitemap\Changefreq
"The input is not a valid sitemap changefreq" => "Hodnota nenà platné 'changefreq' pro sitemapu",
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
- // Zend_Validator_Sitemap_Lastmod
+ // Zend\Validator\Sitemap\Lastmod
"The input is not a valid sitemap lastmod" => "Hodnota nenà platné 'lastmod' pro sitemapu",
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
- // Zend_Validator_Sitemap_Loc
+ // Zend\Validator\Sitemap\Loc
"The input is not a valid sitemap location" => "Hodnota nenà platná 'location' pro sitemapu",
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
- // Zend_Validator_Sitemap_Priority
+ // Zend\Validator\Sitemap\Priority
"The input is not a valid sitemap priority" => "Hodnota nenà platná 'priority' pro sitemapu",
"Invalid type given. Numeric string, integer or float expected" => "Chybný typ. Byl oÄekáván ÄÃselný Å™etÄ›zec, celé nebo desetinné ÄÃslo",
- // Zend_Validator_Step
+ // Zend\Validator\Step
"Invalid value given. Scalar expected" => "Chybná hodnota. Byla oÄekávána skalárnà hodnota",
"The input is not a valid step" => "Hodnota nenà platný krok",
- // Zend_Validator_StringLength
+ // Zend\Validator\StringLength
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
"The input is less than %min% characters long" => "Hodnota je kratšà než %min% znaků",
"The input is more than %max% characters long" => "Hodnota je delšà než %max% znaků",
- // Zend_Validator_Uri
+ // Zend\Validator\Uri
"Invalid type given. String expected" => "Chybný typ. Byl oÄekáván Å™etÄ›zec",
"The input does not appear to be a valid Uri" => "Hodnota nevypadá jako platná URI",
);
diff --git a/vendor/zendframework/zendframework/resources/languages/de/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/de/Zend_Captcha.php
index f4669f67cef..df5ad7e725b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 6d576e9b647..1b0dc634ff0 100644
--- a/vendor/zendframework/zendframework/resources/languages/de/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/de/Zend_Validate.php
@@ -10,7 +10,7 @@
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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_Captcha.php b/vendor/zendframework/zendframework/resources/languages/en/Zend_Captcha.php
index 74440ed09ec..a20dd405b62 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 044bd06911d..acf366ce203 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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/es/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/es/Zend_Validate.php
index 63c8bd86ed6..a1090ad49c7 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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/fi/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/fi/Zend_Validate.php
index ae494f73af7..27f33165b31 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 704d65e6bed..34d534777e0 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 ff4aa4766d4..1db4deb7666 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 4b8e5b2964d..972661dddbd 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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
new file mode 100644
index 00000000000..a9b71889eb2
--- /dev/null
+++ b/vendor/zendframework/zendframework/resources/languages/hu/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-2013 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" => "Hiányzó captcha mezők",
+ "Failed to validate captcha" => "Érvénytelen captcha",
+ "Captcha value is wrong: %value%" => "Captcha érték hibás: %value%",
+
+ // Zend\Captcha\Word
+ "Empty captcha value" => "Hiányzó captcha érték",
+ "Captcha ID field is missing" => "Hiányzó captcha ID mező",
+ "Captcha value is wrong" => "Captcha érték hibás",
+);
diff --git a/vendor/zendframework/zendframework/resources/languages/hu/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/hu/Zend_Validate.php
new file mode 100644
index 00000000000..3b547563024
--- /dev/null
+++ b/vendor/zendframework/zendframework/resources/languages/hu/Zend_Validate.php
@@ -0,0 +1,289 @@
+<?php
+/**
+ * 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)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+/**
+ * EN-Revision: 16.Jul.2013
+ */
+return array(
+ // Zend\I18n\Validator\Alnum
+ "Invalid type given. String, integer or float expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok, egészek, tizedes törtek",
+ "The input contains characters which are non alphabetic and no digits" => "A megadott érték tartalmaz betűkön és számjegyeken kÃvüli karaktereket",
+ "The input is an empty string" => "A megadott érték üres",
+
+ // Zend\I18n\Validator\Alpha
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+ "The input contains non alphabetic characters" => "A megadott érték tartalmaz betűkön kÃvüli karaktereket",
+ "The input is an empty string" => "A megadott érték üres",
+
+ // Zend\I18n\Validator\DateTime
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+ "The input does not appear to be a valid datetime" => "A megadott érték nem tűnik érvényes dátum-idő-nek",
+
+ // Zend\I18n\Validator\Float
+ "Invalid type given. String, integer or float expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok, egészek, tizedes törtek",
+ "The input does not appear to be a float" => "A megadott érték nem tűnik érvényes számnak",
+
+ // Zend\I18n\Validator\Int
+ "Invalid type given. String or integer expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok, egészek",
+ "The input does not appear to be an integer" => "A megadott érték nem tűnik érvényes egész számnak",
+
+ // Zend\I18n\Validator\PhoneNumber
+ "The input does not match a phone number format" => "A megadott érték nem felel meg a várt telefon szám formátumnak",
+ "The country provided is currently unsupported" => "A megadott ország jelenleg nem támogatott",
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+
+ // Zend\I18n\Validator\PostCode
+ "Invalid type given. String or integer expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok, egészek",
+ "The input does not appear to be a postal code" => "A megadott érték nem tűnik irányÃtószámnak",
+ "An exception has been raised while validating the input" => "A megadott érték érvényesÃtése közben nem várt hiba történt",
+
+ // Zend\Validator\Barcode
+ "The input failed checksum validation" => "A megadott érték ellenőrző összege nem megfelelő",
+ "The input contains invalid characters" => "A megadott érték érvénytelen karaktereket tartalmaz",
+ "The input should have a length of %length% characters" => "A megadott érték hossza %length% karakter kell, hogy legyen",
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+
+ // Zend\Validator\Between
+ "The input is not between '%min%' and '%max%', inclusively" => "A megadott érték nem esik - megengedően - '%min%' és '%max%' közé",
+ "The input is not strictly between '%min%' and '%max%'" => "A megadott érték nem esik - szigorúan - '%min%' és '%max%' közé",
+
+ // Zend\Validator\Callback
+ "The input is not valid" => "A megadott érték érvénytelen",
+ "An exception has been raised within the callback" => "A visszahÃvandó függvény nem várt hibát okozott.",
+
+ // Zend\Validator\CreditCard
+ "The input seems to contain an invalid checksum" => "A megadott érték érvénytelen ellenőrző összeget tartalmaz",
+ "The input must contain only digits" => "A megadott érték csak számjegyeket tartalmazhat",
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+ "The input contains an invalid amount of digits" => "A megadott érték érvénytelen számú számjegyet tartalmaz",
+ "The input is not from an allowed institute" => "A megadott érték nem megengedett intézethez tartozik",
+ "The input seems to be an invalid credit card number" => "A megadott érték érvénytelen hitelkártya számnak tűnik",
+ "An exception has been raised while validating the input" => "A megadott érték érvényesÃtése közben nem várt hiba történt",
+
+ // Zend\Validator\Csrf
+ "The form submitted did not originate from the expected site" => "Az űrlap nem a várt oldalról érkezett (Elképzelhető, hogy ez egy CSRF támadási kisérlet)",
+
+ // Zend\Validator\Date
+ "Invalid type given. String, integer, array or DateTime expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok, egész számok, tömbök, \\DateTime tÃpus",
+ "The input does not appear to be a valid date" => "A megadott érték nem tűnik érvényes dátumnak",
+ "The input does not fit the date format '%format%'" => "A megadott érték nem felel meg a következő dátum formátumnak: '%format%'",
+
+ // Zend\Validator\DateStep
+ "The input is not a valid step" => "A megadott érték nem érvényes lépcső",
+
+ // Zend\Validator\Db\AbstractDb
+ "No record matching the input was found" => "Nem található megadott értéknek megfelelő adatbázis rekord",
+ "A record matching the input was found" => "A megadott értéknek megfelelő adatbázis rekord létezik",
+
+ // Zend\Validator\Digits
+ "The input must contain only digits" => "A megadott érték csak számjegyeket tartalmazhat",
+ "The input is an empty string" => "A megadott érték üres",
+ "Invalid type given. String, integer or float expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok, egészek, tizedes törtek",
+
+ // Zend\Validator\EmailAddress
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+ "The input is not a valid email address. Use the basic format local-part@hostname" => "A megadott érték nem érvényes email cÃm. A helyinev@kiszolgalo formátum használható.",
+ "'%hostname%' is not a valid hostname for the email address" => "'%hostname%' nem érvényes kiszolgáló név az email cÃmhez",
+ "'%hostname%' does not appear to have any valid MX or A records for the email address" => "'%hostname%' nem tűnik érvényes MX vagy A rekordnak az email cÃmhez",
+ "'%hostname%' is not in a routable network segment. The email address should not be resolved from public network" => "'%hostname%' nem visszafejthetÅ‘ hálózati szegmens. Az email cÃm nem visszafejthetÅ‘ a nyilvános hálózaton",
+ "'%localPart%' can not be matched against dot-atom format" => "'%localPart%' nem feleltethető meg a dot-atom formátumnak.",
+ "'%localPart%' can not be matched against quoted-string format" => "'%localPart%' nem feleltethető meg az idézőjelezett-karakterlánc (quoted-string) formátumnak",
+ "'%localPart%' is not a valid local part for the email address" => "'%localPart%' nem érvényes lokális név az email cÃmhez",
+ "The input exceeds the allowed length" => "A megadott érték hossza meghaladja a megengedettet",
+
+ // Zend\Validator\Explode
+ "Invalid type given" => "A megadott érték tÃpusa érvénytelen",
+
+ // Zend\Validator\File\Count
+ "Too many files, maximum '%max%' are allowed but '%count%' are given" => "Túl sok fájl, maximum '%max%' megengedett, de '%count%' érkezett",
+ "Too few files, minimum '%min%' are expected but '%count%' are given" => "Túl kevés fájl, minimum '%min%' megengedett,de '%count%' érkezett",
+
+ // Zend\Validator\File\Crc32
+ "File does not match the given crc32 hashes" => "A fájl nem felel meg a megadott crc32 hasheknek",
+ "A crc32 hash could not be evaluated for the given file" => "A crc32 hash nem számÃtható ki a megadott fájlhoz",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\File\ExcludeExtension
+ "File has an incorrect extension" => "A fájl kiterjesztése nem megfelelő",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\File\Exists
+ "File does not exist" => "A fájl nem létezik",
+
+ // Zend\Validator\File\Extension
+ "File has an incorrect extension" => "A fájl kiterjesztése nem megfelelő",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\File\FilesSize
+ "All files in sum should have a maximum size of '%max%' but '%size%' were detected" => "Az összes fájl együttes mérete maximum '%max%' lehet, de '%size%' méretű fájl érkezett",
+ "All files in sum should have a minimum size of '%min%' but '%size%' were detected" => "Az összes fájl együttes mérete minimum '%min%' lehet, de '%size%' méretű fájl érkezett",
+ "One or more files can not be read" => "Egy vagy több fájl olvasása nem sikerült",
+
+ // Zend\Validator\File\Hash
+ "File does not match the given hashes" => "A fájl nem felel meg az adott hasheknek",
+ "A hash could not be evaluated for the given file" => "A hash nem számÃtható ki az adott fájlhoz",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\File\ImageSize
+ "Maximum allowed width for image should be '%maxwidth%' but '%width%' detected" => "A kép megengedett legnagyobb szélessége '%maxwidth%' de '%width%' széles kép érkezett",
+ "Minimum expected width for image should be '%minwidth%' but '%width%' detected" => "A kép megengedett legnagyobb szélessége '%minwidth%' de '%width%' széles kép érkezett",
+ "Maximum allowed height for image should be '%maxheight%' but '%height%' detected" => "A kép megengedett legnagyobb magassága '%maxheight%' de '%height%' magas kép érkezett",
+ "Minimum expected height for image should be '%minheight%' but '%height%' detected" => "A kép megengedett legnagyobb magassága '%minheight%' de '%height%' magas kép érkezett",
+ "The size of image could not be detected" => "A kép méretét nem sikerült meghatározni",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\File\IsCompressed
+ "File is not compressed, '%type%' detected" => "A kapott fájl nem tömörÃtett, '%type%' tÃpusúnak tűnik.",
+ "The mimetype could not be detected from the file" => "A fájl mime tÃpusát nem sikerült azonosÃtani",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\File\IsImage
+ "File is no image, '%type%' detected" => "A fájl nem kép, '%type%' tÃpusúnak tűnik",
+ "The mimetype could not be detected from the file" => "A fájl mime tÃpusát nem sikerült azonosÃtani",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\File\Md5
+ "File does not match the given md5 hashes" => "A fájl nem felel meg a megadott md5 hasheknek",
+ "An md5 hash could not be evaluated for the given file" => "Az md5 hash nem számÃtható ki a megadott fájlhoz",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\File\MimeType
+ "File has an incorrect mimetype of '%type%'" => "File has an incorrect mimetype of '%type%'",
+ "The mimetype could not be detected from the file" => "A fájl mime tÃpusát nem sikerült azonosÃtani",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\File\NotExists
+ "File exists" => "A fájl már létezik",
+
+ // Zend\Validator\File\Sha1
+ "File does not match the given sha1 hashes" => "A fájl nem felel meg a megadott sha1 hasheknek",
+ "A sha1 hash could not be evaluated for the given file" => "Az sha1 hash nem számÃtható ki a megadott fájlhoz",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\File\Size
+ "Maximum allowed size for file is '%max%' but '%size%' detected" => "Maximum megengedett fájlméret '%max%', de '%size%' érkezett",
+ "Minimum expected size for file is '%min%' but '%size%' detected" => "Minimum megengedett fájlméret '%min%', de '%size%' érkezett",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\File\Upload
+ "File '%value%' exceeds the defined ini size" => "A(z) '%value%' fájl mérete meghaladja a PHP beállÃtásokban megengedettet",
+ "File '%value%' exceeds the defined form size" => "A(z) '%value%' fájl mérete meghaladja az űrlap által megengedettet",
+ "File '%value%' was only partially uploaded" => "A(z) '%value%' fájl csak részlegesen lett feltöltve",
+ "File '%value%' was not uploaded" => "A(z) '%value%' fájl nem lett feltöltve",
+ "No temporary directory was found for file '%value%'" => "A(z) '%value%' fájl számára nem található átmeneti könyvtár",
+ "File '%value%' can't be written" => "A(z) '%value%' fájl nem Ãrható",
+ "A PHP extension returned an error while uploading the file '%value%'" => "Egy PHP kiterjesztés nem várt hibát okozott a(z) '%value%' fájl feltöltése közben",
+ "File '%value%' was illegally uploaded. This could be a possible attack" => "A(z) '%value%' fájl illegálisan került feltöltésre. Elképzelhető, hogy ez egy támadás következménye",
+ "File '%value%' was not found" => "A(z) '%value%' fájl nem található",
+ "Unknown error while uploading file '%value%'" => "Ismeretlen hiba történt a(z) '%value%' fájl feltöltése közben",
+
+ // Zend\Validator\File\UploadFile
+ "File exceeds the defined ini size" => "A fájl mérete meghaladja a PHP beállÃtásokban megengedettet",
+ "File exceeds the defined form size" => "A fájl mérete meghaladja az űrlap által megengedettet",
+ "File was only partially uploaded" => "A fájl csak részlegesen lett feltöltve",
+ "File was not uploaded" => "A fájl nem lett feltöltve",
+ "No temporary directory was found for file" => "A fájl számára nem található átmeneti könyvtár",
+ "File can't be written" => "A fájl nem Ãrható",
+ "A PHP extension returned an error while uploading the file" => "Egy PHP kiterjesztés nem várt hibát okozott a fájl feltöltése közben",
+ "File was illegally uploaded. This could be a possible attack" => "A fájl illegálisan került feltöltésre. Elképzelhető, hogy ez egy támadás következménye",
+ "File was not found" => "A fájl nem található",
+ "Unknown error while uploading file" => "Ismeretlen hiba történt a fájl feltöltése közben",
+
+ // Zend\Validator\File\WordCount
+ "Too many words, maximum '%max%' are allowed but '%count%' were counted" => "Túl sok szó, maximum '%max%' szó megengedett, de '%count%' érkezett",
+ "Too few words, minimum '%min%' are expected but '%count%' were counted" => "Túl kevés szó, minimum '%min%' szó megengedett, de '%count%' érkezett",
+ "File is not readable or does not exist" => "A fájl nem létezik vagy nem olvasható",
+
+ // Zend\Validator\GreaterThan
+ "The input is not greater than '%min%'" => "A megadott érték nem nagyobb, mint '%min%'",
+ "The input is not greater or equal than '%min%'" => "A megadott érték nem nagyobb vagy egyenlő, mint '%min%'",
+
+ // Zend\Validator\Hex
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+ "The input contains non-hexadecimal characters" => "A megadott érték nem-hexadecimális karaktert tartalmaz",
+
+ // Zend\Validator\Hostname
+ "The input appears to be a DNS hostname but the given punycode notation cannot be decoded" => "A megadott érték DNS kiszolgáló névnek tűnik, de a megadott punycode jelölés nem visszakódolható",
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+ "The input appears to be a DNS hostname but contains a dash in an invalid position" => "A megadott érték érvényes DNS kiszolgáló névnek tűnik, de érvénytelen helyen tartalmaz kötőjelet",
+ "The input does not match the expected structure for a DNS hostname" => "A megadott érték nem felel meg a várt DNS kiszolgáló név struktúrának",
+ "The input appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'" => "A megadott érték DNS kiszolgáló névnek tűnik, de nem sikerült megfeleltetni a '%tld%' kiszolgáló név sémának",
+ "The input does not appear to be a valid local network name" => "A megadott érték nem tűnik érvényes helyi hálózati névnek",
+ "The input does not appear to be a valid URI hostname" => "A megadott érték nem tűnik érvényes URI kiszolgáló névnek",
+ "The input appears to be an IP address, but IP addresses are not allowed" => "A megadott érték IP cÃmnek tűnik, de IP cÃmek nem megengedettek",
+ "The input appears to be a local network name but local network names are not allowed" => "A megadott érték helyi hálózati cÃmnek tűnik, de helyi hálózati cÃmek nem megengedettek",
+ "The input appears to be a DNS hostname but cannot extract TLD part" => "A megadott érték DNS kiszolgáló névnek tűnik, de a TLD részt nem sikerült visszafejteni",
+ "The input appears to be a DNS hostname but cannot match TLD against known list" => "A megadott érték DNS kiszolgáló névnek tűnik, de a megadott TLD ismeretlen",
+
+ // Zend\Validator\Iban
+ "Unknown country within the IBAN" => "Ismeretlen ország az IBAN rendszerben",
+ "Countries outside the Single Euro Payments Area (SEPA) are not supported" => "A SEPA fizetési övezeten kÃvüli országok nem támogatottak",
+ "The input has a false IBAN format" => "A megadott érték nem felel meg az IBAN formátumnak",
+ "The input has failed the IBAN check" => "A megadott érték nem felel meg az IBAN ellenőrzésnek",
+
+ // Zend\Validator\Identical
+ "The two given tokens do not match" => "A két megadott érték nem egyezik",
+ "No token was provided to match against" => "Az összehasonlÃtási érték hiányzik",
+
+ // Zend\Validator\InArray
+ "The input was not found in the haystack" => "A megadott érték nem található az érvényes halmazban/tömbben.",
+
+ // Zend\Validator\Ip
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+ "The input does not appear to be a valid IP address" => "A megadott érték nem tűnik érvényes IP cÃmnek",
+
+ // Zend\Validator\IsInstanceOf
+ "The input is not an instance of '%className%'" => "A megadott érték nem '%className%'",
+
+ // Zend\Validator\Isbn
+ "Invalid type given. String or integer expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok, egészek",
+ "The input is not a valid ISBN number" => "A megadott érték nem érvényes ISBN szám",
+
+ // Zend\Validator\LessThan
+ "The input is not less than '%max%'" => "A megadott érték nem kisebb, mint '%max%'",
+ "The input is not less or equal than '%max%'" => "A megadott érték nem kisebb vagy egyenlő, mint '%max%'",
+
+ // Zend\Validator\NotEmpty
+ "Value is required and can't be empty" => "A megadott érték kötelező és nem lehet üres",
+ "Invalid type given. String, integer, float, boolean or array expected" => "Invalid type given. String, integer, float, boolean or array expected",
+
+ // Zend\Validator\Regex
+ "Invalid type given. String, integer or float expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok, egészek, tizedes törtek",
+ "The input does not match against pattern '%pattern%'" => "A megadott érték nem felel meg a '%pattern%' mintának",
+ "There was an internal error while using the pattern '%pattern%'" => "A(z) '%pattern%' minta használata közben hiba történt",
+
+ // Zend\Validator\Sitemap\Changefreq
+ "The input is not a valid sitemap changefreq" => "A megadott érték nem érvényes `sitemap changefreq`",
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+
+ // Zend\Validator\Sitemap\Lastmod
+ "The input is not a valid sitemap lastmod" => "A megadott érték nem érvényes `sitemap lastmod`",
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+
+ // Zend\Validator\Sitemap\Loc
+ "The input is not a valid sitemap location" => "A megadott érték nem érvényes `sitemap location`",
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+
+ // Zend\Validator\Sitemap\Priority
+ "The input is not a valid sitemap priority" => "The input is not a valid sitemap priority",
+ "Invalid type given. Numeric string, integer or float expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: numerikus karakterláncok, egészek vagy tizedes törtek",
+
+ // Zend\Validator\Step
+ "Invalid value given. Scalar expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: skalárok (egész számok, tizedes törtek, karakterláncok, stb)",
+ "The input is not a valid step" => "A megadott érték nem érvényes lépcső",
+
+ // Zend\Validator\StringLength
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+ "The input is less than %min% characters long" => "A megadott érték rövidebb, mint %min% hosszúságú",
+ "The input is more than %max% characters long" => "A megadott érték hosszabb, mint %max% hosszúságú",
+
+ // Zend\Validator\Uri
+ "Invalid type given. String expected" => "Érvénytelen tÃpus. Érvényes tÃpusok: karakterláncok",
+ "The input does not appear to be a valid Uri" => "A megadott érték nem tűnik érvényes Uri-nak",
+);
diff --git a/vendor/zendframework/zendframework/resources/languages/it/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/it/Zend_Captcha.php
index d5403db464f..41324285c90 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 40014d5b9be..9e51eee3a71 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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
new file mode 100644
index 00000000000..dbb0ad4d439
--- /dev/null
+++ b/vendor/zendframework/zendframework/resources/languages/ja/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-2014 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" => "ã‚ャプãƒãƒ£ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ãŒè¶³ã‚Šã¾ã›ã‚“",
+ "Failed to validate captcha" => "ã‚ャプãƒãƒ£ã®æ¤œè¨¼ã«å¤±æ•—ã—ã¾ã—ãŸ",
+ "Captcha value is wrong: %value%" => "ã‚ャプãƒãƒ£ã®å€¤ãŒé–“é•ã£ã¦ã„ã¾ã™: %value%",
+
+ // Zend\Captcha\Word
+ "Empty captcha value" => "ã‚ャプãƒãƒ£ã®å€¤ãŒç©ºã§ã™",
+ "Captcha ID field is missing" => "ã‚ャプãƒãƒ£IDフィールドãŒè¶³ã‚Šã¾ã›ã‚“",
+ "Captcha value is wrong" => "ã‚ャプãƒãƒ£ã®å€¤ãŒé–“é•ã£ã¦ã„ã¾ã™",
+);
diff --git a/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php
index 9f063d26375..0759edb23fd 100644
--- a/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php
+++ b/vendor/zendframework/zendframework/resources/languages/ja/Zend_Validate.php
@@ -3,83 +3,90 @@
* 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-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/**
- * EN-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" => "入力値ã¯æ£ã—ã„日時ã§ã¯ãªã„よã†ã§ã™",
+
+ // 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" => "ä¸æ£ãªå½¢å¼ã§ã™ã€‚æ–‡å—列ãŒæœŸå¾…ã•ã‚Œã¦ã„ã¾ã™",
"The input contains an invalid amount of digits" => "入力値ã¯ä¸æ£ãªæ¡æ•°ã§ã™",
"The input is not from an allowed institute" => "入力値ã¯èªå¯æ©Ÿé–¢ã‹ã‚‰è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“",
- "The input seems to be an invalid creditcard number" => "入力値ã¯ç„¡åŠ¹ãªã‚¯ãƒ¬ã‚¸ãƒƒãƒˆã‚«ãƒ¼ãƒ‰ç•ªå·ã®ã‚ˆã†ã§ã™",
+ "The input seems to be an invalid credit card 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 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ãŒæœŸå¾…ã•ã‚Œã¾ã™",
+ // Zend\Validator\DateStep
"The input is not a valid step" => "入力値ã¯æœ‰åŠ¹ãªé–“éš”ã§ã¯ã‚ã‚Šã¾ã›ã‚“",
- "The input does not appear to be a valid date" => "入力値ã¯æœ‰åŠ¹ãªæ—¥ä»˜ã§ã¯ãªã„よã†ã§ã™",
- // 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" => "Emailアドレス㮠'%hostname%' ã¯æœ‰åŠ¹ãªãƒ›ã‚¹ãƒˆåã§ã¯ã‚ã‚Šã¾ã›ã‚“",
@@ -90,106 +97,118 @@ return array(
"'%localPart%' is not a valid local part for the email address" => "Emailアドレス㮠'%localPart%' ã¯æœ‰åŠ¹ãªãƒãƒ¼ã‚«ãƒ«ãƒ‘ートã§ã¯ã‚ã‚Šã¾ã›ã‚“",
"The input exceeds the allowed length" => "入力値ã¯è¨±ã•ã‚ŒãŸé•·ã•ã‚’超ãˆã¦ã„ã¾ã™",
- // Zend_Validator_Explode
- "Invalid type given. String expected" => "ä¸æ£ãªå½¢å¼ã§ã™ã€‚æ–‡å—列ãŒæœŸå¾…ã•ã‚Œã¦ã„ã¾ã™",
+ // Zend\Validator\Explode
+ "Invalid type given" => "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%' ã®æ¨ªå¹…㯠'%width%' ã§ã—ãŸã€‚横幅ã¯æœ€å¤§ '%maxwidth%' ã¾ã§è¨±ã•ã‚Œã¦ã„ã¾ã™",
- "Minimum expected width for image '%value%' should be '%minwidth%' but '%width%' detected" => "ç”»åƒ '%value%' ã®æ¨ªå¹…㯠'%width%' ã§ã—ãŸã€‚横幅ã¯æœ€å° '%minwidth%' 以上ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™",
- "Maximum allowed height for image '%value%' should be '%maxheight%' but '%height%' detected" => "ç”»åƒ '%value%' ã®é«˜ã•ã¯ '%height%' ã§ã—ãŸã€‚高ã•ã¯æœ€å¤§ '%maxheight%' ã¾ã§è¨±ã•ã‚Œã¦ã„ã¾ã™",
- "Minimum expected height for image '%value%' should be '%minheight%' but '%height%' detected" => "ç”»åƒ '%value%' ã®é«˜ã•ã¯ '%height%' ã§ã—ãŸã€‚高ã•ã¯æœ€å° '%minheight%' 以上ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™",
- "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" => " '%type%' ãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ファイル '%value%' ã¯åœ§ç¸®ã•ã‚Œã¦ã„ã¾ã›ã‚“",
- "The mimetype of file '%value%' could not be detected" => "ファイル '%value%' ã® Mimetype ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
- "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%' ã® Mimetype ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
- "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%' ã¯èª¤ã£ãŸ MimeType '%type%' ã§ã™",
- "The mimetype of file '%value%' could not be detected" => "ファイル '%value%' ã® Mimetype ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
- "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" => "ç”»åƒã®æ¨ªå¹…㯠'%width%' ã§ã—ãŸã€‚横幅ã¯æœ€å¤§ '%maxwidth%' ã¾ã§è¨±ã•ã‚Œã¦ã„ã¾ã™",
+ "Minimum expected width for image should be '%minwidth%' but '%width%' detected" => "ç”»åƒã®æ¨ªå¹…㯠'%width%' ã§ã—ãŸã€‚横幅ã¯æœ€å° '%minwidth%' 以上ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™",
+ "Maximum allowed height for image should be '%maxheight%' but '%height%' detected" => "ç”»åƒã®é«˜ã•ã¯ '%height%' ã§ã—ãŸã€‚高ã•ã¯æœ€å¤§ '%maxheight%' ã¾ã§è¨±ã•ã‚Œã¦ã„ã¾ã™",
+ "Minimum expected height for image should be '%minheight%' but '%height%' detected" => "ç”»åƒã®é«˜ã•ã¯ '%height%' ã§ã—ãŸã€‚高ã•ã¯æœ€å° '%minheight%' 以上ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™",
+ "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" => "ファイルã‹ã‚‰MimeTypeãŒæ¤œå‡ºã§ãã¾ã›ã‚“ã§ã—ãŸ",
+ "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" => "ファイルã‹ã‚‰MimeTypeãŒæ¤œå‡ºã§ãã¾ã›ã‚“ã§ã—ãŸ",
+ "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 hash値ãŒæ±‚ã‚ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ",
+ "File is not readable or does not exist" => "ファイルã¯èªã¿è¾¼ã‚ãªã„ã‹ã‚‚ã—ãã¯å˜åœ¨ã—ã¾ã›ã‚“",
+
+ // Zend\Validator\File\MimeType
+ "File has an incorrect mimetype of '%type%'" => "ファイルã¯ä¸æ£ãª mimetype å½¢å¼ã® '%type%' ã‚’å«ã‚“ã§ã„ã¾ã™",
+ "The mimetype could not be detected from the file" => "ファイルã‹ã‚‰MimeTypeãŒæ¤œå‡ºã§ãã¾ã›ã‚“ã§ã—ãŸ",
+ "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%' ã¯èªã¿è¾¼ã‚ãªã„ã‹ã‚‚ã—ãã¯å˜åœ¨ã—ã¾ã›ã‚“",
-
- // Zend_Validator_File_Size
- "Maximum allowed size for file '%value%' is '%max%' but '%size%' detected" => "ファイルサイズ㯠'%size%' ã§ã™ã€‚ファイル '%value%' ã®ã‚µã‚¤ã‚ºã¯æœ€å¤§ '%max%' ã¾ã§è¨±ã•ã‚Œã¦ã„ã¾ã™",
- "Minimum expected size for file '%value%' is '%min%' but '%size%' detected" => "ファイルサイズ㯠'%size%' ã§ã™ã€‚ファイル '%value%' ã®ã‚µã‚¤ã‚ºã¯æœ€å° '%min%' 以上必è¦ã§ã™",
- "File '%value%' is not readable or does not exist" => "ファイル '%value%' ã¯èªã¿è¾¼ã‚ãªã„ã‹ã‚‚ã—ãã¯å˜åœ¨ã—ã¾ã›ã‚“",
-
- // 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%' ã¯ä¸€éƒ¨ã®ã¿ã—ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¦ã„ã¾ã›ã‚“",
- "File '%value%' was not uploaded" => "ファイル '%value%' ã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ",
- "No temporary directory was found for file '%value%'" => "ファイル '%value%' をアップãƒãƒ¼ãƒ‰ã™ã‚‹ä¸€æ™‚ディレクトリãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
- "File '%value%' can't be written" => "ファイル '%value%' ã¯æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ",
- "A PHP extension returned an error while uploading the file '%value%'" => "ファイル '%value%' をアップãƒãƒ¼ãƒ‰ä¸ã«æ‹¡å¼µãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒã‚¨ãƒ©ãƒ¼ã‚’å¿œç”ã—ã¾ã—ãŸ",
- "File '%value%' was illegally uploaded. This could be a possible attack" => "ファイル '%value%' ã¯ä¸æ£ãªã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã§ã—ãŸã€‚攻撃ã®å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™",
+ "File is not readable or does not exist" => "ファイルã¯èªã¿è¾¼ã‚ãªã„ã‹ã‚‚ã—ãã¯å˜åœ¨ã—ã¾ã›ã‚“",
+
+ // Zend\Validator\File\Size
+ "Maximum allowed size for file is '%max%' but '%size%' detected" => "ファイルサイズ㯠'%size%' ã§ã™ã€‚ファイルã®ã‚µã‚¤ã‚ºã¯æœ€å¤§ '%max%' ã¾ã§è¨±ã•ã‚Œã¦ã„ã¾ã™",
+ "Minimum expected size for file is '%min%' but '%size%' detected" => "ファイルサイズ㯠'%size%' ã§ã™ã€‚ファイルã®ã‚µã‚¤ã‚ºã¯æœ€å° '%min%' 以上必è¦ã§ã™",
+ "File is not readable or does not exist" => "ファイルã¯èªã¿è¾¼ã‚ãªã„ã‹ã‚‚ã—ãã¯å˜åœ¨ã—ã¾ã›ã‚“",
+
+ // 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%' ã¯ä¸€éƒ¨ã®ã¿ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã—ãŸ",
+ "File '%value%' was not uploaded" => "ファイル '%value%' ãŒã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¦ã„ã¾ã›ã‚“",
+ "No temporary directory was found for file '%value%'" => "ファイル '%value%' 用ã®ä¸€æ™‚ディレクトリãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
+ "File '%value%' can't be written" => "ファイル '%value%' ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ",
+ "A PHP extension returned an error while uploading the file '%value%'" => "ファイル '%value%' をアップãƒãƒ¼ãƒ‰ä¸ã«PHPã®æ‹¡å¼µãŒãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒã‚¨ãƒ©ãƒ¼ã‚’è¿”ã—ã¾ã—ãŸ",
+ "File '%value%' was illegally uploaded. This could be a possible attack" => "ファイル '%value%' ã¯ä¸å½“ã«ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã—ãŸã€‚攻撃ã®å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™",
"File '%value%' was not found" => "ファイル '%value%' ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
- "Unknown error while uploading file '%value%'" => "ファイル '%value%' をアップãƒãƒ¼ãƒ‰ä¸ã«æœªçŸ¥ã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ",
-
- // Zend_Validator_File_WordCount
- "Too much words, maximum '%max%' are allowed but '%count%' were counted" => "å˜èªžæ•° '%count%' ãŒå¤šéŽãŽã¾ã™ã€‚最大㧠'%max%' 個ãŒè¨±ã•ã‚Œã¾ã™",
+ "Unknown error while uploading file '%value%'" => "ファイル '%value%' をアップãƒãƒ¼ãƒ‰ä¸ã«ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ã§ã™",
+
+ // 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" => "ファイルをアップãƒãƒ¼ãƒ‰ä¸ã«æ‹¡å¼µãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒã‚¨ãƒ©ãƒ¼ã‚’å¿œç”ã—ã¾ã—ãŸ",
+ "File was illegally uploaded. This could be a possible attack" => "ファイルã¯ä¸æ£ãªã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã§ã—ãŸã€‚攻撃ã®å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™",
+ "File was not found" => "ファイルã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
+ "Unknown error while uploading file" => "ファイルをアップãƒãƒ¼ãƒ‰ä¸ã«æœªçŸ¥ã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ",
+
+ // Zend\Validator\File\WordCount
+ "Too many words, maximum '%max%' are allowed but '%count%' were counted" => "å˜èªžæ•°ãŒå¤šã™ãŽã¾ã™ã€‚最大㧠'%max%' ã¾ã§ã§ã™ãŒ '%count%' 個カウントã•ã‚Œã¾ã—ãŸ",
"Too few words, minimum '%min%' are expected but '%count%' were counted" => "å˜èªžæ•° '%count%' ãŒå°‘ãªéŽãŽã¾ã™ã€‚å°‘ãªãã¨ã‚‚ '%min%' 個必è¦ã§ã™",
- "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" => "入力値ã¯16進数ã§ã¯ãªã„æ–‡å—ã‚’å«ã‚“ã§ã„ã¾ã™",
- // Zend_Validator_Hostname
+ // Zend\Validator\Hostname
"The input appears to be a DNS hostname but the given punycode notation cannot be decoded" => " 入力値㯠DNS ホストåã®ã‚ˆã†ã§ã™ãŒã€ punycode 変æ›ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ",
"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" => "2 ã¤ã®ãƒˆãƒ¼ã‚¯ãƒ³ã¯ä¸€è‡´ã—ã¾ã›ã‚“ã§ã—ãŸ",
"No token was provided to match against" => "ãƒã‚§ãƒƒã‚¯ã‚’è¡Œã†ãŸã‚ã®ãƒˆãƒ¼ã‚¯ãƒ³ãŒã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
- // Zend_Validator_InArray
+ // Zend\Validator\InArray
"The input was not found in the haystack" => " 入力値㌠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
+ // 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_Sitemap_Changefreq
+ // Zend\Validator\Sitemap\Changefreq
"The input is not a valid sitemap changefreq" => " 入力値ã¯æ£ã—ã„サイトマップã®æ›´æ–°é »åº¦ã§ã¯ã‚ã‚Šã¾ã›ã‚“",
"Invalid type given. String expected" => "ä¸æ£ãªå½¢å¼ã§ã™ã€‚æ–‡å—列ãŒæœŸå¾…ã•ã‚Œã¦ã„ã¾ã™",
- // Zend_Validator_Sitemap_Lastmod
+ // Zend\Validator\Sitemap\Lastmod
"The input is not a valid sitemap lastmod" => " 入力値ã¯æ£ã—ã„サイトマップã®æœ€çµ‚æ›´æ–°æ—¥ã§ã¯ã‚ã‚Šã¾ã›ã‚“",
"Invalid type given. String expected" => "ä¸æ£ãªå½¢å¼ã§ã™ã€‚æ–‡å—列ãŒæœŸå¾…ã•ã‚Œã¦ã„ã¾ã™",
- // Zend_Validator_Sitemap_Loc
+ // Zend\Validator\Sitemap\Loc
"The input is not a valid sitemap location" => " 入力値ã¯æ£ã—ã„サイトマップã®ä½ç½®ã§ã¯ã‚ã‚Šã¾ã›ã‚“",
"Invalid type given. String expected" => "ä¸æ£ãªå½¢å¼ã§ã™ã€‚æ–‡å—列ãŒæœŸå¾…ã•ã‚Œã¦ã„ã¾ã™",
- // Zend_Validator_Sitemap_Priority
+ // Zend\Validator\Sitemap\Priority
"The input is not a valid sitemap 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" => " 入力値㯠%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/nl/Zend_Validate.php b/vendor/zendframework/zendframework/resources/languages/nl/Zend_Validate.php
index 443ff4707d5..535afc78e0c 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -11,75 +11,82 @@
* NL-Revision: 09.Sept.2012
*/
return array(
- // Zend_I18n_Validator_Alnum
+ // Zend\I18n\Validator\Alnum
"Invalid type given. String, integer or float expected" => "Ongeldig type opgegeven, waarde moet een float, string of integer zijn",
"The input contains characters which are non alphabetic and no digits" => "De input bevat tekens welke alfabetisch, noch numeriek zijn",
"The input is an empty string" => "De input is een lege string",
- // Zend_I18n_Validator_Alpha
+ // Zend\I18n\Validator\Alpha
"Invalid type given. String expected" => "Ongeldig type opgegeven, waarde moet een string zijn",
"The input contains non alphabetic characters" => "De input bevat tekens welke niet alfabetisch zijn",
"The input is an empty string" => "De input is een lege string",
- // Zend_I18n_Validator_Float
- "Invalid type given. String, integer or float expected" => "Invalid type given. String, integer or float expected",
- "The input does not appear to be a float" => "The input does not appear to be a float",
+ // Zend\I18n\Validator\DateTime
+ "Invalid type given. String expected" => "Ongeldig type opgegeven, waarde moet een string zijn",
+ "The input does not appear to be a valid datetime" => "De input lijkt geen geldige datetime te zijn",
+
+ // Zend\I18n\Validator\Float
+ "Invalid type given. String, integer or float expected" => "Ongeldig type opgegeven, waarde moet een string, integer of een float zijn",
+ "The input does not appear to be a float" => "De input lijkt geen geldige float te zijn",
- // Zend_I18n_Validator_Int
- "Invalid type given. String or integer expected" => "Invalid type given. String or integer expected",
- "The input does not appear to be an integer" => "The input does not appear to be an integer",
+ // Zend\I18n\Validator\Int
+ "Invalid type given. String or integer expected" => "Ongeldig type opgegeven, waarde moet een string of een integer zijn",
+ "The input does not appear to be an integer" => "De input lijkt geen geldige integer te zijn",
+
+ // Zend\I18n\Validator\PhoneNumber
+ "The input does not match a phone number format" => "De input komt niet overeen met een geldig telefoonnummer",
+ "The country provided is currently unsupported" => "De opgegeven landcode is momenteel niet ondersteund",
+ "Invalid type given. String expected" => "Ongeldig type opgegeven, waarde moet een string zijn",
- // Zend_I18n_Validator_PostCode
+ // Zend\I18n\Validator\PostCode
"Invalid type given. String or integer expected" => "Ongeldig type opgegeven, waarde moet een string of integer zijn",
"The input does not appear to be a postal code" => "De input lijkt geen geldige postcode te zijn",
"An exception has been raised while validating the input" => "Er is een interne fout opgetreden tijdens het valideren van de input",
- // Zend_Validator_Barcode
+ // Zend\Validator\Barcode
"The input failed checksum validation" => "De input slaagde niet in de checksum validatie",
"The input contains invalid characters" => "De input bevat ongeldige tekens",
"The input should have a length of %length% characters" => "De input moet een lengte hebben van %length% tekens",
"Invalid type given. String expected" => "Ongeldig type opgegeven, waarde moet een string zijn",
- // Zend_Validator_Between
+ // Zend\Validator\Between
"The input is not between '%min%' and '%max%', inclusively" => "De input is niet tussen of gelijk aan '%min%' en '%max%'",
"The input is not strictly between '%min%' and '%max%'" => "De input is niet tussen '%min%' en '%max%'",
- // Zend_Validator_Callback
+ // Zend\Validator\Callback
"The input is not valid" => "De input is ongeldig",
"An exception has been raised within the callback" => "Fout opgetreden in de callback, exceptie teruggegeven",
- // Zend_Validator_CreditCard
+ // Zend\Validator\CreditCard
"The input seems to contain an invalid checksum" => "De input bevat een ongeldige checksum",
"The input must contain only digits" => "De input kan alleen cijfers bevatten",
"Invalid type given. String expected" => "Ongeldig type opgegeven, waarde moet een string zijn",
"The input contains an invalid amount of digits" => "De input bevat een ongeldige hoeveelheid cijfers",
"The input is not from an allowed institute" => "De input is niet afkomstig van een toegestaan instituut",
- "The input seems to be an invalid creditcard number" => "De input is een ongeldig creditcard nummer",
+ "The input seems to be an invalid credit card number" => "De input is een ongeldig credit card nummer",
"An exception has been raised while validating the input" => "Er is een interne fout opgetreden tijdens het valideren van de input",
- // Zend_Validator_Csrf
+ // Zend\Validator\Csrf
"The form submitted did not originate from the expected site" => "Het verzonden formulier kwam niet van de verwachte website",
- // Zend_Validator_Date
+ // Zend\Validator\Date
"Invalid type given. String, integer, array or DateTime expected" => "Ongeldig type opgegeven, waarde moet een string, integer, array of DateTime zijn",
"The input does not appear to be a valid date" => "De input lijkt geen geldige datum te zijn",
"The input does not fit the date format '%format%'" => "De input past niet in het datumformaat '%format%'",
- // Zend_Validator_DateStep
- "Invalid type given. String, integer, array or DateTime expected" => "Ongeldig type opgegeven, waarde moet een string, integer, array of DateTime zijn",
- "The input does not appear to be a valid date" => "De input lijkt geen geldige datum te zijn",
+ // Zend\Validator\DateStep
"The input is not a valid step" => "De input is geen geldige stap",
- // Zend_Validator_Db_AbstractDb
+ // Zend\Validator\Db\AbstractDb
"No record matching the input was found" => "Er kon geen overeenkomstig record gevonden worden",
"A record matching the input was found" => "Een record wat overeenkomt met de input is gevonden",
- // Zend_Validator_Digits
+ // Zend\Validator\Digits
"The input must contain only digits" => "De input bevat niet enkel numerieke karakters",
"The input is an empty string" => "De input is een lege string",
"Invalid type given. String, integer or float expected" => "Ongeldig type opgegeven, waarde moet een string, integer of float zijn",
- // Zend_Validator_EmailAddress
+ // Zend\Validator\EmailAddress
"Invalid type given. String expected" => "Ongeldig type opgegeven, waarde moet een string zijn",
"The input is not a valid email address. Use the basic format local-part@hostname" => "De input is geen geldig e-mail adres in het basis formaat lokaal-gedeelte@hostname",
"'%hostname%' is not a valid hostname for the email address" => "'%hostname%' is geen geldige hostnaam voor het e-mail adres",
@@ -90,81 +97,81 @@ return array(
"'%localPart%' is not a valid local part for the email address" => "'%localPart%' is geen geldig lokaal gedeelte voor het e-mail adres",
"The input exceeds the allowed length" => "De input overschrijdt de toegestane lengte",
- // Zend_Validator_Explode
- "Invalid type given. String expected" => "Ongeldig type opgegeven, waarde moet een string zijn",
+ // Zend\Validator\Explode
+ "Invalid type given" => "Ongeldig type opgegeven",
- // Zend_Validator_File_Count
+ // Zend\Validator\File\Count
"Too many files, maximum '%max%' are allowed but '%count%' are given" => "Te veel bestanden, maximaal '%max%' zijn toegestaan, maar '%count%' werd opgegeven",
"Too few files, minimum '%min%' are expected but '%count%' are given" => "Te weinig bestanden, er worden er minimaal '%min%' verwacht, maar er waren er '%count%' opgegeven",
- // Zend_Validator_File_Crc32
- "File '%value%' does not match the given crc32 hashes" => "File '%value%' matcht niet met de opgegeven crc32 hashes",
+ // Zend\Validator\File\Crc32
+ "File does not match the given crc32 hashes" => "File matcht niet met de opgegeven crc32 hashes",
"A crc32 hash could not be evaluated for the given file" => "Fout tijdens het genereren van een crc32 hash van het opgegeven bestand",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
- // Zend_Validator_File_ExcludeExtension
- "File '%value%' has a false extension" => "Het bestand '%value%' heeft een ongeldige extensie",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
+ // Zend\Validator\File\ExcludeExtension
+ "File has an incorrect extension" => "Het bestand heeft een ongeldige extensie",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
- // Zend_Validator_File_Exists
- "File '%value%' does not exist" => "Bestand '%value%' bestaat niet",
+ // Zend\Validator\File\Exists
+ "File does not exist" => "Bestand bestaat niet",
- // Zend_Validator_File_Extension
- "File '%value%' has a false extension" => "Het bestand '%value%' heeft een ongeldige extensie",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
+ // Zend\Validator\File\Extension
+ "File has an incorrect extension" => "Het bestand heeft een ongeldige extensie",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
- // Zend_Validator_File_FilesSize
+ // Zend\Validator\File\FilesSize
"All files in sum should have a maximum size of '%max%' but '%size%' were detected" => "Alle bestanden tesamen hebben een maximale grootte van '%max%' maar '%size%' was gedetecteerd",
"All files in sum should have a minimum size of '%min%' but '%size%' were detected" => "Alle bestanden tesamen hebben een minimum grotte van '%min%' maar '%size%' was gedetecteerd",
- "One or more files can not be read" => "One or more files can not be read",
+ "One or more files can not be read" => "Eén of meerdere bestanden kon niet gelezen worden",
- // Zend_Validator_File_Hash
- "File '%value%' does not match the given hashes" => "Het bestand '%value%' matcht niet met de opgegeven hashes",
+ // Zend\Validator\File\Hash
+ "File does not match the given hashes" => "Het bestand matcht niet met de opgegeven hashes",
"A hash could not be evaluated for the given file" => "Een hash kon niet worden gegenereerd voor het opgegeven bestand",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
-
- // Zend_Validator_File_ImageSize
- "Maximum allowed width for image '%value%' should be '%maxwidth%' but '%width%' detected" => "Maximum breedte voor afbeelding '%value%' is '%maxwidth%' maar '%width%' werd gedetecteerd",
- "Minimum expected width for image '%value%' should be '%minwidth%' but '%width%' detected" => "Minimum breedte voor afbeelding '%value%' is '%minwidth%' maar '%width%' werd gedetecteerd",
- "Maximum allowed height for image '%value%' should be '%maxheight%' but '%height%' detected" => "Maximum hoogte voor afbeelding '%value%' is '%maxheight%' maar '%height%' werd gedetecteerd",
- "Minimum expected height for image '%value%' should be '%minheight%' but '%height%' detected" => "Minimum hoogte voor afbeelding '%value%' is '%minheight%' maar '%height%' werd gedetecteerd",
- "The size of image '%value%' could not be detected" => "De grootte van afbeelding '%value%' kon niet worden gedetecteerd",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
-
- // Zend_Validator_File_IsCompressed
- "File '%value%' is not compressed, '%type%' detected" => "Het bestand '%value%' is niet gecomprimeerd, '%type%' gedetecteerd",
- "The mimetype of file '%value%' could not be detected" => "Het mimetype van bestand '%value%' kon niet worden gedetecteerd",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
-
- // Zend_Validator_File_IsImage
- "File '%value%' is no image, '%type%' detected" => "Het bestand '%value%' is geen afbeelding, '%type%' gedetecteerd",
- "The mimetype of file '%value%' could not be detected" => "Het mimetype van bestand '%value%' kon niet worden gedetecteerd",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
-
- // Zend_Validator_File_Md5
- "File '%value%' does not match the given md5 hashes" => "Het bestand '%value%' matcht niet met de opgegeven md5-hashes",
- "A md5 hash could not be evaluated for the given file" => "Een md5-hash kon niet gegenereerd worden voor het opgegeven bestand",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
-
- // Zend_Validator_File_MimeType
- "File '%value%' has a false mimetype of '%type%'" => "Het bestand '%value%' heeft een ongeldig mimetype: '%type%'",
- "The mimetype of file '%value%' could not be detected" => "Het mimetype van bestand '%value%' kon niet worden gedetecteerd",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
-
- // Zend_Validator_File_NotExists
- "File '%value%' exists" => "Het bestand '%value%' bestaat",
-
- // Zend_Validator_File_Sha1
- "File '%value%' does not match the given sha1 hashes" => "Het bestand '%value%' matcht niet met de opgegeven sha1-hashes",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
+
+ // Zend\Validator\File\ImageSize
+ "Maximum allowed width for image should be '%maxwidth%' but '%width%' detected" => "Maximum breedte voor afbeelding is '%maxwidth%' maar '%width%' werd gedetecteerd",
+ "Minimum expected width for image should be '%minwidth%' but '%width%' detected" => "Minimum breedte voor afbeelding is '%minwidth%' maar '%width%' werd gedetecteerd",
+ "Maximum allowed height for image should be '%maxheight%' but '%height%' detected" => "Maximum hoogte voor afbeelding is '%maxheight%' maar '%height%' werd gedetecteerd",
+ "Minimum expected height for image should be '%minheight%' but '%height%' detected" => "Minimum hoogte voor afbeelding is '%minheight%' maar '%height%' werd gedetecteerd",
+ "The size of image could not be detected" => "De grootte van afbeelding kon niet worden gedetecteerd",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
+
+ // Zend\Validator\File\IsCompressed
+ "File is not compressed, '%type%' detected" => "Het bestand is niet gecomprimeerd, '%type%' gedetecteerd",
+ "The mimetype could not be detected from the file" => "Het mimetype van bestand kon niet worden gedetecteerd",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
+
+ // Zend\Validator\File\IsImage
+ "File is no image, '%type%' detected" => "Het bestand is geen afbeelding, '%type%' gedetecteerd",
+ "The mimetype could not be detected from the file" => "Het mimetype van bestand kon niet worden gedetecteerd",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
+
+ // Zend\Validator\File\Md5
+ "File does not match the given md5 hashes" => "Het bestand matcht niet met de opgegeven md5-hashes",
+ "An md5 hash could not be evaluated for the given file" => "Een md5-hash kon niet gegenereerd worden voor het opgegeven bestand",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
+
+ // Zend\Validator\File\MimeType
+ "File has an incorrect mimetype of '%type%'" => "Het bestand heeft een ongeldig mimetype: '%type%'",
+ "The mimetype could not be detected from the file" => "Het mimetype van bestand kon niet worden gedetecteerd",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
+
+ // Zend\Validator\File\NotExists
+ "File exists" => "Het bestand bestaat",
+
+ // Zend\Validator\File\Sha1
+ "File does not match the given sha1 hashes" => "Het bestand matcht niet met de opgegeven sha1-hashes",
"A sha1 hash could not be evaluated for the given file" => "Een sha1-hash kon niet worden gegenereerd voor het opgegeven bestand",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
- // Zend_Validator_File_Size
- "Maximum allowed size for file '%value%' is '%max%' but '%size%' detected" => "Maximum grootte voor bestand '%value%' is '%max%' maar '%size%' werd gedetecteerd",
- "Minimum expected size for file '%value%' is '%min%' but '%size%' detected" => "Minimum grootte voor bestand '%value%' is '%min%' maar '%size%' werd gedetecteerd",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
+ // Zend\Validator\File\Size
+ "Maximum allowed size for file is '%max%' but '%size%' detected" => "Maximum grootte voor bestand is '%max%' maar '%size%' werd gedetecteerd",
+ "Minimum expected size for file is '%min%' but '%size%' detected" => "Minimum grootte voor bestand is '%min%' maar '%size%' werd gedetecteerd",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
- // Zend_Validator_File_Upload
+ // Zend\Validator\File\Upload
"File '%value%' exceeds the defined ini size" => "Het bestand '%value%' overschrijdt de ini grootte",
"File '%value%' exceeds the defined form size" => "Het bestand '%value%' overschrijdt de formulier grootte",
"File '%value%' was only partially uploaded" => "Het bestand '%value%' was slechts gedeeltelijk geüpload",
@@ -176,20 +183,32 @@ return array(
"File '%value%' was not found" => "Het bestand '%value%' kon niet worden gevonden",
"Unknown error while uploading file '%value%'" => "Er is een onbekende fout opgetreden tijdens het uploaden van '%value%'",
- // Zend_Validator_File_WordCount
- "Too much words, maximum '%max%' are allowed but '%count%' were counted" => "Te veel woorden, er is een maximum van '%max%', maar er waren '%count%' geteld",
+ // Zend\Validator\File\UploadFile
+ "File exceeds the defined ini size" => "Het bestand overschrijdt de ini grootte",
+ "File exceeds the defined form size" => "Het bestand overschrijdt de formulier grootte",
+ "File was only partially uploaded" => "Het bestand was slechts gedeeltelijk geüpload",
+ "File was not uploaded" => "Het bestand was niet geüpload",
+ "No temporary directory was found for file" => "Geen tijdelijke map was gevonden voor bestand",
+ "File can't be written" => "Het bestand kan niet worden geschreven",
+ "A PHP extension returned an error while uploading the file" => "Een PHP-extensie gaf een foutmelding terug tijdens het uploaden van het bestand",
+ "File was illegally uploaded. This could be a possible attack" => "Het bestand was illegaal geüpload. Dit kan een aanval zijn",
+ "File was not found" => "Het bestand kon niet worden gevonden",
+ "Unknown error while uploading file" => "Er is een onbekende fout opgetreden tijdens het uploaden van",
+
+ // Zend\Validator\File\WordCount
+ "Too many words, maximum '%max%' are allowed but '%count%' were counted" => "Te veel woorden, er is een maximum van '%max%', maar er waren '%count%' geteld",
"Too few words, minimum '%min%' are expected but '%count%' were counted" => "Te weinig worden, er is een minimum van '%min%' maar er waren '%count%' getelc",
- "File '%value%' is not readable or does not exist" => "Het bestand '%value%' kon niet worden gevonden",
+ "File is not readable or does not exist" => "Het bestand kon niet worden gevonden",
- // Zend_Validator_GreaterThan
+ // Zend\Validator\GreaterThan
"The input is not greater than '%min%'" => "De input is niet groter dan '%min%'",
"The input is not greater or equal than '%min%'" => "De input is niet groter dan of gelijk aan '%min%'",
- // Zend_Validator_Hex
+ // Zend\Validator\Hex
"Invalid type given. String expected" => "Ongeldig type gegeven, waarde moet een string zijn",
"The input contains non-hexadecimal characters" => "De input bestaat niet enkel uit hexadecimale cijfers",
- // Zend_Validator_Hostname
+ // Zend\Validator\Hostname
"The input appears to be a DNS hostname but the given punycode notation cannot be decoded" => "De input lijkt een geldige DNS hostnaam te zijn, maar de opgegeven punnycode notatie kan niet worden gedecodeerd",
"Invalid type given. String expected" => "Ongeldig type gegeven, waarde moet een string zijn",
"The input appears to be a DNS hostname but contains a dash in an invalid position" => "De input lijkt een DNS hostnaam te zijn, maar bevat een streep op een ongeldige plek",
@@ -202,66 +221,69 @@ return array(
"The input appears to be a DNS hostname but cannot extract TLD part" => "De input lijkt een DNS hostnaam te zijn, maar kan niet het TLD gedeelte bepalen",
"The input appears to be a DNS hostname but cannot match TLD against known list" => "De input lijkt een DNS hostnaam te zijn, maar het TLD bestaat niet in de lijst met bekende TLD's",
- // Zend_Validator_Iban
+ // Zend\Validator\Iban
"Unknown country within the IBAN" => "Onbekend land in de IBAN",
"Countries outside the Single Euro Payments Area (SEPA) are not supported" => "Landen buiten Single Euro Payments Area (SEPA) worden niet ondersteund",
"The input has a false IBAN format" => "De input heeft een ongeldig IBAN formaat",
"The input has failed the IBAN check" => "De input is geen geldige IBAN",
- // Zend_Validator_Identical
+ // Zend\Validator\Identical
"The two given tokens do not match" => "De twee tokens komen niet overeen",
"No token was provided to match against" => "Er is geen token opgegeven om mee te matchen",
- // Zend_Validator_InArray
+ // Zend\Validator\InArray
"The input was not found in the haystack" => "De input kon niet worden gevonden in lijst met beschikbare waardes",
- // Zend_Validator_Ip
+ // Zend\Validator\Ip
"Invalid type given. String expected" => "Ongeldig type gegeven, waarde moet een string zijn",
"The input does not appear to be a valid IP address" => "De input lijkt geen geldig IP adres te zijn",
- // Zend_Validator_Isbn
+ // Zend\Validator\IsInstanceOf
+ "The input is not an instance of '%className%'" => "De input is geen instantie van '%className%'",
+
+ // Zend\Validator\Isbn
"Invalid type given. String or integer expected" => "Ongeldig type opgegeven, waarde moet een string of integer zijn",
"The input is not a valid ISBN number" => "De input is geen geldig ISBN nummer",
- // Zend_Validator_LessThan
+ // Zend\Validator\LessThan
"The input is not less than '%max%'" => "De input is niet minder dan '%max%'",
"The input is not less or equal than '%max%'" => "De input is niet minder dan of gelijk aan '%max%'",
- // Zend_Validator_NotEmpty
+ // Zend\Validator\NotEmpty
"Value is required and can't be empty" => "Waarde is vereist en kan niet leeg worden gelaten",
"Invalid type given. String, integer, float, boolean or array expected" => "Ongeldig type opgegeven, waarde dient een float, string, array, boolean of integer te zijn",
- // Zend_Validator_Regex
+ // Zend\Validator\Regex
"Invalid type given. String, integer or float expected" => "Ongeldig type opgegeven, waarde dient een string, integer of float te zijn",
"The input does not match against pattern '%pattern%'" => "De input matcht niet met het patroon '%pattern%'",
"There was an internal error while using the pattern '%pattern%'" => "Er is een interne fout opgetreden tijdens het gebruik van het patroon '%pattern%'",
- // Zend_Validator_Sitemap_Changefreq
+ // Zend\Validator\Sitemap\Changefreq
"The input is not a valid sitemap changefreq" => "De input is geen geldige sitemap changefreq",
"Invalid type given. String expected" => "Ongeldig type opgegeven, waarde dient een string te zijn",
- // Zend_Validator_Sitemap_Lastmod
+ // Zend\Validator\Sitemap\Lastmod
"The input is not a valid sitemap lastmod" => "De input is geen geldige sitemap lastmod",
"Invalid type given. String expected" => "Ongeldig type opgegeven, waarde dient een string te zijn",
- // Zend_Validator_Sitemap_Loc
+ // Zend\Validator\Sitemap\Loc
"The input is not a valid sitemap location" => "De input is geen geldige sitemap locatie",
"Invalid type given. String expected" => "Ongeldig type opgegeven, waarde dient een string te zijn",
- // Zend_Validator_Sitemap_Priority
+ // Zend\Validator\Sitemap\Priority
"The input is not a valid sitemap priority" => "De input is geen geldige sitemap prioriteit",
"Invalid type given. Numeric string, integer or float expected" => "Ongeldig type opgegeven, waarde dient een numerieke string, integer of float te zijn",
- // Zend_Validator_Step
+ // Zend\Validator\Step
"Invalid value given. Scalar expected" => "Ongeldige waarde opgegeven, waarde dient een scalar te zijn",
"The input is not a valid step" => "De input is geen geldige stap",
- // Zend_Validator_StringLength
+ // Zend\Validator\StringLength
"Invalid type given. String expected" => "Ongeldig type opgegeven, waarde dient een string te zijn",
"The input is less than %min% characters long" => "De input is minder dan %min% tekens lang",
"The input is more than %max% characters long" => "De input is meer dan %max% tekens lang",
- // Zend_Validator_Uri
+ // Zend\Validator\Uri
"Invalid type given. String expected" => "Ongeldig type opgegeven, waarde dient een string te zijn",
"The input does not appear to be a valid Uri" => "De input blijkt geen geldige Uri te zijn",
);
diff --git a/vendor/zendframework/zendframework/resources/languages/no/Zend_Captcha.php b/vendor/zendframework/zendframework/resources/languages/no/Zend_Captcha.php
index 2c04e61df98..05c5a7ec0c1 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 2100db00cf3..284b82e8597 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 29a6aa6d648..2259461684f 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 3e499e0b552..10618ce0478 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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_Captcha.php b/vendor/zendframework/zendframework/resources/languages/pt_BR/Zend_Captcha.php
index f4229d148f1..c8d8f2634f2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 298560c0fb9..153f228f98b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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_Validate.php b/vendor/zendframework/zendframework/resources/languages/ru/Zend_Validate.php
index 1dcfa4374d1..1af75359de6 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 f55a5a976fc..59422bb7dc2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 1e7f30a6ccf..7a46df4a962 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 c7b4f8c862a..66f164775a2 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 78f0acf4e90..646c100e6f3 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 3a991919678..34b570b5472 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 9881f40e8b8..5057d5671ab 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 d3149fe2c00..ce182270ef9 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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_Captcha.php b/vendor/zendframework/zendframework/resources/languages/tr/Zend_Captcha.php
index 7d8803dec1e..5314ab824b5 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 c202f6e9d6d..4177ffff453 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 cca495d4082..44a1d66384b 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 1e32d102a5a..10a9393535a 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 e555499e652..25335e848f8 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 32edca5c0b8..2fa1ea77493 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 a722bbcac2d..e4e58692b73 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend 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 a7c1851d2ef..f163ecc7f60 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-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
--
GitLab