From 7545fdb588e8813f5fb1d3995c9893bd0d7dddec Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Tue, 16 Sep 2014 08:00:32 +0000 Subject: [PATCH] Upgrade Zend Framework to version 1.12.8 --- library/Zend/Acl.php | 6 +- library/Zend/Acl/Assert/Interface.php | 6 +- library/Zend/Acl/Exception.php | 6 +- library/Zend/Acl/Resource.php | 7 +- library/Zend/Acl/Resource/Interface.php | 6 +- library/Zend/Acl/Role.php | 7 +- library/Zend/Acl/Role/Interface.php | 6 +- library/Zend/Acl/Role/Registry.php | 6 +- library/Zend/Acl/Role/Registry/Exception.php | 6 +- library/Zend/Amf/Adobe/Auth.php | 11 +- library/Zend/Amf/Adobe/DbInspector.php | 6 +- library/Zend/Amf/Adobe/Introspector.php | 6 +- library/Zend/Amf/Auth/Abstract.php | 6 +- library/Zend/Amf/Constants.php | 6 +- library/Zend/Amf/Exception.php | 6 +- library/Zend/Amf/Parse/Amf0/Deserializer.php | 11 +- library/Zend/Amf/Parse/Amf0/Serializer.php | 6 +- library/Zend/Amf/Parse/Amf3/Deserializer.php | 11 +- library/Zend/Amf/Parse/Amf3/Serializer.php | 6 +- library/Zend/Amf/Parse/Deserializer.php | 6 +- library/Zend/Amf/Parse/InputStream.php | 6 +- library/Zend/Amf/Parse/OutputStream.php | 6 +- .../Zend/Amf/Parse/Resource/MysqlResult.php | 6 +- .../Zend/Amf/Parse/Resource/MysqliResult.php | 6 +- library/Zend/Amf/Parse/Resource/Stream.php | 6 +- library/Zend/Amf/Parse/Serializer.php | 6 +- library/Zend/Amf/Parse/TypeLoader.php | 6 +- library/Zend/Amf/Request.php | 6 +- library/Zend/Amf/Request/Http.php | 6 +- library/Zend/Amf/Response.php | 6 +- library/Zend/Amf/Response/Http.php | 6 +- library/Zend/Amf/Server.php | 6 +- library/Zend/Amf/Server/Exception.php | 6 +- library/Zend/Amf/Util/BinaryStream.php | 6 +- library/Zend/Amf/Value/ByteArray.php | 6 +- library/Zend/Amf/Value/MessageBody.php | 6 +- library/Zend/Amf/Value/MessageHeader.php | 6 +- .../Amf/Value/Messaging/AbstractMessage.php | 6 +- .../Value/Messaging/AcknowledgeMessage.php | 6 +- .../Amf/Value/Messaging/ArrayCollection.php | 6 +- .../Zend/Amf/Value/Messaging/AsyncMessage.php | 6 +- .../Amf/Value/Messaging/CommandMessage.php | 6 +- .../Zend/Amf/Value/Messaging/ErrorMessage.php | 6 +- .../Amf/Value/Messaging/RemotingMessage.php | 6 +- library/Zend/Amf/Value/TraitsInfo.php | 6 +- library/Zend/Application.php | 6 +- .../Zend/Application/Bootstrap/Bootstrap.php | 14 +- .../Bootstrap/BootstrapAbstract.php | 28 +- .../Application/Bootstrap/Bootstrapper.php | 7 +- .../Zend/Application/Bootstrap/Exception.php | 6 +- .../Bootstrap/ResourceBootstrapper.php | 6 +- library/Zend/Application/Exception.php | 6 +- .../Zend/Application/Module/Autoloader.php | 7 +- library/Zend/Application/Module/Bootstrap.php | 9 +- .../Application/Resource/Cachemanager.php | 15 +- library/Zend/Application/Resource/Db.php | 14 +- library/Zend/Application/Resource/Dojo.php | 6 +- .../Zend/Application/Resource/Exception.php | 6 +- .../Application/Resource/Frontcontroller.php | 7 +- library/Zend/Application/Resource/Layout.php | 6 +- library/Zend/Application/Resource/Locale.php | 6 +- library/Zend/Application/Resource/Log.php | 6 +- library/Zend/Application/Resource/Mail.php | 6 +- library/Zend/Application/Resource/Modules.php | 7 +- library/Zend/Application/Resource/Multidb.php | 6 +- .../Zend/Application/Resource/Navigation.php | 6 +- .../Zend/Application/Resource/Resource.php | 7 +- .../Application/Resource/ResourceAbstract.php | 6 +- library/Zend/Application/Resource/Router.php | 6 +- library/Zend/Application/Resource/Session.php | 7 +- .../Zend/Application/Resource/Translate.php | 12 +- .../Zend/Application/Resource/Useragent.php | 4 +- library/Zend/Application/Resource/View.php | 6 +- library/Zend/Auth.php | 6 +- library/Zend/Auth/Adapter/DbTable.php | 7 +- library/Zend/Auth/Adapter/Digest.php | 7 +- library/Zend/Auth/Adapter/Exception.php | 6 +- library/Zend/Auth/Adapter/Http.php | 7 +- .../Auth/Adapter/Http/Resolver/Exception.php | 6 +- .../Zend/Auth/Adapter/Http/Resolver/File.php | 7 +- .../Auth/Adapter/Http/Resolver/Interface.php | 6 +- library/Zend/Auth/Adapter/Interface.php | 6 +- library/Zend/Auth/Adapter/Ldap.php | 7 +- library/Zend/Auth/Adapter/OpenId.php | 9 +- library/Zend/Auth/Exception.php | 6 +- library/Zend/Auth/Result.php | 13 +- library/Zend/Auth/Storage/Exception.php | 6 +- library/Zend/Auth/Storage/Interface.php | 6 +- library/Zend/Auth/Storage/NonPersistent.php | 6 +- library/Zend/Auth/Storage/Session.php | 11 +- library/Zend/Barcode.php | 6 +- library/Zend/Barcode/Exception.php | 6 +- library/Zend/Barcode/Object/Code128.php | 8 +- library/Zend/Barcode/Object/Code25.php | 6 +- .../Zend/Barcode/Object/Code25interleaved.php | 6 +- library/Zend/Barcode/Object/Code39.php | 6 +- library/Zend/Barcode/Object/Ean13.php | 6 +- library/Zend/Barcode/Object/Ean2.php | 6 +- library/Zend/Barcode/Object/Ean5.php | 6 +- library/Zend/Barcode/Object/Ean8.php | 8 +- library/Zend/Barcode/Object/Error.php | 10 +- library/Zend/Barcode/Object/Exception.php | 6 +- library/Zend/Barcode/Object/Identcode.php | 8 +- library/Zend/Barcode/Object/Itf14.php | 6 +- library/Zend/Barcode/Object/Leitcode.php | 6 +- .../Zend/Barcode/Object/ObjectAbstract.php | 97 +- library/Zend/Barcode/Object/Planet.php | 8 +- library/Zend/Barcode/Object/Postnet.php | 6 +- library/Zend/Barcode/Object/Royalmail.php | 6 +- library/Zend/Barcode/Object/Upca.php | 6 +- library/Zend/Barcode/Object/Upce.php | 8 +- library/Zend/Barcode/Renderer/Exception.php | 6 +- library/Zend/Barcode/Renderer/Image.php | 35 +- library/Zend/Barcode/Renderer/Pdf.php | 27 +- .../Barcode/Renderer/RendererAbstract.php | 47 +- library/Zend/Barcode/Renderer/Svg.php | 29 +- library/Zend/Cache.php | 6 +- library/Zend/Cache/Backend.php | 10 +- library/Zend/Cache/Backend/Apc.php | 18 +- library/Zend/Cache/Backend/BlackHole.php | 6 +- .../Zend/Cache/Backend/ExtendedInterface.php | 6 +- library/Zend/Cache/Backend/File.php | 42 +- library/Zend/Cache/Backend/Interface.php | 6 +- library/Zend/Cache/Backend/Libmemcached.php | 8 +- library/Zend/Cache/Backend/Memcached.php | 6 +- library/Zend/Cache/Backend/Sqlite.php | 6 +- library/Zend/Cache/Backend/Static.php | 49 +- library/Zend/Cache/Backend/Test.php | 9 +- library/Zend/Cache/Backend/TwoLevels.php | 30 +- library/Zend/Cache/Backend/WinCache.php | 4 +- library/Zend/Cache/Backend/Xcache.php | 6 +- library/Zend/Cache/Backend/ZendPlatform.php | 6 +- library/Zend/Cache/Backend/ZendServer.php | 6 +- .../Zend/Cache/Backend/ZendServer/Disk.php | 9 +- .../Zend/Cache/Backend/ZendServer/ShMem.php | 17 +- library/Zend/Cache/Core.php | 6 +- library/Zend/Cache/Exception.php | 6 +- library/Zend/Cache/Frontend/Capture.php | 6 +- library/Zend/Cache/Frontend/Class.php | 58 +- library/Zend/Cache/Frontend/File.php | 6 +- library/Zend/Cache/Frontend/Function.php | 6 +- library/Zend/Cache/Frontend/Output.php | 6 +- library/Zend/Cache/Frontend/Page.php | 6 +- library/Zend/Cache/Manager.php | 22 +- library/Zend/Captcha/Adapter.php | 6 +- library/Zend/Captcha/Base.php | 8 +- library/Zend/Captcha/Dumb.php | 6 +- library/Zend/Captcha/Exception.php | 6 +- library/Zend/Captcha/Figlet.php | 9 +- library/Zend/Captcha/Image.php | 28 +- library/Zend/Captcha/ReCaptcha.php | 12 +- library/Zend/Captcha/Word.php | 11 +- library/Zend/Cloud/AbstractFactory.php | 4 +- .../Zend/Cloud/DocumentService/Adapter.php | 4 +- .../Adapter/AbstractAdapter.php | 4 +- .../DocumentService/Adapter/SimpleDb.php | 4 +- .../Adapter/SimpleDb/Query.php | 4 +- .../DocumentService/Adapter/WindowsAzure.php | 4 +- .../Adapter/WindowsAzure/Query.php | 4 +- .../Zend/Cloud/DocumentService/Document.php | 4 +- .../Cloud/DocumentService/DocumentSet.php | 4 +- .../Zend/Cloud/DocumentService/Exception.php | 4 +- .../Zend/Cloud/DocumentService/Factory.php | 4 +- library/Zend/Cloud/DocumentService/Query.php | 4 +- .../Cloud/DocumentService/QueryAdapter.php | 4 +- library/Zend/Cloud/Exception.php | 4 +- library/Zend/Cloud/Infrastructure/Adapter.php | 4 +- .../Adapter/AbstractAdapter.php | 4 +- .../Zend/Cloud/Infrastructure/Adapter/Ec2.php | 4 +- .../Infrastructure/Adapter/Rackspace.php | 4 +- .../Zend/Cloud/Infrastructure/Exception.php | 4 +- library/Zend/Cloud/Infrastructure/Factory.php | 4 +- library/Zend/Cloud/Infrastructure/Image.php | 4 +- .../Zend/Cloud/Infrastructure/ImageList.php | 4 +- .../Zend/Cloud/Infrastructure/Instance.php | 4 +- .../Cloud/Infrastructure/InstanceList.php | 4 +- .../Cloud/OperationNotAvailableException.php | 4 +- library/Zend/Cloud/QueueService/Adapter.php | 4 +- .../QueueService/Adapter/AbstractAdapter.php | 4 +- .../Zend/Cloud/QueueService/Adapter/Sqs.php | 6 +- .../QueueService/Adapter/WindowsAzure.php | 4 +- .../Cloud/QueueService/Adapter/ZendQueue.php | 4 +- library/Zend/Cloud/QueueService/Exception.php | 4 +- library/Zend/Cloud/QueueService/Factory.php | 4 +- library/Zend/Cloud/QueueService/Message.php | 4 +- .../Zend/Cloud/QueueService/MessageSet.php | 4 +- library/Zend/Cloud/StorageService/Adapter.php | 4 +- .../StorageService/Adapter/FileSystem.php | 4 +- .../StorageService/Adapter/Rackspace.php | 4 +- .../Zend/Cloud/StorageService/Adapter/S3.php | 4 +- .../StorageService/Adapter/WindowsAzure.php | 4 +- .../Zend/Cloud/StorageService/Exception.php | 4 +- library/Zend/Cloud/StorageService/Factory.php | 4 +- library/Zend/CodeGenerator/Abstract.php | 6 +- library/Zend/CodeGenerator/Exception.php | 8 +- library/Zend/CodeGenerator/Php/Abstract.php | 6 +- library/Zend/CodeGenerator/Php/Body.php | 6 +- library/Zend/CodeGenerator/Php/Class.php | 6 +- library/Zend/CodeGenerator/Php/Docblock.php | 17 +- .../Zend/CodeGenerator/Php/Docblock/Tag.php | 6 +- .../Php/Docblock/Tag/License.php | 8 +- .../CodeGenerator/Php/Docblock/Tag/Param.php | 6 +- .../CodeGenerator/Php/Docblock/Tag/Return.php | 8 +- library/Zend/CodeGenerator/Php/Exception.php | 6 +- library/Zend/CodeGenerator/Php/File.php | 6 +- .../CodeGenerator/Php/Member/Abstract.php | 6 +- .../CodeGenerator/Php/Member/Container.php | 8 +- library/Zend/CodeGenerator/Php/Method.php | 6 +- library/Zend/CodeGenerator/Php/Parameter.php | 8 +- .../Php/Parameter/DefaultValue.php | 8 +- library/Zend/CodeGenerator/Php/Property.php | 6 +- .../Php/Property/DefaultValue.php | 6 +- library/Zend/Config.php | 10 +- library/Zend/Config/Exception.php | 6 +- library/Zend/Config/Ini.php | 6 +- library/Zend/Config/Json.php | 8 +- library/Zend/Config/Writer.php | 6 +- library/Zend/Config/Writer/Array.php | 6 +- library/Zend/Config/Writer/FileAbstract.php | 8 +- library/Zend/Config/Writer/Ini.php | 6 +- library/Zend/Config/Writer/Json.php | 2 +- library/Zend/Config/Writer/Xml.php | 6 +- library/Zend/Config/Writer/Yaml.php | 2 +- library/Zend/Config/Xml.php | 28 +- library/Zend/Config/Yaml.php | 6 +- library/Zend/Console/Getopt.php | 6 +- library/Zend/Console/Getopt/Exception.php | 6 +- library/Zend/Controller/Action.php | 6 +- library/Zend/Controller/Action/Exception.php | 6 +- .../Controller/Action/Helper/Abstract.php | 6 +- .../Controller/Action/Helper/ActionStack.php | 6 +- .../Controller/Action/Helper/AjaxContext.php | 6 +- .../Action/Helper/AutoComplete/Abstract.php | 6 +- .../Action/Helper/AutoCompleteDojo.php | 6 +- .../Helper/AutoCompleteScriptaculous.php | 6 +- .../Zend/Controller/Action/Helper/Cache.php | 6 +- .../Action/Helper/ContextSwitch.php | 6 +- .../Action/Helper/FlashMessenger.php | 10 +- .../Zend/Controller/Action/Helper/Json.php | 6 +- .../Controller/Action/Helper/Redirector.php | 6 +- library/Zend/Controller/Action/Helper/Url.php | 6 +- .../Controller/Action/Helper/ViewRenderer.php | 6 +- .../Zend/Controller/Action/HelperBroker.php | 6 +- .../Action/HelperBroker/PriorityStack.php | 6 +- library/Zend/Controller/Action/Interface.php | 6 +- .../Zend/Controller/Dispatcher/Abstract.php | 6 +- .../Zend/Controller/Dispatcher/Exception.php | 6 +- .../Zend/Controller/Dispatcher/Interface.php | 6 +- .../Zend/Controller/Dispatcher/Standard.php | 6 +- library/Zend/Controller/Exception.php | 6 +- library/Zend/Controller/Front.php | 6 +- library/Zend/Controller/Plugin/Abstract.php | 6 +- .../Zend/Controller/Plugin/ActionStack.php | 6 +- library/Zend/Controller/Plugin/Broker.php | 6 +- .../Zend/Controller/Plugin/ErrorHandler.php | 6 +- library/Zend/Controller/Plugin/PutHandler.php | 6 +- library/Zend/Controller/Request/Abstract.php | 6 +- library/Zend/Controller/Request/Apache404.php | 4 +- library/Zend/Controller/Request/Exception.php | 6 +- library/Zend/Controller/Request/Http.php | 4 +- .../Zend/Controller/Request/HttpTestCase.php | 4 +- library/Zend/Controller/Request/Simple.php | 6 +- library/Zend/Controller/Response/Abstract.php | 6 +- library/Zend/Controller/Response/Cli.php | 6 +- .../Zend/Controller/Response/Exception.php | 6 +- library/Zend/Controller/Response/Http.php | 4 +- .../Zend/Controller/Response/HttpTestCase.php | 4 +- library/Zend/Controller/Router/Abstract.php | 6 +- library/Zend/Controller/Router/Exception.php | 6 +- library/Zend/Controller/Router/Interface.php | 6 +- library/Zend/Controller/Router/Rewrite.php | 6 +- library/Zend/Controller/Router/Route.php | 6 +- .../Zend/Controller/Router/Route/Abstract.php | 6 +- .../Zend/Controller/Router/Route/Chain.php | 8 +- .../Zend/Controller/Router/Route/Hostname.php | 6 +- .../Controller/Router/Route/Interface.php | 6 +- .../Zend/Controller/Router/Route/Module.php | 6 +- .../Zend/Controller/Router/Route/Regex.php | 6 +- .../Zend/Controller/Router/Route/Static.php | 6 +- library/Zend/Crypt.php | 6 +- library/Zend/Crypt/DiffieHellman.php | 18 +- .../Zend/Crypt/DiffieHellman/Exception.php | 8 +- library/Zend/Crypt/Exception.php | 8 +- library/Zend/Crypt/Hmac.php | 13 +- library/Zend/Crypt/Hmac/Exception.php | 8 +- library/Zend/Crypt/Math.php | 6 +- library/Zend/Crypt/Math/BigInteger.php | 15 +- library/Zend/Crypt/Math/BigInteger/Bcmath.php | 46 +- .../Zend/Crypt/Math/BigInteger/Exception.php | 8 +- library/Zend/Crypt/Math/BigInteger/Gmp.php | 74 +- .../Zend/Crypt/Math/BigInteger/Interface.php | 8 +- library/Zend/Crypt/Math/Exception.php | 8 +- library/Zend/Crypt/Rsa.php | 6 +- library/Zend/Crypt/Rsa/Exception.php | 6 +- library/Zend/Crypt/Rsa/Key.php | 8 +- library/Zend/Crypt/Rsa/Key/Private.php | 8 +- library/Zend/Crypt/Rsa/Key/Public.php | 8 +- library/Zend/Currency.php | 6 +- library/Zend/Currency/CurrencyInterface.php | 6 +- library/Zend/Currency/Exception.php | 6 +- library/Zend/Date.php | 77 +- library/Zend/Date/Cities.php | 6 +- library/Zend/Date/DateObject.php | 6 +- library/Zend/Date/Exception.php | 6 +- library/Zend/Db.php | 6 +- library/Zend/Db/Adapter/Abstract.php | 17 +- library/Zend/Db/Adapter/Db2.php | 6 +- library/Zend/Db/Adapter/Db2/Exception.php | 6 +- library/Zend/Db/Adapter/Exception.php | 8 +- library/Zend/Db/Adapter/Mysqli.php | 6 +- library/Zend/Db/Adapter/Mysqli/Exception.php | 6 +- library/Zend/Db/Adapter/Oracle.php | 6 +- library/Zend/Db/Adapter/Oracle/Exception.php | 6 +- library/Zend/Db/Adapter/Pdo/Abstract.php | 6 +- library/Zend/Db/Adapter/Pdo/Ibm.php | 6 +- library/Zend/Db/Adapter/Pdo/Ibm/Db2.php | 6 +- library/Zend/Db/Adapter/Pdo/Ibm/Ids.php | 6 +- library/Zend/Db/Adapter/Pdo/Mssql.php | 8 +- library/Zend/Db/Adapter/Pdo/Mysql.php | 10 +- library/Zend/Db/Adapter/Pdo/Oci.php | 6 +- library/Zend/Db/Adapter/Pdo/Pgsql.php | 6 +- library/Zend/Db/Adapter/Pdo/Sqlite.php | 6 +- library/Zend/Db/Adapter/Sqlsrv.php | 6 +- library/Zend/Db/Adapter/Sqlsrv/Exception.php | 6 +- library/Zend/Db/Exception.php | 6 +- library/Zend/Db/Expr.php | 6 +- library/Zend/Db/Profiler.php | 6 +- library/Zend/Db/Profiler/Exception.php | 6 +- library/Zend/Db/Profiler/Firebug.php | 6 +- library/Zend/Db/Profiler/Query.php | 6 +- library/Zend/Db/Select.php | 24 +- library/Zend/Db/Select/Exception.php | 6 +- library/Zend/Db/Statement.php | 6 +- library/Zend/Db/Statement/Db2.php | 6 +- library/Zend/Db/Statement/Db2/Exception.php | 6 +- library/Zend/Db/Statement/Exception.php | 6 +- library/Zend/Db/Statement/Interface.php | 6 +- library/Zend/Db/Statement/Mysqli.php | 8 +- .../Zend/Db/Statement/Mysqli/Exception.php | 6 +- library/Zend/Db/Statement/Oracle.php | 6 +- .../Zend/Db/Statement/Oracle/Exception.php | 6 +- library/Zend/Db/Statement/Pdo.php | 9 +- library/Zend/Db/Statement/Pdo/Ibm.php | 8 +- library/Zend/Db/Statement/Pdo/Oci.php | 8 +- library/Zend/Db/Statement/Sqlsrv.php | 6 +- .../Zend/Db/Statement/Sqlsrv/Exception.php | 6 +- library/Zend/Db/Table.php | 6 +- library/Zend/Db/Table/Abstract.php | 46 +- library/Zend/Db/Table/Definition.php | 6 +- library/Zend/Db/Table/Exception.php | 6 +- library/Zend/Db/Table/Row.php | 6 +- library/Zend/Db/Table/Row/Abstract.php | 6 +- library/Zend/Db/Table/Row/Exception.php | 6 +- library/Zend/Db/Table/Rowset.php | 6 +- library/Zend/Db/Table/Rowset/Abstract.php | 19 +- library/Zend/Db/Table/Rowset/Exception.php | 6 +- library/Zend/Db/Table/Select.php | 8 +- library/Zend/Db/Table/Select/Exception.php | 6 +- library/Zend/Debug.php | 6 +- library/Zend/Dojo.php | 6 +- library/Zend/Dojo/BuildLayer.php | 6 +- library/Zend/Dojo/Data.php | 6 +- library/Zend/Dojo/Exception.php | 6 +- library/Zend/Dojo/Form.php | 6 +- .../Form/Decorator/AccordionContainer.php | 6 +- .../Dojo/Form/Decorator/AccordionPane.php | 6 +- .../Dojo/Form/Decorator/BorderContainer.php | 6 +- .../Zend/Dojo/Form/Decorator/ContentPane.php | 6 +- .../Dojo/Form/Decorator/DijitContainer.php | 6 +- .../Zend/Dojo/Form/Decorator/DijitElement.php | 6 +- .../Zend/Dojo/Form/Decorator/DijitForm.php | 6 +- .../Dojo/Form/Decorator/SplitContainer.php | 6 +- .../Dojo/Form/Decorator/StackContainer.php | 6 +- .../Zend/Dojo/Form/Decorator/TabContainer.php | 6 +- library/Zend/Dojo/Form/DisplayGroup.php | 6 +- library/Zend/Dojo/Form/Element/Button.php | 6 +- library/Zend/Dojo/Form/Element/CheckBox.php | 6 +- library/Zend/Dojo/Form/Element/ComboBox.php | 6 +- .../Dojo/Form/Element/CurrencyTextBox.php | 6 +- .../Zend/Dojo/Form/Element/DateTextBox.php | 6 +- library/Zend/Dojo/Form/Element/Dijit.php | 6 +- library/Zend/Dojo/Form/Element/DijitMulti.php | 6 +- library/Zend/Dojo/Form/Element/Editor.php | 6 +- .../Dojo/Form/Element/FilteringSelect.php | 6 +- .../Dojo/Form/Element/HorizontalSlider.php | 6 +- .../Zend/Dojo/Form/Element/NumberSpinner.php | 6 +- .../Zend/Dojo/Form/Element/NumberTextBox.php | 6 +- .../Dojo/Form/Element/PasswordTextBox.php | 6 +- .../Zend/Dojo/Form/Element/RadioButton.php | 6 +- .../Zend/Dojo/Form/Element/SimpleTextarea.php | 6 +- library/Zend/Dojo/Form/Element/Slider.php | 6 +- .../Zend/Dojo/Form/Element/SubmitButton.php | 6 +- library/Zend/Dojo/Form/Element/TextBox.php | 6 +- library/Zend/Dojo/Form/Element/Textarea.php | 6 +- .../Zend/Dojo/Form/Element/TimeTextBox.php | 6 +- .../Dojo/Form/Element/ValidationTextBox.php | 6 +- .../Zend/Dojo/Form/Element/VerticalSlider.php | 6 +- library/Zend/Dojo/Form/SubForm.php | 6 +- library/Zend/Dojo/View/Exception.php | 6 +- .../Dojo/View/Helper/AccordionContainer.php | 6 +- .../Zend/Dojo/View/Helper/AccordionPane.php | 6 +- .../Zend/Dojo/View/Helper/BorderContainer.php | 6 +- library/Zend/Dojo/View/Helper/Button.php | 6 +- library/Zend/Dojo/View/Helper/CheckBox.php | 6 +- library/Zend/Dojo/View/Helper/ComboBox.php | 6 +- library/Zend/Dojo/View/Helper/ContentPane.php | 6 +- .../Zend/Dojo/View/Helper/CurrencyTextBox.php | 6 +- library/Zend/Dojo/View/Helper/CustomDijit.php | 6 +- library/Zend/Dojo/View/Helper/DateTextBox.php | 6 +- library/Zend/Dojo/View/Helper/Dijit.php | 6 +- .../Zend/Dojo/View/Helper/DijitContainer.php | 6 +- library/Zend/Dojo/View/Helper/Dojo.php | 6 +- .../Zend/Dojo/View/Helper/Dojo/Container.php | 8 +- library/Zend/Dojo/View/Helper/Editor.php | 6 +- .../Zend/Dojo/View/Helper/FilteringSelect.php | 6 +- library/Zend/Dojo/View/Helper/Form.php | 6 +- .../Dojo/View/Helper/HorizontalSlider.php | 6 +- .../Zend/Dojo/View/Helper/NumberSpinner.php | 6 +- .../Zend/Dojo/View/Helper/NumberTextBox.php | 6 +- .../Zend/Dojo/View/Helper/PasswordTextBox.php | 6 +- library/Zend/Dojo/View/Helper/RadioButton.php | 6 +- .../Zend/Dojo/View/Helper/SimpleTextarea.php | 8 +- library/Zend/Dojo/View/Helper/Slider.php | 6 +- .../Zend/Dojo/View/Helper/SplitContainer.php | 6 +- .../Zend/Dojo/View/Helper/StackContainer.php | 6 +- .../Zend/Dojo/View/Helper/SubmitButton.php | 6 +- .../Zend/Dojo/View/Helper/TabContainer.php | 6 +- library/Zend/Dojo/View/Helper/TextBox.php | 6 +- library/Zend/Dojo/View/Helper/Textarea.php | 6 +- library/Zend/Dojo/View/Helper/TimeTextBox.php | 6 +- .../Dojo/View/Helper/ValidationTextBox.php | 6 +- .../Zend/Dojo/View/Helper/VerticalSlider.php | 6 +- library/Zend/Dom/Exception.php | 6 +- library/Zend/Dom/Query.php | 32 +- library/Zend/Dom/Query/Css2Xpath.php | 6 +- library/Zend/Dom/Query/Result.php | 6 +- library/Zend/EventManager/Event.php | 4 +- library/Zend/EventManager/EventCollection.php | 4 +- .../Zend/EventManager/EventDescription.php | 4 +- library/Zend/EventManager/EventManager.php | 4 +- .../Zend/EventManager/EventManagerAware.php | 4 +- library/Zend/EventManager/Exception.php | 4 +- .../Exception/InvalidArgumentException.php | 4 +- library/Zend/EventManager/Filter.php | 4 +- .../EventManager/Filter/FilterIterator.php | 4 +- library/Zend/EventManager/FilterChain.php | 4 +- .../Zend/EventManager/GlobalEventManager.php | 4 +- .../Zend/EventManager/ListenerAggregate.php | 4 +- .../Zend/EventManager/ResponseCollection.php | 4 +- .../EventManager/SharedEventCollection.php | 4 +- .../SharedEventCollectionAware.php | 4 +- .../Zend/EventManager/SharedEventManager.php | 4 +- .../Zend/EventManager/StaticEventManager.php | 4 +- library/Zend/Exception.php | 6 +- library/Zend/Feed.php | 21 +- library/Zend/Feed/Abstract.php | 23 +- library/Zend/Feed/Atom.php | 6 +- library/Zend/Feed/Builder.php | 6 +- library/Zend/Feed/Builder/Entry.php | 6 +- library/Zend/Feed/Builder/Exception.php | 6 +- library/Zend/Feed/Builder/Header.php | 6 +- library/Zend/Feed/Builder/Header/Itunes.php | 8 +- library/Zend/Feed/Builder/Interface.php | 6 +- library/Zend/Feed/Element.php | 6 +- library/Zend/Feed/Entry/Abstract.php | 12 +- library/Zend/Feed/Entry/Atom.php | 12 +- library/Zend/Feed/Entry/Rss.php | 6 +- library/Zend/Feed/Exception.php | 6 +- library/Zend/Feed/Pubsubhubbub.php | 6 +- .../Feed/Pubsubhubbub/CallbackAbstract.php | 6 +- .../Feed/Pubsubhubbub/CallbackInterface.php | 6 +- library/Zend/Feed/Pubsubhubbub/Exception.php | 6 +- .../Zend/Feed/Pubsubhubbub/HttpResponse.php | 6 +- .../Feed/Pubsubhubbub/Model/ModelAbstract.php | 6 +- .../Feed/Pubsubhubbub/Model/Subscription.php | 6 +- .../Model/SubscriptionInterface.php | 6 +- library/Zend/Feed/Pubsubhubbub/Publisher.php | 6 +- library/Zend/Feed/Pubsubhubbub/Subscriber.php | 6 +- .../Feed/Pubsubhubbub/Subscriber/Callback.php | 6 +- library/Zend/Feed/Reader.php | 57 +- library/Zend/Feed/Reader/Collection.php | 6 +- .../Zend/Feed/Reader/Collection/Author.php | 6 +- .../Zend/Feed/Reader/Collection/Category.php | 6 +- .../Reader/Collection/CollectionAbstract.php | 6 +- library/Zend/Feed/Reader/Entry/Atom.php | 6 +- library/Zend/Feed/Reader/Entry/Rss.php | 6 +- library/Zend/Feed/Reader/EntryAbstract.php | 6 +- library/Zend/Feed/Reader/EntryInterface.php | 6 +- .../Zend/Feed/Reader/Extension/Atom/Entry.php | 8 +- .../Zend/Feed/Reader/Extension/Atom/Feed.php | 6 +- .../Feed/Reader/Extension/Content/Entry.php | 6 +- .../Extension/CreativeCommons/Entry.php | 6 +- .../Reader/Extension/CreativeCommons/Feed.php | 6 +- .../Reader/Extension/DublinCore/Entry.php | 6 +- .../Feed/Reader/Extension/DublinCore/Feed.php | 6 +- .../Feed/Reader/Extension/EntryAbstract.php | 6 +- .../Feed/Reader/Extension/FeedAbstract.php | 6 +- .../Feed/Reader/Extension/Podcast/Entry.php | 8 +- .../Feed/Reader/Extension/Podcast/Feed.php | 8 +- .../Feed/Reader/Extension/Slash/Entry.php | 6 +- .../Reader/Extension/Syndication/Feed.php | 6 +- .../Feed/Reader/Extension/Thread/Entry.php | 6 +- .../Reader/Extension/WellFormedWeb/Entry.php | 6 +- library/Zend/Feed/Reader/Feed/Atom.php | 6 +- library/Zend/Feed/Reader/Feed/Atom/Source.php | 6 +- library/Zend/Feed/Reader/Feed/Rss.php | 6 +- library/Zend/Feed/Reader/FeedAbstract.php | 6 +- library/Zend/Feed/Reader/FeedInterface.php | 6 +- library/Zend/Feed/Reader/FeedSet.php | 6 +- library/Zend/Feed/Rss.php | 6 +- library/Zend/Feed/Writer.php | 6 +- library/Zend/Feed/Writer/Deleted.php | 6 +- library/Zend/Feed/Writer/Entry.php | 6 +- .../Exception/InvalidMethodException.php | 6 +- .../Writer/Extension/Atom/Renderer/Feed.php | 6 +- .../Extension/Content/Renderer/Entry.php | 6 +- .../Extension/DublinCore/Renderer/Entry.php | 6 +- .../Extension/DublinCore/Renderer/Feed.php | 6 +- .../Feed/Writer/Extension/ITunes/Entry.php | 6 +- .../Feed/Writer/Extension/ITunes/Feed.php | 6 +- .../Extension/ITunes/Renderer/Entry.php | 6 +- .../Writer/Extension/ITunes/Renderer/Feed.php | 6 +- .../Writer/Extension/RendererAbstract.php | 6 +- .../Writer/Extension/RendererInterface.php | 6 +- .../Writer/Extension/Slash/Renderer/Entry.php | 6 +- .../Extension/Threading/Renderer/Entry.php | 6 +- .../WellFormedWeb/Renderer/Entry.php | 6 +- library/Zend/Feed/Writer/Feed.php | 6 +- .../Zend/Feed/Writer/Feed/FeedAbstract.php | 6 +- .../Zend/Feed/Writer/Renderer/Entry/Atom.php | 14 +- .../Writer/Renderer/Entry/Atom/Deleted.php | 6 +- .../Zend/Feed/Writer/Renderer/Entry/Rss.php | 6 +- .../Zend/Feed/Writer/Renderer/Feed/Atom.php | 6 +- .../Renderer/Feed/Atom/AtomAbstract.php | 6 +- .../Feed/Writer/Renderer/Feed/Atom/Source.php | 6 +- .../Zend/Feed/Writer/Renderer/Feed/Rss.php | 6 +- .../Feed/Writer/Renderer/RendererAbstract.php | 6 +- .../Writer/Renderer/RendererInterface.php | 6 +- library/Zend/Feed/Writer/Source.php | 6 +- library/Zend/File/ClassFileLocator.php | 91 +- library/Zend/File/PhpClassFile.php | 56 + library/Zend/File/Transfer.php | 6 +- .../Zend/File/Transfer/Adapter/Abstract.php | 23 +- library/Zend/File/Transfer/Adapter/Http.php | 6 +- library/Zend/File/Transfer/Exception.php | 6 +- library/Zend/Filter.php | 6 +- library/Zend/Filter/Alnum.php | 6 +- library/Zend/Filter/Alpha.php | 6 +- library/Zend/Filter/BaseName.php | 6 +- library/Zend/Filter/Boolean.php | 6 +- library/Zend/Filter/Callback.php | 6 +- library/Zend/Filter/Compress.php | 6 +- library/Zend/Filter/Compress/Bz2.php | 10 +- .../Zend/Filter/Compress/CompressAbstract.php | 6 +- .../Filter/Compress/CompressInterface.php | 6 +- library/Zend/Filter/Compress/Gz.php | 10 +- library/Zend/Filter/Compress/Lzf.php | 6 +- library/Zend/Filter/Compress/Rar.php | 6 +- library/Zend/Filter/Compress/Tar.php | 6 +- library/Zend/Filter/Compress/Zip.php | 6 +- library/Zend/Filter/Decompress.php | 6 +- library/Zend/Filter/Decrypt.php | 6 +- library/Zend/Filter/Digits.php | 6 +- library/Zend/Filter/Dir.php | 6 +- library/Zend/Filter/Encrypt.php | 6 +- library/Zend/Filter/Encrypt/Interface.php | 6 +- library/Zend/Filter/Encrypt/Mcrypt.php | 6 +- library/Zend/Filter/Encrypt/Openssl.php | 8 +- library/Zend/Filter/Exception.php | 6 +- library/Zend/Filter/File/Decrypt.php | 6 +- library/Zend/Filter/File/Encrypt.php | 6 +- library/Zend/Filter/File/LowerCase.php | 6 +- library/Zend/Filter/File/Rename.php | 11 +- library/Zend/Filter/File/UpperCase.php | 6 +- library/Zend/Filter/HtmlEntities.php | 6 +- library/Zend/Filter/Inflector.php | 6 +- library/Zend/Filter/Input.php | 6 +- library/Zend/Filter/Int.php | 6 +- library/Zend/Filter/Interface.php | 6 +- library/Zend/Filter/LocalizedToNormalized.php | 6 +- library/Zend/Filter/NormalizedToLocalized.php | 6 +- library/Zend/Filter/Null.php | 6 +- library/Zend/Filter/PregReplace.php | 6 +- library/Zend/Filter/RealPath.php | 6 +- library/Zend/Filter/StringToLower.php | 6 +- library/Zend/Filter/StringToUpper.php | 6 +- library/Zend/Filter/StringTrim.php | 6 +- library/Zend/Filter/StripNewlines.php | 6 +- library/Zend/Filter/StripTags.php | 6 +- library/Zend/Filter/Word/CamelCaseToDash.php | 6 +- .../Zend/Filter/Word/CamelCaseToSeparator.php | 6 +- .../Filter/Word/CamelCaseToUnderscore.php | 6 +- library/Zend/Filter/Word/DashToCamelCase.php | 6 +- library/Zend/Filter/Word/DashToSeparator.php | 6 +- library/Zend/Filter/Word/DashToUnderscore.php | 8 +- .../Zend/Filter/Word/Separator/Abstract.php | 8 +- .../Zend/Filter/Word/SeparatorToCamelCase.php | 28 +- library/Zend/Filter/Word/SeparatorToDash.php | 8 +- .../Zend/Filter/Word/SeparatorToSeparator.php | 8 +- .../Filter/Word/UnderscoreToCamelCase.php | 6 +- library/Zend/Filter/Word/UnderscoreToDash.php | 8 +- .../Filter/Word/UnderscoreToSeparator.php | 6 +- library/Zend/Form.php | 98 +- library/Zend/Form/Decorator/Abstract.php | 6 +- library/Zend/Form/Decorator/Callback.php | 6 +- library/Zend/Form/Decorator/Captcha.php | 6 +- .../Zend/Form/Decorator/Captcha/ReCaptcha.php | 4 +- library/Zend/Form/Decorator/Captcha/Word.php | 6 +- library/Zend/Form/Decorator/Description.php | 6 +- library/Zend/Form/Decorator/DtDdWrapper.php | 6 +- library/Zend/Form/Decorator/Errors.php | 6 +- library/Zend/Form/Decorator/Exception.php | 6 +- library/Zend/Form/Decorator/Fieldset.php | 7 +- library/Zend/Form/Decorator/File.php | 6 +- library/Zend/Form/Decorator/Form.php | 6 +- library/Zend/Form/Decorator/FormElements.php | 6 +- library/Zend/Form/Decorator/FormErrors.php | 6 +- library/Zend/Form/Decorator/HtmlTag.php | 6 +- library/Zend/Form/Decorator/Image.php | 6 +- library/Zend/Form/Decorator/Interface.php | 6 +- library/Zend/Form/Decorator/Label.php | 8 +- .../Form/Decorator/Marker/File/Interface.php | 6 +- .../Zend/Form/Decorator/PrepareElements.php | 6 +- library/Zend/Form/Decorator/Tooltip.php | 6 +- library/Zend/Form/Decorator/ViewHelper.php | 6 +- library/Zend/Form/Decorator/ViewScript.php | 6 +- library/Zend/Form/DisplayGroup.php | 6 +- library/Zend/Form/Element.php | 42 +- library/Zend/Form/Element/Button.php | 6 +- library/Zend/Form/Element/Captcha.php | 6 +- library/Zend/Form/Element/Checkbox.php | 6 +- library/Zend/Form/Element/Exception.php | 6 +- library/Zend/Form/Element/File.php | 29 +- library/Zend/Form/Element/Hash.php | 6 +- library/Zend/Form/Element/Hidden.php | 6 +- library/Zend/Form/Element/Image.php | 6 +- library/Zend/Form/Element/Multi.php | 6 +- library/Zend/Form/Element/MultiCheckbox.php | 6 +- library/Zend/Form/Element/Multiselect.php | 6 +- library/Zend/Form/Element/Note.php | 6 +- library/Zend/Form/Element/Password.php | 6 +- library/Zend/Form/Element/Radio.php | 6 +- library/Zend/Form/Element/Reset.php | 6 +- library/Zend/Form/Element/Select.php | 6 +- library/Zend/Form/Element/Submit.php | 6 +- library/Zend/Form/Element/Text.php | 6 +- library/Zend/Form/Element/Textarea.php | 6 +- library/Zend/Form/Element/Xhtml.php | 6 +- library/Zend/Form/Exception.php | 6 +- library/Zend/Form/SubForm.php | 6 +- library/Zend/Gdata.php | 8 +- library/Zend/Gdata/Analytics.php | 2 +- library/Zend/Gdata/Analytics/AccountEntry.php | 2 +- library/Zend/Gdata/Analytics/AccountFeed.php | 2 +- library/Zend/Gdata/Analytics/AccountQuery.php | 4 +- library/Zend/Gdata/Analytics/DataEntry.php | 2 +- library/Zend/Gdata/Analytics/DataFeed.php | 2 +- library/Zend/Gdata/Analytics/DataQuery.php | 2 +- .../Gdata/Analytics/Extension/Dimension.php | 2 +- .../Zend/Gdata/Analytics/Extension/Goal.php | 2 +- .../Zend/Gdata/Analytics/Extension/Metric.php | 2 +- .../Gdata/Analytics/Extension/Property.php | 2 +- .../Gdata/Analytics/Extension/TableId.php | 2 +- library/Zend/Gdata/App.php | 13 +- library/Zend/Gdata/App/AuthException.php | 6 +- .../Zend/Gdata/App/BadMethodCallException.php | 6 +- library/Zend/Gdata/App/Base.php | 13 +- library/Zend/Gdata/App/BaseMediaSource.php | 6 +- .../Gdata/App/CaptchaRequiredException.php | 6 +- library/Zend/Gdata/App/Entry.php | 6 +- library/Zend/Gdata/App/Exception.php | 6 +- library/Zend/Gdata/App/Extension.php | 6 +- library/Zend/Gdata/App/Extension/Author.php | 6 +- library/Zend/Gdata/App/Extension/Category.php | 6 +- library/Zend/Gdata/App/Extension/Content.php | 6 +- .../Zend/Gdata/App/Extension/Contributor.php | 6 +- library/Zend/Gdata/App/Extension/Control.php | 6 +- library/Zend/Gdata/App/Extension/Draft.php | 6 +- library/Zend/Gdata/App/Extension/Edited.php | 6 +- library/Zend/Gdata/App/Extension/Element.php | 6 +- library/Zend/Gdata/App/Extension/Email.php | 6 +- .../Zend/Gdata/App/Extension/Generator.php | 6 +- library/Zend/Gdata/App/Extension/Icon.php | 6 +- library/Zend/Gdata/App/Extension/Id.php | 6 +- library/Zend/Gdata/App/Extension/Link.php | 6 +- library/Zend/Gdata/App/Extension/Logo.php | 6 +- library/Zend/Gdata/App/Extension/Name.php | 6 +- library/Zend/Gdata/App/Extension/Person.php | 6 +- .../Zend/Gdata/App/Extension/Published.php | 6 +- library/Zend/Gdata/App/Extension/Rights.php | 6 +- library/Zend/Gdata/App/Extension/Source.php | 6 +- library/Zend/Gdata/App/Extension/Subtitle.php | 6 +- library/Zend/Gdata/App/Extension/Summary.php | 6 +- library/Zend/Gdata/App/Extension/Text.php | 6 +- library/Zend/Gdata/App/Extension/Title.php | 6 +- library/Zend/Gdata/App/Extension/Updated.php | 6 +- library/Zend/Gdata/App/Extension/Uri.php | 6 +- library/Zend/Gdata/App/Feed.php | 6 +- library/Zend/Gdata/App/FeedEntryParent.php | 6 +- library/Zend/Gdata/App/FeedSourceParent.php | 6 +- library/Zend/Gdata/App/HttpException.php | 6 +- library/Zend/Gdata/App/IOException.php | 6 +- .../Gdata/App/InvalidArgumentException.php | 6 +- .../App/LoggingHttpClientAdapterSocket.php | 6 +- library/Zend/Gdata/App/MediaEntry.php | 6 +- library/Zend/Gdata/App/MediaFileSource.php | 6 +- library/Zend/Gdata/App/MediaSource.php | 6 +- library/Zend/Gdata/App/Util.php | 6 +- library/Zend/Gdata/App/VersionException.php | 6 +- library/Zend/Gdata/AuthSub.php | 6 +- library/Zend/Gdata/Books.php | 6 +- library/Zend/Gdata/Books/CollectionEntry.php | 6 +- library/Zend/Gdata/Books/CollectionFeed.php | 6 +- .../Gdata/Books/Extension/AnnotationLink.php | 6 +- .../Gdata/Books/Extension/BooksCategory.php | 6 +- .../Zend/Gdata/Books/Extension/BooksLink.php | 6 +- .../Gdata/Books/Extension/Embeddability.php | 6 +- .../Zend/Gdata/Books/Extension/InfoLink.php | 4 +- .../Gdata/Books/Extension/PreviewLink.php | 6 +- library/Zend/Gdata/Books/Extension/Review.php | 6 +- .../Gdata/Books/Extension/ThumbnailLink.php | 6 +- .../Gdata/Books/Extension/Viewability.php | 6 +- library/Zend/Gdata/Books/VolumeEntry.php | 6 +- library/Zend/Gdata/Books/VolumeFeed.php | 6 +- library/Zend/Gdata/Books/VolumeQuery.php | 6 +- library/Zend/Gdata/Calendar.php | 6 +- library/Zend/Gdata/Calendar/EventEntry.php | 6 +- library/Zend/Gdata/Calendar/EventFeed.php | 6 +- library/Zend/Gdata/Calendar/EventQuery.php | 6 +- .../Gdata/Calendar/Extension/AccessLevel.php | 6 +- .../Zend/Gdata/Calendar/Extension/Color.php | 6 +- .../Zend/Gdata/Calendar/Extension/Hidden.php | 6 +- .../Zend/Gdata/Calendar/Extension/Link.php | 6 +- .../Gdata/Calendar/Extension/QuickAdd.php | 6 +- .../Gdata/Calendar/Extension/Selected.php | 6 +- .../Extension/SendEventNotifications.php | 6 +- .../Gdata/Calendar/Extension/Timezone.php | 6 +- .../Gdata/Calendar/Extension/WebContent.php | 6 +- library/Zend/Gdata/Calendar/ListEntry.php | 6 +- library/Zend/Gdata/Calendar/ListFeed.php | 6 +- library/Zend/Gdata/ClientLogin.php | 6 +- library/Zend/Gdata/Docs.php | 108 +- library/Zend/Gdata/Docs/DocumentListEntry.php | 6 +- library/Zend/Gdata/Docs/DocumentListFeed.php | 6 +- library/Zend/Gdata/Docs/Query.php | 6 +- library/Zend/Gdata/DublinCore.php | 6 +- .../Gdata/DublinCore/Extension/Creator.php | 6 +- .../Zend/Gdata/DublinCore/Extension/Date.php | 6 +- .../DublinCore/Extension/Description.php | 6 +- .../Gdata/DublinCore/Extension/Format.php | 6 +- .../Gdata/DublinCore/Extension/Identifier.php | 6 +- .../Gdata/DublinCore/Extension/Language.php | 6 +- .../Gdata/DublinCore/Extension/Publisher.php | 6 +- .../Gdata/DublinCore/Extension/Rights.php | 6 +- .../Gdata/DublinCore/Extension/Subject.php | 6 +- .../Zend/Gdata/DublinCore/Extension/Title.php | 6 +- library/Zend/Gdata/Entry.php | 6 +- library/Zend/Gdata/Exif.php | 6 +- library/Zend/Gdata/Exif/Entry.php | 6 +- .../Zend/Gdata/Exif/Extension/Distance.php | 6 +- .../Zend/Gdata/Exif/Extension/Exposure.php | 6 +- library/Zend/Gdata/Exif/Extension/FStop.php | 6 +- library/Zend/Gdata/Exif/Extension/Flash.php | 6 +- .../Zend/Gdata/Exif/Extension/FocalLength.php | 6 +- .../Gdata/Exif/Extension/ImageUniqueId.php | 6 +- library/Zend/Gdata/Exif/Extension/Iso.php | 6 +- library/Zend/Gdata/Exif/Extension/Make.php | 6 +- library/Zend/Gdata/Exif/Extension/Model.php | 6 +- library/Zend/Gdata/Exif/Extension/Tags.php | 6 +- library/Zend/Gdata/Exif/Extension/Time.php | 6 +- library/Zend/Gdata/Exif/Feed.php | 6 +- library/Zend/Gdata/Extension.php | 6 +- .../Zend/Gdata/Extension/AttendeeStatus.php | 6 +- library/Zend/Gdata/Extension/AttendeeType.php | 6 +- library/Zend/Gdata/Extension/Comments.php | 6 +- library/Zend/Gdata/Extension/EntryLink.php | 6 +- library/Zend/Gdata/Extension/EventStatus.php | 6 +- .../Zend/Gdata/Extension/ExtendedProperty.php | 6 +- library/Zend/Gdata/Extension/FeedLink.php | 6 +- .../Extension/OpenSearchItemsPerPage.php | 6 +- .../Gdata/Extension/OpenSearchStartIndex.php | 6 +- .../Extension/OpenSearchTotalResults.php | 6 +- .../Zend/Gdata/Extension/OriginalEvent.php | 6 +- library/Zend/Gdata/Extension/Rating.php | 6 +- library/Zend/Gdata/Extension/Recurrence.php | 6 +- .../Gdata/Extension/RecurrenceException.php | 6 +- library/Zend/Gdata/Extension/Reminder.php | 6 +- library/Zend/Gdata/Extension/Transparency.php | 6 +- library/Zend/Gdata/Extension/Visibility.php | 6 +- library/Zend/Gdata/Extension/When.php | 6 +- library/Zend/Gdata/Extension/Where.php | 6 +- library/Zend/Gdata/Extension/Who.php | 6 +- library/Zend/Gdata/Feed.php | 6 +- library/Zend/Gdata/Gapps.php | 10 +- library/Zend/Gdata/Gapps/EmailListEntry.php | 6 +- library/Zend/Gdata/Gapps/EmailListFeed.php | 6 +- library/Zend/Gdata/Gapps/EmailListQuery.php | 6 +- .../Gdata/Gapps/EmailListRecipientEntry.php | 6 +- .../Gdata/Gapps/EmailListRecipientFeed.php | 6 +- .../Gdata/Gapps/EmailListRecipientQuery.php | 6 +- library/Zend/Gdata/Gapps/Error.php | 6 +- .../Zend/Gdata/Gapps/Extension/EmailList.php | 6 +- library/Zend/Gdata/Gapps/Extension/Login.php | 6 +- library/Zend/Gdata/Gapps/Extension/Name.php | 6 +- .../Zend/Gdata/Gapps/Extension/Nickname.php | 6 +- .../Zend/Gdata/Gapps/Extension/Property.php | 4 +- library/Zend/Gdata/Gapps/Extension/Quota.php | 6 +- library/Zend/Gdata/Gapps/GroupEntry.php | 4 +- library/Zend/Gdata/Gapps/GroupFeed.php | 6 +- library/Zend/Gdata/Gapps/GroupQuery.php | 4 +- library/Zend/Gdata/Gapps/MemberEntry.php | 4 +- library/Zend/Gdata/Gapps/MemberFeed.php | 4 +- library/Zend/Gdata/Gapps/MemberQuery.php | 4 +- library/Zend/Gdata/Gapps/NicknameEntry.php | 6 +- library/Zend/Gdata/Gapps/NicknameFeed.php | 6 +- library/Zend/Gdata/Gapps/NicknameQuery.php | 6 +- library/Zend/Gdata/Gapps/OwnerEntry.php | 4 +- library/Zend/Gdata/Gapps/OwnerFeed.php | 4 +- library/Zend/Gdata/Gapps/OwnerQuery.php | 4 +- library/Zend/Gdata/Gapps/Query.php | 6 +- library/Zend/Gdata/Gapps/ServiceException.php | 13 +- library/Zend/Gdata/Gapps/UserEntry.php | 6 +- library/Zend/Gdata/Gapps/UserFeed.php | 6 +- library/Zend/Gdata/Gapps/UserQuery.php | 6 +- library/Zend/Gdata/Gbase.php | 6 +- library/Zend/Gdata/Gbase/Entry.php | 6 +- .../Gdata/Gbase/Extension/BaseAttribute.php | 6 +- library/Zend/Gdata/Gbase/Feed.php | 6 +- library/Zend/Gdata/Gbase/ItemEntry.php | 6 +- library/Zend/Gdata/Gbase/ItemFeed.php | 6 +- library/Zend/Gdata/Gbase/ItemQuery.php | 6 +- library/Zend/Gdata/Gbase/Query.php | 6 +- library/Zend/Gdata/Gbase/SnippetEntry.php | 6 +- library/Zend/Gdata/Gbase/SnippetFeed.php | 6 +- library/Zend/Gdata/Gbase/SnippetQuery.php | 6 +- library/Zend/Gdata/Geo.php | 6 +- library/Zend/Gdata/Geo/Entry.php | 6 +- .../Zend/Gdata/Geo/Extension/GeoRssWhere.php | 6 +- library/Zend/Gdata/Geo/Extension/GmlPoint.php | 6 +- library/Zend/Gdata/Geo/Extension/GmlPos.php | 6 +- library/Zend/Gdata/Geo/Feed.php | 6 +- library/Zend/Gdata/Health.php | 6 +- library/Zend/Gdata/Health/Extension/Ccr.php | 6 +- library/Zend/Gdata/Health/ProfileEntry.php | 6 +- library/Zend/Gdata/Health/ProfileFeed.php | 6 +- .../Zend/Gdata/Health/ProfileListEntry.php | 6 +- library/Zend/Gdata/Health/ProfileListFeed.php | 6 +- library/Zend/Gdata/Health/Query.php | 6 +- .../Zend/Gdata/HttpAdapterStreamingProxy.php | 6 +- .../Zend/Gdata/HttpAdapterStreamingSocket.php | 6 +- library/Zend/Gdata/HttpClient.php | 6 +- library/Zend/Gdata/Kind/EventEntry.php | 6 +- library/Zend/Gdata/Media.php | 6 +- library/Zend/Gdata/Media/Entry.php | 6 +- .../Gdata/Media/Extension/MediaCategory.php | 6 +- .../Gdata/Media/Extension/MediaContent.php | 6 +- .../Gdata/Media/Extension/MediaCopyright.php | 6 +- .../Gdata/Media/Extension/MediaCredit.php | 6 +- .../Media/Extension/MediaDescription.php | 6 +- .../Zend/Gdata/Media/Extension/MediaGroup.php | 6 +- .../Zend/Gdata/Media/Extension/MediaHash.php | 6 +- .../Gdata/Media/Extension/MediaKeywords.php | 6 +- .../Gdata/Media/Extension/MediaPlayer.php | 6 +- .../Gdata/Media/Extension/MediaRating.php | 6 +- .../Media/Extension/MediaRestriction.php | 6 +- .../Zend/Gdata/Media/Extension/MediaText.php | 6 +- .../Gdata/Media/Extension/MediaThumbnail.php | 6 +- .../Zend/Gdata/Media/Extension/MediaTitle.php | 6 +- library/Zend/Gdata/Media/Feed.php | 6 +- library/Zend/Gdata/MediaMimeStream.php | 6 +- library/Zend/Gdata/MimeBodyString.php | 6 +- library/Zend/Gdata/MimeFile.php | 6 +- library/Zend/Gdata/Photos.php | 6 +- library/Zend/Gdata/Photos/AlbumEntry.php | 6 +- library/Zend/Gdata/Photos/AlbumFeed.php | 6 +- library/Zend/Gdata/Photos/AlbumQuery.php | 6 +- library/Zend/Gdata/Photos/CommentEntry.php | 6 +- .../Zend/Gdata/Photos/Extension/Access.php | 6 +- .../Zend/Gdata/Photos/Extension/AlbumId.php | 6 +- .../Zend/Gdata/Photos/Extension/BytesUsed.php | 6 +- .../Zend/Gdata/Photos/Extension/Checksum.php | 6 +- .../Zend/Gdata/Photos/Extension/Client.php | 6 +- .../Gdata/Photos/Extension/CommentCount.php | 6 +- .../Photos/Extension/CommentingEnabled.php | 6 +- .../Zend/Gdata/Photos/Extension/Height.php | 6 +- library/Zend/Gdata/Photos/Extension/Id.php | 6 +- .../Zend/Gdata/Photos/Extension/Location.php | 6 +- .../Photos/Extension/MaxPhotosPerAlbum.php | 6 +- library/Zend/Gdata/Photos/Extension/Name.php | 6 +- .../Zend/Gdata/Photos/Extension/Nickname.php | 6 +- .../Zend/Gdata/Photos/Extension/NumPhotos.php | 6 +- .../Photos/Extension/NumPhotosRemaining.php | 6 +- .../Zend/Gdata/Photos/Extension/PhotoId.php | 6 +- .../Zend/Gdata/Photos/Extension/Position.php | 6 +- .../Gdata/Photos/Extension/QuotaCurrent.php | 6 +- .../Gdata/Photos/Extension/QuotaLimit.php | 6 +- .../Zend/Gdata/Photos/Extension/Rotation.php | 6 +- library/Zend/Gdata/Photos/Extension/Size.php | 6 +- .../Zend/Gdata/Photos/Extension/Thumbnail.php | 6 +- .../Zend/Gdata/Photos/Extension/Timestamp.php | 6 +- library/Zend/Gdata/Photos/Extension/User.php | 6 +- .../Zend/Gdata/Photos/Extension/Version.php | 6 +- .../Zend/Gdata/Photos/Extension/Weight.php | 6 +- library/Zend/Gdata/Photos/Extension/Width.php | 6 +- library/Zend/Gdata/Photos/PhotoEntry.php | 6 +- library/Zend/Gdata/Photos/PhotoFeed.php | 6 +- library/Zend/Gdata/Photos/PhotoQuery.php | 6 +- library/Zend/Gdata/Photos/TagEntry.php | 6 +- library/Zend/Gdata/Photos/UserEntry.php | 6 +- library/Zend/Gdata/Photos/UserFeed.php | 6 +- library/Zend/Gdata/Photos/UserQuery.php | 6 +- library/Zend/Gdata/Query.php | 6 +- library/Zend/Gdata/Spreadsheets.php | 6 +- library/Zend/Gdata/Spreadsheets/CellEntry.php | 6 +- library/Zend/Gdata/Spreadsheets/CellFeed.php | 6 +- library/Zend/Gdata/Spreadsheets/CellQuery.php | 6 +- .../Zend/Gdata/Spreadsheets/DocumentQuery.php | 6 +- .../Gdata/Spreadsheets/Extension/Cell.php | 6 +- .../Gdata/Spreadsheets/Extension/ColCount.php | 6 +- .../Gdata/Spreadsheets/Extension/Custom.php | 6 +- .../Gdata/Spreadsheets/Extension/RowCount.php | 6 +- library/Zend/Gdata/Spreadsheets/ListEntry.php | 6 +- library/Zend/Gdata/Spreadsheets/ListFeed.php | 6 +- library/Zend/Gdata/Spreadsheets/ListQuery.php | 6 +- .../Gdata/Spreadsheets/SpreadsheetEntry.php | 6 +- .../Gdata/Spreadsheets/SpreadsheetFeed.php | 6 +- .../Gdata/Spreadsheets/WorksheetEntry.php | 6 +- .../Zend/Gdata/Spreadsheets/WorksheetFeed.php | 6 +- library/Zend/Gdata/YouTube.php | 12 +- library/Zend/Gdata/YouTube/ActivityEntry.php | 6 +- library/Zend/Gdata/YouTube/ActivityFeed.php | 6 +- library/Zend/Gdata/YouTube/CommentEntry.php | 6 +- library/Zend/Gdata/YouTube/CommentFeed.php | 6 +- library/Zend/Gdata/YouTube/ContactEntry.php | 6 +- library/Zend/Gdata/YouTube/ContactFeed.php | 6 +- .../Zend/Gdata/YouTube/Extension/AboutMe.php | 6 +- library/Zend/Gdata/YouTube/Extension/Age.php | 6 +- .../Zend/Gdata/YouTube/Extension/Books.php | 6 +- .../Zend/Gdata/YouTube/Extension/Company.php | 6 +- .../Zend/Gdata/YouTube/Extension/Control.php | 6 +- .../Gdata/YouTube/Extension/CountHint.php | 6 +- .../Gdata/YouTube/Extension/Description.php | 6 +- .../Zend/Gdata/YouTube/Extension/Duration.php | 6 +- .../Gdata/YouTube/Extension/FirstName.php | 6 +- .../Zend/Gdata/YouTube/Extension/Gender.php | 6 +- .../Zend/Gdata/YouTube/Extension/Hobbies.php | 6 +- .../Zend/Gdata/YouTube/Extension/Hometown.php | 6 +- .../Zend/Gdata/YouTube/Extension/LastName.php | 6 +- library/Zend/Gdata/YouTube/Extension/Link.php | 6 +- .../Zend/Gdata/YouTube/Extension/Location.php | 6 +- .../Gdata/YouTube/Extension/MediaContent.php | 6 +- .../Gdata/YouTube/Extension/MediaCredit.php | 6 +- .../Gdata/YouTube/Extension/MediaGroup.php | 6 +- .../Gdata/YouTube/Extension/MediaRating.php | 6 +- .../Zend/Gdata/YouTube/Extension/Movies.php | 6 +- .../Zend/Gdata/YouTube/Extension/Music.php | 6 +- .../Zend/Gdata/YouTube/Extension/NoEmbed.php | 6 +- .../Gdata/YouTube/Extension/Occupation.php | 6 +- .../Gdata/YouTube/Extension/PlaylistId.php | 6 +- .../Gdata/YouTube/Extension/PlaylistTitle.php | 6 +- .../Zend/Gdata/YouTube/Extension/Position.php | 6 +- .../Zend/Gdata/YouTube/Extension/Private.php | 6 +- .../Gdata/YouTube/Extension/QueryString.php | 6 +- library/Zend/Gdata/YouTube/Extension/Racy.php | 6 +- .../Zend/Gdata/YouTube/Extension/Recorded.php | 6 +- .../Gdata/YouTube/Extension/Relationship.php | 6 +- .../Gdata/YouTube/Extension/ReleaseDate.php | 6 +- .../Zend/Gdata/YouTube/Extension/School.php | 6 +- .../Zend/Gdata/YouTube/Extension/State.php | 6 +- .../Gdata/YouTube/Extension/Statistics.php | 6 +- .../Zend/Gdata/YouTube/Extension/Status.php | 6 +- .../Zend/Gdata/YouTube/Extension/Token.php | 6 +- .../Zend/Gdata/YouTube/Extension/Uploaded.php | 6 +- .../Zend/Gdata/YouTube/Extension/Username.php | 6 +- .../Zend/Gdata/YouTube/Extension/VideoId.php | 6 +- library/Zend/Gdata/YouTube/InboxEntry.php | 6 +- library/Zend/Gdata/YouTube/InboxFeed.php | 6 +- library/Zend/Gdata/YouTube/MediaEntry.php | 6 +- .../Zend/Gdata/YouTube/PlaylistListEntry.php | 6 +- .../Zend/Gdata/YouTube/PlaylistListFeed.php | 6 +- .../Zend/Gdata/YouTube/PlaylistVideoEntry.php | 6 +- .../Zend/Gdata/YouTube/PlaylistVideoFeed.php | 6 +- .../Zend/Gdata/YouTube/SubscriptionEntry.php | 6 +- .../Zend/Gdata/YouTube/SubscriptionFeed.php | 6 +- .../Zend/Gdata/YouTube/UserProfileEntry.php | 6 +- library/Zend/Gdata/YouTube/VideoEntry.php | 6 +- library/Zend/Gdata/YouTube/VideoFeed.php | 6 +- library/Zend/Gdata/YouTube/VideoQuery.php | 6 +- library/Zend/Http/Client.php | 25 +- library/Zend/Http/Client/Adapter/Curl.php | 32 +- .../Zend/Http/Client/Adapter/Exception.php | 6 +- .../Zend/Http/Client/Adapter/Interface.php | 6 +- library/Zend/Http/Client/Adapter/Proxy.php | 6 +- library/Zend/Http/Client/Adapter/Socket.php | 6 +- library/Zend/Http/Client/Adapter/Stream.php | 6 +- library/Zend/Http/Client/Adapter/Test.php | 6 +- library/Zend/Http/Client/Exception.php | 6 +- library/Zend/Http/Cookie.php | 6 +- library/Zend/Http/CookieJar.php | 6 +- library/Zend/Http/Exception.php | 6 +- .../Exception/InvalidArgumentException.php | 4 +- .../Header/Exception/RuntimeException.php | 4 +- library/Zend/Http/Header/SetCookie.php | 1092 +-- library/Zend/Http/Response.php | 6 +- library/Zend/Http/Response/Stream.php | 6 +- library/Zend/Http/UserAgent.php | 4 +- .../Zend/Http/UserAgent/AbstractDevice.php | 4 +- library/Zend/Http/UserAgent/Bot.php | 4 +- library/Zend/Http/UserAgent/Checker.php | 4 +- library/Zend/Http/UserAgent/Console.php | 4 +- library/Zend/Http/UserAgent/Desktop.php | 4 +- library/Zend/Http/UserAgent/Device.php | 4 +- library/Zend/Http/UserAgent/Email.php | 4 +- library/Zend/Http/UserAgent/Exception.php | 4 +- .../Zend/Http/UserAgent/Features/Adapter.php | 4 +- .../UserAgent/Features/Adapter/Browscap.php | 49 +- .../Features/Adapter/DeviceAtlas.php | 4 +- .../UserAgent/Features/Adapter/TeraWurfl.php | 4 +- .../Http/UserAgent/Features/Exception.php | 4 +- library/Zend/Http/UserAgent/Feed.php | 4 +- library/Zend/Http/UserAgent/Mobile.php | 4 +- library/Zend/Http/UserAgent/Offline.php | 4 +- library/Zend/Http/UserAgent/Probe.php | 4 +- library/Zend/Http/UserAgent/Spam.php | 4 +- library/Zend/Http/UserAgent/Storage.php | 4 +- .../Zend/Http/UserAgent/Storage/Exception.php | 4 +- .../Http/UserAgent/Storage/NonPersistent.php | 4 +- .../Zend/Http/UserAgent/Storage/Session.php | 4 +- library/Zend/Http/UserAgent/Text.php | 4 +- library/Zend/Http/UserAgent/Validator.php | 4 +- library/Zend/Json.php | 14 +- library/Zend/Json/Decoder.php | 6 +- library/Zend/Json/Encoder.php | 6 +- library/Zend/Json/Exception.php | 6 +- library/Zend/Json/Expr.php | 6 +- library/Zend/Json/Server.php | 6 +- library/Zend/Json/Server/Cache.php | 6 +- library/Zend/Json/Server/Error.php | 6 +- library/Zend/Json/Server/Exception.php | 6 +- library/Zend/Json/Server/Request.php | 6 +- library/Zend/Json/Server/Request/Http.php | 6 +- library/Zend/Json/Server/Response.php | 6 +- library/Zend/Json/Server/Response/Http.php | 6 +- library/Zend/Json/Server/Smd.php | 6 +- library/Zend/Json/Server/Smd/Service.php | 6 +- library/Zend/Layout.php | 6 +- .../Controller/Action/Helper/Layout.php | 6 +- .../Zend/Layout/Controller/Plugin/Layout.php | 6 +- library/Zend/Layout/Exception.php | 6 +- library/Zend/Ldap.php | 6 +- library/Zend/Ldap/Attribute.php | 8 +- library/Zend/Ldap/Collection.php | 8 +- .../Zend/Ldap/Collection/Iterator/Default.php | 8 +- library/Zend/Ldap/Converter.php | 23 +- library/Zend/Ldap/Converter/Exception.php | 6 +- library/Zend/Ldap/Dn.php | 8 +- library/Zend/Ldap/Exception.php | 6 +- library/Zend/Ldap/Filter.php | 8 +- library/Zend/Ldap/Filter/Abstract.php | 8 +- library/Zend/Ldap/Filter/And.php | 8 +- library/Zend/Ldap/Filter/Exception.php | 8 +- library/Zend/Ldap/Filter/Logical.php | 8 +- library/Zend/Ldap/Filter/Mask.php | 8 +- library/Zend/Ldap/Filter/Not.php | 8 +- library/Zend/Ldap/Filter/Or.php | 8 +- library/Zend/Ldap/Filter/String.php | 8 +- library/Zend/Ldap/Ldif/Encoder.php | 8 +- library/Zend/Ldap/Node.php | 8 +- library/Zend/Ldap/Node/Abstract.php | 8 +- library/Zend/Ldap/Node/ChildrenIterator.php | 8 +- library/Zend/Ldap/Node/Collection.php | 8 +- library/Zend/Ldap/Node/RootDse.php | 8 +- .../Ldap/Node/RootDse/ActiveDirectory.php | 8 +- library/Zend/Ldap/Node/RootDse/OpenLdap.php | 8 +- library/Zend/Ldap/Node/RootDse/eDirectory.php | 8 +- library/Zend/Ldap/Node/Schema.php | 8 +- .../Zend/Ldap/Node/Schema/ActiveDirectory.php | 8 +- .../Schema/AttributeType/ActiveDirectory.php | 8 +- .../Node/Schema/AttributeType/Interface.php | 8 +- .../Node/Schema/AttributeType/OpenLdap.php | 8 +- library/Zend/Ldap/Node/Schema/Item.php | 8 +- .../Schema/ObjectClass/ActiveDirectory.php | 8 +- .../Node/Schema/ObjectClass/Interface.php | 8 +- .../Ldap/Node/Schema/ObjectClass/OpenLdap.php | 8 +- library/Zend/Ldap/Node/Schema/OpenLdap.php | 6 +- library/Zend/Loader.php | 6 +- library/Zend/Loader/Autoloader.php | 6 +- library/Zend/Loader/Autoloader/Interface.php | 6 +- library/Zend/Loader/Autoloader/Resource.php | 6 +- library/Zend/Loader/AutoloaderFactory.php | 4 +- library/Zend/Loader/ClassMapAutoloader.php | 4 +- library/Zend/Loader/Exception.php | 8 +- .../Exception/InvalidArgumentException.php | 4 +- library/Zend/Loader/PluginLoader.php | 44 +- .../Zend/Loader/PluginLoader/Exception.php | 6 +- .../Zend/Loader/PluginLoader/Interface.php | 6 +- library/Zend/Loader/SplAutoloader.php | 4 +- library/Zend/Loader/StandardAutoloader.php | 4 +- library/Zend/Locale.php | 1177 ++- library/Zend/Locale/Data.php | 172 +- library/Zend/Locale/Data/Translation.php | 12 +- library/Zend/Locale/Data/aa.xml | 242 +- library/Zend/Locale/Data/aa_DJ.xml | 21 +- library/Zend/Locale/Data/aa_ER.xml | 17 +- library/Zend/Locale/Data/aa_ET.xml | 9 +- library/Zend/Locale/Data/af.xml | 3502 +++++++- library/Zend/Locale/Data/af_NA.xml | 89 +- library/Zend/Locale/Data/af_ZA.xml | 9 +- library/Zend/Locale/Data/agq.xml | 774 ++ library/Zend/Locale/Data/agq_CM.xml | 14 + library/Zend/Locale/Data/ak.xml | 633 +- library/Zend/Locale/Data/ak_GH.xml | 9 +- library/Zend/Locale/Data/am.xml | 4599 ++++++++++- library/Zend/Locale/Data/am_ET.xml | 9 +- library/Zend/Locale/Data/ar.xml | 5948 ++++++++++++-- library/Zend/Locale/Data/ar_001.xml | 14 + library/Zend/Locale/Data/ar_AE.xml | 15 +- library/Zend/Locale/Data/ar_BH.xml | 15 +- library/Zend/Locale/Data/ar_DJ.xml | 21 + library/Zend/Locale/Data/ar_DZ.xml | 172 +- library/Zend/Locale/Data/ar_EG.xml | 223 +- library/Zend/Locale/Data/ar_EH.xml | 17 + library/Zend/Locale/Data/ar_ER.xml | 21 + library/Zend/Locale/Data/ar_IL.xml | 14 + library/Zend/Locale/Data/ar_IQ.xml | 111 +- library/Zend/Locale/Data/ar_JO.xml | 86 +- library/Zend/Locale/Data/ar_KM.xml | 14 + library/Zend/Locale/Data/ar_KW.xml | 15 +- library/Zend/Locale/Data/ar_LB.xml | 116 +- library/Zend/Locale/Data/ar_LY.xml | 21 +- library/Zend/Locale/Data/ar_MA.xml | 177 +- library/Zend/Locale/Data/ar_MR.xml | 96 + library/Zend/Locale/Data/ar_OM.xml | 15 +- library/Zend/Locale/Data/ar_PS.xml | 134 + library/Zend/Locale/Data/ar_QA.xml | 45 +- library/Zend/Locale/Data/ar_SA.xml | 49 +- library/Zend/Locale/Data/ar_SD.xml | 15 +- library/Zend/Locale/Data/ar_SO.xml | 21 + library/Zend/Locale/Data/ar_SS.xml | 24 + library/Zend/Locale/Data/ar_SY.xml | 101 +- library/Zend/Locale/Data/ar_TD.xml | 14 + library/Zend/Locale/Data/ar_TN.xml | 196 +- library/Zend/Locale/Data/ar_YE.xml | 45 +- library/Zend/Locale/Data/as.xml | 263 +- library/Zend/Locale/Data/as_IN.xml | 9 +- library/Zend/Locale/Data/asa.xml | 766 ++ library/Zend/Locale/Data/asa_TZ.xml | 14 + library/Zend/Locale/Data/ast.xml | 2613 ++++++ library/Zend/Locale/Data/ast_ES.xml | 14 + library/Zend/Locale/Data/az.xml | 5263 +++++++++--- library/Zend/Locale/Data/az_Cyrl.xml | 151 +- library/Zend/Locale/Data/az_Cyrl_AZ.xml | 9 +- library/Zend/Locale/Data/az_Latn.xml | 9 +- library/Zend/Locale/Data/az_Latn_AZ.xml | 9 +- library/Zend/Locale/Data/bas.xml | 780 ++ library/Zend/Locale/Data/bas_CM.xml | 14 + library/Zend/Locale/Data/be.xml | 926 ++- library/Zend/Locale/Data/be_BY.xml | 9 +- library/Zend/Locale/Data/bem.xml | 337 + library/Zend/Locale/Data/bem_ZM.xml | 14 + library/Zend/Locale/Data/bez.xml | 765 ++ library/Zend/Locale/Data/bez_TZ.xml | 14 + library/Zend/Locale/Data/bg.xml | 3641 +++++++-- library/Zend/Locale/Data/bg_BG.xml | 9 +- library/Zend/Locale/Data/bm.xml | 755 ++ library/Zend/Locale/Data/bm_ML.xml | 14 + library/Zend/Locale/Data/bn.xml | 3954 ++++++++- library/Zend/Locale/Data/bn_BD.xml | 9 +- library/Zend/Locale/Data/bn_IN.xml | 283 +- library/Zend/Locale/Data/bo.xml | 668 +- library/Zend/Locale/Data/bo_CN.xml | 9 +- library/Zend/Locale/Data/bo_IN.xml | 21 +- library/Zend/Locale/Data/br.xml | 2391 ++++++ library/Zend/Locale/Data/br_FR.xml | 14 + library/Zend/Locale/Data/brx.xml | 4142 ++++++++++ library/Zend/Locale/Data/brx_IN.xml | 14 + library/Zend/Locale/Data/bs.xml | 5194 +++++++++++- library/Zend/Locale/Data/bs_Cyrl.xml | 6541 +++++++++++++++ library/Zend/Locale/Data/bs_Cyrl_BA.xml | 15 + library/Zend/Locale/Data/bs_Latn.xml | 14 + library/Zend/Locale/Data/bs_Latn_BA.xml | 15 + library/Zend/Locale/Data/byn.xml | 786 +- library/Zend/Locale/Data/byn_ER.xml | 9 +- library/Zend/Locale/Data/ca.xml | 3452 ++++++-- library/Zend/Locale/Data/ca_AD.xml | 14 + library/Zend/Locale/Data/ca_ES.xml | 9 +- library/Zend/Locale/Data/ca_ES_VALENCIA.xml | 15 + library/Zend/Locale/Data/ca_FR.xml | 21 + library/Zend/Locale/Data/ca_IT.xml | 14 + library/Zend/Locale/Data/cgg.xml | 751 ++ library/Zend/Locale/Data/cgg_UG.xml | 14 + library/Zend/Locale/Data/characters.xml | 43 +- library/Zend/Locale/Data/chr.xml | 846 ++ library/Zend/Locale/Data/chr_US.xml | 14 + library/Zend/Locale/Data/coverageLevels.xml | 498 ++ library/Zend/Locale/Data/cs.xml | 5478 +++++++++++-- library/Zend/Locale/Data/cs_CZ.xml | 9 +- library/Zend/Locale/Data/cy.xml | 5324 +++++++++++- library/Zend/Locale/Data/cy_GB.xml | 9 +- library/Zend/Locale/Data/da.xml | 3240 ++++++-- library/Zend/Locale/Data/da_DK.xml | 9 +- library/Zend/Locale/Data/da_GL.xml | 14 + library/Zend/Locale/Data/dav.xml | 765 ++ library/Zend/Locale/Data/dav_KE.xml | 14 + library/Zend/Locale/Data/dayPeriods.xml | 144 + library/Zend/Locale/Data/de.xml | 3587 +++++++-- library/Zend/Locale/Data/de_AT.xml | 130 +- library/Zend/Locale/Data/de_BE.xml | 114 +- library/Zend/Locale/Data/de_CH.xml | 35 +- library/Zend/Locale/Data/de_DE.xml | 9 +- library/Zend/Locale/Data/de_LI.xml | 16 +- library/Zend/Locale/Data/de_LU.xml | 9 +- library/Zend/Locale/Data/dje.xml | 779 ++ library/Zend/Locale/Data/dje_NE.xml | 14 + library/Zend/Locale/Data/dua.xml | 342 + library/Zend/Locale/Data/dua_CM.xml | 14 + library/Zend/Locale/Data/dyo.xml | 546 ++ library/Zend/Locale/Data/dyo_SN.xml | 14 + library/Zend/Locale/Data/dz.xml | 2667 +++++- library/Zend/Locale/Data/dz_BT.xml | 9 +- library/Zend/Locale/Data/ebu.xml | 764 ++ library/Zend/Locale/Data/ebu_KE.xml | 14 + library/Zend/Locale/Data/ee.xml | 5525 ++++++++++++- library/Zend/Locale/Data/ee_GH.xml | 9 +- library/Zend/Locale/Data/ee_TG.xml | 9 +- library/Zend/Locale/Data/el.xml | 3406 ++++++-- library/Zend/Locale/Data/el_CY.xml | 13 +- library/Zend/Locale/Data/el_GR.xml | 9 +- library/Zend/Locale/Data/en.xml | 2865 +++++-- library/Zend/Locale/Data/en_001.xml | 94 + library/Zend/Locale/Data/en_150.xml | 288 + library/Zend/Locale/Data/en_AG.xml | 14 + library/Zend/Locale/Data/en_AI.xml | 14 + library/Zend/Locale/Data/en_AS.xml | 9 +- library/Zend/Locale/Data/en_AU.xml | 389 +- library/Zend/Locale/Data/en_BB.xml | 21 + library/Zend/Locale/Data/en_BE.xml | 229 +- library/Zend/Locale/Data/en_BM.xml | 21 + library/Zend/Locale/Data/en_BS.xml | 34 + library/Zend/Locale/Data/en_BW.xml | 256 +- library/Zend/Locale/Data/en_BZ.xml | 250 +- library/Zend/Locale/Data/en_CA.xml | 145 +- library/Zend/Locale/Data/en_CC.xml | 21 + library/Zend/Locale/Data/en_CK.xml | 21 + library/Zend/Locale/Data/en_CM.xml | 40 + library/Zend/Locale/Data/en_CX.xml | 21 + library/Zend/Locale/Data/en_DG.xml | 15 + library/Zend/Locale/Data/en_DM.xml | 14 + library/Zend/Locale/Data/en_Dsrt.xml | 288 +- library/Zend/Locale/Data/en_Dsrt_US.xml | 9 +- library/Zend/Locale/Data/en_ER.xml | 47 + library/Zend/Locale/Data/en_FJ.xml | 21 + library/Zend/Locale/Data/en_FK.xml | 24 + library/Zend/Locale/Data/en_FM.xml | 14 + library/Zend/Locale/Data/en_GB.xml | 1204 ++- library/Zend/Locale/Data/en_GD.xml | 14 + library/Zend/Locale/Data/en_GG.xml | 14 + library/Zend/Locale/Data/en_GH.xml | 47 + library/Zend/Locale/Data/en_GI.xml | 27 + library/Zend/Locale/Data/en_GM.xml | 47 + library/Zend/Locale/Data/en_GU.xml | 18 +- library/Zend/Locale/Data/en_GY.xml | 21 + library/Zend/Locale/Data/en_HK.xml | 233 +- library/Zend/Locale/Data/en_IE.xml | 249 +- library/Zend/Locale/Data/en_IM.xml | 14 + library/Zend/Locale/Data/en_IN.xml | 267 +- library/Zend/Locale/Data/en_IO.xml | 15 + library/Zend/Locale/Data/en_JE.xml | 14 + library/Zend/Locale/Data/en_JM.xml | 96 +- library/Zend/Locale/Data/en_KE.xml | 47 + library/Zend/Locale/Data/en_KI.xml | 21 + library/Zend/Locale/Data/en_KN.xml | 14 + library/Zend/Locale/Data/en_KY.xml | 34 + library/Zend/Locale/Data/en_LC.xml | 14 + library/Zend/Locale/Data/en_LR.xml | 47 + library/Zend/Locale/Data/en_LS.xml | 47 + library/Zend/Locale/Data/en_MG.xml | 47 + library/Zend/Locale/Data/en_MH.xml | 69 +- library/Zend/Locale/Data/en_MO.xml | 68 + library/Zend/Locale/Data/en_MP.xml | 69 +- library/Zend/Locale/Data/en_MS.xml | 14 + library/Zend/Locale/Data/en_MT.xml | 252 +- library/Zend/Locale/Data/en_MU.xml | 47 + library/Zend/Locale/Data/en_MW.xml | 47 + library/Zend/Locale/Data/en_NA.xml | 46 +- library/Zend/Locale/Data/en_NF.xml | 21 + library/Zend/Locale/Data/en_NG.xml | 47 + library/Zend/Locale/Data/en_NR.xml | 21 + library/Zend/Locale/Data/en_NU.xml | 21 + library/Zend/Locale/Data/en_NZ.xml | 300 +- library/Zend/Locale/Data/en_PG.xml | 21 + library/Zend/Locale/Data/en_PH.xml | 11 +- library/Zend/Locale/Data/en_PK.xml | 273 +- library/Zend/Locale/Data/en_PN.xml | 21 + library/Zend/Locale/Data/en_PR.xml | 14 + library/Zend/Locale/Data/en_PW.xml | 27 + library/Zend/Locale/Data/en_RW.xml | 47 + library/Zend/Locale/Data/en_SB.xml | 21 + library/Zend/Locale/Data/en_SC.xml | 21 + library/Zend/Locale/Data/en_SD.xml | 40 + library/Zend/Locale/Data/en_SG.xml | 190 +- library/Zend/Locale/Data/en_SH.xml | 24 + library/Zend/Locale/Data/en_SL.xml | 47 + library/Zend/Locale/Data/en_SS.xml | 50 + library/Zend/Locale/Data/en_SX.xml | 21 + library/Zend/Locale/Data/en_SZ.xml | 47 + library/Zend/Locale/Data/en_TC.xml | 14 + library/Zend/Locale/Data/en_TK.xml | 21 + library/Zend/Locale/Data/en_TO.xml | 21 + library/Zend/Locale/Data/en_TT.xml | 20 +- library/Zend/Locale/Data/en_TV.xml | 21 + library/Zend/Locale/Data/en_TZ.xml | 47 + library/Zend/Locale/Data/en_UG.xml | 47 + library/Zend/Locale/Data/en_UM.xml | 9 +- library/Zend/Locale/Data/en_US.xml | 9 +- library/Zend/Locale/Data/en_US_POSIX.xml | 30 +- library/Zend/Locale/Data/en_VC.xml | 14 + library/Zend/Locale/Data/en_VG.xml | 14 + library/Zend/Locale/Data/en_VI.xml | 9 +- library/Zend/Locale/Data/en_VU.xml | 21 + library/Zend/Locale/Data/en_WS.xml | 21 + library/Zend/Locale/Data/en_ZA.xml | 248 +- library/Zend/Locale/Data/en_ZM.xml | 47 + library/Zend/Locale/Data/en_ZW.xml | 237 +- library/Zend/Locale/Data/eo.xml | 354 +- library/Zend/Locale/Data/eo_001.xml | 14 + library/Zend/Locale/Data/es.xml | 3116 +++++-- library/Zend/Locale/Data/es_419.xml | 232 + library/Zend/Locale/Data/es_AR.xml | 235 +- library/Zend/Locale/Data/es_BO.xml | 20 +- library/Zend/Locale/Data/es_CL.xml | 260 +- library/Zend/Locale/Data/es_CO.xml | 217 +- library/Zend/Locale/Data/es_CR.xml | 20 +- library/Zend/Locale/Data/es_CU.xml | 24 + library/Zend/Locale/Data/es_DO.xml | 21 +- library/Zend/Locale/Data/es_EA.xml | 14 + library/Zend/Locale/Data/es_EC.xml | 216 +- library/Zend/Locale/Data/es_ES.xml | 9 +- library/Zend/Locale/Data/es_GQ.xml | 24 + library/Zend/Locale/Data/es_GT.xml | 203 +- library/Zend/Locale/Data/es_HN.xml | 201 +- library/Zend/Locale/Data/es_IC.xml | 14 + library/Zend/Locale/Data/es_MX.xml | 4930 +++++++++++- library/Zend/Locale/Data/es_NI.xml | 18 +- library/Zend/Locale/Data/es_PA.xml | 222 +- library/Zend/Locale/Data/es_PE.xml | 210 +- library/Zend/Locale/Data/es_PH.xml | 21 + library/Zend/Locale/Data/es_PR.xml | 250 +- library/Zend/Locale/Data/es_PY.xml | 23 +- library/Zend/Locale/Data/es_SV.xml | 15 +- library/Zend/Locale/Data/es_US.xml | 298 +- library/Zend/Locale/Data/es_UY.xml | 24 +- library/Zend/Locale/Data/es_VE.xml | 23 +- library/Zend/Locale/Data/et.xml | 3331 +++++++- library/Zend/Locale/Data/et_EE.xml | 9 +- library/Zend/Locale/Data/eu.xml | 3824 ++++++++- library/Zend/Locale/Data/eu_ES.xml | 9 +- library/Zend/Locale/Data/ewo.xml | 783 ++ library/Zend/Locale/Data/ewo_CM.xml | 14 + library/Zend/Locale/Data/fa.xml | 3589 +++++++-- library/Zend/Locale/Data/fa_AF.xml | 47 +- library/Zend/Locale/Data/fa_IR.xml | 9 +- library/Zend/Locale/Data/ff.xml | 762 ++ library/Zend/Locale/Data/ff_CM.xml | 14 + library/Zend/Locale/Data/ff_GN.xml | 21 + library/Zend/Locale/Data/ff_MR.xml | 21 + library/Zend/Locale/Data/ff_SN.xml | 14 + library/Zend/Locale/Data/fi.xml | 3204 ++++++-- library/Zend/Locale/Data/fi_FI.xml | 9 +- library/Zend/Locale/Data/fil.xml | 3641 ++++++++- library/Zend/Locale/Data/fil_PH.xml | 9 +- library/Zend/Locale/Data/fo.xml | 1772 +++- library/Zend/Locale/Data/fo_FO.xml | 9 +- library/Zend/Locale/Data/fr.xml | 4940 +++++++----- library/Zend/Locale/Data/fr_BE.xml | 179 +- library/Zend/Locale/Data/fr_BF.xml | 14 + library/Zend/Locale/Data/fr_BI.xml | 21 + library/Zend/Locale/Data/fr_BJ.xml | 14 + library/Zend/Locale/Data/fr_BL.xml | 14 + library/Zend/Locale/Data/fr_CA.xml | 510 +- library/Zend/Locale/Data/fr_CD.xml | 21 + library/Zend/Locale/Data/fr_CF.xml | 14 + library/Zend/Locale/Data/fr_CG.xml | 14 + library/Zend/Locale/Data/fr_CH.xml | 209 +- library/Zend/Locale/Data/fr_CI.xml | 14 + library/Zend/Locale/Data/fr_CM.xml | 14 + library/Zend/Locale/Data/fr_DJ.xml | 21 + library/Zend/Locale/Data/fr_DZ.xml | 21 + library/Zend/Locale/Data/fr_FR.xml | 9 +- library/Zend/Locale/Data/fr_GA.xml | 14 + library/Zend/Locale/Data/fr_GF.xml | 14 + library/Zend/Locale/Data/fr_GN.xml | 21 + library/Zend/Locale/Data/fr_GP.xml | 14 + library/Zend/Locale/Data/fr_GQ.xml | 14 + library/Zend/Locale/Data/fr_HT.xml | 21 + library/Zend/Locale/Data/fr_KM.xml | 21 + library/Zend/Locale/Data/fr_LU.xml | 12 +- library/Zend/Locale/Data/fr_MA.xml | 14 + library/Zend/Locale/Data/fr_MC.xml | 9 +- library/Zend/Locale/Data/fr_MF.xml | 14 + library/Zend/Locale/Data/fr_MG.xml | 21 + library/Zend/Locale/Data/fr_ML.xml | 14 + library/Zend/Locale/Data/fr_MQ.xml | 14 + library/Zend/Locale/Data/fr_MR.xml | 21 + library/Zend/Locale/Data/fr_MU.xml | 21 + library/Zend/Locale/Data/fr_NC.xml | 14 + library/Zend/Locale/Data/fr_NE.xml | 14 + library/Zend/Locale/Data/fr_PF.xml | 14 + library/Zend/Locale/Data/fr_PM.xml | 14 + library/Zend/Locale/Data/fr_RE.xml | 14 + library/Zend/Locale/Data/fr_RW.xml | 21 + library/Zend/Locale/Data/fr_SC.xml | 21 + library/Zend/Locale/Data/fr_SN.xml | 9 +- library/Zend/Locale/Data/fr_SY.xml | 21 + library/Zend/Locale/Data/fr_TD.xml | 14 + library/Zend/Locale/Data/fr_TG.xml | 14 + library/Zend/Locale/Data/fr_TN.xml | 21 + library/Zend/Locale/Data/fr_VU.xml | 21 + library/Zend/Locale/Data/fr_WF.xml | 14 + library/Zend/Locale/Data/fr_YT.xml | 14 + library/Zend/Locale/Data/fur.xml | 2183 +++-- library/Zend/Locale/Data/fur_IT.xml | 9 +- library/Zend/Locale/Data/fy.xml | 6954 ++++++++++++++++ library/Zend/Locale/Data/fy_NL.xml | 14 + library/Zend/Locale/Data/ga.xml | 430 +- library/Zend/Locale/Data/ga_IE.xml | 9 +- library/Zend/Locale/Data/gd.xml | 1250 +++ library/Zend/Locale/Data/gd_GB.xml | 14 + library/Zend/Locale/Data/genderList.xml | 21 + library/Zend/Locale/Data/gl.xml | 3550 ++++++-- library/Zend/Locale/Data/gl_ES.xml | 9 +- library/Zend/Locale/Data/gsw.xml | 1655 +++- library/Zend/Locale/Data/gsw_CH.xml | 9 +- library/Zend/Locale/Data/gsw_LI.xml | 14 + library/Zend/Locale/Data/gu.xml | 4710 ++++++++++- library/Zend/Locale/Data/gu_IN.xml | 9 +- library/Zend/Locale/Data/guz.xml | 764 ++ library/Zend/Locale/Data/guz_KE.xml | 14 + library/Zend/Locale/Data/gv.xml | 150 +- library/Zend/Locale/Data/gv_IM.xml | 14 + library/Zend/Locale/Data/ha.xml | 805 +- library/Zend/Locale/Data/ha_Latn.xml | 9 +- library/Zend/Locale/Data/ha_Latn_GH.xml | 16 +- library/Zend/Locale/Data/ha_Latn_NE.xml | 9 +- library/Zend/Locale/Data/ha_Latn_NG.xml | 9 +- library/Zend/Locale/Data/haw.xml | 245 +- library/Zend/Locale/Data/haw_US.xml | 9 +- library/Zend/Locale/Data/he.xml | 4586 +++++++++-- library/Zend/Locale/Data/he_IL.xml | 9 +- library/Zend/Locale/Data/hi.xml | 5229 +++++++++--- library/Zend/Locale/Data/hi_IN.xml | 9 +- library/Zend/Locale/Data/hr.xml | 4617 ++++++++--- library/Zend/Locale/Data/hr_BA.xml | 21 + library/Zend/Locale/Data/hr_HR.xml | 9 +- library/Zend/Locale/Data/hu.xml | 3767 +++++++-- library/Zend/Locale/Data/hu_HU.xml | 9 +- library/Zend/Locale/Data/hy.xml | 4988 +++++++++++- library/Zend/Locale/Data/hy_AM.xml | 9 +- library/Zend/Locale/Data/ia.xml | 824 +- library/Zend/Locale/Data/ia_FR.xml | 14 + library/Zend/Locale/Data/id.xml | 5464 ++++++++++++- library/Zend/Locale/Data/id_ID.xml | 9 +- library/Zend/Locale/Data/ig.xml | 278 +- library/Zend/Locale/Data/ig_NG.xml | 9 +- library/Zend/Locale/Data/ii.xml | 169 +- library/Zend/Locale/Data/ii_CN.xml | 9 +- library/Zend/Locale/Data/is.xml | 3777 +++++++-- library/Zend/Locale/Data/is_IS.xml | 9 +- library/Zend/Locale/Data/it.xml | 3433 ++++++-- library/Zend/Locale/Data/it_CH.xml | 158 +- library/Zend/Locale/Data/it_IT.xml | 9 +- library/Zend/Locale/Data/it_SM.xml | 14 + library/Zend/Locale/Data/ja.xml | 5066 ++++++++++-- library/Zend/Locale/Data/ja_JP.xml | 9 +- library/Zend/Locale/Data/jgo.xml | 608 ++ library/Zend/Locale/Data/jgo_CM.xml | 14 + library/Zend/Locale/Data/jmc.xml | 761 ++ library/Zend/Locale/Data/jmc_TZ.xml | 14 + library/Zend/Locale/Data/ka.xml | 4629 ++++++++++- library/Zend/Locale/Data/ka_GE.xml | 9 +- library/Zend/Locale/Data/kab.xml | 763 ++ library/Zend/Locale/Data/kab_DZ.xml | 14 + library/Zend/Locale/Data/kam.xml | 748 +- library/Zend/Locale/Data/kam_KE.xml | 9 +- library/Zend/Locale/Data/kde.xml | 766 ++ library/Zend/Locale/Data/kde_TZ.xml | 14 + library/Zend/Locale/Data/kea.xml | 1665 ++++ library/Zend/Locale/Data/kea_CV.xml | 14 + library/Zend/Locale/Data/khq.xml | 761 ++ library/Zend/Locale/Data/khq_ML.xml | 14 + library/Zend/Locale/Data/ki.xml | 761 ++ library/Zend/Locale/Data/ki_KE.xml | 14 + library/Zend/Locale/Data/kk.xml | 4659 ++++++++++- library/Zend/Locale/Data/kk_Cyrl.xml | 9 +- library/Zend/Locale/Data/kk_Cyrl_KZ.xml | 9 +- library/Zend/Locale/Data/kkj.xml | 319 + library/Zend/Locale/Data/kkj_CM.xml | 14 + library/Zend/Locale/Data/kl.xml | 1736 +++- library/Zend/Locale/Data/kl_GL.xml | 9 +- library/Zend/Locale/Data/kln.xml | 768 ++ library/Zend/Locale/Data/kln_KE.xml | 14 + library/Zend/Locale/Data/km.xml | 4549 ++++++++++- library/Zend/Locale/Data/km_KH.xml | 9 +- library/Zend/Locale/Data/kn.xml | 4466 ++++++++++- library/Zend/Locale/Data/kn_IN.xml | 9 +- library/Zend/Locale/Data/ko.xml | 3498 ++++++-- library/Zend/Locale/Data/ko_KP.xml | 25 + library/Zend/Locale/Data/ko_KR.xml | 9 +- library/Zend/Locale/Data/kok.xml | 157 +- library/Zend/Locale/Data/kok_IN.xml | 9 +- library/Zend/Locale/Data/ks.xml | 4135 ++++++++++ library/Zend/Locale/Data/ks_Arab.xml | 14 + library/Zend/Locale/Data/ks_Arab_IN.xml | 15 + library/Zend/Locale/Data/ksb.xml | 763 ++ library/Zend/Locale/Data/ksb_TZ.xml | 14 + library/Zend/Locale/Data/ksf.xml | 757 ++ library/Zend/Locale/Data/ksf_CM.xml | 14 + library/Zend/Locale/Data/ksh.xml | 2973 +++++++ library/Zend/Locale/Data/ksh_DE.xml | 14 + library/Zend/Locale/Data/kw.xml | 217 +- library/Zend/Locale/Data/kw_GB.xml | 9 +- library/Zend/Locale/Data/ky.xml | 4852 ++++++++++- library/Zend/Locale/Data/ky_Cyrl.xml | 14 + library/Zend/Locale/Data/ky_Cyrl_KG.xml | 15 + library/Zend/Locale/Data/lag.xml | 753 ++ library/Zend/Locale/Data/lag_TZ.xml | 14 + library/Zend/Locale/Data/languageInfo.xml | 151 + library/Zend/Locale/Data/lg.xml | 756 ++ library/Zend/Locale/Data/lg_UG.xml | 14 + library/Zend/Locale/Data/likelySubtags.xml | 2379 ++++-- library/Zend/Locale/Data/lkt.xml | 545 ++ library/Zend/Locale/Data/lkt_US.xml | 14 + library/Zend/Locale/Data/ln.xml | 1130 ++- library/Zend/Locale/Data/ln_AO.xml | 21 + library/Zend/Locale/Data/ln_CD.xml | 9 +- library/Zend/Locale/Data/ln_CF.xml | 14 + library/Zend/Locale/Data/ln_CG.xml | 9 +- library/Zend/Locale/Data/lo.xml | 6625 ++++++++++++++- library/Zend/Locale/Data/lo_LA.xml | 9 +- library/Zend/Locale/Data/lt.xml | 5298 ++++++++++-- library/Zend/Locale/Data/lt_LT.xml | 9 +- library/Zend/Locale/Data/lu.xml | 775 ++ library/Zend/Locale/Data/lu_CD.xml | 14 + library/Zend/Locale/Data/luo.xml | 761 ++ library/Zend/Locale/Data/luo_KE.xml | 14 + library/Zend/Locale/Data/luy.xml | 763 ++ library/Zend/Locale/Data/luy_KE.xml | 14 + library/Zend/Locale/Data/lv.xml | 3662 ++++++++- library/Zend/Locale/Data/lv_LV.xml | 9 +- library/Zend/Locale/Data/mas.xml | 751 ++ library/Zend/Locale/Data/mas_KE.xml | 14 + library/Zend/Locale/Data/mas_TZ.xml | 21 + library/Zend/Locale/Data/mer.xml | 757 ++ library/Zend/Locale/Data/mer_KE.xml | 14 + library/Zend/Locale/Data/metaZones.xml | 1849 +++++ library/Zend/Locale/Data/mfe.xml | 749 ++ library/Zend/Locale/Data/mfe_MU.xml | 14 + library/Zend/Locale/Data/mg.xml | 750 ++ library/Zend/Locale/Data/mg_MG.xml | 14 + library/Zend/Locale/Data/mgh.xml | 479 ++ library/Zend/Locale/Data/mgh_MZ.xml | 14 + library/Zend/Locale/Data/mgo.xml | 539 ++ library/Zend/Locale/Data/mgo_CM.xml | 14 + library/Zend/Locale/Data/mk.xml | 3928 ++++++++- library/Zend/Locale/Data/mk_MK.xml | 9 +- library/Zend/Locale/Data/ml.xml | 5468 ++++++++----- library/Zend/Locale/Data/ml_IN.xml | 9 +- library/Zend/Locale/Data/mn.xml | 4849 ++++++++++- library/Zend/Locale/Data/mn_Cyrl.xml | 9 +- library/Zend/Locale/Data/mn_Cyrl_MN.xml | 9 +- library/Zend/Locale/Data/mr.xml | 4859 ++++++++++- library/Zend/Locale/Data/mr_IN.xml | 9 +- library/Zend/Locale/Data/ms.xml | 3502 +++++++- library/Zend/Locale/Data/ms_Latn.xml | 14 + library/Zend/Locale/Data/ms_Latn_BN.xml | 56 + library/Zend/Locale/Data/ms_Latn_MY.xml | 15 + library/Zend/Locale/Data/ms_Latn_SG.xml | 22 + library/Zend/Locale/Data/mt.xml | 569 +- library/Zend/Locale/Data/mt_MT.xml | 9 +- library/Zend/Locale/Data/mua.xml | 783 ++ library/Zend/Locale/Data/mua_CM.xml | 14 + library/Zend/Locale/Data/my.xml | 3657 ++++++++- library/Zend/Locale/Data/my_MM.xml | 9 +- library/Zend/Locale/Data/naq.xml | 762 ++ library/Zend/Locale/Data/naq_NA.xml | 14 + library/Zend/Locale/Data/nb.xml | 3553 ++++++-- library/Zend/Locale/Data/nb_NO.xml | 9 +- library/Zend/Locale/Data/nb_SJ.xml | 14 + library/Zend/Locale/Data/nd.xml | 752 ++ library/Zend/Locale/Data/nd_ZW.xml | 14 + library/Zend/Locale/Data/ne.xml | 4336 +++++++++- library/Zend/Locale/Data/ne_IN.xml | 131 +- library/Zend/Locale/Data/ne_NP.xml | 9 +- library/Zend/Locale/Data/nl.xml | 4919 ++++++++++-- library/Zend/Locale/Data/nl_AW.xml | 21 + library/Zend/Locale/Data/nl_BE.xml | 86 +- library/Zend/Locale/Data/nl_BQ.xml | 21 + library/Zend/Locale/Data/nl_CW.xml | 21 + library/Zend/Locale/Data/nl_NL.xml | 9 +- library/Zend/Locale/Data/nl_SR.xml | 21 + library/Zend/Locale/Data/nl_SX.xml | 21 + library/Zend/Locale/Data/nmg.xml | 764 ++ library/Zend/Locale/Data/nmg_CM.xml | 14 + library/Zend/Locale/Data/nn.xml | 1694 +++- library/Zend/Locale/Data/nn_NO.xml | 9 +- library/Zend/Locale/Data/nnh.xml | 320 + library/Zend/Locale/Data/nnh_CM.xml | 14 + library/Zend/Locale/Data/nr.xml | 223 +- library/Zend/Locale/Data/nr_ZA.xml | 9 +- library/Zend/Locale/Data/nso.xml | 225 +- library/Zend/Locale/Data/nso_ZA.xml | 9 +- library/Zend/Locale/Data/numberingSystems.xml | 35 +- library/Zend/Locale/Data/nus.xml | 435 + library/Zend/Locale/Data/nus_SD.xml | 14 + library/Zend/Locale/Data/nyn.xml | 755 ++ library/Zend/Locale/Data/nyn_UG.xml | 14 + library/Zend/Locale/Data/om.xml | 89 +- library/Zend/Locale/Data/om_ET.xml | 9 +- library/Zend/Locale/Data/om_KE.xml | 16 +- library/Zend/Locale/Data/or.xml | 192 +- library/Zend/Locale/Data/or_IN.xml | 9 +- library/Zend/Locale/Data/ordinals.xml | 130 + library/Zend/Locale/Data/os.xml | 879 ++ library/Zend/Locale/Data/os_GE.xml | 14 + library/Zend/Locale/Data/os_RU.xml | 21 + library/Zend/Locale/Data/pa.xml | 4866 ++++++++++- library/Zend/Locale/Data/pa_Arab.xml | 167 +- library/Zend/Locale/Data/pa_Arab_PK.xml | 9 +- library/Zend/Locale/Data/pa_Guru.xml | 9 +- library/Zend/Locale/Data/pa_Guru_IN.xml | 9 +- library/Zend/Locale/Data/pl.xml | 4792 +++++++++-- library/Zend/Locale/Data/pl_PL.xml | 9 +- library/Zend/Locale/Data/plurals.xml | 225 + library/Zend/Locale/Data/postalCodeData.xml | 18 +- library/Zend/Locale/Data/ps.xml | 325 +- library/Zend/Locale/Data/ps_AF.xml | 9 +- library/Zend/Locale/Data/pt.xml | 3954 ++++++--- library/Zend/Locale/Data/pt_AO.xml | 53 + library/Zend/Locale/Data/pt_BR.xml | 9 +- library/Zend/Locale/Data/pt_CV.xml | 57 + library/Zend/Locale/Data/pt_GW.xml | 46 + library/Zend/Locale/Data/pt_MO.xml | 53 + library/Zend/Locale/Data/pt_MZ.xml | 53 + library/Zend/Locale/Data/pt_PT.xml | 5344 ++++++++++-- library/Zend/Locale/Data/pt_ST.xml | 53 + library/Zend/Locale/Data/pt_TL.xml | 46 + library/Zend/Locale/Data/rm.xml | 2793 +++++++ library/Zend/Locale/Data/rm_CH.xml | 14 + library/Zend/Locale/Data/rn.xml | 747 ++ library/Zend/Locale/Data/rn_BI.xml | 14 + library/Zend/Locale/Data/ro.xml | 3969 ++++++++- library/Zend/Locale/Data/ro_MD.xml | 16 +- library/Zend/Locale/Data/ro_RO.xml | 9 +- library/Zend/Locale/Data/rof.xml | 761 ++ library/Zend/Locale/Data/rof_TZ.xml | 14 + library/Zend/Locale/Data/root.xml | 4695 ++++++----- library/Zend/Locale/Data/ru.xml | 5091 ++++++++++-- library/Zend/Locale/Data/ru_BY.xml | 24 + library/Zend/Locale/Data/ru_KG.xml | 21 + library/Zend/Locale/Data/ru_KZ.xml | 21 + library/Zend/Locale/Data/ru_MD.xml | 21 + library/Zend/Locale/Data/ru_RU.xml | 9 +- library/Zend/Locale/Data/ru_UA.xml | 154 +- library/Zend/Locale/Data/rw.xml | 91 +- library/Zend/Locale/Data/rw_RW.xml | 9 +- library/Zend/Locale/Data/rwk.xml | 761 ++ library/Zend/Locale/Data/rwk_TZ.xml | 14 + library/Zend/Locale/Data/sah.xml | 417 + library/Zend/Locale/Data/sah_RU.xml | 14 + library/Zend/Locale/Data/saq.xml | 761 ++ library/Zend/Locale/Data/saq_KE.xml | 14 + library/Zend/Locale/Data/sbp.xml | 765 ++ library/Zend/Locale/Data/sbp_TZ.xml | 14 + library/Zend/Locale/Data/se.xml | 2180 +++-- library/Zend/Locale/Data/se_FI.xml | 259 +- library/Zend/Locale/Data/se_NO.xml | 9 +- library/Zend/Locale/Data/seh.xml | 738 ++ library/Zend/Locale/Data/seh_MZ.xml | 14 + library/Zend/Locale/Data/ses.xml | 761 ++ library/Zend/Locale/Data/ses_ML.xml | 14 + library/Zend/Locale/Data/sg.xml | 759 ++ library/Zend/Locale/Data/sg_CF.xml | 14 + library/Zend/Locale/Data/shi.xml | 749 ++ library/Zend/Locale/Data/shi_Latn.xml | 751 ++ library/Zend/Locale/Data/shi_Latn_MA.xml | 15 + library/Zend/Locale/Data/shi_Tfng.xml | 14 + library/Zend/Locale/Data/shi_Tfng_MA.xml | 15 + library/Zend/Locale/Data/si.xml | 4570 ++++++++++- library/Zend/Locale/Data/si_LK.xml | 9 +- library/Zend/Locale/Data/sk.xml | 4185 +++++++++- library/Zend/Locale/Data/sk_SK.xml | 9 +- library/Zend/Locale/Data/sl.xml | 3251 +++++++- library/Zend/Locale/Data/sl_SI.xml | 9 +- library/Zend/Locale/Data/sn.xml | 754 ++ library/Zend/Locale/Data/sn_ZW.xml | 14 + library/Zend/Locale/Data/so.xml | 724 +- library/Zend/Locale/Data/so_DJ.xml | 16 +- library/Zend/Locale/Data/so_ET.xml | 16 +- library/Zend/Locale/Data/so_KE.xml | 16 +- library/Zend/Locale/Data/so_SO.xml | 9 +- library/Zend/Locale/Data/sq.xml | 4337 +++++++++- library/Zend/Locale/Data/sq_AL.xml | 9 +- library/Zend/Locale/Data/sq_MK.xml | 21 + library/Zend/Locale/Data/sq_XK.xml | 14 + library/Zend/Locale/Data/sr.xml | 4722 +++++++---- library/Zend/Locale/Data/sr_Cyrl.xml | 9 +- library/Zend/Locale/Data/sr_Cyrl_BA.xml | 79 +- library/Zend/Locale/Data/sr_Cyrl_ME.xml | 9 +- library/Zend/Locale/Data/sr_Cyrl_RS.xml | 9 +- library/Zend/Locale/Data/sr_Cyrl_XK.xml | 15 + library/Zend/Locale/Data/sr_Latn.xml | 5489 ++++++++----- library/Zend/Locale/Data/sr_Latn_BA.xml | 9 +- library/Zend/Locale/Data/sr_Latn_ME.xml | 71 +- library/Zend/Locale/Data/sr_Latn_RS.xml | 9 +- library/Zend/Locale/Data/sr_Latn_XK.xml | 15 + library/Zend/Locale/Data/ss.xml | 223 +- library/Zend/Locale/Data/ss_SZ.xml | 10 +- library/Zend/Locale/Data/ss_ZA.xml | 9 +- library/Zend/Locale/Data/ssy.xml | 215 + library/Zend/Locale/Data/ssy_ER.xml | 14 + library/Zend/Locale/Data/st.xml | 408 +- library/Zend/Locale/Data/st_LS.xml | 9 +- library/Zend/Locale/Data/st_ZA.xml | 9 +- library/Zend/Locale/Data/supplementalData.xml | 7137 ++++++++--------- .../Zend/Locale/Data/supplementalMetadata.xml | 1889 +++++ library/Zend/Locale/Data/sv.xml | 4489 +++++++---- library/Zend/Locale/Data/sv_AX.xml | 15 + library/Zend/Locale/Data/sv_FI.xml | 175 +- library/Zend/Locale/Data/sv_SE.xml | 9 +- library/Zend/Locale/Data/sw.xml | 3693 ++++++++- library/Zend/Locale/Data/sw_KE.xml | 19 +- library/Zend/Locale/Data/sw_TZ.xml | 9 +- library/Zend/Locale/Data/sw_UG.xml | 21 + library/Zend/Locale/Data/swc.xml | 775 ++ library/Zend/Locale/Data/swc_CD.xml | 14 + library/Zend/Locale/Data/ta.xml | 4611 ++++++++++- library/Zend/Locale/Data/ta_IN.xml | 9 +- library/Zend/Locale/Data/ta_LK.xml | 21 + library/Zend/Locale/Data/ta_MY.xml | 92 + library/Zend/Locale/Data/ta_SG.xml | 95 + library/Zend/Locale/Data/te.xml | 4954 +++++++++++- library/Zend/Locale/Data/te_IN.xml | 9 +- .../Zend/Locale/Data/telephoneCodeData.xml | 745 +- library/Zend/Locale/Data/teo.xml | 761 ++ library/Zend/Locale/Data/teo_KE.xml | 21 + library/Zend/Locale/Data/teo_UG.xml | 14 + library/Zend/Locale/Data/tg.xml | 278 +- library/Zend/Locale/Data/tg_Cyrl.xml | 9 +- library/Zend/Locale/Data/tg_Cyrl_TJ.xml | 9 +- library/Zend/Locale/Data/th.xml | 4870 ++++++++--- library/Zend/Locale/Data/th_TH.xml | 9 +- library/Zend/Locale/Data/ti.xml | 360 +- library/Zend/Locale/Data/ti_ER.xml | 149 +- library/Zend/Locale/Data/ti_ET.xml | 9 +- library/Zend/Locale/Data/tig.xml | 784 +- library/Zend/Locale/Data/tig_ER.xml | 9 +- library/Zend/Locale/Data/tn.xml | 382 +- library/Zend/Locale/Data/tn_BW.xml | 21 + library/Zend/Locale/Data/tn_ZA.xml | 9 +- library/Zend/Locale/Data/to.xml | 2678 ++++++- library/Zend/Locale/Data/to_TO.xml | 9 +- library/Zend/Locale/Data/tr.xml | 3208 ++++++-- library/Zend/Locale/Data/tr_CY.xml | 14 + library/Zend/Locale/Data/tr_TR.xml | 9 +- library/Zend/Locale/Data/ts.xml | 196 +- library/Zend/Locale/Data/ts_ZA.xml | 9 +- library/Zend/Locale/Data/twq.xml | 780 ++ library/Zend/Locale/Data/twq_NE.xml | 14 + library/Zend/Locale/Data/tzm.xml | 767 ++ library/Zend/Locale/Data/tzm_Latn.xml | 14 + library/Zend/Locale/Data/tzm_Latn_MA.xml | 15 + library/Zend/Locale/Data/ug.xml | 5088 +++++++++++- library/Zend/Locale/Data/ug_Arab.xml | 10 +- library/Zend/Locale/Data/ug_Arab_CN.xml | 10 +- library/Zend/Locale/Data/uk.xml | 4986 ++++++++++-- library/Zend/Locale/Data/uk_UA.xml | 9 +- library/Zend/Locale/Data/ur.xml | 4635 ++++++++++- library/Zend/Locale/Data/ur_IN.xml | 172 +- library/Zend/Locale/Data/ur_PK.xml | 9 +- library/Zend/Locale/Data/uz.xml | 3323 +++++++- library/Zend/Locale/Data/uz_Arab.xml | 187 +- library/Zend/Locale/Data/uz_Arab_AF.xml | 10 +- library/Zend/Locale/Data/uz_Cyrl.xml | 3254 +++++++- library/Zend/Locale/Data/uz_Cyrl_UZ.xml | 9 +- library/Zend/Locale/Data/uz_Latn.xml | 169 +- library/Zend/Locale/Data/uz_Latn_UZ.xml | 9 +- library/Zend/Locale/Data/vai.xml | 677 ++ library/Zend/Locale/Data/vai_Latn.xml | 684 ++ library/Zend/Locale/Data/vai_Latn_LR.xml | 15 + library/Zend/Locale/Data/vai_Vaii.xml | 14 + library/Zend/Locale/Data/vai_Vaii_LR.xml | 15 + library/Zend/Locale/Data/ve.xml | 194 +- library/Zend/Locale/Data/ve_ZA.xml | 9 +- library/Zend/Locale/Data/vi.xml | 4983 +++++++++++- library/Zend/Locale/Data/vi_VN.xml | 9 +- library/Zend/Locale/Data/vo.xml | 312 + library/Zend/Locale/Data/vo_001.xml | 14 + library/Zend/Locale/Data/vun.xml | 761 ++ library/Zend/Locale/Data/vun_TZ.xml | 14 + library/Zend/Locale/Data/wae.xml | 1340 ++++ library/Zend/Locale/Data/wae_CH.xml | 14 + library/Zend/Locale/Data/wal.xml | 497 +- library/Zend/Locale/Data/wal_ET.xml | 9 +- library/Zend/Locale/Data/windowsZones.xml | 653 ++ library/Zend/Locale/Data/xh.xml | 348 +- library/Zend/Locale/Data/xh_ZA.xml | 9 +- library/Zend/Locale/Data/xog.xml | 759 ++ library/Zend/Locale/Data/xog_UG.xml | 14 + library/Zend/Locale/Data/yav.xml | 670 ++ library/Zend/Locale/Data/yav_CM.xml | 14 + library/Zend/Locale/Data/yo.xml | 835 +- library/Zend/Locale/Data/yo_BJ.xml | 797 ++ library/Zend/Locale/Data/yo_NG.xml | 9 +- library/Zend/Locale/Data/zgh.xml | 755 ++ library/Zend/Locale/Data/zgh_MA.xml | 14 + library/Zend/Locale/Data/zh.xml | 4472 +++++++++-- library/Zend/Locale/Data/zh_Hans.xml | 9 +- library/Zend/Locale/Data/zh_Hans_CN.xml | 9 +- library/Zend/Locale/Data/zh_Hans_HK.xml | 595 +- library/Zend/Locale/Data/zh_Hans_MO.xml | 503 +- library/Zend/Locale/Data/zh_Hans_SG.xml | 566 +- library/Zend/Locale/Data/zh_Hant.xml | 5248 ++++++++++-- library/Zend/Locale/Data/zh_Hant_HK.xml | 878 +- library/Zend/Locale/Data/zh_Hant_MO.xml | 162 +- library/Zend/Locale/Data/zh_Hant_TW.xml | 9 +- library/Zend/Locale/Data/zu.xml | 3137 +++++++- library/Zend/Locale/Data/zu_ZA.xml | 9 +- library/Zend/Locale/Exception.php | 6 +- library/Zend/Locale/Format.php | 179 +- library/Zend/Locale/Math.php | 6 +- library/Zend/Locale/Math/Exception.php | 6 +- library/Zend/Locale/Math/PhpMath.php | 6 +- library/Zend/Log.php | 25 +- library/Zend/Log/Exception.php | 8 +- library/Zend/Log/FactoryInterface.php | 10 +- library/Zend/Log/Filter/Abstract.php | 8 +- library/Zend/Log/Filter/Interface.php | 8 +- library/Zend/Log/Filter/Message.php | 8 +- library/Zend/Log/Filter/Priority.php | 8 +- library/Zend/Log/Filter/Suppress.php | 8 +- library/Zend/Log/Formatter/Abstract.php | 10 +- library/Zend/Log/Formatter/Firebug.php | 8 +- library/Zend/Log/Formatter/Interface.php | 8 +- library/Zend/Log/Formatter/Simple.php | 10 +- library/Zend/Log/Formatter/Xml.php | 8 +- library/Zend/Log/Writer/Abstract.php | 8 +- library/Zend/Log/Writer/Db.php | 8 +- library/Zend/Log/Writer/Firebug.php | 6 +- library/Zend/Log/Writer/Mail.php | 8 +- library/Zend/Log/Writer/Mock.php | 8 +- library/Zend/Log/Writer/Null.php | 8 +- library/Zend/Log/Writer/Stream.php | 8 +- library/Zend/Log/Writer/Syslog.php | 6 +- library/Zend/Log/Writer/ZendMonitor.php | 8 +- library/Zend/Mail.php | 8 +- library/Zend/Mail/Exception.php | 6 +- library/Zend/Mail/Message.php | 6 +- library/Zend/Mail/Message/File.php | 6 +- library/Zend/Mail/Message/Interface.php | 8 +- library/Zend/Mail/Part.php | 6 +- library/Zend/Mail/Part/File.php | 6 +- library/Zend/Mail/Part/Interface.php | 8 +- library/Zend/Mail/Protocol/Abstract.php | 8 +- library/Zend/Mail/Protocol/Exception.php | 6 +- library/Zend/Mail/Protocol/Imap.php | 6 +- library/Zend/Mail/Protocol/Pop3.php | 6 +- library/Zend/Mail/Protocol/Smtp.php | 6 +- .../Zend/Mail/Protocol/Smtp/Auth/Crammd5.php | 6 +- .../Zend/Mail/Protocol/Smtp/Auth/Login.php | 6 +- .../Zend/Mail/Protocol/Smtp/Auth/Plain.php | 6 +- library/Zend/Mail/Storage.php | 6 +- library/Zend/Mail/Storage/Abstract.php | 6 +- library/Zend/Mail/Storage/Exception.php | 6 +- library/Zend/Mail/Storage/Folder.php | 6 +- .../Zend/Mail/Storage/Folder/Interface.php | 6 +- library/Zend/Mail/Storage/Folder/Maildir.php | 6 +- library/Zend/Mail/Storage/Folder/Mbox.php | 6 +- library/Zend/Mail/Storage/Imap.php | 6 +- library/Zend/Mail/Storage/Maildir.php | 6 +- library/Zend/Mail/Storage/Mbox.php | 6 +- library/Zend/Mail/Storage/Pop3.php | 6 +- .../Zend/Mail/Storage/Writable/Interface.php | 8 +- .../Zend/Mail/Storage/Writable/Maildir.php | 6 +- library/Zend/Mail/Transport/Abstract.php | 6 +- library/Zend/Mail/Transport/Exception.php | 6 +- library/Zend/Mail/Transport/File.php | 4 +- library/Zend/Mail/Transport/Sendmail.php | 6 +- library/Zend/Mail/Transport/Smtp.php | 6 +- library/Zend/Markup.php | 6 +- library/Zend/Markup/Exception.php | 8 +- library/Zend/Markup/Parser/Bbcode.php | 6 +- library/Zend/Markup/Parser/Exception.php | 8 +- .../Zend/Markup/Parser/ParserInterface.php | 6 +- library/Zend/Markup/Renderer/Exception.php | 8 +- library/Zend/Markup/Renderer/Html.php | 6 +- library/Zend/Markup/Renderer/Html/Code.php | 6 +- .../Markup/Renderer/Html/HtmlAbstract.php | 6 +- library/Zend/Markup/Renderer/Html/Img.php | 6 +- library/Zend/Markup/Renderer/Html/List.php | 6 +- library/Zend/Markup/Renderer/Html/Url.php | 6 +- .../Zend/Markup/Renderer/RendererAbstract.php | 6 +- .../Renderer/TokenConverterInterface.php | 6 +- library/Zend/Markup/Token.php | 6 +- library/Zend/Markup/TokenList.php | 6 +- library/Zend/Measure/Abstract.php | 6 +- library/Zend/Measure/Acceleration.php | 6 +- library/Zend/Measure/Angle.php | 6 +- library/Zend/Measure/Area.php | 6 +- library/Zend/Measure/Binary.php | 6 +- library/Zend/Measure/Capacitance.php | 6 +- library/Zend/Measure/Cooking/Volume.php | 6 +- library/Zend/Measure/Cooking/Weight.php | 6 +- library/Zend/Measure/Current.php | 6 +- library/Zend/Measure/Density.php | 6 +- library/Zend/Measure/Energy.php | 6 +- library/Zend/Measure/Exception.php | 6 +- library/Zend/Measure/Flow/Mass.php | 6 +- library/Zend/Measure/Flow/Mole.php | 6 +- library/Zend/Measure/Flow/Volume.php | 6 +- library/Zend/Measure/Force.php | 6 +- library/Zend/Measure/Frequency.php | 6 +- library/Zend/Measure/Illumination.php | 6 +- library/Zend/Measure/Length.php | 6 +- library/Zend/Measure/Lightness.php | 6 +- library/Zend/Measure/Number.php | 6 +- library/Zend/Measure/Power.php | 6 +- library/Zend/Measure/Pressure.php | 6 +- library/Zend/Measure/Speed.php | 6 +- library/Zend/Measure/Temperature.php | 6 +- library/Zend/Measure/Time.php | 6 +- library/Zend/Measure/Torque.php | 6 +- library/Zend/Measure/Viscosity/Dynamic.php | 6 +- library/Zend/Measure/Viscosity/Kinematic.php | 6 +- library/Zend/Measure/Volume.php | 6 +- library/Zend/Measure/Weight.php | 6 +- library/Zend/Memory.php | 6 +- library/Zend/Memory/AccessController.php | 6 +- library/Zend/Memory/Container.php | 6 +- library/Zend/Memory/Container/Interface.php | 6 +- library/Zend/Memory/Container/Locked.php | 6 +- library/Zend/Memory/Container/Movable.php | 6 +- library/Zend/Memory/Exception.php | 6 +- library/Zend/Memory/Manager.php | 6 +- library/Zend/Memory/Value.php | 6 +- library/Zend/Mime.php | 6 +- library/Zend/Mime/Decode.php | 6 +- library/Zend/Mime/Exception.php | 6 +- library/Zend/Mime/Message.php | 6 +- library/Zend/Mime/Part.php | 6 +- library/Zend/Mobile/Exception.php | 4 +- library/Zend/Mobile/Push/Abstract.php | 4 +- library/Zend/Mobile/Push/Apns.php | 11 +- library/Zend/Mobile/Push/Exception.php | 4 +- .../Push/Exception/DeviceQuotaExceeded.php | 4 +- .../Push/Exception/InvalidAuthToken.php | 4 +- .../Mobile/Push/Exception/InvalidPayload.php | 4 +- .../Push/Exception/InvalidRegistration.php | 4 +- .../Mobile/Push/Exception/InvalidToken.php | 4 +- .../Mobile/Push/Exception/InvalidTopic.php | 4 +- .../Mobile/Push/Exception/QuotaExceeded.php | 4 +- .../Push/Exception/ServerUnavailable.php | 4 +- library/Zend/Mobile/Push/Gcm.php | 12 +- library/Zend/Mobile/Push/Interface.php | 4 +- library/Zend/Mobile/Push/Message/Abstract.php | 4 +- library/Zend/Mobile/Push/Message/Apns.php | 4 +- .../Zend/Mobile/Push/Message/Exception.php | 4 +- library/Zend/Mobile/Push/Message/Gcm.php | 22 +- .../Zend/Mobile/Push/Message/Interface.php | 4 +- library/Zend/Mobile/Push/Message/Mpns.php | 4 +- library/Zend/Mobile/Push/Message/Mpns/Raw.php | 9 +- .../Zend/Mobile/Push/Message/Mpns/Tile.php | 4 +- .../Zend/Mobile/Push/Message/Mpns/Toast.php | 4 +- library/Zend/Mobile/Push/Mpns.php | 4 +- library/Zend/Mobile/Push/Response/Gcm.php | 4 +- library/Zend/Mobile/Push/Test/ApnsProxy.php | 2 +- library/Zend/Navigation.php | 6 +- library/Zend/Navigation/Container.php | 26 +- library/Zend/Navigation/Exception.php | 6 +- library/Zend/Navigation/Page.php | 6 +- library/Zend/Navigation/Page/Mvc.php | 136 +- library/Zend/Navigation/Page/Uri.php | 6 +- library/Zend/Oauth.php | 6 +- library/Zend/Oauth/Client.php | 31 +- library/Zend/Oauth/Config.php | 6 +- library/Zend/Oauth/Config/ConfigInterface.php | 6 +- library/Zend/Oauth/Consumer.php | 6 +- library/Zend/Oauth/Exception.php | 8 +- library/Zend/Oauth/Http.php | 6 +- library/Zend/Oauth/Http/AccessToken.php | 6 +- library/Zend/Oauth/Http/RequestToken.php | 6 +- library/Zend/Oauth/Http/UserAuthorization.php | 6 +- library/Zend/Oauth/Http/Utility.php | 6 +- library/Zend/Oauth/Signature/Hmac.php | 6 +- library/Zend/Oauth/Signature/Plaintext.php | 6 +- library/Zend/Oauth/Signature/Rsa.php | 6 +- .../Oauth/Signature/SignatureAbstract.php | 6 +- library/Zend/Oauth/Token.php | 6 +- library/Zend/Oauth/Token/Access.php | 6 +- .../Zend/Oauth/Token/AuthorizedRequest.php | 6 +- library/Zend/Oauth/Token/Request.php | 6 +- library/Zend/OpenId.php | 8 +- library/Zend/OpenId/Consumer.php | 55 +- library/Zend/OpenId/Consumer/Storage.php | 6 +- library/Zend/OpenId/Consumer/Storage/File.php | 6 +- library/Zend/OpenId/Exception.php | 6 +- library/Zend/OpenId/Extension.php | 6 +- library/Zend/OpenId/Extension/Sreg.php | 6 +- library/Zend/OpenId/Provider.php | 6 +- library/Zend/OpenId/Provider/Storage.php | 6 +- library/Zend/OpenId/Provider/Storage/File.php | 6 +- library/Zend/OpenId/Provider/User.php | 6 +- library/Zend/OpenId/Provider/User/Session.php | 6 +- library/Zend/Paginator.php | 6 +- library/Zend/Paginator/Adapter/Array.php | 8 +- library/Zend/Paginator/Adapter/DbSelect.php | 6 +- .../Zend/Paginator/Adapter/DbTableSelect.php | 8 +- library/Zend/Paginator/Adapter/Interface.php | 6 +- library/Zend/Paginator/Adapter/Iterator.php | 8 +- library/Zend/Paginator/Adapter/Null.php | 8 +- library/Zend/Paginator/AdapterAggregate.php | 8 +- library/Zend/Paginator/Exception.php | 8 +- library/Zend/Paginator/ScrollingStyle/All.php | 8 +- .../Zend/Paginator/ScrollingStyle/Elastic.php | 8 +- .../Paginator/ScrollingStyle/Interface.php | 8 +- .../Zend/Paginator/ScrollingStyle/Jumping.php | 8 +- .../Zend/Paginator/ScrollingStyle/Sliding.php | 8 +- .../Paginator/SerializableLimitIterator.php | 6 +- library/Zend/Pdf.php | 243 +- library/Zend/Pdf/Action.php | 6 +- library/Zend/Pdf/Action/GoTo.php | 6 +- library/Zend/Pdf/Action/GoTo3DView.php | 6 +- library/Zend/Pdf/Action/GoToE.php | 6 +- library/Zend/Pdf/Action/GoToR.php | 6 +- library/Zend/Pdf/Action/Hide.php | 6 +- library/Zend/Pdf/Action/ImportData.php | 6 +- library/Zend/Pdf/Action/JavaScript.php | 6 +- library/Zend/Pdf/Action/Launch.php | 6 +- library/Zend/Pdf/Action/Movie.php | 6 +- library/Zend/Pdf/Action/Named.php | 6 +- library/Zend/Pdf/Action/Rendition.php | 6 +- library/Zend/Pdf/Action/ResetForm.php | 6 +- library/Zend/Pdf/Action/SetOCGState.php | 6 +- library/Zend/Pdf/Action/Sound.php | 6 +- library/Zend/Pdf/Action/SubmitForm.php | 6 +- library/Zend/Pdf/Action/Thread.php | 6 +- library/Zend/Pdf/Action/Trans.php | 6 +- library/Zend/Pdf/Action/URI.php | 6 +- library/Zend/Pdf/Action/Unknown.php | 6 +- library/Zend/Pdf/Annotation.php | 6 +- .../Zend/Pdf/Annotation/FileAttachment.php | 6 +- library/Zend/Pdf/Annotation/Link.php | 17 +- library/Zend/Pdf/Annotation/Markup.php | 6 +- library/Zend/Pdf/Annotation/Text.php | 6 +- library/Zend/Pdf/Canvas.php | 4 +- library/Zend/Pdf/Canvas/Abstract.php | 4 +- library/Zend/Pdf/Canvas/Interface.php | 4 +- library/Zend/Pdf/Cmap.php | 6 +- library/Zend/Pdf/Cmap/ByteEncoding.php | 6 +- library/Zend/Pdf/Cmap/ByteEncoding/Static.php | 6 +- library/Zend/Pdf/Cmap/SegmentToDelta.php | 6 +- library/Zend/Pdf/Cmap/TrimmedTable.php | 6 +- library/Zend/Pdf/Color.php | 6 +- library/Zend/Pdf/Color/Cmyk.php | 6 +- library/Zend/Pdf/Color/GrayScale.php | 6 +- library/Zend/Pdf/Color/Html.php | 6 +- library/Zend/Pdf/Color/Rgb.php | 6 +- library/Zend/Pdf/Destination.php | 6 +- library/Zend/Pdf/Destination/Explicit.php | 6 +- library/Zend/Pdf/Destination/Fit.php | 6 +- .../Zend/Pdf/Destination/FitBoundingBox.php | 6 +- .../FitBoundingBoxHorizontally.php | 6 +- .../Destination/FitBoundingBoxVertically.php | 6 +- .../Zend/Pdf/Destination/FitHorizontally.php | 6 +- library/Zend/Pdf/Destination/FitRectangle.php | 6 +- .../Zend/Pdf/Destination/FitVertically.php | 6 +- library/Zend/Pdf/Destination/Named.php | 6 +- library/Zend/Pdf/Destination/Unknown.php | 6 +- library/Zend/Pdf/Destination/Zoom.php | 6 +- library/Zend/Pdf/Element.php | 6 +- library/Zend/Pdf/Element/Array.php | 6 +- library/Zend/Pdf/Element/Boolean.php | 6 +- library/Zend/Pdf/Element/Dictionary.php | 6 +- library/Zend/Pdf/Element/Name.php | 6 +- library/Zend/Pdf/Element/Null.php | 6 +- library/Zend/Pdf/Element/Numeric.php | 6 +- library/Zend/Pdf/Element/Object.php | 6 +- library/Zend/Pdf/Element/Object/Stream.php | 6 +- library/Zend/Pdf/Element/Reference.php | 6 +- .../Zend/Pdf/Element/Reference/Context.php | 6 +- library/Zend/Pdf/Element/Reference/Table.php | 6 +- library/Zend/Pdf/Element/Stream.php | 6 +- library/Zend/Pdf/Element/String.php | 6 +- library/Zend/Pdf/Element/String/Binary.php | 6 +- library/Zend/Pdf/ElementFactory.php | 6 +- library/Zend/Pdf/ElementFactory/Interface.php | 6 +- library/Zend/Pdf/ElementFactory/Proxy.php | 6 +- library/Zend/Pdf/Exception.php | 6 +- library/Zend/Pdf/FileParser.php | 6 +- library/Zend/Pdf/FileParser/Font.php | 6 +- library/Zend/Pdf/FileParser/Font/OpenType.php | 6 +- .../Pdf/FileParser/Font/OpenType/TrueType.php | 6 +- library/Zend/Pdf/FileParser/Image.php | 6 +- library/Zend/Pdf/FileParser/Image/Png.php | 6 +- library/Zend/Pdf/FileParserDataSource.php | 6 +- .../Zend/Pdf/FileParserDataSource/File.php | 6 +- .../Zend/Pdf/FileParserDataSource/String.php | 6 +- library/Zend/Pdf/Filter/Ascii85.php | 6 +- library/Zend/Pdf/Filter/AsciiHex.php | 6 +- library/Zend/Pdf/Filter/Compression.php | 6 +- library/Zend/Pdf/Filter/Compression/Flate.php | 6 +- library/Zend/Pdf/Filter/Compression/Lzw.php | 6 +- library/Zend/Pdf/Filter/Interface.php | 6 +- library/Zend/Pdf/Filter/RunLength.php | 6 +- library/Zend/Pdf/Font.php | 6 +- library/Zend/Pdf/Image.php | 6 +- library/Zend/Pdf/NameTree.php | 6 +- library/Zend/Pdf/Outline.php | 6 +- library/Zend/Pdf/Outline/Created.php | 6 +- library/Zend/Pdf/Outline/Loaded.php | 6 +- library/Zend/Pdf/Page.php | 6 +- library/Zend/Pdf/Parser.php | 6 +- .../RecursivelyIteratableObjectsContainer.php | 6 +- library/Zend/Pdf/Resource.php | 6 +- library/Zend/Pdf/Resource/ContentStream.php | 4 +- library/Zend/Pdf/Resource/Extractor.php | 4 +- library/Zend/Pdf/Resource/Font.php | 6 +- library/Zend/Pdf/Resource/Font/CidFont.php | 6 +- .../Pdf/Resource/Font/CidFont/TrueType.php | 6 +- library/Zend/Pdf/Resource/Font/Extracted.php | 6 +- .../Zend/Pdf/Resource/Font/FontDescriptor.php | 6 +- library/Zend/Pdf/Resource/Font/Simple.php | 6 +- .../Zend/Pdf/Resource/Font/Simple/Parsed.php | 6 +- .../Resource/Font/Simple/Parsed/TrueType.php | 6 +- .../Pdf/Resource/Font/Simple/Standard.php | 6 +- .../Resource/Font/Simple/Standard/Courier.php | 6 +- .../Font/Simple/Standard/CourierBold.php | 6 +- .../Simple/Standard/CourierBoldOblique.php | 6 +- .../Font/Simple/Standard/CourierOblique.php | 6 +- .../Font/Simple/Standard/Helvetica.php | 6 +- .../Font/Simple/Standard/HelveticaBold.php | 6 +- .../Simple/Standard/HelveticaBoldOblique.php | 6 +- .../Font/Simple/Standard/HelveticaOblique.php | 6 +- .../Resource/Font/Simple/Standard/Symbol.php | 6 +- .../Font/Simple/Standard/TimesBold.php | 6 +- .../Font/Simple/Standard/TimesBoldItalic.php | 6 +- .../Font/Simple/Standard/TimesItalic.php | 6 +- .../Font/Simple/Standard/TimesRoman.php | 6 +- .../Font/Simple/Standard/ZapfDingbats.php | 6 +- library/Zend/Pdf/Resource/Font/Type0.php | 6 +- library/Zend/Pdf/Resource/GraphicsState.php | 4 +- library/Zend/Pdf/Resource/Image.php | 6 +- library/Zend/Pdf/Resource/Image/Jpeg.php | 6 +- library/Zend/Pdf/Resource/Image/Png.php | 6 +- library/Zend/Pdf/Resource/Image/Tiff.php | 6 +- library/Zend/Pdf/Resource/ImageFactory.php | 6 +- library/Zend/Pdf/Resource/Unified.php | 4 +- library/Zend/Pdf/StringParser.php | 6 +- library/Zend/Pdf/Style.php | 6 +- library/Zend/Pdf/Target.php | 6 +- library/Zend/Pdf/Trailer.php | 6 +- library/Zend/Pdf/Trailer/Generator.php | 6 +- library/Zend/Pdf/Trailer/Keeper.php | 6 +- library/Zend/Pdf/UpdateInfoContainer.php | 6 +- library/Zend/ProgressBar.php | 6 +- library/Zend/ProgressBar/Adapter.php | 6 +- library/Zend/ProgressBar/Adapter/Console.php | 8 +- .../Zend/ProgressBar/Adapter/Exception.php | 6 +- library/Zend/ProgressBar/Adapter/JsPull.php | 6 +- library/Zend/ProgressBar/Adapter/JsPush.php | 6 +- library/Zend/ProgressBar/Exception.php | 6 +- library/Zend/Queue.php | 6 +- library/Zend/Queue/Adapter/Activemq.php | 6 +- .../Zend/Queue/Adapter/AdapterAbstract.php | 6 +- .../Zend/Queue/Adapter/AdapterInterface.php | 6 +- library/Zend/Queue/Adapter/Array.php | 6 +- library/Zend/Queue/Adapter/Db.php | 6 +- library/Zend/Queue/Adapter/Db/Message.php | 6 +- library/Zend/Queue/Adapter/Db/Queue.php | 6 +- .../Zend/Queue/Adapter/Db/queue_sqlite.sql | 2 +- library/Zend/Queue/Adapter/Memcacheq.php | 6 +- library/Zend/Queue/Adapter/Null.php | 6 +- .../Zend/Queue/Adapter/PlatformJobQueue.php | 6 +- library/Zend/Queue/Exception.php | 6 +- library/Zend/Queue/Message.php | 6 +- library/Zend/Queue/Message/Iterator.php | 6 +- library/Zend/Queue/Message/PlatformJob.php | 6 +- library/Zend/Queue/Stomp/Client.php | 6 +- .../Zend/Queue/Stomp/Client/Connection.php | 6 +- .../Stomp/Client/ConnectionInterface.php | 6 +- library/Zend/Queue/Stomp/Frame.php | 6 +- library/Zend/Queue/Stomp/FrameInterface.php | 6 +- library/Zend/Reflection/Class.php | 6 +- library/Zend/Reflection/Docblock.php | 6 +- library/Zend/Reflection/Docblock/Tag.php | 6 +- .../Zend/Reflection/Docblock/Tag/Param.php | 6 +- .../Zend/Reflection/Docblock/Tag/Return.php | 6 +- library/Zend/Reflection/Exception.php | 6 +- library/Zend/Reflection/Extension.php | 6 +- library/Zend/Reflection/File.php | 6 +- library/Zend/Reflection/Function.php | 6 +- library/Zend/Reflection/Method.php | 6 +- library/Zend/Reflection/Parameter.php | 6 +- library/Zend/Reflection/Property.php | 6 +- library/Zend/Registry.php | 6 +- library/Zend/Rest/Client.php | 6 +- library/Zend/Rest/Client/Exception.php | 6 +- library/Zend/Rest/Client/Result.php | 10 +- library/Zend/Rest/Client/Result/Exception.php | 6 +- library/Zend/Rest/Controller.php | 6 +- library/Zend/Rest/Exception.php | 6 +- library/Zend/Rest/Route.php | 6 +- library/Zend/Rest/Server.php | 6 +- library/Zend/Rest/Server/Exception.php | 6 +- library/Zend/Search/Exception.php | 6 +- library/Zend/Search/Lucene.php | 6 +- .../Zend/Search/Lucene/Analysis/Analyzer.php | 6 +- .../Lucene/Analysis/Analyzer/Common.php | 6 +- .../Lucene/Analysis/Analyzer/Common/Text.php | 6 +- .../Analyzer/Common/Text/CaseInsensitive.php | 6 +- .../Analysis/Analyzer/Common/TextNum.php | 6 +- .../Common/TextNum/CaseInsensitive.php | 6 +- .../Lucene/Analysis/Analyzer/Common/Utf8.php | 6 +- .../Analyzer/Common/Utf8/CaseInsensitive.php | 6 +- .../Analysis/Analyzer/Common/Utf8Num.php | 6 +- .../Common/Utf8Num/CaseInsensitive.php | 6 +- library/Zend/Search/Lucene/Analysis/Token.php | 6 +- .../Search/Lucene/Analysis/TokenFilter.php | 6 +- .../Lucene/Analysis/TokenFilter/LowerCase.php | 6 +- .../Analysis/TokenFilter/LowerCaseUtf8.php | 6 +- .../Analysis/TokenFilter/ShortWords.php | 6 +- .../Lucene/Analysis/TokenFilter/StopWords.php | 6 +- library/Zend/Search/Lucene/Document.php | 6 +- library/Zend/Search/Lucene/Document/Docx.php | 13 +- .../Zend/Search/Lucene/Document/Exception.php | 6 +- library/Zend/Search/Lucene/Document/Html.php | 6 +- .../Zend/Search/Lucene/Document/OpenXml.php | 12 +- library/Zend/Search/Lucene/Document/Pptx.php | 18 +- library/Zend/Search/Lucene/Document/Xlsx.php | 17 +- library/Zend/Search/Lucene/Exception.php | 6 +- library/Zend/Search/Lucene/FSM.php | 6 +- library/Zend/Search/Lucene/FSMAction.php | 6 +- library/Zend/Search/Lucene/Field.php | 6 +- .../Search/Lucene/Index/DictionaryLoader.php | 6 +- .../Zend/Search/Lucene/Index/DocsFilter.php | 6 +- .../Zend/Search/Lucene/Index/FieldInfo.php | 6 +- .../Zend/Search/Lucene/Index/SegmentInfo.php | 6 +- .../Search/Lucene/Index/SegmentMerger.php | 6 +- .../Search/Lucene/Index/SegmentWriter.php | 6 +- .../Index/SegmentWriter/DocumentWriter.php | 6 +- .../Index/SegmentWriter/StreamWriter.php | 6 +- library/Zend/Search/Lucene/Index/Term.php | 6 +- library/Zend/Search/Lucene/Index/TermInfo.php | 6 +- .../Lucene/Index/TermsPriorityQueue.php | 6 +- .../Lucene/Index/TermsStream/Interface.php | 6 +- library/Zend/Search/Lucene/Index/Writer.php | 6 +- library/Zend/Search/Lucene/Interface.php | 6 +- .../Search/Lucene/Interface/MultiSearcher.php | 2 +- library/Zend/Search/Lucene/LockManager.php | 6 +- library/Zend/Search/Lucene/MultiSearcher.php | 8 +- library/Zend/Search/Lucene/PriorityQueue.php | 6 +- library/Zend/Search/Lucene/Proxy.php | 6 +- .../Search/BooleanExpressionRecognizer.php | 6 +- .../Lucene/Search/Highlighter/Default.php | 6 +- .../Lucene/Search/Highlighter/Interface.php | 6 +- library/Zend/Search/Lucene/Search/Query.php | 6 +- .../Search/Lucene/Search/Query/Boolean.php | 6 +- .../Zend/Search/Lucene/Search/Query/Empty.php | 6 +- .../Zend/Search/Lucene/Search/Query/Fuzzy.php | 6 +- .../Lucene/Search/Query/Insignificant.php | 6 +- .../Search/Lucene/Search/Query/MultiTerm.php | 6 +- .../Search/Lucene/Search/Query/Phrase.php | 6 +- .../Lucene/Search/Query/Preprocessing.php | 6 +- .../Search/Query/Preprocessing/Fuzzy.php | 6 +- .../Search/Query/Preprocessing/Phrase.php | 6 +- .../Search/Query/Preprocessing/Term.php | 6 +- .../Zend/Search/Lucene/Search/Query/Range.php | 6 +- .../Zend/Search/Lucene/Search/Query/Term.php | 6 +- .../Search/Lucene/Search/Query/Wildcard.php | 6 +- .../Zend/Search/Lucene/Search/QueryEntry.php | 6 +- .../Lucene/Search/QueryEntry/Phrase.php | 6 +- .../Lucene/Search/QueryEntry/Subquery.php | 6 +- .../Search/Lucene/Search/QueryEntry/Term.php | 6 +- .../Zend/Search/Lucene/Search/QueryHit.php | 6 +- .../Zend/Search/Lucene/Search/QueryLexer.php | 6 +- .../Zend/Search/Lucene/Search/QueryParser.php | 6 +- .../Lucene/Search/QueryParserContext.php | 6 +- .../Lucene/Search/QueryParserException.php | 6 +- .../Zend/Search/Lucene/Search/QueryToken.php | 6 +- .../Zend/Search/Lucene/Search/Similarity.php | 6 +- .../Lucene/Search/Similarity/Default.php | 6 +- library/Zend/Search/Lucene/Search/Weight.php | 6 +- .../Search/Lucene/Search/Weight/Boolean.php | 6 +- .../Search/Lucene/Search/Weight/Empty.php | 6 +- .../Search/Lucene/Search/Weight/MultiTerm.php | 6 +- .../Search/Lucene/Search/Weight/Phrase.php | 6 +- .../Zend/Search/Lucene/Search/Weight/Term.php | 6 +- .../Zend/Search/Lucene/Storage/Directory.php | 6 +- .../Lucene/Storage/Directory/Filesystem.php | 6 +- library/Zend/Search/Lucene/Storage/File.php | 6 +- .../Search/Lucene/Storage/File/Filesystem.php | 6 +- .../Search/Lucene/Storage/File/Memory.php | 6 +- .../Lucene/TermStreamsPriorityQueue.php | 6 +- library/Zend/Serializer.php | 6 +- .../Serializer/Adapter/AdapterAbstract.php | 6 +- .../Serializer/Adapter/AdapterInterface.php | 6 +- library/Zend/Serializer/Adapter/Amf0.php | 6 +- library/Zend/Serializer/Adapter/Amf3.php | 6 +- library/Zend/Serializer/Adapter/Igbinary.php | 6 +- library/Zend/Serializer/Adapter/Json.php | 15 +- library/Zend/Serializer/Adapter/PhpCode.php | 6 +- .../Zend/Serializer/Adapter/PhpSerialize.php | 6 +- .../Zend/Serializer/Adapter/PythonPickle.php | 6 +- library/Zend/Serializer/Adapter/Wddx.php | 28 +- library/Zend/Serializer/Exception.php | 6 +- library/Zend/Server/Abstract.php | 6 +- library/Zend/Server/Cache.php | 6 +- library/Zend/Server/Definition.php | 6 +- library/Zend/Server/Exception.php | 4 +- library/Zend/Server/Interface.php | 6 +- library/Zend/Server/Method/Callback.php | 6 +- library/Zend/Server/Method/Definition.php | 6 +- library/Zend/Server/Method/Parameter.php | 6 +- library/Zend/Server/Method/Prototype.php | 6 +- library/Zend/Server/Reflection.php | 6 +- library/Zend/Server/Reflection/Class.php | 6 +- library/Zend/Server/Reflection/Exception.php | 6 +- library/Zend/Server/Reflection/Function.php | 6 +- .../Server/Reflection/Function/Abstract.php | 6 +- library/Zend/Server/Reflection/Method.php | 6 +- library/Zend/Server/Reflection/Node.php | 6 +- library/Zend/Server/Reflection/Parameter.php | 6 +- library/Zend/Server/Reflection/Prototype.php | 6 +- .../Zend/Server/Reflection/ReturnValue.php | 6 +- library/Zend/Service/Abstract.php | 6 +- library/Zend/Service/Akismet.php | 6 +- library/Zend/Service/Amazon.php | 13 +- library/Zend/Service/Amazon/Abstract.php | 6 +- library/Zend/Service/Amazon/Accessories.php | 6 +- .../Zend/Service/Amazon/Authentication.php | 4 +- .../Amazon/Authentication/Exception.php | 4 +- .../Zend/Service/Amazon/Authentication/S3.php | 4 +- .../Zend/Service/Amazon/Authentication/V1.php | 4 +- .../Zend/Service/Amazon/Authentication/V2.php | 4 +- .../Zend/Service/Amazon/CustomerReview.php | 6 +- library/Zend/Service/Amazon/Ec2.php | 6 +- library/Zend/Service/Amazon/Ec2/Abstract.php | 6 +- .../Service/Amazon/Ec2/Availabilityzones.php | 6 +- .../Zend/Service/Amazon/Ec2/CloudWatch.php | 6 +- library/Zend/Service/Amazon/Ec2/Ebs.php | 6 +- library/Zend/Service/Amazon/Ec2/Elasticip.php | 6 +- library/Zend/Service/Amazon/Ec2/Exception.php | 6 +- library/Zend/Service/Amazon/Ec2/Image.php | 6 +- library/Zend/Service/Amazon/Ec2/Instance.php | 6 +- .../Service/Amazon/Ec2/Instance/Reserved.php | 6 +- .../Service/Amazon/Ec2/Instance/Windows.php | 6 +- library/Zend/Service/Amazon/Ec2/Keypair.php | 6 +- library/Zend/Service/Amazon/Ec2/Region.php | 6 +- library/Zend/Service/Amazon/Ec2/Response.php | 13 +- .../Service/Amazon/Ec2/Securitygroups.php | 6 +- .../Zend/Service/Amazon/EditorialReview.php | 6 +- library/Zend/Service/Amazon/Exception.php | 8 +- library/Zend/Service/Amazon/Image.php | 6 +- library/Zend/Service/Amazon/Item.php | 6 +- library/Zend/Service/Amazon/ListmaniaList.php | 6 +- library/Zend/Service/Amazon/Offer.php | 8 +- library/Zend/Service/Amazon/OfferSet.php | 6 +- library/Zend/Service/Amazon/Query.php | 6 +- library/Zend/Service/Amazon/ResultSet.php | 6 +- library/Zend/Service/Amazon/S3.php | 6 +- library/Zend/Service/Amazon/S3/Exception.php | 6 +- library/Zend/Service/Amazon/S3/Stream.php | 6 +- .../Zend/Service/Amazon/SimilarProduct.php | 6 +- library/Zend/Service/Amazon/SimpleDb.php | 4 +- .../Service/Amazon/SimpleDb/Attribute.php | 4 +- .../Service/Amazon/SimpleDb/Exception.php | 4 +- library/Zend/Service/Amazon/SimpleDb/Page.php | 4 +- .../Zend/Service/Amazon/SimpleDb/Response.php | 14 +- library/Zend/Service/Amazon/Sqs.php | 6 +- library/Zend/Service/Amazon/Sqs/Exception.php | 6 +- library/Zend/Service/Audioscrobbler.php | 24 +- library/Zend/Service/Console/Command.php | 413 + .../Console/Command/ParameterSource/Argv.php | 71 + .../Command/ParameterSource/ConfigFile.php | 104 + .../Console/Command/ParameterSource/Env.php | 75 + .../ParameterSourceInterface.php | 43 + .../Command/ParameterSource/Prompt.php | 66 + .../Console/Command/ParameterSource/StdIn.php | 81 + library/Zend/Service/Console/Exception.php | 39 + library/Zend/Service/Delicious.php | 12 +- library/Zend/Service/Delicious/Exception.php | 6 +- library/Zend/Service/Delicious/Post.php | 6 +- library/Zend/Service/Delicious/PostList.php | 6 +- library/Zend/Service/Delicious/SimplePost.php | 6 +- .../DeveloperGarden/BaseUserService.php | 6 +- .../BaseUserService/AccountBalance.php | 6 +- .../DeveloperGarden/Client/ClientAbstract.php | 6 +- .../DeveloperGarden/Client/Exception.php | 6 +- .../Service/DeveloperGarden/Client/Soap.php | 6 +- .../DeveloperGarden/ConferenceCall.php | 6 +- .../ConferenceCall/ConferenceAccount.php | 6 +- .../ConferenceCall/ConferenceDetail.php | 6 +- .../ConferenceCall/ConferenceSchedule.php | 6 +- .../ConferenceCall/Exception.php | 6 +- .../ConferenceCall/Participant.php | 6 +- .../ConferenceCall/ParticipantDetail.php | 6 +- .../ConferenceCall/ParticipantStatus.php | 6 +- .../Service/DeveloperGarden/Credential.php | 6 +- .../Service/DeveloperGarden/Exception.php | 6 +- .../Service/DeveloperGarden/IpLocation.php | 6 +- .../DeveloperGarden/IpLocation/IpAddress.php | 6 +- .../Service/DeveloperGarden/LocalSearch.php | 6 +- .../DeveloperGarden/LocalSearch/Exception.php | 6 +- .../LocalSearch/SearchParameters.php | 6 +- .../BaseUserService/ChangeQuotaPool.php | 6 +- .../BaseUserService/GetAccountBalance.php | 6 +- .../BaseUserService/GetQuotaInformation.php | 6 +- ...ddConferenceTemplateParticipantRequest.php | 6 +- .../CommitConferenceRequest.php | 6 +- .../CreateConferenceRequest.php | 6 +- .../CreateConferenceTemplateRequest.php | 6 +- .../GetConferenceListRequest.php | 6 +- .../GetConferenceStatusRequest.php | 6 +- .../GetConferenceTemplateListRequest.php | 6 +- ...etConferenceTemplateParticipantRequest.php | 6 +- .../GetConferenceTemplateRequest.php | 6 +- .../GetParticipantStatusRequest.php | 6 +- .../GetRunningConferenceRequest.php | 6 +- .../ConferenceCall/NewParticipantRequest.php | 6 +- .../RemoveConferenceRequest.php | 6 +- ...veConferenceTemplateParticipantRequest.php | 6 +- .../RemoveConferenceTemplateRequest.php | 6 +- .../RemoveParticipantRequest.php | 6 +- .../UpdateConferenceRequest.php | 6 +- ...teConferenceTemplateParticipantRequest.php | 6 +- .../UpdateConferenceTemplateRequest.php | 6 +- .../UpdateParticipantRequest.php | 6 +- .../DeveloperGarden/Request/Exception.php | 6 +- .../Request/IpLocation/LocateIPRequest.php | 6 +- .../LocalSearch/LocalSearchRequest.php | 6 +- .../Request/RequestAbstract.php | 6 +- .../Request/SendSms/SendFlashSMS.php | 6 +- .../Request/SendSms/SendSMS.php | 6 +- .../Request/SendSms/SendSmsAbstract.php | 6 +- .../SmsValidation/GetValidatedNumbers.php | 6 +- .../Request/SmsValidation/Invalidate.php | 6 +- .../SmsValidation/SendValidationKeyword.php | 6 +- .../Request/SmsValidation/Validate.php | 6 +- .../Request/VoiceButler/CallStatus.php | 6 +- .../Request/VoiceButler/NewCall.php | 6 +- .../Request/VoiceButler/NewCallSequenced.php | 6 +- .../Request/VoiceButler/TearDownCall.php | 6 +- .../VoiceButler/VoiceButlerAbstract.php | 6 +- .../DeveloperGarden/Response/BaseType.php | 6 +- .../ChangeQuotaPoolResponse.php | 6 +- .../GetAccountBalanceResponse.php | 6 +- .../GetQuotaInformationResponse.php | 6 +- ...dConferenceTemplateParticipantResponse.php | 6 +- ...ferenceTemplateParticipantResponseType.php | 6 +- .../ConferenceCall/CCSResponseType.php | 6 +- .../CommitConferenceResponse.php | 6 +- .../ConferenceCall/ConferenceCallAbstract.php | 6 +- .../CreateConferenceResponse.php | 6 +- .../CreateConferenceResponseType.php | 6 +- .../CreateConferenceTemplateResponse.php | 6 +- .../CreateConferenceTemplateResponseType.php | 6 +- .../GetConferenceListResponse.php | 6 +- .../GetConferenceListResponseType.php | 6 +- .../GetConferenceStatusResponse.php | 6 +- .../GetConferenceStatusResponseType.php | 6 +- .../GetConferenceTemplateListResponse.php | 6 +- .../GetConferenceTemplateListResponseType.php | 6 +- ...tConferenceTemplateParticipantResponse.php | 6 +- ...ferenceTemplateParticipantResponseType.php | 6 +- .../GetConferenceTemplateResponse.php | 6 +- .../GetConferenceTemplateResponseType.php | 6 +- .../GetParticipantStatusResponse.php | 6 +- .../GetParticipantStatusResponseType.php | 6 +- .../GetRunningConferenceResponse.php | 6 +- .../GetRunningConferenceResponseType.php | 6 +- .../ConferenceCall/NewParticipantResponse.php | 6 +- .../NewParticipantResponseType.php | 6 +- .../RemoveConferenceResponse.php | 6 +- ...eConferenceTemplateParticipantResponse.php | 6 +- .../RemoveConferenceTemplateResponse.php | 6 +- .../RemoveParticipantResponse.php | 6 +- .../UpdateConferenceResponse.php | 6 +- ...eConferenceTemplateParticipantResponse.php | 6 +- .../UpdateConferenceTemplateResponse.php | 6 +- .../UpdateParticipantResponse.php | 6 +- .../DeveloperGarden/Response/Exception.php | 6 +- .../Response/IpLocation/CityType.php | 6 +- .../IpLocation/GeoCoordinatesType.php | 6 +- .../IpLocation/IPAddressLocationType.php | 6 +- .../Response/IpLocation/LocateIPResponse.php | 6 +- .../IpLocation/LocateIPResponseType.php | 6 +- .../Response/IpLocation/RegionType.php | 6 +- .../LocalSearch/LocalSearchResponse.php | 6 +- .../LocalSearch/LocalSearchResponseType.php | 6 +- .../Response/ResponseAbstract.php | 6 +- .../SecurityTokenServer/Exception.php | 6 +- .../SecurityTokenServer/GetTokensResponse.php | 6 +- .../SecurityTokenServer/Interface.php | 6 +- .../SecurityTokenResponse.php | 6 +- .../Response/SendSms/SendFlashSMSResponse.php | 6 +- .../Response/SendSms/SendSMSResponse.php | 6 +- .../Response/SendSms/SendSmsAbstract.php | 6 +- .../GetValidatedNumbersResponse.php | 6 +- .../SmsValidation/InvalidateResponse.php | 6 +- .../SendValidationKeywordResponse.php | 6 +- .../SmsValidation/ValidateResponse.php | 6 +- .../SmsValidation/ValidatedNumber.php | 6 +- .../VoiceButler/CallStatus2Response.php | 6 +- .../VoiceButler/CallStatusResponse.php | 6 +- .../Response/VoiceButler/NewCallResponse.php | 6 +- .../VoiceButler/NewCallSequencedResponse.php | 6 +- .../VoiceButler/TearDownCallResponse.php | 6 +- .../VoiceButler/VoiceButlerAbstract.php | 6 +- .../DeveloperGarden/SecurityTokenServer.php | 6 +- .../SecurityTokenServer/Cache.php | 6 +- .../Zend/Service/DeveloperGarden/SendSms.php | 6 +- .../Service/DeveloperGarden/SmsValidation.php | 6 +- .../Service/DeveloperGarden/VoiceCall.php | 6 +- library/Zend/Service/Ebay/Abstract.php | 4 +- library/Zend/Service/Ebay/Exception.php | 4 +- library/Zend/Service/Ebay/Finding.php | 9 +- .../Zend/Service/Ebay/Finding/Abstract.php | 4 +- library/Zend/Service/Ebay/Finding/Aspect.php | 4 +- .../Finding/Aspect/Histogram/Container.php | 4 +- .../Ebay/Finding/Aspect/Histogram/Value.php | 4 +- .../Finding/Aspect/Histogram/Value/Set.php | 4 +- .../Zend/Service/Ebay/Finding/Aspect/Set.php | 4 +- .../Zend/Service/Ebay/Finding/Category.php | 4 +- .../Ebay/Finding/Category/Histogram.php | 4 +- .../Finding/Category/Histogram/Container.php | 4 +- .../Ebay/Finding/Category/Histogram/Set.php | 4 +- .../Zend/Service/Ebay/Finding/Error/Data.php | 4 +- .../Service/Ebay/Finding/Error/Data/Set.php | 4 +- .../Service/Ebay/Finding/Error/Message.php | 4 +- .../Zend/Service/Ebay/Finding/Exception.php | 4 +- .../Zend/Service/Ebay/Finding/ListingInfo.php | 4 +- .../Service/Ebay/Finding/PaginationOutput.php | 4 +- .../Ebay/Finding/Response/Abstract.php | 4 +- .../Ebay/Finding/Response/Histograms.php | 4 +- .../Service/Ebay/Finding/Response/Items.php | 4 +- .../Ebay/Finding/Response/Keywords.php | 4 +- .../Zend/Service/Ebay/Finding/Search/Item.php | 4 +- .../Service/Ebay/Finding/Search/Item/Set.php | 4 +- .../Service/Ebay/Finding/Search/Result.php | 4 +- .../Zend/Service/Ebay/Finding/SellerInfo.php | 4 +- .../Service/Ebay/Finding/SellingStatus.php | 4 +- .../Service/Ebay/Finding/Set/Abstract.php | 4 +- .../Service/Ebay/Finding/ShippingInfo.php | 4 +- .../Zend/Service/Ebay/Finding/Storefront.php | 4 +- library/Zend/Service/Exception.php | 6 +- library/Zend/Service/Flickr.php | 25 +- library/Zend/Service/Flickr/Image.php | 6 +- library/Zend/Service/Flickr/Result.php | 6 +- library/Zend/Service/Flickr/ResultSet.php | 6 +- library/Zend/Service/LiveDocx.php | 6 +- library/Zend/Service/LiveDocx/Exception.php | 8 +- library/Zend/Service/LiveDocx/MailMerge.php | 8 +- library/Zend/Service/Rackspace/Abstract.php | 7 +- library/Zend/Service/Rackspace/Exception.php | 6 +- library/Zend/Service/Rackspace/Files.php | 2 +- .../Service/Rackspace/Files/Container.php | 220 +- .../Service/Rackspace/Files/ContainerList.php | 4 +- .../Service/Rackspace/Files/Exception.php | 6 +- .../Zend/Service/Rackspace/Files/Object.php | 111 +- .../Service/Rackspace/Files/ObjectList.php | 4 +- library/Zend/Service/Rackspace/Servers.php | 4 +- .../Service/Rackspace/Servers/Exception.php | 6 +- .../Zend/Service/Rackspace/Servers/Image.php | 4 +- .../Service/Rackspace/Servers/ImageList.php | 4 +- .../Zend/Service/Rackspace/Servers/Server.php | 4 +- .../Service/Rackspace/Servers/ServerList.php | 4 +- .../Rackspace/Servers/SharedIpGroup.php | 4 +- .../Rackspace/Servers/SharedIpGroupList.php | 4 +- library/Zend/Service/ReCaptcha.php | 11 +- library/Zend/Service/ReCaptcha/Exception.php | 8 +- library/Zend/Service/ReCaptcha/MailHide.php | 6 +- .../Service/ReCaptcha/MailHide/Exception.php | 8 +- library/Zend/Service/ReCaptcha/Response.php | 6 +- .../Service/ShortUrl/AbstractShortener.php | 4 +- library/Zend/Service/ShortUrl/BitLy.php | 4 +- library/Zend/Service/ShortUrl/Exception.php | 4 +- library/Zend/Service/ShortUrl/IsGd.php | 4 +- library/Zend/Service/ShortUrl/JdemCz.php | 4 +- library/Zend/Service/ShortUrl/MetamarkNet.php | 4 +- library/Zend/Service/ShortUrl/Shortener.php | 4 +- library/Zend/Service/ShortUrl/TinyUrlCom.php | 4 +- library/Zend/Service/SlideShare.php | 15 +- library/Zend/Service/SlideShare/Exception.php | 8 +- library/Zend/Service/SlideShare/SlideShow.php | 8 +- library/Zend/Service/SqlAzure/Exception.php | 4 +- .../Service/SqlAzure/Management/Client.php | 11 +- .../Service/SqlAzure/Management/Exception.php | 6 +- .../Management/FirewallRuleInstance.php | 4 +- .../SqlAzure/Management/ServerInstance.php | 4 +- .../Management/ServiceEntityAbstract.php | 4 +- library/Zend/Service/StrikeIron.php | 6 +- library/Zend/Service/StrikeIron/Base.php | 6 +- library/Zend/Service/StrikeIron/Decorator.php | 6 +- library/Zend/Service/StrikeIron/Exception.php | 6 +- .../Service/StrikeIron/SalesUseTaxBasic.php | 6 +- .../StrikeIron/USAddressVerification.php | 6 +- .../Zend/Service/StrikeIron/ZipCodeInfo.php | 6 +- library/Zend/Service/Technorati.php | 23 +- library/Zend/Service/Technorati/Author.php | 6 +- .../Service/Technorati/BlogInfoResult.php | 6 +- .../Zend/Service/Technorati/CosmosResult.php | 6 +- .../Service/Technorati/CosmosResultSet.php | 6 +- .../Service/Technorati/DailyCountsResult.php | 6 +- .../Technorati/DailyCountsResultSet.php | 6 +- library/Zend/Service/Technorati/Exception.php | 6 +- .../Zend/Service/Technorati/GetInfoResult.php | 6 +- .../Zend/Service/Technorati/KeyInfoResult.php | 6 +- library/Zend/Service/Technorati/Result.php | 6 +- library/Zend/Service/Technorati/ResultSet.php | 6 +- .../Zend/Service/Technorati/SearchResult.php | 6 +- .../Service/Technorati/SearchResultSet.php | 6 +- library/Zend/Service/Technorati/TagResult.php | 6 +- .../Zend/Service/Technorati/TagResultSet.php | 6 +- .../Zend/Service/Technorati/TagsResult.php | 6 +- .../Zend/Service/Technorati/TagsResultSet.php | 6 +- library/Zend/Service/Technorati/Utils.php | 6 +- library/Zend/Service/Technorati/Weblog.php | 6 +- library/Zend/Service/Twitter.php | 6 +- library/Zend/Service/Twitter/Exception.php | 6 +- library/Zend/Service/Twitter/Response.php | 4 +- .../WindowsAzure/CommandLine/Certificate.php | 44 +- .../WindowsAzure/CommandLine/Deployment.php | 145 +- .../CommandLine/GetAsynchronousOperation.php | 32 +- .../WindowsAzure/CommandLine/Package.php | 61 +- .../PackageScaffolderAbstract.php | 4 +- .../Scaffolders/DefaultScaffolder/index.php | 4 +- .../WindowsAzure/CommandLine/Service.php | 51 +- .../WindowsAzure/CommandLine/Storage.php | 55 +- .../Credentials/CredentialsAbstract.php | 6 +- .../WindowsAzure/Credentials/Exception.php | 4 +- .../Credentials/SharedAccessSignature.php | 6 +- .../WindowsAzure/Credentials/SharedKey.php | 6 +- .../Credentials/SharedKeyLite.php | 6 +- .../Diagnostics/ConfigurationDataSources.php | 6 +- ...figurationDiagnosticInfrastructureLogs.php | 6 +- .../Diagnostics/ConfigurationDirectories.php | 6 +- .../Diagnostics/ConfigurationInstance.php | 11 +- .../Diagnostics/ConfigurationLogs.php | 6 +- .../ConfigurationObjectBaseAbstract.php | 6 +- .../ConfigurationPerformanceCounters.php | 6 +- .../ConfigurationWindowsEventLog.php | 6 +- .../DirectoryConfigurationSubscription.php | 6 +- .../WindowsAzure/Diagnostics/Exception.php | 6 +- .../WindowsAzure/Diagnostics/LogLevel.php | 6 +- .../WindowsAzure/Diagnostics/Manager.php | 6 +- .../PerformanceCounterSubscription.php | 6 +- .../Zend/Service/WindowsAzure/Exception.php | 6 +- .../Service/WindowsAzure/Log/Exception.php | 8 +- .../Log/Formatter/WindowsAzure.php | 6 +- .../WindowsAzure/Log/Writer/WindowsAzure.php | 6 +- .../Management/AffinityGroupInstance.php | 4 +- .../Management/CertificateInstance.php | 4 +- .../WindowsAzure/Management/Client.php | 11 +- .../Management/DeploymentInstance.php | 4 +- .../WindowsAzure/Management/Exception.php | 6 +- .../Management/HostedServiceInstance.php | 4 +- .../Management/LocationInstance.php | 4 +- .../OperatingSystemFamilyInstance.php | 4 +- .../Management/OperatingSystemInstance.php | 4 +- .../Management/OperationStatusInstance.php | 4 +- .../Management/ServiceEntityAbstract.php | 4 +- .../Management/StorageServiceInstance.php | 4 +- .../SubscriptionOperationInstance.php | 4 +- .../WindowsAzure/RetryPolicy/Exception.php | 6 +- .../WindowsAzure/RetryPolicy/NoRetry.php | 8 +- .../WindowsAzure/RetryPolicy/RetryN.php | 8 +- .../RetryPolicy/RetryPolicyAbstract.php | 8 +- .../Service/WindowsAzure/SessionHandler.php | 6 +- library/Zend/Service/WindowsAzure/Storage.php | 12 +- .../Service/WindowsAzure/Storage/Batch.php | 6 +- .../Storage/BatchStorageAbstract.php | 6 +- .../Service/WindowsAzure/Storage/Blob.php | 6 +- .../WindowsAzure/Storage/Blob/Stream.php | 6 +- .../WindowsAzure/Storage/BlobContainer.php | 6 +- .../WindowsAzure/Storage/BlobInstance.php | 6 +- .../Storage/DynamicTableEntity.php | 6 +- .../WindowsAzure/Storage/LeaseInstance.php | 4 +- .../Storage/PageRegionInstance.php | 4 +- .../Service/WindowsAzure/Storage/Queue.php | 6 +- .../WindowsAzure/Storage/QueueInstance.php | 6 +- .../WindowsAzure/Storage/QueueMessage.php | 6 +- .../WindowsAzure/Storage/SignedIdentifier.php | 6 +- .../Storage/StorageEntityAbstract.php | 4 +- .../Service/WindowsAzure/Storage/Table.php | 6 +- .../WindowsAzure/Storage/TableEntity.php | 6 +- .../WindowsAzure/Storage/TableEntityQuery.php | 8 +- .../WindowsAzure/Storage/TableInstance.php | 6 +- library/Zend/Service/Yahoo.php | 29 +- library/Zend/Service/Yahoo/Image.php | 6 +- library/Zend/Service/Yahoo/ImageResult.php | 6 +- library/Zend/Service/Yahoo/ImageResultSet.php | 6 +- .../Zend/Service/Yahoo/InlinkDataResult.php | 6 +- .../Service/Yahoo/InlinkDataResultSet.php | 6 +- library/Zend/Service/Yahoo/LocalResult.php | 6 +- library/Zend/Service/Yahoo/LocalResultSet.php | 6 +- library/Zend/Service/Yahoo/NewsResult.php | 6 +- library/Zend/Service/Yahoo/NewsResultSet.php | 6 +- library/Zend/Service/Yahoo/PageDataResult.php | 6 +- .../Zend/Service/Yahoo/PageDataResultSet.php | 6 +- library/Zend/Service/Yahoo/Result.php | 6 +- library/Zend/Service/Yahoo/ResultSet.php | 6 +- library/Zend/Service/Yahoo/VideoResult.php | 6 +- library/Zend/Service/Yahoo/VideoResultSet.php | 6 +- library/Zend/Service/Yahoo/WebResult.php | 6 +- library/Zend/Service/Yahoo/WebResultSet.php | 6 +- library/Zend/Session.php | 13 +- library/Zend/Session/Abstract.php | 6 +- library/Zend/Session/Exception.php | 6 +- library/Zend/Session/Namespace.php | 6 +- library/Zend/Session/SaveHandler/DbTable.php | 6 +- .../Zend/Session/SaveHandler/Exception.php | 6 +- .../Zend/Session/SaveHandler/Interface.php | 6 +- library/Zend/Session/Validator/Abstract.php | 6 +- .../Zend/Session/Validator/HttpUserAgent.php | 6 +- library/Zend/Session/Validator/Interface.php | 6 +- library/Zend/Soap/AutoDiscover.php | 4 +- library/Zend/Soap/AutoDiscover/Exception.php | 4 +- library/Zend/Soap/Client.php | 6 +- library/Zend/Soap/Client/Common.php | 4 +- library/Zend/Soap/Client/DotNet.php | 4 +- library/Zend/Soap/Client/Exception.php | 6 +- library/Zend/Soap/Client/Local.php | 4 +- library/Zend/Soap/Server.php | 31 +- library/Zend/Soap/Server/Exception.php | 6 +- library/Zend/Soap/Server/Proxy.php | 4 +- library/Zend/Soap/Wsdl.php | 28 +- library/Zend/Soap/Wsdl/Exception.php | 8 +- library/Zend/Soap/Wsdl/Strategy/Abstract.php | 6 +- library/Zend/Soap/Wsdl/Strategy/AnyType.php | 8 +- .../Soap/Wsdl/Strategy/ArrayOfTypeComplex.php | 8 +- .../Wsdl/Strategy/ArrayOfTypeSequence.php | 6 +- library/Zend/Soap/Wsdl/Strategy/Composite.php | 8 +- .../Soap/Wsdl/Strategy/DefaultComplexType.php | 6 +- library/Zend/Soap/Wsdl/Strategy/Interface.php | 8 +- library/Zend/Stdlib/CallbackHandler.php | 4 +- library/Zend/Stdlib/Exception.php | 4 +- .../Exception/InvalidCallbackException.php | 4 +- library/Zend/Stdlib/PriorityQueue.php | 4 +- library/Zend/Stdlib/SplPriorityQueue.php | 4 +- library/Zend/Tag/Cloud.php | 6 +- library/Zend/Tag/Cloud/Decorator/Cloud.php | 6 +- .../Zend/Tag/Cloud/Decorator/Exception.php | 6 +- .../Zend/Tag/Cloud/Decorator/HtmlCloud.php | 6 +- library/Zend/Tag/Cloud/Decorator/HtmlTag.php | 6 +- library/Zend/Tag/Cloud/Decorator/Tag.php | 6 +- library/Zend/Tag/Cloud/Exception.php | 6 +- library/Zend/Tag/Exception.php | 6 +- library/Zend/Tag/Item.php | 6 +- library/Zend/Tag/ItemList.php | 6 +- library/Zend/Tag/Taggable.php | 6 +- library/Zend/Test/DbAdapter.php | 8 +- library/Zend/Test/DbStatement.php | 8 +- .../Zend/Test/PHPUnit/Constraint/DomQuery.php | 412 +- .../Test/PHPUnit/Constraint/DomQuery34.php | 422 + .../Test/PHPUnit/Constraint/DomQuery37.php | 434 + .../Test/PHPUnit/Constraint/DomQuery41.php | 436 + .../Test/PHPUnit/Constraint/Exception.php | 9 +- .../Zend/Test/PHPUnit/Constraint/Redirect.php | 293 +- .../Test/PHPUnit/Constraint/Redirect34.php | 303 + .../Test/PHPUnit/Constraint/Redirect37.php | 315 + .../Test/PHPUnit/Constraint/Redirect41.php | 317 + .../PHPUnit/Constraint/ResponseHeader.php | 396 +- .../PHPUnit/Constraint/ResponseHeader34.php | 406 + .../PHPUnit/Constraint/ResponseHeader37.php | 419 + .../PHPUnit/Constraint/ResponseHeader41.php | 421 + .../Zend/Test/PHPUnit/ControllerTestCase.php | 15 +- .../Zend/Test/PHPUnit/DatabaseTestCase.php | 13 +- library/Zend/Test/PHPUnit/Db/Connection.php | 13 +- .../Zend/Test/PHPUnit/Db/DataSet/DbRowset.php | 13 +- .../Zend/Test/PHPUnit/Db/DataSet/DbTable.php | 13 +- .../PHPUnit/Db/DataSet/DbTableDataSet.php | 12 +- .../Test/PHPUnit/Db/DataSet/QueryDataSet.php | 18 +- .../Test/PHPUnit/Db/DataSet/QueryTable.php | 18 +- library/Zend/Test/PHPUnit/Db/Exception.php | 8 +- .../Zend/Test/PHPUnit/Db/Metadata/Generic.php | 33 +- .../Test/PHPUnit/Db/Operation/DeleteAll.php | 29 +- .../Zend/Test/PHPUnit/Db/Operation/Insert.php | 28 +- .../Test/PHPUnit/Db/Operation/Truncate.php | 28 +- library/Zend/Test/PHPUnit/Db/SimpleTester.php | 28 +- library/Zend/Text/Exception.php | 6 +- library/Zend/Text/Figlet.php | 6 +- library/Zend/Text/Figlet/Exception.php | 6 +- library/Zend/Text/Figlet/zend-framework.flf | 2 +- library/Zend/Text/MultiByte.php | 6 +- library/Zend/Text/Table.php | 6 +- library/Zend/Text/Table/Column.php | 6 +- library/Zend/Text/Table/Decorator/Ascii.php | 6 +- .../Zend/Text/Table/Decorator/Interface.php | 6 +- library/Zend/Text/Table/Decorator/Unicode.php | 6 +- library/Zend/Text/Table/Exception.php | 6 +- library/Zend/Text/Table/Row.php | 6 +- library/Zend/TimeSync.php | 6 +- library/Zend/TimeSync/Exception.php | 6 +- library/Zend/TimeSync/Ntp.php | 6 +- library/Zend/TimeSync/Protocol.php | 6 +- library/Zend/TimeSync/Sntp.php | 6 +- library/Zend/Tool/Framework/Action/Base.php | 6 +- .../Zend/Tool/Framework/Action/Exception.php | 6 +- .../Zend/Tool/Framework/Action/Interface.php | 8 +- .../Zend/Tool/Framework/Action/Repository.php | 6 +- .../Zend/Tool/Framework/Client/Abstract.php | 6 +- library/Zend/Tool/Framework/Client/Config.php | 8 +- .../Zend/Tool/Framework/Client/Console.php | 6 +- .../Client/Console/ArgumentParser.php | 6 +- .../Framework/Client/Console/HelpSystem.php | 6 +- .../Framework/Client/Console/Manifest.php | 6 +- .../Console/ResponseDecorator/AlignCenter.php | 8 +- .../Console/ResponseDecorator/Blockize.php | 6 +- .../Console/ResponseDecorator/Colorizer.php | 6 +- .../Console/ResponseDecorator/Indention.php | 6 +- .../Zend/Tool/Framework/Client/Exception.php | 8 +- .../Client/Interactive/InputHandler.php | 6 +- .../Client/Interactive/InputInterface.php | 6 +- .../Client/Interactive/InputRequest.php | 6 +- .../Client/Interactive/InputResponse.php | 6 +- .../Client/Interactive/OutputInterface.php | 6 +- .../Zend/Tool/Framework/Client/Manifest.php | 6 +- .../Zend/Tool/Framework/Client/Request.php | 8 +- .../Zend/Tool/Framework/Client/Response.php | 8 +- .../Response/ContentDecorator/Interface.php | 6 +- .../Response/ContentDecorator/Separator.php | 6 +- .../Zend/Tool/Framework/Client/Storage.php | 6 +- .../Client/Storage/AdapterInterface.php | 6 +- .../Framework/Client/Storage/Directory.php | 6 +- library/Zend/Tool/Framework/Exception.php | 8 +- .../Zend/Tool/Framework/Loader/Abstract.php | 6 +- .../Tool/Framework/Loader/BasicLoader.php | 8 +- .../Framework/Loader/IncludePathLoader.php | 6 +- .../RecursiveFilterIterator.php | 6 +- .../Zend/Tool/Framework/Loader/Interface.php | 6 +- .../Framework/Manifest/ActionManifestable.php | 6 +- .../Framework/Manifest/ActionMetadata.php | 6 +- .../Tool/Framework/Manifest/Exception.php | 6 +- .../Tool/Framework/Manifest/Indexable.php | 6 +- .../Tool/Framework/Manifest/Interface.php | 6 +- .../Zend/Tool/Framework/Manifest/Metadata.php | 6 +- .../Manifest/MetadataManifestable.php | 6 +- .../Manifest/ProviderManifestable.php | 6 +- .../Framework/Manifest/ProviderMetadata.php | 6 +- .../Tool/Framework/Manifest/Repository.php | 6 +- .../Tool/Framework/Metadata/Attributable.php | 6 +- .../Zend/Tool/Framework/Metadata/Basic.php | 8 +- .../Zend/Tool/Framework/Metadata/Dynamic.php | 6 +- .../Tool/Framework/Metadata/Interface.php | 6 +- library/Zend/Tool/Framework/Metadata/Tool.php | 6 +- .../Zend/Tool/Framework/Provider/Abstract.php | 6 +- .../Provider/DocblockManifestable.php | 6 +- .../Tool/Framework/Provider/Exception.php | 8 +- .../Tool/Framework/Provider/Initializable.php | 4 +- .../Tool/Framework/Provider/Interactable.php | 6 +- .../Tool/Framework/Provider/Interface.php | 6 +- .../Tool/Framework/Provider/Pretendable.php | 6 +- .../Tool/Framework/Provider/Repository.php | 6 +- .../Tool/Framework/Provider/Signature.php | 8 +- library/Zend/Tool/Framework/Registry.php | 6 +- .../Framework/Registry/EnabledInterface.php | 6 +- .../Tool/Framework/Registry/Exception.php | 6 +- .../Tool/Framework/Registry/Interface.php | 6 +- .../Tool/Framework/System/Action/Create.php | 8 +- .../Tool/Framework/System/Action/Delete.php | 6 +- .../Zend/Tool/Framework/System/Manifest.php | 6 +- .../Tool/Framework/System/Provider/Config.php | 8 +- .../Framework/System/Provider/Manifest.php | 6 +- .../Framework/System/Provider/Phpinfo.php | 6 +- .../Framework/System/Provider/Version.php | 6 +- .../Tool/Project/Context/Content/Engine.php | 8 +- .../Context/Content/Engine/CodeGenerator.php | 8 +- .../Project/Context/Content/Engine/Phtml.php | 8 +- .../Zend/Tool/Project/Context/Exception.php | 6 +- .../Project/Context/Filesystem/Abstract.php | 8 +- .../Project/Context/Filesystem/Directory.php | 8 +- .../Tool/Project/Context/Filesystem/File.php | 6 +- .../Zend/Tool/Project/Context/Interface.php | 6 +- .../Zend/Tool/Project/Context/Repository.php | 6 +- .../Tool/Project/Context/System/Interface.php | 6 +- .../Context/System/NotOverwritable.php | 6 +- .../Context/System/ProjectDirectory.php | 8 +- .../Context/System/ProjectProfileFile.php | 6 +- .../System/ProjectProvidersDirectory.php | 8 +- .../Context/System/TopLevelRestrictable.php | 6 +- .../Project/Context/Zf/AbstractClassFile.php | 6 +- .../Tool/Project/Context/Zf/ActionMethod.php | 8 +- .../Tool/Project/Context/Zf/ApisDirectory.php | 8 +- .../Context/Zf/ApplicationConfigFile.php | 6 +- .../Context/Zf/ApplicationDirectory.php | 6 +- .../Tool/Project/Context/Zf/BootstrapFile.php | 6 +- .../Project/Context/Zf/CacheDirectory.php | 8 +- .../Tool/Project/Context/Zf/ConfigFile.php | 6 +- .../Project/Context/Zf/ConfigsDirectory.php | 6 +- .../Project/Context/Zf/ControllerFile.php | 6 +- .../Context/Zf/ControllersDirectory.php | 6 +- .../Tool/Project/Context/Zf/DataDirectory.php | 8 +- .../Project/Context/Zf/DbTableDirectory.php | 6 +- .../Tool/Project/Context/Zf/DbTableFile.php | 6 +- .../Tool/Project/Context/Zf/DocsDirectory.php | 6 +- .../Zend/Tool/Project/Context/Zf/FormFile.php | 6 +- .../Project/Context/Zf/FormsDirectory.php | 6 +- .../Tool/Project/Context/Zf/HtaccessFile.php | 6 +- .../Project/Context/Zf/LayoutScriptFile.php | 6 +- .../Context/Zf/LayoutScriptsDirectory.php | 6 +- .../Project/Context/Zf/LayoutsDirectory.php | 8 +- .../Project/Context/Zf/LibraryDirectory.php | 8 +- .../Project/Context/Zf/LocalesDirectory.php | 6 +- .../Tool/Project/Context/Zf/LogsDirectory.php | 8 +- .../Tool/Project/Context/Zf/ModelFile.php | 8 +- .../Project/Context/Zf/ModelsDirectory.php | 6 +- .../Project/Context/Zf/ModuleDirectory.php | 6 +- .../Project/Context/Zf/ModulesDirectory.php | 6 +- .../Context/Zf/ProjectProviderFile.php | 6 +- .../Project/Context/Zf/PublicDirectory.php | 6 +- .../Context/Zf/PublicImagesDirectory.php | 6 +- .../Project/Context/Zf/PublicIndexFile.php | 6 +- .../Context/Zf/PublicScriptsDirectory.php | 6 +- .../Context/Zf/PublicStylesheetsDirectory.php | 6 +- .../Context/Zf/SearchIndexesDirectory.php | 8 +- .../Project/Context/Zf/ServicesDirectory.php | 8 +- .../Project/Context/Zf/SessionsDirectory.php | 6 +- .../Project/Context/Zf/TemporaryDirectory.php | 6 +- .../Zf/TestApplicationActionMethod.php | 6 +- .../Zf/TestApplicationBootstrapFile.php | 6 +- .../Zf/TestApplicationControllerDirectory.php | 8 +- .../Zf/TestApplicationControllerFile.php | 6 +- .../Context/Zf/TestApplicationDirectory.php | 6 +- .../Zf/TestApplicationModuleDirectory.php | 6 +- .../Zf/TestApplicationModulesDirectory.php | 6 +- .../Context/Zf/TestLibraryBootstrapFile.php | 6 +- .../Context/Zf/TestLibraryDirectory.php | 6 +- .../Project/Context/Zf/TestLibraryFile.php | 8 +- .../Zf/TestLibraryNamespaceDirectory.php | 6 +- .../Context/Zf/TestPHPUnitBootstrapFile.php | 4 +- .../Context/Zf/TestPHPUnitConfigFile.php | 6 +- .../Project/Context/Zf/TestsDirectory.php | 6 +- .../Project/Context/Zf/UploadsDirectory.php | 6 +- .../Zf/ViewControllerScriptsDirectory.php | 6 +- .../Context/Zf/ViewFiltersDirectory.php | 8 +- .../Context/Zf/ViewHelpersDirectory.php | 6 +- .../Project/Context/Zf/ViewScriptFile.php | 6 +- .../Context/Zf/ViewScriptsDirectory.php | 6 +- .../Project/Context/Zf/ViewsDirectory.php | 6 +- .../Context/Zf/ZfStandardLibraryDirectory.php | 6 +- library/Zend/Tool/Project/Exception.php | 6 +- library/Zend/Tool/Project/Profile.php | 8 +- .../Zend/Tool/Project/Profile/Exception.php | 6 +- .../Project/Profile/FileParser/Interface.php | 8 +- .../Tool/Project/Profile/FileParser/Xml.php | 8 +- .../Profile/Iterator/ContextFilter.php | 6 +- .../Iterator/EnabledResourceFilter.php | 8 +- .../Zend/Tool/Project/Profile/Resource.php | 8 +- .../Project/Profile/Resource/Container.php | 8 +- .../Profile/Resource/SearchConstraints.php | 8 +- .../Zend/Tool/Project/Provider/Abstract.php | 6 +- library/Zend/Tool/Project/Provider/Action.php | 6 +- .../Tool/Project/Provider/Application.php | 6 +- .../Zend/Tool/Project/Provider/Controller.php | 6 +- .../Zend/Tool/Project/Provider/DbAdapter.php | 6 +- .../Zend/Tool/Project/Provider/DbTable.php | 8 +- .../Zend/Tool/Project/Provider/Exception.php | 6 +- library/Zend/Tool/Project/Provider/Form.php | 8 +- library/Zend/Tool/Project/Provider/Layout.php | 6 +- .../Zend/Tool/Project/Provider/Manifest.php | 6 +- library/Zend/Tool/Project/Provider/Model.php | 6 +- library/Zend/Tool/Project/Provider/Module.php | 6 +- .../Zend/Tool/Project/Provider/Profile.php | 6 +- .../Zend/Tool/Project/Provider/Project.php | 8 +- .../Tool/Project/Provider/ProjectProvider.php | 6 +- library/Zend/Tool/Project/Provider/Test.php | 6 +- library/Zend/Tool/Project/Provider/View.php | 6 +- library/Zend/Translate.php | 6 +- library/Zend/Translate/Adapter.php | 6 +- library/Zend/Translate/Adapter/Array.php | 6 +- library/Zend/Translate/Adapter/Csv.php | 6 +- library/Zend/Translate/Adapter/Gettext.php | 8 +- library/Zend/Translate/Adapter/Ini.php | 6 +- library/Zend/Translate/Adapter/Qt.php | 20 +- library/Zend/Translate/Adapter/Tbx.php | 20 +- library/Zend/Translate/Adapter/Tmx.php | 20 +- library/Zend/Translate/Adapter/Xliff.php | 20 +- library/Zend/Translate/Adapter/XmlTm.php | 20 +- library/Zend/Translate/Exception.php | 6 +- library/Zend/Translate/Plural.php | 6 +- library/Zend/Uri.php | 6 +- library/Zend/Uri/Exception.php | 6 +- library/Zend/Uri/Http.php | 6 +- library/Zend/Validate.php | 6 +- library/Zend/Validate/Abstract.php | 28 +- library/Zend/Validate/Alnum.php | 6 +- library/Zend/Validate/Alpha.php | 6 +- library/Zend/Validate/Barcode.php | 8 +- .../Zend/Validate/Barcode/AdapterAbstract.php | 6 +- .../Validate/Barcode/AdapterInterface.php | 6 +- library/Zend/Validate/Barcode/Code25.php | 6 +- .../Validate/Barcode/Code25interleaved.php | 6 +- library/Zend/Validate/Barcode/Code39.php | 6 +- library/Zend/Validate/Barcode/Code39ext.php | 6 +- library/Zend/Validate/Barcode/Code93.php | 6 +- library/Zend/Validate/Barcode/Code93ext.php | 6 +- library/Zend/Validate/Barcode/Ean12.php | 6 +- library/Zend/Validate/Barcode/Ean13.php | 6 +- library/Zend/Validate/Barcode/Ean14.php | 6 +- library/Zend/Validate/Barcode/Ean18.php | 6 +- library/Zend/Validate/Barcode/Ean2.php | 6 +- library/Zend/Validate/Barcode/Ean5.php | 6 +- library/Zend/Validate/Barcode/Ean8.php | 6 +- library/Zend/Validate/Barcode/Gtin12.php | 6 +- library/Zend/Validate/Barcode/Gtin13.php | 6 +- library/Zend/Validate/Barcode/Gtin14.php | 6 +- library/Zend/Validate/Barcode/Identcode.php | 6 +- .../Zend/Validate/Barcode/Intelligentmail.php | 6 +- library/Zend/Validate/Barcode/Issn.php | 6 +- library/Zend/Validate/Barcode/Itf14.php | 6 +- library/Zend/Validate/Barcode/Leitcode.php | 6 +- library/Zend/Validate/Barcode/Planet.php | 6 +- library/Zend/Validate/Barcode/Postnet.php | 6 +- library/Zend/Validate/Barcode/Royalmail.php | 6 +- library/Zend/Validate/Barcode/Sscc.php | 6 +- library/Zend/Validate/Barcode/Upca.php | 6 +- library/Zend/Validate/Barcode/Upce.php | 6 +- library/Zend/Validate/Between.php | 6 +- library/Zend/Validate/Callback.php | 6 +- library/Zend/Validate/Ccnum.php | 6 +- library/Zend/Validate/CreditCard.php | 6 +- library/Zend/Validate/Date.php | 6 +- library/Zend/Validate/Db/Abstract.php | 6 +- library/Zend/Validate/Db/NoRecordExists.php | 6 +- library/Zend/Validate/Db/RecordExists.php | 6 +- library/Zend/Validate/Digits.php | 6 +- library/Zend/Validate/EmailAddress.php | 19 +- library/Zend/Validate/Exception.php | 6 +- library/Zend/Validate/File/Count.php | 6 +- library/Zend/Validate/File/Crc32.php | 8 +- .../Zend/Validate/File/ExcludeExtension.php | 6 +- .../Zend/Validate/File/ExcludeMimeType.php | 38 +- library/Zend/Validate/File/Exists.php | 6 +- library/Zend/Validate/File/Extension.php | 12 +- library/Zend/Validate/File/FilesSize.php | 6 +- library/Zend/Validate/File/Hash.php | 6 +- library/Zend/Validate/File/ImageSize.php | 6 +- library/Zend/Validate/File/IsCompressed.php | 6 +- library/Zend/Validate/File/IsImage.php | 6 +- library/Zend/Validate/File/Md5.php | 6 +- library/Zend/Validate/File/MimeType.php | 101 +- library/Zend/Validate/File/NotExists.php | 6 +- library/Zend/Validate/File/Sha1.php | 6 +- library/Zend/Validate/File/Size.php | 6 +- library/Zend/Validate/File/Upload.php | 6 +- library/Zend/Validate/File/WordCount.php | 6 +- library/Zend/Validate/Float.php | 6 +- library/Zend/Validate/GreaterThan.php | 6 +- library/Zend/Validate/Hex.php | 6 +- library/Zend/Validate/Hostname.php | 715 +- library/Zend/Validate/Hostname/Biz.php | 6 +- library/Zend/Validate/Hostname/Cn.php | 6 +- library/Zend/Validate/Hostname/Com.php | 8 +- library/Zend/Validate/Hostname/Jp.php | 6 +- library/Zend/Validate/Iban.php | 36 +- library/Zend/Validate/Identical.php | 10 +- library/Zend/Validate/InArray.php | 6 +- library/Zend/Validate/Int.php | 6 +- library/Zend/Validate/Interface.php | 6 +- library/Zend/Validate/Ip.php | 6 +- library/Zend/Validate/Isbn.php | 6 +- library/Zend/Validate/Ldap/Dn.php | 6 +- library/Zend/Validate/LessThan.php | 6 +- library/Zend/Validate/NotEmpty.php | 6 +- library/Zend/Validate/PostCode.php | 6 +- library/Zend/Validate/Regex.php | 6 +- library/Zend/Validate/Sitemap/Changefreq.php | 6 +- library/Zend/Validate/Sitemap/Lastmod.php | 6 +- library/Zend/Validate/Sitemap/Loc.php | 6 +- library/Zend/Validate/Sitemap/Priority.php | 6 +- library/Zend/Validate/StringLength.php | 22 +- library/Zend/Version.php | 8 +- library/Zend/View.php | 6 +- library/Zend/View/Abstract.php | 6 +- library/Zend/View/Exception.php | 6 +- library/Zend/View/Helper/Abstract.php | 6 +- library/Zend/View/Helper/Action.php | 6 +- library/Zend/View/Helper/BaseUrl.php | 6 +- library/Zend/View/Helper/Currency.php | 6 +- library/Zend/View/Helper/Cycle.php | 6 +- library/Zend/View/Helper/DeclareVars.php | 6 +- library/Zend/View/Helper/Doctype.php | 6 +- library/Zend/View/Helper/Fieldset.php | 6 +- library/Zend/View/Helper/Form.php | 10 +- library/Zend/View/Helper/FormButton.php | 6 +- library/Zend/View/Helper/FormCheckbox.php | 6 +- library/Zend/View/Helper/FormElement.php | 6 +- library/Zend/View/Helper/FormErrors.php | 6 +- library/Zend/View/Helper/FormFile.php | 6 +- library/Zend/View/Helper/FormHidden.php | 6 +- library/Zend/View/Helper/FormImage.php | 6 +- library/Zend/View/Helper/FormLabel.php | 6 +- .../Zend/View/Helper/FormMultiCheckbox.php | 6 +- library/Zend/View/Helper/FormNote.php | 6 +- library/Zend/View/Helper/FormPassword.php | 6 +- library/Zend/View/Helper/FormRadio.php | 6 +- library/Zend/View/Helper/FormReset.php | 6 +- library/Zend/View/Helper/FormSelect.php | 6 +- library/Zend/View/Helper/FormSubmit.php | 6 +- library/Zend/View/Helper/FormText.php | 6 +- library/Zend/View/Helper/FormTextarea.php | 6 +- library/Zend/View/Helper/Gravatar.php | 2 +- library/Zend/View/Helper/HeadLink.php | 6 +- library/Zend/View/Helper/HeadMeta.php | 6 +- library/Zend/View/Helper/HeadScript.php | 6 +- library/Zend/View/Helper/HeadStyle.php | 6 +- library/Zend/View/Helper/HeadTitle.php | 6 +- library/Zend/View/Helper/HtmlElement.php | 17 +- library/Zend/View/Helper/HtmlFlash.php | 6 +- library/Zend/View/Helper/HtmlList.php | 6 +- library/Zend/View/Helper/HtmlObject.php | 6 +- library/Zend/View/Helper/HtmlPage.php | 6 +- library/Zend/View/Helper/HtmlQuicktime.php | 6 +- library/Zend/View/Helper/InlineScript.php | 6 +- library/Zend/View/Helper/Interface.php | 6 +- library/Zend/View/Helper/Json.php | 6 +- library/Zend/View/Helper/Layout.php | 6 +- library/Zend/View/Helper/Navigation.php | 6 +- .../View/Helper/Navigation/Breadcrumbs.php | 6 +- .../Zend/View/Helper/Navigation/Helper.php | 6 +- .../View/Helper/Navigation/HelperAbstract.php | 6 +- library/Zend/View/Helper/Navigation/Links.php | 6 +- library/Zend/View/Helper/Navigation/Menu.php | 6 +- .../Zend/View/Helper/Navigation/Sitemap.php | 6 +- .../Zend/View/Helper/PaginationControl.php | 6 +- library/Zend/View/Helper/Partial.php | 6 +- .../Zend/View/Helper/Partial/Exception.php | 6 +- library/Zend/View/Helper/PartialLoop.php | 6 +- library/Zend/View/Helper/Placeholder.php | 6 +- .../View/Helper/Placeholder/Container.php | 6 +- .../Helper/Placeholder/Container/Abstract.php | 6 +- .../Placeholder/Container/Exception.php | 6 +- .../Placeholder/Container/Standalone.php | 6 +- .../Zend/View/Helper/Placeholder/Registry.php | 6 +- .../Helper/Placeholder/Registry/Exception.php | 6 +- .../Zend/View/Helper/RenderToPlaceholder.php | 6 +- library/Zend/View/Helper/ServerUrl.php | 6 +- library/Zend/View/Helper/Translate.php | 6 +- library/Zend/View/Helper/Url.php | 6 +- library/Zend/View/Helper/UserAgent.php | 4 +- library/Zend/View/Interface.php | 6 +- library/Zend/View/Stream.php | 6 +- library/Zend/Wildfire/Channel/HttpHeaders.php | 6 +- library/Zend/Wildfire/Channel/Interface.php | 6 +- library/Zend/Wildfire/Exception.php | 6 +- library/Zend/Wildfire/Plugin/FirePhp.php | 6 +- .../Zend/Wildfire/Plugin/FirePhp/Message.php | 6 +- .../Wildfire/Plugin/FirePhp/TableMessage.php | 6 +- library/Zend/Wildfire/Plugin/Interface.php | 6 +- library/Zend/Wildfire/Protocol/JsonStream.php | 6 +- library/Zend/Xml/Exception.php | 36 + library/Zend/Xml/Security.php | 159 + library/Zend/XmlRpc/Client.php | 18 +- library/Zend/XmlRpc/Client/Exception.php | 6 +- library/Zend/XmlRpc/Client/FaultException.php | 6 +- library/Zend/XmlRpc/Client/HttpException.php | 6 +- .../XmlRpc/Client/IntrospectException.php | 6 +- .../XmlRpc/Client/ServerIntrospection.php | 6 +- library/Zend/XmlRpc/Client/ServerProxy.php | 6 +- library/Zend/XmlRpc/Exception.php | 6 +- library/Zend/XmlRpc/Fault.php | 6 +- library/Zend/XmlRpc/Generator/DomDocument.php | 6 +- .../XmlRpc/Generator/GeneratorAbstract.php | 4 +- library/Zend/XmlRpc/Generator/XmlWriter.php | 4 +- library/Zend/XmlRpc/Request.php | 30 +- library/Zend/XmlRpc/Request/Http.php | 6 +- library/Zend/XmlRpc/Request/Stdin.php | 6 +- library/Zend/XmlRpc/Response.php | 35 +- library/Zend/XmlRpc/Response/Http.php | 6 +- library/Zend/XmlRpc/Server.php | 6 +- library/Zend/XmlRpc/Server/Cache.php | 6 +- library/Zend/XmlRpc/Server/Exception.php | 6 +- library/Zend/XmlRpc/Server/Fault.php | 6 +- library/Zend/XmlRpc/Server/System.php | 6 +- library/Zend/XmlRpc/Value.php | 14 +- library/Zend/XmlRpc/Value/Array.php | 6 +- library/Zend/XmlRpc/Value/Base64.php | 8 +- library/Zend/XmlRpc/Value/BigInteger.php | 8 +- library/Zend/XmlRpc/Value/Boolean.php | 8 +- library/Zend/XmlRpc/Value/Collection.php | 6 +- library/Zend/XmlRpc/Value/DateTime.php | 6 +- library/Zend/XmlRpc/Value/Double.php | 6 +- library/Zend/XmlRpc/Value/Exception.php | 6 +- library/Zend/XmlRpc/Value/Integer.php | 6 +- library/Zend/XmlRpc/Value/Nil.php | 6 +- library/Zend/XmlRpc/Value/Scalar.php | 8 +- library/Zend/XmlRpc/Value/String.php | 8 +- library/Zend/XmlRpc/Value/Struct.php | 8 +- 3197 files changed, 463912 insertions(+), 71685 deletions(-) create mode 100644 library/Zend/File/PhpClassFile.php create mode 100644 library/Zend/Locale/Data/agq.xml create mode 100644 library/Zend/Locale/Data/agq_CM.xml create mode 100644 library/Zend/Locale/Data/ar_001.xml create mode 100644 library/Zend/Locale/Data/ar_DJ.xml create mode 100644 library/Zend/Locale/Data/ar_EH.xml create mode 100644 library/Zend/Locale/Data/ar_ER.xml create mode 100644 library/Zend/Locale/Data/ar_IL.xml create mode 100644 library/Zend/Locale/Data/ar_KM.xml create mode 100644 library/Zend/Locale/Data/ar_MR.xml create mode 100644 library/Zend/Locale/Data/ar_PS.xml create mode 100644 library/Zend/Locale/Data/ar_SO.xml create mode 100644 library/Zend/Locale/Data/ar_SS.xml create mode 100644 library/Zend/Locale/Data/ar_TD.xml create mode 100644 library/Zend/Locale/Data/asa.xml create mode 100644 library/Zend/Locale/Data/asa_TZ.xml create mode 100644 library/Zend/Locale/Data/ast.xml create mode 100644 library/Zend/Locale/Data/ast_ES.xml create mode 100644 library/Zend/Locale/Data/bas.xml create mode 100644 library/Zend/Locale/Data/bas_CM.xml create mode 100644 library/Zend/Locale/Data/bem.xml create mode 100644 library/Zend/Locale/Data/bem_ZM.xml create mode 100644 library/Zend/Locale/Data/bez.xml create mode 100644 library/Zend/Locale/Data/bez_TZ.xml create mode 100644 library/Zend/Locale/Data/bm.xml create mode 100644 library/Zend/Locale/Data/bm_ML.xml create mode 100644 library/Zend/Locale/Data/br.xml create mode 100644 library/Zend/Locale/Data/br_FR.xml create mode 100644 library/Zend/Locale/Data/brx.xml create mode 100644 library/Zend/Locale/Data/brx_IN.xml create mode 100644 library/Zend/Locale/Data/bs_Cyrl.xml create mode 100644 library/Zend/Locale/Data/bs_Cyrl_BA.xml create mode 100644 library/Zend/Locale/Data/bs_Latn.xml create mode 100644 library/Zend/Locale/Data/bs_Latn_BA.xml create mode 100644 library/Zend/Locale/Data/ca_AD.xml create mode 100644 library/Zend/Locale/Data/ca_ES_VALENCIA.xml create mode 100644 library/Zend/Locale/Data/ca_FR.xml create mode 100644 library/Zend/Locale/Data/ca_IT.xml create mode 100644 library/Zend/Locale/Data/cgg.xml create mode 100644 library/Zend/Locale/Data/cgg_UG.xml create mode 100644 library/Zend/Locale/Data/chr.xml create mode 100644 library/Zend/Locale/Data/chr_US.xml create mode 100644 library/Zend/Locale/Data/coverageLevels.xml create mode 100644 library/Zend/Locale/Data/da_GL.xml create mode 100644 library/Zend/Locale/Data/dav.xml create mode 100644 library/Zend/Locale/Data/dav_KE.xml create mode 100644 library/Zend/Locale/Data/dayPeriods.xml create mode 100644 library/Zend/Locale/Data/dje.xml create mode 100644 library/Zend/Locale/Data/dje_NE.xml create mode 100644 library/Zend/Locale/Data/dua.xml create mode 100644 library/Zend/Locale/Data/dua_CM.xml create mode 100644 library/Zend/Locale/Data/dyo.xml create mode 100644 library/Zend/Locale/Data/dyo_SN.xml create mode 100644 library/Zend/Locale/Data/ebu.xml create mode 100644 library/Zend/Locale/Data/ebu_KE.xml create mode 100644 library/Zend/Locale/Data/en_001.xml create mode 100644 library/Zend/Locale/Data/en_150.xml create mode 100644 library/Zend/Locale/Data/en_AG.xml create mode 100644 library/Zend/Locale/Data/en_AI.xml create mode 100644 library/Zend/Locale/Data/en_BB.xml create mode 100644 library/Zend/Locale/Data/en_BM.xml create mode 100644 library/Zend/Locale/Data/en_BS.xml create mode 100644 library/Zend/Locale/Data/en_CC.xml create mode 100644 library/Zend/Locale/Data/en_CK.xml create mode 100644 library/Zend/Locale/Data/en_CM.xml create mode 100644 library/Zend/Locale/Data/en_CX.xml create mode 100644 library/Zend/Locale/Data/en_DG.xml create mode 100644 library/Zend/Locale/Data/en_DM.xml create mode 100644 library/Zend/Locale/Data/en_ER.xml create mode 100644 library/Zend/Locale/Data/en_FJ.xml create mode 100644 library/Zend/Locale/Data/en_FK.xml create mode 100644 library/Zend/Locale/Data/en_FM.xml create mode 100644 library/Zend/Locale/Data/en_GD.xml create mode 100644 library/Zend/Locale/Data/en_GG.xml create mode 100644 library/Zend/Locale/Data/en_GH.xml create mode 100644 library/Zend/Locale/Data/en_GI.xml create mode 100644 library/Zend/Locale/Data/en_GM.xml create mode 100644 library/Zend/Locale/Data/en_GY.xml create mode 100644 library/Zend/Locale/Data/en_IM.xml create mode 100644 library/Zend/Locale/Data/en_IO.xml create mode 100644 library/Zend/Locale/Data/en_JE.xml create mode 100644 library/Zend/Locale/Data/en_KE.xml create mode 100644 library/Zend/Locale/Data/en_KI.xml create mode 100644 library/Zend/Locale/Data/en_KN.xml create mode 100644 library/Zend/Locale/Data/en_KY.xml create mode 100644 library/Zend/Locale/Data/en_LC.xml create mode 100644 library/Zend/Locale/Data/en_LR.xml create mode 100644 library/Zend/Locale/Data/en_LS.xml create mode 100644 library/Zend/Locale/Data/en_MG.xml create mode 100644 library/Zend/Locale/Data/en_MO.xml create mode 100644 library/Zend/Locale/Data/en_MS.xml create mode 100644 library/Zend/Locale/Data/en_MU.xml create mode 100644 library/Zend/Locale/Data/en_MW.xml create mode 100644 library/Zend/Locale/Data/en_NF.xml create mode 100644 library/Zend/Locale/Data/en_NG.xml create mode 100644 library/Zend/Locale/Data/en_NR.xml create mode 100644 library/Zend/Locale/Data/en_NU.xml create mode 100644 library/Zend/Locale/Data/en_PG.xml create mode 100644 library/Zend/Locale/Data/en_PN.xml create mode 100644 library/Zend/Locale/Data/en_PR.xml create mode 100644 library/Zend/Locale/Data/en_PW.xml create mode 100644 library/Zend/Locale/Data/en_RW.xml create mode 100644 library/Zend/Locale/Data/en_SB.xml create mode 100644 library/Zend/Locale/Data/en_SC.xml create mode 100644 library/Zend/Locale/Data/en_SD.xml create mode 100644 library/Zend/Locale/Data/en_SH.xml create mode 100644 library/Zend/Locale/Data/en_SL.xml create mode 100644 library/Zend/Locale/Data/en_SS.xml create mode 100644 library/Zend/Locale/Data/en_SX.xml create mode 100644 library/Zend/Locale/Data/en_SZ.xml create mode 100644 library/Zend/Locale/Data/en_TC.xml create mode 100644 library/Zend/Locale/Data/en_TK.xml create mode 100644 library/Zend/Locale/Data/en_TO.xml create mode 100644 library/Zend/Locale/Data/en_TV.xml create mode 100644 library/Zend/Locale/Data/en_TZ.xml create mode 100644 library/Zend/Locale/Data/en_UG.xml create mode 100644 library/Zend/Locale/Data/en_VC.xml create mode 100644 library/Zend/Locale/Data/en_VG.xml create mode 100644 library/Zend/Locale/Data/en_VU.xml create mode 100644 library/Zend/Locale/Data/en_WS.xml create mode 100644 library/Zend/Locale/Data/en_ZM.xml create mode 100644 library/Zend/Locale/Data/eo_001.xml create mode 100644 library/Zend/Locale/Data/es_419.xml create mode 100644 library/Zend/Locale/Data/es_CU.xml create mode 100644 library/Zend/Locale/Data/es_EA.xml create mode 100644 library/Zend/Locale/Data/es_GQ.xml create mode 100644 library/Zend/Locale/Data/es_IC.xml create mode 100644 library/Zend/Locale/Data/es_PH.xml create mode 100644 library/Zend/Locale/Data/ewo.xml create mode 100644 library/Zend/Locale/Data/ewo_CM.xml create mode 100644 library/Zend/Locale/Data/ff.xml create mode 100644 library/Zend/Locale/Data/ff_CM.xml create mode 100644 library/Zend/Locale/Data/ff_GN.xml create mode 100644 library/Zend/Locale/Data/ff_MR.xml create mode 100644 library/Zend/Locale/Data/ff_SN.xml create mode 100644 library/Zend/Locale/Data/fr_BF.xml create mode 100644 library/Zend/Locale/Data/fr_BI.xml create mode 100644 library/Zend/Locale/Data/fr_BJ.xml create mode 100644 library/Zend/Locale/Data/fr_BL.xml create mode 100644 library/Zend/Locale/Data/fr_CD.xml create mode 100644 library/Zend/Locale/Data/fr_CF.xml create mode 100644 library/Zend/Locale/Data/fr_CG.xml create mode 100644 library/Zend/Locale/Data/fr_CI.xml create mode 100644 library/Zend/Locale/Data/fr_CM.xml create mode 100644 library/Zend/Locale/Data/fr_DJ.xml create mode 100644 library/Zend/Locale/Data/fr_DZ.xml create mode 100644 library/Zend/Locale/Data/fr_GA.xml create mode 100644 library/Zend/Locale/Data/fr_GF.xml create mode 100644 library/Zend/Locale/Data/fr_GN.xml create mode 100644 library/Zend/Locale/Data/fr_GP.xml create mode 100644 library/Zend/Locale/Data/fr_GQ.xml create mode 100644 library/Zend/Locale/Data/fr_HT.xml create mode 100644 library/Zend/Locale/Data/fr_KM.xml create mode 100644 library/Zend/Locale/Data/fr_MA.xml create mode 100644 library/Zend/Locale/Data/fr_MF.xml create mode 100644 library/Zend/Locale/Data/fr_MG.xml create mode 100644 library/Zend/Locale/Data/fr_ML.xml create mode 100644 library/Zend/Locale/Data/fr_MQ.xml create mode 100644 library/Zend/Locale/Data/fr_MR.xml create mode 100644 library/Zend/Locale/Data/fr_MU.xml create mode 100644 library/Zend/Locale/Data/fr_NC.xml create mode 100644 library/Zend/Locale/Data/fr_NE.xml create mode 100644 library/Zend/Locale/Data/fr_PF.xml create mode 100644 library/Zend/Locale/Data/fr_PM.xml create mode 100644 library/Zend/Locale/Data/fr_RE.xml create mode 100644 library/Zend/Locale/Data/fr_RW.xml create mode 100644 library/Zend/Locale/Data/fr_SC.xml create mode 100644 library/Zend/Locale/Data/fr_SY.xml create mode 100644 library/Zend/Locale/Data/fr_TD.xml create mode 100644 library/Zend/Locale/Data/fr_TG.xml create mode 100644 library/Zend/Locale/Data/fr_TN.xml create mode 100644 library/Zend/Locale/Data/fr_VU.xml create mode 100644 library/Zend/Locale/Data/fr_WF.xml create mode 100644 library/Zend/Locale/Data/fr_YT.xml create mode 100644 library/Zend/Locale/Data/fy.xml create mode 100644 library/Zend/Locale/Data/fy_NL.xml create mode 100644 library/Zend/Locale/Data/gd.xml create mode 100644 library/Zend/Locale/Data/gd_GB.xml create mode 100644 library/Zend/Locale/Data/genderList.xml create mode 100644 library/Zend/Locale/Data/gsw_LI.xml create mode 100644 library/Zend/Locale/Data/guz.xml create mode 100644 library/Zend/Locale/Data/guz_KE.xml create mode 100644 library/Zend/Locale/Data/gv_IM.xml create mode 100644 library/Zend/Locale/Data/hr_BA.xml create mode 100644 library/Zend/Locale/Data/ia_FR.xml create mode 100644 library/Zend/Locale/Data/it_SM.xml create mode 100644 library/Zend/Locale/Data/jgo.xml create mode 100644 library/Zend/Locale/Data/jgo_CM.xml create mode 100644 library/Zend/Locale/Data/jmc.xml create mode 100644 library/Zend/Locale/Data/jmc_TZ.xml create mode 100644 library/Zend/Locale/Data/kab.xml create mode 100644 library/Zend/Locale/Data/kab_DZ.xml create mode 100644 library/Zend/Locale/Data/kde.xml create mode 100644 library/Zend/Locale/Data/kde_TZ.xml create mode 100644 library/Zend/Locale/Data/kea.xml create mode 100644 library/Zend/Locale/Data/kea_CV.xml create mode 100644 library/Zend/Locale/Data/khq.xml create mode 100644 library/Zend/Locale/Data/khq_ML.xml create mode 100644 library/Zend/Locale/Data/ki.xml create mode 100644 library/Zend/Locale/Data/ki_KE.xml create mode 100644 library/Zend/Locale/Data/kkj.xml create mode 100644 library/Zend/Locale/Data/kkj_CM.xml create mode 100644 library/Zend/Locale/Data/kln.xml create mode 100644 library/Zend/Locale/Data/kln_KE.xml create mode 100644 library/Zend/Locale/Data/ko_KP.xml create mode 100644 library/Zend/Locale/Data/ks.xml create mode 100644 library/Zend/Locale/Data/ks_Arab.xml create mode 100644 library/Zend/Locale/Data/ks_Arab_IN.xml create mode 100644 library/Zend/Locale/Data/ksb.xml create mode 100644 library/Zend/Locale/Data/ksb_TZ.xml create mode 100644 library/Zend/Locale/Data/ksf.xml create mode 100644 library/Zend/Locale/Data/ksf_CM.xml create mode 100644 library/Zend/Locale/Data/ksh.xml create mode 100644 library/Zend/Locale/Data/ksh_DE.xml create mode 100644 library/Zend/Locale/Data/ky_Cyrl.xml create mode 100644 library/Zend/Locale/Data/ky_Cyrl_KG.xml create mode 100644 library/Zend/Locale/Data/lag.xml create mode 100644 library/Zend/Locale/Data/lag_TZ.xml create mode 100644 library/Zend/Locale/Data/languageInfo.xml create mode 100644 library/Zend/Locale/Data/lg.xml create mode 100644 library/Zend/Locale/Data/lg_UG.xml create mode 100644 library/Zend/Locale/Data/lkt.xml create mode 100644 library/Zend/Locale/Data/lkt_US.xml create mode 100644 library/Zend/Locale/Data/ln_AO.xml create mode 100644 library/Zend/Locale/Data/ln_CF.xml create mode 100644 library/Zend/Locale/Data/lu.xml create mode 100644 library/Zend/Locale/Data/lu_CD.xml create mode 100644 library/Zend/Locale/Data/luo.xml create mode 100644 library/Zend/Locale/Data/luo_KE.xml create mode 100644 library/Zend/Locale/Data/luy.xml create mode 100644 library/Zend/Locale/Data/luy_KE.xml create mode 100644 library/Zend/Locale/Data/mas.xml create mode 100644 library/Zend/Locale/Data/mas_KE.xml create mode 100644 library/Zend/Locale/Data/mas_TZ.xml create mode 100644 library/Zend/Locale/Data/mer.xml create mode 100644 library/Zend/Locale/Data/mer_KE.xml create mode 100644 library/Zend/Locale/Data/metaZones.xml create mode 100644 library/Zend/Locale/Data/mfe.xml create mode 100644 library/Zend/Locale/Data/mfe_MU.xml create mode 100644 library/Zend/Locale/Data/mg.xml create mode 100644 library/Zend/Locale/Data/mg_MG.xml create mode 100644 library/Zend/Locale/Data/mgh.xml create mode 100644 library/Zend/Locale/Data/mgh_MZ.xml create mode 100644 library/Zend/Locale/Data/mgo.xml create mode 100644 library/Zend/Locale/Data/mgo_CM.xml create mode 100644 library/Zend/Locale/Data/ms_Latn.xml create mode 100644 library/Zend/Locale/Data/ms_Latn_BN.xml create mode 100644 library/Zend/Locale/Data/ms_Latn_MY.xml create mode 100644 library/Zend/Locale/Data/ms_Latn_SG.xml create mode 100644 library/Zend/Locale/Data/mua.xml create mode 100644 library/Zend/Locale/Data/mua_CM.xml create mode 100644 library/Zend/Locale/Data/naq.xml create mode 100644 library/Zend/Locale/Data/naq_NA.xml create mode 100644 library/Zend/Locale/Data/nb_SJ.xml create mode 100644 library/Zend/Locale/Data/nd.xml create mode 100644 library/Zend/Locale/Data/nd_ZW.xml create mode 100644 library/Zend/Locale/Data/nl_AW.xml create mode 100644 library/Zend/Locale/Data/nl_BQ.xml create mode 100644 library/Zend/Locale/Data/nl_CW.xml create mode 100644 library/Zend/Locale/Data/nl_SR.xml create mode 100644 library/Zend/Locale/Data/nl_SX.xml create mode 100644 library/Zend/Locale/Data/nmg.xml create mode 100644 library/Zend/Locale/Data/nmg_CM.xml create mode 100644 library/Zend/Locale/Data/nnh.xml create mode 100644 library/Zend/Locale/Data/nnh_CM.xml create mode 100644 library/Zend/Locale/Data/nus.xml create mode 100644 library/Zend/Locale/Data/nus_SD.xml create mode 100644 library/Zend/Locale/Data/nyn.xml create mode 100644 library/Zend/Locale/Data/nyn_UG.xml create mode 100644 library/Zend/Locale/Data/ordinals.xml create mode 100644 library/Zend/Locale/Data/os.xml create mode 100644 library/Zend/Locale/Data/os_GE.xml create mode 100644 library/Zend/Locale/Data/os_RU.xml create mode 100644 library/Zend/Locale/Data/plurals.xml create mode 100644 library/Zend/Locale/Data/pt_AO.xml create mode 100644 library/Zend/Locale/Data/pt_CV.xml create mode 100644 library/Zend/Locale/Data/pt_GW.xml create mode 100644 library/Zend/Locale/Data/pt_MO.xml create mode 100644 library/Zend/Locale/Data/pt_MZ.xml create mode 100644 library/Zend/Locale/Data/pt_ST.xml create mode 100644 library/Zend/Locale/Data/pt_TL.xml create mode 100644 library/Zend/Locale/Data/rm.xml create mode 100644 library/Zend/Locale/Data/rm_CH.xml create mode 100644 library/Zend/Locale/Data/rn.xml create mode 100644 library/Zend/Locale/Data/rn_BI.xml create mode 100644 library/Zend/Locale/Data/rof.xml create mode 100644 library/Zend/Locale/Data/rof_TZ.xml create mode 100644 library/Zend/Locale/Data/ru_BY.xml create mode 100644 library/Zend/Locale/Data/ru_KG.xml create mode 100644 library/Zend/Locale/Data/ru_KZ.xml create mode 100644 library/Zend/Locale/Data/ru_MD.xml create mode 100644 library/Zend/Locale/Data/rwk.xml create mode 100644 library/Zend/Locale/Data/rwk_TZ.xml create mode 100644 library/Zend/Locale/Data/sah.xml create mode 100644 library/Zend/Locale/Data/sah_RU.xml create mode 100644 library/Zend/Locale/Data/saq.xml create mode 100644 library/Zend/Locale/Data/saq_KE.xml create mode 100644 library/Zend/Locale/Data/sbp.xml create mode 100644 library/Zend/Locale/Data/sbp_TZ.xml create mode 100644 library/Zend/Locale/Data/seh.xml create mode 100644 library/Zend/Locale/Data/seh_MZ.xml create mode 100644 library/Zend/Locale/Data/ses.xml create mode 100644 library/Zend/Locale/Data/ses_ML.xml create mode 100644 library/Zend/Locale/Data/sg.xml create mode 100644 library/Zend/Locale/Data/sg_CF.xml create mode 100644 library/Zend/Locale/Data/shi.xml create mode 100644 library/Zend/Locale/Data/shi_Latn.xml create mode 100644 library/Zend/Locale/Data/shi_Latn_MA.xml create mode 100644 library/Zend/Locale/Data/shi_Tfng.xml create mode 100644 library/Zend/Locale/Data/shi_Tfng_MA.xml create mode 100644 library/Zend/Locale/Data/sn.xml create mode 100644 library/Zend/Locale/Data/sn_ZW.xml create mode 100644 library/Zend/Locale/Data/sq_MK.xml create mode 100644 library/Zend/Locale/Data/sq_XK.xml create mode 100644 library/Zend/Locale/Data/sr_Cyrl_XK.xml create mode 100644 library/Zend/Locale/Data/sr_Latn_XK.xml create mode 100644 library/Zend/Locale/Data/ssy.xml create mode 100644 library/Zend/Locale/Data/ssy_ER.xml create mode 100644 library/Zend/Locale/Data/supplementalMetadata.xml create mode 100644 library/Zend/Locale/Data/sv_AX.xml create mode 100644 library/Zend/Locale/Data/sw_UG.xml create mode 100644 library/Zend/Locale/Data/swc.xml create mode 100644 library/Zend/Locale/Data/swc_CD.xml create mode 100644 library/Zend/Locale/Data/ta_LK.xml create mode 100644 library/Zend/Locale/Data/ta_MY.xml create mode 100644 library/Zend/Locale/Data/ta_SG.xml create mode 100644 library/Zend/Locale/Data/teo.xml create mode 100644 library/Zend/Locale/Data/teo_KE.xml create mode 100644 library/Zend/Locale/Data/teo_UG.xml create mode 100644 library/Zend/Locale/Data/tn_BW.xml create mode 100644 library/Zend/Locale/Data/tr_CY.xml create mode 100644 library/Zend/Locale/Data/twq.xml create mode 100644 library/Zend/Locale/Data/twq_NE.xml create mode 100644 library/Zend/Locale/Data/tzm.xml create mode 100644 library/Zend/Locale/Data/tzm_Latn.xml create mode 100644 library/Zend/Locale/Data/tzm_Latn_MA.xml create mode 100644 library/Zend/Locale/Data/vai.xml create mode 100644 library/Zend/Locale/Data/vai_Latn.xml create mode 100644 library/Zend/Locale/Data/vai_Latn_LR.xml create mode 100644 library/Zend/Locale/Data/vai_Vaii.xml create mode 100644 library/Zend/Locale/Data/vai_Vaii_LR.xml create mode 100644 library/Zend/Locale/Data/vo.xml create mode 100644 library/Zend/Locale/Data/vo_001.xml create mode 100644 library/Zend/Locale/Data/vun.xml create mode 100644 library/Zend/Locale/Data/vun_TZ.xml create mode 100644 library/Zend/Locale/Data/wae.xml create mode 100644 library/Zend/Locale/Data/wae_CH.xml create mode 100644 library/Zend/Locale/Data/windowsZones.xml create mode 100644 library/Zend/Locale/Data/xog.xml create mode 100644 library/Zend/Locale/Data/xog_UG.xml create mode 100644 library/Zend/Locale/Data/yav.xml create mode 100644 library/Zend/Locale/Data/yav_CM.xml create mode 100644 library/Zend/Locale/Data/yo_BJ.xml create mode 100644 library/Zend/Locale/Data/zgh.xml create mode 100644 library/Zend/Locale/Data/zgh_MA.xml create mode 100644 library/Zend/Service/Console/Command.php create mode 100644 library/Zend/Service/Console/Command/ParameterSource/Argv.php create mode 100644 library/Zend/Service/Console/Command/ParameterSource/ConfigFile.php create mode 100644 library/Zend/Service/Console/Command/ParameterSource/Env.php create mode 100644 library/Zend/Service/Console/Command/ParameterSource/ParameterSourceInterface.php create mode 100644 library/Zend/Service/Console/Command/ParameterSource/Prompt.php create mode 100644 library/Zend/Service/Console/Command/ParameterSource/StdIn.php create mode 100644 library/Zend/Service/Console/Exception.php create mode 100644 library/Zend/Test/PHPUnit/Constraint/DomQuery34.php create mode 100644 library/Zend/Test/PHPUnit/Constraint/DomQuery37.php create mode 100644 library/Zend/Test/PHPUnit/Constraint/DomQuery41.php create mode 100644 library/Zend/Test/PHPUnit/Constraint/Redirect34.php create mode 100644 library/Zend/Test/PHPUnit/Constraint/Redirect37.php create mode 100644 library/Zend/Test/PHPUnit/Constraint/Redirect41.php create mode 100644 library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php create mode 100644 library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php create mode 100644 library/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php create mode 100644 library/Zend/Xml/Exception.php create mode 100644 library/Zend/Xml/Security.php diff --git a/library/Zend/Acl.php b/library/Zend/Acl.php index cc6de6b..a0285f0 100644 --- a/library/Zend/Acl.php +++ b/library/Zend/Acl.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Acl.php 24771 2012-05-07 01:13:06Z adamlundrigan $ + * @version $Id$ */ @@ -53,7 +53,7 @@ require_once 'Zend/Acl/Resource.php'; /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Acl diff --git a/library/Zend/Acl/Assert/Interface.php b/library/Zend/Acl/Assert/Interface.php index e61c308..b95f785 100644 --- a/library/Zend/Acl/Assert/Interface.php +++ b/library/Zend/Acl/Assert/Interface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -41,7 +41,7 @@ require_once 'Zend/Acl/Resource/Interface.php'; /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Acl_Assert_Interface diff --git a/library/Zend/Acl/Exception.php b/library/Zend/Acl/Exception.php index de42407..51e79fa 100644 --- a/library/Zend/Acl/Exception.php +++ b/library/Zend/Acl/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Acl_Exception extends Zend_Exception diff --git a/library/Zend/Acl/Resource.php b/library/Zend/Acl/Resource.php index 40f1501..5afb3ab 100644 --- a/library/Zend/Acl/Resource.php +++ b/library/Zend/Acl/Resource.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Resource.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Acl/Resource/Interface.php'; /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Acl_Resource implements Zend_Acl_Resource_Interface @@ -45,7 +45,6 @@ class Zend_Acl_Resource implements Zend_Acl_Resource_Interface * Sets the Resource identifier * * @param string $resourceId - * @return void */ public function __construct($resourceId) { diff --git a/library/Zend/Acl/Resource/Interface.php b/library/Zend/Acl/Resource/Interface.php index 4ab2284..3c6d358 100644 --- a/library/Zend/Acl/Resource/Interface.php +++ b/library/Zend/Acl/Resource/Interface.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Acl_Resource_Interface diff --git a/library/Zend/Acl/Role.php b/library/Zend/Acl/Role.php index bf0963d..db7f404 100644 --- a/library/Zend/Acl/Role.php +++ b/library/Zend/Acl/Role.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Role.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Acl/Role/Interface.php'; /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Acl_Role implements Zend_Acl_Role_Interface @@ -45,7 +45,6 @@ class Zend_Acl_Role implements Zend_Acl_Role_Interface * Sets the Role identifier * * @param string $roleId - * @return void */ public function __construct($roleId) { diff --git a/library/Zend/Acl/Role/Interface.php b/library/Zend/Acl/Role/Interface.php index ddb7b33..0bd3fb5 100644 --- a/library/Zend/Acl/Role/Interface.php +++ b/library/Zend/Acl/Role/Interface.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Acl_Role_Interface diff --git a/library/Zend/Acl/Role/Registry.php b/library/Zend/Acl/Role/Registry.php index 8051534..a8cc259 100644 --- a/library/Zend/Acl/Role/Registry.php +++ b/library/Zend/Acl/Role/Registry.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Registry.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Acl/Role/Interface.php'; /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Acl_Role_Registry diff --git a/library/Zend/Acl/Role/Registry/Exception.php b/library/Zend/Acl/Role/Registry/Exception.php index 9a518ad..72cb840 100644 --- a/library/Zend/Acl/Role/Registry/Exception.php +++ b/library/Zend/Acl/Role/Registry/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Acl/Exception.php'; /** * @category Zend * @package Zend_Acl - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Acl_Role_Registry_Exception extends Zend_Acl_Exception diff --git a/library/Zend/Amf/Adobe/Auth.php b/library/Zend/Amf/Adobe/Auth.php index e3a624c..c5aa27a 100644 --- a/library/Zend/Amf/Adobe/Auth.php +++ b/library/Zend/Amf/Adobe/Auth.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Auth.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Amf_Auth_Abstract */ @@ -28,12 +28,15 @@ require_once 'Zend/Acl.php'; /** @see Zend_Auth_Result */ require_once 'Zend/Auth/Result.php'; +/** @see Zend_Xml_Security */ +require_once 'Zend/Xml/Security.php'; + /** * This class implements authentication against XML file with roles for Flex Builder. * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract @@ -61,7 +64,7 @@ class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract public function __construct($rolefile) { $this->_acl = new Zend_Acl(); - $xml = simplexml_load_file($rolefile); + $xml = Zend_Xml_Security::scanFile($rolefile); /* Roles file format: diff --git a/library/Zend/Amf/Adobe/DbInspector.php b/library/Zend/Amf/Adobe/DbInspector.php index 9562a60..48b46be 100644 --- a/library/Zend/Amf/Adobe/DbInspector.php +++ b/library/Zend/Amf/Adobe/DbInspector.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbInspector.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -24,7 +24,7 @@ * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Adobe_DbInspector diff --git a/library/Zend/Amf/Adobe/Introspector.php b/library/Zend/Amf/Adobe/Introspector.php index 66ef314..1088ae3 100644 --- a/library/Zend/Amf/Adobe/Introspector.php +++ b/library/Zend/Amf/Adobe/Introspector.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Introspector.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id$ */ /** @see Zend_Amf_Parse_TypeLoader */ @@ -33,7 +33,7 @@ require_once 'Zend/Server/Reflection.php'; * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Adobe_Introspector diff --git a/library/Zend/Amf/Auth/Abstract.php b/library/Zend/Amf/Auth/Abstract.php index d5b72d9..e0e2e46 100644 --- a/library/Zend/Amf/Auth/Abstract.php +++ b/library/Zend/Amf/Auth/Abstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Auth_Adapter_Interface */ @@ -27,7 +27,7 @@ require_once 'Zend/Auth/Adapter/Interface.php'; * * @package Zend_Amf * @subpackage Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Auth_Abstract implements Zend_Auth_Adapter_Interface diff --git a/library/Zend/Amf/Constants.php b/library/Zend/Amf/Constants.php index d5342f5..5584e25 100644 --- a/library/Zend/Amf/Constants.php +++ b/library/Zend/Amf/Constants.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Constants.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -24,7 +24,7 @@ * deserialization to detect the AMF marker and encoding types. * * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_Amf_Constants diff --git a/library/Zend/Amf/Exception.php b/library/Zend/Amf/Exception.php index 85e4a95..91381b1 100644 --- a/library/Zend/Amf/Exception.php +++ b/library/Zend/Amf/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ require_once 'Zend/Exception.php'; /** * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Exception extends Zend_Exception diff --git a/library/Zend/Amf/Parse/Amf0/Deserializer.php b/library/Zend/Amf/Parse/Amf0/Deserializer.php index 65adb6e..7ea591b 100644 --- a/library/Zend/Amf/Parse/Amf0/Deserializer.php +++ b/library/Zend/Amf/Parse/Amf0/Deserializer.php @@ -15,14 +15,17 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Amf_Constants */ require_once 'Zend/Amf/Constants.php'; +/** Zend_Xml_Security */ +require_once 'Zend/Xml/Security.php'; + /** @see Zend_Amf_Parse_Deserializer */ require_once 'Zend/Amf/Parse/Deserializer.php'; @@ -33,7 +36,7 @@ require_once 'Zend/Amf/Parse/Deserializer.php'; * @todo Class could be implemented as Factory Class with each data type it's own class * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer @@ -248,7 +251,7 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer public function readXmlString() { $string = $this->_stream->readLongUTF(); - return simplexml_load_string($string); + return Zend_Xml_Security::scan($string); //simplexml_load_string($string); } /** diff --git a/library/Zend/Amf/Parse/Amf0/Serializer.php b/library/Zend/Amf/Parse/Amf0/Serializer.php index ce23f19..fb24b44 100644 --- a/library/Zend/Amf/Parse/Amf0/Serializer.php +++ b/library/Zend/Amf/Parse/Amf0/Serializer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $ + * @version $Id$ */ /** Zend_Amf_Constants */ @@ -32,7 +32,7 @@ require_once 'Zend/Amf/Parse/Serializer.php'; * @uses Zend_Amf_Parse_Serializer * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer diff --git a/library/Zend/Amf/Parse/Amf3/Deserializer.php b/library/Zend/Amf/Parse/Amf3/Deserializer.php index 361aaa4..68693b1 100644 --- a/library/Zend/Amf/Parse/Amf3/Deserializer.php +++ b/library/Zend/Amf/Parse/Amf3/Deserializer.php @@ -15,14 +15,17 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Amf_Parse_Deserializer */ require_once 'Zend/Amf/Parse/Deserializer.php'; +/** Zend_Xml_Security */ +require_once 'Zend/Xml/Security.php'; + /** Zend_Amf_Parse_TypeLoader */ require_once 'Zend/Amf/Parse/TypeLoader.php'; @@ -34,7 +37,7 @@ require_once 'Zend/Amf/Parse/TypeLoader.php'; * @todo Class could be implemented as Factory Class with each data type it's own class. * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer @@ -417,6 +420,6 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer $xmlReference = $this->readInteger(); $length = $xmlReference >> 1; $string = $this->_stream->readBytes($length); - return simplexml_load_string($string); + return Zend_Xml_Security::scan($string); } } diff --git a/library/Zend/Amf/Parse/Amf3/Serializer.php b/library/Zend/Amf/Parse/Amf3/Serializer.php index 7cbea7f..68c20c1 100644 --- a/library/Zend/Amf/Parse/Amf3/Serializer.php +++ b/library/Zend/Amf/Parse/Amf3/Serializer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $ + * @version $Id$ */ /** Zend_Amf_Constants */ @@ -35,7 +35,7 @@ require_once 'Zend/Amf/Parse/TypeLoader.php'; * * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer diff --git a/library/Zend/Amf/Parse/Deserializer.php b/library/Zend/Amf/Parse/Deserializer.php index 6c56367..ce99c6c 100644 --- a/library/Zend/Amf/Parse/Deserializer.php +++ b/library/Zend/Amf/Parse/Deserializer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -30,7 +30,7 @@ * @see http://opensource.adobe.com/svn/opensource/blazeds/trunk/modules/core/src/java/flex/messaging/io/amf/ * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Parse_Deserializer diff --git a/library/Zend/Amf/Parse/InputStream.php b/library/Zend/Amf/Parse/InputStream.php index af52ca7..39fe772 100644 --- a/library/Zend/Amf/Parse/InputStream.php +++ b/library/Zend/Amf/Parse/InputStream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: InputStream.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Amf_Util_BinaryStream */ @@ -31,7 +31,7 @@ require_once 'Zend/Amf/Util/BinaryStream.php'; * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Parse_InputStream extends Zend_Amf_Util_BinaryStream diff --git a/library/Zend/Amf/Parse/OutputStream.php b/library/Zend/Amf/Parse/OutputStream.php index d16a0c2..52ba5e9 100644 --- a/library/Zend/Amf/Parse/OutputStream.php +++ b/library/Zend/Amf/Parse/OutputStream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OutputStream.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Amf_Util_BinaryStream */ @@ -32,7 +32,7 @@ require_once 'Zend/Amf/Util/BinaryStream.php'; * @uses Zend_Amf_Util_BinaryStream * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Parse_OutputStream extends Zend_Amf_Util_BinaryStream diff --git a/library/Zend/Amf/Parse/Resource/MysqlResult.php b/library/Zend/Amf/Parse/Resource/MysqlResult.php index 85f0c56..f11a83d 100644 --- a/library/Zend/Amf/Parse/Resource/MysqlResult.php +++ b/library/Zend/Amf/Parse/Resource/MysqlResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MysqlResult.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Parse_Resource_MysqlResult diff --git a/library/Zend/Amf/Parse/Resource/MysqliResult.php b/library/Zend/Amf/Parse/Resource/MysqliResult.php index c549fad..86ac448 100644 --- a/library/Zend/Amf/Parse/Resource/MysqliResult.php +++ b/library/Zend/Amf/Parse/Resource/MysqliResult.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MysqliResult.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Parse_Resource_MysqliResult diff --git a/library/Zend/Amf/Parse/Resource/Stream.php b/library/Zend/Amf/Parse/Resource/Stream.php index 2f6ee88..c1b361b 100644 --- a/library/Zend/Amf/Parse/Resource/Stream.php +++ b/library/Zend/Amf/Parse/Resource/Stream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Stream.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Parse_Resource_Stream diff --git a/library/Zend/Amf/Parse/Serializer.php b/library/Zend/Amf/Parse/Serializer.php index c36e4c6..6c0dea5 100644 --- a/library/Zend/Amf/Parse/Serializer.php +++ b/library/Zend/Amf/Parse/Serializer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $ + * @version $Id$ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Parse_Serializer diff --git a/library/Zend/Amf/Parse/TypeLoader.php b/library/Zend/Amf/Parse/TypeLoader.php index f5190b2..747d0d0 100644 --- a/library/Zend/Amf/Parse/TypeLoader.php +++ b/library/Zend/Amf/Parse/TypeLoader.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TypeLoader.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -47,7 +47,7 @@ require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php'; * @todo PHP 5.3 can drastically change this class w/ namespace and the new call_user_func w/ namespace * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_Amf_Parse_TypeLoader diff --git a/library/Zend/Amf/Request.php b/library/Zend/Amf/Request.php index 289b8c2..3ad84cf 100644 --- a/library/Zend/Amf/Request.php +++ b/library/Zend/Amf/Request.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Request.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Amf_Parse_InputStream */ @@ -40,7 +40,7 @@ require_once 'Zend/Amf/Value/MessageBody.php'; * * @todo Currently not checking if the object needs to be Type Mapped to a server object. * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Request diff --git a/library/Zend/Amf/Request/Http.php b/library/Zend/Amf/Request/Http.php index b795277..57ccbb9 100644 --- a/library/Zend/Amf/Request/Http.php +++ b/library/Zend/Amf/Request/Http.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Amf_Request */ @@ -32,7 +32,7 @@ require_once 'Zend/Amf/Request.php'; * * @package Zend_Amf * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Request_Http extends Zend_Amf_Request diff --git a/library/Zend/Amf/Response.php b/library/Zend/Amf/Response.php index cac34de..6b3d12d 100644 --- a/library/Zend/Amf/Response.php +++ b/library/Zend/Amf/Response.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Response.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Amf_Constants */ @@ -32,7 +32,7 @@ require_once 'Zend/Amf/Parse/Amf0/Serializer.php'; * Handles converting the PHP object ready for response back into AMF * * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Response diff --git a/library/Zend/Amf/Response/Http.php b/library/Zend/Amf/Response/Http.php index 0e52c78..c3bcb21 100644 --- a/library/Zend/Amf/Response/Http.php +++ b/library/Zend/Amf/Response/Http.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Response - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Amf_Response */ @@ -28,7 +28,7 @@ require_once 'Zend/Amf/Response.php'; * * @package Zend_Amf * @subpackage Response - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Response_Http extends Zend_Amf_Response diff --git a/library/Zend/Amf/Server.php b/library/Zend/Amf/Server.php index c2ca709..acd6504 100644 --- a/library/Zend/Amf/Server.php +++ b/library/Zend/Amf/Server.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Server_Interface */ @@ -52,7 +52,7 @@ require_once 'Zend/Auth.php'; * @todo Make the reflection methods cache and autoload. * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Server implements Zend_Server_Interface diff --git a/library/Zend/Amf/Server/Exception.php b/library/Zend/Amf/Server/Exception.php index b961831..fe9c92c 100644 --- a/library/Zend/Amf/Server/Exception.php +++ b/library/Zend/Amf/Server/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Amf_Exception */ @@ -29,7 +29,7 @@ require_once 'Zend/Amf/Exception.php'; * @category Zend * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Server_Exception extends Zend_Amf_Exception diff --git a/library/Zend/Amf/Util/BinaryStream.php b/library/Zend/Amf/Util/BinaryStream.php index 732ea2a..0a32512 100644 --- a/library/Zend/Amf/Util/BinaryStream.php +++ b/library/Zend/Amf/Util/BinaryStream.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Util - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BinaryStream.php 25241 2013-01-22 11:07:36Z frosch $ + * @version $Id$ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Util - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Util_BinaryStream diff --git a/library/Zend/Amf/Value/ByteArray.php b/library/Zend/Amf/Value/ByteArray.php index b62c182..0ab5b81 100644 --- a/library/Zend/Amf/Value/ByteArray.php +++ b/library/Zend/Amf/Value/ByteArray.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ByteArray.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Value_ByteArray diff --git a/library/Zend/Amf/Value/MessageBody.php b/library/Zend/Amf/Value/MessageBody.php index fe58eea..55b3fe5 100644 --- a/library/Zend/Amf/Value/MessageBody.php +++ b/library/Zend/Amf/Value/MessageBody.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MessageBody.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Value_MessageBody diff --git a/library/Zend/Amf/Value/MessageHeader.php b/library/Zend/Amf/Value/MessageHeader.php index b106c50..9b0a49f 100644 --- a/library/Zend/Amf/Value/MessageHeader.php +++ b/library/Zend/Amf/Value/MessageHeader.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MessageHeader.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Value_MessageHeader diff --git a/library/Zend/Amf/Value/Messaging/AbstractMessage.php b/library/Zend/Amf/Value/Messaging/AbstractMessage.php index f342b3f..f832f93 100644 --- a/library/Zend/Amf/Value/Messaging/AbstractMessage.php +++ b/library/Zend/Amf/Value/Messaging/AbstractMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AbstractMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Value_Messaging_AbstractMessage diff --git a/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php b/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php index da3ce04..93437fe 100644 --- a/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php +++ b/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AcknowledgeMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Amf_Value_Messaging_AsyncMessage */ @@ -32,7 +32,7 @@ require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Value_Messaging_AcknowledgeMessage extends Zend_Amf_Value_Messaging_AsyncMessage diff --git a/library/Zend/Amf/Value/Messaging/ArrayCollection.php b/library/Zend/Amf/Value/Messaging/ArrayCollection.php index bdcfeec..8b1933e 100644 --- a/library/Zend/Amf/Value/Messaging/ArrayCollection.php +++ b/library/Zend/Amf/Value/Messaging/ArrayCollection.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ArrayCollection.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -27,7 +27,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Value_Messaging_ArrayCollection extends ArrayObject diff --git a/library/Zend/Amf/Value/Messaging/AsyncMessage.php b/library/Zend/Amf/Value/Messaging/AsyncMessage.php index 51746f2..29e709f 100644 --- a/library/Zend/Amf/Value/Messaging/AsyncMessage.php +++ b/library/Zend/Amf/Value/Messaging/AsyncMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AsyncMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -30,7 +30,7 @@ require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Value_Messaging_AsyncMessage extends Zend_Amf_Value_Messaging_AbstractMessage diff --git a/library/Zend/Amf/Value/Messaging/CommandMessage.php b/library/Zend/Amf/Value/Messaging/CommandMessage.php index 073b11d..fbfc9c9 100644 --- a/library/Zend/Amf/Value/Messaging/CommandMessage.php +++ b/library/Zend/Amf/Value/Messaging/CommandMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CommandMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -36,7 +36,7 @@ require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Value_Messaging_CommandMessage extends Zend_Amf_Value_Messaging_AsyncMessage diff --git a/library/Zend/Amf/Value/Messaging/ErrorMessage.php b/library/Zend/Amf/Value/Messaging/ErrorMessage.php index 40813a0..2cb4f52 100644 --- a/library/Zend/Amf/Value/Messaging/ErrorMessage.php +++ b/library/Zend/Amf/Value/Messaging/ErrorMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ErrorMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Amf_Value_Messaging_AcknowledgeMessage */ @@ -30,7 +30,7 @@ require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Value_Messaging_ErrorMessage extends Zend_Amf_Value_Messaging_AcknowledgeMessage diff --git a/library/Zend/Amf/Value/Messaging/RemotingMessage.php b/library/Zend/Amf/Value/Messaging/RemotingMessage.php index e403132..bc319de 100644 --- a/library/Zend/Amf/Value/Messaging/RemotingMessage.php +++ b/library/Zend/Amf/Value/Messaging/RemotingMessage.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RemotingMessage.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Amf_Value_Messaging_AbstractMessage */ @@ -31,7 +31,7 @@ require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Value_Messaging_RemotingMessage extends Zend_Amf_Value_Messaging_AbstractMessage diff --git a/library/Zend/Amf/Value/TraitsInfo.php b/library/Zend/Amf/Value/TraitsInfo.php index f8863cd..f048b94 100644 --- a/library/Zend/Amf/Value/TraitsInfo.php +++ b/library/Zend/Amf/Value/TraitsInfo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TraitsInfo.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Amf_Value_TraitsInfo diff --git a/library/Zend/Application.php b/library/Zend/Application.php index fa229c9..cf7d2a8 100644 --- a/library/Zend/Application.php +++ b/library/Zend/Application.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Application.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id$ */ /** * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application diff --git a/library/Zend/Application/Bootstrap/Bootstrap.php b/library/Zend/Application/Bootstrap/Bootstrap.php index d81cc25..a1bc5b4 100644 --- a/library/Zend/Application/Bootstrap/Bootstrap.php +++ b/library/Zend/Application/Bootstrap/Bootstrap.php @@ -15,11 +15,16 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bootstrap.php 25073 2012-11-06 19:31:53Z rob $ + * @version $Id$ */ +/** + * @see Zend_Application_Bootstrap_BootstrapAbstract + */ +require_once 'Zend/Application/Bootstrap/BootstrapAbstract.php'; + /** * Concrete base class for bootstrap classes * @@ -29,7 +34,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Bootstrap_Bootstrap @@ -53,7 +58,6 @@ class Zend_Application_Bootstrap_Bootstrap * Ensure FrontController resource is registered * * @param Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application - * @return void */ public function __construct($application) { @@ -120,7 +124,7 @@ class Zend_Application_Bootstrap_Bootstrap public function getResourceLoader() { if ((null === $this->_resourceLoader) - && (false != ($namespace = $this->getAppNamespace())) + && (false !== ($namespace = $this->getAppNamespace())) ) { $r = new ReflectionClass($this); $path = $r->getFileName(); diff --git a/library/Zend/Application/Bootstrap/BootstrapAbstract.php b/library/Zend/Application/Bootstrap/BootstrapAbstract.php index 7a0f94f..6a62f10 100644 --- a/library/Zend/Application/Bootstrap/BootstrapAbstract.php +++ b/library/Zend/Application/Bootstrap/BootstrapAbstract.php @@ -15,11 +15,21 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BootstrapAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ +/** + * @see Zend_Application_Bootstrap_Bootstrapper + */ +require_once 'Zend/Application/Bootstrap/Bootstrapper.php'; + +/** + * @see Zend_Application_Bootstrap_ResourceBootstrapper + */ +require_once 'Zend/Application/Bootstrap/ResourceBootstrapper.php'; + /** * Abstract base class for bootstrap classes * @@ -28,7 +38,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Application_Bootstrap_BootstrapAbstract @@ -94,7 +104,6 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract * initializer methods. * * @param Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application - * @return void * @throws Zend_Application_Bootstrap_Exception When invalid application is provided */ public function __construct($application) @@ -317,8 +326,9 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract /** * Get a registered plugin resource * - * @param string $resourceName + * @param string $resource * @return Zend_Application_Resource_Resource + * @throws Zend_Application_Bootstrap_Exception */ public function getPluginResource($resource) { @@ -431,6 +441,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract * * @param Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application * @return Zend_Application_Bootstrap_BootstrapAbstract + * @throws Zend_Application_Bootstrap_Exception */ public function setApplication($application) { @@ -481,6 +492,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract * * @param object $container * @return Zend_Application_Bootstrap_BootstrapAbstract + * @throws Zend_Application_Bootstrap_Exception */ public function setContainer($container) { @@ -544,7 +556,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract } /** - * Implement PHP's magic to retrieve a ressource + * Implement PHP's magic to retrieve a resource * in the bootstrap * * @param string $prop @@ -557,7 +569,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract /** * Implement PHP's magic to ask for the - * existence of a ressource in the bootstrap + * existence of a resource in the bootstrap * * @param string $prop * @return bool @@ -592,7 +604,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract * * @param string $method * @param array $args - * @return void + * @return Zend_Application_Bootstrap_BootstrapAbstract * @throws Zend_Application_Bootstrap_Exception On invalid method name */ public function __call($method, $args) diff --git a/library/Zend/Application/Bootstrap/Bootstrapper.php b/library/Zend/Application/Bootstrap/Bootstrapper.php index 956da14..9ea7c78 100644 --- a/library/Zend/Application/Bootstrap/Bootstrapper.php +++ b/library/Zend/Application/Bootstrap/Bootstrapper.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bootstrapper.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Bootstrap_Bootstrapper @@ -35,7 +35,6 @@ interface Zend_Application_Bootstrap_Bootstrapper * Constructor * * @param Zend_Application $application - * @return void */ public function __construct($application); diff --git a/library/Zend/Application/Bootstrap/Exception.php b/library/Zend/Application/Bootstrap/Exception.php index e8a4ea3..4e298c8 100644 --- a/library/Zend/Application/Bootstrap/Exception.php +++ b/library/Zend/Application/Bootstrap/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -30,7 +30,7 @@ require_once 'Zend/Application/Exception.php'; * @category Zend * @package Zend_Application * @uses Zend_Application_Exception - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Bootstrap_Exception extends Zend_Application_Exception diff --git a/library/Zend/Application/Bootstrap/ResourceBootstrapper.php b/library/Zend/Application/Bootstrap/ResourceBootstrapper.php index 79b8378..449ee6e 100644 --- a/library/Zend/Application/Bootstrap/ResourceBootstrapper.php +++ b/library/Zend/Application/Bootstrap/ResourceBootstrapper.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResourceBootstrapper.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Application * @subpackage Bootstrap - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Bootstrap_ResourceBootstrapper diff --git a/library/Zend/Application/Exception.php b/library/Zend/Application/Exception.php index 0710017..68cda56 100644 --- a/library/Zend/Application/Exception.php +++ b/library/Zend/Application/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id$ */ /** @@ -30,7 +30,7 @@ require_once 'Zend/Exception.php'; * @uses Zend_Exception * @category Zend * @package Zend_Application - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Exception extends Zend_Exception diff --git a/library/Zend/Application/Module/Autoloader.php b/library/Zend/Application/Module/Autoloader.php index b52536b..9fa5730 100644 --- a/library/Zend/Application/Module/Autoloader.php +++ b/library/Zend/Application/Module/Autoloader.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Autoloader.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ require_once 'Zend/Loader/Autoloader/Resource.php'; * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Module_Autoloader extends Zend_Loader_Autoloader_Resource @@ -39,7 +39,6 @@ class Zend_Application_Module_Autoloader extends Zend_Loader_Autoloader_Resource * Constructor * * @param array|Zend_Config $options - * @return void */ public function __construct($options) { diff --git a/library/Zend/Application/Module/Bootstrap.php b/library/Zend/Application/Module/Bootstrap.php index f69fa5b..dfaeda0 100644 --- a/library/Zend/Application/Module/Bootstrap.php +++ b/library/Zend/Application/Module/Bootstrap.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Bootstrap.php 25024 2012-07-30 15:08:15Z rob $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -33,7 +33,7 @@ require_once 'Zend/Application/Bootstrap/Bootstrap.php'; * @category Zend * @package Zend_Application * @subpackage Module - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Application_Module_Bootstrap @@ -48,8 +48,7 @@ abstract class Zend_Application_Module_Bootstrap /** * Constructor * - * @param Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application - * @return void + * @param Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application */ public function __construct($application) { diff --git a/library/Zend/Application/Resource/Cachemanager.php b/library/Zend/Application/Resource/Cachemanager.php index c01b5ad..dd9b470 100644 --- a/library/Zend/Application/Resource/Cachemanager.php +++ b/library/Zend/Application/Resource/Cachemanager.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cachemanager.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ require_once 'Zend/Application/Resource/ResourceAbstract.php'; @@ -28,7 +28,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Cachemanager extends Zend_Application_Resource_ResourceAbstract @@ -60,6 +60,15 @@ class Zend_Application_Resource_Cachemanager extends Zend_Application_Resource_R $options = $this->getOptions(); foreach ($options as $key => $value) { + // Logger + if (isset($value['frontend']['options']['logger'])) { + $logger = $value['frontend']['options']['logger']; + if (is_array($logger)) { + $value['frontend']['options']['logger'] = Zend_Log::factory($logger); + } + } + + // Cache templates if ($this->_manager->hasCacheTemplate($key)) { $this->_manager->setTemplateOptions($key, $value); } else { diff --git a/library/Zend/Application/Resource/Db.php b/library/Zend/Application/Resource/Db.php index bd3d950..3965437 100644 --- a/library/Zend/Application/Resource/Db.php +++ b/library/Zend/Application/Resource/Db.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db.php 25123 2012-11-14 18:27:44Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbstract @@ -88,7 +88,7 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs /** * Set the adapter params * - * @param string $adapter + * @param array $params * @return Zend_Application_Resource_Db */ public function setParams(array $params) @@ -110,7 +110,7 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs /** * Set whether to use this as default table adapter * - * @param boolean $defaultTableAdapter + * @param bool $isDefaultTableAdapter * @return Zend_Application_Resource_Db */ public function setIsDefaultTableAdapter($isDefaultTableAdapter) @@ -122,7 +122,7 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs /** * Is this adapter the default table adapter? * - * @return void + * @return bool */ public function isDefaultTableAdapter() { @@ -160,6 +160,8 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs if (null !== ($db = $this->getDbAdapter())) { return $db; } + + return null; } /** diff --git a/library/Zend/Application/Resource/Dojo.php b/library/Zend/Application/Resource/Dojo.php index d56eaeb..ae612e9 100644 --- a/library/Zend/Application/Resource/Dojo.php +++ b/library/Zend/Application/Resource/Dojo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dojo.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Dojo diff --git a/library/Zend/Application/Resource/Exception.php b/library/Zend/Application/Resource/Exception.php index 88125d0..550eb78 100644 --- a/library/Zend/Application/Resource/Exception.php +++ b/library/Zend/Application/Resource/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Application/Exception.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Exception extends Zend_Application_Exception diff --git a/library/Zend/Application/Resource/Frontcontroller.php b/library/Zend/Application/Resource/Frontcontroller.php index 348ce68..eb4f520 100644 --- a/library/Zend/Application/Resource/Frontcontroller.php +++ b/library/Zend/Application/Resource/Frontcontroller.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Frontcontroller.php 24798 2012-05-12 19:17:41Z adamlundrigan $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Frontcontroller extends Zend_Application_Resource_ResourceAbstract @@ -46,6 +46,7 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc * Initialize Front Controller * * @return Zend_Controller_Front + * @throws Zend_Application_Exception */ public function init() { diff --git a/library/Zend/Application/Resource/Layout.php b/library/Zend/Application/Resource/Layout.php index 494ec96..0e10a4c 100644 --- a/library/Zend/Application/Resource/Layout.php +++ b/library/Zend/Application/Resource/Layout.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Layout.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Layout diff --git a/library/Zend/Application/Resource/Locale.php b/library/Zend/Application/Resource/Locale.php index cceac13..7509600 100644 --- a/library/Zend/Application/Resource/Locale.php +++ b/library/Zend/Application/Resource/Locale.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Locale.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Locale diff --git a/library/Zend/Application/Resource/Log.php b/library/Zend/Application/Resource/Log.php index 1ea51e1..0531164 100644 --- a/library/Zend/Application/Resource/Log.php +++ b/library/Zend/Application/Resource/Log.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Log.php 24607 2012-01-16 16:45:49Z xerkus $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Log diff --git a/library/Zend/Application/Resource/Mail.php b/library/Zend/Application/Resource/Mail.php index 8e9d41d..6be5ea9 100644 --- a/library/Zend/Application/Resource/Mail.php +++ b/library/Zend/Application/Resource/Mail.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mail.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceAbstract diff --git a/library/Zend/Application/Resource/Modules.php b/library/Zend/Application/Resource/Modules.php index 749d37d..5600489 100644 --- a/library/Zend/Application/Resource/Modules.php +++ b/library/Zend/Application/Resource/Modules.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Modules.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Modules extends Zend_Application_Resource_ResourceAbstract @@ -46,7 +46,6 @@ class Zend_Application_Resource_Modules extends Zend_Application_Resource_Resour * Constructor * * @param mixed $options - * @return void */ public function __construct($options = null) { diff --git a/library/Zend/Application/Resource/Multidb.php b/library/Zend/Application/Resource/Multidb.php index fdbb38e..deabce3 100644 --- a/library/Zend/Application/Resource/Multidb.php +++ b/library/Zend/Application/Resource/Multidb.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Multidb.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ require_once 'Zend/Application/Resource/ResourceAbstract.php'; @@ -51,7 +51,7 @@ require_once 'Zend/Db/Table.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Multidb extends Zend_Application_Resource_ResourceAbstract diff --git a/library/Zend/Application/Resource/Navigation.php b/library/Zend/Application/Resource/Navigation.php index 9aaf78a..62bebde 100644 --- a/library/Zend/Application/Resource/Navigation.php +++ b/library/Zend/Application/Resource/Navigation.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Navigation.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @author Dolf Schimmel * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Application/Resource/Resource.php b/library/Zend/Application/Resource/Resource.php index 40ba45f..37243ca 100644 --- a/library/Zend/Application/Resource/Resource.php +++ b/library/Zend/Application/Resource/Resource.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Resource.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Resource @@ -37,7 +37,6 @@ interface Zend_Application_Resource_Resource * Must take an optional single argument, $options. * * @param mixed $options - * @return void */ public function __construct($options = null); diff --git a/library/Zend/Application/Resource/ResourceAbstract.php b/library/Zend/Application/Resource/ResourceAbstract.php index 27a500a..c066624 100644 --- a/library/Zend/Application/Resource/ResourceAbstract.php +++ b/library/Zend/Application/Resource/ResourceAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ResourceAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Application/Resource/Resource.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Application_Resource_Resource diff --git a/library/Zend/Application/Resource/Router.php b/library/Zend/Application/Resource/Router.php index 3965e48..013d0bb 100644 --- a/library/Zend/Application/Resource/Router.php +++ b/library/Zend/Application/Resource/Router.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Router.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Router diff --git a/library/Zend/Application/Resource/Session.php b/library/Zend/Application/Resource/Session.php index 4bbcdc4..6dc7a05 100644 --- a/library/Zend/Application/Resource/Session.php +++ b/library/Zend/Application/Resource/Session.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Session.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Session extends Zend_Application_Resource_ResourceAbstract @@ -62,6 +62,7 @@ class Zend_Application_Resource_Session extends Zend_Application_Resource_Resour * Get session save handler * * @return Zend_Session_SaveHandler_Interface + * @throws Zend_Application_Resource_Exception */ public function getSaveHandler() { diff --git a/library/Zend/Application/Resource/Translate.php b/library/Zend/Application/Resource/Translate.php index 075c07f..06e723d 100644 --- a/library/Zend/Application/Resource/Translate.php +++ b/library/Zend/Application/Resource/Translate.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Translate.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_Translate extends Zend_Application_Resource_ResourceAbstract @@ -86,6 +86,12 @@ class Zend_Application_Resource_Translate extends Zend_Application_Resource_Reso unset($options['data']); } + if (isset($options['log'])) { + if (is_array($options['log'])) { + $options['log'] = Zend_Log::factory($options['log']); + } + } + if (isset($options['options'])) { foreach($options['options'] as $key => $value) { $options[$key] = $value; diff --git a/library/Zend/Application/Resource/Useragent.php b/library/Zend/Application/Resource/Useragent.php index 3b166cd..fa090c2 100644 --- a/library/Zend/Application/Resource/Useragent.php +++ b/library/Zend/Application/Resource/Useragent.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_UserAgent extends Zend_Application_Resource_ResourceAbstract diff --git a/library/Zend/Application/Resource/View.php b/library/Zend/Application/Resource/View.php index 2d24852..f99582b 100644 --- a/library/Zend/Application/Resource/View.php +++ b/library/Zend/Application/Resource/View.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: View.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Application/Resource/ResourceAbstract.php'; * @category Zend * @package Zend_Application * @subpackage Resource - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Application_Resource_View extends Zend_Application_Resource_ResourceAbstract diff --git a/library/Zend/Auth.php b/library/Zend/Auth.php index 6d85971..9ada254 100644 --- a/library/Zend/Auth.php +++ b/library/Zend/Auth.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Auth.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth diff --git a/library/Zend/Auth/Adapter/DbTable.php b/library/Zend/Auth/Adapter/DbTable.php index 43722d1..10bdf95 100644 --- a/library/Zend/Auth/Adapter/DbTable.php +++ b/library/Zend/Auth/Adapter/DbTable.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DbTable.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -41,7 +41,7 @@ require_once 'Zend/Auth/Result.php'; * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface @@ -132,7 +132,6 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface * @param string $identityColumn * @param string $credentialColumn * @param string $credentialTreatment - * @return void */ public function __construct(Zend_Db_Adapter_Abstract $zendDb = null, $tableName = null, $identityColumn = null, $credentialColumn = null, $credentialTreatment = null) diff --git a/library/Zend/Auth/Adapter/Digest.php b/library/Zend/Auth/Adapter/Digest.php index 3705c18..cf389ea 100644 --- a/library/Zend/Auth/Adapter/Digest.php +++ b/library/Zend/Auth/Adapter/Digest.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Digest.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Auth/Adapter/Interface.php'; * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface @@ -71,7 +71,6 @@ class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface * @param mixed $realm * @param mixed $username * @param mixed $password - * @return void */ public function __construct($filename = null, $realm = null, $username = null, $password = null) { diff --git a/library/Zend/Auth/Adapter/Exception.php b/library/Zend/Auth/Adapter/Exception.php index 6a8efc0..23cdf99 100644 --- a/library/Zend/Auth/Adapter/Exception.php +++ b/library/Zend/Auth/Adapter/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Auth/Exception.php'; * @category Zend * @package Zend_Auth * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Adapter_Exception extends Zend_Auth_Exception diff --git a/library/Zend/Auth/Adapter/Http.php b/library/Zend/Auth/Adapter/Http.php index 4405454..5c3a910 100644 --- a/library/Zend/Auth/Adapter/Http.php +++ b/library/Zend/Auth/Adapter/Http.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Auth/Adapter/Interface.php'; * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @todo Support auth-int * @todo Track nonces, nonce-count, opaque for replay protection and stale support @@ -163,7 +163,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface * 'alogrithm' => See $_supportedAlgos. Default: MD5 * 'proxy_auth' => Whether to do authentication as a Proxy * @throws Zend_Auth_Adapter_Exception - * @return void */ public function __construct(array $config) { diff --git a/library/Zend/Auth/Adapter/Http/Resolver/Exception.php b/library/Zend/Auth/Adapter/Http/Resolver/Exception.php index 82c2a92..3c53cb6 100644 --- a/library/Zend/Auth/Adapter/Http/Resolver/Exception.php +++ b/library/Zend/Auth/Adapter/Http/Resolver/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Auth/Exception.php'; * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Adapter_Http_Resolver_Exception extends Zend_Auth_Exception diff --git a/library/Zend/Auth/Adapter/Http/Resolver/File.php b/library/Zend/Auth/Adapter/Http/Resolver/File.php index cbb20fe..77a1830 100644 --- a/library/Zend/Auth/Adapter/Http/Resolver/File.php +++ b/library/Zend/Auth/Adapter/Http/Resolver/File.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Auth/Adapter/Http/Resolver/Interface.php'; * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Resolver_Interface @@ -49,7 +49,6 @@ class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Res * Constructor * * @param string $path Complete filename where the credentials are stored - * @return void */ public function __construct($path = '') { diff --git a/library/Zend/Auth/Adapter/Http/Resolver/Interface.php b/library/Zend/Auth/Adapter/Http/Resolver/Interface.php index 5210355..59f765e 100644 --- a/library/Zend/Auth/Adapter/Http/Resolver/Interface.php +++ b/library/Zend/Auth/Adapter/Http/Resolver/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter_Http - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Adapter_Http_Resolver_Interface diff --git a/library/Zend/Auth/Adapter/Interface.php b/library/Zend/Auth/Adapter/Interface.php index 550932c..e43e088 100644 --- a/library/Zend/Auth/Adapter/Interface.php +++ b/library/Zend/Auth/Adapter/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Auth/Result.php'; * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Adapter_Interface diff --git a/library/Zend/Auth/Adapter/Ldap.php b/library/Zend/Auth/Adapter/Ldap.php index 1dc4786..0264f68 100644 --- a/library/Zend/Auth/Adapter/Ldap.php +++ b/library/Zend/Auth/Adapter/Ldap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ldap.php 24618 2012-02-03 08:32:06Z sgehrig $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Auth/Adapter/Interface.php'; * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Adapter_Ldap implements Zend_Auth_Adapter_Interface @@ -76,7 +76,6 @@ class Zend_Auth_Adapter_Ldap implements Zend_Auth_Adapter_Interface * @param array $options An array of arrays of Zend_Ldap options * @param string $username The username of the account being authenticated * @param string $password The password of the account being authenticated - * @return void */ public function __construct(array $options = array(), $username = null, $password = null) { diff --git a/library/Zend/Auth/Adapter/OpenId.php b/library/Zend/Auth/Adapter/OpenId.php index 8882ac6..8240626 100644 --- a/library/Zend/Auth/Adapter/OpenId.php +++ b/library/Zend/Auth/Adapter/OpenId.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: OpenId.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -40,7 +40,7 @@ require_once 'Zend/OpenId/Consumer.php'; * @category Zend * @package Zend_Auth * @subpackage Zend_Auth_Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Adapter_OpenId implements Zend_Auth_Adapter_Interface @@ -113,7 +113,6 @@ class Zend_Auth_Adapter_OpenId implements Zend_Auth_Adapter_Interface * @param mixed $extensions extension object or array of extensions objects * @param Zend_Controller_Response_Abstract $response an optional response * object to perform HTTP or HTML form redirection - * @return void */ public function __construct($id = null, Zend_OpenId_Consumer_Storage $storage = null, @@ -192,7 +191,7 @@ class Zend_Auth_Adapter_OpenId implements Zend_Auth_Adapter_Interface /** * Sets an optional response object to perform HTTP or HTML form redirection * - * @param string $root + * @param string $response * @return Zend_Auth_Adapter_OpenId Provides a fluent interface */ public function setResponse($response) diff --git a/library/Zend/Auth/Exception.php b/library/Zend/Auth/Exception.php index 67bf9c0..6e56978 100644 --- a/library/Zend/Auth/Exception.php +++ b/library/Zend/Auth/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Exception extends Zend_Exception diff --git a/library/Zend/Auth/Result.php b/library/Zend/Auth/Result.php index e13e64d..3848622 100644 --- a/library/Zend/Auth/Result.php +++ b/library/Zend/Auth/Result.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Result.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Result @@ -84,10 +84,9 @@ class Zend_Auth_Result /** * Sets the result code, identity, and failure messages * - * @param int $code - * @param mixed $identity - * @param array $messages - * @return void + * @param int $code + * @param mixed $identity + * @param array $messages */ public function __construct($code, $identity, array $messages = array()) { diff --git a/library/Zend/Auth/Storage/Exception.php b/library/Zend/Auth/Storage/Exception.php index 38762aa..f41bdfe 100644 --- a/library/Zend/Auth/Storage/Exception.php +++ b/library/Zend/Auth/Storage/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Auth/Exception.php'; * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Storage_Exception extends Zend_Auth_Exception diff --git a/library/Zend/Auth/Storage/Interface.php b/library/Zend/Auth/Storage/Interface.php index b64f6d2..873b4cc 100644 --- a/library/Zend/Auth/Storage/Interface.php +++ b/library/Zend/Auth/Storage/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Storage_Interface diff --git a/library/Zend/Auth/Storage/NonPersistent.php b/library/Zend/Auth/Storage/NonPersistent.php index ef5f6be..54d1921 100644 --- a/library/Zend/Auth/Storage/NonPersistent.php +++ b/library/Zend/Auth/Storage/NonPersistent.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NonPersistent.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Auth/Storage/Interface.php'; * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Storage_NonPersistent implements Zend_Auth_Storage_Interface diff --git a/library/Zend/Auth/Storage/Session.php b/library/Zend/Auth/Storage/Session.php index 143f149..4608f15 100644 --- a/library/Zend/Auth/Storage/Session.php +++ b/library/Zend/Auth/Storage/Session.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Session.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Session.php'; * @category Zend * @package Zend_Auth * @subpackage Storage - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Auth_Storage_Session implements Zend_Auth_Storage_Interface @@ -76,9 +76,8 @@ class Zend_Auth_Storage_Session implements Zend_Auth_Storage_Interface /** * Sets session storage options and initializes session namespace object * - * @param mixed $namespace - * @param mixed $member - * @return void + * @param mixed $namespace + * @param mixed $member */ public function __construct($namespace = self::NAMESPACE_DEFAULT, $member = self::MEMBER_DEFAULT) { diff --git a/library/Zend/Barcode.php b/library/Zend/Barcode.php index ef907df..f40793f 100644 --- a/library/Zend/Barcode.php +++ b/library/Zend/Barcode.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Barcode.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode diff --git a/library/Zend/Barcode/Exception.php b/library/Zend/Barcode/Exception.php index 71db6a7..840ec20 100644 --- a/library/Zend/Barcode/Exception.php +++ b/library/Zend/Barcode/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * Zend_Exception @@ -28,7 +28,7 @@ require_once 'Zend/Exception.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Exception extends Zend_Exception diff --git a/library/Zend/Barcode/Object/Code128.php b/library/Zend/Barcode/Object/Code128.php index d8518f7..79e5b49 100644 --- a/library/Zend/Barcode/Object/Code128.php +++ b/library/Zend/Barcode/Object/Code128.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Code25.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Code128 extends Zend_Barcode_Object_ObjectAbstract @@ -259,6 +259,8 @@ class Zend_Barcode_Object_Code128 extends Zend_Barcode_Object_ObjectAbstract /** * Convert string to barcode string + * + * @param $string * @return array */ protected function _convertToBarcodeChars($string) @@ -380,8 +382,10 @@ class Zend_Barcode_Object_Code128 extends Zend_Barcode_Object_ObjectAbstract /** * Standard validation for most of barcode objects + * * @param string $value * @param array $options + * @return bool */ protected function _validateText($value, $options = array()) { diff --git a/library/Zend/Barcode/Object/Code25.php b/library/Zend/Barcode/Object/Code25.php index a477587..4ae7fbf 100644 --- a/library/Zend/Barcode/Object/Code25.php +++ b/library/Zend/Barcode/Object/Code25.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code25.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Code25 extends Zend_Barcode_Object_ObjectAbstract diff --git a/library/Zend/Barcode/Object/Code25interleaved.php b/library/Zend/Barcode/Object/Code25interleaved.php index 4851822..08761ae 100644 --- a/library/Zend/Barcode/Object/Code25interleaved.php +++ b/library/Zend/Barcode/Object/Code25interleaved.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code25interleaved.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Barcode_Object_Code25 */ @@ -31,7 +31,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Code25interleaved extends Zend_Barcode_Object_Code25 diff --git a/library/Zend/Barcode/Object/Code39.php b/library/Zend/Barcode/Object/Code39.php index 7ec4aad..0efb865 100644 --- a/library/Zend/Barcode/Object/Code39.php +++ b/library/Zend/Barcode/Object/Code39.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code39.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Code39 extends Zend_Barcode_Object_ObjectAbstract diff --git a/library/Zend/Barcode/Object/Ean13.php b/library/Zend/Barcode/Object/Ean13.php index 5c762f5..04ee2b9 100644 --- a/library/Zend/Barcode/Object/Ean13.php +++ b/library/Zend/Barcode/Object/Ean13.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean13.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Ean13 extends Zend_Barcode_Object_ObjectAbstract diff --git a/library/Zend/Barcode/Object/Ean2.php b/library/Zend/Barcode/Object/Ean2.php index 3e0a987..9432763 100644 --- a/library/Zend/Barcode/Object/Ean2.php +++ b/library/Zend/Barcode/Object/Ean2.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean2.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Ean2 extends Zend_Barcode_Object_Ean5 diff --git a/library/Zend/Barcode/Object/Ean5.php b/library/Zend/Barcode/Object/Ean5.php index b1eea9b..512b4db 100644 --- a/library/Zend/Barcode/Object/Ean5.php +++ b/library/Zend/Barcode/Object/Ean5.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean5.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Ean5 extends Zend_Barcode_Object_Ean13 diff --git a/library/Zend/Barcode/Object/Ean8.php b/library/Zend/Barcode/Object/Ean8.php index 5c85ca6..2fe81b5 100644 --- a/library/Zend/Barcode/Object/Ean8.php +++ b/library/Zend/Barcode/Object/Ean8.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ean8.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Ean8 extends Zend_Barcode_Object_Ean13 @@ -150,8 +150,10 @@ class Zend_Barcode_Object_Ean8 extends Zend_Barcode_Object_Ean13 /** * Particular validation for Ean8 barcode objects * (to suppress checksum character substitution) + * * @param string $value * @param array $options + * @throws Zend_Barcode_Object_Exception */ protected function _validateText($value, $options = array()) { diff --git a/library/Zend/Barcode/Object/Error.php b/library/Zend/Barcode/Object/Error.php index 7230768..b627cf4 100644 --- a/library/Zend/Barcode/Object/Error.php +++ b/library/Zend/Barcode/Object/Error.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Error.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Barcode_Object_ObjectAbstract */ @@ -28,7 +28,7 @@ require_once 'Zend/Barcode/Object/ObjectAbstract.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Error extends Zend_Barcode_Object_ObjectAbstract @@ -45,6 +45,8 @@ class Zend_Barcode_Object_Error extends Zend_Barcode_Object_ObjectAbstract /** * Height is forced + * + * @param bool $recalculate * @return integer */ public function getHeight($recalculate = false) @@ -54,6 +56,8 @@ class Zend_Barcode_Object_Error extends Zend_Barcode_Object_ObjectAbstract /** * Width is forced + * + * @param bool $recalculate * @return integer */ public function getWidth($recalculate = false) diff --git a/library/Zend/Barcode/Object/Exception.php b/library/Zend/Barcode/Object/Exception.php index a3c31c2..60801a1 100644 --- a/library/Zend/Barcode/Object/Exception.php +++ b/library/Zend/Barcode/Object/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Barcode_Exception */ @@ -27,7 +27,7 @@ require_once 'Zend/Barcode/Exception.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Exception extends Zend_Barcode_Exception diff --git a/library/Zend/Barcode/Object/Identcode.php b/library/Zend/Barcode/Object/Identcode.php index 208cafe..781f65a 100644 --- a/library/Zend/Barcode/Object/Identcode.php +++ b/library/Zend/Barcode/Object/Identcode.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Identcode.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Identcode extends Zend_Barcode_Object_Code25interleaved @@ -66,7 +66,7 @@ class Zend_Barcode_Object_Identcode extends Zend_Barcode_Object_Code25interleave * Check allowed characters * @param string $value * @return string - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function validateText($value) { diff --git a/library/Zend/Barcode/Object/Itf14.php b/library/Zend/Barcode/Object/Itf14.php index 01da466..f0758ba 100644 --- a/library/Zend/Barcode/Object/Itf14.php +++ b/library/Zend/Barcode/Object/Itf14.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Itf14.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Barcode_Object_Code25interleaved */ @@ -31,7 +31,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Itf14 extends Zend_Barcode_Object_Code25interleaved diff --git a/library/Zend/Barcode/Object/Leitcode.php b/library/Zend/Barcode/Object/Leitcode.php index ddcd84d..a220023 100644 --- a/library/Zend/Barcode/Object/Leitcode.php +++ b/library/Zend/Barcode/Object/Leitcode.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Leitcode.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Leitcode extends Zend_Barcode_Object_Identcode diff --git a/library/Zend/Barcode/Object/ObjectAbstract.php b/library/Zend/Barcode/Object/ObjectAbstract.php index 62e847c..673f8c1 100644 --- a/library/Zend/Barcode/Object/ObjectAbstract.php +++ b/library/Zend/Barcode/Object/ObjectAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ObjectAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Barcode_Object_ObjectAbstract @@ -213,8 +213,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Constructor + * * @param array|Zend_Config $options - * @return void */ public function __construct($options = null) { @@ -304,7 +304,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract * Set height of the barcode bar * @param integer $value * @return Zend_Barcode_Object - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function setBarHeight($value) { @@ -331,7 +331,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract * Set thickness of thin bar * @param integer $value * @return Zend_Barcode_Object - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function setBarThinWidth($value) { @@ -358,7 +358,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract * Set thickness of thick bar * @param integer $value * @return Zend_Barcode_Object - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function setBarThickWidth($value) { @@ -386,7 +386,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract * thinBarWidth - thickBarWidth - barHeight - fontSize * @param float $value * @return Zend_Barcode_Object - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function setFactor($value) { @@ -414,7 +414,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract * Set color of the barcode and text * @param string $value * @return Zend_Barcode_Object - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function setForeColor($value) { @@ -444,7 +444,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract * Set the color of the background * @param integer $value * @return Zend_Barcode_Object - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function setBackgroundColor($value) { @@ -526,7 +526,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract * Set orientation of barcode and text * @param float $value * @return Zend_Barcode_Object - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function setOrientation($value) { @@ -569,8 +569,10 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Automatically add leading zeros if barcode length is fixed - * @param string $text + * + * @param string $text * @param boolean $withoutChecksum + * @return string */ protected function _addLeadingZeros($text, $withoutChecksum = false) { @@ -637,7 +639,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract * of the characters to the position of the bars * @param boolean $value * @return Zend_Barcode_Object - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function setStretchText($value) { @@ -686,7 +688,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract * added to the barcode text * @param boolean $value * @return Zend_Barcode_Object - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function setWithChecksumInText($value) { @@ -724,7 +726,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract * - if string, $value is assumed to be the path to a TTF font * @param integer|string $value * @return Zend_Barcode_Object - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function setFont($value) { @@ -766,7 +768,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract * Set the size of the font in case of TTF * @param float $value * @return Zend_Barcode_Object - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ public function setFontSize($value) { @@ -848,13 +850,14 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Add a text drawing instruction in the set of instructions - * @param string $text - * @param float $size - * @param array $position - * @param string $font - * @param integer $color - * @param string $alignment - * @param float $orientation + * + * @param string $text + * @param float $size + * @param array $position + * @param string $font + * @param integer $color + * @param string $alignment + * @param float|int $orientation */ protected function _addText( $text, @@ -882,7 +885,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Checking of parameters after all settings - * @return void + * + * @return bool */ public function checkParams() { @@ -894,8 +898,10 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Check if a text is really provided to barcode + * + * @param string|null $value * @return void - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ protected function _checkText($value = null) { @@ -913,10 +919,11 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Check the ratio between the thick and the thin bar - * @param integer $min - * @param integer $max + * + * @param int $min + * @param int $max * @return void - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ protected function _checkRatio($min = 2, $max = 3) { @@ -934,8 +941,9 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Drawing with an angle is just allow TTF font + * * @return void - * @throw Zend_Barcode_Object_Exception + * @throws Zend_Barcode_Object_Exception */ protected function _checkFontAndOrientation() { @@ -948,8 +956,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract } /** - * Width of the result image - * (before any rotation) + * Width of the result image (before any rotation) + * * @return integer */ protected function _calculateWidth() @@ -961,13 +969,15 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Calculate the width of the barcode + * * @return integer */ abstract protected function _calculateBarcodeWidth(); /** * Height of the result object - * @return integer + * + * @return int */ protected function _calculateHeight() { @@ -978,7 +988,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Height of the barcode - * @return integer + * + * @return int */ protected function _calculateBarcodeHeight() { @@ -993,7 +1004,9 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Get height of the result object - * @return integer + * + * @param bool $recalculate + * @return int */ public function getHeight($recalculate = false) { @@ -1007,7 +1020,9 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Get width of the result object - * @return integer + * + * @param bool $recalculate + * @return int */ public function getWidth($recalculate = false) { @@ -1022,7 +1037,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Calculate the offset from the left of the object * if an orientation is activated - * @param boolean $recalculate + * + * @param bool $recalculate * @return float */ public function getOffsetLeft($recalculate = false) @@ -1049,7 +1065,8 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Calculate the offset from the top of the object * if an orientation is activated - * @param boolean $recalculate + * + * @param bool $recalculate * @return float */ public function getOffsetTop($recalculate = false) @@ -1075,6 +1092,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Apply rotation on a point in X/Y dimensions + * * @param float $x1 x-position before rotation * @param float $y1 y-position before rotation * @return array Array of two elements corresponding to the new XY point @@ -1092,6 +1110,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Complete drawing of the barcode + * * @return array Table of instructions */ public function draw() @@ -1105,6 +1124,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Draw the barcode + * * @return void */ protected function _drawBarcode() @@ -1162,6 +1182,7 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Partial function to draw border + * * @return void */ protected function _drawBorder() @@ -1241,8 +1262,10 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * Standard validation for most of barcode objects + * * @param string $value * @param array $options + * @throws Zend_Barcode_Object_Exception */ protected function _validateText($value, $options = array()) { diff --git a/library/Zend/Barcode/Object/Planet.php b/library/Zend/Barcode/Object/Planet.php index 1da1fc3..0c50108 100644 --- a/library/Zend/Barcode/Object/Planet.php +++ b/library/Zend/Barcode/Object/Planet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Planet.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Planet extends Zend_Barcode_Object_Postnet @@ -59,4 +59,4 @@ class Zend_Barcode_Object_Planet extends Zend_Barcode_Object_Postnet 8 => "01101", 9 => "01011" ); -} \ No newline at end of file +} diff --git a/library/Zend/Barcode/Object/Postnet.php b/library/Zend/Barcode/Object/Postnet.php index 3534c63..3ceea50 100644 --- a/library/Zend/Barcode/Object/Postnet.php +++ b/library/Zend/Barcode/Object/Postnet.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Postnet.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Postnet extends Zend_Barcode_Object_ObjectAbstract diff --git a/library/Zend/Barcode/Object/Royalmail.php b/library/Zend/Barcode/Object/Royalmail.php index 4a87fdf..79c173c 100644 --- a/library/Zend/Barcode/Object/Royalmail.php +++ b/library/Zend/Barcode/Object/Royalmail.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Royalmail.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Royalmail extends Zend_Barcode_Object_ObjectAbstract diff --git a/library/Zend/Barcode/Object/Upca.php b/library/Zend/Barcode/Object/Upca.php index 412e0c4..d70d4d2 100644 --- a/library/Zend/Barcode/Object/Upca.php +++ b/library/Zend/Barcode/Object/Upca.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upca.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Upca extends Zend_Barcode_Object_Ean13 diff --git a/library/Zend/Barcode/Object/Upce.php b/library/Zend/Barcode/Object/Upce.php index c31564c..6cdb5c6 100644 --- a/library/Zend/Barcode/Object/Upce.php +++ b/library/Zend/Barcode/Object/Upce.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Object - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Upce.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Barcode.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Object_Upce extends Zend_Barcode_Object_Ean13 @@ -188,8 +188,10 @@ class Zend_Barcode_Object_Upce extends Zend_Barcode_Object_Ean13 /** * Particular validation for Upce barcode objects * (to suppress checksum character substitution) + * * @param string $value * @param array $options + * @throws Zend_Barcode_Object_Exception */ protected function _validateText($value, $options = array()) { diff --git a/library/Zend/Barcode/Renderer/Exception.php b/library/Zend/Barcode/Renderer/Exception.php index c7bc396..30e0492 100644 --- a/library/Zend/Barcode/Renderer/Exception.php +++ b/library/Zend/Barcode/Renderer/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Barcode_Exception */ @@ -27,7 +27,7 @@ require_once 'Zend/Barcode/Exception.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Renderer_Exception extends Zend_Barcode_Exception diff --git a/library/Zend/Barcode/Renderer/Image.php b/library/Zend/Barcode/Renderer/Image.php index fe20d4d..cefa668 100644 --- a/library/Zend/Barcode/Renderer/Image.php +++ b/library/Zend/Barcode/Renderer/Image.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Barcode_Renderer_RendererAbstract*/ @@ -28,7 +28,7 @@ require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract @@ -91,9 +91,10 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract /** * Set height of the result image + * * @param null|integer $value * @return Zend_Image_Barcode_Abstract - * @throw Zend_Image_Barcode_Exception + * @throws Zend_Barcode_Renderer_Exception */ public function setHeight($value) { @@ -121,7 +122,8 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract * Set barcode width * * @param mixed $value - * @return void + * @return self + * @throws Zend_Barcode_Renderer_Exception */ public function setWidth($value) { @@ -148,9 +150,9 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract /** * Set an image resource to draw the barcode inside * - * @param resource $value + * @param $image * @return Zend_Barcode_Renderer - * @throw Zend_Barcode_Renderer_Exception + * @throws Zend_Barcode_Renderer_Exception */ public function setResource($image) { @@ -169,7 +171,7 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract * * @param string $value * @return Zend_Barcode_RendererAbstract - * @throw Zend_Barcode_Renderer_Exception + * @throws Zend_Barcode_Renderer_Exception */ public function setImageType($value) { @@ -203,6 +205,7 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract * Initialize the image resource * * @return void + * @throws Zend_Barcode_Exception */ protected function _initRenderer() { @@ -287,6 +290,7 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract * Check barcode dimensions * * @return void + * @throws Zend_Barcode_Renderer_Exception */ protected function _checkDimensions() { @@ -383,13 +387,14 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract /** * Draw a polygon in the image resource * - * @param string $text - * @param float $size - * @param array $position - * @param string $font - * @param integer $color - * @param string $alignment - * @param float $orientation + * @param string $text + * @param float $size + * @param array $position + * @param string $font + * @param integer $color + * @param string $alignment + * @param float|int $orientation + * @throws Zend_Barcode_Renderer_Exception */ protected function _drawText($text, $size, $position, $font, $color, $alignment = 'center', $orientation = 0) { diff --git a/library/Zend/Barcode/Renderer/Pdf.php b/library/Zend/Barcode/Renderer/Pdf.php index 0e830c6..2902ca1 100644 --- a/library/Zend/Barcode/Renderer/Pdf.php +++ b/library/Zend/Barcode/Renderer/Pdf.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pdf.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Barcode_Renderer_RendererAbstract */ @@ -37,7 +37,7 @@ require_once 'Zend/Pdf/Color/Rgb.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Renderer_Pdf extends Zend_Barcode_Renderer_RendererAbstract @@ -62,9 +62,11 @@ class Zend_Barcode_Renderer_Pdf extends Zend_Barcode_Renderer_RendererAbstract /** * Set an image resource to draw the barcode inside - * @param resource $value + * + * @param Zend_Pdf $pdf + * @param int $page * @return Zend_Barcode_Renderer - * @throw Zend_Barcode_Renderer_Exception + * @throws Zend_Barcode_Renderer_Exception */ public function setResource($pdf, $page = 0) { @@ -167,13 +169,14 @@ class Zend_Barcode_Renderer_Pdf extends Zend_Barcode_Renderer_RendererAbstract /** * Draw a text in the rendering resource - * @param string $text - * @param float $size - * @param array $position - * @param string $font - * @param integer $color - * @param string $alignment - * @param float $orientation + * + * @param string $text + * @param float $size + * @param array $position + * @param string $font + * @param integer $color + * @param string $alignment + * @param float|int $orientation */ protected function _drawText( $text, diff --git a/library/Zend/Barcode/Renderer/RendererAbstract.php b/library/Zend/Barcode/Renderer/RendererAbstract.php index 348bd99..4ffe161 100644 --- a/library/Zend/Barcode/Renderer/RendererAbstract.php +++ b/library/Zend/Barcode/Renderer/RendererAbstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RendererAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Barcode_Renderer_RendererAbstract @@ -91,8 +91,9 @@ abstract class Zend_Barcode_Renderer_RendererAbstract /** * Constructor + * * @param array|Zend_Config $options - * @return void + * @return Zend_Barcode_Renderer_RendererAbstract */ public function __construct($options = null) { @@ -169,7 +170,7 @@ abstract class Zend_Barcode_Renderer_RendererAbstract * Manually adjust top position * @param integer $value * @return Zend_Barcode_Renderer - * @throw Zend_Barcode_Renderer_Exception + * @throws Zend_Barcode_Renderer_Exception */ public function setTopOffset($value) { @@ -196,7 +197,7 @@ abstract class Zend_Barcode_Renderer_RendererAbstract * Manually adjust left position * @param integer $value * @return Zend_Barcode_Renderer - * @throw Zend_Barcode_Renderer_Exception + * @throws Zend_Barcode_Renderer_Exception */ public function setLeftOffset($value) { @@ -221,7 +222,9 @@ abstract class Zend_Barcode_Renderer_RendererAbstract /** * Activate/Deactivate the automatic rendering of exception + * * @param boolean $value + * @return $this */ public function setAutomaticRenderError($value) { @@ -231,9 +234,10 @@ abstract class Zend_Barcode_Renderer_RendererAbstract /** * Horizontal position of the barcode in the rendering resource + * * @param string $value * @return Zend_Barcode_Renderer - * @throw Zend_Barcode_Renderer_Exception + * @throws Zend_Barcode_Renderer_Exception */ public function setHorizontalPosition($value) { @@ -258,9 +262,10 @@ abstract class Zend_Barcode_Renderer_RendererAbstract /** * Vertical position of the barcode in the rendering resource + * * @param string $value - * @return Zend_Barcode_Renderer - * @throw Zend_Barcode_Renderer_Exception + * @return self + * @throws Zend_Barcode_Renderer_Exception */ public function setVerticalPosition($value) { @@ -287,7 +292,7 @@ abstract class Zend_Barcode_Renderer_RendererAbstract * Set the size of a module * @param float $value * @return Zend_Barcode_Renderer - * @throw Zend_Barcode_Renderer_Exception + * @throws Zend_Barcode_Renderer_Exception */ public function setModuleSize($value) { @@ -322,8 +327,10 @@ abstract class Zend_Barcode_Renderer_RendererAbstract /** * Set the barcode object + * * @param Zend_Barcode_Object $barcode * @return Zend_Barcode_Renderer + * @throws Zend_Barcode_Renderer_Exception */ public function setBarcode($barcode) { @@ -360,7 +367,7 @@ abstract class Zend_Barcode_Renderer_RendererAbstract /** * Check if a barcode object is correctly provided * @return void - * @throw Zend_Barcode_Renderer_Exception + * @throws Zend_Barcode_Renderer_Exception */ protected function _checkBarcodeObject() { @@ -421,7 +428,10 @@ abstract class Zend_Barcode_Renderer_RendererAbstract /** * Draw the barcode in the rendering resource + * * @return mixed + * @throws Zend_Exception + * @throws Zend_Barcode_Exception */ public function draw() { @@ -520,13 +530,14 @@ abstract class Zend_Barcode_Renderer_RendererAbstract /** * Draw a polygon in the rendering resource - * @param string $text - * @param float $size - * @param array $position - * @param string $font - * @param integer $color - * @param string $alignment - * @param float $orientation + * + * @param string $text + * @param float $size + * @param array $position + * @param string $font + * @param integer $color + * @param string $alignment + * @param float|int $orientation */ abstract protected function _drawText( $text, diff --git a/library/Zend/Barcode/Renderer/Svg.php b/library/Zend/Barcode/Renderer/Svg.php index e8a6a4b..3a88cff 100644 --- a/library/Zend/Barcode/Renderer/Svg.php +++ b/library/Zend/Barcode/Renderer/Svg.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Barcode * @subpackage Renderer - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Image.php 20366 2010-01-18 03:56:52Z ralph $ */ @@ -28,7 +28,7 @@ require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; * * @category Zend * @package Zend_Barcode - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract @@ -60,9 +60,10 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract /** * Set height of the result image + * * @param null|integer $value * @return Zend_Image_Barcode_Abstract - * @throw Zend_Image_Barcode_Exception + * @throws Zend_Barcode_Renderer_Exception */ public function setHeight($value) { @@ -90,7 +91,8 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract * Set barcode width * * @param mixed $value - * @return void + * @return self + * @throws Zend_Barcode_Renderer_Exception */ public function setWidth($value) { @@ -117,9 +119,9 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract /** * Set an image resource to draw the barcode inside * - * @param DOMDocument $value + * @param $svg * @return Zend_Barcode_Renderer - * @throw Zend_Barcode_Renderer_Exception + * @throws Zend_Barcode_Renderer_Exception */ public function setResource($svg) { @@ -237,6 +239,7 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract * Check barcode dimensions * * @return void + * @throws Zend_Barcode_Renderer_Exception */ protected function _checkDimensions() { @@ -341,13 +344,13 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract /** * Draw a polygon in the svg resource * - * @param string $text - * @param float $size - * @param array $position - * @param string $font - * @param integer $color - * @param string $alignment - * @param float $orientation + * @param string $text + * @param float $size + * @param array $position + * @param string $font + * @param integer $color + * @param string $alignment + * @param float|int $orientation */ protected function _drawText($text, $size, $position, $font, $color, $alignment = 'center', $orientation = 0) { diff --git a/library/Zend/Cache.php b/library/Zend/Cache.php index aff2e65..52e219b 100644 --- a/library/Zend/Cache.php +++ b/library/Zend/Cache.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 24656 2012-02-26 06:02:53Z adamlundrigan $ + * @version $Id$ */ /** * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Cache diff --git a/library/Zend/Cache/Backend.php b/library/Zend/Cache/Backend.php index 803fd44..9a78057 100644 --- a/library/Zend/Cache/Backend.php +++ b/library/Zend/Cache/Backend.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Backend.php 24989 2012-06-21 07:24:13Z mabe $ + * @version $Id$ */ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend @@ -58,8 +58,6 @@ class Zend_Cache_Backend * Constructor * * @param array $options Associative array of options - * @throws Zend_Cache_Exception - * @return void */ public function __construct(array $options = array()) { @@ -269,7 +267,7 @@ class Zend_Cache_Backend * Log a message at the WARN (4) priority. * * @param string $message - * @throws Zend_Cache_Exception + * @param int $priority * @return void */ protected function _log($message, $priority = 4) diff --git a/library/Zend/Cache/Backend/Apc.php b/library/Zend/Cache/Backend/Apc.php index 0786df0..a1042cb 100644 --- a/library/Zend/Cache/Backend/Apc.php +++ b/library/Zend/Cache/Backend/Apc.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Apc.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface @@ -256,13 +256,13 @@ class Zend_Cache_Backend_Apc extends Zend_Cache_Backend implements Zend_Cache_Ba */ public function getIds() { - $res = array(); - $array = apc_cache_info('user', false); - $records = $array['cache_list']; - foreach ($records as $record) { - $res[] = $record['info']; + $ids = array(); + $iterator = new APCIterator('user', null, APC_ITER_KEY); + foreach ($iterator as $item) { + $ids[] = $item['key']; } - return $res; + + return $ids; } /** diff --git a/library/Zend/Cache/Backend/BlackHole.php b/library/Zend/Cache/Backend/BlackHole.php index 615d7c0..c396ece 100644 --- a/library/Zend/Cache/Backend/BlackHole.php +++ b/library/Zend/Cache/Backend/BlackHole.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BlackHole.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_BlackHole diff --git a/library/Zend/Cache/Backend/ExtendedInterface.php b/library/Zend/Cache/Backend/ExtendedInterface.php index bb5ec5a..84f3e96 100644 --- a/library/Zend/Cache/Backend/ExtendedInterface.php +++ b/library/Zend/Cache/Backend/ExtendedInterface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ExtendedInterface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/Cache/Backend/Interface.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_ExtendedInterface extends Zend_Cache_Backend_Interface diff --git a/library/Zend/Cache/Backend/File.php b/library/Zend/Cache/Backend/File.php index ea1be86..8b39d3e 100644 --- a/library/Zend/Cache/Backend/File.php +++ b/library/Zend/Cache/Backend/File.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 24844 2012-05-31 19:01:36Z rob $ + * @version $Id$ */ /** @@ -34,7 +34,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface @@ -120,7 +120,6 @@ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_B * * @param array $options associative array of options * @throws Zend_Cache_Exception - * @return void */ public function __construct(array $options = array()) { @@ -234,10 +233,10 @@ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_B * Note : $data is always "string" (serialization is done by the * core not by the backend) * - * @param string $data Datas to cache - * @param string $id Cache id - * @param array $tags Array of strings, the cache record will be tagged by each string entry - * @param int $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime) + * @param string $data Datas to cache + * @param string $id Cache id + * @param array $tags Array of strings, the cache record will be tagged by each string entry + * @param boolean|int $specificLifetime If != false, set a specific lifetime for this cache record (null => infinite lifetime) * @return boolean true if no problem */ public function save($data, $id, $tags = array(), $specificLifetime = false) @@ -303,7 +302,7 @@ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_B * ($tags can be an array of strings or a single string) * * @param string $mode clean mode - * @param tags array $tags array of tags + * @param array $tags array of tags * @return boolean true if no problem */ public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array()) @@ -675,14 +674,17 @@ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_B // On some systems it is impossible to distinguish between empty match and an error. return true; } + $metadataFiles = array(); foreach ($glob as $file) { if (is_file($file)) { $fileName = basename($file); if ($this->_isMetadatasFile($fileName)) { - // in CLEANING_MODE_ALL, we drop anything, even remainings old metadatas files - if ($mode != Zend_Cache::CLEANING_MODE_ALL) { - continue; + // In CLEANING_MODE_ALL, we drop anything, even remainings old metadatas files. + // To do that, we need to save the list of the metadata files first. + if ($mode == Zend_Cache::CLEANING_MODE_ALL) { + $metadataFiles[] = $file; } + continue; } $id = $this->_fileNameToId($fileName); $metadatas = $this->_getMetadatas($id); @@ -691,12 +693,7 @@ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_B } switch ($mode) { case Zend_Cache::CLEANING_MODE_ALL: - $res = $this->remove($id); - if (!$res) { - // in this case only, we accept a problem with the metadatas file drop - $res = $this->_remove($file); - } - $result = $result && $res; + $result = $result && $this->remove($id); break; case Zend_Cache::CLEANING_MODE_OLD: if (time() > $metadatas['expire']) { @@ -753,6 +750,14 @@ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_B } } } + + // cycle through metadataFiles and delete orphaned ones + foreach ($metadataFiles as $file) { + if (file_exists($file)) { + $result = $this->_remove($file) && $result; + } + } + return $result; } @@ -843,6 +848,7 @@ class Zend_Cache_Backend_File extends Zend_Cache_Backend implements Zend_Cache_B /** * Compute & return the expire time * + * @param int $lifetime * @return int expire time (unix timestamp) */ protected function _expireTime($lifetime) diff --git a/library/Zend/Cache/Backend/Interface.php b/library/Zend/Cache/Backend/Interface.php index 3f44e2e..3a27895 100644 --- a/library/Zend/Cache/Backend/Interface.php +++ b/library/Zend/Cache/Backend/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_Interface diff --git a/library/Zend/Cache/Backend/Libmemcached.php b/library/Zend/Cache/Backend/Libmemcached.php index cc20c10..673474b 100644 --- a/library/Zend/Cache/Backend/Libmemcached.php +++ b/library/Zend/Cache/Backend/Libmemcached.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Libmemcached.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_Libmemcached extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface @@ -132,7 +132,7 @@ class Zend_Cache_Backend_Libmemcached extends Zend_Cache_Backend implements Zend $this->_log("Unknown memcached client option '{$name}' ({$optConst})"); } } - if ($optId) { + if (null !== $optId) { if (!$this->_memcache->setOption($optId, $value)) { $this->_log("Setting memcached client option '{$optId}' failed"); } diff --git a/library/Zend/Cache/Backend/Memcached.php b/library/Zend/Cache/Backend/Memcached.php index 893a987..8f7c786 100644 --- a/library/Zend/Cache/Backend/Memcached.php +++ b/library/Zend/Cache/Backend/Memcached.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Memcached.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_Memcached extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface diff --git a/library/Zend/Cache/Backend/Sqlite.php b/library/Zend/Cache/Backend/Sqlite.php index 54e1597..bab860a 100644 --- a/library/Zend/Cache/Backend/Sqlite.php +++ b/library/Zend/Cache/Backend/Sqlite.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlite.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_Sqlite extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface diff --git a/library/Zend/Cache/Backend/Static.php b/library/Zend/Cache/Backend/Static.php index a8e2ac8..0244291 100644 --- a/library/Zend/Cache/Backend/Static.php +++ b/library/Zend/Cache/Backend/Static.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Static.php 24989 2012-06-21 07:24:13Z mabe $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_Static @@ -47,16 +47,16 @@ class Zend_Cache_Backend_Static * @var array */ protected $_options = array( - 'public_dir' => null, - 'sub_dir' => 'html', - 'file_extension' => '.html', - 'index_filename' => 'index', - 'file_locking' => true, - 'cache_file_umask' => 0600, - 'cache_directory_umask' => 0700, - 'debug_header' => false, - 'tag_cache' => null, - 'disable_caching' => false + 'public_dir' => null, + 'sub_dir' => 'html', + 'file_extension' => '.html', + 'index_filename' => 'index', + 'file_locking' => true, + 'cache_file_perm' => 0600, + 'cache_directory_perm' => 0700, + 'debug_header' => false, + 'tag_cache' => null, + 'disable_caching' => false ); /** @@ -85,6 +85,24 @@ class Zend_Cache_Backend_Static if ($name == 'tag_cache') { $this->setInnerCache($value); } else { + // See #ZF-12047 and #GH-91 + if ($name == 'cache_file_umask') { + trigger_error( + "'cache_file_umask' is deprecated -> please use 'cache_file_perm' instead", + E_USER_NOTICE + ); + + $name = 'cache_file_perm'; + } + if ($name == 'cache_directory_umask') { + trigger_error( + "'cache_directory_umask' is deprecated -> please use 'cache_directory_perm' instead", + E_USER_NOTICE + ); + + $name = 'cache_directory_perm'; + } + parent::setOption($name, $value); } return $this; @@ -233,7 +251,7 @@ class Zend_Cache_Backend_Static } else { $result = file_put_contents($file, $data); } - @chmod($file, $this->_octdec($this->_options['cache_file_umask'])); + @chmod($file, $this->_octdec($this->_options['cache_file_perm'])); if ($this->_tagged === null && $tagged = $this->getInnerCache()->load(self::INNER_CACHE_NAME)) { $this->_tagged = $tagged; @@ -259,7 +277,7 @@ class Zend_Cache_Backend_Static { if (!is_dir($path)) { $oldUmask = umask(0); - if ( !@mkdir($path, $this->_octdec($this->_options['cache_directory_umask']), true)) { + if ( !@mkdir($path, $this->_octdec($this->_options['cache_directory_perm']), true)) { $lastErr = error_get_last(); umask($oldUmask); Zend_Cache::throwException("Can't create directory: {$lastErr['message']}"); @@ -375,6 +393,7 @@ class Zend_Cache_Backend_Static * @param string $mode Clean mode * @param array $tags Array of tags * @return boolean true if no problem + * @throws Zend_Exception */ public function clean($mode = Zend_Cache::CLEANING_MODE_ALL, $tags = array()) { diff --git a/library/Zend/Cache/Backend/Test.php b/library/Zend/Cache/Backend/Test.php index e93d965..be48822 100644 --- a/library/Zend/Cache/Backend/Test.php +++ b/library/Zend/Cache/Backend/Test.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Test.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_Test extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface @@ -125,6 +125,9 @@ class Zend_Cache_Backend_Test extends Zend_Cache_Backend implements Zend_Cache_B || $id == '4a923ef02d7f997ca14d56dfeae25ea7') { return serialize(array('foo', 'bar')); } + if ( $id == 'f53c7d912cc523d9a65834c8286eceb9') { + return serialize(array('foobar')); + } return 'foo'; } diff --git a/library/Zend/Cache/Backend/TwoLevels.php b/library/Zend/Cache/Backend/TwoLevels.php index f8463cb..440f78f 100644 --- a/library/Zend/Cache/Backend/TwoLevels.php +++ b/library/Zend/Cache/Backend/TwoLevels.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TwoLevels.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,6 +72,11 @@ class Zend_Cache_Backend_TwoLevels extends Zend_Cache_Backend implements Zend_Ca * =====> (boolean) fast_backend_autoload : * - See Zend_Cache::factory() method * + * =====> (boolean) auto_fill_fast_cache + * - If true, automatically fill the fast cache when a cache record was not found in fast cache, but did + * exist in slow cache. This can be usefull when a non-persistent cache like APC or Memcached got + * purged for whatever reason. + * * =====> (boolean) auto_refresh_fast_cache * - If true, auto refresh the fast cache when a cache record is hit * @@ -87,6 +92,7 @@ class Zend_Cache_Backend_TwoLevels extends Zend_Cache_Backend implements Zend_Ca 'fast_backend_custom_naming' => false, 'slow_backend_autoload' => false, 'fast_backend_autoload' => false, + 'auto_fill_fast_cache' => true, 'auto_refresh_fast_cache' => true ); @@ -223,17 +229,23 @@ class Zend_Cache_Backend_TwoLevels extends Zend_Cache_Backend implements Zend_Ca */ public function load($id, $doNotTestCacheValidity = false) { - $res = $this->_fastBackend->load($id, $doNotTestCacheValidity); - if ($res === false) { - $res = $this->_slowBackend->load($id, $doNotTestCacheValidity); - if ($res === false) { + $resultFast = $this->_fastBackend->load($id, $doNotTestCacheValidity); + if ($resultFast === false) { + $resultSlow = $this->_slowBackend->load($id, $doNotTestCacheValidity); + if ($resultSlow === false) { // there is no cache at all for this id return false; } } - $array = unserialize($res); + $array = $resultFast !== false ? unserialize($resultFast) : unserialize($resultSlow); + + //In case no cache entry was found in the FastCache and auto-filling is enabled, copy data to FastCache + if ($resultFast === false && $this->_options['auto_fill_fast_cache']) { + $preparedData = $this->_prepareData($array['data'], $array['lifetime'], $array['priority']); + $this->_fastBackend->save($preparedData, $id, array(), $array['lifetime']); + } // maybe, we have to refresh the fast cache ? - if ($this->_options['auto_refresh_fast_cache']) { + elseif ($this->_options['auto_refresh_fast_cache']) { if ($array['priority'] == 10) { // no need to refresh the fast cache with priority = 10 return $array['data']; diff --git a/library/Zend/Cache/Backend/WinCache.php b/library/Zend/Cache/Backend/WinCache.php index 440ffc4..4d98922 100644 --- a/library/Zend/Cache/Backend/WinCache.php +++ b/library/Zend/Cache/Backend/WinCache.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_WinCache extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface diff --git a/library/Zend/Cache/Backend/Xcache.php b/library/Zend/Cache/Backend/Xcache.php index c19391c..e7d2356 100644 --- a/library/Zend/Cache/Backend/Xcache.php +++ b/library/Zend/Cache/Backend/Xcache.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xcache.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_Xcache extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface diff --git a/library/Zend/Cache/Backend/ZendPlatform.php b/library/Zend/Cache/Backend/ZendPlatform.php index 57cf864..2e6223e 100644 --- a/library/Zend/Cache/Backend/ZendPlatform.php +++ b/library/Zend/Cache/Backend/ZendPlatform.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZendPlatform.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -36,7 +36,7 @@ require_once 'Zend/Cache/Backend/Interface.php'; * * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_ZendPlatform extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface diff --git a/library/Zend/Cache/Backend/ZendServer.php b/library/Zend/Cache/Backend/ZendServer.php index 590a57e..d2c5d05 100644 --- a/library/Zend/Cache/Backend/ZendServer.php +++ b/library/Zend/Cache/Backend/ZendServer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ZendServer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Cache_Backend_ZendServer extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface diff --git a/library/Zend/Cache/Backend/ZendServer/Disk.php b/library/Zend/Cache/Backend/ZendServer/Disk.php index ab01ccf..704aaea 100644 --- a/library/Zend/Cache/Backend/ZendServer/Disk.php +++ b/library/Zend/Cache/Backend/ZendServer/Disk.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Disk.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Cache/Backend/ZendServer.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_ZendServer_Disk extends Zend_Cache_Backend_ZendServer implements Zend_Cache_Backend_Interface @@ -72,7 +72,8 @@ class Zend_Cache_Backend_ZendServer_Disk extends Zend_Cache_Backend_ZendServer i /** * Fetch data * - * @param string $id Cache id + * @param string $id Cache id + * @return mixed|null */ protected function _fetch($id) { diff --git a/library/Zend/Cache/Backend/ZendServer/ShMem.php b/library/Zend/Cache/Backend/ZendServer/ShMem.php index 8d73fc9..644e891 100644 --- a/library/Zend/Cache/Backend/ZendServer/ShMem.php +++ b/library/Zend/Cache/Backend/ZendServer/ShMem.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ShMem.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Cache/Backend/ZendServer.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Backend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Backend_ZendServer_ShMem extends Zend_Cache_Backend_ZendServer implements Zend_Cache_Backend_Interface @@ -53,10 +53,10 @@ class Zend_Cache_Backend_ZendServer_ShMem extends Zend_Cache_Backend_ZendServer /** * Store data * - * @param mixed $data Object to store - * @param string $id Cache id - * @param int $timeToLive Time to live in seconds - * + * @param mixed $data Object to store + * @param string $id Cache id + * @param int $timeToLive Time to live in seconds + * @return bool */ protected function _store($data, $id, $timeToLive) { @@ -72,7 +72,8 @@ class Zend_Cache_Backend_ZendServer_ShMem extends Zend_Cache_Backend_ZendServer /** * Fetch data * - * @param string $id Cache id + * @param string $id Cache id + * @return mixed|null */ protected function _fetch($id) { diff --git a/library/Zend/Cache/Core.php b/library/Zend/Cache/Core.php index e358863..23bab5d 100644 --- a/library/Zend/Cache/Core.php +++ b/library/Zend/Cache/Core.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Core.php 24989 2012-06-21 07:24:13Z mabe $ + * @version $Id$ */ /** * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Core diff --git a/library/Zend/Cache/Exception.php b/library/Zend/Cache/Exception.php index 4488451..bc49421 100644 --- a/library/Zend/Cache/Exception.php +++ b/library/Zend/Cache/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ require_once 'Zend/Exception.php'; /** * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Exception extends Zend_Exception {} diff --git a/library/Zend/Cache/Frontend/Capture.php b/library/Zend/Cache/Frontend/Capture.php index 47b2fde..1622b13 100644 --- a/library/Zend/Cache/Frontend/Capture.php +++ b/library/Zend/Cache/Frontend/Capture.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Capture.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -30,7 +30,7 @@ require_once 'Zend/Cache/Core.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Frontend_Capture extends Zend_Cache_Core diff --git a/library/Zend/Cache/Frontend/Class.php b/library/Zend/Cache/Frontend/Class.php index 7c9a170..8ac98c2 100644 --- a/library/Zend/Cache/Frontend/Class.php +++ b/library/Zend/Cache/Frontend/Class.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Class.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -29,8 +29,8 @@ require_once 'Zend/Cache/Core.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License + * @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 Zend_Cache_Frontend_Class extends Zend_Cache_Core { @@ -53,9 +53,9 @@ class Zend_Cache_Frontend_Class extends Zend_Cache_Core * @var array available options */ protected $_specificOptions = array( - 'cached_entity' => null, - 'cache_by_default' => true, - 'cached_methods' => array(), + 'cached_entity' => null, + 'cache_by_default' => true, + 'cached_methods' => array(), 'non_cached_methods' => array() ); @@ -64,23 +64,23 @@ class Zend_Cache_Frontend_Class extends Zend_Cache_Core * * @var array */ - private $_tags = array(); + protected $_tags = array(); /** * SpecificLifetime value * * false => no specific life time * - * @var int + * @var bool|int */ - private $_specificLifetime = false; + protected $_specificLifetime = false; /** * The cached object or the name of the cached abstract class * * @var mixed */ - private $_cachedEntity = null; + protected $_cachedEntity = null; /** * The class name of the cached object or cached abstract class @@ -89,21 +89,20 @@ class Zend_Cache_Frontend_Class extends Zend_Cache_Core * * @var string */ - private $_cachedEntityLabel = ''; + protected $_cachedEntityLabel = ''; /** * Priority (used by some particular backends) * * @var int */ - private $_priority = 8; + protected $_priority = 8; /** * Constructor * * @param array $options Associative array of options * @throws Zend_Cache_Exception - * @return void */ public function __construct(array $options = array()) { @@ -120,7 +119,7 @@ class Zend_Cache_Frontend_Class extends Zend_Cache_Core /** * Set a specific life time * - * @param int $specificLifetime + * @param bool|int $specificLifetime * @return void */ public function setSpecificLifetime($specificLifetime = false) @@ -168,11 +167,15 @@ class Zend_Cache_Frontend_Class extends Zend_Cache_Core public function setCachedEntity($cachedEntity) { if (!is_string($cachedEntity) && !is_object($cachedEntity)) { - Zend_Cache::throwException('cached_entity must be an object or a class name'); + Zend_Cache::throwException( + 'cached_entity must be an object or a class name' + ); } - $this->_cachedEntity = $cachedEntity; + + $this->_cachedEntity = $cachedEntity; $this->_specificOptions['cached_entity'] = $cachedEntity; - if (is_string($this->_cachedEntity)){ + + if (is_string($this->_cachedEntity)) { $this->_cachedEntityLabel = $this->_cachedEntity; } else { $ro = new ReflectionObject($this->_cachedEntity); @@ -197,6 +200,7 @@ class Zend_Cache_Frontend_Class extends Zend_Cache_Core * @param string $name Method name * @param array $parameters Method parameters * @return mixed Result + * @throws Exception */ public function __call($name, $parameters) { @@ -209,14 +213,17 @@ class Zend_Cache_Frontend_Class extends Zend_Cache_Core $cacheBool1 = $this->_specificOptions['cache_by_default']; $cacheBool2 = in_array($name, $this->_specificOptions['cached_methods']); $cacheBool3 = in_array($name, $this->_specificOptions['non_cached_methods']); - $cache = (($cacheBool1 || $cacheBool2) && (!$cacheBool3)); + $cache = (($cacheBool1 || $cacheBool2) && (!$cacheBool3)); + if (!$cache) { // We do not have not cache return call_user_func_array($callback, $parameters); } - $id = $this->_makeId($name, $parameters); - if ( ($rs = $this->load($id)) && isset($rs[0], $rs[1]) ) { + $id = $this->makeId($name, $parameters); + if (($rs = $this->load($id)) && (array_key_exists(0, $rs)) + && (array_key_exists(1, $rs)) + ) { // A cache is available $output = $rs[0]; $return = $rs[1]; @@ -228,8 +235,12 @@ class Zend_Cache_Frontend_Class extends Zend_Cache_Core try { $return = call_user_func_array($callback, $parameters); $output = ob_get_clean(); - $data = array($output, $return); - $this->save($data, $id, $this->_tags, $this->_specificLifetime, $this->_priority); + $data = array($output, $return); + + $this->save( + $data, $id, $this->_tags, $this->_specificLifetime, + $this->_priority + ); } catch (Exception $e) { ob_end_clean(); throw $e; @@ -261,5 +272,4 @@ class Zend_Cache_Frontend_Class extends Zend_Cache_Core { return md5($this->_cachedEntityLabel . '__' . $name . '__' . serialize($args)); } - } diff --git a/library/Zend/Cache/Frontend/File.php b/library/Zend/Cache/Frontend/File.php index 04355c4..9ff13b1 100644 --- a/library/Zend/Cache/Frontend/File.php +++ b/library/Zend/Cache/Frontend/File.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -30,7 +30,7 @@ require_once 'Zend/Cache/Core.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Frontend_File extends Zend_Cache_Core diff --git a/library/Zend/Cache/Frontend/Function.php b/library/Zend/Cache/Frontend/Function.php index 4550f98..6e794e9 100644 --- a/library/Zend/Cache/Frontend/Function.php +++ b/library/Zend/Cache/Frontend/Function.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Function.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -30,7 +30,7 @@ require_once 'Zend/Cache/Core.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Frontend_Function extends Zend_Cache_Core diff --git a/library/Zend/Cache/Frontend/Output.php b/library/Zend/Cache/Frontend/Output.php index f9a086e..25997d1 100644 --- a/library/Zend/Cache/Frontend/Output.php +++ b/library/Zend/Cache/Frontend/Output.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Output.php 24800 2012-05-13 11:59:32Z mabe $ + * @version $Id$ */ @@ -30,7 +30,7 @@ require_once 'Zend/Cache/Core.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Frontend_Output extends Zend_Cache_Core diff --git a/library/Zend/Cache/Frontend/Page.php b/library/Zend/Cache/Frontend/Page.php index e2c9803..e6ba5f2 100644 --- a/library/Zend/Cache/Frontend/Page.php +++ b/library/Zend/Cache/Frontend/Page.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Page.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -30,7 +30,7 @@ require_once 'Zend/Cache/Core.php'; /** * @package Zend_Cache * @subpackage Zend_Cache_Frontend - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Frontend_Page extends Zend_Cache_Core diff --git a/library/Zend/Cache/Manager.php b/library/Zend/Cache/Manager.php index 8f96e66..0c9616b 100644 --- a/library/Zend/Cache/Manager.php +++ b/library/Zend/Cache/Manager.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Manager.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @see Zend_Cache_Exception */ @@ -28,7 +28,7 @@ require_once 'Zend/Cache.php'; /** * @category Zend * @package Zend_Cache - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cache_Manager @@ -197,8 +197,9 @@ class Zend_Cache_Manager * be lazy loaded * * @param string $name - * @param array $options + * @param array $options * @return Zend_Cache_Manager + * @throws Zend_Cache_Exception */ public function setCacheTemplate($name, $options) { @@ -284,15 +285,24 @@ class Zend_Cache_Manager $current['backend']['name'] = $options['backend']['name']; } if (isset($options['frontend']['options'])) { - foreach ($options['frontend']['options'] as $key=>$value) { + foreach ($options['frontend']['options'] as $key => $value) { $current['frontend']['options'][$key] = $value; } } if (isset($options['backend']['options'])) { - foreach ($options['backend']['options'] as $key=>$value) { + foreach ($options['backend']['options'] as $key => $value) { $current['backend']['options'][$key] = $value; } } + if (isset($options['frontend']['customFrontendNaming'])) { + $current['frontend']['customFrontendNaming'] = $options['frontend']['customFrontendNaming']; + } + if (isset($options['backend']['customBackendNaming'])) { + $current['backend']['customBackendNaming'] = $options['backend']['customBackendNaming']; + } + if (isset($options['frontendBackendAutoload'])) { + $current['frontendBackendAutoload'] = $options['frontendBackendAutoload']; + } return $current; } } diff --git a/library/Zend/Captcha/Adapter.php b/library/Zend/Captcha/Adapter.php index e5a1df0..0bd9db0 100644 --- a/library/Zend/Captcha/Adapter.php +++ b/library/Zend/Captcha/Adapter.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ require_once 'Zend/Validate/Interface.php'; * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Adapter.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ interface Zend_Captcha_Adapter extends Zend_Validate_Interface { diff --git a/library/Zend/Captcha/Base.php b/library/Zend/Captcha/Base.php index 6b30075..41e01e8 100644 --- a/library/Zend/Captcha/Base.php +++ b/library/Zend/Captcha/Base.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +33,9 @@ require_once 'Zend/Validate/Abstract.php'; * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Base.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_Captcha_Adapter { @@ -78,6 +78,7 @@ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_ * Set name * * @param string $name + * @return Zend_Captcha_Adapter */ public function setName($name) { @@ -89,7 +90,6 @@ abstract class Zend_Captcha_Base extends Zend_Validate_Abstract implements Zend_ * Constructor * * @param array|Zend_Config $options - * @return void */ public function __construct($options = null) { diff --git a/library/Zend/Captcha/Dumb.php b/library/Zend/Captcha/Dumb.php index f03dce3..602be4d 100644 --- a/library/Zend/Captcha/Dumb.php +++ b/library/Zend/Captcha/Dumb.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ require_once 'Zend/Captcha/Word.php'; * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dumb.php 24747 2012-05-05 00:21:56Z adamlundrigan $ + * @version $Id$ */ class Zend_Captcha_Dumb extends Zend_Captcha_Word { diff --git a/library/Zend/Captcha/Exception.php b/library/Zend/Captcha/Exception.php index 94be5ba..ef0b33c 100644 --- a/library/Zend/Captcha/Exception.php +++ b/library/Zend/Captcha/Exception.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Captcha - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; * * @category Zend * @package Zend_Captcha - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Captcha_Exception extends Zend_Exception diff --git a/library/Zend/Captcha/Figlet.php b/library/Zend/Captcha/Figlet.php index 37b1506..37cdf63 100644 --- a/library/Zend/Captcha/Figlet.php +++ b/library/Zend/Captcha/Figlet.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +33,9 @@ require_once 'Zend/Text/Figlet.php'; * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Figlet.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Captcha_Figlet extends Zend_Captcha_Word { @@ -49,8 +49,7 @@ class Zend_Captcha_Figlet extends Zend_Captcha_Word /** * Constructor * - * @param null|string|array|Zend_Config $options - * @return void + * @param null|string|array|Zend_Config $options */ public function __construct($options = null) { diff --git a/library/Zend/Captcha/Image.php b/library/Zend/Captcha/Image.php index 0db2cc8..b5c1858 100644 --- a/library/Zend/Captcha/Image.php +++ b/library/Zend/Captcha/Image.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Image.php 24821 2012-05-29 14:54:50Z adamlundrigan $ + * @version $Id$ */ /** @see Zend_Captcha_Word */ @@ -31,7 +31,7 @@ require_once 'Zend/Captcha/Word.php'; * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Captcha_Image extends Zend_Captcha_Word @@ -240,24 +240,36 @@ class Zend_Captcha_Image extends Zend_Captcha_Word { return $this->_width; } + /** + * Set start image + * * @param string $startImage + * @return Zend_Captcha_Image */ public function setStartImage ($startImage) { $this->_startImage = $startImage; return $this; } + /** + * Set dot noise level + * * @param int $dotNoiseLevel + * @return Zend_Captcha_Image */ public function setDotNoiseLevel ($dotNoiseLevel) { $this->_dotNoiseLevel = $dotNoiseLevel; return $this; } - /** + + /** + * Set line noise level + * * @param int $lineNoiseLevel + * @return Zend_Captcha_Image */ public function setLineNoiseLevel ($lineNoiseLevel) { @@ -348,8 +360,12 @@ class Zend_Captcha_Image extends Zend_Captcha_Word $this->_imgUrl = rtrim($imgUrl, "/\\") . '/'; return $this; } + /** + * Set image alternative text + * * @param string $imgAlt + * @return Zend_Captcha_Image */ public function setImgAlt ($imgAlt) { @@ -440,8 +456,9 @@ class Zend_Captcha_Image extends Zend_Captcha_Word * Override this function if you want different image generator * Wave transform from http://www.captcha.ru/captchas/multiwave/ * - * @param string $id Captcha ID + * @param string $id Captcha ID * @param string $word Captcha word + * @throws Zend_Captcha_Exception */ protected function _generateImage($id, $word) { @@ -567,7 +584,6 @@ class Zend_Captcha_Image extends Zend_Captcha_Word /** * Remove old files from image directory - * */ protected function _gc() { diff --git a/library/Zend/Captcha/ReCaptcha.php b/library/Zend/Captcha/ReCaptcha.php index 6778e5b..5737df0 100644 --- a/library/Zend/Captcha/ReCaptcha.php +++ b/library/Zend/Captcha/ReCaptcha.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ require_once 'Zend/Service/ReCaptcha.php'; * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ReCaptcha.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Captcha_ReCaptcha extends Zend_Captcha_Base { @@ -135,8 +135,7 @@ class Zend_Captcha_ReCaptcha extends Zend_Captcha_Base /** * Constructor * - * @param array|Zend_Config $options - * @return void + * @param array|Zend_Config $options */ public function __construct($options = null) { @@ -215,7 +214,8 @@ class Zend_Captcha_ReCaptcha extends Zend_Captcha_Base * Validate captcha * * @see Zend_Validate_Interface::isValid() - * @param mixed $value + * @param mixed $value + * @param array|null $context * @return boolean */ public function isValid($value, $context = null) diff --git a/library/Zend/Captcha/Word.php b/library/Zend/Captcha/Word.php index 7bef5ef..1f0e0fc 100644 --- a/library/Zend/Captcha/Word.php +++ b/library/Zend/Captcha/Word.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ require_once 'Zend/Captcha/Base.php'; * @category Zend * @package Zend_Captcha * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Word.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ abstract class Zend_Captcha_Word extends Zend_Captcha_Base { @@ -187,7 +187,7 @@ abstract class Zend_Captcha_Word extends Zend_Captcha_Base * Set captcha identifier * * @param string $id - * return Zend_Captcha_Word + * @return Zend_Captcha_Word */ protected function _setId ($id) { @@ -366,7 +366,8 @@ abstract class Zend_Captcha_Word extends Zend_Captcha_Base * Validate the word * * @see Zend_Validate_Interface::isValid() - * @param mixed $value + * @param mixed $value + * @param array|null $context * @return boolean */ public function isValid($value, $context = null) diff --git a/library/Zend/Cloud/AbstractFactory.php b/library/Zend/Cloud/AbstractFactory.php index ad480a0..dcfa5a4 100644 --- a/library/Zend/Cloud/AbstractFactory.php +++ b/library/Zend/Cloud/AbstractFactory.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_AbstractFactory diff --git a/library/Zend/Cloud/DocumentService/Adapter.php b/library/Zend/Cloud/DocumentService/Adapter.php index 9479fea..756f662 100644 --- a/library/Zend/Cloud/DocumentService/Adapter.php +++ b/library/Zend/Cloud/DocumentService/Adapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 +31,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_DocumentService_Adapter diff --git a/library/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php b/library/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php index 2a4f916..fd59144 100644 --- a/library/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php +++ b/library/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 +33,7 @@ require_once 'Zend/Cloud/DocumentService/Query.php'; * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Cloud_DocumentService_Adapter_AbstractAdapter diff --git a/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php b/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php index 1e2ffe0..d233dc2 100644 --- a/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php +++ b/library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 @@ require_once 'Zend/Service/Amazon/SimpleDb/Attribute.php'; * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_DocumentService_Adapter_SimpleDb diff --git a/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php b/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php index 89545d8..ba4d7bf 100644 --- a/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php +++ b/library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 @@ require_once 'Zend/Cloud/DocumentService/Query.php'; * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_DocumentService_Adapter_SimpleDb_Query diff --git a/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php b/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php index e812f89..39e2213 100644 --- a/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php +++ b/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 @@ require_once 'Zend/Service/WindowsAzure/Storage/Table.php'; * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_DocumentService_Adapter_WindowsAzure diff --git a/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php b/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php index c6fe8c4..c6fbecc 100644 --- a/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php +++ b/library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ require_once 'Zend/Cloud/DocumentService/QueryAdapter.php'; * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query diff --git a/library/Zend/Cloud/DocumentService/Document.php b/library/Zend/Cloud/DocumentService/Document.php index 9b8c5e5..76e5c72 100644 --- a/library/Zend/Cloud/DocumentService/Document.php +++ b/library/Zend/Cloud/DocumentService/Document.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 +26,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_DocumentService_Document diff --git a/library/Zend/Cloud/DocumentService/DocumentSet.php b/library/Zend/Cloud/DocumentService/DocumentSet.php index 156b2dd..1bf4dfb 100644 --- a/library/Zend/Cloud/DocumentService/DocumentSet.php +++ b/library/Zend/Cloud/DocumentService/DocumentSet.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_DocumentService_DocumentSet implements Countable, IteratorAggregate diff --git a/library/Zend/Cloud/DocumentService/Exception.php b/library/Zend/Cloud/DocumentService/Exception.php index 0c5b173..9e8def3 100644 --- a/library/Zend/Cloud/DocumentService/Exception.php +++ b/library/Zend/Cloud/DocumentService/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ require_once 'Zend/Cloud/Exception.php'; * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_DocumentService_Exception extends Zend_Cloud_Exception diff --git a/library/Zend/Cloud/DocumentService/Factory.php b/library/Zend/Cloud/DocumentService/Factory.php index 569d920..8fa8c97 100644 --- a/library/Zend/Cloud/DocumentService/Factory.php +++ b/library/Zend/Cloud/DocumentService/Factory.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 @@ require_once 'Zend/Cloud/AbstractFactory.php'; * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_DocumentService_Factory extends Zend_Cloud_AbstractFactory diff --git a/library/Zend/Cloud/DocumentService/Query.php b/library/Zend/Cloud/DocumentService/Query.php index caa1659..dbeef9c 100644 --- a/library/Zend/Cloud/DocumentService/Query.php +++ b/library/Zend/Cloud/DocumentService/Query.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 @@ require_once 'Zend/Cloud/DocumentService/QueryAdapter.php'; * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_DocumentService_Query diff --git a/library/Zend/Cloud/DocumentService/QueryAdapter.php b/library/Zend/Cloud/DocumentService/QueryAdapter.php index cfb1c4f..54cf4d1 100644 --- a/library/Zend/Cloud/DocumentService/QueryAdapter.php +++ b/library/Zend/Cloud/DocumentService/QueryAdapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_DocumentService_QueryAdapter diff --git a/library/Zend/Cloud/Exception.php b/library/Zend/Cloud/Exception.php index cea503c..320ae98 100644 --- a/library/Zend/Cloud/Exception.php +++ b/library/Zend/Cloud/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_Exception extends Zend_Exception diff --git a/library/Zend/Cloud/Infrastructure/Adapter.php b/library/Zend/Cloud/Infrastructure/Adapter.php index b23c718..8260154 100644 --- a/library/Zend/Cloud/Infrastructure/Adapter.php +++ b/library/Zend/Cloud/Infrastructure/Adapter.php @@ -3,7 +3,7 @@ * @category Zend * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 @@ * * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_Infrastructure_Adapter diff --git a/library/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php b/library/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php index e412455..ea4c899 100644 --- a/library/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php +++ b/library/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage DocumentService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 +26,7 @@ require_once 'Zend/Cloud/Infrastructure/Instance.php'; * @category Zend * @package Zend_Cloud_Infrastructure * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Cloud_Infrastructure_Adapter_AbstractAdapter implements Zend_Cloud_Infrastructure_Adapter diff --git a/library/Zend/Cloud/Infrastructure/Adapter/Ec2.php b/library/Zend/Cloud/Infrastructure/Adapter/Ec2.php index 694bc11..854dd91 100644 --- a/library/Zend/Cloud/Infrastructure/Adapter/Ec2.php +++ b/library/Zend/Cloud/Infrastructure/Adapter/Ec2.php @@ -3,7 +3,7 @@ * @category Zend * @package Zend_Cloud_Infrastructure * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 +22,7 @@ require_once 'Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php'; * * @package Zend_Cloud_Infrastructure * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_Infrastructure_Adapter_Ec2 extends Zend_Cloud_Infrastructure_Adapter_AbstractAdapter diff --git a/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php b/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php index bf00427..61bab33 100644 --- a/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php +++ b/library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php @@ -3,7 +3,7 @@ * @category Zend * @package Zend_Cloud_Infrastructure * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 +19,7 @@ require_once 'Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php'; * * @package Zend_Cloud_Infrastructure * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_Infrastructure_Adapter_Rackspace extends Zend_Cloud_Infrastructure_Adapter_AbstractAdapter diff --git a/library/Zend/Cloud/Infrastructure/Exception.php b/library/Zend/Cloud/Infrastructure/Exception.php index a7e5da1..87abcdc 100644 --- a/library/Zend/Cloud/Infrastructure/Exception.php +++ b/library/Zend/Cloud/Infrastructure/Exception.php @@ -5,7 +5,7 @@ * @category Zend * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 @@ require_once 'Zend/Cloud/Exception.php'; * @category Zend * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_Infrastructure_Exception extends Zend_Cloud_Exception diff --git a/library/Zend/Cloud/Infrastructure/Factory.php b/library/Zend/Cloud/Infrastructure/Factory.php index f0f5389..1d24b19 100644 --- a/library/Zend/Cloud/Infrastructure/Factory.php +++ b/library/Zend/Cloud/Infrastructure/Factory.php @@ -3,7 +3,7 @@ * @category Zend * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 @@ require_once 'Zend/Cloud/AbstractFactory.php'; * * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_Infrastructure_Factory extends Zend_Cloud_AbstractFactory diff --git a/library/Zend/Cloud/Infrastructure/Image.php b/library/Zend/Cloud/Infrastructure/Image.php index 6694fdd..62a7719 100644 --- a/library/Zend/Cloud/Infrastructure/Image.php +++ b/library/Zend/Cloud/Infrastructure/Image.php @@ -3,7 +3,7 @@ * @category Zend * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 @@ * * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_Infrastructure_Image diff --git a/library/Zend/Cloud/Infrastructure/ImageList.php b/library/Zend/Cloud/Infrastructure/ImageList.php index 7692bde..7fdec7f 100644 --- a/library/Zend/Cloud/Infrastructure/ImageList.php +++ b/library/Zend/Cloud/Infrastructure/ImageList.php @@ -3,7 +3,7 @@ * @category Zend * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 @@ require_once 'Zend/Cloud/Infrastructure/Image.php'; * * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_Infrastructure_ImageList implements Countable, Iterator, ArrayAccess diff --git a/library/Zend/Cloud/Infrastructure/Instance.php b/library/Zend/Cloud/Infrastructure/Instance.php index 6830925..06ba1c2 100644 --- a/library/Zend/Cloud/Infrastructure/Instance.php +++ b/library/Zend/Cloud/Infrastructure/Instance.php @@ -3,7 +3,7 @@ * @category Zend * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 @@ * * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_Infrastructure_Instance diff --git a/library/Zend/Cloud/Infrastructure/InstanceList.php b/library/Zend/Cloud/Infrastructure/InstanceList.php index 0cda88c..6739584 100644 --- a/library/Zend/Cloud/Infrastructure/InstanceList.php +++ b/library/Zend/Cloud/Infrastructure/InstanceList.php @@ -3,7 +3,7 @@ * @category Zend * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 @@ require_once 'Zend/Cloud/Infrastructure/Instance.php'; * * @package Zend_Cloud * @subpackage Infrastructure - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_Infrastructure_InstanceList implements Countable, Iterator, ArrayAccess diff --git a/library/Zend/Cloud/OperationNotAvailableException.php b/library/Zend/Cloud/OperationNotAvailableException.php index 18a1462..53697f0 100644 --- a/library/Zend/Cloud/OperationNotAvailableException.php +++ b/library/Zend/Cloud/OperationNotAvailableException.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 +26,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Cloud - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_OperationNotAvailableException extends Zend_Exception diff --git a/library/Zend/Cloud/QueueService/Adapter.php b/library/Zend/Cloud/QueueService/Adapter.php index d7757c8..4629daf 100644 --- a/library/Zend/Cloud/QueueService/Adapter.php +++ b/library/Zend/Cloud/QueueService/Adapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 +31,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_QueueService_Adapter diff --git a/library/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php b/library/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php index 43711d4..8b41384 100644 --- a/library/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php +++ b/library/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 @@ require_once 'Zend/Cloud/QueueService/MessageSet.php'; * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Cloud_QueueService_Adapter_AbstractAdapter diff --git a/library/Zend/Cloud/QueueService/Adapter/Sqs.php b/library/Zend/Cloud/QueueService/Adapter/Sqs.php index 13d05d3..2240961 100644 --- a/library/Zend/Cloud/QueueService/Adapter/Sqs.php +++ b/library/Zend/Cloud/QueueService/Adapter/Sqs.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 @@ require_once 'Zend/Cloud/QueueService/Message.php'; * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_QueueService_Adapter_Sqs @@ -118,7 +118,7 @@ class Zend_Cloud_QueueService_Adapter_Sqs try { return $this->_sqs->delete($queueId); } catch(Zend_Service_Amazon_Exception $e) { - throw Zend_Cloud_QueueService_Exception('Error on queue deletion: '.$e->getMessage(), $e->getCode(), $e); + throw new Zend_Cloud_QueueService_Exception('Error on queue deletion: '.$e->getMessage(), $e->getCode(), $e); } } diff --git a/library/Zend/Cloud/QueueService/Adapter/WindowsAzure.php b/library/Zend/Cloud/QueueService/Adapter/WindowsAzure.php index 3654a96..65b8bc9 100644 --- a/library/Zend/Cloud/QueueService/Adapter/WindowsAzure.php +++ b/library/Zend/Cloud/QueueService/Adapter/WindowsAzure.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ require_once 'Zend/Service/WindowsAzure/Storage/Queue.php'; * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_QueueService_Adapter_WindowsAzure diff --git a/library/Zend/Cloud/QueueService/Adapter/ZendQueue.php b/library/Zend/Cloud/QueueService/Adapter/ZendQueue.php index 5349775..391d4cf 100644 --- a/library/Zend/Cloud/QueueService/Adapter/ZendQueue.php +++ b/library/Zend/Cloud/QueueService/Adapter/ZendQueue.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ require_once 'Zend/Queue.php'; * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_QueueService_Adapter_ZendQueue diff --git a/library/Zend/Cloud/QueueService/Exception.php b/library/Zend/Cloud/QueueService/Exception.php index 1e8b9a3..f4b6a43 100644 --- a/library/Zend/Cloud/QueueService/Exception.php +++ b/library/Zend/Cloud/QueueService/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ require_once 'Zend/Cloud/Exception.php'; * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_QueueService_Exception extends Zend_Cloud_Exception diff --git a/library/Zend/Cloud/QueueService/Factory.php b/library/Zend/Cloud/QueueService/Factory.php index 0bf77e6..a6996f5 100644 --- a/library/Zend/Cloud/QueueService/Factory.php +++ b/library/Zend/Cloud/QueueService/Factory.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 +25,7 @@ require_once 'Zend/Cloud/AbstractFactory.php'; * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_QueueService_Factory extends Zend_Cloud_AbstractFactory diff --git a/library/Zend/Cloud/QueueService/Message.php b/library/Zend/Cloud/QueueService/Message.php index eddbb6e..4d4ca28 100644 --- a/library/Zend/Cloud/QueueService/Message.php +++ b/library/Zend/Cloud/QueueService/Message.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_QueueService_Message diff --git a/library/Zend/Cloud/QueueService/MessageSet.php b/library/Zend/Cloud/QueueService/MessageSet.php index f622680..20765b3 100644 --- a/library/Zend/Cloud/QueueService/MessageSet.php +++ b/library/Zend/Cloud/QueueService/MessageSet.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Cloud * @subpackage QueueService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_QueueService_MessageSet implements Countable, IteratorAggregate diff --git a/library/Zend/Cloud/StorageService/Adapter.php b/library/Zend/Cloud/StorageService/Adapter.php index e06d119..c64cca3 100644 --- a/library/Zend/Cloud/StorageService/Adapter.php +++ b/library/Zend/Cloud/StorageService/Adapter.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_StorageService_Adapter diff --git a/library/Zend/Cloud/StorageService/Adapter/FileSystem.php b/library/Zend/Cloud/StorageService/Adapter/FileSystem.php index f773e1f..d77e995 100644 --- a/library/Zend/Cloud/StorageService/Adapter/FileSystem.php +++ b/library/Zend/Cloud/StorageService/Adapter/FileSystem.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 +26,7 @@ require_once 'Zend/Cloud/StorageService/Exception.php'; * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_StorageService_Adapter_FileSystem implements Zend_Cloud_StorageService_Adapter diff --git a/library/Zend/Cloud/StorageService/Adapter/Rackspace.php b/library/Zend/Cloud/StorageService/Adapter/Rackspace.php index 1f65841..c0c2041 100644 --- a/library/Zend/Cloud/StorageService/Adapter/Rackspace.php +++ b/library/Zend/Cloud/StorageService/Adapter/Rackspace.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud_StorageService * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 @@ require_once 'Zend/Service/Rackspace/Exception.php'; * @category Zend * @package Zend_Cloud_StorageService * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_StorageService_Adapter_Rackspace diff --git a/library/Zend/Cloud/StorageService/Adapter/S3.php b/library/Zend/Cloud/StorageService/Adapter/S3.php index c39b6c5..5a8cb80 100644 --- a/library/Zend/Cloud/StorageService/Adapter/S3.php +++ b/library/Zend/Cloud/StorageService/Adapter/S3.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ require_once 'Zend/Cloud/StorageService/Exception.php'; * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_StorageService_Adapter_S3 diff --git a/library/Zend/Cloud/StorageService/Adapter/WindowsAzure.php b/library/Zend/Cloud/StorageService/Adapter/WindowsAzure.php index 05ac6ba..c1ea701 100644 --- a/library/Zend/Cloud/StorageService/Adapter/WindowsAzure.php +++ b/library/Zend/Cloud/StorageService/Adapter/WindowsAzure.php @@ -13,7 +13,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 @@ require_once 'Zend/Cloud/StorageService/Exception.php'; * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_StorageService_Adapter_WindowsAzure diff --git a/library/Zend/Cloud/StorageService/Exception.php b/library/Zend/Cloud/StorageService/Exception.php index 30ea7aa..2c5aff8 100644 --- a/library/Zend/Cloud/StorageService/Exception.php +++ b/library/Zend/Cloud/StorageService/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ require_once 'Zend/Cloud/Exception.php'; * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_StorageService_Exception extends Zend_Cloud_Exception diff --git a/library/Zend/Cloud/StorageService/Factory.php b/library/Zend/Cloud/StorageService/Factory.php index 98cfa4c..052a13b 100644 --- a/library/Zend/Cloud/StorageService/Factory.php +++ b/library/Zend/Cloud/StorageService/Factory.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,7 +25,7 @@ require_once 'Zend/Cloud/AbstractFactory.php'; * @category Zend * @package Zend_Cloud * @subpackage StorageService - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Cloud_StorageService_Factory extends Zend_Cloud_AbstractFactory diff --git a/library/Zend/CodeGenerator/Abstract.php b/library/Zend/CodeGenerator/Abstract.php index 4b92bdd..3e8aa55 100644 --- a/library/Zend/CodeGenerator/Abstract.php +++ b/library/Zend/CodeGenerator/Abstract.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_CodeGenerator_Abstract diff --git a/library/Zend/CodeGenerator/Exception.php b/library/Zend/CodeGenerator/Exception.php index 872790c..bbd98a8 100644 --- a/library/Zend/CodeGenerator/Exception.php +++ b/library/Zend/CodeGenerator/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,8 +28,8 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Exception extends Zend_Exception -{} \ No newline at end of file +{} diff --git a/library/Zend/CodeGenerator/Php/Abstract.php b/library/Zend/CodeGenerator/Php/Abstract.php index 485ea9f..274e1b1 100644 --- a/library/Zend/CodeGenerator/Php/Abstract.php +++ b/library/Zend/CodeGenerator/Php/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/CodeGenerator/Abstract.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_CodeGenerator_Php_Abstract extends Zend_CodeGenerator_Abstract diff --git a/library/Zend/CodeGenerator/Php/Body.php b/library/Zend/CodeGenerator/Php/Body.php index 71e5d56..9078adb 100644 --- a/library/Zend/CodeGenerator/Php/Body.php +++ b/library/Zend/CodeGenerator/Php/Body.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Body.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/CodeGenerator/Abstract.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Body extends Zend_CodeGenerator_Abstract diff --git a/library/Zend/CodeGenerator/Php/Class.php b/library/Zend/CodeGenerator/Php/Class.php index beeed63..523284a 100644 --- a/library/Zend/CodeGenerator/Php/Class.php +++ b/library/Zend/CodeGenerator/Php/Class.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Class.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -48,7 +48,7 @@ require_once 'Zend/CodeGenerator/Php/Docblock.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract diff --git a/library/Zend/CodeGenerator/Php/Docblock.php b/library/Zend/CodeGenerator/Php/Docblock.php index 6c0b16e..2822ffd 100644 --- a/library/Zend/CodeGenerator/Php/Docblock.php +++ b/library/Zend/CodeGenerator/Php/Docblock.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Docblock.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract @@ -206,10 +206,11 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract */ protected function _docCommentize($content) { - $indent = $this->getIndentation(); - $output = $indent . '/**' . self::LINE_FEED; + $indent = $this->getIndentation(); + $output = $indent . '/**' . self::LINE_FEED; $content = wordwrap($content, 80, self::LINE_FEED); - $lines = explode(self::LINE_FEED, $content); + $lines = explode(self::LINE_FEED, $content); + foreach ($lines as $line) { $output .= $indent . ' *'; if ($line) { @@ -217,8 +218,10 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract } $output .= self::LINE_FEED; } + + $output = rtrim($output, ' *' . self::LINE_FEED) . self::LINE_FEED; + $output .= $indent . ' */' . self::LINE_FEED; return $output; } - } diff --git a/library/Zend/CodeGenerator/Php/Docblock/Tag.php b/library/Zend/CodeGenerator/Php/Docblock/Tag.php index bea6d16..72f0180 100644 --- a/library/Zend/CodeGenerator/Php/Docblock/Tag.php +++ b/library/Zend/CodeGenerator/Php/Docblock/Tag.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Tag.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/CodeGenerator/Php/Abstract.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstract diff --git a/library/Zend/CodeGenerator/Php/Docblock/Tag/License.php b/library/Zend/CodeGenerator/Php/Docblock/Tag/License.php index 3dfb77e..0a52787 100644 --- a/library/Zend/CodeGenerator/Php/Docblock/Tag/License.php +++ b/library/Zend/CodeGenerator/Php/Docblock/Tag/License.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: License.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Docblock_Tag_License extends Zend_CodeGenerator_Php_Docblock_Tag @@ -95,4 +95,4 @@ class Zend_CodeGenerator_Php_Docblock_Tag_License extends Zend_CodeGenerator_Php return $output; } -} \ No newline at end of file +} diff --git a/library/Zend/CodeGenerator/Php/Docblock/Tag/Param.php b/library/Zend/CodeGenerator/Php/Docblock/Tag/Param.php index d1f8e67..c964e1b 100644 --- a/library/Zend/CodeGenerator/Php/Docblock/Tag/Param.php +++ b/library/Zend/CodeGenerator/Php/Docblock/Tag/Param.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Param.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Docblock_Tag_Param extends Zend_CodeGenerator_Php_Docblock_Tag diff --git a/library/Zend/CodeGenerator/Php/Docblock/Tag/Return.php b/library/Zend/CodeGenerator/Php/Docblock/Tag/Return.php index 2cbf0fa..949c52c 100644 --- a/library/Zend/CodeGenerator/Php/Docblock/Tag/Return.php +++ b/library/Zend/CodeGenerator/Php/Docblock/Tag/Return.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Return.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Docblock_Tag_Return extends Zend_CodeGenerator_Php_Docblock_Tag @@ -95,4 +95,4 @@ class Zend_CodeGenerator_Php_Docblock_Tag_Return extends Zend_CodeGenerator_Php_ return $output; } -} \ No newline at end of file +} diff --git a/library/Zend/CodeGenerator/Php/Exception.php b/library/Zend/CodeGenerator/Php/Exception.php index 65f0db9..4509069 100644 --- a/library/Zend/CodeGenerator/Php/Exception.php +++ b/library/Zend/CodeGenerator/Php/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/CodeGenerator/Exception.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Exception extends Zend_CodeGenerator_Exception diff --git a/library/Zend/CodeGenerator/Php/File.php b/library/Zend/CodeGenerator/Php/File.php index 9ae0c88..fa237ed 100644 --- a/library/Zend/CodeGenerator/Php/File.php +++ b/library/Zend/CodeGenerator/Php/File.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/CodeGenerator/Php/Class.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract diff --git a/library/Zend/CodeGenerator/Php/Member/Abstract.php b/library/Zend/CodeGenerator/Php/Member/Abstract.php index 52b2f83..0456fc6 100644 --- a/library/Zend/CodeGenerator/Php/Member/Abstract.php +++ b/library/Zend/CodeGenerator/Php/Member/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/CodeGenerator/Php/Docblock.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator_Php_Abstract diff --git a/library/Zend/CodeGenerator/Php/Member/Container.php b/library/Zend/CodeGenerator/Php/Member/Container.php index 944f6e1..7658ae1 100644 --- a/library/Zend/CodeGenerator/Php/Member/Container.php +++ b/library/Zend/CodeGenerator/Php/Member/Container.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Container.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Member_Container extends ArrayObject @@ -52,4 +52,4 @@ class Zend_CodeGenerator_Php_Member_Container extends ArrayObject parent::__construct(array(), self::ARRAY_AS_PROPS); } -} \ No newline at end of file +} diff --git a/library/Zend/CodeGenerator/Php/Method.php b/library/Zend/CodeGenerator/Php/Method.php index 2ff4468..6580eb9 100644 --- a/library/Zend/CodeGenerator/Php/Method.php +++ b/library/Zend/CodeGenerator/Php/Method.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Method.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -38,7 +38,7 @@ require_once 'Zend/CodeGenerator/Php/Parameter.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstract diff --git a/library/Zend/CodeGenerator/Php/Parameter.php b/library/Zend/CodeGenerator/Php/Parameter.php index 1dc80f3..0f61e77 100644 --- a/library/Zend/CodeGenerator/Php/Parameter.php +++ b/library/Zend/CodeGenerator/Php/Parameter.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Parameter.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/CodeGenerator/Php/Parameter/DefaultValue.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract @@ -247,4 +247,4 @@ class Zend_CodeGenerator_Php_Parameter extends Zend_CodeGenerator_Php_Abstract return $output; } -} \ No newline at end of file +} diff --git a/library/Zend/CodeGenerator/Php/Parameter/DefaultValue.php b/library/Zend/CodeGenerator/Php/Parameter/DefaultValue.php index a8708cb..17291b6 100644 --- a/library/Zend/CodeGenerator/Php/Parameter/DefaultValue.php +++ b/library/Zend/CodeGenerator/Php/Parameter/DefaultValue.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage Php - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DefaultValue.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage Php - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Parameter_DefaultValue @@ -57,4 +57,4 @@ class Zend_CodeGenerator_Php_Parameter_DefaultValue { return $this->_defaultValue; } -} \ No newline at end of file +} diff --git a/library/Zend/CodeGenerator/Php/Property.php b/library/Zend/CodeGenerator/Php/Property.php index 3dc7f3b..cdaf326 100644 --- a/library/Zend/CodeGenerator/Php/Property.php +++ b/library/Zend/CodeGenerator/Php/Property.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Property.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/CodeGenerator/Php/Property/DefaultValue.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abstract diff --git a/library/Zend/CodeGenerator/Php/Property/DefaultValue.php b/library/Zend/CodeGenerator/Php/Property/DefaultValue.php index 82d85ed..9393412 100644 --- a/library/Zend/CodeGenerator/Php/Property/DefaultValue.php +++ b/library/Zend/CodeGenerator/Php/Property/DefaultValue.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_CodeGenerator * @subpackage PHP - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DefaultValue.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/CodeGenerator/Php/Abstract.php'; /** * @category Zend * @package Zend_CodeGenerator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Php_Abstract diff --git a/library/Zend/Config.php b/library/Zend/Config.php index a977845..4d26a53 100644 --- a/library/Zend/Config.php +++ b/library/Zend/Config.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Config.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Config implements Countable, Iterator @@ -444,7 +444,7 @@ class Zend_Config implements Countable, Iterator * @param string $errfile * @param integer $errline */ - protected function _loadFileErrorHandler($errno, $errstr, $errfile, $errline) + public function _loadFileErrorHandler($errno, $errstr, $errfile, $errline) { if ($this->_loadFileErrorStr === null) { $this->_loadFileErrorStr = $errstr; @@ -481,4 +481,4 @@ class Zend_Config implements Countable, Iterator return $firstArray; } -} \ No newline at end of file +} diff --git a/library/Zend/Config/Exception.php b/library/Zend/Config/Exception.php index c3a3b34..06e47c1 100644 --- a/library/Zend/Config/Exception.php +++ b/library/Zend/Config/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -27,7 +27,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Config_Exception extends Zend_Exception {} diff --git a/library/Zend/Config/Ini.php b/library/Zend/Config/Ini.php index 72cb676..f9ea903 100644 --- a/library/Zend/Config/Ini.php +++ b/library/Zend/Config/Ini.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ini.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Config.php'; /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Config_Ini extends Zend_Config diff --git a/library/Zend/Config/Json.php b/library/Zend/Config/Json.php index ee9924f..2c31fdc 100644 --- a/library/Zend/Config/Json.php +++ b/library/Zend/Config/Json.php @@ -16,7 +16,7 @@ * @package Zend_Config * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 24810 2012-05-17 21:20:12Z rob $ + * @version $Id$ */ /** @@ -128,9 +128,9 @@ class Zend_Config_Json extends Zend_Config } // Parse/decode - $config = Zend_Json::decode($json); - - if (null === $config) { + try { + $config = Zend_Json::decode($json); + } catch (Zend_Json_Exception $e) { // decode failed require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Error parsing JSON data"); diff --git a/library/Zend/Config/Writer.php b/library/Zend/Config/Writer.php index 20bd078..6bbf4c6 100644 --- a/library/Zend/Config/Writer.php +++ b/library/Zend/Config/Writer.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Writer.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id$ */ /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Config_Writer diff --git a/library/Zend/Config/Writer/Array.php b/library/Zend/Config/Writer/Array.php index c98c004..067a582 100644 --- a/library/Zend/Config/Writer/Array.php +++ b/library/Zend/Config/Writer/Array.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Array.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -27,7 +27,7 @@ require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Config_Writer_Array extends Zend_Config_Writer_FileAbstract diff --git a/library/Zend/Config/Writer/FileAbstract.php b/library/Zend/Config/Writer/FileAbstract.php index af4ae90..12d3c36 100644 --- a/library/Zend/Config/Writer/FileAbstract.php +++ b/library/Zend/Config/Writer/FileAbstract.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Config * @package Writer - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +26,9 @@ require_once "Zend/Config/Writer.php"; * * @category Zend * @package Zend_package - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FileAbstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Config_Writer_FileAbstract extends Zend_Config_Writer { @@ -131,4 +131,4 @@ class Zend_Config_Writer_FileAbstract extends Zend_Config_Writer { return ""; } -} \ No newline at end of file +} diff --git a/library/Zend/Config/Writer/Ini.php b/library/Zend/Config/Writer/Ini.php index f2e5a78..e90b935 100644 --- a/library/Zend/Config/Writer/Ini.php +++ b/library/Zend/Config/Writer/Ini.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ini.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -27,7 +27,7 @@ require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Config_Writer_Ini extends Zend_Config_Writer_FileAbstract diff --git a/library/Zend/Config/Writer/Json.php b/library/Zend/Config/Writer/Json.php index d05557f..25da4a9 100644 --- a/library/Zend/Config/Writer/Json.php +++ b/library/Zend/Config/Writer/Json.php @@ -16,7 +16,7 @@ * @package Zend_Config * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 23293 2010-11-04 23:40:23Z ramon $ + * @version $Id$ */ /** diff --git a/library/Zend/Config/Writer/Xml.php b/library/Zend/Config/Writer/Xml.php index 82463c1..75c49a9 100644 --- a/library/Zend/Config/Writer/Xml.php +++ b/library/Zend/Config/Writer/Xml.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Config/Xml.php'; /** * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Config_Writer_Xml extends Zend_Config_Writer_FileAbstract diff --git a/library/Zend/Config/Writer/Yaml.php b/library/Zend/Config/Writer/Yaml.php index 9d7305c..4d2b1fe 100644 --- a/library/Zend/Config/Writer/Yaml.php +++ b/library/Zend/Config/Writer/Yaml.php @@ -16,7 +16,7 @@ * @package Zend_Config * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Yaml.php 23650 2011-01-21 21:32:57Z mikaelkael $ + * @version $Id$ */ /** diff --git a/library/Zend/Config/Xml.php b/library/Zend/Config/Xml.php index 2a2f066..93797b2 100644 --- a/library/Zend/Config/Xml.php +++ b/library/Zend/Config/Xml.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Xml.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -24,12 +24,18 @@ */ require_once 'Zend/Config.php'; +/** @see Zend_Xml_Security */ +require_once 'Zend/Xml/Security.php'; + +/** @see Zend_Xml_Exception */ +require_once 'Zend/Xml/Exception.php'; + /** * XML Adapter for Zend_Config * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Config_Xml extends Zend_Config @@ -96,9 +102,21 @@ class Zend_Config_Xml extends Zend_Config set_error_handler(array($this, '_loadFileErrorHandler')); // Warnings and errors are suppressed if (strstr($xml, 'getMessage() + ); + } } restore_error_handler(); diff --git a/library/Zend/Config/Yaml.php b/library/Zend/Config/Yaml.php index dea099d..1dc97aa 100644 --- a/library/Zend/Config/Yaml.php +++ b/library/Zend/Config/Yaml.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Yaml.php 25169 2012-12-22 12:23:11Z rob $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Config.php'; * * @category Zend * @package Zend_Config - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Config_Yaml extends Zend_Config diff --git a/library/Zend/Console/Getopt.php b/library/Zend/Console/Getopt.php index cd63dff..20a5366 100644 --- a/library/Zend/Console/Getopt.php +++ b/library/Zend/Console/Getopt.php @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Getopt.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -80,7 +80,7 @@ * * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version Release: @package_version@ * @since Class available since Release 0.6.0 diff --git a/library/Zend/Console/Getopt/Exception.php b/library/Zend/Console/Getopt/Exception.php index 5d07de7..33f198c 100644 --- a/library/Zend/Console/Getopt/Exception.php +++ b/library/Zend/Console/Getopt/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Console_Getopt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Console_Getopt_Exception extends Zend_Exception diff --git a/library/Zend/Controller/Action.php b/library/Zend/Controller/Action.php index 5da5226..2de7fbb 100644 --- a/library/Zend/Controller/Action.php +++ b/library/Zend/Controller/Action.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Action.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -37,7 +37,7 @@ require_once 'Zend/Controller/Front.php'; /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Action implements Zend_Controller_Action_Interface diff --git a/library/Zend/Controller/Action/Exception.php b/library/Zend/Controller/Action/Exception.php index 83dda99..6d91266 100644 --- a/library/Zend/Controller/Action/Exception.php +++ b/library/Zend/Controller/Action/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Controller/Exception.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Exception extends Zend_Controller_Exception diff --git a/library/Zend/Controller/Action/Helper/Abstract.php b/library/Zend/Controller/Action/Helper/Abstract.php index b9e070b..ca51fe4 100644 --- a/library/Zend/Controller/Action/Helper/Abstract.php +++ b/library/Zend/Controller/Action/Helper/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Controller/Action.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Action_Helper_Abstract diff --git a/library/Zend/Controller/Action/Helper/ActionStack.php b/library/Zend/Controller/Action/Helper/ActionStack.php index 75d02f4..b5ca6f7 100644 --- a/library/Zend/Controller/Action/Helper/ActionStack.php +++ b/library/Zend/Controller/Action/Helper/ActionStack.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActionStack.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Controller/Action/Helper/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_Helper_Abstract diff --git a/library/Zend/Controller/Action/Helper/AjaxContext.php b/library/Zend/Controller/Action/Helper/AjaxContext.php index 83e1e92..a667452 100644 --- a/library/Zend/Controller/Action/Helper/AjaxContext.php +++ b/library/Zend/Controller/Action/Helper/AjaxContext.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AjaxContext.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Controller/Action/Helper/ContextSwitch.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_Helper_ContextSwitch diff --git a/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php b/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php index eb3b857..497511e 100644 --- a/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php +++ b/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Controller/Action/Helper/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_Controller_Action_Helper_Abstract diff --git a/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php b/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php index e689b01..629b3a3 100644 --- a/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php +++ b/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AutoCompleteDojo.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Action_Helper_AutoComplete_Abstract diff --git a/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php b/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php index 0243e17..a6ecbf8 100644 --- a/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php +++ b/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AutoCompleteScriptaculous.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Controller_Action_Helper_AutoComplete_Abstract diff --git a/library/Zend/Controller/Action/Helper/Cache.php b/library/Zend/Controller/Action/Helper/Cache.php index 8199ff7..3611e0b 100644 --- a/library/Zend/Controller/Action/Helper/Cache.php +++ b/library/Zend/Controller/Action/Helper/Cache.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cache.php 24853 2012-05-31 23:19:27Z adamlundrigan $ + * @version $Id$ */ /** @@ -37,7 +37,7 @@ require_once 'Zend/Cache/Manager.php'; /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Helper_Cache diff --git a/library/Zend/Controller/Action/Helper/ContextSwitch.php b/library/Zend/Controller/Action/Helper/ContextSwitch.php index 2940a2b..358eb35 100644 --- a/library/Zend/Controller/Action/Helper/ContextSwitch.php +++ b/library/Zend/Controller/Action/Helper/ContextSwitch.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContextSwitch.php 24864 2012-06-02 00:51:50Z adamlundrigan $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Controller/Action/Helper/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action_Helper_Abstract diff --git a/library/Zend/Controller/Action/Helper/FlashMessenger.php b/library/Zend/Controller/Action/Helper/FlashMessenger.php index 8ce3807..fdfb579 100644 --- a/library/Zend/Controller/Action/Helper/FlashMessenger.php +++ b/library/Zend/Controller/Action/Helper/FlashMessenger.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +36,9 @@ require_once 'Zend/Controller/Action/Helper/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FlashMessenger.php 24813 2012-05-22 16:49:24Z adamlundrigan $ + * @version $Id$ */ class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Action_Helper_Abstract implements IteratorAggregate, Countable { @@ -150,7 +150,7 @@ class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Actio self::$_session->setExpirationHops(1, null, true); } - if (!is_array(self::$_session->{$this->_namespace})) { + if (!is_array(self::$_session->{$namespace})) { self::$_session->{$namespace} = array(); } @@ -256,7 +256,7 @@ class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Actio $namespace = $this->getNamespace(); } - if ($this->hasCurrentMessages()) { + if ($this->hasCurrentMessages($namespace)) { unset(self::$_session->{$namespace}); return true; } diff --git a/library/Zend/Controller/Action/Helper/Json.php b/library/Zend/Controller/Action/Helper/Json.php index 0615d75..b6312cf 100644 --- a/library/Zend/Controller/Action/Helper/Json.php +++ b/library/Zend/Controller/Action/Helper/Json.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Json.php 24829 2012-05-30 12:31:39Z adamlundrigan $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Controller/Action/Helper/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Helper_Json extends Zend_Controller_Action_Helper_Abstract diff --git a/library/Zend/Controller/Action/Helper/Redirector.php b/library/Zend/Controller/Action/Helper/Redirector.php index 0b5a670..9a43476 100644 --- a/library/Zend/Controller/Action/Helper/Redirector.php +++ b/library/Zend/Controller/Action/Helper/Redirector.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Redirector.php 24843 2012-05-31 18:43:18Z rob $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Controller/Action/Helper/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_Helper_Abstract diff --git a/library/Zend/Controller/Action/Helper/Url.php b/library/Zend/Controller/Action/Helper/Url.php index 96193ec..a083f49 100644 --- a/library/Zend/Controller/Action/Helper/Url.php +++ b/library/Zend/Controller/Action/Helper/Url.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Url.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -32,7 +32,7 @@ require_once 'Zend/Controller/Action/Helper/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Helper_Url extends Zend_Controller_Action_Helper_Abstract diff --git a/library/Zend/Controller/Action/Helper/ViewRenderer.php b/library/Zend/Controller/Action/Helper/ViewRenderer.php index a8ca52f..068d3c7 100644 --- a/library/Zend/Controller/Action/Helper/ViewRenderer.php +++ b/library/Zend/Controller/Action/Helper/ViewRenderer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ViewRenderer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -68,7 +68,7 @@ require_once 'Zend/View.php'; * @uses Zend_Controller_Action_Helper_Abstract * @package Zend_Controller * @subpackage Zend_Controller_Action_Helper - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_Helper_Abstract diff --git a/library/Zend/Controller/Action/HelperBroker.php b/library/Zend/Controller/Action/HelperBroker.php index 8868768..c232d0d 100644 --- a/library/Zend/Controller/Action/HelperBroker.php +++ b/library/Zend/Controller/Action/HelperBroker.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HelperBroker.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -34,7 +34,7 @@ require_once 'Zend/Loader.php'; * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_HelperBroker diff --git a/library/Zend/Controller/Action/HelperBroker/PriorityStack.php b/library/Zend/Controller/Action/HelperBroker/PriorityStack.php index aba21aa..2d1b4cb 100644 --- a/library/Zend/Controller/Action/HelperBroker/PriorityStack.php +++ b/library/Zend/Controller/Action/HelperBroker/PriorityStack.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PriorityStack.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggregate, ArrayAccess, Countable diff --git a/library/Zend/Controller/Action/Interface.php b/library/Zend/Controller/Action/Interface.php index 871390c..a69cfac 100644 --- a/library/Zend/Controller/Action/Interface.php +++ b/library/Zend/Controller/Action/Interface.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Action - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Action_Interface diff --git a/library/Zend/Controller/Dispatcher/Abstract.php b/library/Zend/Controller/Dispatcher/Abstract.php index 48a6187..0eb3f5b 100644 --- a/library/Zend/Controller/Dispatcher/Abstract.php +++ b/library/Zend/Controller/Dispatcher/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Controller_Dispatcher_Interface */ @@ -27,7 +27,7 @@ require_once 'Zend/Controller/Dispatcher/Interface.php'; * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Dispatcher_Abstract implements Zend_Controller_Dispatcher_Interface diff --git a/library/Zend/Controller/Dispatcher/Exception.php b/library/Zend/Controller/Dispatcher/Exception.php index 64140ce..96a9d4d 100644 --- a/library/Zend/Controller/Dispatcher/Exception.php +++ b/library/Zend/Controller/Dispatcher/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Controller/Exception.php'; * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Dispatcher_Exception extends Zend_Controller_Exception diff --git a/library/Zend/Controller/Dispatcher/Interface.php b/library/Zend/Controller/Dispatcher/Interface.php index 929ede0..43215a5 100644 --- a/library/Zend/Controller/Dispatcher/Interface.php +++ b/library/Zend/Controller/Dispatcher/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Controller/Response/Abstract.php'; /** * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Dispatcher_Interface diff --git a/library/Zend/Controller/Dispatcher/Standard.php b/library/Zend/Controller/Dispatcher/Standard.php index fe6597e..e211029 100644 --- a/library/Zend/Controller/Dispatcher/Standard.php +++ b/library/Zend/Controller/Dispatcher/Standard.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Standard.php 24861 2012-06-01 23:40:13Z adamlundrigan $ + * @version $Id$ */ /** Zend_Loader */ @@ -30,7 +30,7 @@ require_once 'Zend/Controller/Dispatcher/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Dispatcher - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abstract diff --git a/library/Zend/Controller/Exception.php b/library/Zend/Controller/Exception.php index 03d8b77..88bcbc5 100644 --- a/library/Zend/Controller/Exception.php +++ b/library/Zend/Controller/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -27,7 +27,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Exception extends Zend_Exception diff --git a/library/Zend/Controller/Front.php b/library/Zend/Controller/Front.php index e231033..3cc11cf 100644 --- a/library/Zend/Controller/Front.php +++ b/library/Zend/Controller/Front.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Front.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Controller/Plugin/Broker.php'; /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Front diff --git a/library/Zend/Controller/Plugin/Abstract.php b/library/Zend/Controller/Plugin/Abstract.php index 46dfdca..71ca167 100644 --- a/library/Zend/Controller/Plugin/Abstract.php +++ b/library/Zend/Controller/Plugin/Abstract.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Plugin_Abstract diff --git a/library/Zend/Controller/Plugin/ActionStack.php b/library/Zend/Controller/Plugin/ActionStack.php index cf5a5ba..68a5cc7 100644 --- a/library/Zend/Controller/Plugin/ActionStack.php +++ b/library/Zend/Controller/Plugin/ActionStack.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,9 +32,9 @@ require_once 'Zend/Registry.php'; * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ActionStack.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract { diff --git a/library/Zend/Controller/Plugin/Broker.php b/library/Zend/Controller/Plugin/Broker.php index 34e43e2..b6c5d56 100644 --- a/library/Zend/Controller/Plugin/Broker.php +++ b/library/Zend/Controller/Plugin/Broker.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Broker.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Controller_Plugin_Abstract */ @@ -27,7 +27,7 @@ require_once 'Zend/Controller/Plugin/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract diff --git a/library/Zend/Controller/Plugin/ErrorHandler.php b/library/Zend/Controller/Plugin/ErrorHandler.php index ec5c785..2ea2627 100644 --- a/library/Zend/Controller/Plugin/ErrorHandler.php +++ b/library/Zend/Controller/Plugin/ErrorHandler.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ require_once 'Zend/Controller/Plugin/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Plugins - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ErrorHandler.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Controller_Plugin_ErrorHandler extends Zend_Controller_Plugin_Abstract { diff --git a/library/Zend/Controller/Plugin/PutHandler.php b/library/Zend/Controller/Plugin/PutHandler.php index f30c8f4..329d389 100644 --- a/library/Zend/Controller/Plugin/PutHandler.php +++ b/library/Zend/Controller/Plugin/PutHandler.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Zend_Controller_Plugin - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PutHandler.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id$ */ /** @@ -35,7 +35,7 @@ require_once 'Zend/Controller/Request/Http.php'; * * @package Zend_Controller * @subpackage Zend_Controller_Plugin - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Plugin_PutHandler extends Zend_Controller_Plugin_Abstract diff --git a/library/Zend/Controller/Request/Abstract.php b/library/Zend/Controller/Request/Abstract.php index 0e8c033..68a8bd7 100644 --- a/library/Zend/Controller/Request/Abstract.php +++ b/library/Zend/Controller/Request/Abstract.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Request_Abstract diff --git a/library/Zend/Controller/Request/Apache404.php b/library/Zend/Controller/Request/Apache404.php index 3bb3873..8c30bae 100644 --- a/library/Zend/Controller/Request/Apache404.php +++ b/library/Zend/Controller/Request/Apache404.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Apache404.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Controller_Request_Http */ diff --git a/library/Zend/Controller/Request/Exception.php b/library/Zend/Controller/Request/Exception.php index e2c26b7..97b4db1 100644 --- a/library/Zend/Controller/Request/Exception.php +++ b/library/Zend/Controller/Request/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Controller/Exception.php'; * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Request_Exception extends Zend_Controller_Exception diff --git a/library/Zend/Controller/Request/Http.php b/library/Zend/Controller/Request/Http.php index 80ad316..decfcb0 100644 --- a/library/Zend/Controller/Request/Http.php +++ b/library/Zend/Controller/Request/Http.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 24842 2012-05-31 18:31:28Z rob $ + * @version $Id$ */ /** @see Zend_Controller_Request_Abstract */ diff --git a/library/Zend/Controller/Request/HttpTestCase.php b/library/Zend/Controller/Request/HttpTestCase.php index 80ae00c..955b877 100644 --- a/library/Zend/Controller/Request/HttpTestCase.php +++ b/library/Zend/Controller/Request/HttpTestCase.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpTestCase.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** diff --git a/library/Zend/Controller/Request/Simple.php b/library/Zend/Controller/Request/Simple.php index 4d92a85..319a297 100644 --- a/library/Zend/Controller/Request/Simple.php +++ b/library/Zend/Controller/Request/Simple.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Simple.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Controller_Request_Abstract */ @@ -27,7 +27,7 @@ require_once 'Zend/Controller/Request/Abstract.php'; * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Request_Simple extends Zend_Controller_Request_Abstract diff --git a/library/Zend/Controller/Response/Abstract.php b/library/Zend/Controller/Response/Abstract.php index 393c231..4fc49ed 100644 --- a/library/Zend/Controller/Response/Abstract.php +++ b/library/Zend/Controller/Response/Abstract.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ * * @package Zend_Controller * @subpackage Response - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Response_Abstract diff --git a/library/Zend/Controller/Response/Cli.php b/library/Zend/Controller/Response/Cli.php index 10d7f05..389e925 100644 --- a/library/Zend/Controller/Response/Cli.php +++ b/library/Zend/Controller/Response/Cli.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cli.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Controller/Response/Abstract.php'; * @uses Zend_Controller_Response_Abstract * @package Zend_Controller * @subpackage Response - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Response_Cli extends Zend_Controller_Response_Abstract diff --git a/library/Zend/Controller/Response/Exception.php b/library/Zend/Controller/Response/Exception.php index 80923dd..e45f079 100644 --- a/library/Zend/Controller/Response/Exception.php +++ b/library/Zend/Controller/Response/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Request - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -28,7 +28,7 @@ require_once 'Zend/Controller/Exception.php'; /** * @package Zend_Controller * @subpackage Response - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Response_Exception extends Zend_Controller_Exception diff --git a/library/Zend/Controller/Response/Http.php b/library/Zend/Controller/Response/Http.php index 5231eea..487c8fb 100644 --- a/library/Zend/Controller/Response/Http.php +++ b/library/Zend/Controller/Response/Http.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Http.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ diff --git a/library/Zend/Controller/Response/HttpTestCase.php b/library/Zend/Controller/Response/HttpTestCase.php index 510128b..72905b4 100644 --- a/library/Zend/Controller/Response/HttpTestCase.php +++ b/library/Zend/Controller/Response/HttpTestCase.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HttpTestCase.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** diff --git a/library/Zend/Controller/Router/Abstract.php b/library/Zend/Controller/Router/Abstract.php index 9d52e1c..0bb9804 100644 --- a/library/Zend/Controller/Router/Abstract.php +++ b/library/Zend/Controller/Router/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Controller/Router/Interface.php'; * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Router_Abstract implements Zend_Controller_Router_Interface diff --git a/library/Zend/Controller/Router/Exception.php b/library/Zend/Controller/Router/Exception.php index 98cf556..b3d4cf7 100644 --- a/library/Zend/Controller/Router/Exception.php +++ b/library/Zend/Controller/Router/Exception.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ require_once 'Zend/Controller/Exception.php'; /** * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Router_Exception extends Zend_Controller_Exception diff --git a/library/Zend/Controller/Router/Interface.php b/library/Zend/Controller/Router/Interface.php index 8610038..8d6a98e 100644 --- a/library/Zend/Controller/Router/Interface.php +++ b/library/Zend/Controller/Router/Interface.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Router_Interface diff --git a/library/Zend/Controller/Router/Rewrite.php b/library/Zend/Controller/Router/Rewrite.php index ccd2465..2c58b1b 100644 --- a/library/Zend/Controller/Router/Rewrite.php +++ b/library/Zend/Controller/Router/Rewrite.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Rewrite.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ require_once 'Zend/Controller/Router/Route.php'; * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ diff --git a/library/Zend/Controller/Router/Route.php b/library/Zend/Controller/Router/Route.php index 61e740a..36d2c11 100644 --- a/library/Zend/Controller/Router/Route.php +++ b/library/Zend/Controller/Router/Route.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Route.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ require_once 'Zend/Controller/Router/Route/Abstract.php'; * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ diff --git a/library/Zend/Controller/Router/Route/Abstract.php b/library/Zend/Controller/Router/Route/Abstract.php index b63a508..53b8115 100644 --- a/library/Zend/Controller/Router/Route/Abstract.php +++ b/library/Zend/Controller/Router/Route/Abstract.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,7 +32,7 @@ require_once 'Zend/Controller/Router/Route/Interface.php'; * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_Router_Route_Interface diff --git a/library/Zend/Controller/Router/Route/Chain.php b/library/Zend/Controller/Router/Route/Chain.php index 806099e..126964b 100644 --- a/library/Zend/Controller/Router/Route/Chain.php +++ b/library/Zend/Controller/Router/Route/Chain.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Chain.php 25249 2013-02-06 09:54:24Z frosch $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ require_once 'Zend/Controller/Router/Route/Abstract.php'; * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Abstract @@ -213,4 +213,4 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab return $defaults; } -} \ No newline at end of file +} diff --git a/library/Zend/Controller/Router/Route/Hostname.php b/library/Zend/Controller/Router/Route/Hostname.php index 9199875..ad9fc98 100644 --- a/library/Zend/Controller/Router/Route/Hostname.php +++ b/library/Zend/Controller/Router/Route/Hostname.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Hostname.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ require_once 'Zend/Controller/Router/Route/Abstract.php'; * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ diff --git a/library/Zend/Controller/Router/Route/Interface.php b/library/Zend/Controller/Router/Route/Interface.php index 7221d59..237c7c8 100644 --- a/library/Zend/Controller/Router/Route/Interface.php +++ b/library/Zend/Controller/Router/Route/Interface.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,7 +26,7 @@ require_once 'Zend/Config.php'; /** * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Router_Route_Interface { diff --git a/library/Zend/Controller/Router/Route/Module.php b/library/Zend/Controller/Router/Route/Module.php index dec9f24..1c89699 100644 --- a/library/Zend/Controller/Router/Route/Module.php +++ b/library/Zend/Controller/Router/Route/Module.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Module.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ require_once 'Zend/Controller/Router/Route/Abstract.php'; * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://manuals.rubyonrails.com/read/chapter/65 */ diff --git a/library/Zend/Controller/Router/Route/Regex.php b/library/Zend/Controller/Router/Route/Regex.php index 32c5ef5..9a9c494 100644 --- a/library/Zend/Controller/Router/Route/Regex.php +++ b/library/Zend/Controller/Router/Route/Regex.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Regex.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ require_once 'Zend/Controller/Router/Route/Abstract.php'; * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Abstract diff --git a/library/Zend/Controller/Router/Route/Static.php b/library/Zend/Controller/Router/Route/Static.php index 6f2a23d..8029acb 100644 --- a/library/Zend/Controller/Router/Route/Static.php +++ b/library/Zend/Controller/Router/Route/Static.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Static.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ require_once 'Zend/Controller/Router/Route/Abstract.php'; * * @package Zend_Controller * @subpackage Router - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Controller_Router_Route_Static extends Zend_Controller_Router_Route_Abstract diff --git a/library/Zend/Crypt.php b/library/Zend/Crypt.php index 4ab68d2..c13453d 100644 --- a/library/Zend/Crypt.php +++ b/library/Zend/Crypt.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Crypt.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id$ */ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt diff --git a/library/Zend/Crypt/DiffieHellman.php b/library/Zend/Crypt/DiffieHellman.php index 373ebb0..820ebf7 100644 --- a/library/Zend/Crypt/DiffieHellman.php +++ b/library/Zend/Crypt/DiffieHellman.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage DiffieHellman - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DiffieHellman.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -27,7 +27,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_DiffieHellman @@ -102,7 +102,6 @@ class Zend_Crypt_DiffieHellman * @param string $generator * @param string $privateKey * @param string $privateKeyType - * @return void */ public function __construct($prime, $generator, $privateKey = null, $privateKeyType = self::NUMBER) { @@ -146,6 +145,7 @@ class Zend_Crypt_DiffieHellman * * @param string $number * @param string $type + * @throws Zend_Crypt_DiffieHellman_Exception * @return Zend_Crypt_DiffieHellman */ public function setPublicKey($number, $type = self::NUMBER) @@ -166,6 +166,7 @@ class Zend_Crypt_DiffieHellman * transaction. * * @param string $type + * @throws Zend_Crypt_DiffieHellman_Exception * @return string */ public function getPublicKey($type = self::NUMBER) @@ -195,6 +196,8 @@ class Zend_Crypt_DiffieHellman * * @param string $publicKey * @param string $type + * @param string $output + * @throws Zend_Crypt_DiffieHellman_Exception * @return mixed */ public function computeSecretKey($publicKey, $type = self::NUMBER, $output = self::NUMBER) @@ -218,6 +221,7 @@ class Zend_Crypt_DiffieHellman * Return the computed shared secret key from the DiffieHellman transaction * * @param string $type + * @throws Zend_Crypt_DiffieHellman_Exception * @return string */ public function getSharedSecretKey($type = self::NUMBER) @@ -238,6 +242,7 @@ class Zend_Crypt_DiffieHellman * Setter for the value of the prime number * * @param string $number + * @throws Zend_Crypt_DiffieHellman_Exception * @return Zend_Crypt_DiffieHellman */ public function setPrime($number) @@ -253,6 +258,7 @@ class Zend_Crypt_DiffieHellman /** * Getter for the value of the prime number * + * @throws Zend_Crypt_DiffieHellman_Exception * @return string */ public function getPrime() @@ -264,11 +270,11 @@ class Zend_Crypt_DiffieHellman return $this->_prime; } - /** * Setter for the value of the generator number * * @param string $number + * @throws Zend_Crypt_DiffieHellman_Exception * @return Zend_Crypt_DiffieHellman */ public function setGenerator($number) @@ -284,6 +290,7 @@ class Zend_Crypt_DiffieHellman /** * Getter for the value of the generator number * + * @throws Zend_Crypt_DiffieHellman_Exception * @return string */ public function getGenerator() @@ -300,6 +307,7 @@ class Zend_Crypt_DiffieHellman * * @param string $number * @param string $type + * @throws Zend_Crypt_DiffieHellman_Exception * @return Zend_Crypt_DiffieHellman */ public function setPrivateKey($number, $type = self::NUMBER) diff --git a/library/Zend/Crypt/DiffieHellman/Exception.php b/library/Zend/Crypt/DiffieHellman/Exception.php index 64180bf..de552ab 100644 --- a/library/Zend/Crypt/DiffieHellman/Exception.php +++ b/library/Zend/Crypt/DiffieHellman/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage DiffieHellman - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,9 +28,9 @@ require_once 'Zend/Crypt/Exception.php'; /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_DiffieHellman_Exception extends Zend_Crypt_Exception { -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Exception.php b/library/Zend/Crypt/Exception.php index 6840fc9..dfd0c5b 100644 --- a/library/Zend/Crypt/Exception.php +++ b/library/Zend/Crypt/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -27,9 +27,9 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Exception extends Zend_Exception { -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Hmac.php b/library/Zend/Crypt/Hmac.php index 65103f8..f73a84c 100644 --- a/library/Zend/Crypt/Hmac.php +++ b/library/Zend/Crypt/Hmac.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Hmac - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Hmac.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Crypt.php'; * @todo Check if mhash() is a required alternative (will be PECL-only soon) * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Hmac extends Zend_Crypt @@ -85,7 +85,7 @@ class Zend_Crypt_Hmac extends Zend_Crypt * @param string $hash * @param string $data * @param string $output - * @param boolean $internal + * @throws Zend_Crypt_Hmac_Exception * @return string */ public static function compute($key, $hash, $data, $output = self::STRING) @@ -108,6 +108,7 @@ class Zend_Crypt_Hmac extends Zend_Crypt * Setter for the hash method. * * @param string $hash + * @throws Zend_Crypt_Hmac_Exception * @return Zend_Crypt_Hmac */ protected static function _setHashAlgorithm($hash) @@ -147,7 +148,7 @@ class Zend_Crypt_Hmac extends Zend_Crypt { if (function_exists('hash_hmac')) { if ($output == self::BINARY) { - return hash_hmac(self::$_hashAlgorithm, $data, self::$_key, 1); + return hash_hmac(self::$_hashAlgorithm, $data, self::$_key, true); } return hash_hmac(self::$_hashAlgorithm, $data, self::$_key); } @@ -178,4 +179,4 @@ class Zend_Crypt_Hmac extends Zend_Crypt return $types[strtoupper($hashAlgorithm)]; } -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Hmac/Exception.php b/library/Zend/Crypt/Hmac/Exception.php index e8e0a09..3bb97ad 100644 --- a/library/Zend/Crypt/Hmac/Exception.php +++ b/library/Zend/Crypt/Hmac/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Hmac - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,9 +28,9 @@ require_once 'Zend/Crypt/Exception.php'; /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Hmac_Exception extends Zend_Crypt_Exception { -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Math.php b/library/Zend/Crypt/Math.php index 893b8ed..40395f5 100644 --- a/library/Zend/Crypt/Math.php +++ b/library/Zend/Crypt/Math.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Math.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/Crypt/Math/BigInteger.php'; /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Math extends Zend_Crypt_Math_BigInteger diff --git a/library/Zend/Crypt/Math/BigInteger.php b/library/Zend/Crypt/Math/BigInteger.php index 26dbaca..b7cd620 100644 --- a/library/Zend/Crypt/Math/BigInteger.php +++ b/library/Zend/Crypt/Math/BigInteger.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BigInteger.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -38,7 +38,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Math_BigInteger @@ -71,9 +71,10 @@ class Zend_Crypt_Math_BigInteger /** * Redirect all public method calls to the wrapped extension object. * - * @param string $methodName - * @param array $args - * @throws Zend_Crypt_Math_BigInteger_Exception + * @param string $methodName + * @param array $args + * @return mixed + * @throws Zend_Crypt_Math_BigInteger_Exception */ public function __call($methodName, $args) { @@ -114,4 +115,4 @@ class Zend_Crypt_Math_BigInteger } } -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Math/BigInteger/Bcmath.php b/library/Zend/Crypt/Math/BigInteger/Bcmath.php index e115d28..13d33c4 100644 --- a/library/Zend/Crypt/Math/BigInteger/Bcmath.php +++ b/library/Zend/Crypt/Math/BigInteger/Bcmath.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Bcmath.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Crypt/Math/BigInteger/Interface.php'; * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_Interface @@ -42,6 +42,7 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In /** * Initialise a big integer into an extension specific type. This is not * applicable to BCMath. + * * @param string $operand * @param int $base * @return string @@ -64,6 +65,8 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In } /** + * Subtract one arbitrary precision number from another + * * @param string $left_operand * @param string $right_operand * @return string @@ -77,6 +80,7 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In * Compare two big integers and returns result as an integer where 0 means * both are identical, 1 that left_operand is larger, or -1 that * right_operand is larger. + * * @param string $left_operand * @param string $right_operand * @return int @@ -89,6 +93,7 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In /** * Divide two big integers and return result or NULL if the denominator * is zero. + * * @param string $left_operand * @param string $right_operand * @return string|null @@ -99,8 +104,10 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In } /** + * Get modulus of an arbitrary precision number + * * @param string $left_operand - * @param string $right_operand + * @param string $modulus * @return string */ public function modulus($left_operand, $modulus) @@ -109,6 +116,8 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In } /** + * Multiply two arbitrary precision numbers + * * @param string $left_operand * @param string $right_operand * @return string @@ -119,6 +128,8 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In } /** + * Raise an arbitrary precision number to another + * * @param string $left_operand * @param string $right_operand * @return string @@ -129,8 +140,12 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In } /** + * Raise an arbitrary precision number to another, reduced by a specified + * modulus + * * @param string $left_operand * @param string $right_operand + * @param string $modulus * @return string */ public function powmod($left_operand, $right_operand, $modulus) @@ -139,8 +154,9 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In } /** - * @param string $left_operand - * @param string $right_operand + * Get the square root of an arbitrary precision number + * + * @param string $operand * @return string */ public function sqrt($operand) @@ -148,7 +164,10 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In return bcsqrt($operand); } - + /** + * @param string $operand + * @return string + */ public function binaryToInteger($operand) { $result = '0'; @@ -160,7 +179,10 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In return $result; } - + /** + * @param string $operand + * @return string + */ public function integerToBinary($operand) { $cmp = bccomp($operand, 0); @@ -188,7 +210,10 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In return $return; }**/ // Prior version for referenced offset - + /** + * @param string $operand + * @return string + */ public function hexToDecimal($operand) { $return = '0'; @@ -199,5 +224,4 @@ class Zend_Crypt_Math_BigInteger_Bcmath implements Zend_Crypt_Math_BigInteger_In } return $return; } - -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Math/BigInteger/Exception.php b/library/Zend/Crypt/Math/BigInteger/Exception.php index 67ee22d..6c4ef3b 100644 --- a/library/Zend/Crypt/Math/BigInteger/Exception.php +++ b/library/Zend/Crypt/Math/BigInteger/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,9 +28,9 @@ require_once 'Zend/Crypt/Math/Exception.php'; /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Math_BigInteger_Exception extends Zend_Crypt_Math_Exception { -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Math/BigInteger/Gmp.php b/library/Zend/Crypt/Math/BigInteger/Gmp.php index ea8ed9e..5c7c645 100644 --- a/library/Zend/Crypt/Math/BigInteger/Gmp.php +++ b/library/Zend/Crypt/Math/BigInteger/Gmp.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Gmp.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Crypt/Math/BigInteger/Interface.php'; * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Interface @@ -53,8 +53,8 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter /** * Adds two arbitrary precision numbers * - * @param string $left_operand - * @param string $right_operand + * @param resource $left_operand + * @param resource $right_operand * @return string */ public function add($left_operand, $right_operand) @@ -64,8 +64,10 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter } /** - * @param string $left_operand - * @param string $right_operand + * Subtract numbers + * + * @param resource $left_operand + * @param resource $right_operand * @return string */ public function subtract($left_operand, $right_operand) @@ -78,8 +80,9 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter * Compare two big integers and returns result as an integer where 0 means * both are identical, 1 that left_operand is larger, or -1 that * right_operand is larger. - * @param string $left_operand - * @param string $right_operand + * + * @param resource $left_operand + * @param resource $right_operand * @return int */ public function compare($left_operand, $right_operand) @@ -91,8 +94,9 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter /** * Divide two big integers and return result or NULL if the denominator * is zero. - * @param string $left_operand - * @param string $right_operand + * + * @param resource $left_operand + * @param resource $right_operand * @return string|null */ public function divide($left_operand, $right_operand) @@ -102,8 +106,11 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter } /** - * @param string $left_operand - * @param string $right_operand + * Modulo operation + * + * @param resource $left_operand + * @param resource $modulus + * @internal param string $right_operand * @return string */ public function modulus($left_operand, $modulus) @@ -113,8 +120,10 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter } /** - * @param string $left_operand - * @param string $right_operand + * Multiply numbers + * + * @param resource $left_operand + * @param resource $right_operand * @return string */ public function multiply($left_operand, $right_operand) @@ -124,8 +133,10 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter } /** - * @param string $left_operand - * @param string $right_operand + * Raise number into power + * + * @param resource $left_operand + * @param int $right_operand * @return string */ public function pow($left_operand, $right_operand) @@ -135,8 +146,11 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter } /** - * @param string $left_operand - * @param string $right_operand + * Raise number into power with modulo + * + * @param resource $left_operand + * @param resource $right_operand + * @param resource $modulus * @return string */ public function powmod($left_operand, $right_operand, $modulus) @@ -146,8 +160,9 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter } /** - * @param string $left_operand - * @param string $right_operand + * Calculate square root + * + * @param $operand * @return string */ public function sqrt($operand) @@ -156,7 +171,10 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter return gmp_strval($result); } - + /** + * @param string $operand + * @return string + */ public function binaryToInteger($operand) { $result = '0'; @@ -168,7 +186,10 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter return gmp_strval($result); } - + /** + * @param resource $operand GMP number resource + * @return string + */ public function integerToBinary($operand) { $bigInt = gmp_strval($operand, 16); @@ -181,7 +202,10 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter return $return; } - + /** + * @param string $operand + * @return string + */ public function hexToDecimal($operand) { $return = '0'; @@ -193,4 +217,4 @@ class Zend_Crypt_Math_BigInteger_Gmp implements Zend_Crypt_Math_BigInteger_Inter return $return; } -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Math/BigInteger/Interface.php b/library/Zend/Crypt/Math/BigInteger/Interface.php index 02a4e47..02a830e 100644 --- a/library/Zend/Crypt/Math/BigInteger/Interface.php +++ b/library/Zend/Crypt/Math/BigInteger/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ * * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Math_BigInteger_Interface @@ -48,4 +48,4 @@ interface Zend_Crypt_Math_BigInteger_Interface public function integerToBinary($operand); public function hexToDecimal($operand); -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Math/Exception.php b/library/Zend/Crypt/Math/Exception.php index e2510a0..2b9d9dc 100644 --- a/library/Zend/Crypt/Math/Exception.php +++ b/library/Zend/Crypt/Math/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,9 +28,9 @@ require_once 'Zend/Crypt/Exception.php'; /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Math_Exception extends Zend_Crypt_Exception { -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Rsa.php b/library/Zend/Crypt/Rsa.php index 38d6a84..f17da55 100644 --- a/library/Zend/Crypt/Rsa.php +++ b/library/Zend/Crypt/Rsa.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rsa.php 24808 2012-05-17 19:56:09Z rob $ + * @version $Id$ */ /** @@ -33,7 +33,7 @@ require_once 'Zend/Crypt/Rsa/Key/Public.php'; /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Rsa diff --git a/library/Zend/Crypt/Rsa/Exception.php b/library/Zend/Crypt/Rsa/Exception.php index 5852842..0ae6e25 100644 --- a/library/Zend/Crypt/Rsa/Exception.php +++ b/library/Zend/Crypt/Rsa/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Crypt * @subpackage Math - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ */ @@ -28,9 +28,9 @@ require_once 'Zend/Crypt/Exception.php'; /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Rsa_Exception extends Zend_Crypt_Exception { -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Rsa/Key.php b/library/Zend/Crypt/Rsa/Key.php index 9a07a9f..c260985 100644 --- a/library/Zend/Crypt/Rsa/Key.php +++ b/library/Zend/Crypt/Rsa/Key.php @@ -15,15 +15,15 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Key.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Rsa_Key implements Countable @@ -92,4 +92,4 @@ class Zend_Crypt_Rsa_Key implements Countable { return $this->_details['type']; } -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Rsa/Key/Private.php b/library/Zend/Crypt/Rsa/Key/Private.php index 601afec..405b5b6 100644 --- a/library/Zend/Crypt/Rsa/Key/Private.php +++ b/library/Zend/Crypt/Rsa/Key/Private.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Private.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/Crypt/Rsa/Key.php'; /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Rsa_Key_Private extends Zend_Crypt_Rsa_Key @@ -72,4 +72,4 @@ class Zend_Crypt_Rsa_Key_Private extends Zend_Crypt_Rsa_Key return $this->_publicKey; } -} \ No newline at end of file +} diff --git a/library/Zend/Crypt/Rsa/Key/Public.php b/library/Zend/Crypt/Rsa/Key/Public.php index b77df30..accbe53 100644 --- a/library/Zend/Crypt/Rsa/Key/Public.php +++ b/library/Zend/Crypt/Rsa/Key/Public.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Crypt * @subpackage Rsa - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Public.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/Crypt/Rsa/Key.php'; /** * @category Zend * @package Zend_Crypt - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Crypt_Rsa_Key_Public extends Zend_Crypt_Rsa_Key @@ -71,4 +71,4 @@ class Zend_Crypt_Rsa_Key_Public extends Zend_Crypt_Rsa_Key return $this->_certificateString; } -} \ No newline at end of file +} diff --git a/library/Zend/Currency.php b/library/Zend/Currency.php index 05c3a4d..8657dd8 100644 --- a/library/Zend/Currency.php +++ b/library/Zend/Currency.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Currency.php 24855 2012-06-01 00:12:25Z adamlundrigan $ + * @version $Id$ */ /** @@ -31,7 +31,7 @@ require_once 'Zend/Locale/Format.php'; * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Currency diff --git a/library/Zend/Currency/CurrencyInterface.php b/library/Zend/Currency/CurrencyInterface.php index 9f5d2fb..9d14e26 100644 --- a/library/Zend/Currency/CurrencyInterface.php +++ b/library/Zend/Currency/CurrencyInterface.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CurrencyInterface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Currency_CurrencyInterface diff --git a/library/Zend/Currency/Exception.php b/library/Zend/Currency/Exception.php index 8641d6e..bb30794 100644 --- a/library/Zend/Currency/Exception.php +++ b/library/Zend/Currency/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; * * @category Zend * @package Zend_Currency - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Currency_Exception extends Zend_Exception diff --git a/library/Zend/Date.php b/library/Zend/Date.php index 1726f9d..08c7d74 100644 --- a/library/Zend/Date.php +++ b/library/Zend/Date.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Date.php 24880 2012-06-12 20:35:18Z matthew $ + * @version $Id$ */ /** @@ -30,7 +30,7 @@ require_once 'Zend/Locale/Math.php'; /** * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Date extends Zend_Date_DateObject @@ -1208,7 +1208,7 @@ class Zend_Date extends Zend_Date_DateObject return $zone; } - preg_match('/([[:alpha:]\/]{3,30})(?!.*([[:alpha:]\/]{3,30}))/', $zone, $match); + preg_match('/([[:alpha:]\/_]{3,30})(?!.*([[:alpha:]\/]{3,30}))/', $zone, $match); try { if (!empty($match) and (!is_int($match[count($match) - 1]))) { $oldzone = $this->getTimezone(); @@ -3235,12 +3235,12 @@ class Zend_Date extends Zend_Date_DateObject return $this->_calcvalue('cmp', $date, 'arpa', self::RFC_822, $locale); } - /** * Check if location is supported * * @param array $location locations array - * @return $horizon float + * @throws Zend_Date_Exception + * @return float $horizon float */ private function _checkLocation($location) { @@ -3358,11 +3358,11 @@ class Zend_Date extends Zend_Date_DateObject return $suninfo; } - /** * Check a given year for leap year. * - * @param integer|array|Zend_Date $year Year to check + * @param integer|array|Zend_Date $year Year to check + * @throws Zend_Date_Exception * @return boolean */ public static function checkLeapYear($year) @@ -3458,7 +3458,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string $calc Calculation to make * @param string|integer|array|Zend_Date $date Date or Part to calculate - * @param string $part Datepart for Calculation + * @param string $type Datepart for Calculation * @param string|Zend_Locale $locale Locale for parsing input * @return integer|string new date * @throws Zend_Date_Exception @@ -3496,11 +3496,13 @@ class Zend_Date extends Zend_Date_DateObject /** * Internal calculation, returns the requested date type * - * @param string $calc Calculation to make - * @param string|integer|Zend_Date $value Datevalue to calculate with, if null the actual value is taken - * @param string|Zend_Locale $locale Locale for parsing input - * @return integer|Zend_Date new date + * @param string $calc Calculation to make + * @param string|integer|Zend_Date $value Datevalue to calculate with, if null the actual value is taken + * @param string $type + * @param string $parameter + * @param string|Zend_Locale $locale Locale for parsing input * @throws Zend_Date_Exception + * @return integer|Zend_Date new date */ private function _calcvalue($calc, $value, $type, $parameter, $locale) { @@ -3556,7 +3558,7 @@ class Zend_Date extends Zend_Date_DateObject * use set() instead. * Returned is the new date object * - * @param string|integer|array|Zend_Date $date Year to set + * @param string|integer|array|Zend_Date $year Year to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception @@ -3575,7 +3577,7 @@ class Zend_Date extends Zend_Date_DateObject * use add() instead. * Returned is the new date object * - * @param string|integer|array|Zend_Date $date Year to add + * @param string|integer|array|Zend_Date $year Year to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception @@ -3594,7 +3596,7 @@ class Zend_Date extends Zend_Date_DateObject * use sub() instead. * Returned is the new date object * - * @param string|integer|array|Zend_Date $date Year to sub + * @param string|integer|array|Zend_Date $year Year to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception @@ -3795,13 +3797,13 @@ class Zend_Date extends Zend_Date_DateObject return $this->copyPart(self::DAY_SHORT, $locale); } - /** * Returns the calculated day * - * @param string $calc Type of calculation to make - * @param Zend_Date $day Day to calculate, when null the actual day is calculated - * @param Zend_Locale $locale Locale for parsing input + * @param string $calc Type of calculation to make + * @param Zend_Date $day Day to calculate, when null the actual day is calculated + * @param Zend_Locale $locale Locale for parsing input + * @throws Zend_Date_Exception * @return Zend_Date|integer */ private function _day($calc, $day, $locale) @@ -3862,7 +3864,7 @@ class Zend_Date extends Zend_Date_DateObject * Returned is the new date object * Example: setDay('Montag', 'de_AT'); will set the monday of this week as day. * - * @param string|integer|array|Zend_Date $month Day to set + * @param string|integer|array|Zend_Date $day Day to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception @@ -3880,7 +3882,7 @@ class Zend_Date extends Zend_Date_DateObject * If a localized dayname is given it will be parsed with the default locale or the optional * set locale. * - * @param string|integer|array|Zend_Date $month Day to add + * @param string|integer|array|Zend_Date $day Day to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception @@ -3898,7 +3900,7 @@ class Zend_Date extends Zend_Date_DateObject * If a localized dayname is given it will be parsed with the default locale or the optional * set locale. * - * @param string|integer|array|Zend_Date $month Day to sub + * @param string|integer|array|Zend_Date $day Day to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception @@ -4010,7 +4012,7 @@ class Zend_Date extends Zend_Date_DateObject * Returned is the new date object. * Example: setWeekday(3); will set the wednesday of this week as day. * - * @param string|integer|array|Zend_Date $month Weekday to set + * @param string|integer|array|Zend_Date $weekday Weekday to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception @@ -4030,7 +4032,7 @@ class Zend_Date extends Zend_Date_DateObject * Example: addWeekday(3); will add the difference of days from the begining of the month until * wednesday. * - * @param string|integer|array|Zend_Date $month Weekday to add + * @param string|integer|array|Zend_Date $weekday Weekday to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception @@ -4050,7 +4052,7 @@ class Zend_Date extends Zend_Date_DateObject * Example: subWeekday(3); will subtract the difference of days from the begining of the month until * wednesday. * - * @param string|integer|array|Zend_Date $month Weekday to sub + * @param string|integer|array|Zend_Date $weekday Weekday to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception @@ -4461,13 +4463,13 @@ class Zend_Date extends Zend_Date_DateObject return $this->_fractional; } - /** * Sets new milliseconds for the date object * Example: setMilliSecond(550, 2) -> equals +5 Sec +50 MilliSec * * @param integer|Zend_Date $milli (Optional) Millisecond to set, when null the actual millisecond is set * @param integer $precision (Optional) Fraction precision of the given milliseconds + * @throws Zend_Date_Exception * @return Zend_Date Provides fluid interface */ public function setMilliSecond($milli = null, $precision = null) @@ -4495,12 +4497,12 @@ class Zend_Date extends Zend_Date_DateObject return $this; } - /** * Adds milliseconds to the date object * * @param integer|Zend_Date $milli (Optional) Millisecond to add, when null the actual millisecond is added * @param integer $precision (Optional) Fractional precision for the given milliseconds + * @throws Zend_Date_Exception * @return Zend_Date Provides fluid interface */ public function addMilliSecond($milli = null, $precision = null) @@ -4514,15 +4516,24 @@ class Zend_Date extends Zend_Date_DateObject } if ($precision === null) { - $precision = strlen($milli); - if ($milli < 0) { - --$precision; - } + // Use internal default precision + // Is not as logic as using the length of the input. But this would break tests and maybe other things + // as an input value of integer 10, which is used in tests, must be parsed as 10 milliseconds (real milliseconds, precision 3) + // but with auto-detect of precision, 100 milliseconds would be added. + $precision = $this->_precision; } if (!is_int($precision) || $precision < 1 || $precision > 9) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision); + throw new Zend_Date_Exception( + "precision ($precision) must be a positive integer less than 10", 0, null, $precision + ); + } + + if ($this->_precision > $precision) { + $milli = $milli * pow(10, $this->_precision - $precision); + } elseif ($this->_precision < $precision) { + $milli = round($milli / pow(10, $precision - $this->_precision)); } $this->_fractional += $milli; diff --git a/library/Zend/Date/Cities.php b/library/Zend/Date/Cities.php index 8f9145a..ca2ec2e 100644 --- a/library/Zend/Date/Cities.php +++ b/library/Zend/Date/Cities.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Cities.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Date * @subpackage Zend_Date_Cities - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Date_Cities diff --git a/library/Zend/Date/DateObject.php b/library/Zend/Date/DateObject.php index c966cd1..06c7350 100644 --- a/library/Zend/Date/DateObject.php +++ b/library/Zend/Date/DateObject.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: DateObject.php 24880 2012-06-12 20:35:18Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Date * @subpackage Zend_Date_DateObject - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Date_DateObject { diff --git a/library/Zend/Date/Exception.php b/library/Zend/Date/Exception.php index 98a555b..c1876da 100644 --- a/library/Zend/Date/Exception.php +++ b/library/Zend/Date/Exception.php @@ -14,8 +14,8 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Date_Exception extends Zend_Exception diff --git a/library/Zend/Db.php b/library/Zend/Db.php index 3a57fcc..aaa1f79 100644 --- a/library/Zend/Db.php +++ b/library/Zend/Db.php @@ -15,9 +15,9 @@ * * @category Zend * @package Zend_Db - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -26,7 +26,7 @@ * * @category Zend * @package Zend_Db - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db diff --git a/library/Zend/Db/Adapter/Abstract.php b/library/Zend/Db/Adapter/Abstract.php index 9bb1265..07f9c5a 100644 --- a/library/Zend/Db/Adapter/Abstract.php +++ b/library/Zend/Db/Adapter/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 25229 2013-01-18 08:17:21Z frosch $ + * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Db/Select.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Adapter_Abstract @@ -1127,10 +1127,15 @@ abstract class Zend_Db_Adapter_Abstract if ($this->_allowSerialization == false) { /** @see Zend_Db_Adapter_Exception */ require_once 'Zend/Db/Adapter/Exception.php'; - throw new Zend_Db_Adapter_Exception(get_class($this) ." is not allowed to be serialized"); + throw new Zend_Db_Adapter_Exception( + get_class($this) . ' is not allowed to be serialized' + ); } - $this->_connection = false; - return array_keys(array_diff_key(get_object_vars($this), array('_connection'=>false))); + $this->_connection = null; + + return array_keys( + array_diff_key(get_object_vars($this), array('_connection' => null)) + ); } /** diff --git a/library/Zend/Db/Adapter/Db2.php b/library/Zend/Db/Adapter/Db2.php index 7d9864b..d88541b 100644 --- a/library/Zend/Db/Adapter/Db2.php +++ b/library/Zend/Db/Adapter/Db2.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db2.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ * */ @@ -39,7 +39,7 @@ require_once 'Zend/Db/Statement/Db2.php'; /** * @package Zend_Db - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Db/Adapter/Db2/Exception.php b/library/Zend/Db/Adapter/Db2/Exception.php index 4962070..cde6e65 100644 --- a/library/Zend/Db/Adapter/Db2/Exception.php +++ b/library/Zend/Db/Adapter/Db2/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -30,7 +30,7 @@ require_once 'Zend/Db/Adapter/Exception.php'; * * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Db2_Exception extends Zend_Db_Adapter_Exception diff --git a/library/Zend/Db/Adapter/Exception.php b/library/Zend/Db/Adapter/Exception.php index 05850cc..6a0a4be 100644 --- a/library/Zend/Db/Adapter/Exception.php +++ b/library/Zend/Db/Adapter/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Db/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Exception extends Zend_Db_Exception @@ -46,7 +46,7 @@ class Zend_Db_Adapter_Exception extends Zend_Db_Exception public function hasChainedException() { - return ($this->_previous !== null); + return ($this->getPrevious() !== null); } public function getChainedException() diff --git a/library/Zend/Db/Adapter/Mysqli.php b/library/Zend/Db/Adapter/Mysqli.php index ac79cf4..c3262b5 100644 --- a/library/Zend/Db/Adapter/Mysqli.php +++ b/library/Zend/Db/Adapter/Mysqli.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mysqli.php 25229 2013-01-18 08:17:21Z frosch $ + * @version $Id$ */ @@ -46,7 +46,7 @@ require_once 'Zend/Db/Statement/Mysqli.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract diff --git a/library/Zend/Db/Adapter/Mysqli/Exception.php b/library/Zend/Db/Adapter/Mysqli/Exception.php index 6805e04..5f9032c 100644 --- a/library/Zend/Db/Adapter/Mysqli/Exception.php +++ b/library/Zend/Db/Adapter/Mysqli/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ * */ @@ -32,7 +32,7 @@ require_once 'Zend/Db/Adapter/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Mysqli_Exception extends Zend_Db_Adapter_Exception diff --git a/library/Zend/Db/Adapter/Oracle.php b/library/Zend/Db/Adapter/Oracle.php index d98bec4..42fa4f5 100644 --- a/library/Zend/Db/Adapter/Oracle.php +++ b/library/Zend/Db/Adapter/Oracle.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oracle.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -34,7 +34,7 @@ require_once 'Zend/Db/Statement/Oracle.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract diff --git a/library/Zend/Db/Adapter/Oracle/Exception.php b/library/Zend/Db/Adapter/Oracle/Exception.php index c04aa58..995ca64 100644 --- a/library/Zend/Db/Adapter/Oracle/Exception.php +++ b/library/Zend/Db/Adapter/Oracle/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -31,7 +31,7 @@ require_once 'Zend/Db/Adapter/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Oracle_Exception extends Zend_Db_Adapter_Exception diff --git a/library/Zend/Db/Adapter/Pdo/Abstract.php b/library/Zend/Db/Adapter/Pdo/Abstract.php index fe6f5f9..84a76f3 100644 --- a/library/Zend/Db/Adapter/Pdo/Abstract.php +++ b/library/Zend/Db/Adapter/Pdo/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Db/Statement/Pdo.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract diff --git a/library/Zend/Db/Adapter/Pdo/Ibm.php b/library/Zend/Db/Adapter/Pdo/Ibm.php index b4898b8..69bfabd 100644 --- a/library/Zend/Db/Adapter/Pdo/Ibm.php +++ b/library/Zend/Db/Adapter/Pdo/Ibm.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ibm.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Db/Statement/Pdo/Ibm.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Pdo_Ibm extends Zend_Db_Adapter_Pdo_Abstract diff --git a/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php b/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php index 07b4d29..7a85389 100644 --- a/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php +++ b/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db2.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Db/Statement/Pdo/Ibm.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Pdo_Ibm_Db2 diff --git a/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php b/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php index ef357ce..cba9688 100644 --- a/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php +++ b/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ids.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Db/Statement/Pdo/Ibm.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Pdo_Ibm_Ids diff --git a/library/Zend/Db/Adapter/Pdo/Mssql.php b/library/Zend/Db/Adapter/Pdo/Mssql.php index d654d81..e3d8c7a 100644 --- a/library/Zend/Db/Adapter/Pdo/Mssql.php +++ b/library/Zend/Db/Adapter/Pdo/Mssql.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mssql.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Abstract @@ -420,4 +420,4 @@ class Zend_Db_Adapter_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Abstract return null; } } -} \ No newline at end of file +} diff --git a/library/Zend/Db/Adapter/Pdo/Mysql.php b/library/Zend/Db/Adapter/Pdo/Mysql.php index 45636e5..cd42197 100644 --- a/library/Zend/Db/Adapter/Pdo/Mysql.php +++ b/library/Zend/Db/Adapter/Pdo/Mysql.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mysql.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Abstract @@ -101,7 +101,9 @@ class Zend_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Abstract return; } - if (!empty($this->_config['charset'])) { + if (!empty($this->_config['charset']) + && version_compare(PHP_VERSION, '5.3.6', '<') + ) { $initCommand = "SET NAMES '" . $this->_config['charset'] . "'"; $this->_config['driver_options'][1002] = $initCommand; // 1002 = PDO::MYSQL_ATTR_INIT_COMMAND } diff --git a/library/Zend/Db/Adapter/Pdo/Oci.php b/library/Zend/Db/Adapter/Pdo/Oci.php index 8411dd9..410adcf 100644 --- a/library/Zend/Db/Adapter/Pdo/Oci.php +++ b/library/Zend/Db/Adapter/Pdo/Oci.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oci.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Pdo_Oci extends Zend_Db_Adapter_Pdo_Abstract diff --git a/library/Zend/Db/Adapter/Pdo/Pgsql.php b/library/Zend/Db/Adapter/Pdo/Pgsql.php index 6551ed1..0f4d13d 100644 --- a/library/Zend/Db/Adapter/Pdo/Pgsql.php +++ b/library/Zend/Db/Adapter/Pdo/Pgsql.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pgsql.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract diff --git a/library/Zend/Db/Adapter/Pdo/Sqlite.php b/library/Zend/Db/Adapter/Pdo/Sqlite.php index a51aae9..f035cea 100644 --- a/library/Zend/Db/Adapter/Pdo/Sqlite.php +++ b/library/Zend/Db/Adapter/Pdo/Sqlite.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlite.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract diff --git a/library/Zend/Db/Adapter/Sqlsrv.php b/library/Zend/Db/Adapter/Sqlsrv.php index e7d5a8e..1ffc707 100644 --- a/library/Zend/Db/Adapter/Sqlsrv.php +++ b/library/Zend/Db/Adapter/Sqlsrv.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlsrv.php 25077 2012-11-06 20:06:24Z rob $ + * @version $Id$ */ /** @@ -34,7 +34,7 @@ require_once 'Zend/Db/Statement/Sqlsrv.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract diff --git a/library/Zend/Db/Adapter/Sqlsrv/Exception.php b/library/Zend/Db/Adapter/Sqlsrv/Exception.php index dc358db..308ffb5 100644 --- a/library/Zend/Db/Adapter/Sqlsrv/Exception.php +++ b/library/Zend/Db/Adapter/Sqlsrv/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -31,7 +31,7 @@ require_once 'Zend/Db/Adapter/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Adapter - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Adapter_Sqlsrv_Exception extends Zend_Db_Adapter_Exception diff --git a/library/Zend/Db/Exception.php b/library/Zend/Db/Exception.php index 948843f..20c1066 100644 --- a/library/Zend/Db/Exception.php +++ b/library/Zend/Db/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Db - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -27,7 +27,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Db - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Exception extends Zend_Exception diff --git a/library/Zend/Db/Expr.php b/library/Zend/Db/Expr.php index 781f900..e4a406a 100644 --- a/library/Zend/Db/Expr.php +++ b/library/Zend/Db/Expr.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Expr - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Expr.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -43,7 +43,7 @@ * @category Zend * @package Zend_Db * @subpackage Expr - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Expr diff --git a/library/Zend/Db/Profiler.php b/library/Zend/Db/Profiler.php index 31993aa..4085290 100644 --- a/library/Zend/Db/Profiler.php +++ b/library/Zend/Db/Profiler.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Profiler.php 25127 2012-11-16 15:17:42Z rob $ + * @version $Id$ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Profiler diff --git a/library/Zend/Db/Profiler/Exception.php b/library/Zend/Db/Profiler/Exception.php index 14186eb..58760c2 100644 --- a/library/Zend/Db/Profiler/Exception.php +++ b/library/Zend/Db/Profiler/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Db/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Profiler_Exception extends Zend_Db_Exception diff --git a/library/Zend/Db/Profiler/Firebug.php b/library/Zend/Db/Profiler/Firebug.php index 26d5196..30f9cd3 100644 --- a/library/Zend/Db/Profiler/Firebug.php +++ b/library/Zend/Db/Profiler/Firebug.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Firebug.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Db_Profiler */ @@ -35,7 +35,7 @@ require_once 'Zend/Wildfire/Plugin/FirePhp/TableMessage.php'; * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Profiler_Firebug extends Zend_Db_Profiler diff --git a/library/Zend/Db/Profiler/Query.php b/library/Zend/Db/Profiler/Query.php index 3420e8b..a41cb70 100644 --- a/library/Zend/Db/Profiler/Query.php +++ b/library/Zend/Db/Profiler/Query.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Query.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Db * @subpackage Profiler - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Profiler_Query diff --git a/library/Zend/Db/Select.php b/library/Zend/Db/Select.php index 717e45d..8f84354 100644 --- a/library/Zend/Db/Select.php +++ b/library/Zend/Db/Select.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Select.php 24833 2012-05-30 13:29:41Z adamlundrigan $ + * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Db/Expr.php'; * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Select @@ -509,7 +509,7 @@ class Zend_Db_Select } foreach ($spec as $val) { - if (preg_match('/\(.*\)/', (string) $val)) { + if (preg_match('/^[\w]*\([^\)]*\)$/', (string) $val)) { $val = new Zend_Db_Expr($val); } $this->_parts[self::GROUP][] = $val; @@ -601,7 +601,7 @@ class Zend_Db_Select $val = trim($matches[1]); $direction = $matches[2]; } - if (preg_match('/\(.*\)/', $val)) { + if (preg_match('/^[\w]*\([^\)]*\)$/', $val)) { $val = new Zend_Db_Expr($val); } $this->_parts[self::ORDER][] = array($val, $direction); @@ -654,7 +654,7 @@ class Zend_Db_Select } /** - * Get part of the structured information for the currect query. + * Get part of the structured information for the current query. * * @param string $part * @return mixed @@ -718,7 +718,7 @@ class Zend_Db_Select { if ($part == null) { $this->_parts = self::$_partsInit; - } else if (array_key_exists($part, self::$_partsInit)) { + } elseif (array_key_exists($part, self::$_partsInit)) { $this->_parts[$part] = self::$_partsInit[$part]; } return $this; @@ -768,7 +768,7 @@ class Zend_Db_Select if (empty($name)) { $correlationName = $tableName = ''; - } else if (is_array($name)) { + } elseif (is_array($name)) { // Must be array($correlationName => $tableName) or array($ident, ...) foreach ($name as $_correlationName => $_tableName) { if (is_string($_correlationName)) { @@ -782,10 +782,10 @@ class Zend_Db_Select } break; } - } else if ($name instanceof Zend_Db_Expr|| $name instanceof Zend_Db_Select) { + } elseif ($name instanceof Zend_Db_Expr|| $name instanceof Zend_Db_Select) { $tableName = $name; $correlationName = $this->_uniqueCorrelation('t'); - } else if (preg_match('/^(.+)\s+AS\s+(.+)$/i', $name, $m)) { + } elseif (preg_match('/^(.+)\s+AS\s+(.+)$/i', $name, $m)) { $tableName = $m[1]; $correlationName = $m[2]; } else { @@ -943,7 +943,7 @@ class Zend_Db_Select $alias = $m[2]; } // Check for columns that look like functions and convert to Zend_Db_Expr - if (preg_match('/\(.*\)/', $col)) { + if (preg_match('/^[\w]*\([^\)]*\)$/', $col)) { $col = new Zend_Db_Expr($col); } elseif (preg_match('/(.+)\.(.+)/', $col, $m)) { $currentCorrelationName = $m[1]; @@ -1238,7 +1238,7 @@ class Zend_Db_Select } else { $order[] = $this->_adapter->quoteIdentifier($term[0], true) . ' ' . $term[1]; } - } else if (is_numeric($term) && strval(intval($term)) == $term) { + } elseif (is_numeric($term) && strval(intval($term)) == $term) { $order[] = (int)trim($term); } else { $order[] = $this->_adapter->quoteIdentifier($term, true); diff --git a/library/Zend/Db/Select/Exception.php b/library/Zend/Db/Select/Exception.php index deb046c..048e1c1 100644 --- a/library/Zend/Db/Select/Exception.php +++ b/library/Zend/Db/Select/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Db/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Db/Statement.php b/library/Zend/Db/Statement.php index ef4a40c..bd2536f 100644 --- a/library/Zend/Db/Statement.php +++ b/library/Zend/Db/Statement.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Statement.php 24790 2012-05-10 12:28:51Z mcleod@spaceweb.nl $ + * @version $Id$ */ /** @@ -36,7 +36,7 @@ require_once 'Zend/Db/Statement/Interface.php'; * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface diff --git a/library/Zend/Db/Statement/Db2.php b/library/Zend/Db/Statement/Db2.php index c53d1b6..c1485ab 100644 --- a/library/Zend/Db/Statement/Db2.php +++ b/library/Zend/Db/Statement/Db2.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Db2.php 24625 2012-02-22 21:53:40Z adamlundrigan $ + * @version $Id$ */ /** @@ -30,7 +30,7 @@ require_once 'Zend/Db/Statement.php'; * * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Statement_Db2 extends Zend_Db_Statement diff --git a/library/Zend/Db/Statement/Db2/Exception.php b/library/Zend/Db/Statement/Db2/Exception.php index bab2424..2fc2ea5 100644 --- a/library/Zend/Db/Statement/Db2/Exception.php +++ b/library/Zend/Db/Statement/Db2/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Db/Statement/Exception.php b/library/Zend/Db/Statement/Exception.php index 8fc6013..8f245f7 100644 --- a/library/Zend/Db/Statement/Exception.php +++ b/library/Zend/Db/Statement/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -31,7 +31,7 @@ require_once 'Zend/Db/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Statement_Exception extends Zend_Db_Exception diff --git a/library/Zend/Db/Statement/Interface.php b/library/Zend/Db/Statement/Interface.php index bb0540c..eaeb0bf 100644 --- a/library/Zend/Db/Statement/Interface.php +++ b/library/Zend/Db/Statement/Interface.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Statement_Interface diff --git a/library/Zend/Db/Statement/Mysqli.php b/library/Zend/Db/Statement/Mysqli.php index b9c6df2..5e872e1 100644 --- a/library/Zend/Db/Statement/Mysqli.php +++ b/library/Zend/Db/Statement/Mysqli.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mysqli.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Db/Statement.php'; * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Statement_Mysqli extends Zend_Db_Statement @@ -359,4 +359,4 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement return $mysqli->affected_rows; } -} \ No newline at end of file +} diff --git a/library/Zend/Db/Statement/Mysqli/Exception.php b/library/Zend/Db/Statement/Mysqli/Exception.php index bebcd43..8cdbc25 100644 --- a/library/Zend/Db/Statement/Mysqli/Exception.php +++ b/library/Zend/Db/Statement/Mysqli/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Db/Statement/Oracle.php b/library/Zend/Db/Statement/Oracle.php index 48415d7..46fb61b 100644 --- a/library/Zend/Db/Statement/Oracle.php +++ b/library/Zend/Db/Statement/Oracle.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oracle.php 24863 2012-06-02 00:22:47Z adamlundrigan $ + * @version $Id$ */ /** @@ -31,7 +31,7 @@ require_once 'Zend/Db/Statement.php'; * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Statement_Oracle extends Zend_Db_Statement diff --git a/library/Zend/Db/Statement/Oracle/Exception.php b/library/Zend/Db/Statement/Oracle/Exception.php index 4183f18..88e6d49 100644 --- a/library/Zend/Db/Statement/Oracle/Exception.php +++ b/library/Zend/Db/Statement/Oracle/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Db/Statement/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Db/Statement/Pdo.php b/library/Zend/Db/Statement/Pdo.php index 6127f17..8be2d4f 100644 --- a/library/Zend/Db/Statement/Pdo.php +++ b/library/Zend/Db/Statement/Pdo.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pdo.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -34,7 +34,7 @@ require_once 'Zend/Db/Statement.php'; * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggregate @@ -231,7 +231,8 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega } } catch (PDOException $e) { require_once 'Zend/Db/Statement/Exception.php'; - throw new Zend_Db_Statement_Exception($e->getMessage(), (int) $e->getCode(), $e); + $message = sprintf('%s, query was: %s', $e->getMessage(), $this->_stmt->queryString); + throw new Zend_Db_Statement_Exception($message, (int) $e->getCode(), $e); } } diff --git a/library/Zend/Db/Statement/Pdo/Ibm.php b/library/Zend/Db/Statement/Pdo/Ibm.php index bfdf76c..5b93c19 100644 --- a/library/Zend/Db/Statement/Pdo/Ibm.php +++ b/library/Zend/Db/Statement/Pdo/Ibm.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ibm.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -34,7 +34,7 @@ require_once 'Zend/Db/Statement/Pdo.php'; * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Statement_Pdo_Ibm extends Zend_Db_Statement_Pdo @@ -91,4 +91,4 @@ class Zend_Db_Statement_Pdo_Ibm extends Zend_Db_Statement_Pdo } } -} \ No newline at end of file +} diff --git a/library/Zend/Db/Statement/Pdo/Oci.php b/library/Zend/Db/Statement/Pdo/Oci.php index 2a2d458..b890a34 100644 --- a/library/Zend/Db/Statement/Pdo/Oci.php +++ b/library/Zend/Db/Statement/Pdo/Oci.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Oci.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -34,7 +34,7 @@ require_once 'Zend/Db/Statement/Pdo.php'; * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Statement_Pdo_Oci extends Zend_Db_Statement_Pdo @@ -88,4 +88,4 @@ class Zend_Db_Statement_Pdo_Oci extends Zend_Db_Statement_Pdo return $row; } -} \ No newline at end of file +} diff --git a/library/Zend/Db/Statement/Sqlsrv.php b/library/Zend/Db/Statement/Sqlsrv.php index f3e5193..e607928 100644 --- a/library/Zend/Db/Statement/Sqlsrv.php +++ b/library/Zend/Db/Statement/Sqlsrv.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlsrv.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -31,7 +31,7 @@ require_once 'Zend/Db/Statement.php'; * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement diff --git a/library/Zend/Db/Statement/Sqlsrv/Exception.php b/library/Zend/Db/Statement/Sqlsrv/Exception.php index ac1fced..20dca7b 100644 --- a/library/Zend/Db/Statement/Sqlsrv/Exception.php +++ b/library/Zend/Db/Statement/Sqlsrv/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -28,7 +28,7 @@ require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db * @subpackage Statement - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Statement_Sqlsrv_Exception extends Zend_Db_Statement_Exception diff --git a/library/Zend/Db/Table.php b/library/Zend/Db/Table.php index 2ba3918..a6cdce2 100644 --- a/library/Zend/Db/Table.php +++ b/library/Zend/Db/Table.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Table.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -36,7 +36,7 @@ require_once 'Zend/Db/Table/Definition.php'; * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Table extends Zend_Db_Table_Abstract diff --git a/library/Zend/Db/Table/Abstract.php b/library/Zend/Db/Table/Abstract.php index a10cfdd..3c10da5 100644 --- a/library/Zend/Db/Table/Abstract.php +++ b/library/Zend/Db/Table/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24958 2012-06-15 13:44:04Z adamlundrigan $ + * @version $Id$ */ /** @@ -41,7 +41,7 @@ require_once 'Zend/Db.php'; * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Table_Abstract @@ -1041,16 +1041,6 @@ abstract class Zend_Db_Table_Abstract $primary = (array) $this->_primary; $pkIdentity = $primary[(int)$this->_identity]; - /** - * If this table uses a database sequence object and the data does not - * specify a value, then get the next ID from the sequence and add it - * to the row. We assume that only the first column in a compound - * primary key takes a value from a sequence. - */ - if (is_string($this->_sequence) && !isset($data[$pkIdentity])) { - $data[$pkIdentity] = $this->_db->nextSequenceId($this->_sequence); - $pkSuppliedBySequence = true; - } /** * If the primary key can be generated automatically, and no value was @@ -1060,7 +1050,7 @@ abstract class Zend_Db_Table_Abstract * position of the data. The following values are considered empty: * null, false, true, '', array() */ - if (!isset($pkSuppliedBySequence) && array_key_exists($pkIdentity, $data)) { + if (array_key_exists($pkIdentity, $data)) { if ($data[$pkIdentity] === null // null || $data[$pkIdentity] === '' // empty string || is_bool($data[$pkIdentity]) // boolean @@ -1069,6 +1059,16 @@ abstract class Zend_Db_Table_Abstract } } + /** + * If this table uses a database sequence object and the data does not + * specify a value, then get the next ID from the sequence and add it + * to the row. We assume that only the first column in a compound + * primary key takes a value from a sequence. + */ + if (is_string($this->_sequence) && !isset($data[$pkIdentity])) { + $data[$pkIdentity] = $this->_db->nextSequenceId($this->_sequence); + } + /** * INSERT the new row. */ @@ -1212,20 +1212,20 @@ abstract class Zend_Db_Table_Abstract { // setup metadata $this->_setupMetadata(); - + // get this class name $thisClass = get_class($this); if ($thisClass === 'Zend_Db_Table') { $thisClass = $this->_definitionConfigName; } - + $rowsAffected = 0; - + foreach ($this->_getReferenceMapNormalized() as $map) { if ($map[self::REF_TABLE_CLASS] == $parentTableClassname && isset($map[self::ON_DELETE])) { - + $where = array(); - + // CASCADE or CASCADE_RECURSE if (in_array($map[self::ON_DELETE], array(self::CASCADE, self::CASCADE_RECURSE))) { for ($i = 0; $i < count($map[self::COLUMNS]); ++$i) { @@ -1237,10 +1237,10 @@ abstract class Zend_Db_Table_Abstract $primaryKey[$refCol], $type); } } - + // CASCADE_RECURSE if ($map[self::ON_DELETE] == self::CASCADE_RECURSE) { - + /** * Execute cascading deletes against dependent tables */ @@ -1259,7 +1259,7 @@ abstract class Zend_Db_Table_Abstract if (in_array($map[self::ON_DELETE], array(self::CASCADE, self::CASCADE_RECURSE))) { $rowsAffected += $this->delete($where); } - + } } return $rowsAffected; @@ -1610,5 +1610,5 @@ abstract class Zend_Db_Table_Abstract return new $tableName($options); } - + } diff --git a/library/Zend/Db/Table/Definition.php b/library/Zend/Db/Table/Definition.php index 6019c7e..8a0dea8 100644 --- a/library/Zend/Db/Table/Definition.php +++ b/library/Zend/Db/Table/Definition.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Definition.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Table_Definition diff --git a/library/Zend/Db/Table/Exception.php b/library/Zend/Db/Table/Exception.php index c74aec7..fb25eaa 100644 --- a/library/Zend/Db/Table/Exception.php +++ b/library/Zend/Db/Table/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Db/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Table_Exception extends Zend_Db_Exception diff --git a/library/Zend/Db/Table/Row.php b/library/Zend/Db/Table/Row.php index 289294f..cb08811 100644 --- a/library/Zend/Db/Table/Row.php +++ b/library/Zend/Db/Table/Row.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Row.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Db/Table/Row/Abstract.php'; * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Table_Row extends Zend_Db_Table_Row_Abstract diff --git a/library/Zend/Db/Table/Row/Abstract.php b/library/Zend/Db/Table/Row/Abstract.php index 9c606f4..3988ecb 100644 --- a/library/Zend/Db/Table/Row/Abstract.php +++ b/library/Zend/Db/Table/Row/Abstract.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24831 2012-05-30 12:52:25Z rob $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Db.php'; * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggregate diff --git a/library/Zend/Db/Table/Row/Exception.php b/library/Zend/Db/Table/Row/Exception.php index f407190..ece4e8a 100644 --- a/library/Zend/Db/Table/Row/Exception.php +++ b/library/Zend/Db/Table/Row/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Db/Table/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Table_Row_Exception extends Zend_Db_Table_Exception diff --git a/library/Zend/Db/Table/Rowset.php b/library/Zend/Db/Table/Rowset.php index 2babd53..9c39f44 100644 --- a/library/Zend/Db/Table/Rowset.php +++ b/library/Zend/Db/Table/Rowset.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Rowset.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Db/Table/Rowset/Abstract.php'; * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Table_Rowset extends Zend_Db_Table_Rowset_Abstract diff --git a/library/Zend/Db/Table/Rowset/Abstract.php b/library/Zend/Db/Table/Rowset/Abstract.php index 73b1fb1..6a53c05 100644 --- a/library/Zend/Db/Table/Rowset/Abstract.php +++ b/library/Zend/Db/Table/Rowset/Abstract.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Countable, ArrayAccess @@ -205,6 +205,7 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta $this->_connected = true; } } + $this->rewind(); return $this->_connected; } @@ -426,6 +427,18 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta 'readOnly' => $this->_readOnly ) ); + + if ( $this->_table instanceof Zend_Db_Table_Abstract ) { + $info = $this->_table->info(); + + if ( $this->_rows[$position] instanceof Zend_Db_Table_Row_Abstract ) { + if ($info['cols'] == array_keys($this->_data[$position])) { + $this->_rows[$position]->setTable($this->getTable()); + } + } + } else { + $this->_rows[$position]->setTable(null); + } } // return the row object diff --git a/library/Zend/Db/Table/Rowset/Exception.php b/library/Zend/Db/Table/Rowset/Exception.php index 5e4990b..57cca4f 100644 --- a/library/Zend/Db/Table/Rowset/Exception.php +++ b/library/Zend/Db/Table/Rowset/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Db/Table/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Table_Rowset_Exception extends Zend_Db_Table_Exception diff --git a/library/Zend/Db/Table/Select.php b/library/Zend/Db/Table/Select.php index c3cbba2..542a6f5 100644 --- a/library/Zend/Db/Table/Select.php +++ b/library/Zend/Db/Table/Select.php @@ -16,9 +16,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Select.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ @@ -40,7 +40,7 @@ require_once 'Zend/Db/Table/Abstract.php'; * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Db_Table_Select extends Zend_Db_Select @@ -221,4 +221,4 @@ class Zend_Db_Table_Select extends Zend_Db_Select return parent::assemble(); } -} \ No newline at end of file +} diff --git a/library/Zend/Db/Table/Select/Exception.php b/library/Zend/Db/Table/Select/Exception.php index 3acb88b..575fa3e 100644 --- a/library/Zend/Db/Table/Select/Exception.php +++ b/library/Zend/Db/Table/Select/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Db * @subpackage Select - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Db/Select/Exception.php'; * @category Zend * @package Zend_Db * @subpackage Table - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Debug.php b/library/Zend/Debug.php index 2346931..d8bebfe 100644 --- a/library/Zend/Debug.php +++ b/library/Zend/Debug.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Debug - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Debug.php 25095 2012-11-07 20:11:07Z rob $ + * @version $Id$ */ /** @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Debug - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/library/Zend/Dojo.php b/library/Zend/Dojo.php index ba010ad..8dddcca 100644 --- a/library/Zend/Dojo.php +++ b/library/Zend/Dojo.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Dojo - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +22,9 @@ * Enable Dojo components * * @package Zend_Dojo - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dojo.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo { diff --git a/library/Zend/Dojo/BuildLayer.php b/library/Zend/Dojo/BuildLayer.php index 49d5626..56faeae 100644 --- a/library/Zend/Dojo/BuildLayer.php +++ b/library/Zend/Dojo/BuildLayer.php @@ -14,16 +14,16 @@ * * @category Zend * @package Zend_Dojo - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BuildLayer.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id$ */ /** * Dojo module layer and custom build profile generation support * * @package Zend_Dojo - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_BuildLayer diff --git a/library/Zend/Dojo/Data.php b/library/Zend/Dojo/Data.php index 9315b0c..72f7d3f 100644 --- a/library/Zend/Dojo/Data.php +++ b/library/Zend/Dojo/Data.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Dojo - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Data.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -26,7 +26,7 @@ * @uses Iterator * @uses Countable * @package Zend_Dojo - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_Data implements ArrayAccess,Iterator,Countable diff --git a/library/Zend/Dojo/Exception.php b/library/Zend/Dojo/Exception.php index 471d6e5..32f3164 100644 --- a/library/Zend/Dojo/Exception.php +++ b/library/Zend/Dojo/Exception.php @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Dojo - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Exception */ @@ -27,7 +27,7 @@ require_once 'Zend/Exception.php'; * * @uses Zend_Exception * @package Zend_Dojo - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_Exception extends Zend_Exception diff --git a/library/Zend/Dojo/Form.php b/library/Zend/Dojo/Form.php index ccc1052..86b2231 100644 --- a/library/Zend/Dojo/Form.php +++ b/library/Zend/Dojo/Form.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Form.php'; * @uses Zend_Form * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Form.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form extends Zend_Form { diff --git a/library/Zend/Dojo/Form/Decorator/AccordionContainer.php b/library/Zend/Dojo/Form/Decorator/AccordionContainer.php index f776d03..2242f97 100644 --- a/library/Zend/Dojo/Form/Decorator/AccordionContainer.php +++ b/library/Zend/Dojo/Form/Decorator/AccordionContainer.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +29,9 @@ require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccordionContainer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Decorator_AccordionContainer extends Zend_Dojo_Form_Decorator_DijitContainer { diff --git a/library/Zend/Dojo/Form/Decorator/AccordionPane.php b/library/Zend/Dojo/Form/Decorator/AccordionPane.php index f78132d..c38ce30 100644 --- a/library/Zend/Dojo/Form/Decorator/AccordionPane.php +++ b/library/Zend/Dojo/Form/Decorator/AccordionPane.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +29,9 @@ require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccordionPane.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Decorator_AccordionPane extends Zend_Dojo_Form_Decorator_DijitContainer { diff --git a/library/Zend/Dojo/Form/Decorator/BorderContainer.php b/library/Zend/Dojo/Form/Decorator/BorderContainer.php index c8337ac..4b38038 100644 --- a/library/Zend/Dojo/Form/Decorator/BorderContainer.php +++ b/library/Zend/Dojo/Form/Decorator/BorderContainer.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +29,9 @@ require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BorderContainer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Decorator_BorderContainer extends Zend_Dojo_Form_Decorator_DijitContainer { diff --git a/library/Zend/Dojo/Form/Decorator/ContentPane.php b/library/Zend/Dojo/Form/Decorator/ContentPane.php index 79289b6..1c2f1a5 100644 --- a/library/Zend/Dojo/Form/Decorator/ContentPane.php +++ b/library/Zend/Dojo/Form/Decorator/ContentPane.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +29,9 @@ require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContentPane.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Decorator_ContentPane extends Zend_Dojo_Form_Decorator_DijitContainer { diff --git a/library/Zend/Dojo/Form/Decorator/DijitContainer.php b/library/Zend/Dojo/Form/Decorator/DijitContainer.php index 41b30aa..681ee19 100644 --- a/library/Zend/Dojo/Form/Decorator/DijitContainer.php +++ b/library/Zend/Dojo/Form/Decorator/DijitContainer.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,9 +35,9 @@ require_once 'Zend/Form/Decorator/Abstract.php'; * @uses Zend_Form_Decorator_Abstract * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DijitContainer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ abstract class Zend_Dojo_Form_Decorator_DijitContainer extends Zend_Form_Decorator_Abstract { diff --git a/library/Zend/Dojo/Form/Decorator/DijitElement.php b/library/Zend/Dojo/Form/Decorator/DijitElement.php index 73f2c33..bf638de 100644 --- a/library/Zend/Dojo/Form/Decorator/DijitElement.php +++ b/library/Zend/Dojo/Form/Decorator/DijitElement.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +36,9 @@ require_once 'Zend/Form/Decorator/ViewHelper.php'; * * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DijitElement.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Decorator_DijitElement extends Zend_Form_Decorator_ViewHelper { diff --git a/library/Zend/Dojo/Form/Decorator/DijitForm.php b/library/Zend/Dojo/Form/Decorator/DijitForm.php index 9fd4218..d5f9aaa 100644 --- a/library/Zend/Dojo/Form/Decorator/DijitForm.php +++ b/library/Zend/Dojo/Form/Decorator/DijitForm.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +31,9 @@ require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; * * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DijitForm.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Decorator_DijitForm extends Zend_Dojo_Form_Decorator_DijitContainer { diff --git a/library/Zend/Dojo/Form/Decorator/SplitContainer.php b/library/Zend/Dojo/Form/Decorator/SplitContainer.php index 64d8a01..3c3a82d 100644 --- a/library/Zend/Dojo/Form/Decorator/SplitContainer.php +++ b/library/Zend/Dojo/Form/Decorator/SplitContainer.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +29,9 @@ require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SplitContainer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Decorator_SplitContainer extends Zend_Dojo_Form_Decorator_DijitContainer { diff --git a/library/Zend/Dojo/Form/Decorator/StackContainer.php b/library/Zend/Dojo/Form/Decorator/StackContainer.php index 16e5fc3..3c91877 100644 --- a/library/Zend/Dojo/Form/Decorator/StackContainer.php +++ b/library/Zend/Dojo/Form/Decorator/StackContainer.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +29,9 @@ require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StackContainer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Decorator_StackContainer extends Zend_Dojo_Form_Decorator_DijitContainer { diff --git a/library/Zend/Dojo/Form/Decorator/TabContainer.php b/library/Zend/Dojo/Form/Decorator/TabContainer.php index 1400456..851b666 100644 --- a/library/Zend/Dojo/Form/Decorator/TabContainer.php +++ b/library/Zend/Dojo/Form/Decorator/TabContainer.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +29,9 @@ require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; * @uses Zend_Dojo_Form_Decorator_DijitContainer * @package Zend_Dojo * @subpackage Form_Decorator - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TabContainer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Decorator_TabContainer extends Zend_Dojo_Form_Decorator_DijitContainer { diff --git a/library/Zend/Dojo/Form/DisplayGroup.php b/library/Zend/Dojo/Form/DisplayGroup.php index 7ea38b1..4c84653 100644 --- a/library/Zend/Dojo/Form/DisplayGroup.php +++ b/library/Zend/Dojo/Form/DisplayGroup.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Form/DisplayGroup.php'; * @uses Zend_Form_DisplayGroup * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DisplayGroup.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_DisplayGroup extends Zend_Form_DisplayGroup { diff --git a/library/Zend/Dojo/Form/Element/Button.php b/library/Zend/Dojo/Form/Element/Button.php index a0ddee2..021768f 100644 --- a/library/Zend/Dojo/Form/Element/Button.php +++ b/library/Zend/Dojo/Form/Element/Button.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/Dijit.php'; * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Button.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_Button extends Zend_Dojo_Form_Element_Dijit { diff --git a/library/Zend/Dojo/Form/Element/CheckBox.php b/library/Zend/Dojo/Form/Element/CheckBox.php index 565b23a..16147ee 100644 --- a/library/Zend/Dojo/Form/Element/CheckBox.php +++ b/library/Zend/Dojo/Form/Element/CheckBox.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ require_once 'Zend/Dojo/Form/Element/Dijit.php'; * @uses Zend_Dojo_Form_Element_Dijit * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CheckBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_CheckBox extends Zend_Dojo_Form_Element_Dijit { diff --git a/library/Zend/Dojo/Form/Element/ComboBox.php b/library/Zend/Dojo/Form/Element/ComboBox.php index c61f2f6..8db34dd 100644 --- a/library/Zend/Dojo/Form/Element/ComboBox.php +++ b/library/Zend/Dojo/Form/Element/ComboBox.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/DijitMulti.php'; * @uses Zend_Dojo_Form_Element_DijitMulti * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ComboBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_ComboBox extends Zend_Dojo_Form_Element_DijitMulti { diff --git a/library/Zend/Dojo/Form/Element/CurrencyTextBox.php b/library/Zend/Dojo/Form/Element/CurrencyTextBox.php index 854ac70..ecb8218 100644 --- a/library/Zend/Dojo/Form/Element/CurrencyTextBox.php +++ b/library/Zend/Dojo/Form/Element/CurrencyTextBox.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/NumberTextBox.php'; * @uses Zend_Dojo_Form_Element_NumberTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CurrencyTextBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_CurrencyTextBox extends Zend_Dojo_Form_Element_NumberTextBox { diff --git a/library/Zend/Dojo/Form/Element/DateTextBox.php b/library/Zend/Dojo/Form/Element/DateTextBox.php index dd13d13..c22ceeb 100644 --- a/library/Zend/Dojo/Form/Element/DateTextBox.php +++ b/library/Zend/Dojo/Form/Element/DateTextBox.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; * @uses Zend_Dojo_Form_Element_ValidationTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DateTextBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_DateTextBox extends Zend_Dojo_Form_Element_ValidationTextBox { diff --git a/library/Zend/Dojo/Form/Element/Dijit.php b/library/Zend/Dojo/Form/Element/Dijit.php index a3b24cb..1685627 100644 --- a/library/Zend/Dojo/Form/Element/Dijit.php +++ b/library/Zend/Dojo/Form/Element/Dijit.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Form/Element.php'; * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dijit.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ abstract class Zend_Dojo_Form_Element_Dijit extends Zend_Form_Element { diff --git a/library/Zend/Dojo/Form/Element/DijitMulti.php b/library/Zend/Dojo/Form/Element/DijitMulti.php index b7e4d48..120d174 100644 --- a/library/Zend/Dojo/Form/Element/DijitMulti.php +++ b/library/Zend/Dojo/Form/Element/DijitMulti.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,9 +30,9 @@ require_once 'Zend/Dojo/Form/Element/Dijit.php'; * @uses Zend_Dojo_Form_Element_Dijit * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DijitMulti.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ abstract class Zend_Dojo_Form_Element_DijitMulti extends Zend_Dojo_Form_Element_Dijit { diff --git a/library/Zend/Dojo/Form/Element/Editor.php b/library/Zend/Dojo/Form/Element/Editor.php index 68eb202..29f15a0 100644 --- a/library/Zend/Dojo/Form/Element/Editor.php +++ b/library/Zend/Dojo/Form/Element/Editor.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Editor.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Dojo_Form_Element_Dijit */ @@ -30,7 +30,7 @@ require_once 'Zend/Dojo/Form/Element/Dijit.php'; * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_Form_Element_Editor extends Zend_Dojo_Form_Element_Dijit diff --git a/library/Zend/Dojo/Form/Element/FilteringSelect.php b/library/Zend/Dojo/Form/Element/FilteringSelect.php index 44bec17..6f5e451 100644 --- a/library/Zend/Dojo/Form/Element/FilteringSelect.php +++ b/library/Zend/Dojo/Form/Element/FilteringSelect.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/ComboBox.php'; * @uses Zend_Dojo_Form_Element_ComboBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FilteringSelect.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_FilteringSelect extends Zend_Dojo_Form_Element_ComboBox { diff --git a/library/Zend/Dojo/Form/Element/HorizontalSlider.php b/library/Zend/Dojo/Form/Element/HorizontalSlider.php index 166abff..02b9f07 100644 --- a/library/Zend/Dojo/Form/Element/HorizontalSlider.php +++ b/library/Zend/Dojo/Form/Element/HorizontalSlider.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/Slider.php'; * @uses Zend_Dojo_Form_Element_Slider * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: HorizontalSlider.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_HorizontalSlider extends Zend_Dojo_Form_Element_Slider { diff --git a/library/Zend/Dojo/Form/Element/NumberSpinner.php b/library/Zend/Dojo/Form/Element/NumberSpinner.php index db3f74d..8d1bd93 100644 --- a/library/Zend/Dojo/Form/Element/NumberSpinner.php +++ b/library/Zend/Dojo/Form/Element/NumberSpinner.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; * @uses Zend_Dojo_Form_Element_ValidationTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NumberSpinner.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_NumberSpinner extends Zend_Dojo_Form_Element_ValidationTextBox { diff --git a/library/Zend/Dojo/Form/Element/NumberTextBox.php b/library/Zend/Dojo/Form/Element/NumberTextBox.php index 0c81f5c..db8d03c 100644 --- a/library/Zend/Dojo/Form/Element/NumberTextBox.php +++ b/library/Zend/Dojo/Form/Element/NumberTextBox.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; * @uses Zend_Dojo_Form_Element_ValidationTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: NumberTextBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_NumberTextBox extends Zend_Dojo_Form_Element_ValidationTextBox { diff --git a/library/Zend/Dojo/Form/Element/PasswordTextBox.php b/library/Zend/Dojo/Form/Element/PasswordTextBox.php index 81794e3..f45cb4c 100644 --- a/library/Zend/Dojo/Form/Element/PasswordTextBox.php +++ b/library/Zend/Dojo/Form/Element/PasswordTextBox.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; * @uses Zend_Dojo_Form_Element_ValidationTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PasswordTextBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_PasswordTextBox extends Zend_Dojo_Form_Element_ValidationTextBox { diff --git a/library/Zend/Dojo/Form/Element/RadioButton.php b/library/Zend/Dojo/Form/Element/RadioButton.php index 5644854..a3794e4 100644 --- a/library/Zend/Dojo/Form/Element/RadioButton.php +++ b/library/Zend/Dojo/Form/Element/RadioButton.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/DijitMulti.php'; * @uses Zend_Dojo_Form_Element_DijitMulti * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RadioButton.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_RadioButton extends Zend_Dojo_Form_Element_DijitMulti { diff --git a/library/Zend/Dojo/Form/Element/SimpleTextarea.php b/library/Zend/Dojo/Form/Element/SimpleTextarea.php index dae51ae..eaf4ce8 100644 --- a/library/Zend/Dojo/Form/Element/SimpleTextarea.php +++ b/library/Zend/Dojo/Form/Element/SimpleTextarea.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +29,9 @@ require_once 'Zend/Dojo/Form/Element/Dijit.php'; * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SimpleTextarea.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_SimpleTextarea extends Zend_Dojo_Form_Element_Dijit { diff --git a/library/Zend/Dojo/Form/Element/Slider.php b/library/Zend/Dojo/Form/Element/Slider.php index 076bc1f..4d8fa92 100644 --- a/library/Zend/Dojo/Form/Element/Slider.php +++ b/library/Zend/Dojo/Form/Element/Slider.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/Dijit.php'; * @uses Zend_Dojo_Form_Element_Dijit * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Slider.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ abstract class Zend_Dojo_Form_Element_Slider extends Zend_Dojo_Form_Element_Dijit { diff --git a/library/Zend/Dojo/Form/Element/SubmitButton.php b/library/Zend/Dojo/Form/Element/SubmitButton.php index 706e739..a52409d 100644 --- a/library/Zend/Dojo/Form/Element/SubmitButton.php +++ b/library/Zend/Dojo/Form/Element/SubmitButton.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/Button.php'; * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubmitButton.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_SubmitButton extends Zend_Dojo_Form_Element_Button { diff --git a/library/Zend/Dojo/Form/Element/TextBox.php b/library/Zend/Dojo/Form/Element/TextBox.php index 2f3c0ad..4f0d5dd 100644 --- a/library/Zend/Dojo/Form/Element/TextBox.php +++ b/library/Zend/Dojo/Form/Element/TextBox.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/Dijit.php'; * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TextBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_TextBox extends Zend_Dojo_Form_Element_Dijit { diff --git a/library/Zend/Dojo/Form/Element/Textarea.php b/library/Zend/Dojo/Form/Element/Textarea.php index 6e15404..5e2bcf7 100644 --- a/library/Zend/Dojo/Form/Element/Textarea.php +++ b/library/Zend/Dojo/Form/Element/Textarea.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/Dijit.php'; * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Textarea.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_Textarea extends Zend_Dojo_Form_Element_Dijit { diff --git a/library/Zend/Dojo/Form/Element/TimeTextBox.php b/library/Zend/Dojo/Form/Element/TimeTextBox.php index 8fe7f18..efba5ca 100644 --- a/library/Zend/Dojo/Form/Element/TimeTextBox.php +++ b/library/Zend/Dojo/Form/Element/TimeTextBox.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/DateTextBox.php'; * @uses Zend_Dojo_Form_Element_DateTextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimeTextBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_TimeTextBox extends Zend_Dojo_Form_Element_DateTextBox { diff --git a/library/Zend/Dojo/Form/Element/ValidationTextBox.php b/library/Zend/Dojo/Form/Element/ValidationTextBox.php index a243ef4..bdce7d7 100644 --- a/library/Zend/Dojo/Form/Element/ValidationTextBox.php +++ b/library/Zend/Dojo/Form/Element/ValidationTextBox.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/TextBox.php'; * @uses Zend_Dojo_Form_Element_TextBox * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ValidationTextBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_ValidationTextBox extends Zend_Dojo_Form_Element_TextBox { diff --git a/library/Zend/Dojo/Form/Element/VerticalSlider.php b/library/Zend/Dojo/Form/Element/VerticalSlider.php index a33ad8a..3b35e3d 100644 --- a/library/Zend/Dojo/Form/Element/VerticalSlider.php +++ b/library/Zend/Dojo/Form/Element/VerticalSlider.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Dojo/Form/Element/Slider.php'; * @uses Zend_Dojo_Form_Element_Slider * @package Zend_Dojo * @subpackage Form_Element - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: VerticalSlider.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_Element_VerticalSlider extends Zend_Dojo_Form_Element_Slider { diff --git a/library/Zend/Dojo/Form/SubForm.php b/library/Zend/Dojo/Form/SubForm.php index 5f3f1a5..c73773c 100644 --- a/library/Zend/Dojo/Form/SubForm.php +++ b/library/Zend/Dojo/Form/SubForm.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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,9 +28,9 @@ require_once 'Zend/Form/SubForm.php'; * @uses Zend_Form_SubForm * @package Zend_Dojo * @subpackage Form - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: SubForm.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ class Zend_Dojo_Form_SubForm extends Zend_Form_SubForm { diff --git a/library/Zend/Dojo/View/Exception.php b/library/Zend/Dojo/View/Exception.php index 6c4c254..b910c1e 100644 --- a/library/Zend/Dojo/View/Exception.php +++ b/library/Zend/Dojo/View/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/Exception.php'; * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Exception extends Zend_Dojo_Exception diff --git a/library/Zend/Dojo/View/Helper/AccordionContainer.php b/library/Zend/Dojo/View/Helper/AccordionContainer.php index 62c7871..cb13249 100644 --- a/library/Zend/Dojo/View/Helper/AccordionContainer.php +++ b/library/Zend/Dojo/View/Helper/AccordionContainer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccordionContainer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_AccordionContainer extends Zend_Dojo_View_Helper_DijitContainer diff --git a/library/Zend/Dojo/View/Helper/AccordionPane.php b/library/Zend/Dojo/View/Helper/AccordionPane.php index 4619932..23a8a92 100644 --- a/library/Zend/Dojo/View/Helper/AccordionPane.php +++ b/library/Zend/Dojo/View/Helper/AccordionPane.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: AccordionPane.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_AccordionPane extends Zend_Dojo_View_Helper_DijitContainer diff --git a/library/Zend/Dojo/View/Helper/BorderContainer.php b/library/Zend/Dojo/View/Helper/BorderContainer.php index d531abc..95e5ce2 100644 --- a/library/Zend/Dojo/View/Helper/BorderContainer.php +++ b/library/Zend/Dojo/View/Helper/BorderContainer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BorderContainer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_BorderContainer extends Zend_Dojo_View_Helper_DijitContainer diff --git a/library/Zend/Dojo/View/Helper/Button.php b/library/Zend/Dojo/View/Helper/Button.php index 56a232b..1c71083 100644 --- a/library/Zend/Dojo/View/Helper/Button.php +++ b/library/Zend/Dojo/View/Helper/Button.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Button.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/View/Helper/Dijit.php'; * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_Button extends Zend_Dojo_View_Helper_Dijit diff --git a/library/Zend/Dojo/View/Helper/CheckBox.php b/library/Zend/Dojo/View/Helper/CheckBox.php index aefd482..21b1e2a 100644 --- a/library/Zend/Dojo/View/Helper/CheckBox.php +++ b/library/Zend/Dojo/View/Helper/CheckBox.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CheckBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/View/Helper/Dijit.php'; * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_CheckBox extends Zend_Dojo_View_Helper_Dijit diff --git a/library/Zend/Dojo/View/Helper/ComboBox.php b/library/Zend/Dojo/View/Helper/ComboBox.php index 0fc9ce1..5f75084 100644 --- a/library/Zend/Dojo/View/Helper/ComboBox.php +++ b/library/Zend/Dojo/View/Helper/ComboBox.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ComboBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/View/Helper/Dijit.php'; * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_ComboBox extends Zend_Dojo_View_Helper_Dijit diff --git a/library/Zend/Dojo/View/Helper/ContentPane.php b/library/Zend/Dojo/View/Helper/ContentPane.php index f57ea6a..eb53e54 100644 --- a/library/Zend/Dojo/View/Helper/ContentPane.php +++ b/library/Zend/Dojo/View/Helper/ContentPane.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ContentPane.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_ContentPane extends Zend_Dojo_View_Helper_DijitContainer diff --git a/library/Zend/Dojo/View/Helper/CurrencyTextBox.php b/library/Zend/Dojo/View/Helper/CurrencyTextBox.php index f886362..a1b8921 100644 --- a/library/Zend/Dojo/View/Helper/CurrencyTextBox.php +++ b/library/Zend/Dojo/View/Helper/CurrencyTextBox.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CurrencyTextBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/View/Helper/Dijit.php'; * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_CurrencyTextBox extends Zend_Dojo_View_Helper_Dijit diff --git a/library/Zend/Dojo/View/Helper/CustomDijit.php b/library/Zend/Dojo/View/Helper/CustomDijit.php index 29f17ea..09483d0 100644 --- a/library/Zend/Dojo/View/Helper/CustomDijit.php +++ b/library/Zend/Dojo/View/Helper/CustomDijit.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CustomDijit.php 25024 2012-07-30 15:08:15Z rob $ + * @version $Id$ */ /** Zend_Dojo_View_Helper_DijitContainer */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; * @uses Zend_Dojo_View_Helper_DijitContainer * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_CustomDijit extends Zend_Dojo_View_Helper_DijitContainer diff --git a/library/Zend/Dojo/View/Helper/DateTextBox.php b/library/Zend/Dojo/View/Helper/DateTextBox.php index 111ea56..edcdea6 100644 --- a/library/Zend/Dojo/View/Helper/DateTextBox.php +++ b/library/Zend/Dojo/View/Helper/DateTextBox.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DateTextBox.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/View/Helper/Dijit.php'; * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_DateTextBox extends Zend_Dojo_View_Helper_Dijit diff --git a/library/Zend/Dojo/View/Helper/Dijit.php b/library/Zend/Dojo/View/Helper/Dijit.php index 76cd8df..43235e0 100644 --- a/library/Zend/Dojo/View/Helper/Dijit.php +++ b/library/Zend/Dojo/View/Helper/Dijit.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Dijit.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_View_Helper_HtmlElement */ @@ -29,7 +29,7 @@ require_once 'Zend/View/Helper/HtmlElement.php'; * @uses Zend_View_Helper_Abstract * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Dojo_View_Helper_Dijit extends Zend_View_Helper_HtmlElement diff --git a/library/Zend/Dojo/View/Helper/DijitContainer.php b/library/Zend/Dojo/View/Helper/DijitContainer.php index 48a6199..be89822 100644 --- a/library/Zend/Dojo/View/Helper/DijitContainer.php +++ b/library/Zend/Dojo/View/Helper/DijitContainer.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: DijitContainer.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** Zend_Dojo_View_Helper_Dijit */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo/View/Helper/Dijit.php'; * @uses Zend_Dojo_View_Helper_Dijit * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Dojo_View_Helper_DijitContainer extends Zend_Dojo_View_Helper_Dijit diff --git a/library/Zend/Dojo/View/Helper/Dojo.php b/library/Zend/Dojo/View/Helper/Dojo.php index f4346a7..05e4bcb 100644 --- a/library/Zend/Dojo/View/Helper/Dojo.php +++ b/library/Zend/Dojo/View/Helper/Dojo.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Dojo.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ require_once 'Zend/Registry.php'; * * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_Dojo diff --git a/library/Zend/Dojo/View/Helper/Dojo/Container.php b/library/Zend/Dojo/View/Helper/Dojo/Container.php index 41c462a..f0fdce7 100644 --- a/library/Zend/Dojo/View/Helper/Dojo/Container.php +++ b/library/Zend/Dojo/View/Helper/Dojo/Container.php @@ -15,8 +15,8 @@ * @category Zend * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Container.php 24593 2012-01-05 20:35:02Z matthew $ + * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) + * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ require_once 'Zend/Dojo.php'; * * @package Zend_Dojo * @subpackage View - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @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 Zend_Dojo_View_Helper_Dojo_Container @@ -1026,7 +1026,7 @@ EOJ; return ''; } - array_reverse($stylesheets); + $stylesheets = array_reverse($stylesheets); $style = '