From 385157be8f3e918a8c36e68de259d586b45c6a4d Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 13 Nov 2014 10:48:47 +0100 Subject: [PATCH] Zend: Remove require_once calls refs #7464 --- library/vendor/Zend/Acl.php | 18 --- library/vendor/Zend/Acl/Assert/Interface.php | 3 - library/vendor/Zend/Acl/Exception.php | 1 - library/vendor/Zend/Acl/Resource.php | 1 - library/vendor/Zend/Acl/Role.php | 1 - library/vendor/Zend/Acl/Role/Registry.php | 6 - .../Zend/Acl/Role/Registry/Exception.php | 1 - library/vendor/Zend/Amf/Adobe/Auth.php | 5 - .../vendor/Zend/Amf/Adobe/Introspector.php | 4 - library/vendor/Zend/Amf/Auth/Abstract.php | 1 - library/vendor/Zend/Amf/Exception.php | 1 - .../Zend/Amf/Parse/Amf0/Deserializer.php | 8 -- .../vendor/Zend/Amf/Parse/Amf0/Serializer.php | 7 -- .../Zend/Amf/Parse/Amf3/Deserializer.php | 11 -- .../vendor/Zend/Amf/Parse/Amf3/Serializer.php | 11 -- library/vendor/Zend/Amf/Parse/InputStream.php | 1 - .../vendor/Zend/Amf/Parse/OutputStream.php | 1 - library/vendor/Zend/Amf/Parse/TypeLoader.php | 9 -- library/vendor/Zend/Amf/Request.php | 8 -- library/vendor/Zend/Amf/Request/Http.php | 1 - library/vendor/Zend/Amf/Response.php | 3 - library/vendor/Zend/Amf/Response/Http.php | 1 - library/vendor/Zend/Amf/Server.php | 41 ------- library/vendor/Zend/Amf/Server/Exception.php | 1 - library/vendor/Zend/Amf/Util/BinaryStream.php | 3 - .../Value/Messaging/AcknowledgeMessage.php | 1 - .../Zend/Amf/Value/Messaging/AsyncMessage.php | 1 - .../Amf/Value/Messaging/CommandMessage.php | 1 - .../Zend/Amf/Value/Messaging/ErrorMessage.php | 1 - .../Amf/Value/Messaging/RemotingMessage.php | 1 - library/vendor/Zend/Application.php | 2 - .../Zend/Application/Bootstrap/Bootstrap.php | 1 - .../Bootstrap/BootstrapAbstract.php | 2 - .../Zend/Application/Bootstrap/Exception.php | 1 - library/vendor/Zend/Application/Exception.php | 1 - .../Zend/Application/Module/Autoloader.php | 1 - .../Zend/Application/Module/Bootstrap.php | 1 - .../Application/Resource/Cachemanager.php | 1 - .../vendor/Zend/Application/Resource/Db.php | 1 - .../vendor/Zend/Application/Resource/Dojo.php | 1 - .../Zend/Application/Resource/Exception.php | 1 - .../Application/Resource/Frontcontroller.php | 3 - .../Zend/Application/Resource/Layout.php | 1 - .../Zend/Application/Resource/Locale.php | 1 - .../vendor/Zend/Application/Resource/Log.php | 1 - .../vendor/Zend/Application/Resource/Mail.php | 1 - .../Zend/Application/Resource/Modules.php | 1 - .../Zend/Application/Resource/Multidb.php | 2 - .../Zend/Application/Resource/Navigation.php | 1 - .../Application/Resource/ResourceAbstract.php | 1 - .../Zend/Application/Resource/Router.php | 1 - .../Zend/Application/Resource/Session.php | 1 - .../Zend/Application/Resource/Translate.php | 4 - .../vendor/Zend/Application/Resource/View.php | 1 - library/vendor/Zend/Auth.php | 1 - library/vendor/Zend/Auth/Adapter/DbTable.php | 7 -- library/vendor/Zend/Auth/Adapter/Digest.php | 3 - .../vendor/Zend/Auth/Adapter/Exception.php | 1 - library/vendor/Zend/Auth/Adapter/Http.php | 15 --- .../Auth/Adapter/Http/Resolver/Exception.php | 1 - .../Zend/Auth/Adapter/Http/Resolver/File.php | 7 -- .../vendor/Zend/Auth/Adapter/Interface.php | 1 - library/vendor/Zend/Auth/Adapter/OpenId.php | 2 - library/vendor/Zend/Auth/Exception.php | 1 - .../vendor/Zend/Auth/Storage/Exception.php | 1 - .../Zend/Auth/Storage/NonPersistent.php | 1 - library/vendor/Zend/Auth/Storage/Session.php | 2 - library/vendor/Zend/Barcode.php | 9 -- library/vendor/Zend/Barcode/Exception.php | 1 - .../vendor/Zend/Barcode/Object/Code128.php | 2 - library/vendor/Zend/Barcode/Object/Code25.php | 2 - .../Zend/Barcode/Object/Code25interleaved.php | 2 - library/vendor/Zend/Barcode/Object/Code39.php | 2 - library/vendor/Zend/Barcode/Object/Ean13.php | 2 - library/vendor/Zend/Barcode/Object/Ean2.php | 2 - library/vendor/Zend/Barcode/Object/Ean5.php | 2 - library/vendor/Zend/Barcode/Object/Ean8.php | 3 - library/vendor/Zend/Barcode/Object/Error.php | 1 - .../vendor/Zend/Barcode/Object/Exception.php | 1 - .../vendor/Zend/Barcode/Object/Identcode.php | 2 - library/vendor/Zend/Barcode/Object/Itf14.php | 2 - .../vendor/Zend/Barcode/Object/Leitcode.php | 2 - .../Zend/Barcode/Object/ObjectAbstract.php | 13 --- library/vendor/Zend/Barcode/Object/Planet.php | 2 - .../vendor/Zend/Barcode/Object/Postnet.php | 2 - .../vendor/Zend/Barcode/Object/Royalmail.php | 2 - library/vendor/Zend/Barcode/Object/Upca.php | 2 - library/vendor/Zend/Barcode/Object/Upce.php | 3 - .../Zend/Barcode/Renderer/Exception.php | 1 - .../vendor/Zend/Barcode/Renderer/Image.php | 13 --- library/vendor/Zend/Barcode/Renderer/Pdf.php | 5 - .../Barcode/Renderer/RendererAbstract.php | 8 -- library/vendor/Zend/Barcode/Renderer/Svg.php | 8 -- library/vendor/Zend/Cache.php | 6 - library/vendor/Zend/Cache/Backend.php | 3 - .../vendor/Zend/Cache/Backend/BlackHole.php | 2 - .../Zend/Cache/Backend/ExtendedInterface.php | 1 - library/vendor/Zend/Cache/Backend/File.php | 2 - library/vendor/Zend/Cache/Backend/Sqlite.php | 2 - library/vendor/Zend/Cache/Backend/Static.php | 2 - library/vendor/Zend/Cache/Backend/Test.php | 2 - .../vendor/Zend/Cache/Backend/TwoLevels.php | 2 - .../vendor/Zend/Cache/Backend/WinCache.php | 2 - library/vendor/Zend/Cache/Backend/Xcache.php | 2 - .../Zend/Cache/Backend/ZendPlatform.php | 2 - .../vendor/Zend/Cache/Backend/ZendServer.php | 2 - .../Zend/Cache/Backend/ZendServer/Disk.php | 2 - .../Zend/Cache/Backend/ZendServer/ShMem.php | 2 - library/vendor/Zend/Cache/Core.php | 3 - library/vendor/Zend/Cache/Exception.php | 1 - .../vendor/Zend/Cache/Frontend/Capture.php | 1 - library/vendor/Zend/Cache/Frontend/Class.php | 1 - library/vendor/Zend/Cache/Frontend/File.php | 1 - .../vendor/Zend/Cache/Frontend/Function.php | 1 - library/vendor/Zend/Cache/Frontend/Output.php | 1 - library/vendor/Zend/Cache/Frontend/Page.php | 1 - library/vendor/Zend/Cache/Manager.php | 4 - library/vendor/Zend/Cloud/AbstractFactory.php | 1 - .../Adapter/AbstractAdapter.php | 4 - .../DocumentService/Adapter/SimpleDb.php | 6 - .../Adapter/SimpleDb/Query.php | 2 - .../DocumentService/Adapter/WindowsAzure.php | 6 - .../Adapter/WindowsAzure/Query.php | 4 - .../Zend/Cloud/DocumentService/Document.php | 2 - .../Zend/Cloud/DocumentService/Exception.php | 1 - .../Zend/Cloud/DocumentService/Factory.php | 3 - .../Zend/Cloud/DocumentService/Query.php | 6 - library/vendor/Zend/Cloud/Exception.php | 1 - .../Adapter/AbstractAdapter.php | 8 -- .../Zend/Cloud/Infrastructure/Adapter/Ec2.php | 17 --- .../Infrastructure/Adapter/Rackspace.php | 21 ---- .../Zend/Cloud/Infrastructure/Exception.php | 1 - .../Zend/Cloud/Infrastructure/Factory.php | 3 - .../Zend/Cloud/Infrastructure/Image.php | 2 - .../Zend/Cloud/Infrastructure/ImageList.php | 5 - .../Zend/Cloud/Infrastructure/Instance.php | 3 - .../Cloud/Infrastructure/InstanceList.php | 6 - .../Cloud/OperationNotAvailableException.php | 1 - .../QueueService/Adapter/AbstractAdapter.php | 3 - .../Zend/Cloud/QueueService/Adapter/Sqs.php | 5 - .../QueueService/Adapter/WindowsAzure.php | 3 - .../Cloud/QueueService/Adapter/ZendQueue.php | 4 - .../Zend/Cloud/QueueService/Exception.php | 1 - .../Zend/Cloud/QueueService/Factory.php | 3 - .../StorageService/Adapter/FileSystem.php | 4 - .../StorageService/Adapter/Rackspace.php | 5 - .../Zend/Cloud/StorageService/Adapter/S3.php | 8 -- .../StorageService/Adapter/WindowsAzure.php | 3 - .../Zend/Cloud/StorageService/Exception.php | 1 - .../Zend/Cloud/StorageService/Factory.php | 3 - .../vendor/Zend/CodeGenerator/Exception.php | 1 - .../Zend/CodeGenerator/Php/Abstract.php | 1 - .../vendor/Zend/CodeGenerator/Php/Body.php | 1 - .../vendor/Zend/CodeGenerator/Php/Class.php | 13 --- .../Zend/CodeGenerator/Php/Docblock.php | 3 - .../Zend/CodeGenerator/Php/Docblock/Tag.php | 2 - .../Php/Docblock/Tag/License.php | 1 - .../CodeGenerator/Php/Docblock/Tag/Param.php | 1 - .../CodeGenerator/Php/Docblock/Tag/Return.php | 1 - .../Zend/CodeGenerator/Php/Exception.php | 1 - .../vendor/Zend/CodeGenerator/Php/File.php | 8 -- .../CodeGenerator/Php/Member/Abstract.php | 3 - .../vendor/Zend/CodeGenerator/Php/Method.php | 4 - .../Zend/CodeGenerator/Php/Parameter.php | 2 - .../Php/Parameter/DefaultValue.php | 1 - .../Zend/CodeGenerator/Php/Property.php | 3 - .../Php/Property/DefaultValue.php | 2 - library/vendor/Zend/Config.php | 3 - library/vendor/Zend/Config/Exception.php | 1 - library/vendor/Zend/Config/Ini.php | 8 -- library/vendor/Zend/Config/Json.php | 9 -- library/vendor/Zend/Config/Writer/Array.php | 1 - .../Zend/Config/Writer/FileAbstract.php | 4 - library/vendor/Zend/Config/Writer/Ini.php | 2 - library/vendor/Zend/Config/Writer/Json.php | 2 - library/vendor/Zend/Config/Writer/Xml.php | 3 - library/vendor/Zend/Config/Writer/Yaml.php | 3 - library/vendor/Zend/Config/Xml.php | 14 --- library/vendor/Zend/Config/Yaml.php | 9 -- library/vendor/Zend/Console/Getopt.php | 12 -- .../vendor/Zend/Console/Getopt/Exception.php | 1 - library/vendor/Zend/Controller/Action.php | 9 -- .../Zend/Controller/Action/Exception.php | 1 - .../Controller/Action/Helper/Abstract.php | 1 - .../Controller/Action/Helper/ActionStack.php | 5 - .../Controller/Action/Helper/AjaxContext.php | 1 - .../Action/Helper/AutoComplete/Abstract.php | 3 - .../Action/Helper/AutoCompleteDojo.php | 4 - .../Helper/AutoCompleteScriptaculous.php | 2 - .../Zend/Controller/Action/Helper/Cache.php | 3 - .../Action/Helper/ContextSwitch.php | 17 --- .../Action/Helper/FlashMessenger.php | 2 - .../Zend/Controller/Action/Helper/Json.php | 3 - .../Controller/Action/Helper/Redirector.php | 3 - .../Zend/Controller/Action/Helper/Url.php | 1 - .../Controller/Action/Helper/ViewRenderer.php | 7 -- .../Zend/Controller/Action/HelperBroker.php | 8 -- .../Action/HelperBroker/PriorityStack.php | 3 - .../Zend/Controller/Dispatcher/Abstract.php | 5 - .../Zend/Controller/Dispatcher/Exception.php | 1 - .../Zend/Controller/Dispatcher/Interface.php | 2 - .../Zend/Controller/Dispatcher/Standard.php | 8 -- library/vendor/Zend/Controller/Exception.php | 1 - library/vendor/Zend/Controller/Front.php | 17 --- .../Zend/Controller/Plugin/ActionStack.php | 3 - .../vendor/Zend/Controller/Plugin/Broker.php | 4 - .../Zend/Controller/Plugin/ErrorHandler.php | 1 - .../Zend/Controller/Plugin/PutHandler.php | 2 - .../Zend/Controller/Request/Apache404.php | 2 - .../Zend/Controller/Request/Exception.php | 1 - .../vendor/Zend/Controller/Request/Http.php | 7 -- .../Zend/Controller/Request/HttpTestCase.php | 2 - .../vendor/Zend/Controller/Request/Simple.php | 1 - .../Zend/Controller/Response/Abstract.php | 6 - .../vendor/Zend/Controller/Response/Cli.php | 1 - .../Zend/Controller/Response/Exception.php | 1 - .../vendor/Zend/Controller/Response/Http.php | 1 - .../Zend/Controller/Response/HttpTestCase.php | 1 - .../Zend/Controller/Router/Abstract.php | 2 - .../Zend/Controller/Router/Exception.php | 1 - .../vendor/Zend/Controller/Router/Rewrite.php | 13 --- .../vendor/Zend/Controller/Router/Route.php | 3 - .../Zend/Controller/Router/Route/Abstract.php | 2 - .../Zend/Controller/Router/Route/Chain.php | 1 - .../Zend/Controller/Router/Route/Hostname.php | 3 - .../Controller/Router/Route/Interface.php | 1 - .../Zend/Controller/Router/Route/Module.php | 1 - .../Zend/Controller/Router/Route/Regex.php | 3 - .../Zend/Controller/Router/Route/Static.php | 1 - library/vendor/Zend/Crypt.php | 1 - library/vendor/Zend/Crypt/DiffieHellman.php | 10 -- .../Zend/Crypt/DiffieHellman/Exception.php | 1 - library/vendor/Zend/Crypt/Exception.php | 1 - library/vendor/Zend/Crypt/Hmac.php | 4 - library/vendor/Zend/Crypt/Hmac/Exception.php | 1 - library/vendor/Zend/Crypt/Math.php | 1 - library/vendor/Zend/Crypt/Math/BigInteger.php | 6 - .../Zend/Crypt/Math/BigInteger/Bcmath.php | 1 - .../Zend/Crypt/Math/BigInteger/Exception.php | 1 - .../vendor/Zend/Crypt/Math/BigInteger/Gmp.php | 1 - library/vendor/Zend/Crypt/Math/Exception.php | 1 - library/vendor/Zend/Crypt/Rsa.php | 4 - library/vendor/Zend/Crypt/Rsa/Exception.php | 1 - library/vendor/Zend/Crypt/Rsa/Key.php | 1 - library/vendor/Zend/Crypt/Rsa/Key/Private.php | 3 - library/vendor/Zend/Crypt/Rsa/Key/Public.php | 2 - library/vendor/Zend/Currency.php | 18 --- library/vendor/Zend/Currency/Exception.php | 1 - library/vendor/Zend/Date.php | 106 ------------------ library/vendor/Zend/Date/Cities.php | 1 - library/vendor/Zend/Date/DateObject.php | 2 - library/vendor/Zend/Date/Exception.php | 1 - library/vendor/Zend/Db.php | 4 - library/vendor/Zend/Db/Adapter/Abstract.php | 13 --- library/vendor/Zend/Db/Adapter/Exception.php | 1 - .../vendor/Zend/Db/Adapter/Pdo/Abstract.php | 11 -- library/vendor/Zend/Db/Adapter/Pdo/Mysql.php | 3 - library/vendor/Zend/Db/Adapter/Pdo/Pgsql.php | 3 - library/vendor/Zend/Db/Adapter/Pdo/Sqlite.php | 6 - library/vendor/Zend/Db/Adapter/Sqlsrv.php | 17 --- .../Zend/Db/Adapter/Sqlsrv/Exception.php | 1 - library/vendor/Zend/Db/Exception.php | 1 - library/vendor/Zend/Db/Profiler.php | 4 - library/vendor/Zend/Db/Profiler/Exception.php | 1 - library/vendor/Zend/Db/Profiler/Firebug.php | 3 - library/vendor/Zend/Db/Select.php | 14 --- library/vendor/Zend/Db/Select/Exception.php | 1 - library/vendor/Zend/Db/Statement.php | 7 -- .../vendor/Zend/Db/Statement/Exception.php | 1 - library/vendor/Zend/Db/Statement/Pdo.php | 20 ---- library/vendor/Zend/Db/Statement/Sqlsrv.php | 10 -- .../Zend/Db/Statement/Sqlsrv/Exception.php | 1 - library/vendor/Zend/Db/Table.php | 2 - library/vendor/Zend/Db/Table/Abstract.php | 25 ----- library/vendor/Zend/Db/Table/Exception.php | 1 - library/vendor/Zend/Db/Table/Row.php | 1 - library/vendor/Zend/Db/Table/Row/Abstract.php | 24 ---- .../vendor/Zend/Db/Table/Row/Exception.php | 1 - library/vendor/Zend/Db/Table/Rowset.php | 1 - .../vendor/Zend/Db/Table/Rowset/Abstract.php | 5 - .../vendor/Zend/Db/Table/Rowset/Exception.php | 1 - library/vendor/Zend/Db/Table/Select.php | 3 - .../vendor/Zend/Db/Table/Select/Exception.php | 1 - library/vendor/Zend/Dom/Exception.php | 1 - library/vendor/Zend/Dom/Query.php | 7 -- library/vendor/Zend/EventManager/Event.php | 2 - .../Zend/EventManager/EventCollection.php | 1 - .../vendor/Zend/EventManager/EventManager.php | 11 -- .../Exception/InvalidArgumentException.php | 2 - library/vendor/Zend/EventManager/Filter.php | 1 - .../EventManager/Filter/FilterIterator.php | 2 - .../vendor/Zend/EventManager/FilterChain.php | 4 - .../Zend/EventManager/GlobalEventManager.php | 2 - .../SharedEventCollectionAware.php | 1 - .../Zend/EventManager/SharedEventManager.php | 2 - .../Zend/EventManager/StaticEventManager.php | 3 - library/vendor/Zend/File/ClassFileLocator.php | 1 - library/vendor/Zend/File/Transfer.php | 3 - .../Zend/File/Transfer/Adapter/Abstract.php | 23 ---- .../Zend/File/Transfer/Adapter/Http.php | 7 -- .../vendor/Zend/File/Transfer/Exception.php | 1 - library/vendor/Zend/Filter.php | 3 - library/vendor/Zend/Filter/Alnum.php | 2 - library/vendor/Zend/Filter/Alpha.php | 2 - library/vendor/Zend/Filter/BaseName.php | 1 - library/vendor/Zend/Filter/Boolean.php | 6 - library/vendor/Zend/Filter/Callback.php | 3 - library/vendor/Zend/Filter/Compress.php | 5 - library/vendor/Zend/Filter/Compress/Bz2.php | 7 -- .../Zend/Filter/Compress/CompressAbstract.php | 1 - library/vendor/Zend/Filter/Compress/Gz.php | 8 -- library/vendor/Zend/Filter/Compress/Lzf.php | 4 - library/vendor/Zend/Filter/Compress/Rar.php | 9 -- library/vendor/Zend/Filter/Compress/Tar.php | 11 -- library/vendor/Zend/Filter/Compress/Zip.php | 12 -- library/vendor/Zend/Filter/Decompress.php | 1 - library/vendor/Zend/Filter/Decrypt.php | 1 - library/vendor/Zend/Filter/Digits.php | 1 - library/vendor/Zend/Filter/Dir.php | 1 - library/vendor/Zend/Filter/Encrypt.php | 4 - library/vendor/Zend/Filter/Encrypt/Mcrypt.php | 13 --- .../vendor/Zend/Filter/Encrypt/Openssl.php | 12 -- library/vendor/Zend/Filter/Exception.php | 1 - library/vendor/Zend/Filter/File/Decrypt.php | 5 - library/vendor/Zend/Filter/File/Encrypt.php | 5 - library/vendor/Zend/Filter/File/LowerCase.php | 5 - library/vendor/Zend/Filter/File/Rename.php | 5 - library/vendor/Zend/Filter/File/UpperCase.php | 5 - library/vendor/Zend/Filter/HtmlEntities.php | 3 - library/vendor/Zend/Filter/Inflector.php | 4 - library/vendor/Zend/Filter/Input.php | 13 --- library/vendor/Zend/Filter/Int.php | 1 - .../Zend/Filter/LocalizedToNormalized.php | 2 - .../Zend/Filter/NormalizedToLocalized.php | 3 - library/vendor/Zend/Filter/Null.php | 2 - library/vendor/Zend/Filter/PregReplace.php | 2 - library/vendor/Zend/Filter/RealPath.php | 1 - library/vendor/Zend/Filter/StringToLower.php | 3 - library/vendor/Zend/Filter/StringToUpper.php | 3 - library/vendor/Zend/Filter/StringTrim.php | 1 - library/vendor/Zend/Filter/StripNewlines.php | 1 - library/vendor/Zend/Filter/StripTags.php | 1 - .../Zend/Filter/Word/CamelCaseToDash.php | 1 - .../Zend/Filter/Word/CamelCaseToSeparator.php | 1 - .../Filter/Word/CamelCaseToUnderscore.php | 1 - .../Zend/Filter/Word/DashToCamelCase.php | 1 - .../Zend/Filter/Word/DashToSeparator.php | 1 - .../Zend/Filter/Word/DashToUnderscore.php | 1 - .../Zend/Filter/Word/Separator/Abstract.php | 2 - .../Zend/Filter/Word/SeparatorToCamelCase.php | 1 - .../Zend/Filter/Word/SeparatorToDash.php | 1 - .../Zend/Filter/Word/SeparatorToSeparator.php | 2 - .../Filter/Word/UnderscoreToCamelCase.php | 1 - .../Zend/Filter/Word/UnderscoreToDash.php | 1 - .../Filter/Word/UnderscoreToSeparator.php | 1 - library/vendor/Zend/Form.php | 27 ----- .../vendor/Zend/Form/Decorator/Abstract.php | 3 - .../vendor/Zend/Form/Decorator/Callback.php | 2 - .../vendor/Zend/Form/Decorator/Captcha.php | 1 - .../Zend/Form/Decorator/Captcha/ReCaptcha.php | 1 - .../Zend/Form/Decorator/Captcha/Word.php | 1 - .../Zend/Form/Decorator/Description.php | 2 - .../Zend/Form/Decorator/DtDdWrapper.php | 1 - library/vendor/Zend/Form/Decorator/Errors.php | 1 - .../vendor/Zend/Form/Decorator/Exception.php | 1 - .../vendor/Zend/Form/Decorator/Fieldset.php | 1 - library/vendor/Zend/Form/Decorator/File.php | 3 - library/vendor/Zend/Form/Decorator/Form.php | 1 - .../Zend/Form/Decorator/FormElements.php | 1 - .../vendor/Zend/Form/Decorator/FormErrors.php | 1 - .../vendor/Zend/Form/Decorator/HtmlTag.php | 4 - library/vendor/Zend/Form/Decorator/Image.php | 2 - library/vendor/Zend/Form/Decorator/Label.php | 5 - .../Zend/Form/Decorator/PrepareElements.php | 1 - .../vendor/Zend/Form/Decorator/Tooltip.php | 1 - .../vendor/Zend/Form/Decorator/ViewHelper.php | 2 - .../vendor/Zend/Form/Decorator/ViewScript.php | 2 - library/vendor/Zend/Form/DisplayGroup.php | 10 -- library/vendor/Zend/Form/Element.php | 25 ----- library/vendor/Zend/Form/Element/Button.php | 1 - library/vendor/Zend/Form/Element/Captcha.php | 3 - library/vendor/Zend/Form/Element/Checkbox.php | 1 - .../vendor/Zend/Form/Element/Exception.php | 1 - library/vendor/Zend/Form/Element/File.php | 5 - library/vendor/Zend/Form/Element/Hash.php | 2 - library/vendor/Zend/Form/Element/Hidden.php | 1 - library/vendor/Zend/Form/Element/Image.php | 1 - library/vendor/Zend/Form/Element/Multi.php | 1 - .../Zend/Form/Element/MultiCheckbox.php | 1 - .../vendor/Zend/Form/Element/Multiselect.php | 1 - library/vendor/Zend/Form/Element/Note.php | 1 - library/vendor/Zend/Form/Element/Password.php | 1 - library/vendor/Zend/Form/Element/Radio.php | 1 - library/vendor/Zend/Form/Element/Reset.php | 1 - library/vendor/Zend/Form/Element/Select.php | 1 - library/vendor/Zend/Form/Element/Submit.php | 1 - library/vendor/Zend/Form/Element/Text.php | 1 - library/vendor/Zend/Form/Element/Textarea.php | 1 - library/vendor/Zend/Form/Element/Xhtml.php | 1 - library/vendor/Zend/Form/Exception.php | 1 - library/vendor/Zend/Form/SubForm.php | 1 - library/vendor/Zend/Gdata.php | 3 - library/vendor/Zend/Gdata/Analytics.php | 7 -- .../Zend/Gdata/Analytics/AccountEntry.php | 5 - .../Zend/Gdata/Analytics/AccountFeed.php | 1 - .../Zend/Gdata/Analytics/AccountQuery.php | 1 - .../vendor/Zend/Gdata/Analytics/DataEntry.php | 1 - .../vendor/Zend/Gdata/Analytics/DataFeed.php | 3 - .../vendor/Zend/Gdata/Analytics/DataQuery.php | 1 - .../Gdata/Analytics/Extension/Dimension.php | 1 - .../Zend/Gdata/Analytics/Extension/Goal.php | 1 - .../Zend/Gdata/Analytics/Extension/Metric.php | 1 - .../Gdata/Analytics/Extension/Property.php | 1 - .../Gdata/Analytics/Extension/TableId.php | 1 - library/vendor/Zend/Gdata/App.php | 27 ----- .../vendor/Zend/Gdata/App/AuthException.php | 1 - .../Zend/Gdata/App/BadMethodCallException.php | 1 - library/vendor/Zend/Gdata/App/Base.php | 8 -- .../vendor/Zend/Gdata/App/BaseMediaSource.php | 4 - .../Gdata/App/CaptchaRequiredException.php | 1 - library/vendor/Zend/Gdata/App/Entry.php | 7 -- library/vendor/Zend/Gdata/App/Exception.php | 1 - library/vendor/Zend/Gdata/App/Extension.php | 1 - .../Zend/Gdata/App/Extension/Author.php | 1 - .../Zend/Gdata/App/Extension/Category.php | 1 - .../Zend/Gdata/App/Extension/Content.php | 1 - .../Zend/Gdata/App/Extension/Contributor.php | 1 - .../Zend/Gdata/App/Extension/Control.php | 2 - .../vendor/Zend/Gdata/App/Extension/Draft.php | 1 - .../Zend/Gdata/App/Extension/Edited.php | 1 - .../Zend/Gdata/App/Extension/Element.php | 1 - .../vendor/Zend/Gdata/App/Extension/Email.php | 1 - .../Zend/Gdata/App/Extension/Generator.php | 1 - .../vendor/Zend/Gdata/App/Extension/Icon.php | 1 - .../vendor/Zend/Gdata/App/Extension/Id.php | 1 - .../vendor/Zend/Gdata/App/Extension/Link.php | 1 - .../vendor/Zend/Gdata/App/Extension/Logo.php | 1 - .../vendor/Zend/Gdata/App/Extension/Name.php | 1 - .../Zend/Gdata/App/Extension/Person.php | 4 - .../Zend/Gdata/App/Extension/Published.php | 1 - .../Zend/Gdata/App/Extension/Rights.php | 1 - .../Zend/Gdata/App/Extension/Source.php | 2 - .../Zend/Gdata/App/Extension/Subtitle.php | 1 - .../Zend/Gdata/App/Extension/Summary.php | 1 - .../vendor/Zend/Gdata/App/Extension/Text.php | 1 - .../vendor/Zend/Gdata/App/Extension/Title.php | 1 - .../Zend/Gdata/App/Extension/Updated.php | 1 - .../vendor/Zend/Gdata/App/Extension/Uri.php | 1 - library/vendor/Zend/Gdata/App/Feed.php | 4 - .../vendor/Zend/Gdata/App/FeedEntryParent.php | 12 -- .../Zend/Gdata/App/FeedSourceParent.php | 6 - .../vendor/Zend/Gdata/App/HttpException.php | 2 - library/vendor/Zend/Gdata/App/IOException.php | 1 - .../Gdata/App/InvalidArgumentException.php | 1 - .../App/LoggingHttpClientAdapterSocket.php | 1 - library/vendor/Zend/Gdata/App/MediaEntry.php | 4 - .../vendor/Zend/Gdata/App/MediaFileSource.php | 3 - library/vendor/Zend/Gdata/App/Util.php | 3 - .../Zend/Gdata/App/VersionException.php | 1 - library/vendor/Zend/Gdata/AuthSub.php | 7 -- library/vendor/Zend/Gdata/Books.php | 6 - .../Zend/Gdata/Books/CollectionEntry.php | 1 - .../Zend/Gdata/Books/CollectionFeed.php | 1 - .../Gdata/Books/Extension/AnnotationLink.php | 1 - .../Gdata/Books/Extension/BooksCategory.php | 1 - .../Zend/Gdata/Books/Extension/BooksLink.php | 1 - .../Gdata/Books/Extension/Embeddability.php | 1 - .../Zend/Gdata/Books/Extension/InfoLink.php | 1 - .../Gdata/Books/Extension/PreviewLink.php | 1 - .../Zend/Gdata/Books/Extension/Review.php | 1 - .../Gdata/Books/Extension/ThumbnailLink.php | 1 - .../Gdata/Books/Extension/Viewability.php | 1 - .../vendor/Zend/Gdata/Books/VolumeEntry.php | 16 --- .../vendor/Zend/Gdata/Books/VolumeFeed.php | 1 - .../vendor/Zend/Gdata/Books/VolumeQuery.php | 2 - library/vendor/Zend/Gdata/Calendar.php | 7 -- .../vendor/Zend/Gdata/Calendar/EventEntry.php | 6 - .../vendor/Zend/Gdata/Calendar/EventFeed.php | 2 - .../vendor/Zend/Gdata/Calendar/EventQuery.php | 6 - .../Gdata/Calendar/Extension/AccessLevel.php | 1 - .../Zend/Gdata/Calendar/Extension/Color.php | 1 - .../Zend/Gdata/Calendar/Extension/Hidden.php | 2 - .../Zend/Gdata/Calendar/Extension/Link.php | 2 - .../Gdata/Calendar/Extension/QuickAdd.php | 1 - .../Gdata/Calendar/Extension/Selected.php | 2 - .../Extension/SendEventNotifications.php | 1 - .../Gdata/Calendar/Extension/Timezone.php | 1 - .../Gdata/Calendar/Extension/WebContent.php | 1 - .../vendor/Zend/Gdata/Calendar/ListEntry.php | 8 -- .../vendor/Zend/Gdata/Calendar/ListFeed.php | 2 - library/vendor/Zend/Gdata/ClientLogin.php | 8 -- library/vendor/Zend/Gdata/Docs.php | 6 - .../Zend/Gdata/Docs/DocumentListEntry.php | 1 - .../Zend/Gdata/Docs/DocumentListFeed.php | 1 - library/vendor/Zend/Gdata/Docs/Query.php | 3 - library/vendor/Zend/Gdata/DublinCore.php | 1 - .../Gdata/DublinCore/Extension/Creator.php | 1 - .../Zend/Gdata/DublinCore/Extension/Date.php | 1 - .../DublinCore/Extension/Description.php | 1 - .../Gdata/DublinCore/Extension/Format.php | 1 - .../Gdata/DublinCore/Extension/Identifier.php | 1 - .../Gdata/DublinCore/Extension/Language.php | 1 - .../Gdata/DublinCore/Extension/Publisher.php | 1 - .../Gdata/DublinCore/Extension/Rights.php | 1 - .../Gdata/DublinCore/Extension/Subject.php | 1 - .../Zend/Gdata/DublinCore/Extension/Title.php | 1 - library/vendor/Zend/Gdata/Entry.php | 3 - library/vendor/Zend/Gdata/Exif.php | 1 - library/vendor/Zend/Gdata/Exif/Entry.php | 3 - .../Zend/Gdata/Exif/Extension/Distance.php | 2 - .../Zend/Gdata/Exif/Extension/Exposure.php | 2 - .../Zend/Gdata/Exif/Extension/FStop.php | 2 - .../Zend/Gdata/Exif/Extension/Flash.php | 2 - .../Zend/Gdata/Exif/Extension/FocalLength.php | 2 - .../Gdata/Exif/Extension/ImageUniqueId.php | 2 - .../vendor/Zend/Gdata/Exif/Extension/Iso.php | 2 - .../vendor/Zend/Gdata/Exif/Extension/Make.php | 2 - .../Zend/Gdata/Exif/Extension/Model.php | 2 - .../vendor/Zend/Gdata/Exif/Extension/Tags.php | 12 -- .../vendor/Zend/Gdata/Exif/Extension/Time.php | 2 - library/vendor/Zend/Gdata/Exif/Feed.php | 3 - library/vendor/Zend/Gdata/Extension.php | 1 - .../Zend/Gdata/Extension/AttendeeStatus.php | 1 - .../Zend/Gdata/Extension/AttendeeType.php | 1 - .../vendor/Zend/Gdata/Extension/Comments.php | 2 - .../vendor/Zend/Gdata/Extension/EntryLink.php | 2 - .../Zend/Gdata/Extension/EventStatus.php | 1 - .../Zend/Gdata/Extension/ExtendedProperty.php | 1 - .../vendor/Zend/Gdata/Extension/FeedLink.php | 2 - .../Extension/OpenSearchItemsPerPage.php | 1 - .../Gdata/Extension/OpenSearchStartIndex.php | 1 - .../Extension/OpenSearchTotalResults.php | 1 - .../Zend/Gdata/Extension/OriginalEvent.php | 3 - .../vendor/Zend/Gdata/Extension/Rating.php | 1 - .../Zend/Gdata/Extension/Recurrence.php | 1 - .../Gdata/Extension/RecurrenceException.php | 3 - .../vendor/Zend/Gdata/Extension/Reminder.php | 1 - .../Zend/Gdata/Extension/Transparency.php | 1 - .../Zend/Gdata/Extension/Visibility.php | 1 - library/vendor/Zend/Gdata/Extension/When.php | 2 - library/vendor/Zend/Gdata/Extension/Where.php | 2 - library/vendor/Zend/Gdata/Extension/Who.php | 4 - library/vendor/Zend/Gdata/Feed.php | 7 -- library/vendor/Zend/Gdata/Gapps.php | 26 ----- .../Zend/Gdata/Gapps/EmailListEntry.php | 3 - .../vendor/Zend/Gdata/Gapps/EmailListFeed.php | 2 - .../Zend/Gdata/Gapps/EmailListQuery.php | 1 - .../Gdata/Gapps/EmailListRecipientEntry.php | 2 - .../Gdata/Gapps/EmailListRecipientFeed.php | 2 - .../Gdata/Gapps/EmailListRecipientQuery.php | 2 - library/vendor/Zend/Gdata/Gapps/Error.php | 1 - .../Zend/Gdata/Gapps/Extension/EmailList.php | 2 - .../Zend/Gdata/Gapps/Extension/Login.php | 14 --- .../Zend/Gdata/Gapps/Extension/Name.php | 2 - .../Zend/Gdata/Gapps/Extension/Nickname.php | 2 - .../Zend/Gdata/Gapps/Extension/Property.php | 2 - .../Zend/Gdata/Gapps/Extension/Quota.php | 2 - .../vendor/Zend/Gdata/Gapps/GroupEntry.php | 2 - library/vendor/Zend/Gdata/Gapps/GroupFeed.php | 2 - .../vendor/Zend/Gdata/Gapps/GroupQuery.php | 1 - .../vendor/Zend/Gdata/Gapps/MemberEntry.php | 2 - .../vendor/Zend/Gdata/Gapps/MemberFeed.php | 2 - .../vendor/Zend/Gdata/Gapps/MemberQuery.php | 2 - .../vendor/Zend/Gdata/Gapps/NicknameEntry.php | 3 - .../vendor/Zend/Gdata/Gapps/NicknameFeed.php | 2 - .../vendor/Zend/Gdata/Gapps/NicknameQuery.php | 1 - .../vendor/Zend/Gdata/Gapps/OwnerEntry.php | 2 - library/vendor/Zend/Gdata/Gapps/OwnerFeed.php | 2 - .../vendor/Zend/Gdata/Gapps/OwnerQuery.php | 2 - library/vendor/Zend/Gdata/Gapps/Query.php | 3 - .../Zend/Gdata/Gapps/ServiceException.php | 7 -- library/vendor/Zend/Gdata/Gapps/UserEntry.php | 5 - library/vendor/Zend/Gdata/Gapps/UserFeed.php | 2 - library/vendor/Zend/Gdata/Gapps/UserQuery.php | 1 - library/vendor/Zend/Gdata/Gbase.php | 2 - library/vendor/Zend/Gdata/Gbase/Entry.php | 2 - .../Gdata/Gbase/Extension/BaseAttribute.php | 1 - library/vendor/Zend/Gdata/Gbase/Feed.php | 2 - library/vendor/Zend/Gdata/Gbase/ItemEntry.php | 1 - library/vendor/Zend/Gdata/Gbase/ItemFeed.php | 1 - library/vendor/Zend/Gdata/Gbase/ItemQuery.php | 2 - library/vendor/Zend/Gdata/Gbase/Query.php | 2 - .../vendor/Zend/Gdata/Gbase/SnippetEntry.php | 1 - .../vendor/Zend/Gdata/Gbase/SnippetFeed.php | 2 - .../vendor/Zend/Gdata/Gbase/SnippetQuery.php | 1 - library/vendor/Zend/Gdata/Geo.php | 1 - library/vendor/Zend/Gdata/Geo/Entry.php | 3 - .../Zend/Gdata/Geo/Extension/GeoRssWhere.php | 3 - .../Zend/Gdata/Geo/Extension/GmlPoint.php | 3 - .../Zend/Gdata/Geo/Extension/GmlPos.php | 2 - library/vendor/Zend/Gdata/Geo/Feed.php | 3 - library/vendor/Zend/Gdata/Health.php | 2 - .../Zend/Gdata/Health/Extension/Ccr.php | 2 - .../vendor/Zend/Gdata/Health/ProfileEntry.php | 2 - .../vendor/Zend/Gdata/Health/ProfileFeed.php | 2 - .../Zend/Gdata/Health/ProfileListEntry.php | 2 - .../Zend/Gdata/Health/ProfileListFeed.php | 2 - library/vendor/Zend/Gdata/Health/Query.php | 2 - .../Zend/Gdata/HttpAdapterStreamingProxy.php | 6 - .../Zend/Gdata/HttpAdapterStreamingSocket.php | 5 - library/vendor/Zend/Gdata/HttpClient.php | 4 - library/vendor/Zend/Gdata/Kind/EventEntry.php | 14 --- library/vendor/Zend/Gdata/Media.php | 1 - library/vendor/Zend/Gdata/Media/Entry.php | 3 - .../Gdata/Media/Extension/MediaCategory.php | 1 - .../Gdata/Media/Extension/MediaContent.php | 1 - .../Gdata/Media/Extension/MediaCopyright.php | 1 - .../Gdata/Media/Extension/MediaCredit.php | 1 - .../Media/Extension/MediaDescription.php | 1 - .../Zend/Gdata/Media/Extension/MediaGroup.php | 15 --- .../Zend/Gdata/Media/Extension/MediaHash.php | 1 - .../Gdata/Media/Extension/MediaKeywords.php | 1 - .../Gdata/Media/Extension/MediaPlayer.php | 1 - .../Gdata/Media/Extension/MediaRating.php | 1 - .../Media/Extension/MediaRestriction.php | 1 - .../Zend/Gdata/Media/Extension/MediaText.php | 1 - .../Gdata/Media/Extension/MediaThumbnail.php | 1 - .../Zend/Gdata/Media/Extension/MediaTitle.php | 1 - library/vendor/Zend/Gdata/Media/Feed.php | 3 - library/vendor/Zend/Gdata/MediaMimeStream.php | 3 - library/vendor/Zend/Gdata/Photos.php | 13 --- .../vendor/Zend/Gdata/Photos/AlbumEntry.php | 13 --- .../vendor/Zend/Gdata/Photos/AlbumFeed.php | 4 - .../vendor/Zend/Gdata/Photos/AlbumQuery.php | 3 - .../vendor/Zend/Gdata/Photos/CommentEntry.php | 5 - .../Zend/Gdata/Photos/Extension/Access.php | 2 - .../Zend/Gdata/Photos/Extension/AlbumId.php | 2 - .../Zend/Gdata/Photos/Extension/BytesUsed.php | 2 - .../Zend/Gdata/Photos/Extension/Checksum.php | 2 - .../Zend/Gdata/Photos/Extension/Client.php | 2 - .../Gdata/Photos/Extension/CommentCount.php | 2 - .../Photos/Extension/CommentingEnabled.php | 2 - .../Zend/Gdata/Photos/Extension/Height.php | 2 - .../vendor/Zend/Gdata/Photos/Extension/Id.php | 2 - .../Zend/Gdata/Photos/Extension/Location.php | 2 - .../Photos/Extension/MaxPhotosPerAlbum.php | 2 - .../Zend/Gdata/Photos/Extension/Name.php | 2 - .../Zend/Gdata/Photos/Extension/Nickname.php | 2 - .../Zend/Gdata/Photos/Extension/NumPhotos.php | 2 - .../Photos/Extension/NumPhotosRemaining.php | 2 - .../Zend/Gdata/Photos/Extension/PhotoId.php | 2 - .../Zend/Gdata/Photos/Extension/Position.php | 2 - .../Gdata/Photos/Extension/QuotaCurrent.php | 2 - .../Gdata/Photos/Extension/QuotaLimit.php | 2 - .../Zend/Gdata/Photos/Extension/Rotation.php | 2 - .../Zend/Gdata/Photos/Extension/Size.php | 2 - .../Zend/Gdata/Photos/Extension/Thumbnail.php | 2 - .../Zend/Gdata/Photos/Extension/Timestamp.php | 2 - .../Zend/Gdata/Photos/Extension/User.php | 2 - .../Zend/Gdata/Photos/Extension/Version.php | 2 - .../Zend/Gdata/Photos/Extension/Weight.php | 2 - .../Zend/Gdata/Photos/Extension/Width.php | 2 - .../vendor/Zend/Gdata/Photos/PhotoEntry.php | 16 --- .../vendor/Zend/Gdata/Photos/PhotoFeed.php | 4 - .../vendor/Zend/Gdata/Photos/PhotoQuery.php | 2 - library/vendor/Zend/Gdata/Photos/TagEntry.php | 3 - .../vendor/Zend/Gdata/Photos/UserEntry.php | 9 -- library/vendor/Zend/Gdata/Photos/UserFeed.php | 8 -- .../vendor/Zend/Gdata/Photos/UserQuery.php | 4 - library/vendor/Zend/Gdata/Query.php | 3 - library/vendor/Zend/Gdata/Spreadsheets.php | 12 -- .../Zend/Gdata/Spreadsheets/CellEntry.php | 2 - .../Zend/Gdata/Spreadsheets/CellFeed.php | 3 - .../Zend/Gdata/Spreadsheets/CellQuery.php | 6 - .../Zend/Gdata/Spreadsheets/DocumentQuery.php | 6 - .../Gdata/Spreadsheets/Extension/Cell.php | 2 - .../Gdata/Spreadsheets/Extension/ColCount.php | 2 - .../Gdata/Spreadsheets/Extension/Custom.php | 2 - .../Gdata/Spreadsheets/Extension/RowCount.php | 2 - .../Zend/Gdata/Spreadsheets/ListEntry.php | 4 - .../Zend/Gdata/Spreadsheets/ListFeed.php | 1 - .../Zend/Gdata/Spreadsheets/ListQuery.php | 6 - .../Gdata/Spreadsheets/SpreadsheetEntry.php | 1 - .../Gdata/Spreadsheets/SpreadsheetFeed.php | 1 - .../Gdata/Spreadsheets/WorksheetEntry.php | 3 - .../Zend/Gdata/Spreadsheets/WorksheetFeed.php | 1 - library/vendor/Zend/Gdata/YouTube.php | 20 ---- .../Zend/Gdata/YouTube/ActivityEntry.php | 4 - .../Zend/Gdata/YouTube/ActivityFeed.php | 2 - .../Zend/Gdata/YouTube/CommentEntry.php | 1 - .../vendor/Zend/Gdata/YouTube/CommentFeed.php | 2 - .../Zend/Gdata/YouTube/ContactEntry.php | 2 - .../vendor/Zend/Gdata/YouTube/ContactFeed.php | 2 - .../Zend/Gdata/YouTube/Extension/AboutMe.php | 1 - .../Zend/Gdata/YouTube/Extension/Age.php | 1 - .../Zend/Gdata/YouTube/Extension/Books.php | 1 - .../Zend/Gdata/YouTube/Extension/Company.php | 1 - .../Zend/Gdata/YouTube/Extension/Control.php | 2 - .../Gdata/YouTube/Extension/CountHint.php | 1 - .../Gdata/YouTube/Extension/Description.php | 1 - .../Zend/Gdata/YouTube/Extension/Duration.php | 1 - .../Gdata/YouTube/Extension/FirstName.php | 1 - .../Zend/Gdata/YouTube/Extension/Gender.php | 1 - .../Zend/Gdata/YouTube/Extension/Hobbies.php | 1 - .../Zend/Gdata/YouTube/Extension/Hometown.php | 1 - .../Zend/Gdata/YouTube/Extension/LastName.php | 1 - .../Zend/Gdata/YouTube/Extension/Link.php | 2 - .../Zend/Gdata/YouTube/Extension/Location.php | 1 - .../Gdata/YouTube/Extension/MediaContent.php | 1 - .../Gdata/YouTube/Extension/MediaCredit.php | 1 - .../Gdata/YouTube/Extension/MediaGroup.php | 8 -- .../Gdata/YouTube/Extension/MediaRating.php | 1 - .../Zend/Gdata/YouTube/Extension/Movies.php | 1 - .../Zend/Gdata/YouTube/Extension/Music.php | 1 - .../Zend/Gdata/YouTube/Extension/NoEmbed.php | 1 - .../Gdata/YouTube/Extension/Occupation.php | 1 - .../Gdata/YouTube/Extension/PlaylistId.php | 1 - .../Gdata/YouTube/Extension/PlaylistTitle.php | 1 - .../Zend/Gdata/YouTube/Extension/Position.php | 1 - .../Zend/Gdata/YouTube/Extension/Private.php | 1 - .../Gdata/YouTube/Extension/QueryString.php | 1 - .../Zend/Gdata/YouTube/Extension/Racy.php | 1 - .../Zend/Gdata/YouTube/Extension/Recorded.php | 1 - .../Gdata/YouTube/Extension/Relationship.php | 1 - .../Gdata/YouTube/Extension/ReleaseDate.php | 1 - .../Zend/Gdata/YouTube/Extension/School.php | 1 - .../Zend/Gdata/YouTube/Extension/State.php | 1 - .../Gdata/YouTube/Extension/Statistics.php | 1 - .../Zend/Gdata/YouTube/Extension/Status.php | 1 - .../Zend/Gdata/YouTube/Extension/Token.php | 1 - .../Zend/Gdata/YouTube/Extension/Uploaded.php | 1 - .../Zend/Gdata/YouTube/Extension/Username.php | 1 - .../Zend/Gdata/YouTube/Extension/VideoId.php | 1 - .../vendor/Zend/Gdata/YouTube/InboxEntry.php | 7 -- .../vendor/Zend/Gdata/YouTube/InboxFeed.php | 2 - .../vendor/Zend/Gdata/YouTube/MediaEntry.php | 3 - .../Zend/Gdata/YouTube/PlaylistListEntry.php | 8 -- .../Zend/Gdata/YouTube/PlaylistListFeed.php | 2 - .../Zend/Gdata/YouTube/PlaylistVideoEntry.php | 2 - .../Zend/Gdata/YouTube/PlaylistVideoFeed.php | 2 - .../Zend/Gdata/YouTube/SubscriptionEntry.php | 15 --- .../Zend/Gdata/YouTube/SubscriptionFeed.php | 2 - .../Zend/Gdata/YouTube/UserProfileEntry.php | 29 ----- .../vendor/Zend/Gdata/YouTube/VideoEntry.php | 18 --- .../vendor/Zend/Gdata/YouTube/VideoFeed.php | 2 - .../vendor/Zend/Gdata/YouTube/VideoQuery.php | 15 --- library/vendor/Zend/Http/Client.php | 23 ---- .../vendor/Zend/Http/Client/Adapter/Curl.php | 13 --- .../Zend/Http/Client/Adapter/Exception.php | 1 - .../vendor/Zend/Http/Client/Adapter/Proxy.php | 10 -- .../Zend/Http/Client/Adapter/Socket.php | 16 --- .../vendor/Zend/Http/Client/Adapter/Test.php | 6 - library/vendor/Zend/Http/Client/Exception.php | 1 - library/vendor/Zend/Http/Cookie.php | 10 -- library/vendor/Zend/Http/CookieJar.php | 8 -- library/vendor/Zend/Http/Exception.php | 1 - .../Exception/InvalidArgumentException.php | 1 - .../Header/Exception/RuntimeException.php | 1 - library/vendor/Zend/Http/Header/SetCookie.php | 2 - library/vendor/Zend/Http/Response.php | 6 - library/vendor/Zend/Http/UserAgent.php | 13 --- .../Zend/Http/UserAgent/AbstractDevice.php | 4 - library/vendor/Zend/Http/UserAgent/Bot.php | 1 - .../vendor/Zend/Http/UserAgent/Checker.php | 1 - .../vendor/Zend/Http/UserAgent/Console.php | 1 - .../vendor/Zend/Http/UserAgent/Desktop.php | 1 - library/vendor/Zend/Http/UserAgent/Email.php | 1 - .../vendor/Zend/Http/UserAgent/Exception.php | 1 - .../UserAgent/Features/Adapter/Browscap.php | 2 - .../Features/Adapter/DeviceAtlas.php | 5 - .../UserAgent/Features/Adapter/TeraWurfl.php | 4 - .../Http/UserAgent/Features/Exception.php | 1 - library/vendor/Zend/Http/UserAgent/Feed.php | 1 - library/vendor/Zend/Http/UserAgent/Mobile.php | 1 - .../vendor/Zend/Http/UserAgent/Offline.php | 1 - library/vendor/Zend/Http/UserAgent/Probe.php | 1 - library/vendor/Zend/Http/UserAgent/Spam.php | 1 - .../Zend/Http/UserAgent/Storage/Exception.php | 1 - .../Http/UserAgent/Storage/NonPersistent.php | 1 - .../Zend/Http/UserAgent/Storage/Session.php | 3 - library/vendor/Zend/Http/UserAgent/Text.php | 1 - .../vendor/Zend/Http/UserAgent/Validator.php | 1 - library/vendor/Zend/Json.php | 9 -- library/vendor/Zend/Json/Decoder.php | 11 -- library/vendor/Zend/Json/Encoder.php | 2 - library/vendor/Zend/Json/Exception.php | 1 - library/vendor/Zend/Json/Server.php | 12 -- library/vendor/Zend/Json/Server/Cache.php | 1 - library/vendor/Zend/Json/Server/Error.php | 1 - library/vendor/Zend/Json/Server/Exception.php | 1 - library/vendor/Zend/Json/Server/Request.php | 2 - .../vendor/Zend/Json/Server/Request/Http.php | 1 - library/vendor/Zend/Json/Server/Response.php | 1 - .../vendor/Zend/Json/Server/Response/Http.php | 1 - library/vendor/Zend/Json/Server/Smd.php | 7 -- .../vendor/Zend/Json/Server/Smd/Service.php | 10 -- library/vendor/Zend/Layout.php | 10 -- .../Controller/Action/Helper/Layout.php | 5 - .../Zend/Layout/Controller/Plugin/Layout.php | 1 - library/vendor/Zend/Layout/Exception.php | 1 - library/vendor/Zend/Loader.php | 5 - library/vendor/Zend/Loader/Autoloader.php | 1 - .../Zend/Loader/Autoloader/Resource.php | 13 --- .../vendor/Zend/Loader/AutoloaderFactory.php | 6 - .../vendor/Zend/Loader/ClassMapAutoloader.php | 5 - library/vendor/Zend/Loader/Exception.php | 1 - .../Exception/InvalidArgumentException.php | 1 - library/vendor/Zend/Loader/PluginLoader.php | 9 -- .../Zend/Loader/PluginLoader/Exception.php | 1 - .../vendor/Zend/Loader/StandardAutoloader.php | 5 - library/vendor/Zend/Locale.php | 16 --- library/vendor/Zend/Locale/Data.php | 8 -- library/vendor/Zend/Locale/Exception.php | 1 - library/vendor/Zend/Locale/Format.php | 21 ---- library/vendor/Zend/Locale/Math.php | 1 - library/vendor/Zend/Locale/Math/Exception.php | 1 - library/vendor/Zend/Locale/Math/PhpMath.php | 8 -- library/vendor/Zend/Log.php | 17 --- library/vendor/Zend/Log/Exception.php | 1 - library/vendor/Zend/Log/Filter/Abstract.php | 3 - library/vendor/Zend/Log/Filter/Message.php | 2 - library/vendor/Zend/Log/Filter/Priority.php | 2 - library/vendor/Zend/Log/Filter/Suppress.php | 1 - .../vendor/Zend/Log/Formatter/Abstract.php | 2 - library/vendor/Zend/Log/Formatter/Firebug.php | 1 - library/vendor/Zend/Log/Formatter/Simple.php | 2 - library/vendor/Zend/Log/Formatter/Xml.php | 1 - library/vendor/Zend/Log/Writer/Abstract.php | 3 - library/vendor/Zend/Log/Writer/Db.php | 3 - library/vendor/Zend/Log/Writer/Firebug.php | 4 - library/vendor/Zend/Log/Writer/Mail.php | 4 - library/vendor/Zend/Log/Writer/Mock.php | 1 - library/vendor/Zend/Log/Writer/Null.php | 1 - library/vendor/Zend/Log/Writer/Stream.php | 6 - library/vendor/Zend/Log/Writer/Syslog.php | 4 - .../vendor/Zend/Log/Writer/ZendMonitor.php | 1 - library/vendor/Zend/Mail.php | 18 --- library/vendor/Zend/Mail/Exception.php | 1 - library/vendor/Zend/Mail/Message.php | 3 - library/vendor/Zend/Mail/Message/File.php | 2 - library/vendor/Zend/Mail/Part.php | 11 -- library/vendor/Zend/Mail/Part/File.php | 7 -- .../vendor/Zend/Mail/Protocol/Abstract.php | 11 -- .../vendor/Zend/Mail/Protocol/Exception.php | 1 - library/vendor/Zend/Mail/Protocol/Imap.php | 8 -- library/vendor/Zend/Mail/Protocol/Pop3.php | 6 - library/vendor/Zend/Mail/Protocol/Smtp.php | 10 -- .../Zend/Mail/Protocol/Smtp/Auth/Crammd5.php | 1 - .../Zend/Mail/Protocol/Smtp/Auth/Login.php | 1 - .../Zend/Mail/Protocol/Smtp/Auth/Plain.php | 1 - library/vendor/Zend/Mail/Storage/Abstract.php | 2 - .../vendor/Zend/Mail/Storage/Exception.php | 1 - library/vendor/Zend/Mail/Storage/Folder.php | 1 - .../Zend/Mail/Storage/Folder/Maildir.php | 10 -- .../vendor/Zend/Mail/Storage/Folder/Mbox.php | 9 -- library/vendor/Zend/Mail/Storage/Imap.php | 26 ----- library/vendor/Zend/Mail/Storage/Maildir.php | 13 --- library/vendor/Zend/Mail/Storage/Mbox.php | 11 -- library/vendor/Zend/Mail/Storage/Pop3.php | 7 -- .../Zend/Mail/Storage/Writable/Maildir.php | 35 ------ .../vendor/Zend/Mail/Transport/Abstract.php | 5 - .../vendor/Zend/Mail/Transport/Exception.php | 1 - library/vendor/Zend/Mail/Transport/File.php | 3 - .../vendor/Zend/Mail/Transport/Sendmail.php | 6 - library/vendor/Zend/Mail/Transport/Smtp.php | 5 - library/vendor/Zend/Markup.php | 1 - library/vendor/Zend/Markup/Exception.php | 1 - library/vendor/Zend/Markup/Parser/Bbcode.php | 4 - .../vendor/Zend/Markup/Parser/Exception.php | 1 - .../vendor/Zend/Markup/Renderer/Exception.php | 1 - library/vendor/Zend/Markup/Renderer/Html.php | 4 - .../vendor/Zend/Markup/Renderer/Html/Code.php | 1 - .../Markup/Renderer/Html/HtmlAbstract.php | 1 - .../vendor/Zend/Markup/Renderer/Html/Img.php | 2 - .../vendor/Zend/Markup/Renderer/Html/List.php | 1 - .../vendor/Zend/Markup/Renderer/Html/Url.php | 2 - .../Zend/Markup/Renderer/RendererAbstract.php | 7 -- library/vendor/Zend/Markup/Token.php | 1 - library/vendor/Zend/Markup/TokenList.php | 1 - library/vendor/Zend/Measure/Abstract.php | 9 -- library/vendor/Zend/Measure/Acceleration.php | 2 - library/vendor/Zend/Measure/Angle.php | 2 - library/vendor/Zend/Measure/Area.php | 2 - library/vendor/Zend/Measure/Binary.php | 2 - library/vendor/Zend/Measure/Capacitance.php | 2 - .../vendor/Zend/Measure/Cooking/Volume.php | 2 - .../vendor/Zend/Measure/Cooking/Weight.php | 2 - library/vendor/Zend/Measure/Current.php | 2 - library/vendor/Zend/Measure/Density.php | 2 - library/vendor/Zend/Measure/Energy.php | 2 - library/vendor/Zend/Measure/Exception.php | 1 - library/vendor/Zend/Measure/Flow/Mass.php | 2 - library/vendor/Zend/Measure/Flow/Mole.php | 2 - library/vendor/Zend/Measure/Flow/Volume.php | 2 - library/vendor/Zend/Measure/Force.php | 2 - library/vendor/Zend/Measure/Frequency.php | 2 - library/vendor/Zend/Measure/Illumination.php | 2 - library/vendor/Zend/Measure/Length.php | 2 - library/vendor/Zend/Measure/Lightness.php | 2 - library/vendor/Zend/Measure/Number.php | 9 -- library/vendor/Zend/Measure/Power.php | 2 - library/vendor/Zend/Measure/Pressure.php | 2 - library/vendor/Zend/Measure/Speed.php | 2 - library/vendor/Zend/Measure/Temperature.php | 2 - library/vendor/Zend/Measure/Time.php | 2 - library/vendor/Zend/Measure/Torque.php | 2 - .../vendor/Zend/Measure/Viscosity/Dynamic.php | 2 - .../Zend/Measure/Viscosity/Kinematic.php | 2 - library/vendor/Zend/Measure/Volume.php | 2 - library/vendor/Zend/Measure/Weight.php | 2 - library/vendor/Zend/Memory.php | 6 - .../vendor/Zend/Memory/AccessController.php | 1 - library/vendor/Zend/Memory/Container.php | 1 - .../vendor/Zend/Memory/Container/Locked.php | 1 - .../vendor/Zend/Memory/Container/Movable.php | 4 - library/vendor/Zend/Memory/Exception.php | 1 - library/vendor/Zend/Memory/Manager.php | 4 - library/vendor/Zend/Mime/Decode.php | 1 - library/vendor/Zend/Mime/Exception.php | 1 - library/vendor/Zend/Mime/Message.php | 3 - library/vendor/Zend/Mime/Part.php | 4 - library/vendor/Zend/Mobile/Exception.php | 1 - library/vendor/Zend/Mobile/Push/Abstract.php | 2 - library/vendor/Zend/Mobile/Push/Apns.php | 11 -- library/vendor/Zend/Mobile/Push/Exception.php | 1 - .../Push/Exception/DeviceQuotaExceeded.php | 1 - .../Push/Exception/InvalidAuthToken.php | 1 - .../Mobile/Push/Exception/InvalidPayload.php | 1 - .../Push/Exception/InvalidRegistration.php | 1 - .../Mobile/Push/Exception/InvalidToken.php | 1 - .../Mobile/Push/Exception/InvalidTopic.php | 1 - .../Mobile/Push/Exception/QuotaExceeded.php | 1 - .../Push/Exception/ServerUnavailable.php | 1 - library/vendor/Zend/Mobile/Push/Gcm.php | 8 -- .../Zend/Mobile/Push/Message/Abstract.php | 2 - .../vendor/Zend/Mobile/Push/Message/Apns.php | 1 - .../Zend/Mobile/Push/Message/Exception.php | 1 - .../vendor/Zend/Mobile/Push/Message/Gcm.php | 1 - .../vendor/Zend/Mobile/Push/Message/Mpns.php | 2 - .../Zend/Mobile/Push/Message/Mpns/Raw.php | 2 - .../Zend/Mobile/Push/Message/Mpns/Tile.php | 1 - .../Zend/Mobile/Push/Message/Mpns/Toast.php | 1 - library/vendor/Zend/Mobile/Push/Mpns.php | 10 -- .../vendor/Zend/Mobile/Push/Response/Gcm.php | 1 - .../Zend/Mobile/Push/Test/ApnsProxy.php | 1 - library/vendor/Zend/Navigation.php | 2 - library/vendor/Zend/Navigation/Container.php | 6 - library/vendor/Zend/Navigation/Exception.php | 1 - library/vendor/Zend/Navigation/Page.php | 26 ----- library/vendor/Zend/Navigation/Page/Mvc.php | 9 -- library/vendor/Zend/Navigation/Page/Uri.php | 2 - library/vendor/Zend/Oauth.php | 1 - library/vendor/Zend/Oauth/Client.php | 7 -- library/vendor/Zend/Oauth/Config.php | 12 -- library/vendor/Zend/Oauth/Consumer.php | 11 -- library/vendor/Zend/Oauth/Exception.php | 1 - library/vendor/Zend/Oauth/Http.php | 5 - .../vendor/Zend/Oauth/Http/AccessToken.php | 2 - .../vendor/Zend/Oauth/Http/RequestToken.php | 2 - .../Zend/Oauth/Http/UserAuthorization.php | 2 - library/vendor/Zend/Oauth/Http/Utility.php | 3 - library/vendor/Zend/Oauth/Signature/Hmac.php | 2 - .../vendor/Zend/Oauth/Signature/Plaintext.php | 1 - library/vendor/Zend/Oauth/Signature/Rsa.php | 2 - .../Oauth/Signature/SignatureAbstract.php | 2 - library/vendor/Zend/Oauth/Token.php | 1 - library/vendor/Zend/Oauth/Token/Access.php | 6 - .../Zend/Oauth/Token/AuthorizedRequest.php | 1 - library/vendor/Zend/Oauth/Token/Request.php | 1 - library/vendor/Zend/OpenId.php | 8 -- library/vendor/Zend/OpenId/Consumer.php | 7 -- .../Zend/OpenId/Consumer/Storage/File.php | 5 - library/vendor/Zend/OpenId/Exception.php | 1 - library/vendor/Zend/OpenId/Extension/Sreg.php | 1 - library/vendor/Zend/OpenId/Provider.php | 4 - .../Zend/OpenId/Provider/Storage/File.php | 1 - .../Zend/OpenId/Provider/User/Session.php | 2 - library/vendor/Zend/Paginator.php | 9 -- .../vendor/Zend/Paginator/Adapter/Array.php | 1 - .../Zend/Paginator/Adapter/DbSelect.php | 5 - .../Zend/Paginator/Adapter/DbTableSelect.php | 1 - .../Zend/Paginator/Adapter/Iterator.php | 3 - .../vendor/Zend/Paginator/Adapter/Null.php | 1 - library/vendor/Zend/Paginator/Exception.php | 1 - .../Zend/Paginator/ScrollingStyle/All.php | 1 - .../Zend/Paginator/ScrollingStyle/Elastic.php | 1 - .../Zend/Paginator/ScrollingStyle/Jumping.php | 1 - .../Zend/Paginator/ScrollingStyle/Sliding.php | 1 - library/vendor/Zend/ProgressBar.php | 2 - .../Zend/ProgressBar/Adapter/Console.php | 7 -- .../Zend/ProgressBar/Adapter/Exception.php | 1 - .../Zend/ProgressBar/Adapter/JsPull.php | 2 - .../Zend/ProgressBar/Adapter/JsPush.php | 2 - library/vendor/Zend/ProgressBar/Exception.php | 1 - library/vendor/Zend/Queue.php | 9 -- .../vendor/Zend/Queue/Adapter/Activemq.php | 12 -- .../Zend/Queue/Adapter/AdapterAbstract.php | 4 - library/vendor/Zend/Queue/Adapter/Array.php | 5 - library/vendor/Zend/Queue/Adapter/Db.php | 20 ---- .../vendor/Zend/Queue/Adapter/Db/Message.php | 1 - .../vendor/Zend/Queue/Adapter/Db/Queue.php | 1 - .../vendor/Zend/Queue/Adapter/Memcacheq.php | 10 -- library/vendor/Zend/Queue/Adapter/Null.php | 9 -- .../Zend/Queue/Adapter/PlatformJobQueue.php | 21 ---- library/vendor/Zend/Queue/Exception.php | 1 - library/vendor/Zend/Queue/Message.php | 4 - .../vendor/Zend/Queue/Message/Iterator.php | 2 - .../vendor/Zend/Queue/Message/PlatformJob.php | 3 - library/vendor/Zend/Queue/Stomp/Client.php | 1 - .../Zend/Queue/Stomp/Client/Connection.php | 7 -- library/vendor/Zend/Queue/Stomp/Frame.php | 9 -- library/vendor/Zend/Reflection/Class.php | 12 -- library/vendor/Zend/Reflection/Docblock.php | 4 - .../vendor/Zend/Reflection/Docblock/Tag.php | 3 - .../Zend/Reflection/Docblock/Tag/Param.php | 3 - .../Zend/Reflection/Docblock/Tag/Return.php | 3 - library/vendor/Zend/Reflection/Exception.php | 1 - library/vendor/Zend/Reflection/Extension.php | 4 - library/vendor/Zend/Reflection/File.php | 10 -- library/vendor/Zend/Reflection/Function.php | 5 - library/vendor/Zend/Reflection/Method.php | 7 -- library/vendor/Zend/Reflection/Parameter.php | 3 - library/vendor/Zend/Reflection/Property.php | 2 - library/vendor/Zend/Registry.php | 5 - library/vendor/Zend/Rest/Client.php | 4 - library/vendor/Zend/Rest/Client/Exception.php | 1 - library/vendor/Zend/Rest/Client/Result.php | 2 - .../Zend/Rest/Client/Result/Exception.php | 1 - library/vendor/Zend/Rest/Controller.php | 1 - library/vendor/Zend/Rest/Exception.php | 1 - library/vendor/Zend/Rest/Route.php | 4 - library/vendor/Zend/Rest/Server.php | 9 -- library/vendor/Zend/Rest/Server/Exception.php | 1 - library/vendor/Zend/SOURCE | 1 + library/vendor/Zend/Serializer.php | 3 - .../Serializer/Adapter/AdapterAbstract.php | 2 - .../vendor/Zend/Serializer/Adapter/Amf0.php | 7 -- .../vendor/Zend/Serializer/Adapter/Amf3.php | 7 -- .../vendor/Zend/Serializer/Adapter/Json.php | 5 - .../Zend/Serializer/Adapter/PhpCode.php | 2 - .../Zend/Serializer/Adapter/PhpSerialize.php | 3 - .../Zend/Serializer/Adapter/PythonPickle.php | 15 --- .../vendor/Zend/Serializer/Adapter/Wddx.php | 6 - library/vendor/Zend/Serializer/Exception.php | 1 - library/vendor/Zend/Server/Abstract.php | 7 -- library/vendor/Zend/Server/Cache.php | 2 - library/vendor/Zend/Server/Definition.php | 4 - library/vendor/Zend/Server/Exception.php | 1 - .../vendor/Zend/Server/Method/Callback.php | 1 - .../vendor/Zend/Server/Method/Definition.php | 5 - .../vendor/Zend/Server/Method/Prototype.php | 1 - library/vendor/Zend/Server/Reflection.php | 6 - .../vendor/Zend/Server/Reflection/Class.php | 3 - .../Zend/Server/Reflection/Exception.php | 1 - .../Zend/Server/Reflection/Function.php | 1 - .../Server/Reflection/Function/Abstract.php | 8 -- .../vendor/Zend/Server/Reflection/Method.php | 1 - .../Zend/Server/Reflection/Parameter.php | 3 - .../Zend/Server/Reflection/Prototype.php | 4 - .../Zend/Server/Reflection/ReturnValue.php | 2 - library/vendor/Zend/Session.php | 16 --- library/vendor/Zend/Session/Abstract.php | 3 - library/vendor/Zend/Session/Exception.php | 1 - library/vendor/Zend/Session/Namespace.php | 18 --- .../Zend/Session/SaveHandler/DbTable.php | 12 -- .../Zend/Session/SaveHandler/Exception.php | 1 - .../Zend/Session/Validator/Abstract.php | 1 - .../Zend/Session/Validator/HttpUserAgent.php | 1 - .../vendor/Zend/Stdlib/CallbackHandler.php | 4 - .../Exception/InvalidCallbackException.php | 1 - library/vendor/Zend/Stdlib/PriorityQueue.php | 1 - library/vendor/Zend/Tag/Cloud.php | 7 -- .../Zend/Tag/Cloud/Decorator/Exception.php | 1 - .../Zend/Tag/Cloud/Decorator/HtmlCloud.php | 1 - .../Zend/Tag/Cloud/Decorator/HtmlTag.php | 6 - library/vendor/Zend/Tag/Cloud/Exception.php | 1 - library/vendor/Zend/Tag/Exception.php | 1 - library/vendor/Zend/Tag/Item.php | 6 - library/vendor/Zend/Tag/ItemList.php | 3 - library/vendor/Zend/Test/DbAdapter.php | 3 - library/vendor/Zend/Test/DbStatement.php | 2 - .../Test/PHPUnit/Constraint/DomQuery34.php | 6 - .../Test/PHPUnit/Constraint/DomQuery37.php | 6 - .../Test/PHPUnit/Constraint/DomQuery41.php | 6 - .../Test/PHPUnit/Constraint/Redirect34.php | 5 - .../Test/PHPUnit/Constraint/Redirect37.php | 5 - .../Test/PHPUnit/Constraint/Redirect41.php | 5 - .../PHPUnit/Constraint/ResponseHeader34.php | 8 -- .../PHPUnit/Constraint/ResponseHeader37.php | 8 -- .../PHPUnit/Constraint/ResponseHeader41.php | 8 -- .../Zend/Test/PHPUnit/ControllerTestCase.php | 44 -------- .../Zend/Test/PHPUnit/DatabaseTestCase.php | 5 - .../Zend/Test/PHPUnit/Db/Connection.php | 2 - .../Zend/Test/PHPUnit/Db/DataSet/DbRowset.php | 2 - .../Zend/Test/PHPUnit/Db/DataSet/DbTable.php | 1 - .../PHPUnit/Db/DataSet/DbTableDataSet.php | 1 - .../Test/PHPUnit/Db/DataSet/QueryDataSet.php | 3 - .../Test/PHPUnit/Db/DataSet/QueryTable.php | 1 - .../vendor/Zend/Test/PHPUnit/Db/Exception.php | 1 - .../Zend/Test/PHPUnit/Db/Metadata/Generic.php | 1 - .../Test/PHPUnit/Db/Operation/DeleteAll.php | 2 - .../Zend/Test/PHPUnit/Db/Operation/Insert.php | 2 - .../Test/PHPUnit/Db/Operation/Truncate.php | 3 - .../Zend/Test/PHPUnit/Db/SimpleTester.php | 3 - library/vendor/Zend/Text/Exception.php | 1 - library/vendor/Zend/Text/Figlet.php | 5 - library/vendor/Zend/Text/Figlet/Exception.php | 1 - library/vendor/Zend/Text/Table.php | 9 -- library/vendor/Zend/Text/Table/Column.php | 7 -- .../Zend/Text/Table/Decorator/Ascii.php | 1 - .../Zend/Text/Table/Decorator/Unicode.php | 1 - library/vendor/Zend/Text/Table/Exception.php | 1 - library/vendor/Zend/Text/Table/Row.php | 4 - library/vendor/Zend/TimeSync.php | 8 -- library/vendor/Zend/TimeSync/Exception.php | 1 - library/vendor/Zend/TimeSync/Ntp.php | 1 - library/vendor/Zend/TimeSync/Sntp.php | 1 - .../Zend/Tool/Framework/Action/Base.php | 1 - .../Zend/Tool/Framework/Action/Exception.php | 1 - .../Zend/Tool/Framework/Action/Repository.php | 3 - .../Zend/Tool/Framework/Client/Abstract.php | 13 --- .../Zend/Tool/Framework/Client/Config.php | 10 -- .../Zend/Tool/Framework/Client/Console.php | 3 - .../Client/Console/ArgumentParser.php | 7 -- .../Framework/Client/Console/HelpSystem.php | 1 - .../Framework/Client/Console/Manifest.php | 6 - .../Console/ResponseDecorator/AlignCenter.php | 1 - .../Console/ResponseDecorator/Blockize.php | 1 - .../Console/ResponseDecorator/Indention.php | 1 - .../Zend/Tool/Framework/Client/Exception.php | 1 - .../Client/Interactive/InputHandler.php | 4 - .../Zend/Tool/Framework/Client/Manifest.php | 6 - .../Zend/Tool/Framework/Client/Response.php | 1 - .../Response/ContentDecorator/Separator.php | 1 - .../Zend/Tool/Framework/Client/Storage.php | 1 - .../Framework/Client/Storage/Directory.php | 1 - .../vendor/Zend/Tool/Framework/Exception.php | 1 - .../Zend/Tool/Framework/Loader/Abstract.php | 4 - .../Tool/Framework/Loader/BasicLoader.php | 5 - .../Framework/Loader/IncludePathLoader.php | 3 - .../Framework/Manifest/ActionManifestable.php | 1 - .../Tool/Framework/Manifest/Exception.php | 1 - .../Manifest/MetadataManifestable.php | 1 - .../Manifest/ProviderManifestable.php | 1 - .../Tool/Framework/Manifest/Repository.php | 4 - .../Zend/Tool/Framework/Metadata/Basic.php | 2 - .../Zend/Tool/Framework/Metadata/Dynamic.php | 4 - .../Zend/Tool/Framework/Metadata/Tool.php | 1 - .../Zend/Tool/Framework/Provider/Abstract.php | 2 - .../Tool/Framework/Provider/Exception.php | 1 - .../Tool/Framework/Provider/Repository.php | 3 - .../Tool/Framework/Provider/Signature.php | 5 - .../vendor/Zend/Tool/Framework/Registry.php | 13 --- .../Tool/Framework/Registry/Exception.php | 1 - .../Tool/Framework/System/Action/Create.php | 1 - .../Tool/Framework/System/Action/Delete.php | 1 - .../Zend/Tool/Framework/System/Manifest.php | 8 -- .../Tool/Framework/System/Provider/Config.php | 12 -- .../Framework/System/Provider/Manifest.php | 2 - .../Framework/System/Provider/Phpinfo.php | 1 - .../Framework/System/Provider/Version.php | 3 - .../Tool/Project/Context/Content/Engine.php | 2 - .../Zend/Tool/Project/Context/Exception.php | 1 - .../Project/Context/Filesystem/Abstract.php | 1 - .../Project/Context/Filesystem/Directory.php | 1 - .../Tool/Project/Context/Filesystem/File.php | 1 - .../Zend/Tool/Project/Context/Repository.php | 6 - .../Context/System/ProjectDirectory.php | 6 - .../Context/System/ProjectProfileFile.php | 4 - .../System/ProjectProvidersDirectory.php | 3 - .../Project/Context/Zf/AbstractClassFile.php | 1 - .../Tool/Project/Context/Zf/ActionMethod.php | 5 - .../Tool/Project/Context/Zf/ApisDirectory.php | 1 - .../Context/Zf/ApplicationConfigFile.php | 1 - .../Context/Zf/ApplicationDirectory.php | 1 - .../Project/Context/Zf/CacheDirectory.php | 1 - .../Tool/Project/Context/Zf/ConfigFile.php | 1 - .../Project/Context/Zf/ConfigsDirectory.php | 1 - .../Context/Zf/ControllersDirectory.php | 1 - .../Tool/Project/Context/Zf/DataDirectory.php | 1 - .../Project/Context/Zf/DbTableDirectory.php | 1 - .../Tool/Project/Context/Zf/DocsDirectory.php | 1 - .../Zend/Tool/Project/Context/Zf/FormFile.php | 1 - .../Project/Context/Zf/FormsDirectory.php | 1 - .../Tool/Project/Context/Zf/HtaccessFile.php | 1 - .../Project/Context/Zf/LayoutScriptFile.php | 1 - .../Context/Zf/LayoutScriptsDirectory.php | 1 - .../Project/Context/Zf/LayoutsDirectory.php | 1 - .../Project/Context/Zf/LibraryDirectory.php | 1 - .../Project/Context/Zf/LocalesDirectory.php | 1 - .../Tool/Project/Context/Zf/LogsDirectory.php | 1 - .../Tool/Project/Context/Zf/ModelFile.php | 1 - .../Project/Context/Zf/ModelsDirectory.php | 1 - .../Project/Context/Zf/ModuleDirectory.php | 1 - .../Project/Context/Zf/ModulesDirectory.php | 1 - .../Context/Zf/ProjectProviderFile.php | 2 - .../Project/Context/Zf/PublicDirectory.php | 1 - .../Context/Zf/PublicImagesDirectory.php | 1 - .../Project/Context/Zf/PublicIndexFile.php | 2 - .../Context/Zf/PublicScriptsDirectory.php | 1 - .../Context/Zf/PublicStylesheetsDirectory.php | 1 - .../Context/Zf/SearchIndexesDirectory.php | 1 - .../Project/Context/Zf/ServicesDirectory.php | 1 - .../Project/Context/Zf/SessionsDirectory.php | 1 - .../Project/Context/Zf/TemporaryDirectory.php | 1 - .../Zf/TestApplicationActionMethod.php | 4 - .../Zf/TestApplicationBootstrapFile.php | 1 - .../Zf/TestApplicationControllerDirectory.php | 1 - .../Zf/TestApplicationControllerFile.php | 1 - .../Context/Zf/TestApplicationDirectory.php | 1 - .../Zf/TestApplicationModuleDirectory.php | 1 - .../Zf/TestApplicationModulesDirectory.php | 1 - .../Context/Zf/TestLibraryBootstrapFile.php | 1 - .../Context/Zf/TestLibraryDirectory.php | 1 - .../Project/Context/Zf/TestLibraryFile.php | 1 - .../Zf/TestLibraryNamespaceDirectory.php | 1 - .../Context/Zf/TestPHPUnitBootstrapFile.php | 2 - .../Context/Zf/TestPHPUnitConfigFile.php | 1 - .../Project/Context/Zf/TestsDirectory.php | 1 - .../Project/Context/Zf/UploadsDirectory.php | 1 - .../Zf/ViewControllerScriptsDirectory.php | 4 - .../Context/Zf/ViewFiltersDirectory.php | 1 - .../Context/Zf/ViewHelpersDirectory.php | 1 - .../Project/Context/Zf/ViewScriptFile.php | 4 - .../Context/Zf/ViewScriptsDirectory.php | 1 - .../Project/Context/Zf/ViewsDirectory.php | 1 - .../Context/Zf/ZfStandardLibraryDirectory.php | 2 - .../vendor/Zend/Tool/Project/Exception.php | 1 - library/vendor/Zend/Tool/Project/Profile.php | 8 -- .../Zend/Tool/Project/Profile/Exception.php | 1 - .../Tool/Project/Profile/FileParser/Xml.php | 4 - .../Zend/Tool/Project/Profile/Resource.php | 2 - .../Project/Profile/Resource/Container.php | 5 - .../Zend/Tool/Project/Provider/Abstract.php | 8 -- .../Zend/Tool/Project/Provider/Action.php | 3 - .../Zend/Tool/Project/Provider/Controller.php | 1 - .../Zend/Tool/Project/Provider/DbAdapter.php | 2 - .../Zend/Tool/Project/Provider/Exception.php | 1 - .../Zend/Tool/Project/Provider/Layout.php | 1 - .../Zend/Tool/Project/Provider/Manifest.php | 1 - .../Zend/Tool/Project/Provider/Module.php | 5 - .../Zend/Tool/Project/Provider/Profile.php | 1 - .../Zend/Tool/Project/Provider/Project.php | 3 - .../Tool/Project/Provider/ProjectProvider.php | 2 - .../Zend/Tool/Project/Provider/Test.php | 2 - .../Zend/Tool/Project/Provider/View.php | 5 - library/vendor/Zend/Translate.php | 4 - library/vendor/Zend/Translate/Adapter.php | 9 -- .../vendor/Zend/Translate/Adapter/Array.php | 3 - library/vendor/Zend/Translate/Adapter/Csv.php | 3 - .../vendor/Zend/Translate/Adapter/Gettext.php | 5 - library/vendor/Zend/Translate/Adapter/Ini.php | 3 - library/vendor/Zend/Translate/Adapter/Qt.php | 7 -- library/vendor/Zend/Translate/Adapter/Tbx.php | 7 -- library/vendor/Zend/Translate/Adapter/Tmx.php | 7 -- .../vendor/Zend/Translate/Adapter/Xliff.php | 7 -- .../vendor/Zend/Translate/Adapter/XmlTm.php | 7 -- library/vendor/Zend/Translate/Exception.php | 1 - library/vendor/Zend/Translate/Plural.php | 1 - library/vendor/Zend/Uri.php | 6 - library/vendor/Zend/Uri/Exception.php | 1 - library/vendor/Zend/Uri/Http.php | 20 ---- library/vendor/Zend/Validate.php | 7 -- library/vendor/Zend/Validate/Abstract.php | 6 - library/vendor/Zend/Validate/Alnum.php | 2 - library/vendor/Zend/Validate/Alpha.php | 2 - library/vendor/Zend/Validate/Barcode.php | 5 - .../Zend/Validate/Barcode/AdapterAbstract.php | 1 - .../vendor/Zend/Validate/Barcode/Code25.php | 1 - .../Validate/Barcode/Code25interleaved.php | 1 - .../vendor/Zend/Validate/Barcode/Code39.php | 1 - .../Zend/Validate/Barcode/Code39ext.php | 1 - .../vendor/Zend/Validate/Barcode/Code93.php | 1 - .../Zend/Validate/Barcode/Code93ext.php | 1 - .../vendor/Zend/Validate/Barcode/Ean12.php | 1 - .../vendor/Zend/Validate/Barcode/Ean13.php | 1 - .../vendor/Zend/Validate/Barcode/Ean14.php | 1 - .../vendor/Zend/Validate/Barcode/Ean18.php | 1 - library/vendor/Zend/Validate/Barcode/Ean2.php | 1 - library/vendor/Zend/Validate/Barcode/Ean5.php | 1 - library/vendor/Zend/Validate/Barcode/Ean8.php | 1 - .../vendor/Zend/Validate/Barcode/Gtin12.php | 1 - .../vendor/Zend/Validate/Barcode/Gtin13.php | 1 - .../vendor/Zend/Validate/Barcode/Gtin14.php | 1 - .../Zend/Validate/Barcode/Identcode.php | 1 - .../Zend/Validate/Barcode/Intelligentmail.php | 1 - library/vendor/Zend/Validate/Barcode/Issn.php | 1 - .../vendor/Zend/Validate/Barcode/Itf14.php | 1 - .../vendor/Zend/Validate/Barcode/Leitcode.php | 1 - .../vendor/Zend/Validate/Barcode/Planet.php | 1 - .../vendor/Zend/Validate/Barcode/Postnet.php | 1 - .../Zend/Validate/Barcode/Royalmail.php | 1 - library/vendor/Zend/Validate/Barcode/Sscc.php | 1 - library/vendor/Zend/Validate/Barcode/Upca.php | 1 - library/vendor/Zend/Validate/Barcode/Upce.php | 1 - library/vendor/Zend/Validate/Between.php | 2 - library/vendor/Zend/Validate/Callback.php | 3 - library/vendor/Zend/Validate/Ccnum.php | 2 - library/vendor/Zend/Validate/CreditCard.php | 3 - library/vendor/Zend/Validate/Date.php | 5 - library/vendor/Zend/Validate/Db/Abstract.php | 5 - .../Zend/Validate/Db/NoRecordExists.php | 1 - .../vendor/Zend/Validate/Db/RecordExists.php | 1 - library/vendor/Zend/Validate/Digits.php | 2 - library/vendor/Zend/Validate/EmailAddress.php | 3 - library/vendor/Zend/Validate/Exception.php | 1 - library/vendor/Zend/Validate/File/Count.php | 6 - library/vendor/Zend/Validate/File/Crc32.php | 3 - .../Zend/Validate/File/ExcludeExtension.php | 2 - .../Zend/Validate/File/ExcludeMimeType.php | 2 - library/vendor/Zend/Validate/File/Exists.php | 3 - .../vendor/Zend/Validate/File/Extension.php | 2 - .../vendor/Zend/Validate/File/FilesSize.php | 3 - library/vendor/Zend/Validate/File/Hash.php | 5 - .../vendor/Zend/Validate/File/ImageSize.php | 7 -- .../Zend/Validate/File/IsCompressed.php | 1 - library/vendor/Zend/Validate/File/IsImage.php | 1 - library/vendor/Zend/Validate/File/Md5.php | 3 - .../vendor/Zend/Validate/File/MimeType.php | 8 -- .../vendor/Zend/Validate/File/NotExists.php | 1 - library/vendor/Zend/Validate/File/Sha1.php | 3 - library/vendor/Zend/Validate/File/Size.php | 7 -- library/vendor/Zend/Validate/File/Upload.php | 2 - .../vendor/Zend/Validate/File/WordCount.php | 2 - library/vendor/Zend/Validate/Float.php | 4 - library/vendor/Zend/Validate/GreaterThan.php | 2 - library/vendor/Zend/Validate/Hex.php | 1 - library/vendor/Zend/Validate/Hostname.php | 2 - library/vendor/Zend/Validate/Iban.php | 4 - library/vendor/Zend/Validate/Identical.php | 1 - library/vendor/Zend/Validate/InArray.php | 2 - library/vendor/Zend/Validate/Int.php | 4 - library/vendor/Zend/Validate/Ip.php | 2 - library/vendor/Zend/Validate/Isbn.php | 4 - library/vendor/Zend/Validate/Ldap/Dn.php | 1 - library/vendor/Zend/Validate/LessThan.php | 2 - library/vendor/Zend/Validate/NotEmpty.php | 2 - library/vendor/Zend/Validate/PostCode.php | 8 -- library/vendor/Zend/Validate/Regex.php | 3 - .../Zend/Validate/Sitemap/Changefreq.php | 1 - .../vendor/Zend/Validate/Sitemap/Lastmod.php | 1 - library/vendor/Zend/Validate/Sitemap/Loc.php | 2 - .../vendor/Zend/Validate/Sitemap/Priority.php | 1 - library/vendor/Zend/Validate/StringLength.php | 4 - library/vendor/Zend/View.php | 2 - library/vendor/Zend/View/Abstract.php | 14 --- library/vendor/Zend/View/Exception.php | 1 - library/vendor/Zend/View/Helper/Abstract.php | 1 - library/vendor/Zend/View/Helper/Action.php | 3 - library/vendor/Zend/View/Helper/BaseUrl.php | 2 - library/vendor/Zend/View/Helper/Currency.php | 4 - .../vendor/Zend/View/Helper/DeclareVars.php | 1 - library/vendor/Zend/View/Helper/Doctype.php | 3 - library/vendor/Zend/View/Helper/Fieldset.php | 1 - library/vendor/Zend/View/Helper/Form.php | 1 - .../vendor/Zend/View/Helper/FormButton.php | 1 - .../vendor/Zend/View/Helper/FormCheckbox.php | 1 - .../vendor/Zend/View/Helper/FormElement.php | 2 - .../vendor/Zend/View/Helper/FormErrors.php | 1 - library/vendor/Zend/View/Helper/FormFile.php | 1 - .../vendor/Zend/View/Helper/FormHidden.php | 1 - library/vendor/Zend/View/Helper/FormImage.php | 1 - library/vendor/Zend/View/Helper/FormLabel.php | 1 - .../Zend/View/Helper/FormMultiCheckbox.php | 1 - library/vendor/Zend/View/Helper/FormNote.php | 1 - .../vendor/Zend/View/Helper/FormPassword.php | 1 - library/vendor/Zend/View/Helper/FormRadio.php | 2 - library/vendor/Zend/View/Helper/FormReset.php | 1 - .../vendor/Zend/View/Helper/FormSelect.php | 1 - .../vendor/Zend/View/Helper/FormSubmit.php | 1 - library/vendor/Zend/View/Helper/FormText.php | 1 - .../vendor/Zend/View/Helper/FormTextarea.php | 1 - library/vendor/Zend/View/Helper/Gravatar.php | 2 - library/vendor/Zend/View/Helper/HeadLink.php | 7 -- library/vendor/Zend/View/Helper/HeadMeta.php | 10 -- .../vendor/Zend/View/Helper/HeadScript.php | 8 -- library/vendor/Zend/View/Helper/HeadStyle.php | 7 -- library/vendor/Zend/View/Helper/HeadTitle.php | 4 - .../vendor/Zend/View/Helper/HtmlElement.php | 2 - library/vendor/Zend/View/Helper/HtmlFlash.php | 1 - library/vendor/Zend/View/Helper/HtmlList.php | 2 - .../vendor/Zend/View/Helper/HtmlObject.php | 1 - library/vendor/Zend/View/Helper/HtmlPage.php | 1 - .../vendor/Zend/View/Helper/HtmlQuicktime.php | 1 - .../vendor/Zend/View/Helper/InlineScript.php | 1 - library/vendor/Zend/View/Helper/Json.php | 4 - library/vendor/Zend/View/Helper/Layout.php | 2 - .../vendor/Zend/View/Helper/Navigation.php | 2 - .../View/Helper/Navigation/Breadcrumbs.php | 3 - .../View/Helper/Navigation/HelperAbstract.php | 7 -- .../Zend/View/Helper/Navigation/Links.php | 3 - .../Zend/View/Helper/Navigation/Menu.php | 3 - .../Zend/View/Helper/Navigation/Sitemap.php | 9 -- .../Zend/View/Helper/PaginationControl.php | 3 - library/vendor/Zend/View/Helper/Partial.php | 3 - .../Zend/View/Helper/Partial/Exception.php | 1 - .../vendor/Zend/View/Helper/PartialLoop.php | 2 - .../vendor/Zend/View/Helper/Placeholder.php | 2 - .../View/Helper/Placeholder/Container.php | 1 - .../Helper/Placeholder/Container/Abstract.php | 1 - .../Placeholder/Container/Exception.php | 1 - .../Placeholder/Container/Standalone.php | 3 - .../Zend/View/Helper/Placeholder/Registry.php | 5 - .../Helper/Placeholder/Registry/Exception.php | 1 - .../Zend/View/Helper/RenderToPlaceholder.php | 1 - library/vendor/Zend/View/Helper/Translate.php | 6 - library/vendor/Zend/View/Helper/Url.php | 1 - library/vendor/Zend/View/Helper/UserAgent.php | 2 - .../Zend/Wildfire/Channel/HttpHeaders.php | 13 --- library/vendor/Zend/Wildfire/Exception.php | 1 - .../vendor/Zend/Wildfire/Plugin/FirePhp.php | 15 --- .../Wildfire/Plugin/FirePhp/TableMessage.php | 5 - .../Zend/Wildfire/Protocol/JsonStream.php | 5 - library/vendor/Zend/Xml/Exception.php | 1 - library/vendor/Zend/Xml/Security.php | 3 - library/vendor/Zend/XmlRpc/Client.php | 9 -- .../vendor/Zend/XmlRpc/Client/Exception.php | 1 - .../Zend/XmlRpc/Client/FaultException.php | 1 - .../Zend/XmlRpc/Client/HttpException.php | 1 - .../XmlRpc/Client/IntrospectException.php | 1 - .../XmlRpc/Client/ServerIntrospection.php | 4 - library/vendor/Zend/XmlRpc/Exception.php | 1 - library/vendor/Zend/XmlRpc/Fault.php | 6 - .../Zend/XmlRpc/Generator/DomDocument.php | 1 - .../Zend/XmlRpc/Generator/XmlWriter.php | 1 - library/vendor/Zend/XmlRpc/Request.php | 4 - library/vendor/Zend/XmlRpc/Request/Http.php | 2 - library/vendor/Zend/XmlRpc/Request/Stdin.php | 1 - library/vendor/Zend/XmlRpc/Response.php | 5 - library/vendor/Zend/XmlRpc/Response/Http.php | 1 - library/vendor/Zend/XmlRpc/Server.php | 29 ----- library/vendor/Zend/XmlRpc/Server/Cache.php | 1 - .../vendor/Zend/XmlRpc/Server/Exception.php | 1 - library/vendor/Zend/XmlRpc/Server/Fault.php | 1 - library/vendor/Zend/XmlRpc/Server/System.php | 2 - library/vendor/Zend/XmlRpc/Value.php | 35 ------ library/vendor/Zend/XmlRpc/Value/Array.php | 1 - library/vendor/Zend/XmlRpc/Value/Base64.php | 1 - .../vendor/Zend/XmlRpc/Value/BigInteger.php | 2 - library/vendor/Zend/XmlRpc/Value/Boolean.php | 1 - .../vendor/Zend/XmlRpc/Value/Collection.php | 1 - library/vendor/Zend/XmlRpc/Value/DateTime.php | 2 - library/vendor/Zend/XmlRpc/Value/Double.php | 1 - .../vendor/Zend/XmlRpc/Value/Exception.php | 1 - library/vendor/Zend/XmlRpc/Value/Integer.php | 2 - library/vendor/Zend/XmlRpc/Value/Nil.php | 1 - library/vendor/Zend/XmlRpc/Value/Scalar.php | 1 - library/vendor/Zend/XmlRpc/Value/String.php | 1 - library/vendor/Zend/XmlRpc/Value/Struct.php | 1 - 1439 files changed, 1 insertion(+), 4937 deletions(-) diff --git a/library/vendor/Zend/Acl.php b/library/vendor/Zend/Acl.php index a0285f099..79a2eac15 100644 --- a/library/vendor/Zend/Acl.php +++ b/library/vendor/Zend/Acl.php @@ -23,31 +23,26 @@ /** * @see Zend_Acl_Resource_Interface */ -require_once 'Zend/Acl/Resource/Interface.php'; /** * @see Zend_Acl_Role_Registry */ -require_once 'Zend/Acl/Role/Registry.php'; /** * @see Zend_Acl_Assert_Interface */ -require_once 'Zend/Acl/Assert/Interface.php'; /** * @see Zend_Acl_Role */ -require_once 'Zend/Acl/Role.php'; /** * @see Zend_Acl_Resource */ -require_once 'Zend/Acl/Resource.php'; /** @@ -152,7 +147,6 @@ class Zend_Acl } if (!$role instanceof Zend_Acl_Role_Interface) { - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('addRole() expects $role to be of type Zend_Acl_Role_Interface'); } @@ -287,14 +281,12 @@ class Zend_Acl } if (!$resource instanceof Zend_Acl_Resource_Interface) { - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('addResource() expects $resource to be of type Zend_Acl_Resource_Interface'); } $resourceId = $resource->getResourceId(); if ($this->has($resourceId)) { - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception("Resource id '$resourceId' already exists in the ACL"); } @@ -309,7 +301,6 @@ class Zend_Acl } $resourceParent = $this->get($resourceParentId); } catch (Zend_Acl_Exception $e) { - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception("Parent Resource id '$resourceParentId' does not exist", 0, $e); } $this->_resources[$resourceParentId]['children'][$resourceId] = $resource; @@ -361,7 +352,6 @@ class Zend_Acl } if (!$this->has($resource)) { - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception("Resource '$resourceId' not found"); } @@ -408,7 +398,6 @@ class Zend_Acl $resourceId = $this->get($resource)->getResourceId(); $inheritId = $this->get($inherit)->getResourceId(); } catch (Zend_Acl_Exception $e) { - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e); } @@ -447,7 +436,6 @@ class Zend_Acl try { $resourceId = $this->get($resource)->getResourceId(); } catch (Zend_Acl_Exception $e) { - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e); } @@ -609,7 +597,6 @@ class Zend_Acl // ensure that the rule type is valid; normalize input to uppercase $type = strtoupper($type); if (self::TYPE_ALLOW !== $type && self::TYPE_DENY !== $type) { - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception("Unsupported rule type; must be either '" . self::TYPE_ALLOW . "' or '" . self::TYPE_DENY . "'"); } @@ -788,7 +775,6 @@ class Zend_Acl break; default: - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception("Unsupported operation; must be either '" . self::OP_ADD . "' or '" . self::OP_REMOVE . "'"); } @@ -966,7 +952,6 @@ class Zend_Acl /** * @see Zend_Acl_Exception */ - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('$dfs parameter may not be null'); } @@ -1009,7 +994,6 @@ class Zend_Acl /** * @see Zend_Acl_Exception */ - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('$privilege parameter may not be null'); } @@ -1055,7 +1039,6 @@ class Zend_Acl /** * @see Zend_Acl_Exception */ - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('$privilege parameter may not be null'); } @@ -1063,7 +1046,6 @@ class Zend_Acl /** * @see Zend_Acl_Exception */ - require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('$dfs parameter may not be null'); } diff --git a/library/vendor/Zend/Acl/Assert/Interface.php b/library/vendor/Zend/Acl/Assert/Interface.php index b95f7851c..37fdabaac 100644 --- a/library/vendor/Zend/Acl/Assert/Interface.php +++ b/library/vendor/Zend/Acl/Assert/Interface.php @@ -23,19 +23,16 @@ /** * @see Zend_Acl */ -require_once 'Zend/Acl.php'; /** * @see Zend_Acl_Role_Interface */ -require_once 'Zend/Acl/Role/Interface.php'; /** * @see Zend_Acl_Resource_Interface */ -require_once 'Zend/Acl/Resource/Interface.php'; /** diff --git a/library/vendor/Zend/Acl/Exception.php b/library/vendor/Zend/Acl/Exception.php index 51e79fa0b..5e0479fa3 100644 --- a/library/vendor/Zend/Acl/Exception.php +++ b/library/vendor/Zend/Acl/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Acl/Resource.php b/library/vendor/Zend/Acl/Resource.php index 5afb3ab64..eaec291d1 100644 --- a/library/vendor/Zend/Acl/Resource.php +++ b/library/vendor/Zend/Acl/Resource.php @@ -23,7 +23,6 @@ /** * @see Zend_Acl_Resource_Interface */ -require_once 'Zend/Acl/Resource/Interface.php'; /** diff --git a/library/vendor/Zend/Acl/Role.php b/library/vendor/Zend/Acl/Role.php index db7f404ed..d8ee46ebe 100644 --- a/library/vendor/Zend/Acl/Role.php +++ b/library/vendor/Zend/Acl/Role.php @@ -23,7 +23,6 @@ /** * @see Zend_Acl_Role_Interface */ -require_once 'Zend/Acl/Role/Interface.php'; /** diff --git a/library/vendor/Zend/Acl/Role/Registry.php b/library/vendor/Zend/Acl/Role/Registry.php index a8cc259ac..bbdf04128 100644 --- a/library/vendor/Zend/Acl/Role/Registry.php +++ b/library/vendor/Zend/Acl/Role/Registry.php @@ -23,7 +23,6 @@ /** * @see Zend_Acl_Role_Interface */ -require_once 'Zend/Acl/Role/Interface.php'; /** @@ -68,7 +67,6 @@ class Zend_Acl_Role_Registry /** * @see Zend_Acl_Role_Registry_Exception */ - require_once 'Zend/Acl/Role/Registry/Exception.php'; throw new Zend_Acl_Role_Registry_Exception("Role id '$roleId' already exists in the registry"); } @@ -81,7 +79,6 @@ class Zend_Acl_Role_Registry /** * @see Zend_Acl_Role_Registry_Exception */ - require_once 'Zend/Acl/Role/Registry/Exception.php'; foreach ($parents as $parent) { try { if ($parent instanceof Zend_Acl_Role_Interface) { @@ -128,7 +125,6 @@ class Zend_Acl_Role_Registry /** * @see Zend_Acl_Role_Registry_Exception */ - require_once 'Zend/Acl/Role/Registry/Exception.php'; throw new Zend_Acl_Role_Registry_Exception("Role '$roleId' not found"); } @@ -195,7 +191,6 @@ class Zend_Acl_Role_Registry /** * @see Zend_Acl_Role_Registry_Exception */ - require_once 'Zend/Acl/Role/Registry/Exception.php'; try { $roleId = $this->get($role)->getRoleId(); $inheritId = $this->get($inherit)->getRoleId(); @@ -232,7 +227,6 @@ class Zend_Acl_Role_Registry /** * @see Zend_Acl_Role_Registry_Exception */ - require_once 'Zend/Acl/Role/Registry/Exception.php'; try { $roleId = $this->get($role)->getRoleId(); } catch (Zend_Acl_Role_Registry_Exception $e) { diff --git a/library/vendor/Zend/Acl/Role/Registry/Exception.php b/library/vendor/Zend/Acl/Role/Registry/Exception.php index 72cb840c0..10ff5345b 100644 --- a/library/vendor/Zend/Acl/Role/Registry/Exception.php +++ b/library/vendor/Zend/Acl/Role/Registry/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Acl_Exception */ -require_once 'Zend/Acl/Exception.php'; /** diff --git a/library/vendor/Zend/Amf/Adobe/Auth.php b/library/vendor/Zend/Amf/Adobe/Auth.php index c5aa27a6b..0831877af 100755 --- a/library/vendor/Zend/Amf/Adobe/Auth.php +++ b/library/vendor/Zend/Amf/Adobe/Auth.php @@ -20,16 +20,12 @@ */ /** @see Zend_Amf_Auth_Abstract */ -require_once 'Zend/Amf/Auth/Abstract.php'; /** @see Zend_Acl */ -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. @@ -109,7 +105,6 @@ Roles file format: /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Username/password should be set'); } diff --git a/library/vendor/Zend/Amf/Adobe/Introspector.php b/library/vendor/Zend/Amf/Adobe/Introspector.php index 1088ae345..f5b144c60 100755 --- a/library/vendor/Zend/Amf/Adobe/Introspector.php +++ b/library/vendor/Zend/Amf/Adobe/Introspector.php @@ -20,13 +20,10 @@ */ /** @see Zend_Amf_Parse_TypeLoader */ -require_once 'Zend/Amf/Parse/TypeLoader.php'; /** @see Zend_Reflection_Class */ -require_once 'Zend/Reflection/Class.php'; /** @see Zend_Server_Reflection */ -require_once 'Zend/Server/Reflection.php'; /** * This class implements a service for generating AMF service descriptions as XML. @@ -92,7 +89,6 @@ class Zend_Amf_Adobe_Introspector // Introspect! if (!class_exists($serviceClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($serviceClass, $this->_getServicePath()); } diff --git a/library/vendor/Zend/Amf/Auth/Abstract.php b/library/vendor/Zend/Amf/Auth/Abstract.php index e0e2e46f2..8d8c4a4b0 100755 --- a/library/vendor/Zend/Amf/Auth/Abstract.php +++ b/library/vendor/Zend/Amf/Auth/Abstract.php @@ -20,7 +20,6 @@ */ /** @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; /** * Base abstract class for AMF authentication implementation diff --git a/library/vendor/Zend/Amf/Exception.php b/library/vendor/Zend/Amf/Exception.php index 91381b12e..7c961dd39 100644 --- a/library/vendor/Zend/Amf/Exception.php +++ b/library/vendor/Zend/Amf/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @package Zend_Amf diff --git a/library/vendor/Zend/Amf/Parse/Amf0/Deserializer.php b/library/vendor/Zend/Amf/Parse/Amf0/Deserializer.php index 7ea591b68..69ca741da 100644 --- a/library/vendor/Zend/Amf/Parse/Amf0/Deserializer.php +++ b/library/vendor/Zend/Amf/Parse/Amf0/Deserializer.php @@ -21,13 +21,10 @@ */ /** 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'; /** * Read an AMF0 input stream and convert it into PHP data types @@ -133,7 +130,6 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer return $this->readAmf3TypeMarker(); default: - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unsupported marker type: ' . $typeMarker); } } @@ -183,7 +179,6 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer { $key = $this->_stream->readInt(); if (!array_key_exists($key, $this->_reference)) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Invalid reference key: '. $key); } return $this->_reference[$key]; @@ -237,7 +232,6 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer // so read and ignore. $offset = $this->_stream->readInt(); - require_once 'Zend/Date.php'; $date = new Zend_Date($timestamp); return $date; } @@ -265,7 +259,6 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer */ public function readTypedObject() { - require_once 'Zend/Amf/Parse/TypeLoader.php'; // get the remote class name $className = $this->_stream->readUTF(); $loader = Zend_Amf_Parse_TypeLoader::loadType($className); @@ -290,7 +283,6 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer */ public function readAmf3TypeMarker() { - require_once 'Zend/Amf/Parse/Amf3/Deserializer.php'; $deserializer = new Zend_Amf_Parse_Amf3_Deserializer($this->_stream); $this->_objectEncoding = Zend_Amf_Constants::AMF3_OBJECT_ENCODING; return $deserializer->readTypeMarker(); diff --git a/library/vendor/Zend/Amf/Parse/Amf0/Serializer.php b/library/vendor/Zend/Amf/Parse/Amf0/Serializer.php index fb24b4439..12674b394 100644 --- a/library/vendor/Zend/Amf/Parse/Amf0/Serializer.php +++ b/library/vendor/Zend/Amf/Parse/Amf0/Serializer.php @@ -21,10 +21,8 @@ */ /** Zend_Amf_Constants */ -require_once 'Zend/Amf/Constants.php'; /** @see Zend_Amf_Parse_Serializer */ -require_once 'Zend/Amf/Parse/Serializer.php'; /** * Serializer PHP misc types back to there corresponding AMF0 Type Marker. @@ -112,7 +110,6 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer $this->writeAmf3TypeMarker($data); break; default: - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception("Unknown Type Marker: " . $markerType); } } @@ -174,7 +171,6 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer } break; default: - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unsupported data type: ' . gettype($data)); } @@ -277,7 +273,6 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer } elseif ($data instanceof Zend_Date) { $dateString = $data->toString('U'); } else { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Invalid date specified; must be a DateTime or Zend_Date object'); } $dateString *= 1000; @@ -313,7 +308,6 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer */ public function writeAmf3TypeMarker(&$data) { - require_once 'Zend/Amf/Parse/Amf3/Serializer.php'; $serializer = new Zend_Amf_Parse_Amf3_Serializer($this->_stream); $serializer->writeTypeMarker($data); return $this; @@ -328,7 +322,6 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer */ protected function getClassName($object) { - require_once 'Zend/Amf/Parse/TypeLoader.php'; //Check to see if the object is a typed object and we need to change $className = ''; switch (true) { diff --git a/library/vendor/Zend/Amf/Parse/Amf3/Deserializer.php b/library/vendor/Zend/Amf/Parse/Amf3/Deserializer.php index 68693b1e5..3ead204ae 100644 --- a/library/vendor/Zend/Amf/Parse/Amf3/Deserializer.php +++ b/library/vendor/Zend/Amf/Parse/Amf3/Deserializer.php @@ -21,13 +21,10 @@ */ /** 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'; /** * Read an AMF3 input stream and convert it into PHP data types. @@ -110,7 +107,6 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer case Zend_Amf_Constants::AMF3_BYTEARRAY: return $this->readString(); default: - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unsupported type marker: ' . $typeMarker); } } @@ -185,7 +181,6 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer // reference string $stringReference = $stringReference >> 1; if ($stringReference >= count($this->_referenceStrings)) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Undefined string reference: ' . $stringReference); } // reference string found @@ -219,7 +214,6 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer if (($dateReference & 0x01) == 0) { $dateReference = $dateReference >> 1; if ($dateReference>=count($this->_referenceObjects)) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Undefined date reference: ' . $dateReference); } return $this->_referenceObjects[$dateReference]; @@ -227,7 +221,6 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer $timestamp = floor($this->_stream->readDouble() / 1000); - require_once 'Zend/Date.php'; $dateTime = new Zend_Date($timestamp); $this->_referenceObjects[] = $dateTime; return $dateTime; @@ -246,7 +239,6 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer if (($arrayReference & 0x01)==0){ $arrayReference = $arrayReference >> 1; if ($arrayReference>=count($this->_referenceObjects)) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknow array reference: ' . $arrayReference); } return $this->_referenceObjects[$arrayReference]; @@ -289,7 +281,6 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer if ($storedObject) { $ref = $traitsInfo; if (!isset($this->_referenceObjects[$ref])) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknown Object reference: ' . $ref); } $returnObject = $this->_referenceObjects[$ref]; @@ -300,7 +291,6 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer if ($storedClass) { $ref = $traitsInfo; if (!isset($this->_referenceDefinitions[$ref])) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknows Definition reference: '. $ref); } // Populate the reference attributes @@ -327,7 +317,6 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer $returnObject = new $loader(); } else { //user defined typed object - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Typed object not found: '. $className . ' '); } } diff --git a/library/vendor/Zend/Amf/Parse/Amf3/Serializer.php b/library/vendor/Zend/Amf/Parse/Amf3/Serializer.php index 68c20c12b..77a6059cd 100644 --- a/library/vendor/Zend/Amf/Parse/Amf3/Serializer.php +++ b/library/vendor/Zend/Amf/Parse/Amf3/Serializer.php @@ -21,14 +21,11 @@ */ /** Zend_Amf_Constants */ -require_once 'Zend/Amf/Constants.php'; /** Zend_Amf_Parse_Serializer */ -require_once 'Zend/Amf/Parse/Serializer.php'; /** Zend_Amf_Parse_TypeLoader */ -require_once 'Zend/Amf/Parse/TypeLoader.php'; /** * Detect PHP object type and convert it to a corresponding AMF3 object type @@ -119,7 +116,6 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer $this->writeXml($data); break; default: - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknown Type Marker: ' . $markerType); } } else { @@ -167,7 +163,6 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer } break; default: - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unsupported data type: ' . gettype($data)); } $this->writeTypeMarker($data, $markerType); @@ -267,7 +262,6 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer } else if ($data instanceof Zend_Amf_Value_ByteArray) { $data = $data->getData(); } else { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Invalid ByteArray specified; must be a string or Zend_Amf_Value_ByteArray'); } @@ -295,7 +289,6 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer } else if ($xml instanceof SimpleXMLElement) { $xml = $xml->asXML(); } else { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Invalid xml specified; must be a DOMDocument or SimpleXMLElement'); } @@ -321,7 +314,6 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer } elseif ($date instanceof Zend_Date) { $dateString = $date->toString('U') * 1000; } else { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Invalid date specified; must be a string DateTime or Zend_Date object'); } @@ -517,15 +509,12 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer $this->writeString($this->_strEmpty); break; case Zend_Amf_Constants::ET_EXTERNAL: - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('External Object Encoding not implemented'); break; default: - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknown Object Encoding type: ' . $encoding); } } catch (Exception $e) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unable to writeObject output: ' . $e->getMessage(), 0, $e); } diff --git a/library/vendor/Zend/Amf/Parse/InputStream.php b/library/vendor/Zend/Amf/Parse/InputStream.php index 39fe772f0..b77dd65a4 100644 --- a/library/vendor/Zend/Amf/Parse/InputStream.php +++ b/library/vendor/Zend/Amf/Parse/InputStream.php @@ -21,7 +21,6 @@ */ /** Zend_Amf_Util_BinaryStream */ -require_once 'Zend/Amf/Util/BinaryStream.php'; /** * InputStream is used to iterate at a binary level through the AMF request. diff --git a/library/vendor/Zend/Amf/Parse/OutputStream.php b/library/vendor/Zend/Amf/Parse/OutputStream.php index 52ba5e96c..16e25253e 100644 --- a/library/vendor/Zend/Amf/Parse/OutputStream.php +++ b/library/vendor/Zend/Amf/Parse/OutputStream.php @@ -21,7 +21,6 @@ */ /** Zend_Amf_Util_BinaryStream */ -require_once 'Zend/Amf/Util/BinaryStream.php'; /** * Iterate at a binary level through the AMF response diff --git a/library/vendor/Zend/Amf/Parse/TypeLoader.php b/library/vendor/Zend/Amf/Parse/TypeLoader.php index 747d0d0a2..431734f31 100644 --- a/library/vendor/Zend/Amf/Parse/TypeLoader.php +++ b/library/vendor/Zend/Amf/Parse/TypeLoader.php @@ -23,23 +23,18 @@ /** * @see Zend_Amf_Value_Messaging_AcknowledgeMessage */ -require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; /** * @see Zend_Amf_Value_Messaging_AsyncMessage */ -require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; /** * @see Zend_Amf_Value_Messaging_CommandMessage */ -require_once 'Zend/Amf/Value/Messaging/CommandMessage.php'; /** * @see Zend_Amf_Value_Messaging_ErrorMessage */ -require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php'; /** * @see Zend_Amf_Value_Messaging_RemotingMessage */ -require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php'; /** * Loads a local class and executes the instantiation of that class. @@ -202,21 +197,18 @@ final class Zend_Amf_Parse_TypeLoader public static function handleResource($resource) { if(!self::$_resourceLoader) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unable to handle resources - resource plugin loader not set'); } try { while(is_resource($resource)) { $resclass = self::getResourceParser($resource); if(!$resclass) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource)); } $parser = new $resclass(); if(is_callable(array($parser, 'parse'))) { $resource = $parser->parse($resource); } else { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception("Could not call parse() method on class $resclass"); } } @@ -224,7 +216,6 @@ final class Zend_Amf_Parse_TypeLoader } catch(Zend_Amf_Exception $e) { throw new Zend_Amf_Exception($e->getMessage(), $e->getCode(), $e); } catch(Exception $e) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource), 0, $e); } } diff --git a/library/vendor/Zend/Amf/Request.php b/library/vendor/Zend/Amf/Request.php index 3ad84cf8f..89731e90e 100644 --- a/library/vendor/Zend/Amf/Request.php +++ b/library/vendor/Zend/Amf/Request.php @@ -20,19 +20,14 @@ */ /** @see Zend_Amf_Parse_InputStream */ -require_once 'Zend/Amf/Parse/InputStream.php'; /** @see Zend_Amf_Parse_Amf0_Deserializer */ -require_once 'Zend/Amf/Parse/Amf0/Deserializer.php'; /** @see Zend_Amf_Constants */ -require_once 'Zend/Amf/Constants.php'; /** @see Zend_Amf_Value_MessageHeader */ -require_once 'Zend/Amf/Value/MessageHeader.php'; /** @see Zend_Amf_Value_MessageBody */ -require_once 'Zend/Amf/Value/MessageBody.php'; /** * Handle the incoming AMF request by deserializing the data to php object @@ -108,7 +103,6 @@ class Zend_Amf_Request && ($clientVersion != Zend_Amf_Constants::AMF3_OBJECT_ENCODING) && ($clientVersion != Zend_Amf_Constants::FMS_OBJECT_ENCODING) ) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknown Player Version ' . $clientVersion); } @@ -150,7 +144,6 @@ class Zend_Amf_Request try { $data = $this->_deserializer->readTypeMarker(); } catch (Exception $e) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unable to parse ' . $name . ' header data: ' . $e->getMessage() . ' '. $e->getLine(), 0, $e); } @@ -172,7 +165,6 @@ class Zend_Amf_Request try { $data = $this->_deserializer->readTypeMarker(); } catch (Exception $e) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unable to parse ' . $targetURI . ' body data ' . $e->getMessage(), 0, $e); } diff --git a/library/vendor/Zend/Amf/Request/Http.php b/library/vendor/Zend/Amf/Request/Http.php index 57ccbb948..a3369484d 100644 --- a/library/vendor/Zend/Amf/Request/Http.php +++ b/library/vendor/Zend/Amf/Request/Http.php @@ -21,7 +21,6 @@ */ /** @see Zend_Amf_Request */ -require_once 'Zend/Amf/Request.php'; /** * AMF Request object -- Request via HTTP diff --git a/library/vendor/Zend/Amf/Response.php b/library/vendor/Zend/Amf/Response.php index 6b3d12d02..c077f1e20 100644 --- a/library/vendor/Zend/Amf/Response.php +++ b/library/vendor/Zend/Amf/Response.php @@ -20,13 +20,10 @@ */ /** @see Zend_Amf_Constants */ -require_once 'Zend/Amf/Constants.php'; /** @see Zend_Amf_Parse_OutputStream */ -require_once 'Zend/Amf/Parse/OutputStream.php'; /** @see Zend_Amf_Parse_Amf0_Serializer */ -require_once 'Zend/Amf/Parse/Amf0/Serializer.php'; /** * Handles converting the PHP object ready for response back into AMF diff --git a/library/vendor/Zend/Amf/Response/Http.php b/library/vendor/Zend/Amf/Response/Http.php index c3bcb2180..c80de673c 100644 --- a/library/vendor/Zend/Amf/Response/Http.php +++ b/library/vendor/Zend/Amf/Response/Http.php @@ -21,7 +21,6 @@ */ /** Zend_Amf_Response */ -require_once 'Zend/Amf/Response.php'; /** * Creates the proper http headers and send the serialized AMF stream to standard out. diff --git a/library/vendor/Zend/Amf/Server.php b/library/vendor/Zend/Amf/Server.php index acd650451..f1099b934 100644 --- a/library/vendor/Zend/Amf/Server.php +++ b/library/vendor/Zend/Amf/Server.php @@ -20,31 +20,22 @@ */ /** @see Zend_Server_Interface */ -require_once 'Zend/Server/Interface.php'; /** @see Zend_Server_Reflection */ -require_once 'Zend/Server/Reflection.php'; /** @see Zend_Amf_Constants */ -require_once 'Zend/Amf/Constants.php'; /** @see Zend_Amf_Value_MessageBody */ -require_once 'Zend/Amf/Value/MessageBody.php'; /** @see Zend_Amf_Value_MessageHeader */ -require_once 'Zend/Amf/Value/MessageHeader.php'; /** @see Zend_Amf_Value_Messaging_CommandMessage */ -require_once 'Zend/Amf/Value/Messaging/CommandMessage.php'; /** @see Zend_Loader_PluginLoader */ -require_once 'Zend/Loader/PluginLoader.php'; /** @see Zend_Amf_Parse_TypeLoader */ -require_once 'Zend/Amf/Parse/TypeLoader.php'; /** @see Zend_Auth */ -require_once 'Zend/Auth.php'; /** * An AMF gateway server implementation to allow the connection of the Adobe Flash Player to * Zend Framework @@ -215,7 +206,6 @@ class Zend_Amf_Server implements Zend_Server_Interface */ public function setSession($namespace = 'Zend_Amf') { - require_once 'Zend/Session.php'; $this->_session = true; $this->_sesionNamespace = new Zend_Session_Namespace($namespace); return $this; @@ -245,7 +235,6 @@ class Zend_Amf_Server implements Zend_Server_Interface if($object) { $class = is_object($object)?get_class($object):$object; if(!$this->_acl->has($class)) { - require_once 'Zend/Acl/Resource.php'; $this->_acl->add(new Zend_Acl_Resource($class)); } $call = array($object, "initAcl"); @@ -264,14 +253,12 @@ class Zend_Amf_Server implements Zend_Server_Interface if($this->_acl->hasRole(Zend_Amf_Constants::GUEST_ROLE)) { $role = Zend_Amf_Constants::GUEST_ROLE; } else { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception("Unauthenticated access not allowed"); } } if($this->_acl->isAllowed($role, $class, $function)) { return true; } else { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception("Access not allowed"); } } @@ -284,7 +271,6 @@ class Zend_Amf_Server implements Zend_Server_Interface protected function getLoader() { if(empty($this->_loader)) { - require_once 'Zend/Loader/PluginLoader.php'; $this->_loader = new Zend_Loader_PluginLoader(); } return $this->_loader; @@ -313,23 +299,19 @@ class Zend_Amf_Server implements Zend_Server_Interface if ($source) { $className = str_replace('.', '_', $source); if(class_exists($className, false) && !isset($this->_classAllowed[$className])) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Can not call "' . $className . '" - use setClass()'); } try { $this->getLoader()->load($className); } catch (Exception $e) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Class "' . $className . '" does not exist: '.$e->getMessage(), 0, $e); } // Add the new loaded class to the server. - require_once 'Zend/Amf/Server/Exception.php'; $this->setClass($className, $source); } if (!isset($this->_table[$qualifiedName])) { // Source is null or doesn't contain specified method - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Method "' . $method . '" does not exist'); } } @@ -361,14 +343,12 @@ class Zend_Amf_Server implements Zend_Server_Interface try { $object = $info->getDeclaringClass()->newInstance(); } catch (Exception $e) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Error instantiating class ' . $class . ' to invoke method ' . $info->getName() . ': '.$e->getMessage(), 621, $e); } $this->_checkAcl($object, $info->getName()); $return = $info->invokeArgs($object, $params); } } else { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Method missing implementation ' . get_class($info)); } @@ -386,7 +366,6 @@ class Zend_Amf_Server implements Zend_Server_Interface */ protected function _loadCommandMessage(Zend_Amf_Value_Messaging_CommandMessage $message) { - require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; switch($message->operation) { case Zend_Amf_Value_Messaging_CommandMessage::DISCONNECT_OPERATION : case Zend_Amf_Value_Messaging_CommandMessage::CLIENT_PING_OPERATION : @@ -397,11 +376,9 @@ class Zend_Amf_Server implements Zend_Server_Interface $userid = $data[0]; $password = isset($data[1])?$data[1]:""; if(empty($userid)) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Login failed: username not supplied'); } if(!$this->_handleAuth($userid, $password)) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Authentication failed'); } $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message); @@ -413,7 +390,6 @@ class Zend_Amf_Server implements Zend_Server_Interface $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message); break; default : - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('CommandMessage::' . $message->operation . ' not implemented'); break; } @@ -443,7 +419,6 @@ class Zend_Amf_Server implements Zend_Server_Interface 'code' => $code ); case Zend_Amf_Constants::AMF3_OBJECT_ENCODING : - require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php'; $return = new Zend_Amf_Value_Messaging_ErrorMessage ( $message ); $return->faultString = $this->isProduction () ? '' : $description; $return->faultCode = $code; @@ -475,7 +450,6 @@ class Zend_Amf_Server implements Zend_Server_Interface return true; } else { // authentication failed, good bye - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception( "Authentication failed: " . join("\n", $result->getMessages()), $result->getCode()); @@ -578,7 +552,6 @@ class Zend_Amf_Server implements Zend_Server_Interface // async call with command message $return = $this->_loadCommandMessage($message); } elseif ($message instanceof Zend_Amf_Value_Messaging_RemotingMessage) { - require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message); $return->body = $this->_dispatch($message->operation, $message->body, $message->source); } else { @@ -661,7 +634,6 @@ class Zend_Amf_Server implements Zend_Server_Interface $response = $this->getResponse(); } catch (Exception $e) { // Handle any errors in the serialization and service calls. - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Handle error: ' . $e->getMessage() . ' ' . $e->getLine(), 0, $e); } @@ -680,11 +652,9 @@ class Zend_Amf_Server implements Zend_Server_Interface if (is_string($request) && class_exists($request)) { $request = new $request(); if (!$request instanceof Zend_Amf_Request) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Invalid request class'); } } elseif (!$request instanceof Zend_Amf_Request) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Invalid request object'); } $this->_request = $request; @@ -699,7 +669,6 @@ class Zend_Amf_Server implements Zend_Server_Interface public function getRequest() { if (null === $this->_request) { - require_once 'Zend/Amf/Request/Http.php'; $this->setRequest(new Zend_Amf_Request_Http()); } @@ -717,11 +686,9 @@ class Zend_Amf_Server implements Zend_Server_Interface if (is_string($response) && class_exists($response)) { $response = new $response(); if (!$response instanceof Zend_Amf_Response) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Invalid response class'); } } elseif (!$response instanceof Zend_Amf_Response) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Invalid response object'); } $this->_response = $response; @@ -736,7 +703,6 @@ class Zend_Amf_Server implements Zend_Server_Interface public function getResponse() { if (null === ($response = $this->_response)) { - require_once 'Zend/Amf/Response/Http.php'; $this->setResponse(new Zend_Amf_Response_Http()); } return $this->_response; @@ -760,10 +726,8 @@ class Zend_Amf_Server implements Zend_Server_Interface public function setClass($class, $namespace = '', $argv = null) { if (is_string($class) && !class_exists($class)){ - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Invalid method or class'); } elseif (!is_string($class) && !is_object($class)) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Invalid method or class; must be a classname or object'); } @@ -801,7 +765,6 @@ class Zend_Amf_Server implements Zend_Server_Interface public function addFunction($function, $namespace = '') { if (!is_string($function) && !is_array($function)) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Unable to attach function'); } @@ -813,7 +776,6 @@ class Zend_Amf_Server implements Zend_Server_Interface $function = (array) $function; foreach ($function as $func) { if (!is_string($func) || !function_exists($func)) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Unable to attach function'); } $this->_methods[] = Zend_Server_Reflection::reflectFunction($func, $argv, $namespace); @@ -863,7 +825,6 @@ class Zend_Amf_Server implements Zend_Server_Interface $name = empty($ns) ? $name : $ns . '.' . $name; if (isset($table[$name])) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Duplicate method registered: ' . $name); } $table[$name] = $dispatchable; @@ -877,7 +838,6 @@ class Zend_Amf_Server implements Zend_Server_Interface $name = empty($ns) ? $name : $ns . '.' . $name; if (isset($table[$name])) { - require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Duplicate method registered: ' . $name); } $table[$name] = $method; @@ -948,7 +908,6 @@ class Zend_Amf_Server implements Zend_Server_Interface */ public function setClassMap($asClass, $phpClass) { - require_once 'Zend/Amf/Parse/TypeLoader.php'; Zend_Amf_Parse_TypeLoader::setMapping($asClass, $phpClass); return $this; } diff --git a/library/vendor/Zend/Amf/Server/Exception.php b/library/vendor/Zend/Amf/Server/Exception.php index fe9c92ca2..d44b458a3 100644 --- a/library/vendor/Zend/Amf/Server/Exception.php +++ b/library/vendor/Zend/Amf/Server/Exception.php @@ -21,7 +21,6 @@ */ /** Zend_Amf_Exception */ -require_once 'Zend/Amf/Exception.php'; /** * Zend_Amf_Server_Exception diff --git a/library/vendor/Zend/Amf/Util/BinaryStream.php b/library/vendor/Zend/Amf/Util/BinaryStream.php index 0a32512c9..9f0aa83b9 100644 --- a/library/vendor/Zend/Amf/Util/BinaryStream.php +++ b/library/vendor/Zend/Amf/Util/BinaryStream.php @@ -68,7 +68,6 @@ class Zend_Amf_Util_BinaryStream public function __construct($stream) { if (!is_string($stream)) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Inputdata is not of type String'); } @@ -100,7 +99,6 @@ class Zend_Amf_Util_BinaryStream public function readBytes($length) { if (($length + $this->_needle) > $this->_streamLength) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length); } $bytes = $this->_mbStringFunctionsOverloaded ? mb_substr($this->_stream, $this->_needle, $length, '8bit') : substr($this->_stream, $this->_needle, $length); @@ -131,7 +129,6 @@ class Zend_Amf_Util_BinaryStream public function readByte() { if (($this->_needle + 1) > $this->_streamLength) { - require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception( 'Buffer underrun at needle position: ' . $this->_needle diff --git a/library/vendor/Zend/Amf/Value/Messaging/AcknowledgeMessage.php b/library/vendor/Zend/Amf/Value/Messaging/AcknowledgeMessage.php index 93437fe46..e03f92b0f 100644 --- a/library/vendor/Zend/Amf/Value/Messaging/AcknowledgeMessage.php +++ b/library/vendor/Zend/Amf/Value/Messaging/AcknowledgeMessage.php @@ -21,7 +21,6 @@ */ /** Zend_Amf_Value_Messaging_AsyncMessage */ -require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; /** * This is the type of message returned by the MessageBroker diff --git a/library/vendor/Zend/Amf/Value/Messaging/AsyncMessage.php b/library/vendor/Zend/Amf/Value/Messaging/AsyncMessage.php index 29e709fde..b6b9b8645 100644 --- a/library/vendor/Zend/Amf/Value/Messaging/AsyncMessage.php +++ b/library/vendor/Zend/Amf/Value/Messaging/AsyncMessage.php @@ -22,7 +22,6 @@ /** Zend_Amf_Value_Messaging_AbstractMessage */ -require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; /** * This type of message contains information necessary to perform diff --git a/library/vendor/Zend/Amf/Value/Messaging/CommandMessage.php b/library/vendor/Zend/Amf/Value/Messaging/CommandMessage.php index fbfc9c9df..e6f0d2499 100644 --- a/library/vendor/Zend/Amf/Value/Messaging/CommandMessage.php +++ b/library/vendor/Zend/Amf/Value/Messaging/CommandMessage.php @@ -23,7 +23,6 @@ /** * @see Zend_Amf_Value_Messaging_AsyncMessage */ -require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; /** * A message that represents an infrastructure command passed between diff --git a/library/vendor/Zend/Amf/Value/Messaging/ErrorMessage.php b/library/vendor/Zend/Amf/Value/Messaging/ErrorMessage.php index 2cb4f52ac..beb93300c 100644 --- a/library/vendor/Zend/Amf/Value/Messaging/ErrorMessage.php +++ b/library/vendor/Zend/Amf/Value/Messaging/ErrorMessage.php @@ -21,7 +21,6 @@ */ /** @see Zend_Amf_Value_Messaging_AcknowledgeMessage */ -require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; /** * Creates the error message to report to flex the issue with the call diff --git a/library/vendor/Zend/Amf/Value/Messaging/RemotingMessage.php b/library/vendor/Zend/Amf/Value/Messaging/RemotingMessage.php index bc319decc..565077b3f 100644 --- a/library/vendor/Zend/Amf/Value/Messaging/RemotingMessage.php +++ b/library/vendor/Zend/Amf/Value/Messaging/RemotingMessage.php @@ -21,7 +21,6 @@ */ /** Zend_Amf_Value_Messaging_AbstractMessage */ -require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; /** * This type of message contains information needed to perform diff --git a/library/vendor/Zend/Application.php b/library/vendor/Zend/Application.php index cf7d2a84d..fcb9a1c45 100644 --- a/library/vendor/Zend/Application.php +++ b/library/vendor/Zend/Application.php @@ -77,7 +77,6 @@ class Zend_Application { $this->_environment = (string) $environment; - require_once 'Zend/Loader/Autoloader.php'; $this->_autoloader = Zend_Loader_Autoloader::getInstance(); if (null !== $options) { @@ -317,7 +316,6 @@ class Zend_Application } if (!class_exists($class, false)) { - require_once $path; if (!class_exists($class, false)) { throw new Zend_Application_Exception('Bootstrap class not found'); } diff --git a/library/vendor/Zend/Application/Bootstrap/Bootstrap.php b/library/vendor/Zend/Application/Bootstrap/Bootstrap.php index a1bc5b47a..a62c78fcc 100644 --- a/library/vendor/Zend/Application/Bootstrap/Bootstrap.php +++ b/library/vendor/Zend/Application/Bootstrap/Bootstrap.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Bootstrap_BootstrapAbstract */ -require_once 'Zend/Application/Bootstrap/BootstrapAbstract.php'; /** * Concrete base class for bootstrap classes diff --git a/library/vendor/Zend/Application/Bootstrap/BootstrapAbstract.php b/library/vendor/Zend/Application/Bootstrap/BootstrapAbstract.php index 6a62f108b..055266e74 100644 --- a/library/vendor/Zend/Application/Bootstrap/BootstrapAbstract.php +++ b/library/vendor/Zend/Application/Bootstrap/BootstrapAbstract.php @@ -23,12 +23,10 @@ /** * @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 diff --git a/library/vendor/Zend/Application/Bootstrap/Exception.php b/library/vendor/Zend/Application/Bootstrap/Exception.php index 4e298c8ac..a7e0bf5b6 100644 --- a/library/vendor/Zend/Application/Bootstrap/Exception.php +++ b/library/vendor/Zend/Application/Bootstrap/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Application_Exception */ -require_once 'Zend/Application/Exception.php'; /** * Exception class for Zend_Application diff --git a/library/vendor/Zend/Application/Exception.php b/library/vendor/Zend/Application/Exception.php index 68cda5661..e8fb96169 100644 --- a/library/vendor/Zend/Application/Exception.php +++ b/library/vendor/Zend/Application/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Exception class for Zend_Application diff --git a/library/vendor/Zend/Application/Module/Autoloader.php b/library/vendor/Zend/Application/Module/Autoloader.php index 9fa573007..b2fe6248a 100644 --- a/library/vendor/Zend/Application/Module/Autoloader.php +++ b/library/vendor/Zend/Application/Module/Autoloader.php @@ -21,7 +21,6 @@ */ /** @see Zend_Loader_Autoloader_Resource */ -require_once 'Zend/Loader/Autoloader/Resource.php'; /** * Resource loader for application module classes diff --git a/library/vendor/Zend/Application/Module/Bootstrap.php b/library/vendor/Zend/Application/Module/Bootstrap.php index dfaeda0e5..1dfe6b4e5 100644 --- a/library/vendor/Zend/Application/Module/Bootstrap.php +++ b/library/vendor/Zend/Application/Module/Bootstrap.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Bootstrap_Bootstrap */ -require_once 'Zend/Application/Bootstrap/Bootstrap.php'; /** * Base bootstrap class for modules diff --git a/library/vendor/Zend/Application/Resource/Cachemanager.php b/library/vendor/Zend/Application/Resource/Cachemanager.php index dd9b47069..c52f58d9d 100644 --- a/library/vendor/Zend/Application/Resource/Cachemanager.php +++ b/library/vendor/Zend/Application/Resource/Cachemanager.php @@ -20,7 +20,6 @@ * @version $Id$ */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** * Cache Manager resource diff --git a/library/vendor/Zend/Application/Resource/Db.php b/library/vendor/Zend/Application/Resource/Db.php index 396543795..420140336 100644 --- a/library/vendor/Zend/Application/Resource/Db.php +++ b/library/vendor/Zend/Application/Resource/Db.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** * Resource for creating database adapter diff --git a/library/vendor/Zend/Application/Resource/Dojo.php b/library/vendor/Zend/Application/Resource/Dojo.php index ae612e91d..34bd2f8ff 100644 --- a/library/vendor/Zend/Application/Resource/Dojo.php +++ b/library/vendor/Zend/Application/Resource/Dojo.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/vendor/Zend/Application/Resource/Exception.php b/library/vendor/Zend/Application/Resource/Exception.php index 550eb7809..cc0e8346a 100644 --- a/library/vendor/Zend/Application/Resource/Exception.php +++ b/library/vendor/Zend/Application/Resource/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Exception */ -require_once 'Zend/Application/Exception.php'; /** * Exception class for Zend_Application diff --git a/library/vendor/Zend/Application/Resource/Frontcontroller.php b/library/vendor/Zend/Application/Resource/Frontcontroller.php index eb4f520a9..edba1b11d 100644 --- a/library/vendor/Zend/Application/Resource/Frontcontroller.php +++ b/library/vendor/Zend/Application/Resource/Frontcontroller.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** @@ -138,7 +137,6 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc case 'dispatcher': if(!isset($value['class'])) { - require_once 'Zend/Application/Exception.php'; throw new Zend_Application_Exception('You must specify both '); } if (!isset($value['params'])) { @@ -147,7 +145,6 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc $dispatchClass = $value['class']; if(!class_exists($dispatchClass)) { - require_once 'Zend/Application/Exception.php'; throw new Zend_Application_Exception('Dispatcher class not found!'); } $front->setDispatcher(new $dispatchClass((array)$value['params'])); diff --git a/library/vendor/Zend/Application/Resource/Layout.php b/library/vendor/Zend/Application/Resource/Layout.php index 0e10a4c4e..59b0baffe 100644 --- a/library/vendor/Zend/Application/Resource/Layout.php +++ b/library/vendor/Zend/Application/Resource/Layout.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/vendor/Zend/Application/Resource/Locale.php b/library/vendor/Zend/Application/Resource/Locale.php index 7509600be..bd6853cbc 100644 --- a/library/vendor/Zend/Application/Resource/Locale.php +++ b/library/vendor/Zend/Application/Resource/Locale.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/vendor/Zend/Application/Resource/Log.php b/library/vendor/Zend/Application/Resource/Log.php index 0531164a6..06f2bca35 100644 --- a/library/vendor/Zend/Application/Resource/Log.php +++ b/library/vendor/Zend/Application/Resource/Log.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/vendor/Zend/Application/Resource/Mail.php b/library/vendor/Zend/Application/Resource/Mail.php index 6be5ea944..8a86571d4 100644 --- a/library/vendor/Zend/Application/Resource/Mail.php +++ b/library/vendor/Zend/Application/Resource/Mail.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** * Resource for setting up Mail Transport and default From & ReplyTo addresses diff --git a/library/vendor/Zend/Application/Resource/Modules.php b/library/vendor/Zend/Application/Resource/Modules.php index 560048918..de3d8e976 100644 --- a/library/vendor/Zend/Application/Resource/Modules.php +++ b/library/vendor/Zend/Application/Resource/Modules.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/vendor/Zend/Application/Resource/Multidb.php b/library/vendor/Zend/Application/Resource/Multidb.php index deabce3b8..59f00ed9f 100644 --- a/library/vendor/Zend/Application/Resource/Multidb.php +++ b/library/vendor/Zend/Application/Resource/Multidb.php @@ -20,9 +20,7 @@ * @version $Id$ */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; -require_once 'Zend/Db/Table.php'; /** */ diff --git a/library/vendor/Zend/Application/Resource/Navigation.php b/library/vendor/Zend/Application/Resource/Navigation.php index 62bebdedb..30cbeed96 100644 --- a/library/vendor/Zend/Application/Resource/Navigation.php +++ b/library/vendor/Zend/Application/Resource/Navigation.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/vendor/Zend/Application/Resource/ResourceAbstract.php b/library/vendor/Zend/Application/Resource/ResourceAbstract.php index c066624dc..c4a44ad29 100644 --- a/library/vendor/Zend/Application/Resource/ResourceAbstract.php +++ b/library/vendor/Zend/Application/Resource/ResourceAbstract.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_Resource */ -require_once 'Zend/Application/Resource/Resource.php'; /** * Abstract class for bootstrap resources diff --git a/library/vendor/Zend/Application/Resource/Router.php b/library/vendor/Zend/Application/Resource/Router.php index 013d0bb8c..259dbf129 100644 --- a/library/vendor/Zend/Application/Resource/Router.php +++ b/library/vendor/Zend/Application/Resource/Router.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/vendor/Zend/Application/Resource/Session.php b/library/vendor/Zend/Application/Resource/Session.php index 6dc7a0580..59975963e 100644 --- a/library/vendor/Zend/Application/Resource/Session.php +++ b/library/vendor/Zend/Application/Resource/Session.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/vendor/Zend/Application/Resource/Translate.php b/library/vendor/Zend/Application/Resource/Translate.php index 06e723df1..19ebe63b7 100644 --- a/library/vendor/Zend/Application/Resource/Translate.php +++ b/library/vendor/Zend/Application/Resource/Translate.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** @@ -68,10 +67,8 @@ class Zend_Application_Resource_Translate extends Zend_Application_Resource_Reso $options = $this->getOptions(); if (!isset($options['content']) && !isset($options['data'])) { - require_once 'Zend/Application/Resource/Exception.php'; throw new Zend_Application_Resource_Exception('No translation source data provided.'); } else if (array_key_exists('content', $options) && array_key_exists('data', $options)) { - require_once 'Zend/Application/Resource/Exception.php'; throw new Zend_Application_Resource_Exception( 'Conflict on translation source data: choose only one key between content and data.' ); @@ -121,7 +118,6 @@ class Zend_Application_Resource_Translate extends Zend_Application_Resource_Reso if(Zend_Registry::isRegistered($key)) { $translate = Zend_Registry::get($key); if(!$translate instanceof Zend_Translate) { - require_once 'Zend/Application/Resource/Exception.php'; throw new Zend_Application_Resource_Exception($key . ' already registered in registry but is ' . 'no instance of Zend_Translate'); diff --git a/library/vendor/Zend/Application/Resource/View.php b/library/vendor/Zend/Application/Resource/View.php index f99582b53..699548ee5 100644 --- a/library/vendor/Zend/Application/Resource/View.php +++ b/library/vendor/Zend/Application/Resource/View.php @@ -23,7 +23,6 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/vendor/Zend/Auth.php b/library/vendor/Zend/Auth.php index 9ada254df..d5ad1150a 100644 --- a/library/vendor/Zend/Auth.php +++ b/library/vendor/Zend/Auth.php @@ -87,7 +87,6 @@ class Zend_Auth /** * @see Zend_Auth_Storage_Session */ - require_once 'Zend/Auth/Storage/Session.php'; $this->setStorage(new Zend_Auth_Storage_Session()); } diff --git a/library/vendor/Zend/Auth/Adapter/DbTable.php b/library/vendor/Zend/Auth/Adapter/DbTable.php index 10bdf9585..08bacd4f9 100644 --- a/library/vendor/Zend/Auth/Adapter/DbTable.php +++ b/library/vendor/Zend/Auth/Adapter/DbTable.php @@ -24,17 +24,14 @@ /** * @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Auth_Result */ -require_once 'Zend/Auth/Result.php'; /** @@ -170,10 +167,8 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface * If no adapter is specified, fetch default database adapter. */ if(null === $this->_zendDb) { - require_once 'Zend/Db/Table/Abstract.php'; $this->_zendDb = Zend_Db_Table_Abstract::getDefaultAdapter(); if (null === $this->_zendDb) { - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('No database adapter present'); } } @@ -414,7 +409,6 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception($exception); } @@ -485,7 +479,6 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('The supplied parameters to Zend_Auth_Adapter_DbTable failed to ' . 'produce a valid sql statement, please check table and column names ' . 'for validity.', 0, $e); diff --git a/library/vendor/Zend/Auth/Adapter/Digest.php b/library/vendor/Zend/Auth/Adapter/Digest.php index cf389eae3..ab53281bd 100644 --- a/library/vendor/Zend/Auth/Adapter/Digest.php +++ b/library/vendor/Zend/Auth/Adapter/Digest.php @@ -24,7 +24,6 @@ /** * @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; /** @@ -185,7 +184,6 @@ class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception("Option '$optionRequired' must be set before authentication"); } } @@ -194,7 +192,6 @@ class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception("Cannot open '$this->_filename' for reading"); } diff --git a/library/vendor/Zend/Auth/Adapter/Exception.php b/library/vendor/Zend/Auth/Adapter/Exception.php index 23cdf991e..b7d4fd125 100644 --- a/library/vendor/Zend/Auth/Adapter/Exception.php +++ b/library/vendor/Zend/Auth/Adapter/Exception.php @@ -24,7 +24,6 @@ /** * Zend_Auth_Exception */ -require_once 'Zend/Auth/Exception.php'; /** diff --git a/library/vendor/Zend/Auth/Adapter/Http.php b/library/vendor/Zend/Auth/Adapter/Http.php index 5c3a91064..00135d3cf 100644 --- a/library/vendor/Zend/Auth/Adapter/Http.php +++ b/library/vendor/Zend/Auth/Adapter/Http.php @@ -24,7 +24,6 @@ /** * @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; /** @@ -170,7 +169,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception(__CLASS__ . ' requires the \'hash\' extension'); } @@ -183,7 +181,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Config key \'accept_schemes\' is required'); } @@ -193,7 +190,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('No supported schemes given in \'accept_schemes\'. Valid values: ' . implode(', ', $this->_supportedSchemes)); } @@ -207,7 +203,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Config key \'realm\' is required, and must contain only printable ' . 'characters, excluding quotation marks and colons'); } else { @@ -221,7 +216,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Config key \'digest_domains\' is required, and must contain ' . 'only printable characters, excluding quotation marks'); } else { @@ -233,7 +227,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Config key \'nonce_timeout\' is required, and must be an ' . 'integer'); } else { @@ -367,7 +360,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Request and Response objects must be set before calling ' . 'authenticate()'); } @@ -414,7 +406,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Unsupported authentication scheme'); } @@ -501,14 +492,12 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('The value of the client Authorization header is required'); } if (empty($this->_basicResolver)) { /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('A basicResolver object must be set before doing Basic ' . 'authentication'); } @@ -520,7 +509,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Unable to base64_decode Authorization header value'); } @@ -558,14 +546,12 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('The value of the client Authorization header is required'); } if (empty($this->_digestResolver)) { /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('A digestResolver object must be set before doing Digest authentication'); } @@ -624,7 +610,6 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Client requested an unsupported qop option'); } // Using hash() should make parameterizing the hash algorithm diff --git a/library/vendor/Zend/Auth/Adapter/Http/Resolver/Exception.php b/library/vendor/Zend/Auth/Adapter/Http/Resolver/Exception.php index 3c53cb6a1..50b0b51de 100644 --- a/library/vendor/Zend/Auth/Adapter/Http/Resolver/Exception.php +++ b/library/vendor/Zend/Auth/Adapter/Http/Resolver/Exception.php @@ -24,7 +24,6 @@ /** * @see Zend_Auth_Exception */ -require_once 'Zend/Auth/Exception.php'; /** diff --git a/library/vendor/Zend/Auth/Adapter/Http/Resolver/File.php b/library/vendor/Zend/Auth/Adapter/Http/Resolver/File.php index 77a183087..c809e395d 100644 --- a/library/vendor/Zend/Auth/Adapter/Http/Resolver/File.php +++ b/library/vendor/Zend/Auth/Adapter/Http/Resolver/File.php @@ -24,7 +24,6 @@ /** * @see Zend_Auth_Adapter_Http_Resolver_Interface */ -require_once 'Zend/Auth/Adapter/Http/Resolver/Interface.php'; /** @@ -70,7 +69,6 @@ class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Res /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Path not readable: ' . $path); } $this->_file = $path; @@ -115,13 +113,11 @@ class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Res /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Username is required'); } else if (!ctype_print($username) || strpos($username, ':') !== false) { /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Username must consist only of printable characters, ' . 'excluding the colon'); } @@ -129,13 +125,11 @@ class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Res /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Realm is required'); } else if (!ctype_print($realm) || strpos($realm, ':') !== false) { /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Realm must consist only of printable characters, ' . 'excluding the colon.'); } @@ -146,7 +140,6 @@ class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Res /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Unable to open password file: ' . $this->_file); } diff --git a/library/vendor/Zend/Auth/Adapter/Interface.php b/library/vendor/Zend/Auth/Adapter/Interface.php index e43e08804..21ba488f5 100644 --- a/library/vendor/Zend/Auth/Adapter/Interface.php +++ b/library/vendor/Zend/Auth/Adapter/Interface.php @@ -24,7 +24,6 @@ /** * @see Zend_Auth_Result */ -require_once 'Zend/Auth/Result.php'; /** diff --git a/library/vendor/Zend/Auth/Adapter/OpenId.php b/library/vendor/Zend/Auth/Adapter/OpenId.php index 8240626f5..f0179bb0f 100644 --- a/library/vendor/Zend/Auth/Adapter/OpenId.php +++ b/library/vendor/Zend/Auth/Adapter/OpenId.php @@ -24,13 +24,11 @@ /** * @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; /** * @see Zend_OpenId_Consumer */ -require_once 'Zend/OpenId/Consumer.php'; /** diff --git a/library/vendor/Zend/Auth/Exception.php b/library/vendor/Zend/Auth/Exception.php index 6e5697890..9b4db3e6a 100644 --- a/library/vendor/Zend/Auth/Exception.php +++ b/library/vendor/Zend/Auth/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Auth/Storage/Exception.php b/library/vendor/Zend/Auth/Storage/Exception.php index f41bdfeee..10a81ac56 100644 --- a/library/vendor/Zend/Auth/Storage/Exception.php +++ b/library/vendor/Zend/Auth/Storage/Exception.php @@ -24,7 +24,6 @@ /** * @see Zend_Auth_Exception */ -require_once 'Zend/Auth/Exception.php'; /** diff --git a/library/vendor/Zend/Auth/Storage/NonPersistent.php b/library/vendor/Zend/Auth/Storage/NonPersistent.php index 54d192109..023e9df98 100644 --- a/library/vendor/Zend/Auth/Storage/NonPersistent.php +++ b/library/vendor/Zend/Auth/Storage/NonPersistent.php @@ -24,7 +24,6 @@ /** * @see Zend_Auth_Storage_Interface */ -require_once 'Zend/Auth/Storage/Interface.php'; /** diff --git a/library/vendor/Zend/Auth/Storage/Session.php b/library/vendor/Zend/Auth/Storage/Session.php index 4608f15af..3a86fa9cf 100644 --- a/library/vendor/Zend/Auth/Storage/Session.php +++ b/library/vendor/Zend/Auth/Storage/Session.php @@ -24,13 +24,11 @@ /** * @see Zend_Auth_Storage_Interface */ -require_once 'Zend/Auth/Storage/Interface.php'; /** * @see Zend_Session */ -require_once 'Zend/Session.php'; /** diff --git a/library/vendor/Zend/Barcode.php b/library/vendor/Zend/Barcode.php index f40793f55..914f633ae 100644 --- a/library/vendor/Zend/Barcode.php +++ b/library/vendor/Zend/Barcode.php @@ -139,7 +139,6 @@ class Zend_Barcode /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; throw new Zend_Barcode_Exception( 'Barcode parameters must be in an array or a Zend_Config object' ); @@ -152,7 +151,6 @@ class Zend_Barcode /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; throw new Zend_Barcode_Exception( 'Barcode name must be specified in a string' ); @@ -175,7 +173,6 @@ class Zend_Barcode * if the specified class cannot be loaded. */ if (!class_exists($barcodeName)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($barcodeName); } @@ -192,7 +189,6 @@ class Zend_Barcode /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; throw new Zend_Barcode_Exception( "Barcode class '$barcodeName' does not extend Zend_Barcode_Object_ObjectAbstract" ); @@ -236,7 +232,6 @@ class Zend_Barcode /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; $e = new Zend_Barcode_Exception( 'Barcode parameters must be in an array or a Zend_Config object' ); @@ -251,7 +246,6 @@ class Zend_Barcode /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; $e = new Zend_Barcode_Exception( 'Renderer name must be specified in a string' ); @@ -277,7 +271,6 @@ class Zend_Barcode * if the specified class cannot be loaded. */ if (!class_exists($rendererName)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rendererName); } @@ -294,7 +287,6 @@ class Zend_Barcode /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; $e = new Zend_Barcode_Exception( "Renderer class '$rendererName' does not extend Zend_Barcode_Renderer_RendererAbstract" ); @@ -346,7 +338,6 @@ class Zend_Barcode */ public static function setBarcodeFont($font) { - require_once 'Zend/Barcode/Object/ObjectAbstract.php'; Zend_Barcode_Object_ObjectAbstract::setBarcodeFont($font); } } diff --git a/library/vendor/Zend/Barcode/Exception.php b/library/vendor/Zend/Barcode/Exception.php index 840ec2005..e40b89290 100644 --- a/library/vendor/Zend/Barcode/Exception.php +++ b/library/vendor/Zend/Barcode/Exception.php @@ -21,7 +21,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Zend_Barcode_Exception diff --git a/library/vendor/Zend/Barcode/Object/Code128.php b/library/vendor/Zend/Barcode/Object/Code128.php index 79e5b4969..ce2919354 100644 --- a/library/vendor/Zend/Barcode/Object/Code128.php +++ b/library/vendor/Zend/Barcode/Object/Code128.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_ObjectAbstract */ -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Code128 barcode diff --git a/library/vendor/Zend/Barcode/Object/Code25.php b/library/vendor/Zend/Barcode/Object/Code25.php index 4ae7fbffe..3dfa1cb12 100644 --- a/library/vendor/Zend/Barcode/Object/Code25.php +++ b/library/vendor/Zend/Barcode/Object/Code25.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_ObjectAbstract */ -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Interleaved 2 of 5 barcode diff --git a/library/vendor/Zend/Barcode/Object/Code25interleaved.php b/library/vendor/Zend/Barcode/Object/Code25interleaved.php index 08761ae71..67612fb50 100644 --- a/library/vendor/Zend/Barcode/Object/Code25interleaved.php +++ b/library/vendor/Zend/Barcode/Object/Code25interleaved.php @@ -21,10 +21,8 @@ */ /** @see Zend_Barcode_Object_Code25 */ -require_once 'Zend/Barcode/Object/Code25.php'; /** @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Interleaved 2 of 5 barcode diff --git a/library/vendor/Zend/Barcode/Object/Code39.php b/library/vendor/Zend/Barcode/Object/Code39.php index 0efb86553..46441243d 100644 --- a/library/vendor/Zend/Barcode/Object/Code39.php +++ b/library/vendor/Zend/Barcode/Object/Code39.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_ObjectAbstract */ -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; /** * @see 'Zend_Validate_Barcode' */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Code39 barcode diff --git a/library/vendor/Zend/Barcode/Object/Ean13.php b/library/vendor/Zend/Barcode/Object/Ean13.php index 04ee2b99f..968d7b293 100644 --- a/library/vendor/Zend/Barcode/Object/Ean13.php +++ b/library/vendor/Zend/Barcode/Object/Ean13.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_ObjectAbstract */ -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Ean13 barcode diff --git a/library/vendor/Zend/Barcode/Object/Ean2.php b/library/vendor/Zend/Barcode/Object/Ean2.php index 943276327..8868b0190 100644 --- a/library/vendor/Zend/Barcode/Object/Ean2.php +++ b/library/vendor/Zend/Barcode/Object/Ean2.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_Ean5 */ -require_once 'Zend/Barcode/Object/Ean5.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Ean2 barcode diff --git a/library/vendor/Zend/Barcode/Object/Ean5.php b/library/vendor/Zend/Barcode/Object/Ean5.php index 512b4dbdf..7b50c7302 100644 --- a/library/vendor/Zend/Barcode/Object/Ean5.php +++ b/library/vendor/Zend/Barcode/Object/Ean5.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_Ean13 */ -require_once 'Zend/Barcode/Object/Ean13.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Ean5 barcode diff --git a/library/vendor/Zend/Barcode/Object/Ean8.php b/library/vendor/Zend/Barcode/Object/Ean8.php index 2fe81b5b2..4cb18fbac 100644 --- a/library/vendor/Zend/Barcode/Object/Ean8.php +++ b/library/vendor/Zend/Barcode/Object/Ean8.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_Ean13 */ -require_once 'Zend/Barcode/Object/Ean13.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Ean8 barcode @@ -170,7 +168,6 @@ class Zend_Barcode_Object_Ean8 extends Zend_Barcode_Object_Ean13 /** * @see Zend_Barcode_Object_Exception */ - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception($message); } } diff --git a/library/vendor/Zend/Barcode/Object/Error.php b/library/vendor/Zend/Barcode/Object/Error.php index b627cf4ba..ff84afd7a 100644 --- a/library/vendor/Zend/Barcode/Object/Error.php +++ b/library/vendor/Zend/Barcode/Object/Error.php @@ -21,7 +21,6 @@ */ /** @see Zend_Barcode_Object_ObjectAbstract */ -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; /** * Class for generate Barcode diff --git a/library/vendor/Zend/Barcode/Object/Exception.php b/library/vendor/Zend/Barcode/Object/Exception.php index 60801a1fe..363335d9f 100644 --- a/library/vendor/Zend/Barcode/Object/Exception.php +++ b/library/vendor/Zend/Barcode/Object/Exception.php @@ -20,7 +20,6 @@ */ /** @see Zend_Barcode_Exception */ -require_once 'Zend/Barcode/Exception.php'; /** * Zend_Barcode_Renderer_Exception diff --git a/library/vendor/Zend/Barcode/Object/Identcode.php b/library/vendor/Zend/Barcode/Object/Identcode.php index 781f65a9c..654aa7a49 100644 --- a/library/vendor/Zend/Barcode/Object/Identcode.php +++ b/library/vendor/Zend/Barcode/Object/Identcode.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_Code25interleaved */ -require_once 'Zend/Barcode/Object/Code25interleaved.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Identcode barcode diff --git a/library/vendor/Zend/Barcode/Object/Itf14.php b/library/vendor/Zend/Barcode/Object/Itf14.php index f0758ba2d..2c80340f0 100644 --- a/library/vendor/Zend/Barcode/Object/Itf14.php +++ b/library/vendor/Zend/Barcode/Object/Itf14.php @@ -21,10 +21,8 @@ */ /** @see Zend_Barcode_Object_Code25interleaved */ -require_once 'Zend/Barcode/Object/Code25interleaved.php'; /** @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Itf14 barcode diff --git a/library/vendor/Zend/Barcode/Object/Leitcode.php b/library/vendor/Zend/Barcode/Object/Leitcode.php index a22002344..cf0473a26 100644 --- a/library/vendor/Zend/Barcode/Object/Leitcode.php +++ b/library/vendor/Zend/Barcode/Object/Leitcode.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_Identcode */ -require_once 'Zend/Barcode/Object/Identcode.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Identcode barcode diff --git a/library/vendor/Zend/Barcode/Object/ObjectAbstract.php b/library/vendor/Zend/Barcode/Object/ObjectAbstract.php index 673f8c1e2..f22e31ec9 100644 --- a/library/vendor/Zend/Barcode/Object/ObjectAbstract.php +++ b/library/vendor/Zend/Barcode/Object/ObjectAbstract.php @@ -309,7 +309,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract public function setBarHeight($value) { if (intval($value) <= 0) { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception( 'Bar height must be greater than 0' ); @@ -336,7 +335,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract public function setBarThinWidth($value) { if (intval($value) <= 0) { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception( 'Bar width must be greater than 0' ); @@ -363,7 +361,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract public function setBarThickWidth($value) { if (intval($value) <= 0) { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception( 'Bar width must be greater than 0' ); @@ -391,7 +388,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract public function setFactor($value) { if (floatval($value) <= 0) { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception( 'Factor must be greater than 0' ); @@ -423,7 +419,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract } elseif (is_numeric($value) && $value >= 0 && $value <= 16777125) { $this->_foreColor = intval($value); } else { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception( 'Text color must be set as #[0-9A-F]{6}' ); @@ -453,7 +448,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract } elseif (is_numeric($value) && $value >= 0 && $value <= 16777125) { $this->_backgroundColor = intval($value); } else { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception( 'Background color must be set as #[0-9A-F]{6}' ); @@ -732,7 +726,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract { if (is_int($value) && $value >= 1 && $value <= 5) { if (!extension_loaded('gd')) { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception( 'GD extension is required to use numeric font' ); @@ -746,7 +739,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract } elseif (is_string($value)) { $this->_font = $value; } else { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception(sprintf( 'Invalid font "%s" provided to setFont()', $value @@ -778,7 +770,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract } if (!is_numeric($value)) { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception( 'Font size must be a numeric value' ); @@ -909,7 +900,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract $value = $this->_text; } if (!strlen($value)) { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception( 'A text must be provide to Barcode before drawing' ); @@ -929,7 +919,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract { $ratio = $this->_barThickWidth / $this->_barThinWidth; if (!($ratio >= $min && $ratio <= $max)) { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception(sprintf( 'Ratio thick/thin bar must be between %0.1f and %0.1f (actual %0.3f)', $min, @@ -948,7 +937,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract protected function _checkFontAndOrientation() { if (is_numeric($this->_font) && $this->_orientation != 0) { - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception( 'Only drawing with TTF font allow orientation of the barcode.' ); @@ -1291,7 +1279,6 @@ abstract class Zend_Barcode_Object_ObjectAbstract /** * @see Zend_Barcode_Object_Exception */ - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception($message); } } diff --git a/library/vendor/Zend/Barcode/Object/Planet.php b/library/vendor/Zend/Barcode/Object/Planet.php index 0c501082a..262e6fbe7 100644 --- a/library/vendor/Zend/Barcode/Object/Planet.php +++ b/library/vendor/Zend/Barcode/Object/Planet.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_Postnet */ -require_once 'Zend/Barcode/Object/Postnet.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Planet barcode diff --git a/library/vendor/Zend/Barcode/Object/Postnet.php b/library/vendor/Zend/Barcode/Object/Postnet.php index 3ceea5039..ec7910b91 100644 --- a/library/vendor/Zend/Barcode/Object/Postnet.php +++ b/library/vendor/Zend/Barcode/Object/Postnet.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_ObjectAbstract */ -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Postnet barcode diff --git a/library/vendor/Zend/Barcode/Object/Royalmail.php b/library/vendor/Zend/Barcode/Object/Royalmail.php index 79c173c3e..14db43744 100644 --- a/library/vendor/Zend/Barcode/Object/Royalmail.php +++ b/library/vendor/Zend/Barcode/Object/Royalmail.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_ObjectAbstract */ -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate Royal maim barcode diff --git a/library/vendor/Zend/Barcode/Object/Upca.php b/library/vendor/Zend/Barcode/Object/Upca.php index d70d4d2d8..4fbf5c6ad 100644 --- a/library/vendor/Zend/Barcode/Object/Upca.php +++ b/library/vendor/Zend/Barcode/Object/Upca.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_Ean13 */ -require_once 'Zend/Barcode/Object/Ean13.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate UpcA barcode diff --git a/library/vendor/Zend/Barcode/Object/Upce.php b/library/vendor/Zend/Barcode/Object/Upce.php index 6cdb5c6b3..eafbb3d29 100644 --- a/library/vendor/Zend/Barcode/Object/Upce.php +++ b/library/vendor/Zend/Barcode/Object/Upce.php @@ -23,12 +23,10 @@ /** * @see Zend_Barcode_Object_Ean13 */ -require_once 'Zend/Barcode/Object/Ean13.php'; /** * @see Zend_Validate_Barcode */ -require_once 'Zend/Validate/Barcode.php'; /** * Class for generate UpcA barcode @@ -208,7 +206,6 @@ class Zend_Barcode_Object_Upce extends Zend_Barcode_Object_Ean13 /** * @see Zend_Barcode_Object_Exception */ - require_once 'Zend/Barcode/Object/Exception.php'; throw new Zend_Barcode_Object_Exception($message); } } diff --git a/library/vendor/Zend/Barcode/Renderer/Exception.php b/library/vendor/Zend/Barcode/Renderer/Exception.php index 30e04926a..6d3dd762c 100644 --- a/library/vendor/Zend/Barcode/Renderer/Exception.php +++ b/library/vendor/Zend/Barcode/Renderer/Exception.php @@ -20,7 +20,6 @@ */ /** @see Zend_Barcode_Exception */ -require_once 'Zend/Barcode/Exception.php'; /** * Zend_Barcode_Renderer_Exception diff --git a/library/vendor/Zend/Barcode/Renderer/Image.php b/library/vendor/Zend/Barcode/Renderer/Image.php index cefa668de..31f3426a2 100644 --- a/library/vendor/Zend/Barcode/Renderer/Image.php +++ b/library/vendor/Zend/Barcode/Renderer/Image.php @@ -21,7 +21,6 @@ */ /** @see Zend_Barcode_Renderer_RendererAbstract*/ -require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; /** * Class for rendering the barcode as image @@ -82,7 +81,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract public function __construct($options = null) { if (!function_exists('gd_info')) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception('Zend_Barcode_Renderer_Image requires the GD extension'); } @@ -99,7 +97,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract public function setHeight($value) { if (!is_numeric($value) || intval($value) < 0) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Image height must be greater than or equals 0' ); @@ -128,7 +125,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract public function setWidth($value) { if (!is_numeric($value) || intval($value) < 0) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Image width must be greater than or equals 0' ); @@ -157,7 +153,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract public function setResource($image) { if (gettype($image) != 'resource' || get_resource_type($image) != 'gd') { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Invalid image resource provided to setResource()' ); @@ -180,7 +175,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract } if (!in_array($value, $this->_allowedImageType)) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception(sprintf( 'Invalid type "%s" provided to setImageType()', $value @@ -210,7 +204,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract protected function _initRenderer() { if (!extension_loaded('gd')) { - require_once 'Zend/Barcode/Exception.php'; $e = new Zend_Barcode_Exception( 'Gd extension must be loaded to render barcode as image' ); @@ -296,7 +289,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract { if ($this->_resource !== null) { if (imagesy($this->_resource) < $this->_barcode->getHeight(true)) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Barcode is define outside the image (height)' ); @@ -305,7 +297,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract if ($this->_userHeight) { $height = $this->_barcode->getHeight(true); if ($this->_userHeight < $height) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception(sprintf( "Barcode is define outside the image (calculated: '%d', provided: '%d')", $height, @@ -316,7 +307,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract } if ($this->_resource !== null) { if (imagesx($this->_resource) < $this->_barcode->getWidth(true)) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Barcode is define outside the image (width)' ); @@ -325,7 +315,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract if ($this->_userWidth) { $width = $this->_barcode->getWidth(true); if ($this->_userWidth < $width) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception(sprintf( "Barcode is define outside the image (calculated: '%d', provided: '%d')", $width, @@ -420,7 +409,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract * to informe user of the problem instead of simply not drawing * the text */ - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'No orientation possible with GD internal font' ); @@ -442,7 +430,6 @@ class Zend_Barcode_Renderer_Image extends Zend_Barcode_Renderer_RendererAbstract } else { if (!function_exists('imagettfbbox')) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'A font was provided, but this instance of PHP does not have TTF (FreeType) support' ); diff --git a/library/vendor/Zend/Barcode/Renderer/Pdf.php b/library/vendor/Zend/Barcode/Renderer/Pdf.php index 2902ca1d4..fc49793db 100644 --- a/library/vendor/Zend/Barcode/Renderer/Pdf.php +++ b/library/vendor/Zend/Barcode/Renderer/Pdf.php @@ -21,16 +21,12 @@ */ /** @see Zend_Barcode_Renderer_RendererAbstract */ -require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; /** @see Zend_Pdf */ -require_once 'Zend/Pdf.php'; /** @see Zend_Pdf_Page */ -require_once 'Zend/Pdf/Page.php'; /** @see Zend_Pdf_Color_Rgb */ -require_once 'Zend/Pdf/Color/Rgb.php'; /** * Class for rendering the barcode in PDF resource @@ -71,7 +67,6 @@ class Zend_Barcode_Renderer_Pdf extends Zend_Barcode_Renderer_RendererAbstract public function setResource($pdf, $page = 0) { if (!$pdf instanceof Zend_Pdf) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Invalid Zend_Pdf resource provided to setResource()' ); diff --git a/library/vendor/Zend/Barcode/Renderer/RendererAbstract.php b/library/vendor/Zend/Barcode/Renderer/RendererAbstract.php index 4ffe1612e..3d06645e9 100644 --- a/library/vendor/Zend/Barcode/Renderer/RendererAbstract.php +++ b/library/vendor/Zend/Barcode/Renderer/RendererAbstract.php @@ -175,7 +175,6 @@ abstract class Zend_Barcode_Renderer_RendererAbstract public function setTopOffset($value) { if (!is_numeric($value) || intval($value) < 0) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Vertical position must be greater than or equals 0' ); @@ -202,7 +201,6 @@ abstract class Zend_Barcode_Renderer_RendererAbstract public function setLeftOffset($value) { if (!is_numeric($value) || intval($value) < 0) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Horizontal position must be greater than or equals 0' ); @@ -242,7 +240,6 @@ abstract class Zend_Barcode_Renderer_RendererAbstract public function setHorizontalPosition($value) { if (!in_array($value, array('left' , 'center' , 'right'))) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( "Invalid barcode position provided must be 'left', 'center' or 'right'" ); @@ -270,7 +267,6 @@ abstract class Zend_Barcode_Renderer_RendererAbstract public function setVerticalPosition($value) { if (!in_array($value, array('top' , 'middle' , 'bottom'))) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( "Invalid barcode position provided must be 'top', 'middle' or 'bottom'" ); @@ -297,7 +293,6 @@ abstract class Zend_Barcode_Renderer_RendererAbstract public function setModuleSize($value) { if (!is_numeric($value) || floatval($value) <= 0) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Float size must be greater than 0' ); @@ -335,7 +330,6 @@ abstract class Zend_Barcode_Renderer_RendererAbstract public function setBarcode($barcode) { if (!$barcode instanceof Zend_Barcode_Object_ObjectAbstract) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Invalid barcode object provided to setBarcode()' ); @@ -375,7 +369,6 @@ abstract class Zend_Barcode_Renderer_RendererAbstract /** * @see Zend_Barcode_Renderer_Exception */ - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'No barcode object provided' ); @@ -494,7 +487,6 @@ abstract class Zend_Barcode_Renderer_RendererAbstract /** * @see Zend_Barcode_Renderer_Exception */ - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Unkown drawing command' ); diff --git a/library/vendor/Zend/Barcode/Renderer/Svg.php b/library/vendor/Zend/Barcode/Renderer/Svg.php index 3a88cff82..b791aaec4 100644 --- a/library/vendor/Zend/Barcode/Renderer/Svg.php +++ b/library/vendor/Zend/Barcode/Renderer/Svg.php @@ -21,7 +21,6 @@ */ /** @see Zend_Barcode_Renderer_RendererAbstract*/ -require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; /** * Class for rendering the barcode as svg @@ -68,7 +67,6 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract public function setHeight($value) { if (!is_numeric($value) || intval($value) < 0) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Svg height must be greater than or equals 0' ); @@ -97,7 +95,6 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract public function setWidth($value) { if (!is_numeric($value) || intval($value) < 0) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Svg width must be greater than or equals 0' ); @@ -126,7 +123,6 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract public function setResource($svg) { if (!$svg instanceof DOMDocument) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Invalid DOMDocument resource provided to setResource()' ); @@ -247,7 +243,6 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract $this->_readRootElement(); $height = (float) $this->_rootElement->getAttribute('height'); if ($height < $this->_barcode->getHeight(true)) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Barcode is define outside the image (height)' ); @@ -256,7 +251,6 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract if ($this->_userHeight) { $height = $this->_barcode->getHeight(true); if ($this->_userHeight < $height) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception(sprintf( "Barcode is define outside the image (calculated: '%d', provided: '%d')", $height, @@ -269,7 +263,6 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract $this->_readRootElement(); $width = $this->_rootElement->getAttribute('width'); if ($width < $this->_barcode->getWidth(true)) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception( 'Barcode is define outside the image (width)' ); @@ -278,7 +271,6 @@ class Zend_Barcode_Renderer_Svg extends Zend_Barcode_Renderer_RendererAbstract if ($this->_userWidth) { $width = (float) $this->_barcode->getWidth(true); if ($this->_userWidth < $width) { - require_once 'Zend/Barcode/Renderer/Exception.php'; throw new Zend_Barcode_Renderer_Exception(sprintf( "Barcode is define outside the image (calculated: '%d', provided: '%d')", $width, diff --git a/library/vendor/Zend/Cache.php b/library/vendor/Zend/Cache.php index 52e219bbc..209b7dff9 100644 --- a/library/vendor/Zend/Cache.php +++ b/library/vendor/Zend/Cache.php @@ -84,7 +84,6 @@ abstract class Zend_Cache * @param array $backendOptions associative array of options for the corresponding backend constructor * @param boolean $customFrontendNaming if true, the frontend argument is used as a complete class name ; if false, the frontend argument is used as the end of "Zend_Cache_Frontend_[...]" class name * @param boolean $customBackendNaming if true, the backend argument is used as a complete class name ; if false, the backend argument is used as the end of "Zend_Cache_Backend_[...]" class name - * @param boolean $autoload if true, there will no require_once for backend and frontend (useful only for custom backends/frontends) * @throws Zend_Cache_Exception * @return Zend_Cache_Core|Zend_Cache_Frontend */ @@ -130,7 +129,6 @@ abstract class Zend_Cache // we use a standard backend $backendClass = 'Zend_Cache_Backend_' . $backend; // security controls are explicit - require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php'; } else { // we use a custom backend if (!preg_match('~^[\w\\\\]+$~D', $backend)) { @@ -147,7 +145,6 @@ abstract class Zend_Cache if (!(self::_isReadable($file))) { self::throwException("file $file not found in include_path"); } - require_once $file; } } return new $backendClass($backendOptions); @@ -172,7 +169,6 @@ abstract class Zend_Cache // For perfs reasons, with frontend == 'Core', we can interact with the Core itself $frontendClass = 'Zend_Cache_' . ($frontend != 'Core' ? 'Frontend_' : '') . $frontend; // security controls are explicit - require_once str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php'; } else { // we use a custom frontend if (!preg_match('~^[\w\\\\]+$~D', $frontend)) { @@ -189,7 +185,6 @@ abstract class Zend_Cache if (!(self::_isReadable($file))) { self::throwException("file $file not found in include_path"); } - require_once $file; } } return new $frontendClass($frontendOptions); @@ -205,7 +200,6 @@ abstract class Zend_Cache public static function throwException($msg, Exception $e = null) { // For perfs reasons, we use this dynamic inclusion - require_once 'Zend/Cache/Exception.php'; throw new Zend_Cache_Exception($msg, 0, $e); } diff --git a/library/vendor/Zend/Cache/Backend.php b/library/vendor/Zend/Cache/Backend.php index 9a7805712..988cb08b4 100644 --- a/library/vendor/Zend/Cache/Backend.php +++ b/library/vendor/Zend/Cache/Backend.php @@ -255,9 +255,6 @@ class Zend_Cache_Backend } // Create a default logger to the standard output stream - require_once 'Zend/Log.php'; - require_once 'Zend/Log/Writer/Stream.php'; - require_once 'Zend/Log/Filter/Priority.php'; $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output')); $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<=')); $this->_directives['logger'] = $logger; diff --git a/library/vendor/Zend/Cache/Backend/BlackHole.php b/library/vendor/Zend/Cache/Backend/BlackHole.php index c396ece02..e61ad4bb7 100644 --- a/library/vendor/Zend/Cache/Backend/BlackHole.php +++ b/library/vendor/Zend/Cache/Backend/BlackHole.php @@ -23,12 +23,10 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/library/vendor/Zend/Cache/Backend/ExtendedInterface.php b/library/vendor/Zend/Cache/Backend/ExtendedInterface.php index 84f3e9617..1d96f2dcb 100644 --- a/library/vendor/Zend/Cache/Backend/ExtendedInterface.php +++ b/library/vendor/Zend/Cache/Backend/ExtendedInterface.php @@ -23,7 +23,6 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; /** * @package Zend_Cache diff --git a/library/vendor/Zend/Cache/Backend/File.php b/library/vendor/Zend/Cache/Backend/File.php index 8b39d3e79..c241f2c2d 100644 --- a/library/vendor/Zend/Cache/Backend/File.php +++ b/library/vendor/Zend/Cache/Backend/File.php @@ -23,12 +23,10 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/vendor/Zend/Cache/Backend/Sqlite.php b/library/vendor/Zend/Cache/Backend/Sqlite.php index bab860a29..2b8e911dc 100644 --- a/library/vendor/Zend/Cache/Backend/Sqlite.php +++ b/library/vendor/Zend/Cache/Backend/Sqlite.php @@ -24,12 +24,10 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/library/vendor/Zend/Cache/Backend/Static.php b/library/vendor/Zend/Cache/Backend/Static.php index 024429125..c23d31d1e 100644 --- a/library/vendor/Zend/Cache/Backend/Static.php +++ b/library/vendor/Zend/Cache/Backend/Static.php @@ -23,12 +23,10 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/library/vendor/Zend/Cache/Backend/Test.php b/library/vendor/Zend/Cache/Backend/Test.php index be48822f5..a9cd61bb2 100644 --- a/library/vendor/Zend/Cache/Backend/Test.php +++ b/library/vendor/Zend/Cache/Backend/Test.php @@ -24,12 +24,10 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/library/vendor/Zend/Cache/Backend/TwoLevels.php b/library/vendor/Zend/Cache/Backend/TwoLevels.php index 440f78f11..902412952 100644 --- a/library/vendor/Zend/Cache/Backend/TwoLevels.php +++ b/library/vendor/Zend/Cache/Backend/TwoLevels.php @@ -24,12 +24,10 @@ /** * @see Zend_Cache_Backend_ExtendedInterface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/vendor/Zend/Cache/Backend/WinCache.php b/library/vendor/Zend/Cache/Backend/WinCache.php index 4d9892207..f47b998d2 100644 --- a/library/vendor/Zend/Cache/Backend/WinCache.php +++ b/library/vendor/Zend/Cache/Backend/WinCache.php @@ -24,12 +24,10 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/vendor/Zend/Cache/Backend/Xcache.php b/library/vendor/Zend/Cache/Backend/Xcache.php index e7d235610..6c7e22c28 100644 --- a/library/vendor/Zend/Cache/Backend/Xcache.php +++ b/library/vendor/Zend/Cache/Backend/Xcache.php @@ -24,12 +24,10 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/vendor/Zend/Cache/Backend/ZendPlatform.php b/library/vendor/Zend/Cache/Backend/ZendPlatform.php index 2e6223e91..0eea9eef5 100644 --- a/library/vendor/Zend/Cache/Backend/ZendPlatform.php +++ b/library/vendor/Zend/Cache/Backend/ZendPlatform.php @@ -23,12 +23,10 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend.php'; /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; /** diff --git a/library/vendor/Zend/Cache/Backend/ZendServer.php b/library/vendor/Zend/Cache/Backend/ZendServer.php index d2c5d0566..47f5539b3 100755 --- a/library/vendor/Zend/Cache/Backend/ZendServer.php +++ b/library/vendor/Zend/Cache/Backend/ZendServer.php @@ -22,10 +22,8 @@ /** @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; /** @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/vendor/Zend/Cache/Backend/ZendServer/Disk.php b/library/vendor/Zend/Cache/Backend/ZendServer/Disk.php index 704aaea42..017f7d859 100755 --- a/library/vendor/Zend/Cache/Backend/ZendServer/Disk.php +++ b/library/vendor/Zend/Cache/Backend/ZendServer/Disk.php @@ -22,10 +22,8 @@ /** @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; /** @see Zend_Cache_Backend_ZendServer */ -require_once 'Zend/Cache/Backend/ZendServer.php'; /** diff --git a/library/vendor/Zend/Cache/Backend/ZendServer/ShMem.php b/library/vendor/Zend/Cache/Backend/ZendServer/ShMem.php index 644e891a6..7884362ca 100755 --- a/library/vendor/Zend/Cache/Backend/ZendServer/ShMem.php +++ b/library/vendor/Zend/Cache/Backend/ZendServer/ShMem.php @@ -22,10 +22,8 @@ /** @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; /** @see Zend_Cache_Backend_ZendServer */ -require_once 'Zend/Cache/Backend/ZendServer.php'; /** diff --git a/library/vendor/Zend/Cache/Core.php b/library/vendor/Zend/Cache/Core.php index 23bab5d6a..7a9626f2b 100644 --- a/library/vendor/Zend/Cache/Core.php +++ b/library/vendor/Zend/Cache/Core.php @@ -719,9 +719,6 @@ class Zend_Cache_Core } // Create a default logger to the standard output stream - require_once 'Zend/Log.php'; - require_once 'Zend/Log/Writer/Stream.php'; - require_once 'Zend/Log/Filter/Priority.php'; $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output')); $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<=')); $this->_options['logger'] = $logger; diff --git a/library/vendor/Zend/Cache/Exception.php b/library/vendor/Zend/Cache/Exception.php index bc49421de..3a0fde23f 100644 --- a/library/vendor/Zend/Cache/Exception.php +++ b/library/vendor/Zend/Cache/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @package Zend_Cache diff --git a/library/vendor/Zend/Cache/Frontend/Capture.php b/library/vendor/Zend/Cache/Frontend/Capture.php index 1622b13bb..81c7ed618 100644 --- a/library/vendor/Zend/Cache/Frontend/Capture.php +++ b/library/vendor/Zend/Cache/Frontend/Capture.php @@ -24,7 +24,6 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; /** diff --git a/library/vendor/Zend/Cache/Frontend/Class.php b/library/vendor/Zend/Cache/Frontend/Class.php index 8ac98c24a..af584d17e 100644 --- a/library/vendor/Zend/Cache/Frontend/Class.php +++ b/library/vendor/Zend/Cache/Frontend/Class.php @@ -23,7 +23,6 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; /** diff --git a/library/vendor/Zend/Cache/Frontend/File.php b/library/vendor/Zend/Cache/Frontend/File.php index 9ff13b1b7..31edc38b2 100644 --- a/library/vendor/Zend/Cache/Frontend/File.php +++ b/library/vendor/Zend/Cache/Frontend/File.php @@ -24,7 +24,6 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; /** diff --git a/library/vendor/Zend/Cache/Frontend/Function.php b/library/vendor/Zend/Cache/Frontend/Function.php index 6e794e99e..ca09ee3f5 100644 --- a/library/vendor/Zend/Cache/Frontend/Function.php +++ b/library/vendor/Zend/Cache/Frontend/Function.php @@ -24,7 +24,6 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; /** diff --git a/library/vendor/Zend/Cache/Frontend/Output.php b/library/vendor/Zend/Cache/Frontend/Output.php index 25997d12d..115b5dd1c 100644 --- a/library/vendor/Zend/Cache/Frontend/Output.php +++ b/library/vendor/Zend/Cache/Frontend/Output.php @@ -24,7 +24,6 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; /** diff --git a/library/vendor/Zend/Cache/Frontend/Page.php b/library/vendor/Zend/Cache/Frontend/Page.php index e6ba5f280..f08595dbb 100644 --- a/library/vendor/Zend/Cache/Frontend/Page.php +++ b/library/vendor/Zend/Cache/Frontend/Page.php @@ -24,7 +24,6 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; /** diff --git a/library/vendor/Zend/Cache/Manager.php b/library/vendor/Zend/Cache/Manager.php index 0c9616b9c..b7af8cf98 100644 --- a/library/vendor/Zend/Cache/Manager.php +++ b/library/vendor/Zend/Cache/Manager.php @@ -20,10 +20,8 @@ */ /** @see Zend_Cache_Exception */ -require_once 'Zend/Cache/Exception.php'; /** @see Zend_Cache */ -require_once 'Zend/Cache.php'; /** * @category Zend @@ -206,7 +204,6 @@ class Zend_Cache_Manager if ($options instanceof Zend_Config) { $options = $options->toArray(); } elseif (!is_array($options)) { - require_once 'Zend/Cache/Exception.php'; throw new Zend_Cache_Exception('Options passed must be in' . ' an associative array or instance of Zend_Config'); } @@ -256,7 +253,6 @@ class Zend_Cache_Manager if ($options instanceof Zend_Config) { $options = $options->toArray(); } elseif (!is_array($options)) { - require_once 'Zend/Cache/Exception.php'; throw new Zend_Cache_Exception('Options passed must be in' . ' an associative array or instance of Zend_Config'); } diff --git a/library/vendor/Zend/Cloud/AbstractFactory.php b/library/vendor/Zend/Cloud/AbstractFactory.php index dcfa5a446..aaf02a01d 100755 --- a/library/vendor/Zend/Cloud/AbstractFactory.php +++ b/library/vendor/Zend/Cloud/AbstractFactory.php @@ -58,7 +58,6 @@ class Zend_Cloud_AbstractFactory $classname = $options[$adapterOption]; unset($options[$adapterOption]); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } diff --git a/library/vendor/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php b/library/vendor/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php index fd59144c9..bfda948dc 100644 --- a/library/vendor/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php +++ b/library/vendor/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php @@ -17,10 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/DocumentService/Adapter.php'; -require_once 'Zend/Cloud/DocumentService/Document.php'; -require_once 'Zend/Cloud/DocumentService/DocumentSet.php'; -require_once 'Zend/Cloud/DocumentService/Query.php'; /** * Abstract document service adapter diff --git a/library/vendor/Zend/Cloud/DocumentService/Adapter/SimpleDb.php b/library/vendor/Zend/Cloud/DocumentService/Adapter/SimpleDb.php index d233dc29a..af96c917e 100644 --- a/library/vendor/Zend/Cloud/DocumentService/Adapter/SimpleDb.php +++ b/library/vendor/Zend/Cloud/DocumentService/Adapter/SimpleDb.php @@ -17,11 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php'; -require_once 'Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php'; -require_once 'Zend/Cloud/DocumentService/Exception.php'; -require_once 'Zend/Service/Amazon/SimpleDb.php'; -require_once 'Zend/Service/Amazon/SimpleDb/Attribute.php'; /** * SimpleDB adapter for document service. @@ -356,7 +351,6 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDb { $queryClass = $this->getQueryClass(); if (!class_exists($queryClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($queryClass); } diff --git a/library/vendor/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php b/library/vendor/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php index ba4d7bf6d..eadb0b877 100644 --- a/library/vendor/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php +++ b/library/vendor/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php @@ -20,7 +20,6 @@ /* * @see Zend_Cloud_DocumentService_Query */ -require_once 'Zend/Cloud/DocumentService/Query.php'; /** * Class implementing Query adapter for working with SimpleDb queries in a @@ -130,7 +129,6 @@ class Zend_Cloud_DocumentService_Adapter_SimpleDb_Query } if (empty($from)) { if (null === $collectionName) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception("Query requires a FROM clause"); } $from = $adapter->quoteName($collectionName); diff --git a/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php b/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php index 39e22138c..ae8577e19 100755 --- a/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php +++ b/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php @@ -17,11 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php'; -require_once 'Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php'; -require_once 'Zend/Cloud/DocumentService/Exception.php'; -require_once 'Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php'; -require_once 'Zend/Service/WindowsAzure/Storage/Table.php'; /** * SimpleDB adapter for document service. @@ -476,7 +471,6 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzure { $queryClass = $this->getQueryClass(); if (!class_exists($queryClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($queryClass); } diff --git a/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php b/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php index c6fbeccdc..aefefb73d 100755 --- a/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php +++ b/library/vendor/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php @@ -20,7 +20,6 @@ /* * @see Zend_Cloud_DocumentService_QueryAdapter */ -require_once 'Zend/Cloud/DocumentService/QueryAdapter.php'; /** * Class implementing Query adapter for working with Azure queries in a @@ -52,7 +51,6 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query public function __construct($select = null) { if (!$select instanceof Zend_Service_WindowsAzure_Storage_TableEntityQuery) { - require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php'; $select = new Zend_Service_WindowsAzure_Storage_TableEntityQuery(); } $this->_azureSelect = $select; @@ -113,7 +111,6 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query public function whereId($value) { if (!is_array($value)) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception('Invalid document key'); } $this->_azureSelect->wherePartitionKey($value[0])->whereRowKey($value[1]); @@ -143,7 +140,6 @@ class Zend_Cloud_DocumentService_Adapter_WindowsAzure_Query */ public function order($sort, $direction = 'asc') { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('No support for sorting for Azure yet'); } diff --git a/library/vendor/Zend/Cloud/DocumentService/Document.php b/library/vendor/Zend/Cloud/DocumentService/Document.php index 76e5c72a6..559d9f10f 100644 --- a/library/vendor/Zend/Cloud/DocumentService/Document.php +++ b/library/vendor/Zend/Cloud/DocumentService/Document.php @@ -60,7 +60,6 @@ class Zend_Cloud_DocumentService_Document public function __construct($fields, $id = null) { if (!is_array($fields) && !$fields instanceof ArrayAccess) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception('Fields must be an array or implement ArrayAccess'); } @@ -222,7 +221,6 @@ class Zend_Cloud_DocumentService_Document return $this->setField($option, $args[0]); } - require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException("Unknown operation $name"); } diff --git a/library/vendor/Zend/Cloud/DocumentService/Exception.php b/library/vendor/Zend/Cloud/DocumentService/Exception.php index 9e8def390..3d170d250 100644 --- a/library/vendor/Zend/Cloud/DocumentService/Exception.php +++ b/library/vendor/Zend/Cloud/DocumentService/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Cloud_Exception */ -require_once 'Zend/Cloud/Exception.php'; /** diff --git a/library/vendor/Zend/Cloud/DocumentService/Factory.php b/library/vendor/Zend/Cloud/DocumentService/Factory.php index 8fa8c97e0..76d5c7ea7 100644 --- a/library/vendor/Zend/Cloud/DocumentService/Factory.php +++ b/library/vendor/Zend/Cloud/DocumentService/Factory.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/AbstractFactory.php'; /** * Class implementing working with Azure queries in a structured way @@ -61,13 +60,11 @@ class Zend_Cloud_DocumentService_Factory extends Zend_Cloud_AbstractFactory { $adapter = parent::_getAdapter(self::DOCUMENT_ADAPTER_KEY, $options); if (!$adapter) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception( 'Class must be specified using the \'' . self::DOCUMENT_ADAPTER_KEY . '\' key' ); } elseif (!$adapter instanceof self::$_adapterInterface) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception( 'Adapter must implement \'' . self::$_adapterInterface . '\'' ); diff --git a/library/vendor/Zend/Cloud/DocumentService/Query.php b/library/vendor/Zend/Cloud/DocumentService/Query.php index dbeef9c1d..48210d8d5 100644 --- a/library/vendor/Zend/Cloud/DocumentService/Query.php +++ b/library/vendor/Zend/Cloud/DocumentService/Query.php @@ -17,7 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/DocumentService/QueryAdapter.php'; /** * Generic query object @@ -81,7 +80,6 @@ class Zend_Cloud_DocumentService_Query return $this; } if (!is_string($select) && !is_array($select)) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception("SELECT argument must be a string or an array of strings"); } $this->_clauses[] = array(self::QUERY_SELECT, $select); @@ -97,7 +95,6 @@ class Zend_Cloud_DocumentService_Query public function from($name) { if(!is_string($name)) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception("FROM argument must be a string"); } $this->_clauses[] = array(self::QUERY_FROM, $name); @@ -115,7 +112,6 @@ class Zend_Cloud_DocumentService_Query public function where($cond, $value = null, $op = 'and') { if (!is_string($cond)) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception("WHERE argument must be a string"); } $this->_clauses[] = array(self::QUERY_WHERE, array($cond, $value, $op)); @@ -131,7 +127,6 @@ class Zend_Cloud_DocumentService_Query public function whereId($value) { if (!is_scalar($value)) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception("WHEREID argument must be a scalar"); } $this->_clauses[] = array(self::QUERY_WHEREID, $value); @@ -147,7 +142,6 @@ class Zend_Cloud_DocumentService_Query public function limit($limit) { if ($limit != (int) $limit) { - require_once 'Zend/Cloud/DocumentService/Exception.php'; throw new Zend_Cloud_DocumentService_Exception("LIMIT argument must be an integer"); } $this->_clauses[] = array(self::QUERY_LIMIT, $limit); diff --git a/library/vendor/Zend/Cloud/Exception.php b/library/vendor/Zend/Cloud/Exception.php index 320ae98cd..3eae6979c 100644 --- a/library/vendor/Zend/Cloud/Exception.php +++ b/library/vendor/Zend/Cloud/Exception.php @@ -22,7 +22,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php b/library/vendor/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php index ea4c8994b..2f9d31085 100644 --- a/library/vendor/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php +++ b/library/vendor/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php @@ -17,8 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/Infrastructure/Adapter.php'; -require_once 'Zend/Cloud/Infrastructure/Instance.php'; /** * Abstract infrastructure service adapter @@ -96,17 +94,14 @@ abstract class Zend_Cloud_Infrastructure_Adapter_AbstractAdapter implements Zend public function deployInstance($id, $params, $cmd) { if (!function_exists("ssh2_connect")) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('Deployment requires the PHP "SSH" extension (ext/ssh2)'); } if (empty($id)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You must specify the instance where to deploy'); } if (empty($cmd)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You must specify the shell commands to run on the instance'); } @@ -115,13 +110,11 @@ abstract class Zend_Cloud_Infrastructure_Adapter_AbstractAdapter implements Zend || (empty($params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD]) && empty($params[Zend_Cloud_Infrastructure_Instance::SSH_KEY])) ) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You must specify the params for the SSH connection'); } $host = $this->publicDnsInstance($id); if (empty($host)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception(sprintf( 'The instance identified by "%s" does not exist', $id @@ -131,7 +124,6 @@ abstract class Zend_Cloud_Infrastructure_Adapter_AbstractAdapter implements Zend $conn = ssh2_connect($host); if (!ssh2_auth_password($conn, $params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME], $params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD])) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('SSH authentication failed'); } diff --git a/library/vendor/Zend/Cloud/Infrastructure/Adapter/Ec2.php b/library/vendor/Zend/Cloud/Infrastructure/Adapter/Ec2.php index 854dd919e..3088a4c72 100644 --- a/library/vendor/Zend/Cloud/Infrastructure/Adapter/Ec2.php +++ b/library/vendor/Zend/Cloud/Infrastructure/Adapter/Ec2.php @@ -7,15 +7,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Service/Amazon/Ec2/Instance.php'; -require_once 'Zend/Service/Amazon/Ec2/Image.php'; -require_once 'Zend/Service/Amazon/Ec2/Availabilityzones.php'; -require_once 'Zend/Service/Amazon/Ec2/CloudWatch.php'; -require_once 'Zend/Cloud/Infrastructure/Instance.php'; -require_once 'Zend/Cloud/Infrastructure/InstanceList.php'; -require_once 'Zend/Cloud/Infrastructure/Image.php'; -require_once 'Zend/Cloud/Infrastructure/ImageList.php'; -require_once 'Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php'; /** * Amazon EC2 adapter for infrastructure service @@ -129,14 +120,12 @@ class Zend_Cloud_Infrastructure_Adapter_Ec2 extends Zend_Cloud_Infrastructure_Ad } if (empty($options) || !is_array($options)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('Invalid options provided'); } if (!isset($options[self::AWS_ACCESS_KEY]) || !isset($options[self::AWS_SECRET_KEY]) ) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('AWS keys not specified!'); } @@ -151,7 +140,6 @@ class Zend_Cloud_Infrastructure_Adapter_Ec2 extends Zend_Cloud_Infrastructure_Ad try { $this->ec2 = new Zend_Service_Amazon_Ec2_Instance($options[self::AWS_ACCESS_KEY], $options[self::AWS_SECRET_KEY], $this->region); } catch (Exception $e) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('Error on create: ' . $e->getMessage(), $e->getCode(), $e); } @@ -298,7 +286,6 @@ class Zend_Cloud_Infrastructure_Adapter_Ec2 extends Zend_Cloud_Infrastructure_Ad */ public function stopInstance($id) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('The stopInstance method is not implemented in the adapter'); } @@ -310,7 +297,6 @@ class Zend_Cloud_Infrastructure_Adapter_Ec2 extends Zend_Cloud_Infrastructure_Ad */ public function startInstance($id) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('The startInstance method is not implemented in the adapter'); } @@ -401,7 +387,6 @@ class Zend_Cloud_Infrastructure_Adapter_Ec2 extends Zend_Cloud_Infrastructure_Ad } if (!in_array($metric,$this->validMetrics)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception(sprintf( 'The metric "%s" is not valid', $metric @@ -409,7 +394,6 @@ class Zend_Cloud_Infrastructure_Adapter_Ec2 extends Zend_Cloud_Infrastructure_Ad } if (!empty($options) && !is_array($options)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); } @@ -417,7 +401,6 @@ class Zend_Cloud_Infrastructure_Adapter_Ec2 extends Zend_Cloud_Infrastructure_Ad && (empty($options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME]) || empty($options[Zend_Cloud_Infrastructure_Instance::MONITOR_END_TIME])) ) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception(sprintf( 'The options array must contain: "%s" and "%s"', $options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME], diff --git a/library/vendor/Zend/Cloud/Infrastructure/Adapter/Rackspace.php b/library/vendor/Zend/Cloud/Infrastructure/Adapter/Rackspace.php index 61bab335b..2386a4503 100644 --- a/library/vendor/Zend/Cloud/Infrastructure/Adapter/Rackspace.php +++ b/library/vendor/Zend/Cloud/Infrastructure/Adapter/Rackspace.php @@ -7,12 +7,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Service/Rackspace/Servers.php'; -require_once 'Zend/Cloud/Infrastructure/Instance.php'; -require_once 'Zend/Cloud/Infrastructure/InstanceList.php'; -require_once 'Zend/Cloud/Infrastructure/Image.php'; -require_once 'Zend/Cloud/Infrastructure/ImageList.php'; -require_once 'Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php'; /** * Rackspace servers adapter for infrastructure service @@ -104,17 +98,14 @@ class Zend_Cloud_Infrastructure_Adapter_Rackspace extends Zend_Cloud_Infrastruct } if (empty($options) || !is_array($options)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('Invalid options provided'); } if (!isset($options[self::RACKSPACE_USER])) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('Rackspace access user not specified!'); } if (!isset($options[self::RACKSPACE_KEY])) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('Rackspace access key not specified!'); } @@ -130,7 +121,6 @@ class Zend_Cloud_Infrastructure_Adapter_Rackspace extends Zend_Cloud_Infrastruct $this->region = Zend_Service_Rackspace_Servers::US_AUTH_URL; break; default: - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('The region is not valid'); } } else { @@ -140,7 +130,6 @@ class Zend_Cloud_Infrastructure_Adapter_Rackspace extends Zend_Cloud_Infrastruct try { $this->rackspace = new Zend_Service_Rackspace_Servers($this->accessUser,$this->accessKey, $this->region); } catch (Exception $e) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('Error on create: ' . $e->getMessage(), $e->getCode(), $e); } @@ -240,11 +229,9 @@ class Zend_Cloud_Infrastructure_Adapter_Rackspace extends Zend_Cloud_Infrastruct public function createInstance($name, $options) { if (empty($name)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You must specify the name of the instance'); } if (empty($options) || !is_array($options)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); } // @todo create an generic abstract definition for an instance? @@ -273,7 +260,6 @@ class Zend_Cloud_Infrastructure_Adapter_Rackspace extends Zend_Cloud_Infrastruct */ public function stopInstance($id) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('The stopInstance method is not implemented in the adapter'); } @@ -285,7 +271,6 @@ class Zend_Cloud_Infrastructure_Adapter_Rackspace extends Zend_Cloud_Infrastruct */ public function startInstance($id) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('The startInstance method is not implemented in the adapter'); } @@ -359,23 +344,18 @@ class Zend_Cloud_Infrastructure_Adapter_Rackspace extends Zend_Cloud_Infrastruct public function monitorInstance($id, $metric, $options = null) { if (!function_exists("ssh2_connect")) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('Monitor requires the PHP "SSH" extension (ext/ssh2)'); } if (empty($id)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You must specify the id of the instance to monitor'); } if (empty($metric)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You must specify the metric to monitor'); } if (!in_array($metric,$this->validMetrics)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception(sprintf('The metric "%s" is not valid', $metric)); } if (!empty($options) && !is_array($options)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); } @@ -391,7 +371,6 @@ class Zend_Cloud_Infrastructure_Adapter_Rackspace extends Zend_Cloud_Infrastruct break; } if (empty($cmd)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('The metric specified is not supported by the adapter'); } diff --git a/library/vendor/Zend/Cloud/Infrastructure/Exception.php b/library/vendor/Zend/Cloud/Infrastructure/Exception.php index 87abcdc68..1b251fb0e 100644 --- a/library/vendor/Zend/Cloud/Infrastructure/Exception.php +++ b/library/vendor/Zend/Cloud/Infrastructure/Exception.php @@ -12,7 +12,6 @@ /** * Zend_Cloud_Exception */ -require_once 'Zend/Cloud/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Cloud/Infrastructure/Factory.php b/library/vendor/Zend/Cloud/Infrastructure/Factory.php index 1d24b1905..85d006247 100644 --- a/library/vendor/Zend/Cloud/Infrastructure/Factory.php +++ b/library/vendor/Zend/Cloud/Infrastructure/Factory.php @@ -7,7 +7,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/AbstractFactory.php'; /** @@ -49,13 +48,11 @@ class Zend_Cloud_Infrastructure_Factory extends Zend_Cloud_AbstractFactory $adapter = parent::_getAdapter(self::INFRASTRUCTURE_ADAPTER_KEY, $options); if (!$adapter) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception(sprintf( 'Class must be specified using the "%s" key', self::INFRASTRUCTURE_ADAPTER_KEY )); } elseif (!$adapter instanceof self::$_adapterInterface) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception(sprintf( 'Adapter must implement "%s"', self::$_adapterInterface )); diff --git a/library/vendor/Zend/Cloud/Infrastructure/Image.php b/library/vendor/Zend/Cloud/Infrastructure/Image.php index 62a771978..005acc84a 100644 --- a/library/vendor/Zend/Cloud/Infrastructure/Image.php +++ b/library/vendor/Zend/Cloud/Infrastructure/Image.php @@ -71,13 +71,11 @@ class Zend_Cloud_Infrastructure_Image } if (empty($data) || !is_array($data)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You must pass an array of parameters'); } foreach ($this->attributeRequired as $key) { if (empty($data[$key])) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception(sprintf( 'The param "%s" is a required parameter for class %s', $key, diff --git a/library/vendor/Zend/Cloud/Infrastructure/ImageList.php b/library/vendor/Zend/Cloud/Infrastructure/ImageList.php index 7fdec7ffa..c80c2c29a 100644 --- a/library/vendor/Zend/Cloud/Infrastructure/ImageList.php +++ b/library/vendor/Zend/Cloud/Infrastructure/ImageList.php @@ -8,7 +8,6 @@ */ -require_once 'Zend/Cloud/Infrastructure/Image.php'; /** * List of images @@ -47,7 +46,6 @@ class Zend_Cloud_Infrastructure_ImageList implements Countable, Iterator, ArrayA public function __construct($images, $adapter = null) { if (empty($images) || !is_array($images)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception(__CLASS__ . ' expects an array of images'); } @@ -181,7 +179,6 @@ class Zend_Cloud_Infrastructure_ImageList implements Countable, Iterator, ArrayA public function offsetGet($offset) { if (!$this->offsetExists($offset)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('Illegal index'); } return $this->images[$offset]; @@ -198,7 +195,6 @@ class Zend_Cloud_Infrastructure_ImageList implements Countable, Iterator, ArrayA */ public function offsetSet($offset, $value) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You are trying to set read-only property'); } @@ -212,7 +208,6 @@ class Zend_Cloud_Infrastructure_ImageList implements Countable, Iterator, ArrayA */ public function offsetUnset($offset) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You are trying to unset read-only property'); } } diff --git a/library/vendor/Zend/Cloud/Infrastructure/Instance.php b/library/vendor/Zend/Cloud/Infrastructure/Instance.php index 06ba1c294..3a1caaa48 100644 --- a/library/vendor/Zend/Cloud/Infrastructure/Instance.php +++ b/library/vendor/Zend/Cloud/Infrastructure/Instance.php @@ -83,7 +83,6 @@ class Zend_Cloud_Infrastructure_Instance public function __construct($adapter, $data = null) { if (!($adapter instanceof Zend_Cloud_Infrastructure_Adapter)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception("You must pass a Zend_Cloud_Infrastructure_Adapter instance"); } @@ -96,13 +95,11 @@ class Zend_Cloud_Infrastructure_Instance } if (empty($data) || !is_array($data)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception("You must pass an array of parameters"); } foreach ($this->attributeRequired as $key) { if (empty($data[$key])) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception(sprintf( 'The param "%s" is a required param for %s', $key, diff --git a/library/vendor/Zend/Cloud/Infrastructure/InstanceList.php b/library/vendor/Zend/Cloud/Infrastructure/InstanceList.php index 673958438..40edf0635 100644 --- a/library/vendor/Zend/Cloud/Infrastructure/InstanceList.php +++ b/library/vendor/Zend/Cloud/Infrastructure/InstanceList.php @@ -7,7 +7,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/Infrastructure/Instance.php'; /** * List of instances @@ -44,11 +43,9 @@ class Zend_Cloud_Infrastructure_InstanceList implements Countable, Iterator, Arr public function __construct($adapter, array $instances = null) { if (!($adapter instanceof Zend_Cloud_Infrastructure_Adapter)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You must pass a Zend_Cloud_Infrastructure_Adapter'); } if (empty($instances)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You must pass an array of Instances'); } @@ -182,7 +179,6 @@ class Zend_Cloud_Infrastructure_InstanceList implements Countable, Iterator, Arr public function offsetGet($offset) { if (!$this->offsetExists($offset)) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('Illegal index'); } return $this->instances[$offset]; @@ -199,7 +195,6 @@ class Zend_Cloud_Infrastructure_InstanceList implements Countable, Iterator, Arr */ public function offsetSet($offset, $value) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You are trying to set read-only property'); } @@ -213,7 +208,6 @@ class Zend_Cloud_Infrastructure_InstanceList implements Countable, Iterator, Arr */ public function offsetUnset($offset) { - require_once 'Zend/Cloud/Infrastructure/Exception.php'; throw new Zend_Cloud_Infrastructure_Exception('You are trying to unset read-only property'); } } diff --git a/library/vendor/Zend/Cloud/OperationNotAvailableException.php b/library/vendor/Zend/Cloud/OperationNotAvailableException.php index 53697f033..953c29507 100644 --- a/library/vendor/Zend/Cloud/OperationNotAvailableException.php +++ b/library/vendor/Zend/Cloud/OperationNotAvailableException.php @@ -21,7 +21,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php b/library/vendor/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php index 8b413844b..e8c9a7a07 100644 --- a/library/vendor/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php +++ b/library/vendor/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php @@ -17,9 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/QueueService/Adapter.php'; -require_once 'Zend/Cloud/QueueService/Message.php'; -require_once 'Zend/Cloud/QueueService/MessageSet.php'; /** * Abstract queue adapter diff --git a/library/vendor/Zend/Cloud/QueueService/Adapter/Sqs.php b/library/vendor/Zend/Cloud/QueueService/Adapter/Sqs.php index 2240961de..df778ade2 100644 --- a/library/vendor/Zend/Cloud/QueueService/Adapter/Sqs.php +++ b/library/vendor/Zend/Cloud/QueueService/Adapter/Sqs.php @@ -17,10 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Service/Amazon/Sqs.php'; -require_once 'Zend/Cloud/QueueService/Adapter/AbstractAdapter.php'; -require_once 'Zend/Cloud/QueueService/Exception.php'; -require_once 'Zend/Cloud/QueueService/Message.php'; /** * SQS adapter for simple queue service. @@ -172,7 +168,6 @@ class Zend_Cloud_QueueService_Adapter_Sqs public function storeQueueMetadata($queueId, $metadata, $options = null) { // TODO Add support for SetQueueAttributes to client library - require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Amazon SQS doesn\'t currently support storing metadata'); } diff --git a/library/vendor/Zend/Cloud/QueueService/Adapter/WindowsAzure.php b/library/vendor/Zend/Cloud/QueueService/Adapter/WindowsAzure.php index 65b8bc9fd..0c3919f73 100755 --- a/library/vendor/Zend/Cloud/QueueService/Adapter/WindowsAzure.php +++ b/library/vendor/Zend/Cloud/QueueService/Adapter/WindowsAzure.php @@ -17,9 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/QueueService/Adapter/AbstractAdapter.php'; -require_once 'Zend/Cloud/QueueService/Exception.php'; -require_once 'Zend/Service/WindowsAzure/Storage/Queue.php'; /** * WindowsAzure adapter for simple queue service. diff --git a/library/vendor/Zend/Cloud/QueueService/Adapter/ZendQueue.php b/library/vendor/Zend/Cloud/QueueService/Adapter/ZendQueue.php index 391d4cf51..d2b94784d 100755 --- a/library/vendor/Zend/Cloud/QueueService/Adapter/ZendQueue.php +++ b/library/vendor/Zend/Cloud/QueueService/Adapter/ZendQueue.php @@ -17,9 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/QueueService/Adapter/AbstractAdapter.php'; -require_once 'Zend/Cloud/QueueService/Exception.php'; -require_once 'Zend/Queue.php'; /** * WindowsAzure adapter for simple queue service. @@ -286,7 +283,6 @@ class Zend_Cloud_QueueService_Adapter_ZendQueue */ public function peekMessages($queueId, $num = 1, $options = null) { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('ZendQueue doesn\'t currently support message peeking'); } diff --git a/library/vendor/Zend/Cloud/QueueService/Exception.php b/library/vendor/Zend/Cloud/QueueService/Exception.php index f4b6a433e..9e30d8e49 100644 --- a/library/vendor/Zend/Cloud/QueueService/Exception.php +++ b/library/vendor/Zend/Cloud/QueueService/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Cloud_Exception */ -require_once 'Zend/Cloud/Exception.php'; /** diff --git a/library/vendor/Zend/Cloud/QueueService/Factory.php b/library/vendor/Zend/Cloud/QueueService/Factory.php index a6996f540..255032b0e 100644 --- a/library/vendor/Zend/Cloud/QueueService/Factory.php +++ b/library/vendor/Zend/Cloud/QueueService/Factory.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/AbstractFactory.php'; /** * @category Zend @@ -57,11 +56,9 @@ class Zend_Cloud_QueueService_Factory extends Zend_Cloud_AbstractFactory { $adapter = parent::_getAdapter(self::QUEUE_ADAPTER_KEY, $options); if (!$adapter) { - require_once 'Zend/Cloud/QueueService/Exception.php'; throw new Zend_Cloud_QueueService_Exception('Class must be specified using the \'' . self::QUEUE_ADAPTER_KEY . '\' key'); } elseif (!$adapter instanceof self::$_adapterInterface) { - require_once 'Zend/Cloud/QueueService/Exception.php'; throw new Zend_Cloud_QueueService_Exception( 'Adapter must implement \'' . self::$_adapterInterface . '\'' ); diff --git a/library/vendor/Zend/Cloud/StorageService/Adapter/FileSystem.php b/library/vendor/Zend/Cloud/StorageService/Adapter/FileSystem.php index d77e99536..3ce8c7875 100644 --- a/library/vendor/Zend/Cloud/StorageService/Adapter/FileSystem.php +++ b/library/vendor/Zend/Cloud/StorageService/Adapter/FileSystem.php @@ -17,8 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/StorageService/Adapter.php'; -require_once 'Zend/Cloud/StorageService/Exception.php'; /** * FileSystem adapter for unstructured cloud storage. @@ -228,7 +226,6 @@ class Zend_Cloud_StorageService_Adapter_FileSystem implements Zend_Cloud_Storage */ public function storeMetadata($destinationPath, $metadata, $options = array()) { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Storing metadata not implemented'); } @@ -241,7 +238,6 @@ class Zend_Cloud_StorageService_Adapter_FileSystem implements Zend_Cloud_Storage */ public function deleteMetadata($path) { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Deleting metadata not implemented'); } diff --git a/library/vendor/Zend/Cloud/StorageService/Adapter/Rackspace.php b/library/vendor/Zend/Cloud/StorageService/Adapter/Rackspace.php index c0c20411c..c1cc8e7a2 100644 --- a/library/vendor/Zend/Cloud/StorageService/Adapter/Rackspace.php +++ b/library/vendor/Zend/Cloud/StorageService/Adapter/Rackspace.php @@ -17,10 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/StorageService/Adapter.php'; -require_once 'Zend/Cloud/StorageService/Exception.php'; -require_once 'Zend/Service/Rackspace/Files.php'; -require_once 'Zend/Service/Rackspace/Exception.php'; /** * Adapter for Rackspace cloud storage @@ -183,7 +179,6 @@ class Zend_Cloud_StorageService_Adapter_Rackspace */ public function renameItem($path, $name, $options = null) { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Renaming not implemented'); } diff --git a/library/vendor/Zend/Cloud/StorageService/Adapter/S3.php b/library/vendor/Zend/Cloud/StorageService/Adapter/S3.php index 5a8cb80f7..1b394792a 100644 --- a/library/vendor/Zend/Cloud/StorageService/Adapter/S3.php +++ b/library/vendor/Zend/Cloud/StorageService/Adapter/S3.php @@ -17,9 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Service/Amazon/S3.php'; -require_once 'Zend/Cloud/StorageService/Adapter.php'; -require_once 'Zend/Cloud/StorageService/Exception.php'; /** * S3 adapter for unstructured cloud storage. @@ -226,7 +223,6 @@ class Zend_Cloud_StorageService_Adapter_S3 */ public function renameItem($path, $name, $options = null) { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Rename not implemented'); } @@ -277,7 +273,6 @@ class Zend_Cloud_StorageService_Adapter_S3 */ public function storeMetadata($destinationPath, $metadata, $options = array()) { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Storing separate metadata is not supported, use storeItem() with \'metadata\' option key'); } @@ -290,7 +285,6 @@ class Zend_Cloud_StorageService_Adapter_S3 */ public function deleteMetadata($path) { - require_once 'Zend/Cloud/OperationNotAvailableException.php'; throw new Zend_Cloud_OperationNotAvailableException('Deleting metadata not supported'); } @@ -308,13 +302,11 @@ class Zend_Cloud_StorageService_Adapter_S3 } else if (isset($this->_defaultBucketName)) { $bucket = $this->_defaultBucketName; } else { - require_once 'Zend/Cloud/StorageService/Exception.php'; throw new Zend_Cloud_StorageService_Exception('Bucket name must be specified for S3 adapter.'); } if (isset($options[self::BUCKET_AS_DOMAIN])) { // TODO: support bucket domain names - require_once 'Zend/Cloud/StorageService/Exception.php'; throw new Zend_Cloud_StorageService_Exception('The S3 adapter does not currently support buckets in domain names.'); } diff --git a/library/vendor/Zend/Cloud/StorageService/Adapter/WindowsAzure.php b/library/vendor/Zend/Cloud/StorageService/Adapter/WindowsAzure.php index c1ea701f8..734439f20 100644 --- a/library/vendor/Zend/Cloud/StorageService/Adapter/WindowsAzure.php +++ b/library/vendor/Zend/Cloud/StorageService/Adapter/WindowsAzure.php @@ -17,9 +17,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/StorageService/Adapter.php'; -require_once 'Zend/Service/WindowsAzure/Storage/Blob.php'; -require_once 'Zend/Cloud/StorageService/Exception.php'; /** * diff --git a/library/vendor/Zend/Cloud/StorageService/Exception.php b/library/vendor/Zend/Cloud/StorageService/Exception.php index 2c5aff815..e444cc0bb 100644 --- a/library/vendor/Zend/Cloud/StorageService/Exception.php +++ b/library/vendor/Zend/Cloud/StorageService/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Cloud_Exception */ -require_once 'Zend/Cloud/Exception.php'; /** diff --git a/library/vendor/Zend/Cloud/StorageService/Factory.php b/library/vendor/Zend/Cloud/StorageService/Factory.php index 052a13b4b..cf7aa6aa6 100644 --- a/library/vendor/Zend/Cloud/StorageService/Factory.php +++ b/library/vendor/Zend/Cloud/StorageService/Factory.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Cloud/AbstractFactory.php'; /** * @category Zend @@ -56,11 +55,9 @@ class Zend_Cloud_StorageService_Factory extends Zend_Cloud_AbstractFactory { $adapter = parent::_getAdapter(self::STORAGE_ADAPTER_KEY, $options); if (!$adapter) { - require_once 'Zend/Cloud/StorageService/Exception.php'; throw new Zend_Cloud_StorageService_Exception('Class must be specified using the \'' . self::STORAGE_ADAPTER_KEY . '\' key'); } elseif (!$adapter instanceof self::$_adapterInterface) { - require_once 'Zend/Cloud/StorageService/Exception.php'; throw new Zend_Cloud_StorageService_Exception( 'Adapter must implement \'' . self::$_adapterInterface . '\'' ); diff --git a/library/vendor/Zend/CodeGenerator/Exception.php b/library/vendor/Zend/CodeGenerator/Exception.php index bbd98a8c4..3b8ae25ba 100644 --- a/library/vendor/Zend/CodeGenerator/Exception.php +++ b/library/vendor/Zend/CodeGenerator/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/CodeGenerator/Php/Abstract.php b/library/vendor/Zend/CodeGenerator/Php/Abstract.php index 274e1b134..dc1fbbc14 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Abstract.php +++ b/library/vendor/Zend/CodeGenerator/Php/Abstract.php @@ -23,7 +23,6 @@ /** * @see Zend_CodeGenerator_Abstract */ -require_once 'Zend/CodeGenerator/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/CodeGenerator/Php/Body.php b/library/vendor/Zend/CodeGenerator/Php/Body.php index 9078adbda..2779580bd 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Body.php +++ b/library/vendor/Zend/CodeGenerator/Php/Body.php @@ -23,7 +23,6 @@ /** * @see Zend_CodeGenerator_Abstract */ -require_once 'Zend/CodeGenerator/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/CodeGenerator/Php/Class.php b/library/vendor/Zend/CodeGenerator/Php/Class.php index 523284ac8..58bd6f8fa 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Class.php +++ b/library/vendor/Zend/CodeGenerator/Php/Class.php @@ -23,27 +23,22 @@ /** * @see Zend_CodeGenerator_Php_Abstract */ -require_once 'Zend/CodeGenerator/Php/Abstract.php'; /** * @see Zend_CodeGenerator_Php_Member_Container */ -require_once 'Zend/CodeGenerator/Php/Member/Container.php'; /** * @see Zend_CodeGenerator_Php_Method */ -require_once 'Zend/CodeGenerator/Php/Method.php'; /** * @see Zend_CodeGenerator_Php_Property */ -require_once 'Zend/CodeGenerator/Php/Property.php'; /** * @see Zend_CodeGenerator_Php_Docblock */ -require_once 'Zend/CodeGenerator/Php/Docblock.php'; /** * @category Zend @@ -162,7 +157,6 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract if (is_array($docblock)) { $docblock = new Zend_CodeGenerator_Php_Docblock($docblock); } elseif ((!is_null($docblock)) && (!$docblock instanceof Zend_CodeGenerator_Php_Docblock)) { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock'); } @@ -312,7 +306,6 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract } elseif ($property instanceof Zend_CodeGenerator_Php_Property) { $propertyName = $property->getName(); } else { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('setProperty() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property'); } @@ -320,7 +313,6 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract return $this->setConstant($property); } if (isset($this->_properties[$propertyName])) { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('A property by name ' . $propertyName . ' already exists in this class.'); } @@ -342,16 +334,13 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract } elseif ($const instanceof Zend_CodeGenerator_Php_Property) { $constName = $const->getName(); } else { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('setConstant() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property'); } if (!$const->isConst()) { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('setProperty() expects argument to define a constant'); } if (isset($this->_constants[$constName])) { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('A constant by name ' . $constName . ' already exists in this class.'); } @@ -461,12 +450,10 @@ class Zend_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract } elseif ($method instanceof Zend_CodeGenerator_Php_Method) { $methodName = $method->getName(); } else { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('setMethod() expects either an array of method options or an instance of Zend_CodeGenerator_Php_Method'); } if (isset($this->_methods[$methodName])) { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('A method by name ' . $methodName . ' already exists in this class.'); } diff --git a/library/vendor/Zend/CodeGenerator/Php/Docblock.php b/library/vendor/Zend/CodeGenerator/Php/Docblock.php index 2822ffdfa..a65253fba 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Docblock.php +++ b/library/vendor/Zend/CodeGenerator/Php/Docblock.php @@ -23,12 +23,10 @@ /** * @see Zend_CodeGenerator_Php_Abstract */ -require_once 'Zend/CodeGenerator/Php/Abstract.php'; /** * @see Zend_CodeGenerator_Php_Docblock_Tag */ -require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; /** * @category Zend @@ -151,7 +149,6 @@ class Zend_CodeGenerator_Php_Docblock extends Zend_CodeGenerator_Php_Abstract if (is_array($tag)) { $tag = new Zend_CodeGenerator_Php_Docblock_Tag($tag); } elseif (!$tag instanceof Zend_CodeGenerator_Php_Docblock_Tag) { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception( 'setTag() expects either an array of method options or an ' . 'instance of Zend_CodeGenerator_Php_Docblock_Tag' diff --git a/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag.php b/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag.php index 72f018058..a05d97d5a 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag.php +++ b/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag.php @@ -23,7 +23,6 @@ /** * @see Zend_CodeGenerator_Php_Abstract */ -require_once 'Zend/CodeGenerator/Php/Abstract.php'; /** * @category Zend @@ -94,7 +93,6 @@ class Zend_CodeGenerator_Php_Docblock_Tag extends Zend_CodeGenerator_Php_Abstrac public static function getPluginLoader() { if (self::$_pluginLoader == null) { - require_once 'Zend/Loader/PluginLoader.php'; self::setPluginLoader(new Zend_Loader_PluginLoader(array( 'Zend_CodeGenerator_Php_Docblock_Tag' => dirname(__FILE__) . '/Tag/')) ); diff --git a/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/License.php b/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/License.php index 0a5278744..0cb4ad062 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/License.php +++ b/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/License.php @@ -23,7 +23,6 @@ /** * @see Zend_CodeGenerator_Php_Docblock_Tag */ -require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; /** * @category Zend diff --git a/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/Param.php b/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/Param.php index c964e1b3d..d479f550c 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/Param.php +++ b/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/Param.php @@ -23,7 +23,6 @@ /** * @see Zend_CodeGenerator_Php_Docblock_Tag */ -require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; /** * @category Zend diff --git a/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/Return.php b/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/Return.php index 949c52cfa..04eba0bda 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/Return.php +++ b/library/vendor/Zend/CodeGenerator/Php/Docblock/Tag/Return.php @@ -23,7 +23,6 @@ /** * @see Zend_CodeGenerator_Php_Docblock_Tag */ -require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; /** * @category Zend diff --git a/library/vendor/Zend/CodeGenerator/Php/Exception.php b/library/vendor/Zend/CodeGenerator/Php/Exception.php index 4509069ae..8843be7e8 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Exception.php +++ b/library/vendor/Zend/CodeGenerator/Php/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_CodeGenerator_Exception */ -require_once 'Zend/CodeGenerator/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/CodeGenerator/Php/File.php b/library/vendor/Zend/CodeGenerator/Php/File.php index fa237ed30..7f79bc622 100644 --- a/library/vendor/Zend/CodeGenerator/Php/File.php +++ b/library/vendor/Zend/CodeGenerator/Php/File.php @@ -23,12 +23,10 @@ /** * @see Zend_CodeGenerator_Php_Abstract */ -require_once 'Zend/CodeGenerator/Php/Abstract.php'; /** * @see Zend_CodeGenerator_Php_Class */ -require_once 'Zend/CodeGenerator/Php/Class.php'; /** * @category Zend @@ -84,7 +82,6 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract } if ($fileName == '') { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('FileName does not exist.'); } @@ -111,7 +108,6 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract if ($realpath === false) { if ( ($realpath = Zend_Reflection_File::findRealpathInIncludePath($filePath)) === false) { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('No file for ' . $realpath . ' was found.'); } } @@ -206,7 +202,6 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract if (is_array($docblock)) { $docblock = new Zend_CodeGenerator_Php_Docblock($docblock); } elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock'); } @@ -290,7 +285,6 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract } elseif ($class instanceof Zend_CodeGenerator_Php_Class) { $className = $class->getName(); } else { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('Expecting either an array or an instance of Zend_CodeGenerator_Php_Class'); } @@ -418,7 +412,6 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract $requiredFiles = $this->getRequiredFiles(); if (!empty($requiredFiles)) { foreach ($requiredFiles as $requiredFile) { - $output .= 'require_once \'' . $requiredFile . '\';' . self::LINE_FEED; } $output .= self::LINE_FEED; @@ -458,7 +451,6 @@ class Zend_CodeGenerator_Php_File extends Zend_CodeGenerator_Php_Abstract public function write() { if ($this->_filename == '' || !is_writable(dirname($this->_filename))) { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('This code generator object is not writable.'); } file_put_contents($this->_filename, $this->generate()); diff --git a/library/vendor/Zend/CodeGenerator/Php/Member/Abstract.php b/library/vendor/Zend/CodeGenerator/Php/Member/Abstract.php index 0456fc681..4006e7151 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Member/Abstract.php +++ b/library/vendor/Zend/CodeGenerator/Php/Member/Abstract.php @@ -23,12 +23,10 @@ /** * @see Zend_CodeGenerator_Php_Abstract */ -require_once 'Zend/CodeGenerator/Php/Abstract.php'; /** * @see Zend_CodeGenerator_Php_Abstract */ -require_once 'Zend/CodeGenerator/Php/Docblock.php'; /** * @category Zend @@ -92,7 +90,6 @@ abstract class Zend_CodeGenerator_Php_Member_Abstract extends Zend_CodeGenerator if (is_array($docblock)) { $docblock = new Zend_CodeGenerator_Php_Docblock($docblock); } elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock'); } diff --git a/library/vendor/Zend/CodeGenerator/Php/Method.php b/library/vendor/Zend/CodeGenerator/Php/Method.php index 6580eb9b6..b8a0aa7c7 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Method.php +++ b/library/vendor/Zend/CodeGenerator/Php/Method.php @@ -23,17 +23,14 @@ /** * @see Zend_CodeGenerator_Php_Member_Abstract */ -require_once 'Zend/CodeGenerator/Php/Member/Abstract.php'; /** * @see Zend_CodeGenerator_Php_Docblock */ -require_once 'Zend/CodeGenerator/Php/Docblock.php'; /** * @see Zend_CodeGenerator_Php_Parameter */ -require_once 'Zend/CodeGenerator/Php/Parameter.php'; /** * @category Zend @@ -141,7 +138,6 @@ class Zend_CodeGenerator_Php_Method extends Zend_CodeGenerator_Php_Member_Abstra } elseif ($parameter instanceof Zend_CodeGenerator_Php_Parameter) { $parameterName = $parameter->getName(); } else { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('setParameter() expects either an array of method options or an instance of Zend_CodeGenerator_Php_Parameter'); } diff --git a/library/vendor/Zend/CodeGenerator/Php/Parameter.php b/library/vendor/Zend/CodeGenerator/Php/Parameter.php index 0f61e7766..20d3ecb1f 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Parameter.php +++ b/library/vendor/Zend/CodeGenerator/Php/Parameter.php @@ -23,12 +23,10 @@ /** * @see Zend_CodeGenerator_Php_Abstract */ -require_once 'Zend/CodeGenerator/Php/Abstract.php'; /** * @see Zend_CodeGenerator_Php_ParameterDefaultValue */ -require_once 'Zend/CodeGenerator/Php/Parameter/DefaultValue.php'; /** * @category Zend diff --git a/library/vendor/Zend/CodeGenerator/Php/Parameter/DefaultValue.php b/library/vendor/Zend/CodeGenerator/Php/Parameter/DefaultValue.php index 17291b6a6..03085c6fa 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Parameter/DefaultValue.php +++ b/library/vendor/Zend/CodeGenerator/Php/Parameter/DefaultValue.php @@ -44,7 +44,6 @@ class Zend_CodeGenerator_Php_Parameter_DefaultValue public function __construct($defaultValue) { if(!is_string($defaultValue)) { - require_once "Zend/CodeGenerator/Php/Exception.php"; throw new Zend_CodeGenerator_Php_Exception( "Can only set a string as default value representation, ". "but ".gettype($defaultValue)." was given." diff --git a/library/vendor/Zend/CodeGenerator/Php/Property.php b/library/vendor/Zend/CodeGenerator/Php/Property.php index cdaf326de..98aa53903 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Property.php +++ b/library/vendor/Zend/CodeGenerator/Php/Property.php @@ -23,12 +23,10 @@ /** * @see Zend_CodeGenerator_Php_Member_Abstract */ -require_once 'Zend/CodeGenerator/Php/Member/Abstract.php'; /** * @see Zend_CodeGenerator_Php_Property_DefaultValue */ -require_once 'Zend/CodeGenerator/Php/Property/DefaultValue.php'; /** * @category Zend @@ -160,7 +158,6 @@ class Zend_CodeGenerator_Php_Property extends Zend_CodeGenerator_Php_Member_Abst if ($this->isConst()) { if ($defaultValue != null && !$defaultValue->isValidConstantType()) { - require_once 'Zend/CodeGenerator/Php/Exception.php'; throw new Zend_CodeGenerator_Php_Exception('The property ' . $this->_name . ' is said to be ' . 'constant but does not have a valid constant value.'); } diff --git a/library/vendor/Zend/CodeGenerator/Php/Property/DefaultValue.php b/library/vendor/Zend/CodeGenerator/Php/Property/DefaultValue.php index 93934126b..84881e187 100644 --- a/library/vendor/Zend/CodeGenerator/Php/Property/DefaultValue.php +++ b/library/vendor/Zend/CodeGenerator/Php/Property/DefaultValue.php @@ -23,7 +23,6 @@ /** * @see Zend_CodeGenerator_Php_Abstract */ -require_once 'Zend/CodeGenerator/Php/Abstract.php'; /** * @category Zend @@ -312,7 +311,6 @@ class Zend_CodeGenerator_Php_Property_DefaultValue extends Zend_CodeGenerator_Ph break; case self::TYPE_OTHER: default: - require_once "Zend/CodeGenerator/Php/Exception.php"; throw new Zend_CodeGenerator_Php_Exception( "Type '".get_class($value)."' is unknown or cannot be used as property default value." ); diff --git a/library/vendor/Zend/Config.php b/library/vendor/Zend/Config.php index 4d26a53a0..199dcbe31 100644 --- a/library/vendor/Zend/Config.php +++ b/library/vendor/Zend/Config.php @@ -165,7 +165,6 @@ class Zend_Config implements Countable, Iterator $this->_count = count($this->_data); } else { /** @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Zend_Config is read only'); } } @@ -234,7 +233,6 @@ class Zend_Config implements Countable, Iterator $this->_skipNextIteration = true; } else { /** @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Zend_Config is read only'); } @@ -427,7 +425,6 @@ class Zend_Config implements Countable, Iterator while (array_key_exists($extendedSectionCurrent, $this->_extends)) { if ($this->_extends[$extendedSectionCurrent] == $extendingSection) { /** @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Illegal circular inheritance detected'); } $extendedSectionCurrent = $this->_extends[$extendedSectionCurrent]; diff --git a/library/vendor/Zend/Config/Exception.php b/library/vendor/Zend/Config/Exception.php index 06e47c175..28e6ff964 100644 --- a/library/vendor/Zend/Config/Exception.php +++ b/library/vendor/Zend/Config/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Config/Ini.php b/library/vendor/Zend/Config/Ini.php index f9ea9033e..065a25788 100644 --- a/library/vendor/Zend/Config/Ini.php +++ b/library/vendor/Zend/Config/Ini.php @@ -23,7 +23,6 @@ /** * @see Zend_Config */ -require_once 'Zend/Config.php'; /** @@ -104,7 +103,6 @@ class Zend_Config_Ini extends Zend_Config /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Filename is not set'); } @@ -147,7 +145,6 @@ class Zend_Config_Ini extends Zend_Config /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$sectionName' cannot be found in $filename"); } $dataArray = $this->_arrayMergeRecursive($this->_processSection($iniArray, $sectionName), $dataArray); @@ -178,7 +175,6 @@ class Zend_Config_Ini extends Zend_Config /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception($this->_loadFileErrorStr); } @@ -219,7 +215,6 @@ class Zend_Config_Ini extends Zend_Config /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$thisSection' may not extend multiple sections in $filename"); } } @@ -254,7 +249,6 @@ class Zend_Config_Ini extends Zend_Config /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Parent section '$section' cannot be found"); } } else { @@ -290,7 +284,6 @@ class Zend_Config_Ini extends Zend_Config /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Cannot create sub-key for '{$pieces[0]}' as key already exists"); } $config[$pieces[0]] = $this->_processKey($config[$pieces[0]], $pieces[1], $value); @@ -298,7 +291,6 @@ class Zend_Config_Ini extends Zend_Config /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Invalid key '$key'"); } } else { diff --git a/library/vendor/Zend/Config/Json.php b/library/vendor/Zend/Config/Json.php index 2c31fdc01..cd9533917 100755 --- a/library/vendor/Zend/Config/Json.php +++ b/library/vendor/Zend/Config/Json.php @@ -22,12 +22,10 @@ /** * @see Zend_Config */ -require_once 'Zend/Config.php'; /** * @see Zend_Json */ -require_once 'Zend/Json.php'; /** * JSON Adapter for Zend_Config @@ -82,7 +80,6 @@ class Zend_Config_Json extends Zend_Config public function __construct($json, $section = null, $options = false) { if (empty($json)) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Filename is not set'); } @@ -118,7 +115,6 @@ class Zend_Config_Json extends Zend_Config // Check if there was a error while loading file if ($this->_loadFileErrorStr !== null) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception($this->_loadFileErrorStr); } @@ -132,7 +128,6 @@ class Zend_Config_Json extends Zend_Config $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"); } @@ -147,7 +142,6 @@ class Zend_Config_Json extends Zend_Config $dataArray = array(); foreach ($section as $sectionName) { if (!isset($config[$sectionName])) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $sectionName)); } @@ -157,7 +151,6 @@ class Zend_Config_Json extends Zend_Config parent::__construct($dataArray, $allowModifications); } else { if (!isset($config[$section])) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section)); } @@ -186,7 +179,6 @@ class Zend_Config_Json extends Zend_Config protected function _processExtends(array $data, $section, array $config = array()) { if (!isset($data[$section])) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section)); } @@ -194,7 +186,6 @@ class Zend_Config_Json extends Zend_Config if (is_array($thisSection) && isset($thisSection[self::EXTENDS_NAME])) { if (is_array($thisSection[self::EXTENDS_NAME])) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Invalid extends clause: must be a string; array received'); } $this->_assertValidExtend($section, $thisSection[self::EXTENDS_NAME]); diff --git a/library/vendor/Zend/Config/Writer/Array.php b/library/vendor/Zend/Config/Writer/Array.php index 067a582d3..7e497f5ad 100644 --- a/library/vendor/Zend/Config/Writer/Array.php +++ b/library/vendor/Zend/Config/Writer/Array.php @@ -22,7 +22,6 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Config/Writer/FileAbstract.php b/library/vendor/Zend/Config/Writer/FileAbstract.php index 12d3c3669..f304ccbbb 100644 --- a/library/vendor/Zend/Config/Writer/FileAbstract.php +++ b/library/vendor/Zend/Config/Writer/FileAbstract.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once "Zend/Config/Writer.php"; /** * Abstract File Writer @@ -95,12 +94,10 @@ class Zend_Config_Writer_FileAbstract extends Zend_Config_Writer } if ($this->_filename === null) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('No filename was set'); } if ($this->_config === null) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('No config was set'); } @@ -115,7 +112,6 @@ class Zend_Config_Writer_FileAbstract extends Zend_Config_Writer $result = @file_put_contents($this->_filename, $configString, $flags); if ($result === false) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Could not write to file "' . $this->_filename . '"'); } } diff --git a/library/vendor/Zend/Config/Writer/Ini.php b/library/vendor/Zend/Config/Writer/Ini.php index e90b935ba..e270039ec 100644 --- a/library/vendor/Zend/Config/Writer/Ini.php +++ b/library/vendor/Zend/Config/Writer/Ini.php @@ -22,7 +22,6 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @category Zend @@ -157,7 +156,6 @@ class Zend_Config_Writer_Ini extends Zend_Config_Writer_FileAbstract return '"' . $value . '"'; } else { /** @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Value can not contain double quotes "'); } } diff --git a/library/vendor/Zend/Config/Writer/Json.php b/library/vendor/Zend/Config/Writer/Json.php index 25da4a903..ec5dedb25 100755 --- a/library/vendor/Zend/Config/Writer/Json.php +++ b/library/vendor/Zend/Config/Writer/Json.php @@ -22,12 +22,10 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @see Zend_Config_Json */ -require_once 'Zend/Config/Json.php'; /** * @category Zend diff --git a/library/vendor/Zend/Config/Writer/Xml.php b/library/vendor/Zend/Config/Writer/Xml.php index 75c49a953..7ef7bf4e2 100644 --- a/library/vendor/Zend/Config/Writer/Xml.php +++ b/library/vendor/Zend/Config/Writer/Xml.php @@ -22,12 +22,10 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @see Zend_Config_Xml */ -require_once 'Zend/Config/Xml.php'; /** * @category Zend @@ -101,7 +99,6 @@ class Zend_Config_Writer_Xml extends Zend_Config_Writer_FileAbstract $branchType = 'string'; } } else if ($branchType !== (is_numeric($key) ? 'numeric' : 'string')) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Mixing of string and numeric keys is not allowed'); } diff --git a/library/vendor/Zend/Config/Writer/Yaml.php b/library/vendor/Zend/Config/Writer/Yaml.php index 4d2b1fed4..197bfbfeb 100755 --- a/library/vendor/Zend/Config/Writer/Yaml.php +++ b/library/vendor/Zend/Config/Writer/Yaml.php @@ -22,12 +22,10 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @see Zend_Config_Yaml */ -require_once 'Zend/Config/Yaml.php'; /** * @category Zend @@ -63,7 +61,6 @@ class Zend_Config_Writer_Yaml extends Zend_Config_Writer_FileAbstract public function setYamlEncoder($yamlEncoder) { if (!is_callable($yamlEncoder)) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Invalid parameter to setYamlEncoder - must be callable'); } diff --git a/library/vendor/Zend/Config/Xml.php b/library/vendor/Zend/Config/Xml.php index 93797b235..116ba3fd1 100644 --- a/library/vendor/Zend/Config/Xml.php +++ b/library/vendor/Zend/Config/Xml.php @@ -22,13 +22,10 @@ /** * @see Zend_Config */ -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 @@ -84,7 +81,6 @@ class Zend_Config_Xml extends Zend_Config public function __construct($xml, $section = null, $options = false) { if (empty($xml)) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Filename is not set'); } @@ -106,13 +102,11 @@ class Zend_Config_Xml extends Zend_Config } else { try { if (!$config = Zend_Xml_Security::scanFile($xml)) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception( "Error failed to load $xml file" ); } } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception( $e->getMessage() ); @@ -122,7 +116,6 @@ class Zend_Config_Xml extends Zend_Config restore_error_handler(); // Check if there was a error while loading file if ($this->_loadFileErrorStr !== null) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception($this->_loadFileErrorStr); } @@ -137,7 +130,6 @@ class Zend_Config_Xml extends Zend_Config $dataArray = array(); foreach ($section as $sectionName) { if (!isset($config->$sectionName)) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$sectionName' cannot be found in $xml"); } @@ -147,7 +139,6 @@ class Zend_Config_Xml extends Zend_Config parent::__construct($dataArray, $allowModifications); } else { if (!isset($config->$section)) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$section' cannot be found in $xml"); } @@ -176,7 +167,6 @@ class Zend_Config_Xml extends Zend_Config protected function _processExtends(SimpleXMLElement $element, $section, array $config = array()) { if (!isset($element->$section)) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$section' cannot be found"); } @@ -233,7 +223,6 @@ class Zend_Config_Xml extends Zend_Config // Search for local 'const' nodes and replace them if (count($xmlObject->children(self::XML_NAMESPACE)) > 0) { if (count($xmlObject->children()) > 0) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("A node with a 'const' childnode may not have any other children"); } @@ -252,14 +241,12 @@ class Zend_Config_Xml extends Zend_Config switch ($node->localName) { case 'const': if (!$node->hasAttributeNS(self::XML_NAMESPACE, 'name')) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Misssing 'name' attribute in 'const' node"); } $constantName = $node->getAttributeNS(self::XML_NAMESPACE, 'name'); if (!defined($constantName)) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Constant with name '$constantName' was not defined"); } @@ -269,7 +256,6 @@ class Zend_Config_Xml extends Zend_Config break; default: - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Unknown node with name '$node->localName' found"); } } diff --git a/library/vendor/Zend/Config/Yaml.php b/library/vendor/Zend/Config/Yaml.php index 1dc97aa65..9f4dd6bf5 100755 --- a/library/vendor/Zend/Config/Yaml.php +++ b/library/vendor/Zend/Config/Yaml.php @@ -22,7 +22,6 @@ /** * @see Zend_Config */ -require_once 'Zend/Config.php'; /** * YAML Adapter for Zend_Config @@ -99,7 +98,6 @@ class Zend_Config_Yaml extends Zend_Config public function setYamlDecoder($yamlDecoder) { if (!is_callable($yamlDecoder)) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Invalid parameter to setYamlDecoder() - must be callable'); } @@ -131,7 +129,6 @@ class Zend_Config_Yaml extends Zend_Config public function __construct($yaml, $section = null, $options = false) { if (empty($yaml)) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Filename is not set'); } @@ -171,7 +168,6 @@ class Zend_Config_Yaml extends Zend_Config // Check if there was a error while loading file if ($this->_loadFileErrorStr !== null) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception($this->_loadFileErrorStr); } @@ -186,7 +182,6 @@ class Zend_Config_Yaml extends Zend_Config if (null === $config) { // decode failed - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Error parsing YAML data"); } @@ -200,7 +195,6 @@ class Zend_Config_Yaml extends Zend_Config $dataArray = array(); foreach ($section as $sectionName) { if (!isset($config[$sectionName])) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf( 'Section "%s" cannot be found', implode(' ', (array)$section) @@ -212,7 +206,6 @@ class Zend_Config_Yaml extends Zend_Config parent::__construct($dataArray, $allowModifications); } else { if (!isset($config[$section])) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf( 'Section "%s" cannot be found', implode(' ', (array)$section) @@ -243,7 +236,6 @@ class Zend_Config_Yaml extends Zend_Config protected function _processExtends(array $data, $section, array $config = array()) { if (!isset($data[$section])) { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section)); } @@ -341,7 +333,6 @@ class Zend_Config_Yaml extends Zend_Config $config[] = self::_decodeYaml($currentIndent + 1, $lines); } } else { - require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf( 'Error parsing YAML at line %d - unsupported syntax: "%s"', $lineno, $line diff --git a/library/vendor/Zend/Console/Getopt.php b/library/vendor/Zend/Console/Getopt.php index 20a5366a0..84f8f746d 100644 --- a/library/vendor/Zend/Console/Getopt.php +++ b/library/vendor/Zend/Console/Getopt.php @@ -242,7 +242,6 @@ class Zend_Console_Getopt public function __construct($rules, $argv = null, $getoptConfig = array()) { if (!isset($_SERVER['argv'])) { - require_once 'Zend/Console/Getopt/Exception.php'; if (ini_get('register_argc_argv') == false) { throw new Zend_Console_Getopt_Exception( "argv is not available, because ini option 'register_argc_argv' is set Off" @@ -350,7 +349,6 @@ class Zend_Console_Getopt public function addArguments($argv) { if(!is_array($argv)) { - require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Parameter #1 to addArguments should be an array"); } @@ -370,7 +368,6 @@ class Zend_Console_Getopt public function setArguments($argv) { if(!is_array($argv)) { - require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Parameter #1 to setArguments should be an array"); } @@ -505,7 +502,6 @@ class Zend_Console_Getopt /** * @see Zend_Json */ - require_once 'Zend/Json.php'; $json = Zend_Json::encode($j); return $json; @@ -655,7 +651,6 @@ class Zend_Console_Getopt $flag = $this->_ruleMap[$flag]; if (isset($this->_rules[$alias]) || isset($this->_ruleMap[$alias])) { $o = (strlen($alias) == 1 ? '-' : '--') . $alias; - require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"$o\" is being defined more than once."); } @@ -781,7 +776,6 @@ class Zend_Console_Getopt $flag = strtolower($flag); } if (!isset($this->_ruleMap[$flag])) { - require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"$flag\" is not recognized.", $this->getUsageMessage()); @@ -793,7 +787,6 @@ class Zend_Console_Getopt $param = array_shift($argv); $this->_checkParameterType($realFlag, $param); } else { - require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"$flag\" requires a parameter.", $this->getUsageMessage()); @@ -832,7 +825,6 @@ class Zend_Console_Getopt switch ($type) { case 'word': if (preg_match('/\W/', $param)) { - require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"$flag\" requires a single-word parameter, but was given \"$param\".", $this->getUsageMessage()); @@ -840,7 +832,6 @@ class Zend_Console_Getopt break; case 'integer': if (preg_match('/\D/', $param)) { - require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"$flag\" requires an integer parameter, but was given \"$param\".", $this->getUsageMessage()); @@ -917,13 +908,11 @@ class Zend_Console_Getopt $mainFlag = $flags[0]; foreach ($flags as $flag) { if (empty($flag)) { - require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Blank flag not allowed in rule \"$ruleCode\"."); } if (strlen($flag) == 1) { if (isset($this->_ruleMap[$flag])) { - require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"-$flag\" is being defined more than once."); } @@ -931,7 +920,6 @@ class Zend_Console_Getopt $rule['alias'][] = $flag; } else { if (isset($this->_rules[$flag]) || isset($this->_ruleMap[$flag])) { - require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"--$flag\" is being defined more than once."); } diff --git a/library/vendor/Zend/Console/Getopt/Exception.php b/library/vendor/Zend/Console/Getopt/Exception.php index 33f198c74..4ceeb6628 100644 --- a/library/vendor/Zend/Console/Getopt/Exception.php +++ b/library/vendor/Zend/Console/Getopt/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Console_Getopt_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Controller/Action.php b/library/vendor/Zend/Controller/Action.php index 2de7fbb02..7b78901a8 100644 --- a/library/vendor/Zend/Controller/Action.php +++ b/library/vendor/Zend/Controller/Action.php @@ -22,17 +22,14 @@ /** * @see Zend_Controller_Action_HelperBroker */ -require_once 'Zend/Controller/Action/HelperBroker.php'; /** * @see Zend_Controller_Action_Interface */ -require_once 'Zend/Controller/Action/Interface.php'; /** * @see Zend_Controller_Front */ -require_once 'Zend/Controller/Front.php'; /** * @category Zend @@ -166,7 +163,6 @@ abstract class Zend_Controller_Action implements Zend_Controller_Action_Interfac return $this->view; } - require_once 'Zend/View/Interface.php'; if (isset($this->view) && ($this->view instanceof Zend_View_Interface)) { return $this->view; } @@ -179,11 +175,9 @@ abstract class Zend_Controller_Action implements Zend_Controller_Action_Interfac } $baseDir = dirname($dirs[$module]) . DIRECTORY_SEPARATOR . 'views'; if (!file_exists($baseDir) || !is_dir($baseDir)) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Missing base view directory ("' . $baseDir . '")'); } - require_once 'Zend/View.php'; $this->view = new Zend_View(array('basePath' => $baseDir)); return $this->view; @@ -274,7 +268,6 @@ abstract class Zend_Controller_Action implements Zend_Controller_Action_Interfac if (null === $action) { $action = $request->getActionName(); } elseif (!is_string($action)) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid action specifier for view render'); } @@ -431,7 +424,6 @@ abstract class Zend_Controller_Action implements Zend_Controller_Action_Interfac } // Throw exception in all other cases - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Front controller class has not been loaded'); } @@ -479,7 +471,6 @@ abstract class Zend_Controller_Action implements Zend_Controller_Action_Interfac */ public function __call($methodName, $args) { - require_once 'Zend/Controller/Action/Exception.php'; if ('Action' == substr($methodName, -6)) { $action = substr($methodName, 0, strlen($methodName) - 6); throw new Zend_Controller_Action_Exception(sprintf('Action "%s" does not exist and was not trapped in __call()', $action), 404); diff --git a/library/vendor/Zend/Controller/Action/Exception.php b/library/vendor/Zend/Controller/Action/Exception.php index 6d9126655..538cf1021 100644 --- a/library/vendor/Zend/Controller/Action/Exception.php +++ b/library/vendor/Zend/Controller/Action/Exception.php @@ -24,7 +24,6 @@ /** * @see Zend_Controller_Exception */ -require_once 'Zend/Controller/Exception.php'; /** diff --git a/library/vendor/Zend/Controller/Action/Helper/Abstract.php b/library/vendor/Zend/Controller/Action/Helper/Abstract.php index ca51fe4ec..9ca227709 100644 --- a/library/vendor/Zend/Controller/Action/Helper/Abstract.php +++ b/library/vendor/Zend/Controller/Action/Helper/Abstract.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Action */ -require_once 'Zend/Controller/Action.php'; /** * @category Zend diff --git a/library/vendor/Zend/Controller/Action/Helper/ActionStack.php b/library/vendor/Zend/Controller/Action/Helper/ActionStack.php index b5ca6f735..9c38f8cff 100644 --- a/library/vendor/Zend/Controller/Action/Helper/ActionStack.php +++ b/library/vendor/Zend/Controller/Action/Helper/ActionStack.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Add to action stack @@ -56,7 +55,6 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H /** * @see Zend_Controller_Plugin_ActionStack */ - require_once 'Zend/Controller/Plugin/ActionStack.php'; $this->_actionStack = new Zend_Controller_Plugin_ActionStack(); $front->registerPlugin($this->_actionStack, 97); } else { @@ -94,7 +92,6 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('ActionStack requires either a request object or minimally a string action'); } @@ -104,7 +101,6 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Request object not set yet'); } @@ -114,7 +110,6 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H /** * @see Zend_Controller_Request_Simple */ - require_once 'Zend/Controller/Request/Simple.php'; $newRequest = new Zend_Controller_Request_Simple($action, $controller, $module, $params); return $this->pushStack($newRequest); diff --git a/library/vendor/Zend/Controller/Action/Helper/AjaxContext.php b/library/vendor/Zend/Controller/Action/Helper/AjaxContext.php index a66745225..42233cf44 100644 --- a/library/vendor/Zend/Controller/Action/Helper/AjaxContext.php +++ b/library/vendor/Zend/Controller/Action/Helper/AjaxContext.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Action_Helper_ContextSwitch */ -require_once 'Zend/Controller/Action/Helper/ContextSwitch.php'; /** * Simplify AJAX context switching based on requested format diff --git a/library/vendor/Zend/Controller/Action/Helper/AutoComplete/Abstract.php b/library/vendor/Zend/Controller/Action/Helper/AutoComplete/Abstract.php index 497511e6b..7664379bf 100644 --- a/library/vendor/Zend/Controller/Action/Helper/AutoComplete/Abstract.php +++ b/library/vendor/Zend/Controller/Action/Helper/AutoComplete/Abstract.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Create and send autocompletion lists @@ -71,7 +70,6 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_ /** * @see Zend_Layout */ - require_once 'Zend/Layout.php'; if (null !== ($layout = Zend_Layout::getMvcInstance())) { $layout->disableLayout(); } @@ -98,7 +96,6 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_ /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid data passed for autocompletion'); } diff --git a/library/vendor/Zend/Controller/Action/Helper/AutoCompleteDojo.php b/library/vendor/Zend/Controller/Action/Helper/AutoCompleteDojo.php index 629b3a359..17f8844b3 100644 --- a/library/vendor/Zend/Controller/Action/Helper/AutoCompleteDojo.php +++ b/library/vendor/Zend/Controller/Action/Helper/AutoCompleteDojo.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Action_Helper_AutoComplete_Abstract */ -require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php'; /** * Create and send Dojo-compatible autocompletion lists @@ -60,7 +59,6 @@ class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Act public function prepareAutoCompletion($data, $keepLayouts = false) { if (!$data instanceof Zend_Dojo_Data) { - require_once 'Zend/Dojo/Data.php'; $items = array(); foreach ($data as $key => $value) { $items[] = array('label' => $value, 'name' => $value); @@ -69,10 +67,8 @@ class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Act } if (!$keepLayouts) { - require_once 'Zend/Controller/Action/HelperBroker.php'; Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer')->setNoRender(true); - require_once 'Zend/Layout.php'; $layout = Zend_Layout::getMvcInstance(); if ($layout instanceof Zend_Layout) { $layout->disableLayout(); diff --git a/library/vendor/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php b/library/vendor/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php index a6ecbf82b..d7b25fc10 100644 --- a/library/vendor/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php +++ b/library/vendor/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Action_Helper_AutoComplete_Abstract */ -require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php'; /** * Create and send Scriptaculous-compatible autocompletion lists @@ -66,7 +65,6 @@ class Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Contr /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid data passed for autocompletion'); } diff --git a/library/vendor/Zend/Controller/Action/Helper/Cache.php b/library/vendor/Zend/Controller/Action/Helper/Cache.php index 3611e0b2f..fecd0080b 100644 --- a/library/vendor/Zend/Controller/Action/Helper/Cache.php +++ b/library/vendor/Zend/Controller/Action/Helper/Cache.php @@ -22,17 +22,14 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * @see Zend_Controller_Action_Exception */ -require_once 'Zend/Controller/Action/Exception.php'; /** * @see Zend_Cache_Manager */ -require_once 'Zend/Cache/Manager.php'; /** * @category Zend diff --git a/library/vendor/Zend/Controller/Action/Helper/ContextSwitch.php b/library/vendor/Zend/Controller/Action/Helper/ContextSwitch.php index 358eb3571..576f98e07 100644 --- a/library/vendor/Zend/Controller/Action/Helper/ContextSwitch.php +++ b/library/vendor/Zend/Controller/Action/Helper/ContextSwitch.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Simplify context switching based on requested format @@ -288,7 +287,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Layout */ - require_once 'Zend/Layout.php'; $layout = Zend_Layout::getMvcInstance(); if (null !== $layout) { $layout->disableLayout(); @@ -306,7 +304,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Invalid context callback registered for context "%s"', $context)); } } @@ -395,7 +392,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid suffix information provided in config'); case ($count < 2): $suffix = array_shift($suffixInfo); @@ -441,7 +437,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Cannot set suffix; invalid context type "%s"', $context)); } @@ -487,7 +482,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Cannot retrieve suffix; invalid context type "%s"', $type)); } @@ -528,7 +522,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Context "%s" does not exist', $context)); } @@ -556,7 +549,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Cannot add "%s" header to context "%s": already exists', $header, $context)); } @@ -725,7 +717,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Invalid trigger "%s"', $trigger)); } @@ -751,7 +742,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid callback specified'); } } @@ -898,7 +888,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Cannot set default context; invalid context type "%s"', $type)); } @@ -952,7 +941,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Cannot add context "%s"; already exists', $context)); } $context = (string) $context; @@ -1090,7 +1078,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Invalid postDispatch context callback registered for context "%s"', $context)); } } @@ -1117,11 +1104,9 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action * @see Zend_Json */ if(method_exists($view, 'getVars')) { - require_once 'Zend/Json.php'; $vars = Zend_Json::encode($view->getVars()); $this->getResponse()->setBody($vars); } else { - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('View does not implement the getVars() method needed to encode the view into JSON'); } } @@ -1254,7 +1239,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception("Invalid contexts found for controller"); } @@ -1272,7 +1256,6 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf("Invalid contexts found for action '%s'", $action)); } diff --git a/library/vendor/Zend/Controller/Action/Helper/FlashMessenger.php b/library/vendor/Zend/Controller/Action/Helper/FlashMessenger.php index fdfb579f1..a630f2873 100644 --- a/library/vendor/Zend/Controller/Action/Helper/FlashMessenger.php +++ b/library/vendor/Zend/Controller/Action/Helper/FlashMessenger.php @@ -22,12 +22,10 @@ /** * @see Zend_Session */ -require_once 'Zend/Session.php'; /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Flash Messenger - implement session-based messages diff --git a/library/vendor/Zend/Controller/Action/Helper/Json.php b/library/vendor/Zend/Controller/Action/Helper/Json.php index b6312cff6..32f5da930 100644 --- a/library/vendor/Zend/Controller/Action/Helper/Json.php +++ b/library/vendor/Zend/Controller/Action/Helper/Json.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Simplify AJAX context switching based on requested format @@ -68,7 +67,6 @@ class Zend_Controller_Action_Helper_Json extends Zend_Controller_Action_Helper_A /** * @see Zend_View_Helper_Json */ - require_once 'Zend/View/Helper/Json.php'; $jsonHelper = new Zend_View_Helper_Json(); $data = $jsonHelper->json($data, $keepLayouts, $encodeData); @@ -76,7 +74,6 @@ class Zend_Controller_Action_Helper_Json extends Zend_Controller_Action_Helper_A /** * @see Zend_Controller_Action_HelperBroker */ - require_once 'Zend/Controller/Action/HelperBroker.php'; Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer')->setNoRender(true); } diff --git a/library/vendor/Zend/Controller/Action/Helper/Redirector.php b/library/vendor/Zend/Controller/Action/Helper/Redirector.php index 9a43476c8..1a3c6d78f 100644 --- a/library/vendor/Zend/Controller/Action/Helper/Redirector.php +++ b/library/vendor/Zend/Controller/Action/Helper/Redirector.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * @category Zend @@ -92,7 +91,6 @@ class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_He { $code = (int)$code; if ((300 > $code) || (307 < $code) || (304 == $code) || (306 == $code)) { - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid redirect HTTP status code (' . $code . ')'); } @@ -528,7 +526,6 @@ class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_He return call_user_func_array(array($this, 'gotoSimpleAndExit'), $args); } - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Invalid method "%s" called on redirector', $method)); } } diff --git a/library/vendor/Zend/Controller/Action/Helper/Url.php b/library/vendor/Zend/Controller/Action/Helper/Url.php index a083f497b..c6aafe0c9 100644 --- a/library/vendor/Zend/Controller/Action/Helper/Url.php +++ b/library/vendor/Zend/Controller/Action/Helper/Url.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Helper for creating URLs for redirects and other tasks diff --git a/library/vendor/Zend/Controller/Action/Helper/ViewRenderer.php b/library/vendor/Zend/Controller/Action/Helper/ViewRenderer.php index 068d3c7db..0e3fc3237 100644 --- a/library/vendor/Zend/Controller/Action/Helper/ViewRenderer.php +++ b/library/vendor/Zend/Controller/Action/Helper/ViewRenderer.php @@ -23,12 +23,10 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * @see Zend_View */ -require_once 'Zend/View.php'; /** * View script integration @@ -245,7 +243,6 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_ /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('ViewRenderer cannot locate module directory for module "' . $module . '"'); } $this->_moduleDir = dirname($moduleDir); @@ -263,15 +260,12 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_ /** * @see Zend_Filter_Inflector */ - require_once 'Zend/Filter/Inflector.php'; /** * @see Zend_Filter_PregReplace */ - require_once 'Zend/Filter/PregReplace.php'; /** * @see Zend_Filter_Word_UnderscoreToSeparator */ - require_once 'Zend/Filter/Word/UnderscoreToSeparator.php'; $this->_inflector = new Zend_Filter_Inflector(); $this->_inflector->setStaticRuleReference('moduleDir', $this->_moduleDir) // moduleDir must be specified before the less specific 'module' ->addRules(array( @@ -471,7 +465,6 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_ /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('ViewRenderer initialization failed: retrieved view base path is empty'); } } diff --git a/library/vendor/Zend/Controller/Action/HelperBroker.php b/library/vendor/Zend/Controller/Action/HelperBroker.php index c232d0d11..40fabe372 100644 --- a/library/vendor/Zend/Controller/Action/HelperBroker.php +++ b/library/vendor/Zend/Controller/Action/HelperBroker.php @@ -23,12 +23,10 @@ /** * @see Zend_Controller_Action_HelperBroker_PriorityStack */ -require_once 'Zend/Controller/Action/HelperBroker/PriorityStack.php'; /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; /** * @category Zend @@ -67,7 +65,6 @@ class Zend_Controller_Action_HelperBroker public static function setPluginLoader($loader) { if ((null !== $loader) && (!$loader instanceof Zend_Loader_PluginLoader_Interface)) { - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid plugin loader provided to HelperBroker'); } self::$_pluginLoader = $loader; @@ -81,7 +78,6 @@ class Zend_Controller_Action_HelperBroker public static function getPluginLoader() { if (null === self::$_pluginLoader) { - require_once 'Zend/Loader/PluginLoader.php'; self::$_pluginLoader = new Zend_Loader_PluginLoader(array( 'Zend_Controller_Action_Helper' => 'Zend/Controller/Action/Helper/', )); @@ -179,7 +175,6 @@ class Zend_Controller_Action_HelperBroker $stack = self::getStack(); if (!isset($stack->{$name})) { - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Action helper "' . $name . '" has not been registered with the helper broker'); } @@ -322,7 +317,6 @@ class Zend_Controller_Action_HelperBroker { $helper = $this->getHelper($method); if (!method_exists($helper, 'direct')) { - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Helper "' . $method . '" does not support overloading via direct()'); } return call_user_func_array(array($helper, 'direct'), $args); @@ -365,14 +359,12 @@ class Zend_Controller_Action_HelperBroker try { $class = self::getPluginLoader()->load($name); } catch (Zend_Loader_PluginLoader_Exception $e) { - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Action Helper by name ' . $name . ' not found', 0, $e); } $helper = new $class(); if (!$helper instanceof Zend_Controller_Action_Helper_Abstract) { - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Helper name ' . $name . ' -> class ' . $class . ' is not of type Zend_Controller_Action_Helper_Abstract'); } diff --git a/library/vendor/Zend/Controller/Action/HelperBroker/PriorityStack.php b/library/vendor/Zend/Controller/Action/HelperBroker/PriorityStack.php index 2d1b4cb05..7f7f6bc15 100644 --- a/library/vendor/Zend/Controller/Action/HelperBroker/PriorityStack.php +++ b/library/vendor/Zend/Controller/Action/HelperBroker/PriorityStack.php @@ -117,7 +117,6 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre public function offsetGet($priorityOrHelperName) { if (!$this->offsetExists($priorityOrHelperName)) { - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('A helper with priority ' . $priorityOrHelperName . ' does not exist.'); } @@ -140,7 +139,6 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre $priority = (int) $priority; if (!$helper instanceof Zend_Controller_Action_Helper_Abstract) { - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('$helper must extend Zend_Controller_Action_Helper_Abstract.'); } @@ -175,7 +173,6 @@ class Zend_Controller_Action_HelperBroker_PriorityStack implements IteratorAggre public function offsetUnset($priorityOrHelperName) { if (!$this->offsetExists($priorityOrHelperName)) { - require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('A helper with priority or name ' . $priorityOrHelperName . ' does not exist.'); } diff --git a/library/vendor/Zend/Controller/Dispatcher/Abstract.php b/library/vendor/Zend/Controller/Dispatcher/Abstract.php index 0eb3f5b09..ac9108f18 100644 --- a/library/vendor/Zend/Controller/Dispatcher/Abstract.php +++ b/library/vendor/Zend/Controller/Dispatcher/Abstract.php @@ -21,7 +21,6 @@ */ /** Zend_Controller_Dispatcher_Interface */ -require_once 'Zend/Controller/Dispatcher/Interface.php'; /** * @category Zend @@ -144,14 +143,12 @@ abstract class Zend_Controller_Dispatcher_Abstract implements Zend_Controller_Di } if (!$allStrings) { - require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Word delimiter array must contain only strings'); } return $spec; } - require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Invalid word delimiter'); } @@ -206,7 +203,6 @@ abstract class Zend_Controller_Dispatcher_Abstract implements Zend_Controller_Di public function setPathDelimiter($spec) { if (!is_string($spec)) { - require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Invalid path delimiter'); } $this->_pathDelimiter = $spec; @@ -253,7 +249,6 @@ abstract class Zend_Controller_Dispatcher_Abstract implements Zend_Controller_Di public function getFrontController() { if (null === $this->_frontController) { - require_once 'Zend/Controller/Front.php'; $this->_frontController = Zend_Controller_Front::getInstance(); } diff --git a/library/vendor/Zend/Controller/Dispatcher/Exception.php b/library/vendor/Zend/Controller/Dispatcher/Exception.php index 96a9d4dc8..88fec2f5b 100644 --- a/library/vendor/Zend/Controller/Dispatcher/Exception.php +++ b/library/vendor/Zend/Controller/Dispatcher/Exception.php @@ -22,7 +22,6 @@ /** Zend_Controller_Exception */ -require_once 'Zend/Controller/Exception.php'; /** diff --git a/library/vendor/Zend/Controller/Dispatcher/Interface.php b/library/vendor/Zend/Controller/Dispatcher/Interface.php index 43215a5da..cd70607f1 100644 --- a/library/vendor/Zend/Controller/Dispatcher/Interface.php +++ b/library/vendor/Zend/Controller/Dispatcher/Interface.php @@ -23,12 +23,10 @@ /** * Zend_Controller_Request_Abstract */ -require_once 'Zend/Controller/Request/Abstract.php'; /** * Zend_Controller_Response_Abstract */ -require_once 'Zend/Controller/Response/Abstract.php'; /** * @package Zend_Controller diff --git a/library/vendor/Zend/Controller/Dispatcher/Standard.php b/library/vendor/Zend/Controller/Dispatcher/Standard.php index e211029a2..f84301a8e 100644 --- a/library/vendor/Zend/Controller/Dispatcher/Standard.php +++ b/library/vendor/Zend/Controller/Dispatcher/Standard.php @@ -21,10 +21,8 @@ */ /** Zend_Loader */ -require_once 'Zend/Loader.php'; /** Zend_Controller_Dispatcher_Abstract */ -require_once 'Zend/Controller/Dispatcher/Abstract.php'; /** * @category Zend @@ -102,7 +100,6 @@ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abs $this->addControllerDirectory($path, $module); } } else { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Controller directory spec must be either a string or an array'); } @@ -244,7 +241,6 @@ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abs if (!$this->isDispatchable($request)) { $controller = $request->getControllerName(); if (!$this->getParam('useDefaultControllerAlways') && !empty($controller)) { - require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Invalid controller specified (' . $request->getControllerName() . ')'); } @@ -281,7 +277,6 @@ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abs $controller = new $moduleClassName($request, $this->getResponse(), $this->getParams()); if (!($controller instanceof Zend_Controller_Action_Interface) && !($controller instanceof Zend_Controller_Action)) { - require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception( 'Controller "' . $moduleClassName . '" is not an instance of Zend_Controller_Action_Interface' ); @@ -356,12 +351,10 @@ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abs if (Zend_Loader::isReadable($loadFile)) { include_once $loadFile; } else { - require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Cannot load controller class "' . $className . '" from file "' . $loadFile . "'"); } if (!class_exists($finalClass, false)) { - require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Invalid controller class ("' . $finalClass . '")'); } @@ -400,7 +393,6 @@ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abs $this->_curModule = $this->_defaultModule; $this->_curDirectory = $controllerDirs[$this->_defaultModule]; } else { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('No default module defined for this application'); } diff --git a/library/vendor/Zend/Controller/Exception.php b/library/vendor/Zend/Controller/Exception.php index 88bcbc5b7..181e2d583 100644 --- a/library/vendor/Zend/Controller/Exception.php +++ b/library/vendor/Zend/Controller/Exception.php @@ -21,7 +21,6 @@ /** Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Controller/Front.php b/library/vendor/Zend/Controller/Front.php index 3cc11cfaf..30ca8488e 100644 --- a/library/vendor/Zend/Controller/Front.php +++ b/library/vendor/Zend/Controller/Front.php @@ -21,13 +21,10 @@ /** Zend_Loader */ -require_once 'Zend/Loader.php'; /** Zend_Controller_Action_HelperBroker */ -require_once 'Zend/Controller/Action/HelperBroker.php'; /** Zend_Controller_Plugin_Broker */ -require_once 'Zend/Controller/Plugin/Broker.php'; /** * @category Zend @@ -288,7 +285,6 @@ class Zend_Controller_Front try{ $dir = new DirectoryIterator($path); } catch(Exception $e) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception("Directory $path not readable", 0, $e); } foreach ($dir as $file) { @@ -444,13 +440,11 @@ class Zend_Controller_Front { if (is_string($request)) { if (!class_exists($request)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($request); } $request = new $request(); } if (!$request instanceof Zend_Controller_Request_Abstract) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid request class'); } @@ -486,14 +480,12 @@ class Zend_Controller_Front { if (is_string($router)) { if (!class_exists($router)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($router); } $router = new $router(); } if (!$router instanceof Zend_Controller_Router_Interface) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid router class'); } @@ -513,7 +505,6 @@ class Zend_Controller_Front public function getRouter() { if (null == $this->_router) { - require_once 'Zend/Controller/Router/Rewrite.php'; $this->setRouter(new Zend_Controller_Router_Rewrite()); } @@ -543,7 +534,6 @@ class Zend_Controller_Front public function setBaseUrl($base = null) { if (!is_string($base) && (null !== $base)) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Rewrite base must be a string'); } @@ -596,7 +586,6 @@ class Zend_Controller_Front * Instantiate the default dispatcher if one was not set. */ if (!$this->_dispatcher instanceof Zend_Controller_Dispatcher_Interface) { - require_once 'Zend/Controller/Dispatcher/Standard.php'; $this->_dispatcher = new Zend_Controller_Dispatcher_Standard(); } return $this->_dispatcher; @@ -618,13 +607,11 @@ class Zend_Controller_Front { if (is_string($response)) { if (!class_exists($response)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($response); } $response = new $response(); } if (!$response instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid response class'); } @@ -836,12 +823,10 @@ class Zend_Controller_Front { if (!$this->getParam('noErrorHandler') && !$this->_plugins->hasPlugin('Zend_Controller_Plugin_ErrorHandler')) { // Register with stack index of 100 - require_once 'Zend/Controller/Plugin/ErrorHandler.php'; $this->_plugins->registerPlugin(new Zend_Controller_Plugin_ErrorHandler(), 100); } if (!$this->getParam('noViewRenderer') && !Zend_Controller_Action_HelperBroker::hasHelper('viewRenderer')) { - require_once 'Zend/Controller/Action/Helper/ViewRenderer.php'; Zend_Controller_Action_HelperBroker::getStack()->offsetSet(-80, new Zend_Controller_Action_Helper_ViewRenderer()); } @@ -851,7 +836,6 @@ class Zend_Controller_Front if (null !== $request) { $this->setRequest($request); } elseif ((null === $request) && (null === ($request = $this->getRequest()))) { - require_once 'Zend/Controller/Request/Http.php'; $request = new Zend_Controller_Request_Http(); $this->setRequest($request); } @@ -871,7 +855,6 @@ class Zend_Controller_Front if (null !== $response) { $this->setResponse($response); } elseif ((null === $this->_response) && (null === ($this->_response = $this->getResponse()))) { - require_once 'Zend/Controller/Response/Http.php'; $response = new Zend_Controller_Response_Http(); $this->setResponse($response); } diff --git a/library/vendor/Zend/Controller/Plugin/ActionStack.php b/library/vendor/Zend/Controller/Plugin/ActionStack.php index 68a5cc7c3..1d1df1cd9 100644 --- a/library/vendor/Zend/Controller/Plugin/ActionStack.php +++ b/library/vendor/Zend/Controller/Plugin/ActionStack.php @@ -20,10 +20,8 @@ */ /** Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; /** Zend_Registry */ -require_once 'Zend/Registry.php'; /** * Manage a stack of actions @@ -209,7 +207,6 @@ class Zend_Controller_Plugin_ActionStack extends Zend_Controller_Plugin_Abstract $this->_saveStack($stack); if (!$next instanceof Zend_Controller_Request_Abstract) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('ArrayStack should only contain request objects'); } $action = $next->getActionName(); diff --git a/library/vendor/Zend/Controller/Plugin/Broker.php b/library/vendor/Zend/Controller/Plugin/Broker.php index b6c5d56a0..64bbdae3d 100644 --- a/library/vendor/Zend/Controller/Plugin/Broker.php +++ b/library/vendor/Zend/Controller/Plugin/Broker.php @@ -21,7 +21,6 @@ */ /** Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; /** * @category Zend @@ -51,7 +50,6 @@ class Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract public function registerPlugin(Zend_Controller_Plugin_Abstract $plugin, $stackIndex = null) { if (false !== array_search($plugin, $this->_plugins, true)) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Plugin already registered'); } @@ -59,7 +57,6 @@ class Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract if ($stackIndex) { if (isset($this->_plugins[$stackIndex])) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Plugin with stackIndex "' . $stackIndex . '" already registered'); } $this->_plugins[$stackIndex] = $plugin; @@ -97,7 +94,6 @@ class Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract // Given a plugin object, find it in the array $key = array_search($plugin, $this->_plugins, true); if (false === $key) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Plugin never registered.'); } unset($this->_plugins[$key]); diff --git a/library/vendor/Zend/Controller/Plugin/ErrorHandler.php b/library/vendor/Zend/Controller/Plugin/ErrorHandler.php index 2ea2627d4..9f850d3e2 100644 --- a/library/vendor/Zend/Controller/Plugin/ErrorHandler.php +++ b/library/vendor/Zend/Controller/Plugin/ErrorHandler.php @@ -20,7 +20,6 @@ */ /** Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; /** * Handle exceptions that bubble up based on missing controllers, actions, or diff --git a/library/vendor/Zend/Controller/Plugin/PutHandler.php b/library/vendor/Zend/Controller/Plugin/PutHandler.php index 329d38976..8bda14094 100644 --- a/library/vendor/Zend/Controller/Plugin/PutHandler.php +++ b/library/vendor/Zend/Controller/Plugin/PutHandler.php @@ -23,12 +23,10 @@ /** * @see Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; /** * @see Zend_Controller_Request_Http */ -require_once 'Zend/Controller/Request/Http.php'; /** * Plugin to digest PUT request body and make params available just like POST diff --git a/library/vendor/Zend/Controller/Request/Apache404.php b/library/vendor/Zend/Controller/Request/Apache404.php index 8c30bae3a..f2015da04 100644 --- a/library/vendor/Zend/Controller/Request/Apache404.php +++ b/library/vendor/Zend/Controller/Request/Apache404.php @@ -20,10 +20,8 @@ */ /** Zend_Controller_Request_Http */ -require_once 'Zend/Controller/Request/Http.php'; /** Zend_Uri */ -require_once 'Zend/Uri.php'; /** * Zend_Controller_Request_Apache404 diff --git a/library/vendor/Zend/Controller/Request/Exception.php b/library/vendor/Zend/Controller/Request/Exception.php index 97b4db100..9cbbdf693 100644 --- a/library/vendor/Zend/Controller/Request/Exception.php +++ b/library/vendor/Zend/Controller/Request/Exception.php @@ -22,7 +22,6 @@ /** Zend_Controller_Exception */ -require_once 'Zend/Controller/Exception.php'; /** diff --git a/library/vendor/Zend/Controller/Request/Http.php b/library/vendor/Zend/Controller/Request/Http.php index decfcb055..81f4122b7 100644 --- a/library/vendor/Zend/Controller/Request/Http.php +++ b/library/vendor/Zend/Controller/Request/Http.php @@ -20,10 +20,8 @@ */ /** @see Zend_Controller_Request_Abstract */ -require_once 'Zend/Controller/Request/Abstract.php'; /** @see Zend_Uri */ -require_once 'Zend/Uri.php'; /** * Zend_Controller_Request_Http @@ -121,7 +119,6 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract $this->setRequestUri($path); } else { - require_once 'Zend/Controller/Request/Exception.php'; throw new Zend_Controller_Request_Exception('Invalid URI provided to constructor'); } } else { @@ -186,7 +183,6 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract */ public function __set($key, $value) { - require_once 'Zend/Controller/Request/Exception.php'; throw new Zend_Controller_Request_Exception('Setting values in superglobals not allowed; please use setParam()'); } @@ -249,7 +245,6 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract public function setQuery($spec, $value = null) { if ((null === $value) && !is_array($spec)) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid value passed to setQuery(); must be either array of values or key/value pair'); } if ((null === $value) && is_array($spec)) { @@ -291,7 +286,6 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract public function setPost($spec, $value = null) { if ((null === $value) && !is_array($spec)) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid value passed to setPost(); must be either array of values or key/value pair'); } if ((null === $value) && is_array($spec)) { @@ -981,7 +975,6 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract public function getHeader($header) { if (empty($header)) { - require_once 'Zend/Controller/Request/Exception.php'; throw new Zend_Controller_Request_Exception('An HTTP header name is required'); } diff --git a/library/vendor/Zend/Controller/Request/HttpTestCase.php b/library/vendor/Zend/Controller/Request/HttpTestCase.php index 955b87714..a95e4598e 100644 --- a/library/vendor/Zend/Controller/Request/HttpTestCase.php +++ b/library/vendor/Zend/Controller/Request/HttpTestCase.php @@ -22,7 +22,6 @@ /** * @see Zend_Controller_Request_Http */ -require_once 'Zend/Controller/Request/Http.php'; /** * Zend_Controller_Request_HttpTestCase @@ -169,7 +168,6 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http { $type = strtoupper(trim((string) $type)); if (!in_array($type, $this->_validMethodTypes)) { - require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid request method specified'); } $this->_method = $type; diff --git a/library/vendor/Zend/Controller/Request/Simple.php b/library/vendor/Zend/Controller/Request/Simple.php index 319a297ae..bc61cbfad 100644 --- a/library/vendor/Zend/Controller/Request/Simple.php +++ b/library/vendor/Zend/Controller/Request/Simple.php @@ -21,7 +21,6 @@ */ /** Zend_Controller_Request_Abstract */ -require_once 'Zend/Controller/Request/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Controller/Response/Abstract.php b/library/vendor/Zend/Controller/Response/Abstract.php index 4fc49edaa..c6df02321 100644 --- a/library/vendor/Zend/Controller/Response/Abstract.php +++ b/library/vendor/Zend/Controller/Response/Abstract.php @@ -284,7 +284,6 @@ abstract class Zend_Controller_Response_Abstract public function setHttpResponseCode($code) { if (!is_int($code) || (100 > $code) || (599 < $code)) { - require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Invalid HTTP response code'); } @@ -319,7 +318,6 @@ abstract class Zend_Controller_Response_Abstract { $ok = headers_sent($file, $line); if ($ok && $throw && $this->headersSentThrowsException) { - require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Cannot send headers; headers already sent in ' . $file . ', line ' . $line); } @@ -485,7 +483,6 @@ abstract class Zend_Controller_Response_Abstract public function append($name, $content) { if (!is_string($name)) { - require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")'); } @@ -509,7 +506,6 @@ abstract class Zend_Controller_Response_Abstract public function prepend($name, $content) { if (!is_string($name)) { - require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")'); } @@ -536,12 +532,10 @@ abstract class Zend_Controller_Response_Abstract public function insert($name, $content, $parent = null, $before = false) { if (!is_string($name)) { - require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")'); } if ((null !== $parent) && !is_string($parent)) { - require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Invalid body segment parent key ("' . gettype($parent) . '")'); } diff --git a/library/vendor/Zend/Controller/Response/Cli.php b/library/vendor/Zend/Controller/Response/Cli.php index 389e92514..5a2fab4e5 100644 --- a/library/vendor/Zend/Controller/Response/Cli.php +++ b/library/vendor/Zend/Controller/Response/Cli.php @@ -21,7 +21,6 @@ /** Zend_Controller_Response_Abstract */ -require_once 'Zend/Controller/Response/Abstract.php'; /** diff --git a/library/vendor/Zend/Controller/Response/Exception.php b/library/vendor/Zend/Controller/Response/Exception.php index e45f07905..9f1d424ce 100644 --- a/library/vendor/Zend/Controller/Response/Exception.php +++ b/library/vendor/Zend/Controller/Response/Exception.php @@ -22,7 +22,6 @@ /** Zend_Controller_Exception */ -require_once 'Zend/Controller/Exception.php'; /** diff --git a/library/vendor/Zend/Controller/Response/Http.php b/library/vendor/Zend/Controller/Response/Http.php index 487c8fb06..3c888e9e7 100644 --- a/library/vendor/Zend/Controller/Response/Http.php +++ b/library/vendor/Zend/Controller/Response/Http.php @@ -21,7 +21,6 @@ /** Zend_Controller_Response_Abstract */ -require_once 'Zend/Controller/Response/Abstract.php'; /** diff --git a/library/vendor/Zend/Controller/Response/HttpTestCase.php b/library/vendor/Zend/Controller/Response/HttpTestCase.php index 72905b425..bd6f1226a 100644 --- a/library/vendor/Zend/Controller/Response/HttpTestCase.php +++ b/library/vendor/Zend/Controller/Response/HttpTestCase.php @@ -22,7 +22,6 @@ /** * @see Zend_Controller_Response_Http */ -require_once 'Zend/Controller/Response/Http.php'; /** * Zend_Controller_Response_HttpTestCase diff --git a/library/vendor/Zend/Controller/Router/Abstract.php b/library/vendor/Zend/Controller/Router/Abstract.php index 0bb9804db..19681ce12 100644 --- a/library/vendor/Zend/Controller/Router/Abstract.php +++ b/library/vendor/Zend/Controller/Router/Abstract.php @@ -22,7 +22,6 @@ /** Zend_Controller_Router_Interface */ -require_once 'Zend/Controller/Router/Interface.php'; /** * Simple first implementation of a router, to be replaced @@ -155,7 +154,6 @@ abstract class Zend_Controller_Router_Abstract implements Zend_Controller_Router return $this->_frontController; } - require_once 'Zend/Controller/Front.php'; $this->_frontController = Zend_Controller_Front::getInstance(); return $this->_frontController; } diff --git a/library/vendor/Zend/Controller/Router/Exception.php b/library/vendor/Zend/Controller/Router/Exception.php index b3d4cf7da..cb11aa430 100644 --- a/library/vendor/Zend/Controller/Router/Exception.php +++ b/library/vendor/Zend/Controller/Router/Exception.php @@ -22,7 +22,6 @@ /** Zend_Controller_Exception */ -require_once 'Zend/Controller/Exception.php'; /** diff --git a/library/vendor/Zend/Controller/Router/Rewrite.php b/library/vendor/Zend/Controller/Router/Rewrite.php index 2c58b1b36..cdd3add72 100644 --- a/library/vendor/Zend/Controller/Router/Rewrite.php +++ b/library/vendor/Zend/Controller/Router/Rewrite.php @@ -21,10 +21,8 @@ */ /** Zend_Controller_Router_Abstract */ -require_once 'Zend/Controller/Router/Abstract.php'; /** Zend_Controller_Router_Route */ -require_once 'Zend/Controller/Router/Route.php'; /** * Ruby routing based Router. @@ -92,7 +90,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract $dispatcher = $this->getFrontController()->getDispatcher(); $request = $this->getFrontController()->getRequest(); - require_once 'Zend/Controller/Router/Route/Module.php'; $compat = new Zend_Controller_Router_Route_Module(array(), $dispatcher, $request); $this->_routes = array('default' => $compat) + $this->_routes; @@ -163,7 +160,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract { if ($section !== null) { if ($config->{$section} === null) { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("No route configuration in section '{$section}'"); } @@ -175,7 +171,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract if ($route instanceof Zend_Controller_Router_Route_Chain) { if (!isset($info->chain)) { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("No chain defined"); } @@ -211,7 +206,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract { $class = (isset($info->type)) ? $info->type : 'Zend_Controller_Router_Route'; if (!class_exists($class)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } @@ -271,7 +265,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract public function removeRoute($name) { if (!isset($this->_routes[$name])) { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("Route $name is not defined"); } @@ -314,7 +307,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract public function getRoute($name) { if (!isset($this->_routes[$name])) { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("Route $name is not defined"); } @@ -330,7 +322,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract public function getCurrentRoute() { if (!isset($this->_currentRoute)) { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("Current route is not defined"); } return $this->getRoute($this->_currentRoute); @@ -345,7 +336,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract public function getCurrentRouteName() { if (!isset($this->_currentRoute)) { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("Current route is not defined"); } return $this->_currentRoute; @@ -371,7 +361,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract public function route(Zend_Controller_Request_Abstract $request) { if (!$request instanceof Zend_Controller_Request_Http) { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception('Zend_Controller_Router_Rewrite requires a Zend_Controller_Request_Http-based request object'); } @@ -404,7 +393,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract } if (!$routeMatched) { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception('No route matched the request', 404); } @@ -451,7 +439,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract public function assemble($userParams, $name = null, $reset = false, $encode = true) { if (!is_array($userParams)) { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception('userParams must be an array'); } diff --git a/library/vendor/Zend/Controller/Router/Route.php b/library/vendor/Zend/Controller/Router/Route.php index 36d2c1181..602077e1a 100644 --- a/library/vendor/Zend/Controller/Router/Route.php +++ b/library/vendor/Zend/Controller/Router/Route.php @@ -21,7 +21,6 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * Route @@ -350,7 +349,6 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract } elseif (array_key_exists($name, $this->_defaults)) { $value = $this->_defaults[$name]; } else { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception($name . ' is not specified'); } @@ -498,7 +496,6 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract } } - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception('Could not find a translator'); } diff --git a/library/vendor/Zend/Controller/Router/Route/Abstract.php b/library/vendor/Zend/Controller/Router/Route/Abstract.php index 53b811535..f5dde64f8 100644 --- a/library/vendor/Zend/Controller/Router/Route/Abstract.php +++ b/library/vendor/Zend/Controller/Router/Route/Abstract.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Router_Route_Interface */ -require_once 'Zend/Controller/Router/Route/Interface.php'; /** * Abstract Route @@ -111,7 +110,6 @@ abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_ */ public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = '/') { - require_once 'Zend/Controller/Router/Route/Chain.php'; $chain = new Zend_Controller_Router_Route_Chain(); $chain->chain($this)->chain($route, $separator); diff --git a/library/vendor/Zend/Controller/Router/Route/Chain.php b/library/vendor/Zend/Controller/Router/Route/Chain.php index 126964be1..cb115ab06 100644 --- a/library/vendor/Zend/Controller/Router/Route/Chain.php +++ b/library/vendor/Zend/Controller/Router/Route/Chain.php @@ -21,7 +21,6 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * Chain route is used for managing route chaining. diff --git a/library/vendor/Zend/Controller/Router/Route/Hostname.php b/library/vendor/Zend/Controller/Router/Route/Hostname.php index ad9fc986e..2884bc27f 100644 --- a/library/vendor/Zend/Controller/Router/Route/Hostname.php +++ b/library/vendor/Zend/Controller/Router/Route/Hostname.php @@ -21,7 +21,6 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * Hostname Route @@ -111,7 +110,6 @@ class Zend_Controller_Router_Route_Hostname extends Zend_Controller_Router_Route public function getRequest() { if ($this->_request === null) { - require_once 'Zend/Controller/Front.php'; $this->_request = Zend_Controller_Front::getInstance()->getRequest(); } @@ -271,7 +269,6 @@ class Zend_Controller_Router_Route_Hostname extends Zend_Controller_Router_Route } elseif (isset($this->_defaults[$name])) { $host[$key] = $this->_defaults[$name]; } else { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception($name . ' is not specified'); } } else { diff --git a/library/vendor/Zend/Controller/Router/Route/Interface.php b/library/vendor/Zend/Controller/Router/Route/Interface.php index 237c7c84c..cc2117fed 100644 --- a/library/vendor/Zend/Controller/Router/Route/Interface.php +++ b/library/vendor/Zend/Controller/Router/Route/Interface.php @@ -21,7 +21,6 @@ */ /** Zend_Config */ -require_once 'Zend/Config.php'; /** * @package Zend_Controller diff --git a/library/vendor/Zend/Controller/Router/Route/Module.php b/library/vendor/Zend/Controller/Router/Route/Module.php index 1c89699a4..3ae0dec02 100644 --- a/library/vendor/Zend/Controller/Router/Route/Module.php +++ b/library/vendor/Zend/Controller/Router/Route/Module.php @@ -21,7 +21,6 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * Module Route diff --git a/library/vendor/Zend/Controller/Router/Route/Regex.php b/library/vendor/Zend/Controller/Router/Route/Regex.php index 9a9c49430..ec3dfcee9 100644 --- a/library/vendor/Zend/Controller/Router/Route/Regex.php +++ b/library/vendor/Zend/Controller/Router/Route/Regex.php @@ -21,7 +21,6 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * Regex Route @@ -165,7 +164,6 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab public function assemble($data = array(), $reset = false, $encode = false, $partial = false) { if ($this->_reverse === null) { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception('Cannot assemble. Reversed route is not specified.'); } @@ -199,7 +197,6 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab $return = @vsprintf($this->_reverse, $mergedData); if ($return === false) { - require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception('Cannot assemble. Too few arguments?'); } diff --git a/library/vendor/Zend/Controller/Router/Route/Static.php b/library/vendor/Zend/Controller/Router/Route/Static.php index 8029acb6d..1bab7252e 100644 --- a/library/vendor/Zend/Controller/Router/Route/Static.php +++ b/library/vendor/Zend/Controller/Router/Route/Static.php @@ -21,7 +21,6 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * StaticRoute is used for managing static URIs. diff --git a/library/vendor/Zend/Crypt.php b/library/vendor/Zend/Crypt.php index c13453d27..6ad56b7d6 100644 --- a/library/vendor/Zend/Crypt.php +++ b/library/vendor/Zend/Crypt.php @@ -120,7 +120,6 @@ class Zend_Crypt /** * @see Zend_Crypt_Exception */ - require_once 'Zend/Crypt/Exception.php'; throw new Zend_Crypt_Exception('\'' . $algorithm . '\' is not supported by any available extension or native function'); } diff --git a/library/vendor/Zend/Crypt/DiffieHellman.php b/library/vendor/Zend/Crypt/DiffieHellman.php index 820ebf7e3..3c53c68e7 100644 --- a/library/vendor/Zend/Crypt/DiffieHellman.php +++ b/library/vendor/Zend/Crypt/DiffieHellman.php @@ -154,7 +154,6 @@ class Zend_Crypt_DiffieHellman $number = $this->_math->fromBinary($number); } if (!preg_match("/^\d+$/", $number)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number'); } $this->_publicKey = (string) $number; @@ -172,7 +171,6 @@ class Zend_Crypt_DiffieHellman public function getPublicKey($type = self::NUMBER) { if ($this->_publicKey === null) { - require_once 'Zend/Crypt/DiffieHellman/Exception.php'; throw new Zend_Crypt_DiffieHellman_Exception('A public key has not yet been generated using a prior call to generateKeys()'); } if ($type == self::BINARY) { @@ -206,7 +204,6 @@ class Zend_Crypt_DiffieHellman $publicKey = $this->_math->fromBinary($publicKey); } if (!preg_match("/^\d+$/", $publicKey)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number'); } if (function_exists('openssl_dh_compute_key') && self::$useOpenssl !== false) { @@ -227,7 +224,6 @@ class Zend_Crypt_DiffieHellman public function getSharedSecretKey($type = self::NUMBER) { if (!isset($this->_secretKey)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('A secret key has not yet been computed; call computeSecretKey()'); } if ($type == self::BINARY) { @@ -248,7 +244,6 @@ class Zend_Crypt_DiffieHellman public function setPrime($number) { if (!preg_match("/^\d+$/", $number) || $number < 11) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number or too small: should be a large natural number prime'); } $this->_prime = (string) $number; @@ -264,7 +259,6 @@ class Zend_Crypt_DiffieHellman public function getPrime() { if (!isset($this->_prime)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('No prime number has been set'); } return $this->_prime; @@ -280,7 +274,6 @@ class Zend_Crypt_DiffieHellman public function setGenerator($number) { if (!preg_match("/^\d+$/", $number) || $number < 2) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number greater than 1'); } $this->_generator = (string) $number; @@ -296,7 +289,6 @@ class Zend_Crypt_DiffieHellman public function getGenerator() { if (!isset($this->_generator)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('No generator number has been set'); } return $this->_generator; @@ -316,7 +308,6 @@ class Zend_Crypt_DiffieHellman $number = $this->_math->fromBinary($number); } if (!preg_match("/^\d+$/", $number)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number'); } $this->_privateKey = (string) $number; @@ -366,7 +357,6 @@ class Zend_Crypt_DiffieHellman /** * @see Zend_Crypt_Math */ - require_once 'Zend/Crypt/Math.php'; $this->_math = new Zend_Crypt_Math($extension); } diff --git a/library/vendor/Zend/Crypt/DiffieHellman/Exception.php b/library/vendor/Zend/Crypt/DiffieHellman/Exception.php index de552ab77..1a9f4a524 100644 --- a/library/vendor/Zend/Crypt/DiffieHellman/Exception.php +++ b/library/vendor/Zend/Crypt/DiffieHellman/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Crypt_Exception */ -require_once 'Zend/Crypt/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Crypt/Exception.php b/library/vendor/Zend/Crypt/Exception.php index dfd0c5bb9..5a5c8624d 100644 --- a/library/vendor/Zend/Crypt/Exception.php +++ b/library/vendor/Zend/Crypt/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Crypt/Hmac.php b/library/vendor/Zend/Crypt/Hmac.php index f73a84c87..9d9ecea47 100644 --- a/library/vendor/Zend/Crypt/Hmac.php +++ b/library/vendor/Zend/Crypt/Hmac.php @@ -23,7 +23,6 @@ /** * @see Zend_Crypt */ -require_once 'Zend/Crypt.php'; /** * PHP implementation of the RFC 2104 Hash based Message Authentication Code @@ -92,7 +91,6 @@ class Zend_Crypt_Hmac extends Zend_Crypt { // set the key if (!isset($key) || empty($key)) { - require_once 'Zend/Crypt/Hmac/Exception.php'; throw new Zend_Crypt_Hmac_Exception('provided key is null or empty'); } self::$_key = $key; @@ -114,7 +112,6 @@ class Zend_Crypt_Hmac extends Zend_Crypt protected static function _setHashAlgorithm($hash) { if (!isset($hash) || empty($hash)) { - require_once 'Zend/Crypt/Hmac/Exception.php'; throw new Zend_Crypt_Hmac_Exception('provided hash string is null or empty'); } @@ -130,7 +127,6 @@ class Zend_Crypt_Hmac extends Zend_Crypt } if ($hashSupported === false) { - require_once 'Zend/Crypt/Hmac/Exception.php'; throw new Zend_Crypt_Hmac_Exception('hash algorithm provided is not supported on this PHP installation; please enable the hash or mhash extensions'); } self::$_hashAlgorithm = $hash; diff --git a/library/vendor/Zend/Crypt/Hmac/Exception.php b/library/vendor/Zend/Crypt/Hmac/Exception.php index 3bb97ada3..a3d2efcbd 100644 --- a/library/vendor/Zend/Crypt/Hmac/Exception.php +++ b/library/vendor/Zend/Crypt/Hmac/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Crypt_Exception */ -require_once 'Zend/Crypt/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Crypt/Math.php b/library/vendor/Zend/Crypt/Math.php index 40395f520..783e48242 100644 --- a/library/vendor/Zend/Crypt/Math.php +++ b/library/vendor/Zend/Crypt/Math.php @@ -23,7 +23,6 @@ /** * @see Zend_Crypt_Math_BigInteger */ -require_once 'Zend/Crypt/Math/BigInteger.php'; /** * @category Zend diff --git a/library/vendor/Zend/Crypt/Math/BigInteger.php b/library/vendor/Zend/Crypt/Math/BigInteger.php index b7cd6205b..9af7f1822 100644 --- a/library/vendor/Zend/Crypt/Math/BigInteger.php +++ b/library/vendor/Zend/Crypt/Math/BigInteger.php @@ -62,7 +62,6 @@ class Zend_Crypt_Math_BigInteger public function __construct($extension = null) { if ($extension !== null && !in_array($extension, array('bcmath', 'gmp', 'bigint'))) { - require_once('Zend/Crypt/Math/BigInteger/Exception.php'); throw new Zend_Crypt_Math_BigInteger_Exception('Invalid extension type; please use one of bcmath, gmp or bigint'); } $this->_loadAdapter($extension); @@ -79,7 +78,6 @@ class Zend_Crypt_Math_BigInteger public function __call($methodName, $args) { if(!method_exists($this->_math, $methodName)) { - require_once 'Zend/Crypt/Math/BigInteger/Exception.php'; throw new Zend_Crypt_Math_BigInteger_Exception('invalid method call: ' . get_class($this->_math) . '::' . $methodName . '() does not exist'); } return call_user_func_array(array($this->_math, $methodName), $args); @@ -101,16 +99,12 @@ class Zend_Crypt_Math_BigInteger } } if($extension == 'gmp' && extension_loaded('gmp')) { - require_once 'Zend/Crypt/Math/BigInteger/Gmp.php'; $this->_math = new Zend_Crypt_Math_BigInteger_Gmp(); //} elseif($extension == 'bigint' && extension_loaded('big_int')) { - // require_once 'Zend/Crypt_Math/BigInteger/Bigint.php'; // $this->_math = new Zend_Crypt_Math_BigInteger_Bigint(); } elseif ($extension == 'bcmath' && extension_loaded('bcmath')) { - require_once 'Zend/Crypt/Math/BigInteger/Bcmath.php'; $this->_math = new Zend_Crypt_Math_BigInteger_Bcmath(); } else { - require_once 'Zend/Crypt/Math/BigInteger/Exception.php'; throw new Zend_Crypt_Math_BigInteger_Exception($extension . ' big integer precision math support not detected'); } } diff --git a/library/vendor/Zend/Crypt/Math/BigInteger/Bcmath.php b/library/vendor/Zend/Crypt/Math/BigInteger/Bcmath.php index 13d33c444..2d6def83c 100644 --- a/library/vendor/Zend/Crypt/Math/BigInteger/Bcmath.php +++ b/library/vendor/Zend/Crypt/Math/BigInteger/Bcmath.php @@ -23,7 +23,6 @@ /** * @see Zend_Crypt_Math_BigInteger_Interface */ -require_once 'Zend/Crypt/Math/BigInteger/Interface.php'; /** * Support for arbitrary precision mathematics in PHP. diff --git a/library/vendor/Zend/Crypt/Math/BigInteger/Exception.php b/library/vendor/Zend/Crypt/Math/BigInteger/Exception.php index 6c4ef3b6d..f5db754a8 100644 --- a/library/vendor/Zend/Crypt/Math/BigInteger/Exception.php +++ b/library/vendor/Zend/Crypt/Math/BigInteger/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Crypt_Math_Exception */ -require_once 'Zend/Crypt/Math/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Crypt/Math/BigInteger/Gmp.php b/library/vendor/Zend/Crypt/Math/BigInteger/Gmp.php index 5c7c645ca..4d7488f6a 100644 --- a/library/vendor/Zend/Crypt/Math/BigInteger/Gmp.php +++ b/library/vendor/Zend/Crypt/Math/BigInteger/Gmp.php @@ -23,7 +23,6 @@ /** * @see Zend_Crypt_Math_BigInteger_Interface */ -require_once 'Zend/Crypt/Math/BigInteger/Interface.php'; /** * Support for arbitrary precision mathematics in PHP. diff --git a/library/vendor/Zend/Crypt/Math/Exception.php b/library/vendor/Zend/Crypt/Math/Exception.php index 2b9d9dc2c..1ec8a7a79 100644 --- a/library/vendor/Zend/Crypt/Math/Exception.php +++ b/library/vendor/Zend/Crypt/Math/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Crypt_Exception */ -require_once 'Zend/Crypt/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Crypt/Rsa.php b/library/vendor/Zend/Crypt/Rsa.php index f17da55cc..1eb9d7c6a 100644 --- a/library/vendor/Zend/Crypt/Rsa.php +++ b/library/vendor/Zend/Crypt/Rsa.php @@ -23,12 +23,10 @@ /** * @see Zend_Crypt_Rsa_Key_Private */ -require_once 'Zend/Crypt/Rsa/Key/Private.php'; /** * @see Zend_Crypt_Rsa_Key_Public */ -require_once 'Zend/Crypt/Rsa/Key/Public.php'; /** * @category Zend @@ -70,7 +68,6 @@ class Zend_Crypt_Rsa public function __construct(array $options = null) { if (!extension_loaded('openssl')) { - require_once 'Zend/Crypt/Rsa/Exception.php'; throw new Zend_Crypt_Rsa_Exception('Zend_Crypt_Rsa requires openssl extension to be loaded.'); } @@ -223,7 +220,6 @@ class Zend_Crypt_Rsa $publicKey = null; $resource = openssl_pkey_new($config); if (!$resource) { - require_once 'Zend/Crypt/Rsa/Exception.php'; throw new Zend_Crypt_Rsa_Exception('Failed to generate a new private key'); } // above fails on PHP 5.3 diff --git a/library/vendor/Zend/Crypt/Rsa/Exception.php b/library/vendor/Zend/Crypt/Rsa/Exception.php index 0ae6e25ff..a0f1fbb03 100644 --- a/library/vendor/Zend/Crypt/Rsa/Exception.php +++ b/library/vendor/Zend/Crypt/Rsa/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Crypt_Exception */ -require_once 'Zend/Crypt/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Crypt/Rsa/Key.php b/library/vendor/Zend/Crypt/Rsa/Key.php index c26098506..f558ff637 100644 --- a/library/vendor/Zend/Crypt/Rsa/Key.php +++ b/library/vendor/Zend/Crypt/Rsa/Key.php @@ -71,7 +71,6 @@ class Zend_Crypt_Rsa_Key implements Countable /** * @see Zend_Crypt_Exception */ - require_once 'Zend/Crypt/Exception.php'; throw new Zend_Crypt_Exception('No public key string representation is available'); } diff --git a/library/vendor/Zend/Crypt/Rsa/Key/Private.php b/library/vendor/Zend/Crypt/Rsa/Key/Private.php index 405b5b6a1..47b7a8773 100644 --- a/library/vendor/Zend/Crypt/Rsa/Key/Private.php +++ b/library/vendor/Zend/Crypt/Rsa/Key/Private.php @@ -23,7 +23,6 @@ /** * @see Zend_Crypt_Rsa_Key */ -require_once 'Zend/Crypt/Rsa/Key.php'; /** * @category Zend @@ -53,7 +52,6 @@ class Zend_Crypt_Rsa_Key_Private extends Zend_Crypt_Rsa_Key /** * @see Zend_Crypt_Exception */ - require_once 'Zend/Crypt/Exception.php'; throw new Zend_Crypt_Exception('Unable to load private key'); } $this->_opensslKeyResource = $result; @@ -66,7 +64,6 @@ class Zend_Crypt_Rsa_Key_Private extends Zend_Crypt_Rsa_Key /** * @see Zend_Crypt_Rsa_Key_Public */ - require_once 'Zend/Crypt/Rsa/Key/Public.php'; $this->_publicKey = new Zend_Crypt_Rsa_Key_Public($this->_details['key']); } return $this->_publicKey; diff --git a/library/vendor/Zend/Crypt/Rsa/Key/Public.php b/library/vendor/Zend/Crypt/Rsa/Key/Public.php index accbe5322..439787a07 100644 --- a/library/vendor/Zend/Crypt/Rsa/Key/Public.php +++ b/library/vendor/Zend/Crypt/Rsa/Key/Public.php @@ -23,7 +23,6 @@ /** * @see Zend_Crypt_Rsa_Key */ -require_once 'Zend/Crypt/Rsa/Key.php'; /** * @category Zend @@ -57,7 +56,6 @@ class Zend_Crypt_Rsa_Key_Public extends Zend_Crypt_Rsa_Key /** * @see Zend_Crypt_Exception */ - require_once 'Zend/Crypt/Exception.php'; throw new Zend_Crypt_Exception('Unable to load public key'); } //openssl_pkey_export($result, $public); diff --git a/library/vendor/Zend/Currency.php b/library/vendor/Zend/Currency.php index 8657dd80b..15f26a70c 100644 --- a/library/vendor/Zend/Currency.php +++ b/library/vendor/Zend/Currency.php @@ -22,9 +22,6 @@ /** * include needed classes */ -require_once 'Zend/Locale.php'; -require_once 'Zend/Locale/Data.php'; -require_once 'Zend/Locale/Format.php'; /** * Class for handling currency notations @@ -120,7 +117,6 @@ class Zend_Currency } if (($this->_options['currency'] === null) and ($this->_options['name'] === null)) { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("Currency '$options' not found"); } @@ -162,7 +158,6 @@ class Zend_Currency // Validate the passed number if (!(isset($value)) or (is_numeric($value) === false)) { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("Value '$value' has to be numeric"); } @@ -315,7 +310,6 @@ class Zend_Currency if ((Zend_Locale::isLocale($locale, true, false)) and (strlen($locale) > 4)) { $country = substr($locale, (strpos($locale, '_') + 1)); } else { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("No region found within the locale '" . (string) $locale . "'"); } @@ -436,7 +430,6 @@ class Zend_Currency } if (empty($currency) === true) { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception('No currency defined'); } @@ -551,17 +544,14 @@ class Zend_Currency */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; try { $locale = Zend_Locale::findLocale($locale); if (strlen($locale) > 4) { $this->_options['locale'] = $locale; } else { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("No region found within the locale '" . (string) $locale . "'"); } } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception($e->getMessage()); } @@ -768,7 +758,6 @@ class Zend_Currency if ($currency !== $this->getShortName()) { $service = $this->getService(); if (!($service instanceof Zend_Currency_CurrencyInterface)) { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception('No exchange service applied'); } @@ -798,7 +787,6 @@ class Zend_Currency public function setService($service) { if (is_string($service)) { - require_once 'Zend/Loader.php'; if (!class_exists($service)) { $file = str_replace('_', DIRECTORY_SEPARATOR, $service) . '.php'; if (Zend_Loader::isReadable($file)) { @@ -810,7 +798,6 @@ class Zend_Currency } if (!($service instanceof Zend_Currency_CurrencyInterface)) { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception('A currency service must implement Zend_Currency_CurrencyInterface'); } @@ -847,7 +834,6 @@ class Zend_Currency switch($name) { case 'position': if (($value !== self::STANDARD) and ($value !== self::RIGHT) and ($value !== self::LEFT)) { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("Unknown position '" . $value . "'"); } @@ -856,7 +842,6 @@ class Zend_Currency case 'format': if ((empty($value) === false) and (Zend_Locale::isLocale($value, null, false) === false)) { if (!is_string($value) || (strpos($value, '0') === false)) { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("'" . ((gettype($value) === 'object') ? get_class($value) : $value) . "' is no format token"); @@ -867,7 +852,6 @@ class Zend_Currency case 'display': if (is_numeric($value) and ($value !== self::NO_SYMBOL) and ($value !== self::USE_SYMBOL) and ($value !== self::USE_SHORTNAME) and ($value !== self::USE_NAME)) { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("Unknown display '$value'"); } break; @@ -878,7 +862,6 @@ class Zend_Currency } if (($value < -1) or ($value > 30)) { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("'$value' precision has to be between -1 and 30."); } break; @@ -887,7 +870,6 @@ class Zend_Currency try { Zend_Locale_Format::convertNumerals(0, $options['script']); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception($e->getMessage()); } break; diff --git a/library/vendor/Zend/Currency/Exception.php b/library/vendor/Zend/Currency/Exception.php index bb307945a..0694646e0 100644 --- a/library/vendor/Zend/Currency/Exception.php +++ b/library/vendor/Zend/Currency/Exception.php @@ -22,7 +22,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Exception class for Zend_Currency diff --git a/library/vendor/Zend/Date.php b/library/vendor/Zend/Date.php index 08c7d74ea..b21a6c5ed 100644 --- a/library/vendor/Zend/Date.php +++ b/library/vendor/Zend/Date.php @@ -22,10 +22,6 @@ /** * Include needed Date classes */ -require_once 'Zend/Date/DateObject.php'; -require_once 'Zend/Locale.php'; -require_once 'Zend/Locale/Format.php'; -require_once 'Zend/Locale/Math.php'; /** * @category Zend @@ -248,19 +244,16 @@ class Zend_Date extends Zend_Date_DateObject switch($name) { case 'format_type' : if ((strtolower($value) != 'php') && (strtolower($value) != 'iso')) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("Unknown format type ($value) for dates, only 'iso' and 'php' supported", 0, null, $value); } break; case 'fix_dst' : if (!is_bool($value)) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("'fix_dst' has to be boolean", 0, null, $value); } break; case 'extend_month' : if (!is_bool($value)) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("'extend_month' has to be boolean", 0, null, $value); } break; @@ -269,7 +262,6 @@ class Zend_Date extends Zend_Date_DateObject parent::$_cache = null; } else { if (!$value instanceof Zend_Cache_Core) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("Instance of Zend_Cache expected"); } @@ -283,7 +275,6 @@ class Zend_Date extends Zend_Date_DateObject parent::$_defaultOffset = 0; } else { if (!$value instanceof Zend_TimeSync_Protocol) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("Instance of Zend_TimeSync expected"); } @@ -295,7 +286,6 @@ class Zend_Date extends Zend_Date_DateObject self::$_options[$name] = $value; } else { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("Unknown option: $name = $value"); } } @@ -334,7 +324,6 @@ class Zend_Date extends Zend_Date_DateObject if (isset($stamp['timestamp']) === true) { $stamp = $stamp['timestamp']; } else { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('no timestamp given in array'); } } @@ -1030,7 +1019,6 @@ class Zend_Date extends Zend_Date_DateObject return 12; default: - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('Month ($name) is not a known month'); } } @@ -1288,7 +1276,6 @@ class Zend_Date extends Zend_Date_DateObject private function _calculate($calc, $date, $part, $locale) { if ($date === null) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $date must be set, null is not allowed'); } @@ -1407,7 +1394,6 @@ class Zend_Date extends Zend_Date_DateObject } break; default: - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("datepart for part ($part) not found in array"); break; } @@ -1451,7 +1437,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, 1, 1 + intval($day), 1970, true), $hour); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date); break; @@ -1475,7 +1460,6 @@ class Zend_Date extends Zend_Date_DateObject } // Weekday not found - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; @@ -1485,7 +1469,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, 1, 1 + intval($day), 1970, true), $hour); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date); break; @@ -1509,7 +1492,6 @@ class Zend_Date extends Zend_Date_DateObject } // Weekday not found - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; @@ -1521,12 +1503,10 @@ class Zend_Date extends Zend_Date_DateObject } // Weekday not found - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; case self::DAY_SUFFIX: - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('day suffix not supported', 0, null, $date); break; @@ -1538,7 +1518,6 @@ class Zend_Date extends Zend_Date_DateObject } // Weekday not found - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; @@ -1554,7 +1533,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, $month, $day, $year, true), $hour); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date); break; @@ -1577,7 +1555,6 @@ class Zend_Date extends Zend_Date_DateObject } // Weekday not found - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; @@ -1600,7 +1577,6 @@ class Zend_Date extends Zend_Date_DateObject } // Weekday not found - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; @@ -1612,7 +1588,6 @@ class Zend_Date extends Zend_Date_DateObject parent::mktime(0, 0, 0, 1, 1 + ($week * 7), 1970, true), $hour); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, week expected", 0, null, $date); break; @@ -1656,7 +1631,6 @@ class Zend_Date extends Zend_Date_DateObject } // Monthname not found - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; @@ -1686,7 +1660,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, $month, $day, $year, true), $hour); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; @@ -1729,7 +1702,6 @@ class Zend_Date extends Zend_Date_DateObject } // Monthname not found - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; @@ -1760,12 +1732,10 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, $month, $day, $year, true), $hour); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; case self::MONTH_DAYS: - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('month days not supported', 0, null, $date); break; @@ -1808,13 +1778,11 @@ class Zend_Date extends Zend_Date_DateObject } // Monthname not found - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; // year formats case self::LEAPYEAR: - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('leap year not supported', 0, null, $date); break; @@ -1832,7 +1800,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, $month, $day, $year, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; @@ -1850,7 +1817,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, $month, $day, $year, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; @@ -1872,7 +1838,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, $month, $day, $year, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; @@ -1894,13 +1859,11 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, $month, $day, $year, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; // time formats case self::MERIDIEM: - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('meridiem not supported', 0, null, $date); break; @@ -1916,7 +1879,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, $minute, $second, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, swatchstamp expected", 0, null, $date); break; @@ -1926,7 +1888,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; @@ -1936,7 +1897,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; @@ -1946,7 +1906,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; @@ -1956,7 +1915,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; @@ -1966,7 +1924,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, $minute, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, minute expected", 0, null, $date); break; @@ -1976,7 +1933,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, $second, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, second expected", 0, null, $date); break; @@ -1997,7 +1953,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->compareMillisecond($date); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, milliseconds expected", 0, null, $date); break; @@ -2007,7 +1962,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, $minute, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, minute expected", 0, null, $date); break; @@ -2017,7 +1971,6 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, $second, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, second expected", 0, null, $date); break; @@ -2026,18 +1979,15 @@ class Zend_Date extends Zend_Date_DateObject case self::TIMEZONE_NAME: case self::TIMEZONE: case self::TIMEZONE_SECS: - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('timezone not supported', 0, null, $date); break; case self::DAYLIGHT: - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('daylight not supported', 0, null, $date); break; case self::GMT_DIFF: case self::GMT_DIFF_SEP: - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('gmtdiff not supported', 0, null, $date); break; @@ -2071,7 +2021,6 @@ class Zend_Date extends Zend_Date_DateObject preg_match('/[T,\s]{0,1}(\d{2})(\d{2})(\d{2})/', $tmpdate, $timematch); } if (empty($datematch) and empty($timematch)) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("unsupported ISO8601 format ($date)", 0, null, $date); } if (!empty($timematch)) { @@ -2112,7 +2061,6 @@ class Zend_Date extends Zend_Date_DateObject . '{1}\d{4}|\w{1,20})$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no RFC 2822 format ($date)", 0, null, $date); } @@ -2135,7 +2083,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $date, $this->getUnixTimestamp()); } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, timestamp expected", 0, null, $date); break; @@ -2143,7 +2090,6 @@ class Zend_Date extends Zend_Date_DateObject // break intentionally omitted case self::ERA: case self::ERA_NAME: - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('era not supported', 0, null, $date); break; @@ -2163,7 +2109,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2184,7 +2129,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2205,7 +2149,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2226,7 +2169,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2249,7 +2191,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2265,7 +2206,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true), $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2287,7 +2227,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true), $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2304,7 +2243,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true), $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2321,7 +2259,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true), $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2343,7 +2280,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true), $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2362,7 +2298,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2388,7 +2323,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2409,7 +2343,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2429,7 +2362,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2457,7 +2389,6 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2467,7 +2398,6 @@ class Zend_Date extends Zend_Date_DateObject case self::RFC_3339: $result = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\d{0,4}([+-]{1}\d{2}:\d{2}|Z)$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, ATOM format expected", 0, null, $date); } @@ -2486,7 +2416,6 @@ class Zend_Date extends Zend_Date_DateObject case self::COOKIE: $result = preg_match("/^\w{6,9},\s(\d{2})-(\w{3})-(\d{2})\s(\d{2}):(\d{2}):(\d{2})\s.{3,20}$/", $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, COOKIE format expected", 0, null, $date); } $matchStartPos = iconv_strpos($match[0], ' ', 0, 'UTF-8') + 1; @@ -2515,7 +2444,6 @@ class Zend_Date extends Zend_Date_DateObject // new RFC 822 format, identical to RFC 1036 standard $result = preg_match('/^\w{0,3},{0,1}\s{0,1}(\d{1,2})\s(\w{3})\s(\d{2})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4}|\w{1,20})$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, RFC 822 date format expected", 0, null, $date); } @@ -2537,7 +2465,6 @@ class Zend_Date extends Zend_Date_DateObject case self::RFC_850: $result = preg_match('/^\w{6,9},\s(\d{2})-(\w{3})-(\d{2})\s(\d{2}):(\d{2}):(\d{2})\s.{3,21}$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, RFC 850 date format expected", 0, null, $date); } @@ -2559,7 +2486,6 @@ class Zend_Date extends Zend_Date_DateObject case self::RFC_1123: $result = preg_match('/^\w{0,3},{0,1}\s{0,1}(\d{1,2})\s(\w{3})\s(\d{2,4})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4}|\w{1,20})$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, RFC 1123 date format expected", 0, null, $date); } @@ -2580,7 +2506,6 @@ class Zend_Date extends Zend_Date_DateObject case self::RSS: $result = preg_match('/^\w{3},\s(\d{2})\s(\w{3})\s(\d{2,4})\s(\d{1,2}):(\d{2}):(\d{2})\s.{1,21}$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, RSS date format expected", 0, null, $date); } @@ -2602,7 +2527,6 @@ class Zend_Date extends Zend_Date_DateObject case self::W3C: $result = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})[+-]{1}\d{2}:\d{2}$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, W3C date format expected", 0, null, $date); } @@ -2659,7 +2583,6 @@ class Zend_Date extends Zend_Date_DateObject false), $this->getUnixTimestamp(), false); } catch (Zend_Locale_Exception $e) { if (!is_numeric($date)) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } } @@ -2769,7 +2692,6 @@ class Zend_Date extends Zend_Date_DateObject private function _time($calc, $time, $format, $locale) { if ($time === null) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $time must be set, null is not allowed'); } @@ -2782,7 +2704,6 @@ class Zend_Date extends Zend_Date_DateObject (isset($time['second']) === true)) { $parsed = $time; } else { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no hour, minute or second given in array"); } } else { @@ -2796,7 +2717,6 @@ class Zend_Date extends Zend_Date_DateObject $parsed = Zend_Locale_Format::getTime($time, array('date_format' => $format, 'locale' => $locale, 'format_type' => 'iso')); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e); } } @@ -2931,7 +2851,6 @@ class Zend_Date extends Zend_Date_DateObject private function _date($calc, $date, $format, $locale) { if ($date === null) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $date must be set, null is not allowed'); } @@ -2944,7 +2863,6 @@ class Zend_Date extends Zend_Date_DateObject (isset($date['day']) === true)) { $parsed = $date; } else { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no day,month or year given in array"); } } else { @@ -2961,7 +2879,6 @@ class Zend_Date extends Zend_Date_DateObject $parsed['year'] = self::getFullYear($parsed['year']); } } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e); } } @@ -3245,15 +3162,12 @@ class Zend_Date extends Zend_Date_DateObject private function _checkLocation($location) { if (!isset($location['longitude']) or !isset($location['latitude'])) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('Location must include \'longitude\' and \'latitude\'', 0, null, $location); } if (($location['longitude'] > 180) or ($location['longitude'] < -180)) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('Longitude must be between -180 and 180', 0, null, $location); } if (($location['latitude'] > 90) or ($location['latitude'] < -90)) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('Latitude must be between -90 and 90', 0, null, $location); } @@ -3375,13 +3289,11 @@ class Zend_Date extends Zend_Date_DateObject if (isset($year['year']) === true) { $year = $year['year']; } else { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no year given in array"); } } if (!is_numeric($year)) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("year ($year) has to be integer for checkLeapYear()", 0, null, $year); } @@ -3507,7 +3419,6 @@ class Zend_Date extends Zend_Date_DateObject private function _calcvalue($calc, $value, $type, $parameter, $locale) { if ($value === null) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("parameter $type must be set, null is not allowed"); } @@ -3519,7 +3430,6 @@ class Zend_Date extends Zend_Date_DateObject // extract value from object $value = $value->toString($parameter, 'iso', $locale); } else if (!is_array($value) && !is_numeric($value) && ($type != 'iso') && ($type != 'arpa')) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid $type ($value) operand", 0, null, $value); } @@ -3654,7 +3564,6 @@ class Zend_Date extends Zend_Date_DateObject private function _month($calc, $month, $locale) { if ($month === null) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $month must be set, null is not allowed'); } @@ -3672,7 +3581,6 @@ class Zend_Date extends Zend_Date_DateObject if (isset($month['month']) === true) { $month = $month['month']; } else { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no month given in array"); } } else { @@ -3699,7 +3607,6 @@ class Zend_Date extends Zend_Date_DateObject } } if ($found == 0) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("unknown month name ($month)", 0, null, $month); } } @@ -3809,7 +3716,6 @@ class Zend_Date extends Zend_Date_DateObject private function _day($calc, $day, $locale) { if ($day === null) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $day must be set, null is not allowed'); } @@ -3828,7 +3734,6 @@ class Zend_Date extends Zend_Date_DateObject $day = $day['day']; $type = self::WEEKDAY; } else { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no day given in array"); } } else { @@ -3959,7 +3864,6 @@ class Zend_Date extends Zend_Date_DateObject private function _weekday($calc, $weekday, $locale) { if ($weekday === null) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $weekday must be set, null is not allowed'); } @@ -3978,7 +3882,6 @@ class Zend_Date extends Zend_Date_DateObject $weekday = $weekday['weekday']; $type = self::WEEKDAY; } else { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no weekday given in array"); } } else { @@ -4438,7 +4341,6 @@ class Zend_Date extends Zend_Date_DateObject public function setFractionalPrecision($precision) { if (!intval($precision) or ($precision < 0) or ($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); } @@ -4479,7 +4381,6 @@ class Zend_Date extends Zend_Date_DateObject $milli = intval($milli); $precision = 6; } else if (!is_numeric($milli)) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli); } @@ -4488,7 +4389,6 @@ class Zend_Date extends Zend_Date_DateObject } 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); } @@ -4511,7 +4411,6 @@ class Zend_Date extends Zend_Date_DateObject list($milli, $time) = explode(" ", microtime()); $milli = intval($milli); } else if (!is_numeric($milli)) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli); } @@ -4524,7 +4423,6 @@ class Zend_Date extends Zend_Date_DateObject } 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 ); @@ -4590,19 +4488,16 @@ class Zend_Date extends Zend_Date_DateObject list($milli, $time) = explode(" ", microtime()); $milli = intval($milli); } else if (is_numeric($milli) === false) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli); } if ($precision === null) { $precision = strlen($milli); } else 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); } if ($precision === 0) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('precision is 0'); } @@ -4719,7 +4614,6 @@ class Zend_Date extends Zend_Date_DateObject try { $this->_locale = Zend_Locale::findLocale($locale); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e); } diff --git a/library/vendor/Zend/Date/Cities.php b/library/vendor/Zend/Date/Cities.php index ca2ec2ea8..b5e737eb7 100644 --- a/library/vendor/Zend/Date/Cities.php +++ b/library/vendor/Zend/Date/Cities.php @@ -306,7 +306,6 @@ class Zend_Date_Cities return $return; } } - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('unknown city'); } diff --git a/library/vendor/Zend/Date/DateObject.php b/library/vendor/Zend/Date/DateObject.php index 06c735054..984d11fb2 100644 --- a/library/vendor/Zend/Date/DateObject.php +++ b/library/vendor/Zend/Date/DateObject.php @@ -85,7 +85,6 @@ abstract class Zend_Date_DateObject { } else if ($timestamp === null) { $this->_unixTimestamp = time(); } else { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('\'' . $timestamp . '\' is not a valid UNIX timestamp', 0, null, $timestamp); } @@ -1021,7 +1020,6 @@ abstract class Zend_Date_DateObject { // throw an error on false input, but only if the new date extension is available if (function_exists('timezone_open')) { if (!@timezone_open($zone)) { - require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("timezone ($zone) is not a known timezone", 0, null, $zone); } } diff --git a/library/vendor/Zend/Date/Exception.php b/library/vendor/Zend/Date/Exception.php index c1876da2f..20914463f 100644 --- a/library/vendor/Zend/Date/Exception.php +++ b/library/vendor/Zend/Date/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Db.php b/library/vendor/Zend/Db.php index aaa1f7923..a6baf24e3 100644 --- a/library/vendor/Zend/Db.php +++ b/library/vendor/Zend/Db.php @@ -224,7 +224,6 @@ class Zend_Db /** * @see Zend_Db_Exception */ - require_once 'Zend/Db/Exception.php'; throw new Zend_Db_Exception('Adapter parameters must be in an array or a Zend_Config object'); } @@ -235,7 +234,6 @@ class Zend_Db /** * @see Zend_Db_Exception */ - require_once 'Zend/Db/Exception.php'; throw new Zend_Db_Exception('Adapter name must be specified in a string'); } @@ -259,7 +257,6 @@ class Zend_Db * if the specified class cannot be loaded. */ if (!class_exists($adapterName)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($adapterName); } @@ -276,7 +273,6 @@ class Zend_Db /** * @see Zend_Db_Exception */ - require_once 'Zend/Db/Exception.php'; throw new Zend_Db_Exception("Adapter class '$adapterName' does not extend Zend_Db_Adapter_Abstract"); } diff --git a/library/vendor/Zend/Db/Adapter/Abstract.php b/library/vendor/Zend/Db/Adapter/Abstract.php index 07f9c5a2b..8879626d1 100644 --- a/library/vendor/Zend/Db/Adapter/Abstract.php +++ b/library/vendor/Zend/Db/Adapter/Abstract.php @@ -24,12 +24,10 @@ /** * @see Zend_Db */ -require_once 'Zend/Db.php'; /** * @see Zend_Db_Select */ -require_once 'Zend/Db/Select.php'; /** * Class for connecting to SQL databases and performing common operations. @@ -176,7 +174,6 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('Adapter parameters must be in an array or a Zend_Config object'); } } @@ -232,7 +229,6 @@ abstract class Zend_Db_Adapter_Abstract break; default: /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('Case must be one of the following constants: ' . 'Zend_Db::CASE_NATURAL, Zend_Db::CASE_LOWER, Zend_Db::CASE_UPPER'); } @@ -284,7 +280,6 @@ abstract class Zend_Db_Adapter_Abstract // we need at least a dbname if (! array_key_exists('dbname', $config)) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance"); } @@ -292,7 +287,6 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'password' for login credentials"); } @@ -300,7 +294,6 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'username' for login credentials"); } } @@ -370,7 +363,6 @@ abstract class Zend_Db_Adapter_Abstract /** * @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception('Profiler argument must be an instance of either Zend_Db_Profiler' . ' or Zend_Config when provided as an object'); } @@ -392,7 +384,6 @@ abstract class Zend_Db_Adapter_Abstract if ($profilerInstance === null) { if (!class_exists($profilerClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($profilerClass); } $profilerInstance = new $profilerClass(); @@ -400,7 +391,6 @@ abstract class Zend_Db_Adapter_Abstract if (!$profilerInstance instanceof Zend_Db_Profiler) { /** @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception('Class ' . get_class($profilerInstance) . ' does not extend ' . 'Zend_Db_Profiler'); } @@ -556,7 +546,6 @@ abstract class Zend_Db_Adapter_Abstract $i++; } else { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception(get_class($this) ." doesn't support positional or named binding"); } } @@ -610,7 +599,6 @@ abstract class Zend_Db_Adapter_Abstract $i++; } else { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception(get_class($this) ." doesn't support positional or named binding"); } } @@ -1126,7 +1114,6 @@ 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' ); diff --git a/library/vendor/Zend/Db/Adapter/Exception.php b/library/vendor/Zend/Db/Adapter/Exception.php index 6a0a4be35..f59c46df0 100644 --- a/library/vendor/Zend/Db/Adapter/Exception.php +++ b/library/vendor/Zend/Db/Adapter/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Db/Adapter/Pdo/Abstract.php b/library/vendor/Zend/Db/Adapter/Pdo/Abstract.php index 84a76f393..50991e96c 100644 --- a/library/vendor/Zend/Db/Adapter/Pdo/Abstract.php +++ b/library/vendor/Zend/Db/Adapter/Pdo/Abstract.php @@ -24,13 +24,11 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Statement_Pdo */ -require_once 'Zend/Db/Statement/Pdo.php'; /** @@ -99,7 +97,6 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('The PDO extension is required for this adapter but the extension is not loaded'); } @@ -108,7 +105,6 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('The ' . $this->_pdoType . ' driver is not currently installed'); } @@ -140,7 +136,6 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e); } @@ -178,7 +173,6 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract $this->_connect(); $stmtClass = $this->_defaultStmtClass; if (!class_exists($stmtClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($stmtClass); } $stmt = new $stmtClass($this, $sql); @@ -240,7 +234,6 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -267,7 +260,6 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($errorInfo[2]); } @@ -276,7 +268,6 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -338,7 +329,6 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('The PDO extension is required for this adapter but the extension is not loaded'); } switch ($mode) { @@ -354,7 +344,6 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Invalid fetch mode '$mode' specified"); break; } diff --git a/library/vendor/Zend/Db/Adapter/Pdo/Mysql.php b/library/vendor/Zend/Db/Adapter/Pdo/Mysql.php index cd4219704..b406b9a76 100644 --- a/library/vendor/Zend/Db/Adapter/Pdo/Mysql.php +++ b/library/vendor/Zend/Db/Adapter/Pdo/Mysql.php @@ -24,7 +24,6 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -250,14 +249,12 @@ class Zend_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Abstract $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/vendor/Zend/Db/Adapter/Pdo/Pgsql.php b/library/vendor/Zend/Db/Adapter/Pdo/Pgsql.php index 0f4d13d46..6eeebaa65 100644 --- a/library/vendor/Zend/Db/Adapter/Pdo/Pgsql.php +++ b/library/vendor/Zend/Db/Adapter/Pdo/Pgsql.php @@ -24,7 +24,6 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -249,7 +248,6 @@ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } @@ -258,7 +256,6 @@ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/vendor/Zend/Db/Adapter/Pdo/Sqlite.php b/library/vendor/Zend/Db/Adapter/Pdo/Sqlite.php index f035cea3a..c8261fc9a 100644 --- a/library/vendor/Zend/Db/Adapter/Pdo/Sqlite.php +++ b/library/vendor/Zend/Db/Adapter/Pdo/Sqlite.php @@ -24,7 +24,6 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -106,7 +105,6 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract // we need at least a dbname if (! array_key_exists('dbname', $config)) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance"); } } @@ -140,7 +138,6 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract if ($retval === false) { $error = $this->_connection->errorInfo(); /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($error[2]); } @@ -148,7 +145,6 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract if ($retval === false) { $error = $this->_connection->errorInfo(); /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($error[2]); } } @@ -275,14 +271,12 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/vendor/Zend/Db/Adapter/Sqlsrv.php b/library/vendor/Zend/Db/Adapter/Sqlsrv.php index f5cb9c645..28a9fe8bb 100644 --- a/library/vendor/Zend/Db/Adapter/Sqlsrv.php +++ b/library/vendor/Zend/Db/Adapter/Sqlsrv.php @@ -23,12 +23,10 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Statement_Sqlsrv */ -require_once 'Zend/Db/Statement/Sqlsrv.php'; /** * @category Zend @@ -121,7 +119,6 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Sqlsrv_Exception */ - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception('The Sqlsrv extension is required for this adapter but the extension is not loaded'); } @@ -164,7 +161,6 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Sqlsrv_Exception */ - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -181,7 +177,6 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract // we need at least a dbname if (! array_key_exists('dbname', $config)) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance"); } @@ -189,7 +184,6 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'password' for login credentials. If Windows Authentication is desired, both keys 'username' and 'password' should be ommited from config."); } @@ -198,7 +192,6 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'username' for login credentials. If Windows Authentication is desired, both keys 'username' and 'password' should be ommited from config."); } @@ -239,12 +232,10 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract $sql = "SERIALIZABLE"; break; default: - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception("Invalid transaction isolation level mode '$level' specified"); } if (!sqlsrv_query($this->_connection, "SET TRANSACTION ISOLATION LEVEL $sql;")) { - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception("Transaction cannot be changed to '$level'"); } @@ -291,7 +282,6 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @see Zend_Loader */ - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($stmtClass); } @@ -527,7 +517,6 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract protected function _beginTransaction() { if (!sqlsrv_begin_transaction($this->_connection)) { - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -541,7 +530,6 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract protected function _commit() { if (!sqlsrv_commit($this->_connection)) { - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -555,7 +543,6 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract protected function _rollBack() { if (!sqlsrv_rollback($this->_connection)) { - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -579,11 +566,9 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract $this->_fetchMode = $mode; break; case Zend_Db::FETCH_BOUND: // bound to PHP variable - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception('FETCH_BOUND is not supported yet'); break; default: - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception("Invalid fetch mode '$mode' specified"); break; } @@ -602,14 +587,12 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract { $count = intval($count); if ($count <= 0) { - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/vendor/Zend/Db/Adapter/Sqlsrv/Exception.php b/library/vendor/Zend/Db/Adapter/Sqlsrv/Exception.php index 308ffb550..803199825 100644 --- a/library/vendor/Zend/Db/Adapter/Sqlsrv/Exception.php +++ b/library/vendor/Zend/Db/Adapter/Sqlsrv/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Db_Adapter_Exception */ -require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Sqlsrv_Exception diff --git a/library/vendor/Zend/Db/Exception.php b/library/vendor/Zend/Db/Exception.php index 20c106638..a8f2485eb 100644 --- a/library/vendor/Zend/Db/Exception.php +++ b/library/vendor/Zend/Db/Exception.php @@ -22,7 +22,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Db/Profiler.php b/library/vendor/Zend/Db/Profiler.php index 408529029..d7fe10400 100644 --- a/library/vendor/Zend/Db/Profiler.php +++ b/library/vendor/Zend/Db/Profiler.php @@ -280,7 +280,6 @@ class Zend_Db_Profiler /** * @see Zend_Db_Profiler_Query */ - require_once 'Zend/Db/Profiler/Query.php'; $this->_queryProfiles[] = new Zend_Db_Profiler_Query($queryText, $queryType); end($this->_queryProfiles); @@ -308,7 +307,6 @@ class Zend_Db_Profiler /** * @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception("Profiler has no query with handle '$queryId'."); } @@ -319,7 +317,6 @@ class Zend_Db_Profiler /** * @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception("Query with profiler handle '$queryId' has already ended."); } @@ -361,7 +358,6 @@ class Zend_Db_Profiler /** * @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception("Query handle '$queryId' not found in profiler log."); } diff --git a/library/vendor/Zend/Db/Profiler/Exception.php b/library/vendor/Zend/Db/Profiler/Exception.php index 58760c2b5..4a3217b8e 100644 --- a/library/vendor/Zend/Db/Profiler/Exception.php +++ b/library/vendor/Zend/Db/Profiler/Exception.php @@ -24,7 +24,6 @@ /** * @see Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; /** diff --git a/library/vendor/Zend/Db/Profiler/Firebug.php b/library/vendor/Zend/Db/Profiler/Firebug.php index 30f9cd37e..ec62e0103 100644 --- a/library/vendor/Zend/Db/Profiler/Firebug.php +++ b/library/vendor/Zend/Db/Profiler/Firebug.php @@ -21,13 +21,10 @@ */ /** Zend_Db_Profiler */ -require_once 'Zend/Db/Profiler.php'; /** Zend_Wildfire_Plugin_FirePhp */ -require_once 'Zend/Wildfire/Plugin/FirePhp.php'; /** Zend_Wildfire_Plugin_FirePhp_TableMessage */ -require_once 'Zend/Wildfire/Plugin/FirePhp/TableMessage.php'; /** * Writes DB events as log messages to the Firebug Console via FirePHP. diff --git a/library/vendor/Zend/Db/Select.php b/library/vendor/Zend/Db/Select.php index 8f84354f7..d6ca37f55 100644 --- a/library/vendor/Zend/Db/Select.php +++ b/library/vendor/Zend/Db/Select.php @@ -24,12 +24,10 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Expr */ -require_once 'Zend/Db/Expr.php'; /** @@ -251,7 +249,6 @@ class Zend_Db_Select /** * @see Zend_Db_Select_Exception */ - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("No table has been specified for the FROM clause"); } @@ -280,14 +277,12 @@ class Zend_Db_Select public function union($select = array(), $type = self::SQL_UNION) { if (!is_array($select)) { - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception( "union() only accepts an array of Zend_Db_Select instances of sql query strings." ); } if (!in_array($type, self::$_unionTypes)) { - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid union type '{$type}'"); } @@ -664,7 +659,6 @@ class Zend_Db_Select { $part = strtolower($part); if (!array_key_exists($part, $this->_parts)) { - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid Select part '$part'"); } return $this->_parts[$part]; @@ -757,12 +751,10 @@ class Zend_Db_Select /** * @see Zend_Db_Select_Exception */ - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid join type '$type'"); } if (count($this->_parts[self::UNION])) { - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid use of table with " . self::SQL_UNION); } @@ -804,7 +796,6 @@ class Zend_Db_Select /** * @see Zend_Db_Select_Exception */ - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("You cannot define a correlation name '$correlationName' more than once"); } @@ -873,7 +864,6 @@ class Zend_Db_Select public function _joinUsing($type, $name, $cond, $cols = '*', $schema = null) { if (empty($this->_parts[self::FROM])) { - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("You can only perform a joinUsing after specifying a FROM table"); } @@ -997,7 +987,6 @@ class Zend_Db_Select protected function _where($condition, $value = null, $type = null, $bool = true) { if (count($this->_parts[self::UNION])) { - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid use of where clause with " . self::SQL_UNION); } @@ -1319,11 +1308,9 @@ class Zend_Db_Select if ($type) { $type .= ' join'; if (!in_array($type, self::$_joinTypes)) { - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Unrecognized method '$method()'"); } if (in_array($type, array(self::CROSS_JOIN, self::NATURAL_JOIN))) { - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Cannot perform a joinUsing with method '$method()'"); } } else { @@ -1333,7 +1320,6 @@ class Zend_Db_Select return call_user_func_array(array($this, '_joinUsing'), $args); } - require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Unrecognized method '$method()'"); } diff --git a/library/vendor/Zend/Db/Select/Exception.php b/library/vendor/Zend/Db/Select/Exception.php index 048e1c142..6c8b896f8 100644 --- a/library/vendor/Zend/Db/Select/Exception.php +++ b/library/vendor/Zend/Db/Select/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Db/Statement.php b/library/vendor/Zend/Db/Statement.php index bd2536f41..016478e9f 100644 --- a/library/vendor/Zend/Db/Statement.php +++ b/library/vendor/Zend/Db/Statement.php @@ -23,12 +23,10 @@ /** * @see Zend_Db */ -require_once 'Zend/Db.php'; /** * @see Zend_Db_Statement_Interface */ -require_once 'Zend/Db/Statement/Interface.php'; /** * Abstract class to emulate a PDOStatement for native database adapters. @@ -148,7 +146,6 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception("Invalid bind-variable position '$val'"); } } else if ($val[0] == ':') { @@ -156,7 +153,6 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception("Invalid bind-variable name '$val'"); } } @@ -244,7 +240,6 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception('Invalid bind-variable position'); } @@ -266,7 +261,6 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception("Invalid bind-variable position '$parameter'"); } @@ -436,7 +430,6 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception('invalid fetch mode'); break; } diff --git a/library/vendor/Zend/Db/Statement/Exception.php b/library/vendor/Zend/Db/Statement/Exception.php index 8f245f70e..29bbecdb3 100644 --- a/library/vendor/Zend/Db/Statement/Exception.php +++ b/library/vendor/Zend/Db/Statement/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; /** * Zend_Db_Statement_Exception diff --git a/library/vendor/Zend/Db/Statement/Pdo.php b/library/vendor/Zend/Db/Statement/Pdo.php index 8be2d4fd9..db421eb67 100644 --- a/library/vendor/Zend/Db/Statement/Pdo.php +++ b/library/vendor/Zend/Db/Statement/Pdo.php @@ -23,7 +23,6 @@ /** * @see Zend_Db_Statement */ -require_once 'Zend/Db/Statement.php'; /** * Proxy class to wrap a PDOStatement object. @@ -57,7 +56,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { $this->_stmt = $this->_adapter->getConnection()->prepare($sql); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -81,7 +79,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega return $this->_stmt->bindColumn($column, $param, $type); } } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -113,7 +110,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega } return $this->_stmt->bindParam($parameter, $variable, $type, $length, $options); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -142,7 +138,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega return $this->_stmt->bindValue($parameter, $value, $type); } } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -158,7 +153,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->closeCursor(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -175,7 +169,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->columnCount(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -192,7 +185,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->errorCode(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -209,7 +201,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->errorInfo(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -230,7 +221,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega return $this->_stmt->execute(); } } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; $message = sprintf('%s, query was: %s', $e->getMessage(), $this->_stmt->queryString); throw new Zend_Db_Statement_Exception($message, (int) $e->getCode(), $e); } @@ -253,7 +243,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->fetch($style, $cursor, $offset); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -291,7 +280,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega return $this->_stmt->fetchAll($style); } } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -308,7 +296,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->fetchColumn($col); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -326,7 +313,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->fetchObject($class, $config); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -343,7 +329,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->getAttribute($key); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -360,7 +345,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->getColumnMeta($column); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -378,7 +362,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->nextRowset(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -396,7 +379,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->rowCount(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -414,7 +396,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->setAttribute($key, $val); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -432,7 +413,6 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->setFetchMode($mode); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } diff --git a/library/vendor/Zend/Db/Statement/Sqlsrv.php b/library/vendor/Zend/Db/Statement/Sqlsrv.php index e607928ee..6b36c82c9 100644 --- a/library/vendor/Zend/Db/Statement/Sqlsrv.php +++ b/library/vendor/Zend/Db/Statement/Sqlsrv.php @@ -23,7 +23,6 @@ /** * @see Zend_Db_Statement */ -require_once 'Zend/Db/Statement.php'; /** * Extends for Microsoft SQL Server Driver for PHP @@ -66,7 +65,6 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $this->_stmt = sqlsrv_prepare($connection, $sql); if (!$this->_stmt) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -202,7 +200,6 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $this->_stmt = sqlsrv_query($connection, $this->_originalSQL, $params); if (!$this->_stmt) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -233,7 +230,6 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $values = sqlsrv_fetch_array($this->_stmt, SQLSRV_FETCH_ASSOC); if (!$values && (null !== $error = sqlsrv_errors())) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception($error); } @@ -270,7 +266,6 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $row = $this->_fetchBound($row); break; default: - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception("Invalid fetch mode '$style' specified"); break; } @@ -293,7 +288,6 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement if (!sqlsrv_fetch($this->_stmt)) { if (null !== $error = sqlsrv_errors()) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception($error); } @@ -303,7 +297,6 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $data = sqlsrv_get_field($this->_stmt, $col); //0-based if ($data === false) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -327,7 +320,6 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $obj = sqlsrv_fetch_object($this->_stmt); if ($error = sqlsrv_errors()) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception($error); } @@ -373,7 +365,6 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement public function nextRowset() { if (sqlsrv_next_result($this->_stmt) === false) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -405,7 +396,6 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement // Strict check is necessary; 0 is a valid return value if ($num_rows === false) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } diff --git a/library/vendor/Zend/Db/Statement/Sqlsrv/Exception.php b/library/vendor/Zend/Db/Statement/Sqlsrv/Exception.php index 20dca7b9b..8d21296c7 100644 --- a/library/vendor/Zend/Db/Statement/Sqlsrv/Exception.php +++ b/library/vendor/Zend/Db/Statement/Sqlsrv/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Db_Statement_Exception */ -require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db diff --git a/library/vendor/Zend/Db/Table.php b/library/vendor/Zend/Db/Table.php index a6cdce203..03005f00a 100644 --- a/library/vendor/Zend/Db/Table.php +++ b/library/vendor/Zend/Db/Table.php @@ -23,12 +23,10 @@ /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; /** * @see Zend_Db_Table_Definition */ -require_once 'Zend/Db/Table/Definition.php'; /** * Class for SQL table interface. diff --git a/library/vendor/Zend/Db/Table/Abstract.php b/library/vendor/Zend/Db/Table/Abstract.php index 3c10da535..cadeccad2 100644 --- a/library/vendor/Zend/Db/Table/Abstract.php +++ b/library/vendor/Zend/Db/Table/Abstract.php @@ -23,17 +23,14 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Select.php'; /** * @see Zend_Db */ -require_once 'Zend/Db.php'; /** * Class for SQL table interface. @@ -467,11 +464,9 @@ abstract class Zend_Db_Table_Abstract $refMap = $this->_getReferenceMapNormalized(); if ($ruleKey !== null) { if (!isset($refMap[$ruleKey])) { - require_once "Zend/Db/Table/Exception.php"; throw new Zend_Db_Table_Exception("No reference rule \"$ruleKey\" from table $thisClass to table $tableClassname"); } if ($refMap[$ruleKey][self::REF_TABLE_CLASS] != $tableClassname) { - require_once "Zend/Db/Table/Exception.php"; throw new Zend_Db_Table_Exception("Reference rule \"$ruleKey\" does not reference table $tableClassname"); } return $refMap[$ruleKey]; @@ -481,7 +476,6 @@ abstract class Zend_Db_Table_Abstract return $reference; } } - require_once "Zend/Db/Table/Exception.php"; throw new Zend_Db_Table_Exception("No reference from table $thisClass to table $tableClassname"); } @@ -604,11 +598,9 @@ abstract class Zend_Db_Table_Abstract return null; } if (is_string($db)) { - require_once 'Zend/Registry.php'; $db = Zend_Registry::get($db); } if (!$db instanceof Zend_Db_Adapter_Abstract) { - require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('Argument must be of type Zend_Db_Adapter_Abstract, or a Registry key where a Zend_Db_Adapter_Abstract object is stored'); } return $db; @@ -699,11 +691,9 @@ abstract class Zend_Db_Table_Abstract return null; } if (is_string($metadataCache)) { - require_once 'Zend/Registry.php'; $metadataCache = Zend_Registry::get($metadataCache); } if (!$metadataCache instanceof Zend_Cache_Core) { - require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('Argument must be of type Zend_Cache_Core, or a Registry key where a Zend_Cache_Core object is stored'); } return $metadataCache; @@ -752,7 +742,6 @@ abstract class Zend_Db_Table_Abstract if (! $this->_db) { $this->_db = self::getDefaultAdapter(); if (!$this->_db instanceof Zend_Db_Adapter_Abstract) { - require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('No adapter found for ' . get_class($this)); } } @@ -885,7 +874,6 @@ abstract class Zend_Db_Table_Abstract // if no primary key was specified and none was found in the metadata // then throw an exception. if (empty($this->_primary)) { - require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("A table must have a primary key, but none was found for table '{$this->_name}'"); } } else if (!is_array($this->_primary)) { @@ -897,7 +885,6 @@ abstract class Zend_Db_Table_Abstract $cols = $this->_getCols(); if (! array_intersect((array) $this->_primary, $cols) == (array) $this->_primary) { - require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Primary key column(s) (" . implode(',', (array) $this->_primary) . ") are not columns in this table (" @@ -1000,7 +987,6 @@ abstract class Zend_Db_Table_Abstract } if (!array_key_exists($key, $info)) { - require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('There is no table information for the key "' . $key . '"'); } @@ -1015,7 +1001,6 @@ abstract class Zend_Db_Table_Abstract */ public function select($withFromPart = self::SELECT_WITHOUT_FROM_PART) { - require_once 'Zend/Db/Table/Select.php'; $select = new Zend_Db_Table_Select($this); if ($withFromPart == self::SELECT_WITH_FROM_PART) { $select->from($this->info(self::NAME), Zend_Db_Table_Select::SQL_WILDCARD, $this->info(self::SCHEMA)); @@ -1112,7 +1097,6 @@ abstract class Zend_Db_Table_Abstract /** * @see Zend_Db_Table_Exception */ - require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('Column "' . $column . '" not found in table.'); } @@ -1290,12 +1274,10 @@ abstract class Zend_Db_Table_Abstract $keyNames = array_values((array) $this->_primary); if (count($args) < count($keyNames)) { - require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Too few columns for the primary key"); } if (count($args) > count($keyNames)) { - require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Too many columns for the primary key"); } @@ -1312,7 +1294,6 @@ abstract class Zend_Db_Table_Abstract if ($numberTerms == 0) { $numberTerms = $keyValuesCount; } else if ($keyValuesCount != $numberTerms) { - require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Missing value(s) for the primary key"); } $keyValues = array_values($keyValues); @@ -1346,7 +1327,6 @@ abstract class Zend_Db_Table_Abstract if ($whereClause == null) { $rowsetClass = $this->getRowsetClass(); if (!class_exists($rowsetClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rowsetClass); } return new $rowsetClass(array('table' => $this, 'rowClass' => $this->getRowClass(), 'stored' => true)); @@ -1399,7 +1379,6 @@ abstract class Zend_Db_Table_Abstract $rowsetClass = $this->getRowsetClass(); if (!class_exists($rowsetClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rowsetClass); } return new $rowsetClass($data); @@ -1449,7 +1428,6 @@ abstract class Zend_Db_Table_Abstract $rowClass = $this->getRowClass(); if (!class_exists($rowClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rowClass); } return new $rowClass($data); @@ -1512,7 +1490,6 @@ abstract class Zend_Db_Table_Abstract $rowClass = $this->getRowClass(); if (!class_exists($rowClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rowClass); } $row = new $rowClass($config); @@ -1590,10 +1567,8 @@ abstract class Zend_Db_Table_Abstract // assume the tableName is the class name if (!class_exists($tableName)) { try { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($tableName); } catch (Zend_Exception $e) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e); } } diff --git a/library/vendor/Zend/Db/Table/Exception.php b/library/vendor/Zend/Db/Table/Exception.php index fb25eaa0e..9189ff3a9 100644 --- a/library/vendor/Zend/Db/Table/Exception.php +++ b/library/vendor/Zend/Db/Table/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Db/Table/Row.php b/library/vendor/Zend/Db/Table/Row.php index cb088110a..076d68304 100644 --- a/library/vendor/Zend/Db/Table/Row.php +++ b/library/vendor/Zend/Db/Table/Row.php @@ -24,7 +24,6 @@ /** * @see Zend_Db_Table_Row_Abstract */ -require_once 'Zend/Db/Table/Row/Abstract.php'; /** diff --git a/library/vendor/Zend/Db/Table/Row/Abstract.php b/library/vendor/Zend/Db/Table/Row/Abstract.php index 3988ecbc2..f5ef7f32f 100644 --- a/library/vendor/Zend/Db/Table/Row/Abstract.php +++ b/library/vendor/Zend/Db/Table/Row/Abstract.php @@ -23,7 +23,6 @@ /** * @see Zend_Db */ -require_once 'Zend/Db.php'; /** * @category Zend @@ -122,7 +121,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg if (isset($config['data'])) { if (!is_array($config['data'])) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Data must be an array'); } $this->_data = $config['data']; @@ -157,7 +155,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg protected function _transformColumn($columnName) { if (!is_string($columnName)) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Specified column is not a string'); } // Perform no transformation by default @@ -175,7 +172,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg { $columnName = $this->_transformColumn($columnName); if (!array_key_exists($columnName, $this->_data)) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row"); } return $this->_data[$columnName]; @@ -193,7 +189,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg { $columnName = $this->_transformColumn($columnName); if (!array_key_exists($columnName, $this->_data)) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row"); } $this->_data[$columnName] = $value; @@ -211,11 +206,9 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg { $columnName = $this->_transformColumn($columnName); if (!array_key_exists($columnName, $this->_data)) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row"); } if ($this->isConnected() && in_array($columnName, $this->_table->info('primary'))) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is a primary key and should not be unset"); } unset($this->_data[$columnName]); @@ -342,7 +335,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg $tableClass = get_class($table); if (! $table instanceof $this->_tableClass) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The specified Table is of class $tableClass, expecting class to be instance of $this->_tableClass"); } @@ -352,13 +344,11 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg $info = $this->_table->info(); if ($info['cols'] != array_keys($this->_data)) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('The specified Table does not have the same columns as the Row'); } if (! array_intersect((array) $this->_primary, $info['primary']) == (array) $this->_primary) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The specified Table '$tableClass' does not have the same primary key as the Row"); } @@ -451,7 +441,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg * A read-only row cannot be saved. */ if ($this->_readOnly === true) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('This row has been marked read-only'); } @@ -509,7 +498,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg * A read-only row cannot be saved. */ if ($this->_readOnly === true) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('This row has been marked read-only'); } @@ -598,7 +586,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg * A read-only row cannot be deleted. */ if ($this->_readOnly === true) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('This row has been marked read-only'); } @@ -692,7 +679,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg protected function _getTable() { if (!$this->_connected) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Cannot save a Row unless it is connected'); } return $this->_table; @@ -707,7 +693,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg protected function _getPrimaryKey($useDirty = true) { if (!is_array($this->_primary)) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The primary key must be set as an array"); } @@ -718,7 +703,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg $array = array_intersect_key($this->_cleanData, $primary); } if (count($primary) != count($array)) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The specified Table '$this->_tableClass' does not have the same primary key as the Row"); } return $array; @@ -771,7 +755,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg $row = $this->_getTable()->fetchRow($where); if (null === $row) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Cannot refresh row as parent is missing'); } @@ -888,7 +871,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg if ($type == 'object') { $type = get_class($dependentTable); } - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Dependent table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -944,7 +926,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg if ($type == 'object') { $type = get_class($parentTable); } - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Parent table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -1012,7 +993,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg if ($type == 'object') { $type = get_class($intersectionTable); } - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Intersection table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -1032,7 +1012,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg if ($type == 'object') { $type = get_class($matchTable); } - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Match table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -1096,10 +1075,8 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg $rowsetClass = $matchTable->getRowsetClass(); if (!class_exists($rowsetClass)) { try { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rowsetClass); } catch (Zend_Exception $e) { - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -1165,7 +1142,6 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess, IteratorAggreg return $this->findDependentRowset($class, $ruleKey1, $select); } - require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Unrecognized method '$method()'"); } diff --git a/library/vendor/Zend/Db/Table/Row/Exception.php b/library/vendor/Zend/Db/Table/Row/Exception.php index ece4e8a69..67718b732 100644 --- a/library/vendor/Zend/Db/Table/Row/Exception.php +++ b/library/vendor/Zend/Db/Table/Row/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Db_Table_Exception */ -require_once 'Zend/Db/Table/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Db/Table/Rowset.php b/library/vendor/Zend/Db/Table/Rowset.php index 9c39f4409..57f114df7 100644 --- a/library/vendor/Zend/Db/Table/Rowset.php +++ b/library/vendor/Zend/Db/Table/Rowset.php @@ -25,7 +25,6 @@ /** * @see Zend_Db_Table_Rowset_Abstract */ -require_once 'Zend/Db/Table/Rowset/Abstract.php'; /** diff --git a/library/vendor/Zend/Db/Table/Rowset/Abstract.php b/library/vendor/Zend/Db/Table/Rowset/Abstract.php index 6a53c054a..358c5f00b 100644 --- a/library/vendor/Zend/Db/Table/Rowset/Abstract.php +++ b/library/vendor/Zend/Db/Table/Rowset/Abstract.php @@ -112,7 +112,6 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta $this->_rowClass = $config['rowClass']; } if (!class_exists($this->_rowClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($this->_rowClass); } if (isset($config['data'])) { @@ -310,7 +309,6 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta { $position = (int) $position; if ($position < 0 || $position >= $this->_count) { - require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception("Illegal index $position"); } $this->_pointer = $position; @@ -340,7 +338,6 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta { $offset = (int) $offset; if ($offset < 0 || $offset >= $this->_count) { - require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception("Illegal index $offset"); } $this->_pointer = $offset; @@ -382,7 +379,6 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta try { $row = $this->_loadAndReturnRow($position); } catch (Zend_Db_Table_Rowset_Exception $e) { - require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception('No row could be found at position ' . (int) $position, 0, $e); } @@ -413,7 +409,6 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta protected function _loadAndReturnRow($position) { if (!isset($this->_data[$position])) { - require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception("Data for provided position does not exist"); } diff --git a/library/vendor/Zend/Db/Table/Rowset/Exception.php b/library/vendor/Zend/Db/Table/Rowset/Exception.php index 57cca4f95..75ebce43c 100644 --- a/library/vendor/Zend/Db/Table/Rowset/Exception.php +++ b/library/vendor/Zend/Db/Table/Rowset/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Db_Table_Exception */ -require_once 'Zend/Db/Table/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Db/Table/Select.php b/library/vendor/Zend/Db/Table/Select.php index 542a6f54e..7b9e7b797 100644 --- a/library/vendor/Zend/Db/Table/Select.php +++ b/library/vendor/Zend/Db/Table/Select.php @@ -25,13 +25,11 @@ /** * @see Zend_Db_Select */ -require_once 'Zend/Db/Select.php'; /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; /** @@ -211,7 +209,6 @@ class Zend_Db_Table_Select extends Zend_Db_Select // Check each column to ensure it only references the primary table if ($column) { if (!isset($from[$table]) || $from[$table]['tableName'] != $primary) { - require_once 'Zend/Db/Table/Select/Exception.php'; throw new Zend_Db_Table_Select_Exception('Select query cannot join with another table'); } } diff --git a/library/vendor/Zend/Db/Table/Select/Exception.php b/library/vendor/Zend/Db/Table/Select/Exception.php index 575fa3e5f..3fb6b026f 100644 --- a/library/vendor/Zend/Db/Table/Select/Exception.php +++ b/library/vendor/Zend/Db/Table/Select/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Select/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Dom/Exception.php b/library/vendor/Zend/Dom/Exception.php index 3f6fc9112..38ad1d155 100644 --- a/library/vendor/Zend/Dom/Exception.php +++ b/library/vendor/Zend/Dom/Exception.php @@ -20,7 +20,6 @@ */ /** Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Zend_Dom Exceptions diff --git a/library/vendor/Zend/Dom/Query.php b/library/vendor/Zend/Dom/Query.php index 8853590e2..cc95f0258 100644 --- a/library/vendor/Zend/Dom/Query.php +++ b/library/vendor/Zend/Dom/Query.php @@ -22,18 +22,14 @@ /** * @see Zend_Dom_Query_Css2Xpath */ -require_once 'Zend/Dom/Query/Css2Xpath.php'; /** * @see Zend_Dom_Query_Result */ -require_once 'Zend/Dom/Query/Result.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; /** * Query DOM structures based on CSS selectors and/or XPath @@ -245,7 +241,6 @@ class Zend_Dom_Query public function queryXpath($xpathQuery, $query = null) { if (null === ($document = $this->getDocument())) { - require_once 'Zend/Dom/Exception.php'; throw new Zend_Dom_Exception('Cannot query; no document registered'); } @@ -263,7 +258,6 @@ class Zend_Dom_Query $domDoc = Zend_Xml_Security::scan($document, $domDoc); $success = ($domDoc !== false); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Dom/Exception.php'; throw new Zend_Dom_Exception( $e->getMessage() ); @@ -283,7 +277,6 @@ class Zend_Dom_Query libxml_use_internal_errors(false); if (!$success) { - require_once 'Zend/Dom/Exception.php'; throw new Zend_Dom_Exception(sprintf('Error parsing document (type == %s)', $type)); } diff --git a/library/vendor/Zend/EventManager/Event.php b/library/vendor/Zend/EventManager/Event.php index 0374d04a1..60d175dd3 100644 --- a/library/vendor/Zend/EventManager/Event.php +++ b/library/vendor/Zend/EventManager/Event.php @@ -18,7 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/EventDescription.php'; /** * Representation of an event @@ -111,7 +110,6 @@ class Zend_EventManager_Event implements Zend_EventManager_EventDescription public function setParams($params) { if (!is_array($params) && !is_object($params)) { - require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; throw new Zend_EventManager_Exception_InvalidArgumentException(sprintf( 'Event parameters must be an array or object; received "%s"', (is_object($params) ? get_class($params) : gettype($params)) diff --git a/library/vendor/Zend/EventManager/EventCollection.php b/library/vendor/Zend/EventManager/EventCollection.php index 8affc06ba..db7574139 100644 --- a/library/vendor/Zend/EventManager/EventCollection.php +++ b/library/vendor/Zend/EventManager/EventCollection.php @@ -18,7 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/CallbackHandler.php'; /** * Interface for messengers diff --git a/library/vendor/Zend/EventManager/EventManager.php b/library/vendor/Zend/EventManager/EventManager.php index 17b13ad44..e060fd7d5 100644 --- a/library/vendor/Zend/EventManager/EventManager.php +++ b/library/vendor/Zend/EventManager/EventManager.php @@ -18,13 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/Event.php'; -require_once 'Zend/EventManager/EventCollection.php'; -require_once 'Zend/EventManager/ResponseCollection.php'; -require_once 'Zend/EventManager/SharedEventCollectionAware.php'; -require_once 'Zend/EventManager/StaticEventManager.php'; -require_once 'Zend/Stdlib/CallbackHandler.php'; -require_once 'Zend/Stdlib/PriorityQueue.php'; /** * Event manager: notification system @@ -201,7 +194,6 @@ class Zend_EventManager_EventManager implements Zend_EventManager_EventCollectio } if ($callback && !is_callable($callback)) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException('Invalid callback provided'); } @@ -243,7 +235,6 @@ class Zend_EventManager_EventManager implements Zend_EventManager_EventCollectio } if (!is_callable($callback)) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException('Invalid callback provided'); } @@ -278,7 +269,6 @@ class Zend_EventManager_EventManager implements Zend_EventManager_EventCollectio // Null callback is invalid if (null === $callback) { - require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; throw new Zend_EventManager_Exception_InvalidArgumentException(sprintf( '%s: expects a callback; none provided', __METHOD__ @@ -337,7 +327,6 @@ class Zend_EventManager_EventManager implements Zend_EventManager_EventCollectio } if (!$listener instanceof Zend_Stdlib_CallbackHandler) { - require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; throw new Zend_EventManager_Exception_InvalidArgumentException(sprintf( '%s: expected a Zend_EventManager_ListenerAggregate or Zend_Stdlib_CallbackHandler; received "%s"', __METHOD__, diff --git a/library/vendor/Zend/EventManager/Exception/InvalidArgumentException.php b/library/vendor/Zend/EventManager/Exception/InvalidArgumentException.php index 6ec87c678..ffa6f0035 100644 --- a/library/vendor/Zend/EventManager/Exception/InvalidArgumentException.php +++ b/library/vendor/Zend/EventManager/Exception/InvalidArgumentException.php @@ -21,12 +21,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_EventManager_Exception */ -require_once 'Zend/EventManager/Exception.php'; /** * Invalid argument exception diff --git a/library/vendor/Zend/EventManager/Filter.php b/library/vendor/Zend/EventManager/Filter.php index d578f0ebe..b2db59a20 100644 --- a/library/vendor/Zend/EventManager/Filter.php +++ b/library/vendor/Zend/EventManager/Filter.php @@ -18,7 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/CallbackHandler.php'; /** * Interface for intercepting filter chains diff --git a/library/vendor/Zend/EventManager/Filter/FilterIterator.php b/library/vendor/Zend/EventManager/Filter/FilterIterator.php index ca2d97bca..892eff09a 100644 --- a/library/vendor/Zend/EventManager/Filter/FilterIterator.php +++ b/library/vendor/Zend/EventManager/Filter/FilterIterator.php @@ -18,8 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/CallbackHandler.php'; -require_once 'Zend/Stdlib/SplPriorityQueue.php'; /** * Specialized priority queue implementation for use with an intercepting diff --git a/library/vendor/Zend/EventManager/FilterChain.php b/library/vendor/Zend/EventManager/FilterChain.php index 2c9ae4b05..b52d059a7 100644 --- a/library/vendor/Zend/EventManager/FilterChain.php +++ b/library/vendor/Zend/EventManager/FilterChain.php @@ -18,9 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/Filter.php'; -require_once 'Zend/EventManager/Filter/FilterIterator.php'; -require_once 'Zend/Stdlib/CallbackHandler.php'; /** * FilterChain: intercepting filter manager @@ -84,7 +81,6 @@ class Zend_EventManager_FilterChain implements Zend_EventManager_Filter public function attach($callback, $priority = 1) { if (empty($callback)) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException('No callback provided'); } $filter = new Zend_Stdlib_CallbackHandler($callback, array('priority' => $priority)); diff --git a/library/vendor/Zend/EventManager/GlobalEventManager.php b/library/vendor/Zend/EventManager/GlobalEventManager.php index 82a3a91ec..41da3437c 100644 --- a/library/vendor/Zend/EventManager/GlobalEventManager.php +++ b/library/vendor/Zend/EventManager/GlobalEventManager.php @@ -18,8 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/CallbackHandler.php'; -require_once 'Zend/Stdlib/PriorityQueue.php'; /** * Event manager: notification system diff --git a/library/vendor/Zend/EventManager/SharedEventCollectionAware.php b/library/vendor/Zend/EventManager/SharedEventCollectionAware.php index e2a906ae3..98c9616f6 100644 --- a/library/vendor/Zend/EventManager/SharedEventCollectionAware.php +++ b/library/vendor/Zend/EventManager/SharedEventCollectionAware.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/SharedEventCollection.php'; /** * Interface to automate setter injection for a SharedEventCollection instance diff --git a/library/vendor/Zend/EventManager/SharedEventManager.php b/library/vendor/Zend/EventManager/SharedEventManager.php index 133c7c9b2..97faa24ae 100644 --- a/library/vendor/Zend/EventManager/SharedEventManager.php +++ b/library/vendor/Zend/EventManager/SharedEventManager.php @@ -18,8 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/EventManager.php'; -require_once 'Zend/EventManager/SharedEventCollection.php'; /** * Shared/contextual EventManager diff --git a/library/vendor/Zend/EventManager/StaticEventManager.php b/library/vendor/Zend/EventManager/StaticEventManager.php index 9b30d1a4e..656816129 100644 --- a/library/vendor/Zend/EventManager/StaticEventManager.php +++ b/library/vendor/Zend/EventManager/StaticEventManager.php @@ -18,9 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/EventManager.php'; -require_once 'Zend/EventManager/SharedEventManager.php'; -require_once 'Zend/Stdlib/CallbackHandler.php'; /** * Static version of EventManager diff --git a/library/vendor/Zend/File/ClassFileLocator.php b/library/vendor/Zend/File/ClassFileLocator.php index b5f0a87d2..547694300 100644 --- a/library/vendor/Zend/File/ClassFileLocator.php +++ b/library/vendor/Zend/File/ClassFileLocator.php @@ -18,7 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/File/PhpClassFile.php'; /** * Locate files containing PHP classes, interfaces, or abstracts diff --git a/library/vendor/Zend/File/Transfer.php b/library/vendor/Zend/File/Transfer.php index 5ec9411bd..77c411c4c 100644 --- a/library/vendor/Zend/File/Transfer.php +++ b/library/vendor/Zend/File/Transfer.php @@ -22,7 +22,6 @@ /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; /** * Base class for all protocols supporting file transfers @@ -75,7 +74,6 @@ class Zend_File_Transfer $direction = (integer) $direction; $this->_adapter[$direction] = new $adapter($options); if (!$this->_adapter[$direction] instanceof Zend_File_Transfer_Adapter_Abstract) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("Adapter " . $adapter . " does not extend Zend_File_Transfer_Adapter_Abstract"); } @@ -119,7 +117,6 @@ class Zend_File_Transfer return call_user_func_array(array($this->_adapter[$direction], $method), $options); } - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("Unknown method '" . $method . "' called!"); } } diff --git a/library/vendor/Zend/File/Transfer/Adapter/Abstract.php b/library/vendor/Zend/File/Transfer/Adapter/Abstract.php index 027a36180..35d67dfd2 100644 --- a/library/vendor/Zend/File/Transfer/Adapter/Abstract.php +++ b/library/vendor/Zend/File/Transfer/Adapter/Abstract.php @@ -171,7 +171,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract */ public static function getProgress() { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method must be implemented within the adapter'); } @@ -192,7 +191,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract $this->_loaders[$type] = $loader; return $this; default: - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type)); } } @@ -221,7 +219,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract 'Zend_' . $prefixSegment . '_File' => 'Zend/' . $pathSegment . '/File', ); - require_once 'Zend/Loader/PluginLoader.php'; $this->_loaders[$type] = new Zend_Loader_PluginLoader($paths); } else { $loader = $this->_loaders[$type]; @@ -232,7 +229,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract } return $this->_loaders[$type]; default: - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } } @@ -274,7 +270,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract } return $this; default: - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } } @@ -347,7 +342,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract unset($options['messages']); } } else { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Invalid validator provided to addValidator; must be string or Zend_Validate_Interface'); } @@ -429,7 +423,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract } } } else { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Invalid validator passed to addValidators()'); } } @@ -579,7 +572,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract break; default: - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("Unknown option: $name = $value"); } } @@ -755,7 +747,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract $class = $this->getPluginLoader(self::FILTER)->load($filter); $filter = new $class($options); } else { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Invalid filter specified'); } @@ -930,7 +921,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract */ public function getFile() { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -987,7 +977,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract */ public function addFile($file, $validator = null, $filter = null) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -999,7 +988,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract */ public function getType() { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -1014,7 +1002,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract */ public function addType($type, $validator = null, $filter = null) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -1032,14 +1019,12 @@ abstract class Zend_File_Transfer_Adapter_Abstract $orig = $files; $destination = rtrim($destination, "/\\"); if (!is_dir($destination)) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception( 'The given destination is not a directory or does not exist' ); } if (!$this->_isPathWriteable($destination)) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception( 'The given destination is not writable' ); @@ -1079,7 +1064,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract if (isset($this->_files[$orig]['destination'])) { $destinations[$orig] = $this->_files[$orig]['destination']; } else { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception(sprintf('The file transfer adapter can not find "%s"', $orig)); } } @@ -1119,7 +1103,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Invalid translator specified'); } @@ -1173,7 +1156,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract public function getHash($hash = 'crc32', $files = null) { if (!in_array($hash, hash_algos())) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Unknown hash algorithm'); } @@ -1185,7 +1167,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract } else if (file_exists($value['tmp_name'])) { $result[$key] = hash_file($hash, $value['tmp_name']); } else if (empty($value['options']['ignoreNoFile'])) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist"); } } @@ -1216,7 +1197,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract $result[$key] = $value['size']; } } else if (empty($value['options']['ignoreNoFile'])) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist"); } else { continue; @@ -1265,7 +1245,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract if (file_exists($value['name']) || file_exists($value['tmp_name'])) { $result[$key] = $value['type']; } else if (empty($value['options']['ignoreNoFile'])) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist"); } else { continue; @@ -1416,7 +1395,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract $this->_tmpDir = realpath(dirname($tempFile)); unlink($tempFile); } else { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Could not determine a temporary directory'); } } @@ -1500,7 +1478,6 @@ abstract class Zend_File_Transfer_Adapter_Abstract return array(); } - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception(sprintf('The file transfer adapter can not find "%s"', $find)); } diff --git a/library/vendor/Zend/File/Transfer/Adapter/Http.php b/library/vendor/Zend/File/Transfer/Adapter/Http.php index ecb95367a..2035fc7af 100644 --- a/library/vendor/Zend/File/Transfer/Adapter/Http.php +++ b/library/vendor/Zend/File/Transfer/Adapter/Http.php @@ -22,7 +22,6 @@ /** * @see Zend_File_Transfer_Adapter_Abstract */ -require_once 'Zend/File/Transfer/Adapter/Abstract.php'; /** * File transfer adapter class for the HTTP protocol @@ -45,7 +44,6 @@ class Zend_File_Transfer_Adapter_Http extends Zend_File_Transfer_Adapter_Abstrac public function __construct($options = array()) { if (ini_get('file_uploads') == false) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('File uploads are not allowed in your php config!'); } @@ -105,7 +103,6 @@ class Zend_File_Transfer_Adapter_Http extends Zend_File_Transfer_Adapter_Abstrac */ public function send($options = null) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -228,7 +225,6 @@ class Zend_File_Transfer_Adapter_Http extends Zend_File_Transfer_Adapter_Abstrac */ public function isSent($files = null) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -307,7 +303,6 @@ class Zend_File_Transfer_Adapter_Http extends Zend_File_Transfer_Adapter_Abstrac public static function getProgress($id = null) { if (!function_exists('apc_fetch') and !function_exists('uploadprogress_get_info')) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Neither APC nor uploadprogress extension installed'); } @@ -385,12 +380,10 @@ class Zend_File_Transfer_Adapter_Http extends Zend_File_Transfer_Adapter_Abstrac if (isset($adapter) && isset($status['id'])) { if ($adapter instanceof Zend_ProgressBar_Adapter) { - require_once 'Zend/ProgressBar.php'; $adapter = new Zend_ProgressBar($adapter, 0, $status['total'], $session); } if (!($adapter instanceof Zend_ProgressBar)) { - require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Unknown Adapter given'); } diff --git a/library/vendor/Zend/File/Transfer/Exception.php b/library/vendor/Zend/File/Transfer/Exception.php index f9dae44bb..e0b868650 100644 --- a/library/vendor/Zend/File/Transfer/Exception.php +++ b/library/vendor/Zend/File/Transfer/Exception.php @@ -22,7 +22,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Exception class for Zend_File_Transfer diff --git a/library/vendor/Zend/Filter.php b/library/vendor/Zend/Filter.php index 8a9305e37..12fd93c8c 100644 --- a/library/vendor/Zend/Filter.php +++ b/library/vendor/Zend/Filter.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -206,7 +205,6 @@ class Zend_Filter implements Zend_Filter_Interface */ public static function filterStatic($value, $classBaseName, array $args = array(), $namespaces = array()) { - require_once 'Zend/Loader.php'; $namespaces = array_merge((array) $namespaces, self::$_defaultNamespaces, array('Zend_Filter')); foreach ($namespaces as $namespace) { $className = $namespace . '_' . ucfirst($classBaseName); @@ -233,7 +231,6 @@ class Zend_Filter implements Zend_Filter_Interface return $object->filter($value); } } - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Filter class not found from basename '$classBaseName'"); } } diff --git a/library/vendor/Zend/Filter/Alnum.php b/library/vendor/Zend/Filter/Alnum.php index cbfd8ff99..f0b86b355 100644 --- a/library/vendor/Zend/Filter/Alnum.php +++ b/library/vendor/Zend/Filter/Alnum.php @@ -22,11 +22,9 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @see Zend_Locale */ -require_once 'Zend/Locale.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/Alpha.php b/library/vendor/Zend/Filter/Alpha.php index 0cc75c43b..4fe835c30 100644 --- a/library/vendor/Zend/Filter/Alpha.php +++ b/library/vendor/Zend/Filter/Alpha.php @@ -22,11 +22,9 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @see Zend_Locale */ -require_once 'Zend/Locale.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/BaseName.php b/library/vendor/Zend/Filter/BaseName.php index e6a15d0e3..3c0143792 100644 --- a/library/vendor/Zend/Filter/BaseName.php +++ b/library/vendor/Zend/Filter/BaseName.php @@ -24,7 +24,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** diff --git a/library/vendor/Zend/Filter/Boolean.php b/library/vendor/Zend/Filter/Boolean.php index 555b11eab..86a8db989 100644 --- a/library/vendor/Zend/Filter/Boolean.php +++ b/library/vendor/Zend/Filter/Boolean.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -154,7 +153,6 @@ class Zend_Filter_Boolean implements Zend_Filter_Interface } if (!is_int($type) || ($type < 0) || ($type > self::ALL)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Unknown type'); } @@ -186,14 +184,11 @@ class Zend_Filter_Boolean implements Zend_Filter_Interface } elseif ($locale instanceof Zend_Locale) { $locale = array($locale->toString()); } elseif (!is_array($locale)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Locale has to be string, array or an instance of Zend_Locale'); } - require_once 'Zend/Locale.php'; foreach ($locale as $single) { if (!Zend_Locale::isLocale($single)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Unknown locale '$single'"); } } @@ -244,7 +239,6 @@ class Zend_Filter_Boolean implements Zend_Filter_Interface if ($type >= self::YES) { $type -= self::YES; if (is_string($value)) { - require_once 'Zend/Locale.php'; $locales = $this->getLocale(); foreach ($locales as $locale) { if ($this->_getLocalizedQuestion($value, false, $locale) === false) { diff --git a/library/vendor/Zend/Filter/Callback.php b/library/vendor/Zend/Filter/Callback.php index cc6b32af0..017fc4f83 100644 --- a/library/vendor/Zend/Filter/Callback.php +++ b/library/vendor/Zend/Filter/Callback.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -67,7 +66,6 @@ class Zend_Filter_Callback implements Zend_Filter_Interface } if (!array_key_exists('callback', $options)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Missing callback to use'); } @@ -96,7 +94,6 @@ class Zend_Filter_Callback implements Zend_Filter_Interface public function setCallback($callback, $options = null) { if (!is_callable($callback)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Callback can not be accessed'); } diff --git a/library/vendor/Zend/Filter/Compress.php b/library/vendor/Zend/Filter/Compress.php index e54230dda..c6b17e2ee 100644 --- a/library/vendor/Zend/Filter/Compress.php +++ b/library/vendor/Zend/Filter/Compress.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * Compresses a given string @@ -97,7 +96,6 @@ class Zend_Filter_Compress implements Zend_Filter_Interface $adapter = $this->_adapter; $options = $this->getAdapterOptions(); if (!class_exists($adapter)) { - require_once 'Zend/Loader.php'; if (Zend_Loader::isReadable('Zend/Filter/Compress/' . ucfirst($adapter) . '.php')) { $adapter = 'Zend_Filter_Compress_' . ucfirst($adapter); } @@ -106,7 +104,6 @@ class Zend_Filter_Compress implements Zend_Filter_Interface $this->_adapter = new $adapter($options); if (!$this->_adapter instanceof Zend_Filter_Compress_CompressInterface) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Compression adapter '" . $adapter . "' does not implement Zend_Filter_Compress_CompressInterface"); } return $this->_adapter; @@ -135,7 +132,6 @@ class Zend_Filter_Compress implements Zend_Filter_Interface return $this; } if (!is_string($adapter)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Invalid adapter provided; must be string or instance of Zend_Filter_Compress_CompressInterface'); } $this->_adapter = $adapter; @@ -175,7 +171,6 @@ class Zend_Filter_Compress implements Zend_Filter_Interface { $adapter = $this->getAdapter(); if (!method_exists($adapter, $method)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Unknown method '{$method}'"); } diff --git a/library/vendor/Zend/Filter/Compress/Bz2.php b/library/vendor/Zend/Filter/Compress/Bz2.php index c02fbb615..fba7d009f 100644 --- a/library/vendor/Zend/Filter/Compress/Bz2.php +++ b/library/vendor/Zend/Filter/Compress/Bz2.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Compress_CompressAbstract */ -require_once 'Zend/Filter/Compress/CompressAbstract.php'; /** * Compression adapter for Bz2 @@ -56,7 +55,6 @@ class Zend_Filter_Compress_Bz2 extends Zend_Filter_Compress_CompressAbstract public function __construct($options = null) { if (!extension_loaded('bz2')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the bz2 extension'); } parent::__construct($options); @@ -81,7 +79,6 @@ class Zend_Filter_Compress_Bz2 extends Zend_Filter_Compress_CompressAbstract public function setBlocksize($blocksize) { if (($blocksize < 0) || ($blocksize > 9)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Blocksize must be between 0 and 9'); } @@ -123,7 +120,6 @@ class Zend_Filter_Compress_Bz2 extends Zend_Filter_Compress_CompressAbstract if (!empty($archive)) { $file = bzopen($archive, 'w'); if (!$file) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error opening the archive '" . $archive . "'"); } @@ -135,7 +131,6 @@ class Zend_Filter_Compress_Bz2 extends Zend_Filter_Compress_CompressAbstract } if (is_int($compressed)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during compression'); } @@ -158,7 +153,6 @@ class Zend_Filter_Compress_Bz2 extends Zend_Filter_Compress_CompressAbstract if (@file_exists($archive)) { $file = bzopen($archive, 'r'); if (!$file) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error opening the archive '" . $content . "'"); } @@ -169,7 +163,6 @@ class Zend_Filter_Compress_Bz2 extends Zend_Filter_Compress_CompressAbstract } if (is_int($compressed)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during decompression'); } diff --git a/library/vendor/Zend/Filter/Compress/CompressAbstract.php b/library/vendor/Zend/Filter/Compress/CompressAbstract.php index 5e0a643d3..bbcaa325c 100644 --- a/library/vendor/Zend/Filter/Compress/CompressAbstract.php +++ b/library/vendor/Zend/Filter/Compress/CompressAbstract.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Compress_CompressInterface */ -require_once 'Zend/Filter/Compress/CompressInterface.php'; /** * Abstract compression adapter diff --git a/library/vendor/Zend/Filter/Compress/Gz.php b/library/vendor/Zend/Filter/Compress/Gz.php index 093bdc5f3..f21e92208 100644 --- a/library/vendor/Zend/Filter/Compress/Gz.php +++ b/library/vendor/Zend/Filter/Compress/Gz.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Compress_CompressAbstract */ -require_once 'Zend/Filter/Compress/CompressAbstract.php'; /** * Compression adapter for Gzip (ZLib) @@ -58,7 +57,6 @@ class Zend_Filter_Compress_Gz extends Zend_Filter_Compress_CompressAbstract public function __construct($options = null) { if (!extension_loaded('zlib')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the zlib extension'); } parent::__construct($options); @@ -83,7 +81,6 @@ class Zend_Filter_Compress_Gz extends Zend_Filter_Compress_CompressAbstract public function setLevel($level) { if (($level < 0) || ($level > 9)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Level must be between 0 and 9'); } @@ -109,7 +106,6 @@ class Zend_Filter_Compress_Gz extends Zend_Filter_Compress_CompressAbstract public function setMode($mode) { if (($mode != 'compress') && ($mode != 'deflate')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Given compression mode not supported'); } @@ -151,7 +147,6 @@ class Zend_Filter_Compress_Gz extends Zend_Filter_Compress_CompressAbstract if (!empty($archive)) { $file = gzopen($archive, 'w' . $this->getLevel()); if (!$file) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error opening the archive '" . $this->_options['archive'] . "'"); } @@ -165,7 +160,6 @@ class Zend_Filter_Compress_Gz extends Zend_Filter_Compress_CompressAbstract } if (!$compressed) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during compression'); } @@ -189,7 +183,6 @@ class Zend_Filter_Compress_Gz extends Zend_Filter_Compress_CompressAbstract if (@file_exists($archive)) { $handler = fopen($archive, "rb"); if (!$handler) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error opening the archive '" . $archive . "'"); } @@ -209,7 +202,6 @@ class Zend_Filter_Compress_Gz extends Zend_Filter_Compress_CompressAbstract } if (!$compressed) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during compression'); } diff --git a/library/vendor/Zend/Filter/Compress/Lzf.php b/library/vendor/Zend/Filter/Compress/Lzf.php index 822daf81e..ba05d0cb6 100644 --- a/library/vendor/Zend/Filter/Compress/Lzf.php +++ b/library/vendor/Zend/Filter/Compress/Lzf.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Compress_CompressInterface */ -require_once 'Zend/Filter/Compress/CompressInterface.php'; /** * Compression adapter for Lzf @@ -40,7 +39,6 @@ class Zend_Filter_Compress_Lzf implements Zend_Filter_Compress_CompressInterface public function __construct() { if (!extension_loaded('lzf')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the lzf extension'); } } @@ -55,7 +53,6 @@ class Zend_Filter_Compress_Lzf implements Zend_Filter_Compress_CompressInterface { $compressed = lzf_compress($content); if (!$compressed) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during compression'); } @@ -72,7 +69,6 @@ class Zend_Filter_Compress_Lzf implements Zend_Filter_Compress_CompressInterface { $compressed = lzf_decompress($content); if (!$compressed) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during compression'); } diff --git a/library/vendor/Zend/Filter/Compress/Rar.php b/library/vendor/Zend/Filter/Compress/Rar.php index 557d96560..51b3c25fe 100644 --- a/library/vendor/Zend/Filter/Compress/Rar.php +++ b/library/vendor/Zend/Filter/Compress/Rar.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Compress_CompressAbstract */ -require_once 'Zend/Filter/Compress/CompressAbstract.php'; /** * Compression adapter for Rar @@ -60,7 +59,6 @@ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract public function __construct($options = null) { if (!extension_loaded('rar')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the rar extension'); } parent::__construct($options); @@ -85,7 +83,6 @@ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract public function setCallback($callback) { if (!is_callable($callback)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Callback can not be accessed'); } @@ -158,7 +155,6 @@ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract public function setTarget($target) { if (!file_exists(dirname($target))) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The directory '$target' does not exist"); } @@ -177,7 +173,6 @@ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract { $callback = $this->getCallback(); if ($callback === null) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('No compression callback available'); } @@ -186,7 +181,6 @@ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract $result = call_user_func($callback, $options, $content); if ($result !== true) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error compressing the RAR Archive'); } @@ -205,7 +199,6 @@ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract if (file_exists($content)) { $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content)); } elseif (empty($archive) || !file_exists($archive)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('RAR Archive not found'); } @@ -217,7 +210,6 @@ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract } if (!$archive) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error opening the RAR Archive"); } @@ -228,7 +220,6 @@ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract $filelist = rar_list($archive); if (!$filelist) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error reading the RAR Archive"); } diff --git a/library/vendor/Zend/Filter/Compress/Tar.php b/library/vendor/Zend/Filter/Compress/Tar.php index 5c9cb54a4..6f14fa6e2 100644 --- a/library/vendor/Zend/Filter/Compress/Tar.php +++ b/library/vendor/Zend/Filter/Compress/Tar.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Compress_CompressAbstract */ -require_once 'Zend/Filter/Compress/CompressAbstract.php'; /** * Compression adapter for Tar @@ -57,11 +56,9 @@ class Zend_Filter_Compress_Tar extends Zend_Filter_Compress_CompressAbstract public function __construct($options = null) { if (!class_exists('Archive_Tar')) { - require_once 'Zend/Loader.php'; try { Zend_Loader::loadClass('Archive_Tar'); } catch (Zend_Exception $e) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs PEARs Archive_Tar', 0, $e); } } @@ -112,7 +109,6 @@ class Zend_Filter_Compress_Tar extends Zend_Filter_Compress_CompressAbstract public function setTarget($target) { if (!file_exists(dirname($target))) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The directory '$target' does not exist"); } @@ -139,17 +135,14 @@ class Zend_Filter_Compress_Tar extends Zend_Filter_Compress_CompressAbstract { $mode = ucfirst(strtolower($mode)); if (($mode != 'Bz2') && ($mode != 'Gz')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The mode '$mode' is unknown"); } if (($mode == 'Bz2') && (!extension_loaded('bz2'))) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This mode needs the bz2 extension'); } if (($mode == 'Gz') && (!extension_loaded('zlib'))) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This mode needs the zlib extension'); } } @@ -171,7 +164,6 @@ class Zend_Filter_Compress_Tar extends Zend_Filter_Compress_CompressAbstract $result = file_put_contents($file, $content); if ($result === false) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error creating the temporary file'); } @@ -195,7 +187,6 @@ class Zend_Filter_Compress_Tar extends Zend_Filter_Compress_CompressAbstract $result = $archive->create($content); if ($result === false) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error creating the Tar archive'); } @@ -214,7 +205,6 @@ class Zend_Filter_Compress_Tar extends Zend_Filter_Compress_CompressAbstract if (file_exists($content)) { $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content)); } elseif (empty($archive) || !file_exists($archive)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Tar Archive not found'); } @@ -226,7 +216,6 @@ class Zend_Filter_Compress_Tar extends Zend_Filter_Compress_CompressAbstract $result = $archive->extract($target); if ($result === false) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error while extracting the Tar archive'); } diff --git a/library/vendor/Zend/Filter/Compress/Zip.php b/library/vendor/Zend/Filter/Compress/Zip.php index 631aa4441..7b4eb423f 100644 --- a/library/vendor/Zend/Filter/Compress/Zip.php +++ b/library/vendor/Zend/Filter/Compress/Zip.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Compress_CompressAbstract */ -require_once 'Zend/Filter/Compress/CompressAbstract.php'; /** * Compression adapter for zip @@ -57,7 +56,6 @@ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract public function __construct($options = null) { if (!extension_loaded('zip')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the zip extension'); } parent::__construct($options); @@ -106,7 +104,6 @@ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract public function setTarget($target) { if (!file_exists(dirname($target))) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The directory '$target' does not exist"); } @@ -127,7 +124,6 @@ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract $res = $zip->open($this->getArchive(), ZipArchive::CREATE | ZipArchive::OVERWRITE); if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } @@ -163,7 +159,6 @@ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract foreach ($files as $file) { $zip->addFile($current . $file, $local . $file); if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } } @@ -171,7 +166,6 @@ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract } else { $res = $zip->addFile($content, $basename); if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } } @@ -185,7 +179,6 @@ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract $res = $zip->addFromString($file, $content); if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } } @@ -206,7 +199,6 @@ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract if (file_exists($content)) { $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content)); } elseif (empty($archive) || !file_exists($archive)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('ZIP Archive not found'); } @@ -224,12 +216,10 @@ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract } if (empty($target) || !is_dir($target)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('No target for ZIP decompression set'); } if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } @@ -242,7 +232,6 @@ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract (substr($currName, 0, 4) == './..') ) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Upward directory traversal was detected inside ' . $archive . ' please use PHP 5.2.8 or greater to take advantage of path resolution features of ' . 'the zip extension in this decompress() method.' @@ -253,7 +242,6 @@ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract $res = @$zip->extractTo($target); if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } diff --git a/library/vendor/Zend/Filter/Decompress.php b/library/vendor/Zend/Filter/Decompress.php index ebc136429..52ba2aafa 100644 --- a/library/vendor/Zend/Filter/Decompress.php +++ b/library/vendor/Zend/Filter/Decompress.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Compress */ -require_once 'Zend/Filter/Compress.php'; /** * Decompresses a given string diff --git a/library/vendor/Zend/Filter/Decrypt.php b/library/vendor/Zend/Filter/Decrypt.php index fee1f5f43..0c9c47455 100644 --- a/library/vendor/Zend/Filter/Decrypt.php +++ b/library/vendor/Zend/Filter/Decrypt.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Encrypt */ -require_once 'Zend/Filter/Encrypt.php'; /** * Decrypts a given string diff --git a/library/vendor/Zend/Filter/Digits.php b/library/vendor/Zend/Filter/Digits.php index b3f49e814..6031c1121 100644 --- a/library/vendor/Zend/Filter/Digits.php +++ b/library/vendor/Zend/Filter/Digits.php @@ -24,7 +24,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** diff --git a/library/vendor/Zend/Filter/Dir.php b/library/vendor/Zend/Filter/Dir.php index 0bfa754d5..8a2aaf81f 100644 --- a/library/vendor/Zend/Filter/Dir.php +++ b/library/vendor/Zend/Filter/Dir.php @@ -24,7 +24,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** diff --git a/library/vendor/Zend/Filter/Encrypt.php b/library/vendor/Zend/Filter/Encrypt.php index abd5062ce..5282cf5b3 100644 --- a/library/vendor/Zend/Filter/Encrypt.php +++ b/library/vendor/Zend/Filter/Encrypt.php @@ -22,12 +22,10 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; /** * Encrypts a given string @@ -99,7 +97,6 @@ class Zend_Filter_Encrypt implements Zend_Filter_Interface $this->_adapter = new $adapter($options); if (!$this->_adapter instanceof Zend_Filter_Encrypt_Interface) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Encoding adapter '" . $adapter . "' does not implement Zend_Filter_Encrypt_Interface"); } @@ -116,7 +113,6 @@ class Zend_Filter_Encrypt implements Zend_Filter_Interface { $part = substr($method, 0, 3); if ((($part != 'get') and ($part != 'set')) or !method_exists($this->_adapter, $method)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Unknown method '{$method}'"); } diff --git a/library/vendor/Zend/Filter/Encrypt/Mcrypt.php b/library/vendor/Zend/Filter/Encrypt/Mcrypt.php index 48d95d809..3b2b77c1b 100644 --- a/library/vendor/Zend/Filter/Encrypt/Mcrypt.php +++ b/library/vendor/Zend/Filter/Encrypt/Mcrypt.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Encrypt_Interface */ -require_once 'Zend/Filter/Encrypt/Interface.php'; /** * Encryption adapter for mcrypt @@ -71,7 +70,6 @@ class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface public function __construct($options) { if (!extension_loaded('mcrypt')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the mcrypt extension'); } @@ -80,7 +78,6 @@ class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface } elseif (is_string($options)) { $options = array('key' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Invalid options argument provided to filter'); } @@ -115,25 +112,21 @@ class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface } if (!is_array($options)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Invalid options argument provided to filter'); } $options = $options + $this->getEncryption(); $algorithms = mcrypt_list_algorithms($options['algorithm_directory']); if (!in_array($options['algorithm'], $algorithms)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The algorithm '{$options['algorithm']}' is not supported"); } $modes = mcrypt_list_modes($options['mode_directory']); if (!in_array($options['mode'], $modes)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The mode '{$options['mode']}' is not supported"); } if (!mcrypt_module_self_test($options['algorithm'], $options['algorithm_directory'])) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('The given algorithm can not be used due an internal mcrypt problem'); } @@ -182,7 +175,6 @@ class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface } $vector = mcrypt_create_iv($size, $method); } else if (strlen($vector) != $size) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('The given vector has a wrong size for the set algorithm'); } @@ -230,7 +222,6 @@ class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface { // compress prior to encryption if (!empty($this->_compression)) { - require_once 'Zend/Filter/Compress.php'; $compress = new Zend_Filter_Compress($this->_compression); $value = $compress->filter($value); } @@ -262,7 +253,6 @@ class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface // decompress after decryption if (!empty($this->_compression)) { - require_once 'Zend/Filter/Decompress.php'; $decompress = new Zend_Filter_Decompress($this->_compression); $decrypted = $decompress->filter($decrypted); } @@ -295,7 +285,6 @@ class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface $this->_encryption['mode_directory']); if ($cipher === false) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Mcrypt can not be opened with your settings'); } @@ -332,13 +321,11 @@ class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface $keysize = mcrypt_enc_get_key_size($cipher); $key = substr(md5($key), 0, $keysize); } else if (!in_array(strlen($key), $keysizes)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('The given key has a wrong size for the set algorithm'); } $result = mcrypt_generic_init($cipher, $key, $this->_encryption['vector']); if ($result < 0) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Mcrypt could not be initialize with the given setting'); } diff --git a/library/vendor/Zend/Filter/Encrypt/Openssl.php b/library/vendor/Zend/Filter/Encrypt/Openssl.php index ef03cc192..5239ea436 100644 --- a/library/vendor/Zend/Filter/Encrypt/Openssl.php +++ b/library/vendor/Zend/Filter/Encrypt/Openssl.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Encrypt_Interface */ -require_once 'Zend/Filter/Encrypt/Interface.php'; /** * Encryption adapter for openssl @@ -84,7 +83,6 @@ class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface public function __construct($options = array()) { if (!extension_loaded('openssl')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the openssl extension'); } @@ -123,7 +121,6 @@ class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface protected function _setKeys($keys) { if (!is_array($keys)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Invalid options argument provided to filter'); } @@ -141,7 +138,6 @@ class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface case 'public': $test = openssl_pkey_get_public($cert); if ($test === false) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Public key '{$cert}' not valid"); } @@ -151,7 +147,6 @@ class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface case 'private': $test = openssl_pkey_get_private($cert, $this->_passphrase); if ($test === false) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Private key '{$cert}' not valid"); } @@ -357,7 +352,6 @@ class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface $encryptedkeys = array(); if (count($this->_keys['public']) == 0) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Openssl can not encrypt without public keys'); } @@ -379,7 +373,6 @@ class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface // compress prior to encryption if (!empty($this->_compression)) { - require_once 'Zend/Filter/Compress.php'; $compress = new Zend_Filter_Compress($this->_compression); $value = $compress->filter($value); } @@ -390,7 +383,6 @@ class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface } if ($crypt === false) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Openssl was not able to encrypt your content with the given options'); } @@ -424,12 +416,10 @@ class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface $envelope = current($this->getEnvelopeKey()); if (count($this->_keys['private']) !== 1) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Please give a private key for decryption with Openssl'); } if (!$this->_package && empty($envelope)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Please give a envelope key for decryption with Openssl'); } @@ -466,13 +456,11 @@ class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface openssl_free_key($keys); if ($crypt === false) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Openssl was not able to decrypt you content with the given options'); } // decompress after decryption if (!empty($this->_compression)) { - require_once 'Zend/Filter/Decompress.php'; $decompress = new Zend_Filter_Decompress($this->_compression); $decrypted = $decompress->filter($decrypted); } diff --git a/library/vendor/Zend/Filter/Exception.php b/library/vendor/Zend/Filter/Exception.php index ecc95b2b9..10e9b8ac6 100644 --- a/library/vendor/Zend/Filter/Exception.php +++ b/library/vendor/Zend/Filter/Exception.php @@ -24,7 +24,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Filter/File/Decrypt.php b/library/vendor/Zend/Filter/File/Decrypt.php index 8af2c6b63..1b1029524 100644 --- a/library/vendor/Zend/Filter/File/Decrypt.php +++ b/library/vendor/Zend/Filter/File/Decrypt.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Decrypt */ -require_once 'Zend/Filter/Decrypt.php'; /** * Decrypts a given file and stores the decrypted file content @@ -74,7 +73,6 @@ class Zend_Filter_File_Decrypt extends Zend_Filter_Decrypt public function filter($value) { if (!file_exists($value)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' not found"); } @@ -83,13 +81,11 @@ class Zend_Filter_File_Decrypt extends Zend_Filter_Decrypt } if (file_exists($this->_filename) and !is_writable($this->_filename)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '{$this->_filename}' is not writable"); } $content = file_get_contents($value); if (!$content) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while reading file '$value'"); } @@ -97,7 +93,6 @@ class Zend_Filter_File_Decrypt extends Zend_Filter_Decrypt $result = file_put_contents($this->_filename, $decrypted); if (!$result) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while writing file '{$this->_filename}'"); } diff --git a/library/vendor/Zend/Filter/File/Encrypt.php b/library/vendor/Zend/Filter/File/Encrypt.php index fb0fe1470..c37c23ff2 100644 --- a/library/vendor/Zend/Filter/File/Encrypt.php +++ b/library/vendor/Zend/Filter/File/Encrypt.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Encrypt */ -require_once 'Zend/Filter/Encrypt.php'; /** * Encrypts a given file and stores the encrypted file content @@ -74,7 +73,6 @@ class Zend_Filter_File_Encrypt extends Zend_Filter_Encrypt public function filter($value) { if (!file_exists($value)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' not found"); } @@ -83,13 +81,11 @@ class Zend_Filter_File_Encrypt extends Zend_Filter_Encrypt } if (file_exists($this->_filename) and !is_writable($this->_filename)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '{$this->_filename}' is not writable"); } $content = file_get_contents($value); if (!$content) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while reading file '$value'"); } @@ -97,7 +93,6 @@ class Zend_Filter_File_Encrypt extends Zend_Filter_Encrypt $result = file_put_contents($this->_filename, $encrypted); if (!$result) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while writing file '{$this->_filename}'"); } diff --git a/library/vendor/Zend/Filter/File/LowerCase.php b/library/vendor/Zend/Filter/File/LowerCase.php index 4d2b2bae5..8a2d755cd 100644 --- a/library/vendor/Zend/Filter/File/LowerCase.php +++ b/library/vendor/Zend/Filter/File/LowerCase.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_StringToLower */ -require_once 'Zend/Filter/StringToLower.php'; /** * @category Zend @@ -56,18 +55,15 @@ class Zend_Filter_File_LowerCase extends Zend_Filter_StringToLower public function filter($value) { if (!file_exists($value)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' not found"); } if (!is_writable($value)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' is not writable"); } $content = file_get_contents($value); if (!$content) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while reading file '$value'"); } @@ -75,7 +71,6 @@ class Zend_Filter_File_LowerCase extends Zend_Filter_StringToLower $result = file_put_contents($value, $content); if (!$result) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while writing file '$value'"); } diff --git a/library/vendor/Zend/Filter/File/Rename.php b/library/vendor/Zend/Filter/File/Rename.php index b894d0684..cec3b2546 100644 --- a/library/vendor/Zend/Filter/File/Rename.php +++ b/library/vendor/Zend/Filter/File/Rename.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -58,7 +57,6 @@ class Zend_Filter_File_Rename implements Zend_Filter_Interface } elseif (is_string($options)) { $options = array('target' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Invalid options argument provided to filter'); } @@ -122,7 +120,6 @@ class Zend_Filter_File_Rename implements Zend_Filter_Interface if (is_string($options)) { $options = array('target' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception ('Invalid options to rename filter provided'); } @@ -160,7 +157,6 @@ class Zend_Filter_File_Rename implements Zend_Filter_Interface } if (file_exists($file['target'])) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception(sprintf("File '%s' could not be renamed. It already exists.", $value)); } @@ -194,7 +190,6 @@ class Zend_Filter_File_Rename implements Zend_Filter_Interface return $file['target']; } - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception(sprintf("File '%s' could not be renamed. An error occured while processing the file.", $value)); } diff --git a/library/vendor/Zend/Filter/File/UpperCase.php b/library/vendor/Zend/Filter/File/UpperCase.php index 0592dbeaa..c99e8b8ad 100644 --- a/library/vendor/Zend/Filter/File/UpperCase.php +++ b/library/vendor/Zend/Filter/File/UpperCase.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_StringToUpper */ -require_once 'Zend/Filter/StringToUpper.php'; /** * @category Zend @@ -56,18 +55,15 @@ class Zend_Filter_File_UpperCase extends Zend_Filter_StringToUpper public function filter($value) { if (!file_exists($value)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' not found"); } if (!is_writable($value)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' is not writable"); } $content = file_get_contents($value); if (!$content) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while reading file '$value'"); } @@ -75,7 +71,6 @@ class Zend_Filter_File_UpperCase extends Zend_Filter_StringToUpper $result = file_put_contents($value, $content); if (!$result) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while writing file '$value'"); } diff --git a/library/vendor/Zend/Filter/HtmlEntities.php b/library/vendor/Zend/Filter/HtmlEntities.php index 0a73b89a9..9c6acb8f6 100644 --- a/library/vendor/Zend/Filter/HtmlEntities.php +++ b/library/vendor/Zend/Filter/HtmlEntities.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -200,14 +199,12 @@ class Zend_Filter_HtmlEntities implements Zend_Filter_Interface $filtered = htmlentities((string) $value, $this->getQuoteStyle(), $this->getEncoding(), $this->getDoubleQuote()); if (strlen((string) $value) && !strlen($filtered)) { if (!function_exists('iconv')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Encoding mismatch has resulted in htmlentities errors'); } $enc = $this->getEncoding(); $value = iconv('', $enc . '//IGNORE', (string) $value); $filtered = htmlentities($value, $this->getQuoteStyle(), $enc, $this->getDoubleQuote()); if (!strlen($filtered)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Encoding mismatch has resulted in htmlentities errors'); } } diff --git a/library/vendor/Zend/Filter/Inflector.php b/library/vendor/Zend/Filter/Inflector.php index 6d4e47856..65a872dd9 100644 --- a/library/vendor/Zend/Filter/Inflector.php +++ b/library/vendor/Zend/Filter/Inflector.php @@ -23,12 +23,10 @@ * @see Zend_Filter * @see Zend_Filter_Interface */ -require_once 'Zend/Filter.php'; /** * @see Zend_Loader_PluginLoader */ -require_once 'Zend/Loader/PluginLoader.php'; /** * Filter chain for string inflection @@ -483,7 +481,6 @@ class Zend_Filter_Inflector implements Zend_Filter_Interface $inflectedTarget = preg_replace(array_keys($processedParts), array_values($processedParts), $this->_target); if ($this->_throwTargetExceptionsOn && (preg_match('#(?='.$pregQuotedTargetReplacementIdentifier.'[A-Za-z]{1})#', $inflectedTarget) == true)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('A replacement identifier ' . $this->_targetReplacementIdentifier . ' was found inside the inflected target, perhaps a rule was not satisfied with a target source? Unsatisfied inflected target: ' . $inflectedTarget); } @@ -518,7 +515,6 @@ class Zend_Filter_Inflector implements Zend_Filter_Interface $className = $this->getPluginLoader()->load($rule); $ruleObject = new $className(); if (!$ruleObject instanceof Zend_Filter_Interface) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('No class named ' . $rule . ' implementing Zend_Filter_Interface could be found'); } diff --git a/library/vendor/Zend/Filter/Input.php b/library/vendor/Zend/Filter/Input.php index 8a5633038..f892137d6 100644 --- a/library/vendor/Zend/Filter/Input.php +++ b/library/vendor/Zend/Filter/Input.php @@ -22,17 +22,14 @@ /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; /** * @see Zend_Filter */ -require_once 'Zend/Filter.php'; /** * @see Zend_Validate */ -require_once 'Zend/Validate.php'; /** * @category Zend @@ -242,7 +239,6 @@ class Zend_Filter_Input $this->_loaders[$type] = $loader; return $this; default: - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type)); } @@ -277,11 +273,9 @@ class Zend_Filter_Input $pathSegment = 'Zend/Validate/'; break; default: - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } - require_once 'Zend/Loader/PluginLoader.php'; $this->_loaders[$type] = new Zend_Loader_PluginLoader( array($prefixSegment => $pathSegment) ); @@ -464,11 +458,9 @@ class Zend_Filter_Input { $this->_process(); if ($this->hasInvalid()) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Input has invalid fields"); } if ($this->hasMissing()) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Input has missing fields"); } @@ -507,7 +499,6 @@ class Zend_Filter_Input $escapeFilter = $this->_getFilter($escapeFilter); } if (!$escapeFilter instanceof Zend_Filter_Interface) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Escape filter specified does not implement Zend_Filter_Interface'); } $this->_defaultEscapeFilter = $escapeFilter; @@ -561,7 +552,6 @@ class Zend_Filter_Input $this->_defaults[$option] = $value; break; default: - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Unknown option '$option'"); break; } @@ -583,7 +573,6 @@ class Zend_Filter_Input } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid translator specified'); } @@ -602,7 +591,6 @@ class Zend_Filter_Input } if ($this->_translator === null) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $translator = Zend_Registry::get('Zend_Translate'); if ($translator instanceof Zend_Translate_Adapter) { @@ -1193,7 +1181,6 @@ class Zend_Filter_Input $class = new ReflectionClass($className); if (!$class->implementsInterface($interfaceName)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Class '$className' based on basename '$classBaseName' must implement the '$interfaceName' interface"); } diff --git a/library/vendor/Zend/Filter/Int.php b/library/vendor/Zend/Filter/Int.php index 45498f8bc..d2de695de 100644 --- a/library/vendor/Zend/Filter/Int.php +++ b/library/vendor/Zend/Filter/Int.php @@ -24,7 +24,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** diff --git a/library/vendor/Zend/Filter/LocalizedToNormalized.php b/library/vendor/Zend/Filter/LocalizedToNormalized.php index 826b20de0..e993738c6 100644 --- a/library/vendor/Zend/Filter/LocalizedToNormalized.php +++ b/library/vendor/Zend/Filter/LocalizedToNormalized.php @@ -22,12 +22,10 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @see Zend_Loader */ -require_once 'Zend/Locale/Format.php'; /** * Normalizes given localized input diff --git a/library/vendor/Zend/Filter/NormalizedToLocalized.php b/library/vendor/Zend/Filter/NormalizedToLocalized.php index 8482e8703..461e9ab05 100644 --- a/library/vendor/Zend/Filter/NormalizedToLocalized.php +++ b/library/vendor/Zend/Filter/NormalizedToLocalized.php @@ -22,12 +22,10 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @see Zend_Loader */ -require_once 'Zend/Locale/Format.php'; /** * Localizes given normalized input @@ -97,7 +95,6 @@ class Zend_Filter_NormalizedToLocalized implements Zend_Filter_Interface public function filter($value) { if (is_array($value)) { - require_once 'Zend/Date.php'; $date = new Zend_Date($value, $this->_options['locale']); return $date->toString($this->_options['date_format']); } else if ($this->_options['precision'] === 0) { diff --git a/library/vendor/Zend/Filter/Null.php b/library/vendor/Zend/Filter/Null.php index 047ef8ae7..6e97af08e 100644 --- a/library/vendor/Zend/Filter/Null.php +++ b/library/vendor/Zend/Filter/Null.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -117,7 +116,6 @@ class Zend_Filter_Null implements Zend_Filter_Interface } if (!is_int($type) || ($type < 0) || ($type > self::ALL)) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Unknown type'); } diff --git a/library/vendor/Zend/Filter/PregReplace.php b/library/vendor/Zend/Filter/PregReplace.php index 4b2506770..356052ae0 100644 --- a/library/vendor/Zend/Filter/PregReplace.php +++ b/library/vendor/Zend/Filter/PregReplace.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -164,7 +163,6 @@ class Zend_Filter_PregReplace implements Zend_Filter_Interface public function filter($value) { if ($this->_matchPattern == null) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception(get_class($this) . ' does not have a valid MatchPattern set.'); } diff --git a/library/vendor/Zend/Filter/RealPath.php b/library/vendor/Zend/Filter/RealPath.php index 4cd4c951a..7da9e55bb 100644 --- a/library/vendor/Zend/Filter/RealPath.php +++ b/library/vendor/Zend/Filter/RealPath.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/StringToLower.php b/library/vendor/Zend/Filter/StringToLower.php index a15a3b932..e2970e4b5 100644 --- a/library/vendor/Zend/Filter/StringToLower.php +++ b/library/vendor/Zend/Filter/StringToLower.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -87,13 +86,11 @@ class Zend_Filter_StringToLower implements Zend_Filter_Interface { if ($encoding !== null) { if (!function_exists('mb_strtolower')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('mbstring is required for this feature'); } $encoding = (string) $encoding; if (!in_array(strtolower($encoding), array_map('strtolower', mb_list_encodings()))) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The given encoding '$encoding' is not supported by mbstring"); } } diff --git a/library/vendor/Zend/Filter/StringToUpper.php b/library/vendor/Zend/Filter/StringToUpper.php index 83d7a914c..689d2c0af 100644 --- a/library/vendor/Zend/Filter/StringToUpper.php +++ b/library/vendor/Zend/Filter/StringToUpper.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -87,13 +86,11 @@ class Zend_Filter_StringToUpper implements Zend_Filter_Interface { if ($encoding !== null) { if (!function_exists('mb_strtoupper')) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('mbstring is required for this feature'); } $encoding = (string) $encoding; if (!in_array(strtolower($encoding), array_map('strtolower', mb_list_encodings()))) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The given encoding '$encoding' is not supported by mbstring"); } } diff --git a/library/vendor/Zend/Filter/StringTrim.php b/library/vendor/Zend/Filter/StringTrim.php index efdc8ff5a..cb9c4380e 100644 --- a/library/vendor/Zend/Filter/StringTrim.php +++ b/library/vendor/Zend/Filter/StringTrim.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/StripNewlines.php b/library/vendor/Zend/Filter/StripNewlines.php index d7996c46a..33f0a01f1 100644 --- a/library/vendor/Zend/Filter/StripNewlines.php +++ b/library/vendor/Zend/Filter/StripNewlines.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/StripTags.php b/library/vendor/Zend/Filter/StripTags.php index 6f9f46ee8..2bfb905bf 100644 --- a/library/vendor/Zend/Filter/StripTags.php +++ b/library/vendor/Zend/Filter/StripTags.php @@ -23,7 +23,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; /** diff --git a/library/vendor/Zend/Filter/Word/CamelCaseToDash.php b/library/vendor/Zend/Filter/Word/CamelCaseToDash.php index f30802c0d..8d8b7f598 100644 --- a/library/vendor/Zend/Filter/Word/CamelCaseToDash.php +++ b/library/vendor/Zend/Filter/Word/CamelCaseToDash.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Word/CamelCaseToSeparator.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/Word/CamelCaseToSeparator.php b/library/vendor/Zend/Filter/Word/CamelCaseToSeparator.php index 881491d6a..5261daaf1 100644 --- a/library/vendor/Zend/Filter/Word/CamelCaseToSeparator.php +++ b/library/vendor/Zend/Filter/Word/CamelCaseToSeparator.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/Separator/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/Word/CamelCaseToUnderscore.php b/library/vendor/Zend/Filter/Word/CamelCaseToUnderscore.php index 6a9591cd0..0fd448809 100644 --- a/library/vendor/Zend/Filter/Word/CamelCaseToUnderscore.php +++ b/library/vendor/Zend/Filter/Word/CamelCaseToUnderscore.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_CamelCaseToSeparator */ -require_once 'Zend/Filter/Word/CamelCaseToSeparator.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/Word/DashToCamelCase.php b/library/vendor/Zend/Filter/Word/DashToCamelCase.php index 85c945034..29f360233 100644 --- a/library/vendor/Zend/Filter/Word/DashToCamelCase.php +++ b/library/vendor/Zend/Filter/Word/DashToCamelCase.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Word/SeparatorToCamelCase.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/Word/DashToSeparator.php b/library/vendor/Zend/Filter/Word/DashToSeparator.php index 526ac90a9..824c263b8 100644 --- a/library/vendor/Zend/Filter/Word/DashToSeparator.php +++ b/library/vendor/Zend/Filter/Word/DashToSeparator.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/Separator/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/Word/DashToUnderscore.php b/library/vendor/Zend/Filter/Word/DashToUnderscore.php index 436ae1c2d..51460cc00 100644 --- a/library/vendor/Zend/Filter/Word/DashToUnderscore.php +++ b/library/vendor/Zend/Filter/Word/DashToUnderscore.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/Word/Separator/Abstract.php b/library/vendor/Zend/Filter/Word/Separator/Abstract.php index c5db832cd..f4d8b2ec3 100644 --- a/library/vendor/Zend/Filter/Word/Separator/Abstract.php +++ b/library/vendor/Zend/Filter/Word/Separator/Abstract.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/PregReplace.php'; /** * @category Zend @@ -56,7 +55,6 @@ abstract class Zend_Filter_Word_Separator_Abstract extends Zend_Filter_PregRepla public function setSeparator($separator) { if ($separator == null) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('"' . $separator . '" is not a valid separator.'); } $this->_separator = $separator; diff --git a/library/vendor/Zend/Filter/Word/SeparatorToCamelCase.php b/library/vendor/Zend/Filter/Word/SeparatorToCamelCase.php index 416fd63ec..0bfd6c706 100644 --- a/library/vendor/Zend/Filter/Word/SeparatorToCamelCase.php +++ b/library/vendor/Zend/Filter/Word/SeparatorToCamelCase.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/Separator/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/Word/SeparatorToDash.php b/library/vendor/Zend/Filter/Word/SeparatorToDash.php index 4c47f73bf..447e937be 100644 --- a/library/vendor/Zend/Filter/Word/SeparatorToDash.php +++ b/library/vendor/Zend/Filter/Word/SeparatorToDash.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_SeperatorToSeparator */ -require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/Word/SeparatorToSeparator.php b/library/vendor/Zend/Filter/Word/SeparatorToSeparator.php index b706e95a4..2b291b682 100644 --- a/library/vendor/Zend/Filter/Word/SeparatorToSeparator.php +++ b/library/vendor/Zend/Filter/Word/SeparatorToSeparator.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/PregReplace.php'; /** * @category Zend @@ -117,7 +116,6 @@ class Zend_Filter_Word_SeparatorToSeparator extends Zend_Filter_PregReplace protected function _separatorToSeparatorFilter($value) { if ($this->_searchSeparator == null) { - require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('You must provide a search separator for this filter to work.'); } diff --git a/library/vendor/Zend/Filter/Word/UnderscoreToCamelCase.php b/library/vendor/Zend/Filter/Word/UnderscoreToCamelCase.php index 1d4f29aba..80f85b25e 100644 --- a/library/vendor/Zend/Filter/Word/UnderscoreToCamelCase.php +++ b/library/vendor/Zend/Filter/Word/UnderscoreToCamelCase.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Word/SeparatorToCamelCase.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/Word/UnderscoreToDash.php b/library/vendor/Zend/Filter/Word/UnderscoreToDash.php index ecd06ad2e..e043f97ab 100644 --- a/library/vendor/Zend/Filter/Word/UnderscoreToDash.php +++ b/library/vendor/Zend/Filter/Word/UnderscoreToDash.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; /** * @category Zend diff --git a/library/vendor/Zend/Filter/Word/UnderscoreToSeparator.php b/library/vendor/Zend/Filter/Word/UnderscoreToSeparator.php index ae878d0c9..b9bd0a7c9 100644 --- a/library/vendor/Zend/Filter/Word/UnderscoreToSeparator.php +++ b/library/vendor/Zend/Filter/Word/UnderscoreToSeparator.php @@ -22,7 +22,6 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; /** * @category Zend diff --git a/library/vendor/Zend/Form.php b/library/vendor/Zend/Form.php index 22bf1b696..7bcde7f7b 100644 --- a/library/vendor/Zend/Form.php +++ b/library/vendor/Zend/Form.php @@ -19,7 +19,6 @@ */ /** @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Interface.php'; /** * Zend_Form @@ -424,7 +423,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface $this->_loaders[$type] = $loader; return $this; default: - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type)); } } @@ -457,11 +455,9 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface $pathSegment = 'Form/Element'; break; default: - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } - require_once 'Zend/Loader/PluginLoader.php'; $this->_loaders[$type] = new Zend_Loader_PluginLoader( array('Zend_' . $prefixSegment . '_' => 'Zend/' . $pathSegment . '/') ); @@ -515,7 +511,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface } return $this; default: - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } } @@ -794,7 +789,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface { $method = strtolower($method); if (!in_array($method, $this->_methods)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('"%s" is an invalid form method', $method)); } $this->setAttrib('method', $method); @@ -868,7 +862,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface { $name = $this->filterName($name); if ('' === (string)$name) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid name provided; must contain only valid variable characters and be non-empty'); } @@ -1034,7 +1027,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface { if (is_string($element)) { if (null === $name) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception( 'Elements specified by string must have an accompanying name' ); @@ -1061,7 +1053,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface $this->_elements[$name] = $element; $this->_elements[$name]->addPrefixPaths($prefixPaths); } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception( 'Element must be specified by string or Zend_Form_Element instance' ); @@ -1091,12 +1082,10 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface public function createElement($type, $name, $options = null) { if (!is_string($type)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Element type must be a string indicating type'); } if (!is_string($name)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Element name must be a string'); } @@ -1839,7 +1828,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface } } if (empty($group)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('No valid elements specified for display group'); } @@ -1867,7 +1855,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface } if (!class_exists($class)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } $this->_displayGroups[$name] = new $class( @@ -1898,7 +1885,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface if (null === $name) { $name = $group->getName(); if ('' === (string)$name) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid display group added; requires name'); } } @@ -2267,7 +2253,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface public function isValid($data) { if (!is_array($data)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(__METHOD__ . ' expects an array'); } $translator = $this->getTranslator(); @@ -2382,7 +2367,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface */ public function processAjax(array $data) { - require_once 'Zend/Json.php'; if ($this->isValidPartial($data)) { return Zend_Json::encode(true); } @@ -2689,7 +2673,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface public function getView() { if (null === $this->_view) { - require_once 'Zend/Controller/Action/HelperBroker.php'; $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); $this->setView($viewRenderer->view); } @@ -2739,7 +2722,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface break; } if (is_numeric($name)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid alias provided to addDecorator; must be alphanumeric string'); } if (is_string($spec)) { @@ -2751,7 +2733,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface $decorator = $spec; } } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator provided to addDecorator; must be string or Zend_Form_Decorator_Interface'); } @@ -2800,7 +2781,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface } } } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()'); } } @@ -3036,7 +3016,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid translator specified'); } @@ -3059,7 +3038,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface } elseif ($translator instanceof Zend_Translate) { self::$_translatorDefault = $translator->getAdapter(); } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid translator specified'); } } @@ -3100,7 +3078,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface public static function getDefaultTranslator() { if (null === self::$_translatorDefault) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $translator = Zend_Registry::get('Zend_Translate'); if ($translator instanceof Zend_Translate_Adapter) { @@ -3185,7 +3162,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface return; } - require_once 'Zend/Form/Exception.php'; if (is_object($value)) { $type = get_class($value); } else { @@ -3256,11 +3232,9 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface return $decorator->render($seed); } - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Decorator by name %s does not exist', $decoratorName)); } - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Method %s does not exist', $method)); } @@ -3285,7 +3259,6 @@ class Zend_Form implements Iterator, Countable, Zend_Validate_Interface } elseif (isset($this->_displayGroups[$key])) { return $this->getDisplayGroup($key); } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Corruption detected in form; invalid key ("%s") found in internal iterator', (string) $key)); } } diff --git a/library/vendor/Zend/Form/Decorator/Abstract.php b/library/vendor/Zend/Form/Decorator/Abstract.php index a3f871f19..56a06c481 100644 --- a/library/vendor/Zend/Form/Decorator/Abstract.php +++ b/library/vendor/Zend/Form/Decorator/Abstract.php @@ -19,7 +19,6 @@ */ /** Zend_Form_Decorator_Interface */ -require_once 'Zend/Form/Decorator/Interface.php'; /** * Zend_Form_Decorator_Abstract @@ -179,7 +178,6 @@ abstract class Zend_Form_Decorator_Abstract implements Zend_Form_Decorator_Inter && (!$element instanceof Zend_Form) && (!$element instanceof Zend_Form_DisplayGroup)) { - require_once 'Zend/Form/Decorator/Exception.php'; throw new Zend_Form_Decorator_Exception('Invalid element type passed to decorator'); } @@ -248,7 +246,6 @@ abstract class Zend_Form_Decorator_Abstract implements Zend_Form_Decorator_Inter */ public function render($content) { - require_once 'Zend/Form/Decorator/Exception.php'; throw new Zend_Form_Decorator_Exception('render() not implemented'); } } diff --git a/library/vendor/Zend/Form/Decorator/Callback.php b/library/vendor/Zend/Form/Decorator/Callback.php index 6daf4b43e..658a214d8 100644 --- a/library/vendor/Zend/Form/Decorator/Callback.php +++ b/library/vendor/Zend/Form/Decorator/Callback.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Callback @@ -66,7 +65,6 @@ class Zend_Form_Decorator_Callback extends Zend_Form_Decorator_Abstract public function setCallback($callback) { if (!is_callable($callback)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid callback provided to callback decorator'); } $this->_callback = $callback; diff --git a/library/vendor/Zend/Form/Decorator/Captcha.php b/library/vendor/Zend/Form/Decorator/Captcha.php index 3ef4504d9..1958886d9 100644 --- a/library/vendor/Zend/Form/Decorator/Captcha.php +++ b/library/vendor/Zend/Form/Decorator/Captcha.php @@ -20,7 +20,6 @@ */ /** @see Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Captcha generic decorator diff --git a/library/vendor/Zend/Form/Decorator/Captcha/ReCaptcha.php b/library/vendor/Zend/Form/Decorator/Captcha/ReCaptcha.php index c18b0dd1d..fb7237721 100644 --- a/library/vendor/Zend/Form/Decorator/Captcha/ReCaptcha.php +++ b/library/vendor/Zend/Form/Decorator/Captcha/ReCaptcha.php @@ -20,7 +20,6 @@ */ /** @see Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * ReCaptcha-based captcha decorator diff --git a/library/vendor/Zend/Form/Decorator/Captcha/Word.php b/library/vendor/Zend/Form/Decorator/Captcha/Word.php index d1e3fbc96..5c4650192 100644 --- a/library/vendor/Zend/Form/Decorator/Captcha/Word.php +++ b/library/vendor/Zend/Form/Decorator/Captcha/Word.php @@ -20,7 +20,6 @@ */ /** @see Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Word-based captcha decorator diff --git a/library/vendor/Zend/Form/Decorator/Description.php b/library/vendor/Zend/Form/Decorator/Description.php index 06854c609..714587c81 100644 --- a/library/vendor/Zend/Form/Decorator/Description.php +++ b/library/vendor/Zend/Form/Decorator/Description.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Description @@ -182,7 +181,6 @@ class Zend_Form_Decorator_Description extends Zend_Form_Decorator_Abstract } if (!empty($tag)) { - require_once 'Zend/Form/Decorator/HtmlTag.php'; $options['tag'] = $tag; $decorator = new Zend_Form_Decorator_HtmlTag($options); $description = $decorator->render($description); diff --git a/library/vendor/Zend/Form/Decorator/DtDdWrapper.php b/library/vendor/Zend/Form/Decorator/DtDdWrapper.php index 45bcc6c68..854ee8a8f 100644 --- a/library/vendor/Zend/Form/Decorator/DtDdWrapper.php +++ b/library/vendor/Zend/Form/Decorator/DtDdWrapper.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_DtDdWrapper diff --git a/library/vendor/Zend/Form/Decorator/Errors.php b/library/vendor/Zend/Form/Decorator/Errors.php index ce64d3a49..5f6b6fb3d 100644 --- a/library/vendor/Zend/Form/Decorator/Errors.php +++ b/library/vendor/Zend/Form/Decorator/Errors.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Errors diff --git a/library/vendor/Zend/Form/Decorator/Exception.php b/library/vendor/Zend/Form/Decorator/Exception.php index 0facf83eb..438b34d1b 100644 --- a/library/vendor/Zend/Form/Decorator/Exception.php +++ b/library/vendor/Zend/Form/Decorator/Exception.php @@ -21,7 +21,6 @@ */ /** Zend_Form_Exception */ -require_once 'Zend/Form/Exception.php'; /** * Exception for Zend_Form component. diff --git a/library/vendor/Zend/Form/Decorator/Fieldset.php b/library/vendor/Zend/Form/Decorator/Fieldset.php index bc2a01cbf..5fd981906 100644 --- a/library/vendor/Zend/Form/Decorator/Fieldset.php +++ b/library/vendor/Zend/Form/Decorator/Fieldset.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Fieldset diff --git a/library/vendor/Zend/Form/Decorator/File.php b/library/vendor/Zend/Form/Decorator/File.php index 68461375e..caf078c63 100644 --- a/library/vendor/Zend/Form/Decorator/File.php +++ b/library/vendor/Zend/Form/Decorator/File.php @@ -20,13 +20,10 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** Zend_Form_Decorator_Marker_File_Interface */ -require_once 'Zend/Form/Decorator/Marker/File/Interface.php'; /** Zend_File_Transfer_Adapter_Http */ -require_once 'Zend/File/Transfer/Adapter/Http.php'; /** * Zend_Form_Decorator_File diff --git a/library/vendor/Zend/Form/Decorator/Form.php b/library/vendor/Zend/Form/Decorator/Form.php index aa598a8df..82e668b2b 100644 --- a/library/vendor/Zend/Form/Decorator/Form.php +++ b/library/vendor/Zend/Form/Decorator/Form.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Form diff --git a/library/vendor/Zend/Form/Decorator/FormElements.php b/library/vendor/Zend/Form/Decorator/FormElements.php index c4fa9ec0e..8b5ee7f55 100644 --- a/library/vendor/Zend/Form/Decorator/FormElements.php +++ b/library/vendor/Zend/Form/Decorator/FormElements.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_FormElements diff --git a/library/vendor/Zend/Form/Decorator/FormErrors.php b/library/vendor/Zend/Form/Decorator/FormErrors.php index 4c6c98c7c..e66a38a84 100644 --- a/library/vendor/Zend/Form/Decorator/FormErrors.php +++ b/library/vendor/Zend/Form/Decorator/FormErrors.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_FormErrors diff --git a/library/vendor/Zend/Form/Decorator/HtmlTag.php b/library/vendor/Zend/Form/Decorator/HtmlTag.php index 974240399..0e6cb6598 100644 --- a/library/vendor/Zend/Form/Decorator/HtmlTag.php +++ b/library/vendor/Zend/Form/Decorator/HtmlTag.php @@ -22,7 +22,6 @@ /** * @see Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Element_HtmlTag @@ -109,9 +108,6 @@ class Zend_Form_Decorator_HtmlTag extends Zend_Form_Decorator_Abstract public function normalizeTag($tag) { if (!isset($this->_tagFilter)) { - require_once 'Zend/Filter.php'; - require_once 'Zend/Filter/Alnum.php'; - require_once 'Zend/Filter/StringToLower.php'; $this->_tagFilter = new Zend_Filter(); $this->_tagFilter->addFilter(new Zend_Filter_Alnum()) ->addFilter(new Zend_Filter_StringToLower()); diff --git a/library/vendor/Zend/Form/Decorator/Image.php b/library/vendor/Zend/Form/Decorator/Image.php index 309cbd936..bc071d547 100644 --- a/library/vendor/Zend/Form/Decorator/Image.php +++ b/library/vendor/Zend/Form/Decorator/Image.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Image @@ -137,7 +136,6 @@ class Zend_Form_Decorator_Image extends Zend_Form_Decorator_Abstract $image = $view->formImage($name, $element->getImageValue(), $attribs); if (null !== $tag) { - require_once 'Zend/Form/Decorator/HtmlTag.php'; $decorator = new Zend_Form_Decorator_HtmlTag(); $decorator->setOptions(array('tag' => $tag)); $image = $decorator->render($image); diff --git a/library/vendor/Zend/Form/Decorator/Label.php b/library/vendor/Zend/Form/Decorator/Label.php index dc9e8a25b..72619ac01 100644 --- a/library/vendor/Zend/Form/Decorator/Label.php +++ b/library/vendor/Zend/Form/Decorator/Label.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Label @@ -260,14 +259,12 @@ class Zend_Form_Decorator_Label extends Zend_Form_Decorator_Abstract $key = 'optional' . $position; break; default: - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid method "%s" called in Label decorator, and detected as type %s', $method, $type)); } switch ($head) { case 'set': if (0 === count($args)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Method "%s" requires at least one argument; none provided', $method)); } $value = array_shift($args); @@ -286,7 +283,6 @@ class Zend_Form_Decorator_Label extends Zend_Form_Decorator_Abstract } } - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid method "%s" called in Label decorator', $method)); } @@ -432,7 +428,6 @@ class Zend_Form_Decorator_Label extends Zend_Form_Decorator_Abstract } if (null !== $tag) { - require_once 'Zend/Form/Decorator/HtmlTag.php'; $decorator = new Zend_Form_Decorator_HtmlTag(); if (null !== $this->_tagClass) { $decorator->setOptions(array('tag' => $tag, diff --git a/library/vendor/Zend/Form/Decorator/PrepareElements.php b/library/vendor/Zend/Form/Decorator/PrepareElements.php index 69efc8d40..3ca51b27f 100644 --- a/library/vendor/Zend/Form/Decorator/PrepareElements.php +++ b/library/vendor/Zend/Form/Decorator/PrepareElements.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_FormElements */ -require_once 'Zend/Form/Decorator/FormElements.php'; /** * Zend_Form_Decorator_PrepareElements diff --git a/library/vendor/Zend/Form/Decorator/Tooltip.php b/library/vendor/Zend/Form/Decorator/Tooltip.php index 2e7dc6ac4..e97bbca4c 100644 --- a/library/vendor/Zend/Form/Decorator/Tooltip.php +++ b/library/vendor/Zend/Form/Decorator/Tooltip.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Tooltip diff --git a/library/vendor/Zend/Form/Decorator/ViewHelper.php b/library/vendor/Zend/Form/Decorator/ViewHelper.php index 1b65b3d53..6d397810f 100644 --- a/library/vendor/Zend/Form/Decorator/ViewHelper.php +++ b/library/vendor/Zend/Form/Decorator/ViewHelper.php @@ -19,7 +19,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_ViewHelper @@ -223,7 +222,6 @@ class Zend_Form_Decorator_ViewHelper extends Zend_Form_Decorator_Abstract $view = $element->getView(); if (null === $view) { - require_once 'Zend/Form/Decorator/Exception.php'; throw new Zend_Form_Decorator_Exception('ViewHelper decorator cannot render without a registered view object'); } diff --git a/library/vendor/Zend/Form/Decorator/ViewScript.php b/library/vendor/Zend/Form/Decorator/ViewScript.php index 221338f1b..b1e7bedc2 100644 --- a/library/vendor/Zend/Form/Decorator/ViewScript.php +++ b/library/vendor/Zend/Form/Decorator/ViewScript.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_ViewScript @@ -158,7 +157,6 @@ class Zend_Form_Decorator_ViewScript extends Zend_Form_Decorator_Abstract $viewScript = $this->getViewScript(); if (empty($viewScript)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('No view script registered with ViewScript decorator'); } diff --git a/library/vendor/Zend/Form/DisplayGroup.php b/library/vendor/Zend/Form/DisplayGroup.php index 8832640a8..4356bd417 100644 --- a/library/vendor/Zend/Form/DisplayGroup.php +++ b/library/vendor/Zend/Form/DisplayGroup.php @@ -332,7 +332,6 @@ class Zend_Form_DisplayGroup implements Iterator,Countable { $name = $this->filtername($name); if (('0' !== $name) && empty($name)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid name provided; must contain only valid variable characters and be non-empty'); } @@ -488,7 +487,6 @@ class Zend_Form_DisplayGroup implements Iterator,Countable { foreach ($elements as $element) { if (!$element instanceof Zend_Form_Element) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('elements passed via array to addElements() must be Zend_Form_Elements only'); } $this->addElement($element); @@ -716,7 +714,6 @@ class Zend_Form_DisplayGroup implements Iterator,Countable break; } if (is_numeric($name)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid alias provided to addDecorator; must be alphanumeric string'); } if (is_string($spec)) { @@ -728,7 +725,6 @@ class Zend_Form_DisplayGroup implements Iterator,Countable $decorator = $spec; } } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator provided to addDecorator; must be string or Zend_Form_Decorator_Interface'); } @@ -776,7 +772,6 @@ class Zend_Form_DisplayGroup implements Iterator,Countable } } } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()'); } } @@ -896,7 +891,6 @@ class Zend_Form_DisplayGroup implements Iterator,Countable public function getView() { if (null === $this->_view) { - require_once 'Zend/Controller/Action/HelperBroker.php'; $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); $this->setView($viewRenderer->view); } @@ -951,7 +945,6 @@ class Zend_Form_DisplayGroup implements Iterator,Countable } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid translator specified'); } return $this; @@ -969,7 +962,6 @@ class Zend_Form_DisplayGroup implements Iterator,Countable } if (null === $this->_translator) { - require_once 'Zend/Form.php'; return Zend_Form::getDefaultTranslator(); } @@ -1031,11 +1023,9 @@ class Zend_Form_DisplayGroup implements Iterator,Countable return $decorator->render($seed); } - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Decorator by name %s does not exist', $decoratorName)); } - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Method %s does not exist', $method)); } diff --git a/library/vendor/Zend/Form/Element.php b/library/vendor/Zend/Form/Element.php index 6a01f81b9..b00ea5392 100644 --- a/library/vendor/Zend/Form/Element.php +++ b/library/vendor/Zend/Form/Element.php @@ -19,16 +19,12 @@ */ /** @see Zend_Filter */ -require_once 'Zend/Filter.php'; /** @see Zend_Form */ -require_once 'Zend/Form.php'; /** @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Interface.php'; /** @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Zend_Form_Element @@ -263,7 +259,6 @@ class Zend_Form_Element implements Zend_Validate_Interface } if (null === $this->getName()) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Zend_Form_Element requires each element to have a name'); } @@ -417,7 +412,6 @@ class Zend_Form_Element implements Zend_Validate_Interface } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid translator specified'); } return $this; @@ -500,7 +494,6 @@ class Zend_Form_Element implements Zend_Validate_Interface { $name = $this->filterName($name); if ('' === $name) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid name provided; must contain only valid variable characters and be non-empty'); } @@ -859,7 +852,6 @@ class Zend_Form_Element implements Zend_Validate_Interface { $name = (string) $name; if ('_' == $name[0]) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid attribute "%s"; must not contain a leading underscore', $name)); } @@ -954,7 +946,6 @@ class Zend_Form_Element implements Zend_Validate_Interface public function __get($key) { if ('_' == $key[0]) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Cannot retrieve value for protected/private property "%s"', $key)); } @@ -1003,11 +994,9 @@ class Zend_Form_Element implements Zend_Validate_Interface return $decorator->render($seed); } - require_once 'Zend/Form/Element/Exception.php'; throw new Zend_Form_Element_Exception(sprintf('Decorator by name %s does not exist', $decoratorName)); } - require_once 'Zend/Form/Element/Exception.php'; throw new Zend_Form_Element_Exception(sprintf('Method %s does not exist', $method)); } @@ -1031,7 +1020,6 @@ class Zend_Form_Element implements Zend_Validate_Interface $this->_loaders[$type] = $loader; return $this; default: - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type)); } } @@ -1060,14 +1048,12 @@ class Zend_Form_Element implements Zend_Validate_Interface $pathSegment = 'Form/Decorator'; } if (!isset($this->_loaders[$type])) { - require_once 'Zend/Loader/PluginLoader.php'; $this->_loaders[$type] = new Zend_Loader_PluginLoader( array('Zend_' . $prefixSegment . '_' => 'Zend/' . $pathSegment . '/') ); } return $this->_loaders[$type]; default: - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } } @@ -1110,7 +1096,6 @@ class Zend_Form_Element implements Zend_Validate_Interface } return $this; default: - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } } @@ -1186,7 +1171,6 @@ class Zend_Form_Element implements Zend_Validate_Interface 'options' => $options, ); } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid validator provided to addValidator; must be string or Zend_Validate_Interface'); } @@ -1238,7 +1222,6 @@ class Zend_Form_Element implements Zend_Validate_Interface } } } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid validator passed to addValidators()'); } } @@ -1660,7 +1643,6 @@ class Zend_Form_Element implements Zend_Validate_Interface ); $this->_filters[$name] = $filter; } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid filter provided to addFilter; must be string or Zend_Filter_Interface'); } @@ -1705,7 +1687,6 @@ class Zend_Form_Element implements Zend_Validate_Interface } } } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid filter passed to addFilters()'); } } @@ -1837,7 +1818,6 @@ class Zend_Form_Element implements Zend_Validate_Interface public function getView() { if (null === $this->_view) { - require_once 'Zend/Controller/Action/HelperBroker.php'; $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); $this->setView($viewRenderer->view); } @@ -1885,7 +1865,6 @@ class Zend_Form_Element implements Zend_Validate_Interface break; } if (is_numeric($name)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid alias provided to addDecorator; must be alphanumeric string'); } if (is_string($spec)) { @@ -1897,7 +1876,6 @@ class Zend_Form_Element implements Zend_Validate_Interface $decorator = $spec; } } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator provided to addDecorator; must be string or Zend_Form_Decorator_Interface'); } @@ -1945,7 +1923,6 @@ class Zend_Form_Element implements Zend_Validate_Interface } } } else { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()'); } } @@ -2103,7 +2080,6 @@ class Zend_Form_Element implements Zend_Validate_Interface $name = $this->getPluginLoader(self::FILTER)->load($filter['filter']); if (array_key_exists($name, $this->_filters)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Filter instance already exists for filter "%s"', $origName)); } @@ -2152,7 +2128,6 @@ class Zend_Form_Element implements Zend_Validate_Interface $name = $this->getPluginLoader(self::VALIDATE)->load($validator['validator']); if (array_key_exists($name, $this->_validators)) { - require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Validator instance already exists for validator "%s"', $origName)); } diff --git a/library/vendor/Zend/Form/Element/Button.php b/library/vendor/Zend/Form/Element/Button.php index 4ebd230a7..85b9488b5 100644 --- a/library/vendor/Zend/Form/Element/Button.php +++ b/library/vendor/Zend/Form/Element/Button.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Submit */ -require_once 'Zend/Form/Element/Submit.php'; /** * Button form element diff --git a/library/vendor/Zend/Form/Element/Captcha.php b/library/vendor/Zend/Form/Element/Captcha.php index dea504031..09afc98ef 100644 --- a/library/vendor/Zend/Form/Element/Captcha.php +++ b/library/vendor/Zend/Form/Element/Captcha.php @@ -21,10 +21,8 @@ */ /** @see Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** @see Zend_Captcha_Adapter */ -require_once 'Zend/Captcha/Adapter.php'; /** * Generic captcha element @@ -204,7 +202,6 @@ class Zend_Form_Element_Captcha extends Zend_Form_Element_Xhtml $type = strtoupper($type); if ($type == self::CAPTCHA) { if (!isset($this->_loaders[$type])) { - require_once 'Zend/Loader/PluginLoader.php'; $this->_loaders[$type] = new Zend_Loader_PluginLoader( array('Zend_Captcha' => 'Zend/Captcha/') ); diff --git a/library/vendor/Zend/Form/Element/Checkbox.php b/library/vendor/Zend/Form/Element/Checkbox.php index a068f6ff0..6290a720d 100644 --- a/library/vendor/Zend/Form/Element/Checkbox.php +++ b/library/vendor/Zend/Form/Element/Checkbox.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** * Checkbox form element diff --git a/library/vendor/Zend/Form/Element/Exception.php b/library/vendor/Zend/Form/Element/Exception.php index 85b4359db..d7c0de352 100644 --- a/library/vendor/Zend/Form/Element/Exception.php +++ b/library/vendor/Zend/Form/Element/Exception.php @@ -21,7 +21,6 @@ */ /** Zend_Form_Exception */ -require_once 'Zend/Form/Exception.php'; /** * Exception for Zend_Form component. diff --git a/library/vendor/Zend/Form/Element/File.php b/library/vendor/Zend/Form/Element/File.php index 4cf5e4169..cc805fb99 100644 --- a/library/vendor/Zend/Form/Element/File.php +++ b/library/vendor/Zend/Form/Element/File.php @@ -19,7 +19,6 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** * Zend_Form_Element @@ -129,7 +128,6 @@ class Zend_Form_Element_File extends Zend_Form_Element_Xhtml } if (!array_key_exists($type, $this->_loaders)) { - require_once 'Zend/Loader/PluginLoader.php'; $loader = new Zend_Loader_PluginLoader(array( 'Zend_File_Transfer_Adapter' => 'Zend/File/Transfer/Adapter/', )); @@ -184,7 +182,6 @@ class Zend_Form_Element_File extends Zend_Form_Element_Xhtml $class = $loader->load($adapter); $this->_adapter = new $class; } else { - require_once 'Zend/Form/Element/Exception.php'; throw new Zend_Form_Element_Exception('Invalid adapter specified'); } @@ -756,7 +753,6 @@ class Zend_Form_Element_File extends Zend_Form_Element_Xhtml $translator = $this->getTransferAdapter()->getTranslator(); if (null === $translator) { - require_once 'Zend/Form.php'; return Zend_Form::getDefaultTranslator(); } @@ -874,7 +870,6 @@ class Zend_Form_Element_File extends Zend_Form_Element_Xhtml } if (!$marker) { - require_once 'Zend/Form/Element/Exception.php'; throw new Zend_Form_Element_Exception('No file decorator found... unable to render file element'); } diff --git a/library/vendor/Zend/Form/Element/Hash.php b/library/vendor/Zend/Form/Element/Hash.php index 9cde34d02..e761eac18 100644 --- a/library/vendor/Zend/Form/Element/Hash.php +++ b/library/vendor/Zend/Form/Element/Hash.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** * CSRF form protection @@ -105,7 +104,6 @@ class Zend_Form_Element_Hash extends Zend_Form_Element_Xhtml public function getSession() { if (null === $this->_session) { - require_once 'Zend/Session/Namespace.php'; $this->_session = new Zend_Session_Namespace($this->getSessionName()); } return $this->_session; diff --git a/library/vendor/Zend/Form/Element/Hidden.php b/library/vendor/Zend/Form/Element/Hidden.php index 83fcc9cca..83d306a36 100644 --- a/library/vendor/Zend/Form/Element/Hidden.php +++ b/library/vendor/Zend/Form/Element/Hidden.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** * Hidden form element diff --git a/library/vendor/Zend/Form/Element/Image.php b/library/vendor/Zend/Form/Element/Image.php index 14acd2847..9d10eadf8 100644 --- a/library/vendor/Zend/Form/Element/Image.php +++ b/library/vendor/Zend/Form/Element/Image.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** * Image form element diff --git a/library/vendor/Zend/Form/Element/Multi.php b/library/vendor/Zend/Form/Element/Multi.php index d8c606241..a1634cc18 100644 --- a/library/vendor/Zend/Form/Element/Multi.php +++ b/library/vendor/Zend/Form/Element/Multi.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** * Base class for multi-option form elements diff --git a/library/vendor/Zend/Form/Element/MultiCheckbox.php b/library/vendor/Zend/Form/Element/MultiCheckbox.php index bb201f5b1..59a01cfde 100644 --- a/library/vendor/Zend/Form/Element/MultiCheckbox.php +++ b/library/vendor/Zend/Form/Element/MultiCheckbox.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Multi */ -require_once 'Zend/Form/Element/Multi.php'; /** * MultiCheckbox form element diff --git a/library/vendor/Zend/Form/Element/Multiselect.php b/library/vendor/Zend/Form/Element/Multiselect.php index dcf77d945..68886f248 100644 --- a/library/vendor/Zend/Form/Element/Multiselect.php +++ b/library/vendor/Zend/Form/Element/Multiselect.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Select */ -require_once 'Zend/Form/Element/Select.php'; /** * Multiselect form element diff --git a/library/vendor/Zend/Form/Element/Note.php b/library/vendor/Zend/Form/Element/Note.php index a1031d5c1..38b485eb0 100644 --- a/library/vendor/Zend/Form/Element/Note.php +++ b/library/vendor/Zend/Form/Element/Note.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** * Element to show an HTML note diff --git a/library/vendor/Zend/Form/Element/Password.php b/library/vendor/Zend/Form/Element/Password.php index 237394fc7..059699b87 100644 --- a/library/vendor/Zend/Form/Element/Password.php +++ b/library/vendor/Zend/Form/Element/Password.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** * Password form element diff --git a/library/vendor/Zend/Form/Element/Radio.php b/library/vendor/Zend/Form/Element/Radio.php index 82d54c5da..f387ed91b 100644 --- a/library/vendor/Zend/Form/Element/Radio.php +++ b/library/vendor/Zend/Form/Element/Radio.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Multi */ -require_once 'Zend/Form/Element/Multi.php'; /** * Radio form element diff --git a/library/vendor/Zend/Form/Element/Reset.php b/library/vendor/Zend/Form/Element/Reset.php index 1157fd5d0..1722e7d37 100644 --- a/library/vendor/Zend/Form/Element/Reset.php +++ b/library/vendor/Zend/Form/Element/Reset.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Submit */ -require_once 'Zend/Form/Element/Submit.php'; /** * Reset form element diff --git a/library/vendor/Zend/Form/Element/Select.php b/library/vendor/Zend/Form/Element/Select.php index 8e57c483c..296e3e69f 100644 --- a/library/vendor/Zend/Form/Element/Select.php +++ b/library/vendor/Zend/Form/Element/Select.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Multi */ -require_once 'Zend/Form/Element/Multi.php'; /** * Select.php form element diff --git a/library/vendor/Zend/Form/Element/Submit.php b/library/vendor/Zend/Form/Element/Submit.php index aded24562..0352527df 100644 --- a/library/vendor/Zend/Form/Element/Submit.php +++ b/library/vendor/Zend/Form/Element/Submit.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** * Submit form element diff --git a/library/vendor/Zend/Form/Element/Text.php b/library/vendor/Zend/Form/Element/Text.php index 8557f7ba7..a0c9ca850 100644 --- a/library/vendor/Zend/Form/Element/Text.php +++ b/library/vendor/Zend/Form/Element/Text.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** * Text form element diff --git a/library/vendor/Zend/Form/Element/Textarea.php b/library/vendor/Zend/Form/Element/Textarea.php index f1fbd9458..58c8fcc53 100644 --- a/library/vendor/Zend/Form/Element/Textarea.php +++ b/library/vendor/Zend/Form/Element/Textarea.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; /** * Textarea form element diff --git a/library/vendor/Zend/Form/Element/Xhtml.php b/library/vendor/Zend/Form/Element/Xhtml.php index 5f376cd43..f3c051d4f 100644 --- a/library/vendor/Zend/Form/Element/Xhtml.php +++ b/library/vendor/Zend/Form/Element/Xhtml.php @@ -20,7 +20,6 @@ */ /** Zend_Form_Element */ -require_once 'Zend/Form/Element.php'; /** * Base element for XHTML elements diff --git a/library/vendor/Zend/Form/Exception.php b/library/vendor/Zend/Form/Exception.php index d60313e9b..81ef51ee4 100644 --- a/library/vendor/Zend/Form/Exception.php +++ b/library/vendor/Zend/Form/Exception.php @@ -20,7 +20,6 @@ */ /** Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Exception for Zend_Form component. diff --git a/library/vendor/Zend/Form/SubForm.php b/library/vendor/Zend/Form/SubForm.php index f656f3753..2532f18ad 100644 --- a/library/vendor/Zend/Form/SubForm.php +++ b/library/vendor/Zend/Form/SubForm.php @@ -19,7 +19,6 @@ */ /** Zend_Form */ -require_once 'Zend/Form.php'; /** * Zend_Form_SubForm diff --git a/library/vendor/Zend/Gdata.php b/library/vendor/Zend/Gdata.php index 95a138a1a..708aa5b13 100644 --- a/library/vendor/Zend/Gdata.php +++ b/library/vendor/Zend/Gdata.php @@ -24,7 +24,6 @@ /** * Zend_Gdata_App */ -require_once 'Zend/Gdata/App.php'; /** * Provides functionality to interact with Google data APIs @@ -154,7 +153,6 @@ class Zend_Gdata extends Zend_Gdata_App } elseif ($location instanceof Zend_Gdata_Query) { $uri = $location->getQueryUrl(); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must specify the location as either a string URI ' . 'or a child of Zend_Gdata_Query'); @@ -179,7 +177,6 @@ class Zend_Gdata extends Zend_Gdata_App } elseif ($location instanceof Zend_Gdata_Query) { $uri = $location->getQueryUrl(); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must specify the location as either a string URI ' . 'or a child of Zend_Gdata_Query'); diff --git a/library/vendor/Zend/Gdata/Analytics.php b/library/vendor/Zend/Gdata/Analytics.php index ab8e5f18e..57cdaa1e0 100644 --- a/library/vendor/Zend/Gdata/Analytics.php +++ b/library/vendor/Zend/Gdata/Analytics.php @@ -23,37 +23,30 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_Analytics_AccountEntry */ -require_once 'Zend/Gdata/Analytics/AccountEntry.php'; /** * @see Zend_Gdata_Analytics_AccountFeed */ -require_once 'Zend/Gdata/Analytics/AccountFeed.php'; /** * @see Zend_Gdata_Analytics_DataEntry */ -require_once 'Zend/Gdata/Analytics/DataEntry.php'; /** * @see Zend_Gdata_Analytics_DataFeed */ -require_once 'Zend/Gdata/Analytics/DataFeed.php'; /** * @see Zend_Gdata_Analytics_DataQuery */ -require_once 'Zend/Gdata/Analytics/DataQuery.php'; /** * @see Zend_Gdata_Analytics_AccountQuery */ -require_once 'Zend/Gdata/Analytics/AccountQuery.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/Analytics/AccountEntry.php b/library/vendor/Zend/Gdata/Analytics/AccountEntry.php index 768d4934e..964b4ce8c 100644 --- a/library/vendor/Zend/Gdata/Analytics/AccountEntry.php +++ b/library/vendor/Zend/Gdata/Analytics/AccountEntry.php @@ -23,27 +23,22 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Analytics_Extension_Dimension */ -require_once 'Zend/Gdata/Analytics/Extension/Dimension.php'; /** * @see Zend_Gdata_Analytics_Extension_Metric */ -require_once 'Zend/Gdata/Analytics/Extension/Metric.php'; /** * @see Zend_Gdata_Analytics_Extension_Property */ -require_once 'Zend/Gdata/Analytics/Extension/Property.php'; /** * @see Zend_Gdata_Analytics_Extension_TableId */ -require_once 'Zend/Gdata/Analytics/Extension/TableId.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/Analytics/AccountFeed.php b/library/vendor/Zend/Gdata/Analytics/AccountFeed.php index a97513504..361a670ca 100644 --- a/library/vendor/Zend/Gdata/Analytics/AccountFeed.php +++ b/library/vendor/Zend/Gdata/Analytics/AccountFeed.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/Analytics/AccountQuery.php b/library/vendor/Zend/Gdata/Analytics/AccountQuery.php index ec8a6d139..cf8b3229c 100644 --- a/library/vendor/Zend/Gdata/Analytics/AccountQuery.php +++ b/library/vendor/Zend/Gdata/Analytics/AccountQuery.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_Query */ -require_once 'Zend/Gdata/Query.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/Analytics/DataEntry.php b/library/vendor/Zend/Gdata/Analytics/DataEntry.php index 2a921199c..ec85f20d9 100644 --- a/library/vendor/Zend/Gdata/Analytics/DataEntry.php +++ b/library/vendor/Zend/Gdata/Analytics/DataEntry.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/Analytics/DataFeed.php b/library/vendor/Zend/Gdata/Analytics/DataFeed.php index e774ce7cf..7ec123cc7 100644 --- a/library/vendor/Zend/Gdata/Analytics/DataFeed.php +++ b/library/vendor/Zend/Gdata/Analytics/DataFeed.php @@ -23,17 +23,14 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Analytics */ -require_once 'Zend/Gdata/Analytics.php'; /** * @see Zend_Gdata_Geo_Entry */ -require_once 'Zend/Gdata/Analytics/DataEntry.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/Analytics/DataQuery.php b/library/vendor/Zend/Gdata/Analytics/DataQuery.php index 06ef9378c..8cfd9a190 100644 --- a/library/vendor/Zend/Gdata/Analytics/DataQuery.php +++ b/library/vendor/Zend/Gdata/Analytics/DataQuery.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_Query */ -require_once 'Zend/Gdata/Query.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/Analytics/Extension/Dimension.php b/library/vendor/Zend/Gdata/Analytics/Extension/Dimension.php index 0ccd2c5c5..7be057679 100644 --- a/library/vendor/Zend/Gdata/Analytics/Extension/Dimension.php +++ b/library/vendor/Zend/Gdata/Analytics/Extension/Dimension.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_Extension_Metric */ -require_once 'Zend/Gdata/Analytics/Extension/Metric.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/Analytics/Extension/Goal.php b/library/vendor/Zend/Gdata/Analytics/Extension/Goal.php index 49c364754..477938655 100644 --- a/library/vendor/Zend/Gdata/Analytics/Extension/Goal.php +++ b/library/vendor/Zend/Gdata/Analytics/Extension/Goal.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/Analytics/Extension/Metric.php b/library/vendor/Zend/Gdata/Analytics/Extension/Metric.php index 3af58a22e..63c9a68cd 100644 --- a/library/vendor/Zend/Gdata/Analytics/Extension/Metric.php +++ b/library/vendor/Zend/Gdata/Analytics/Extension/Metric.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_Extension_Property */ -require_once 'Zend/Gdata/Analytics/Extension/Property.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/Analytics/Extension/Property.php b/library/vendor/Zend/Gdata/Analytics/Extension/Property.php index f36b61b30..6a7cb7a7b 100644 --- a/library/vendor/Zend/Gdata/Analytics/Extension/Property.php +++ b/library/vendor/Zend/Gdata/Analytics/Extension/Property.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/Analytics/Extension/TableId.php b/library/vendor/Zend/Gdata/Analytics/Extension/TableId.php index 543b82de1..6890d8bfa 100644 --- a/library/vendor/Zend/Gdata/Analytics/Extension/TableId.php +++ b/library/vendor/Zend/Gdata/Analytics/Extension/TableId.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/App.php b/library/vendor/Zend/Gdata/App.php index b2f9374b6..8b7c1f442 100644 --- a/library/vendor/Zend/Gdata/App.php +++ b/library/vendor/Zend/Gdata/App.php @@ -24,30 +24,24 @@ /** * Zend_Gdata_Feed */ -require_once 'Zend/Gdata/App/Feed.php'; /** * Zend_Gdata_Http_Client */ -require_once 'Zend/Http/Client.php'; /** * Zend_Version */ -require_once 'Zend/Version.php'; /** * Zend_Gdata_App_MediaSource */ -require_once 'Zend/Gdata/App/MediaSource.php'; /** * Zend_Uri/Http */ -require_once 'Zend/Uri/Http.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** * Provides Atom Publishing Protocol (APP) functionality. This class and all @@ -252,7 +246,6 @@ class Zend_Gdata_App $client = new Zend_Http_Client(); } if (!$client instanceof Zend_Http_Client) { - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException( 'Argument is not an instance of Zend_Http_Client.'); } @@ -339,7 +332,6 @@ class Zend_Gdata_App public static function setGzipEnabled($enabled = false) { if ($enabled && !function_exists('gzinflate')) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You cannot enable gzipped responses if the zlib module ' . 'is not enabled in your PHP installation.'); @@ -416,7 +408,6 @@ class Zend_Gdata_App public function setMajorProtocolVersion($value) { if (!($value >= 1)) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException( 'Major protocol version must be >= 1'); } @@ -446,7 +437,6 @@ class Zend_Gdata_App public function setMinorProtocolVersion($value) { if (!($value >= 0)) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException( 'Minor protocol version must be >= 0'); } @@ -597,7 +587,6 @@ class Zend_Gdata_App public function performHttpRequest($method, $url, $headers = null, $body = null, $contentType = null, $remainingRedirects = null) { - require_once 'Zend/Http/Client/Exception.php'; if ($remainingRedirects === null) { $remainingRedirects = self::getMaxRedirects(); } @@ -616,13 +605,11 @@ class Zend_Gdata_App // check the overridden method if (($method == 'POST' || $method == 'PUT') && $body === null && $headers['x-http-method-override'] != 'DELETE') { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must specify the data to post as either a ' . 'string or a child of Zend_Gdata_App_Entry'); } if ($url === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must specify an URI to which to post.'); } @@ -648,7 +635,6 @@ class Zend_Gdata_App // Set the params for the new request to be performed $this->_httpClient->setHeaders($headers); - require_once 'Zend/Uri/Http.php'; $uri = Zend_Uri_Http::fromString($url); preg_match("/^(.*?)(\?.*)?$/", $url, $matches); $this->_httpClient->setUri($matches[1]); @@ -670,10 +656,8 @@ class Zend_Gdata_App $oldHttpAdapter = $this->_httpClient->getAdapter(); if ($oldHttpAdapter instanceof Zend_Http_Client_Adapter_Proxy) { - require_once 'Zend/Gdata/HttpAdapterStreamingProxy.php'; $newAdapter = new Zend_Gdata_HttpAdapterStreamingProxy(); } else { - require_once 'Zend/Gdata/HttpAdapterStreamingSocket.php'; $newAdapter = new Zend_Gdata_HttpAdapterStreamingSocket(); } $this->_httpClient->setAdapter($newAdapter); @@ -692,7 +676,6 @@ class Zend_Gdata_App if ($usingMimeStream) { $this->_httpClient->setAdapter($oldHttpAdapter); } - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } if ($response->isRedirect() && $response->getStatus() != '304') { @@ -702,13 +685,11 @@ class Zend_Gdata_App $method, $newUrl, $headers, $body, $contentType, $remainingRedirects); } else { - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException( 'Number of redirects exceeds maximum', null, $response); } } if (!$response->isSuccessful()) { - require_once 'Zend/Gdata/App/HttpException.php'; $exceptionMessage = 'Expected response code 200, got ' . $response->getStatus(); if (self::getVerboseExceptionMessages()) { @@ -818,7 +799,6 @@ class Zend_Gdata_App $minorProtocolVersion = null) { if (!class_exists($className, false)) { - require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($className); } @@ -829,7 +809,6 @@ class Zend_Gdata_App @ini_restore('track_errors'); if (!$doc) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( "DOMDocument cannot parse XML: $php_errormsg"); } @@ -859,7 +838,6 @@ class Zend_Gdata_App $feed = @file_get_contents($filename, $useIncludePath); @ini_restore('track_errors'); if ($feed === false) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( "File could not be loaded: $php_errormsg"); } @@ -976,7 +954,6 @@ class Zend_Gdata_App $extraHeaders = array()) { if (!class_exists($className, false)) { - require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($className); } @@ -1017,7 +994,6 @@ class Zend_Gdata_App } if (!class_exists($className, false)) { - require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($className); } @@ -1056,7 +1032,6 @@ class Zend_Gdata_App // Autoloading disabled on next line for compatibility // with magic factories. See ZF-6660. if (!class_exists($name . '_' . $class, false)) { - require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($name . '_' . $class); } $foundClassName = $name . '_' . $class; @@ -1082,12 +1057,10 @@ class Zend_Gdata_App } return $instance; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( "Unable to find '${class}' in registered packages"); } } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception("No such method ${method}"); } } diff --git a/library/vendor/Zend/Gdata/App/AuthException.php b/library/vendor/Zend/Gdata/App/AuthException.php index b42907dcf..6f0849720 100644 --- a/library/vendor/Zend/Gdata/App/AuthException.php +++ b/library/vendor/Zend/Gdata/App/AuthException.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; /** * Gdata exceptions diff --git a/library/vendor/Zend/Gdata/App/BadMethodCallException.php b/library/vendor/Zend/Gdata/App/BadMethodCallException.php index 68d83f6a5..303dff49f 100644 --- a/library/vendor/Zend/Gdata/App/BadMethodCallException.php +++ b/library/vendor/Zend/Gdata/App/BadMethodCallException.php @@ -24,7 +24,6 @@ /** * Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; /** * Gdata APP exceptions diff --git a/library/vendor/Zend/Gdata/App/Base.php b/library/vendor/Zend/Gdata/App/Base.php index 3f0b313fd..ee162ecc3 100644 --- a/library/vendor/Zend/Gdata/App/Base.php +++ b/library/vendor/Zend/Gdata/App/Base.php @@ -24,10 +24,8 @@ /** * @see Zend_Gdata_App_Util */ -require_once 'Zend/Gdata/App/Util.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** * Abstract class for all XML elements @@ -307,17 +305,14 @@ abstract class Zend_Gdata_App_Base $doc = @Zend_Xml_Security::scan($xml, $doc); @ini_restore('track_errors'); if (!$doc) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception("DOMDocument cannot parse XML: $php_errormsg"); } $element = $doc->getElementsByTagName($this->_rootElement)->item(0); if (!$element) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('No root <' . $this->_rootElement . '> element'); } $this->transferFromDOM($element); } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('XML passed to transferFromXML cannot be null'); } } @@ -483,7 +478,6 @@ abstract class Zend_Gdata_App_Base } else if (property_exists($this, "_${name}")) { return $this->{'_' . $name}; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } @@ -509,7 +503,6 @@ abstract class Zend_Gdata_App_Base } else if (isset($this->{'_' . $name}) || ($this->{'_' . $name} === null)) { $this->{'_' . $name} = $val; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } @@ -525,7 +518,6 @@ abstract class Zend_Gdata_App_Base $rc = new ReflectionClass(get_class($this)); $privName = '_' . $name; if (!($rc->hasProperty($privName))) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } else { diff --git a/library/vendor/Zend/Gdata/App/BaseMediaSource.php b/library/vendor/Zend/Gdata/App/BaseMediaSource.php index df9ca63fc..893858f0d 100644 --- a/library/vendor/Zend/Gdata/App/BaseMediaSource.php +++ b/library/vendor/Zend/Gdata/App/BaseMediaSource.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_MediaSource */ -require_once 'Zend/Gdata/App/MediaSource.php'; /** * Concrete class to use a file handle as an attachment within a MediaEntry. @@ -116,7 +115,6 @@ abstract class Zend_Gdata_App_BaseMediaSource implements Zend_Gdata_App_MediaSou } else if (property_exists($this, "_${name}")) { return $this->{'_' . $name}; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } @@ -140,7 +138,6 @@ abstract class Zend_Gdata_App_BaseMediaSource implements Zend_Gdata_App_MediaSou } else if (isset($this->{'_' . $name}) || ($this->{'_' . $name} === null)) { $this->{'_' . $name} = $val; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } @@ -156,7 +153,6 @@ abstract class Zend_Gdata_App_BaseMediaSource implements Zend_Gdata_App_MediaSou $rc = new ReflectionClass(get_class($this)); $privName = '_' . $name; if (!($rc->hasProperty($privName))) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } else { diff --git a/library/vendor/Zend/Gdata/App/CaptchaRequiredException.php b/library/vendor/Zend/Gdata/App/CaptchaRequiredException.php index 7207f0211..b97e98da3 100644 --- a/library/vendor/Zend/Gdata/App/CaptchaRequiredException.php +++ b/library/vendor/Zend/Gdata/App/CaptchaRequiredException.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_CaptchaRequiredException */ -require_once 'Zend/Gdata/App/AuthException.php'; /** * Gdata exceptions diff --git a/library/vendor/Zend/Gdata/App/Entry.php b/library/vendor/Zend/Gdata/App/Entry.php index 35e90c5ff..96c2aac95 100644 --- a/library/vendor/Zend/Gdata/App/Entry.php +++ b/library/vendor/Zend/Gdata/App/Entry.php @@ -24,37 +24,30 @@ /** * @see Zend_Gdata_App_FeedEntryParent */ -require_once 'Zend/Gdata/App/FeedEntryParent.php'; /** * @see Zend_Gdata_App_Extension_Content */ -require_once 'Zend/Gdata/App/Extension/Content.php'; /** * @see Zend_Gdata_App_Extension_Edited */ -require_once 'Zend/Gdata/App/Extension/Edited.php'; /** * @see Zend_Gdata_App_Extension_Published */ -require_once 'Zend/Gdata/App/Extension/Published.php'; /** * @see Zend_Gdata_App_Extension_Source */ -require_once 'Zend/Gdata/App/Extension/Source.php'; /** * @see Zend_Gdata_App_Extension_Summary */ -require_once 'Zend/Gdata/App/Extension/Summary.php'; /** * @see Zend_Gdata_App_Extension_Control */ -require_once 'Zend/Gdata/App/Extension/Control.php'; /** * Concrete class for working with Atom entries. diff --git a/library/vendor/Zend/Gdata/App/Exception.php b/library/vendor/Zend/Gdata/App/Exception.php index 65d9818ea..d57b26959 100644 --- a/library/vendor/Zend/Gdata/App/Exception.php +++ b/library/vendor/Zend/Gdata/App/Exception.php @@ -25,7 +25,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Gdata App exceptions diff --git a/library/vendor/Zend/Gdata/App/Extension.php b/library/vendor/Zend/Gdata/App/Extension.php index 410418dc3..71073e54a 100644 --- a/library/vendor/Zend/Gdata/App/Extension.php +++ b/library/vendor/Zend/Gdata/App/Extension.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Base */ -require_once 'Zend/Gdata/App/Base.php'; /** * Gdata App extensions diff --git a/library/vendor/Zend/Gdata/App/Extension/Author.php b/library/vendor/Zend/Gdata/App/Extension/Author.php index a808e6af9..dcc9cc0af 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Author.php +++ b/library/vendor/Zend/Gdata/App/Extension/Author.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension/Person.php'; /** * Represents the atom:author element diff --git a/library/vendor/Zend/Gdata/App/Extension/Category.php b/library/vendor/Zend/Gdata/App/Extension/Category.php index 20e5f86d1..d48d46878 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Category.php +++ b/library/vendor/Zend/Gdata/App/Extension/Category.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:category element diff --git a/library/vendor/Zend/Gdata/App/Extension/Content.php b/library/vendor/Zend/Gdata/App/Extension/Content.php index ed30fb3eb..f81628b6d 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Content.php +++ b/library/vendor/Zend/Gdata/App/Extension/Content.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension_Text */ -require_once 'Zend/Gdata/App/Extension/Text.php'; /** * Represents the atom:content element diff --git a/library/vendor/Zend/Gdata/App/Extension/Contributor.php b/library/vendor/Zend/Gdata/App/Extension/Contributor.php index 1fe933f5e..b47277aab 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Contributor.php +++ b/library/vendor/Zend/Gdata/App/Extension/Contributor.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension/Person.php'; /** * Represents the atom:contributor element diff --git a/library/vendor/Zend/Gdata/App/Extension/Control.php b/library/vendor/Zend/Gdata/App/Extension/Control.php index ab080fd69..8e27cbb11 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Control.php +++ b/library/vendor/Zend/Gdata/App/Extension/Control.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * @see Zend_Gdata_App_Extension_Draft */ -require_once 'Zend/Gdata/App/Extension/Draft.php'; /** * Represents the app:control element diff --git a/library/vendor/Zend/Gdata/App/Extension/Draft.php b/library/vendor/Zend/Gdata/App/Extension/Draft.php index 14f766423..4e48bc0b1 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Draft.php +++ b/library/vendor/Zend/Gdata/App/Extension/Draft.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the app:draft element diff --git a/library/vendor/Zend/Gdata/App/Extension/Edited.php b/library/vendor/Zend/Gdata/App/Extension/Edited.php index fdaefa577..a5d28bad0 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Edited.php +++ b/library/vendor/Zend/Gdata/App/Extension/Edited.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the app:edited element diff --git a/library/vendor/Zend/Gdata/App/Extension/Element.php b/library/vendor/Zend/Gdata/App/Extension/Element.php index 78fc23ac0..0a3770fed 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Element.php +++ b/library/vendor/Zend/Gdata/App/Extension/Element.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Class that represents elements which were not handled by other parsing diff --git a/library/vendor/Zend/Gdata/App/Extension/Email.php b/library/vendor/Zend/Gdata/App/Extension/Email.php index f77dee5d4..47fa75a54 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Email.php +++ b/library/vendor/Zend/Gdata/App/Extension/Email.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:email element diff --git a/library/vendor/Zend/Gdata/App/Extension/Generator.php b/library/vendor/Zend/Gdata/App/Extension/Generator.php index 9d763aa1b..e49ddddec 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Generator.php +++ b/library/vendor/Zend/Gdata/App/Extension/Generator.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:generator element diff --git a/library/vendor/Zend/Gdata/App/Extension/Icon.php b/library/vendor/Zend/Gdata/App/Extension/Icon.php index 6af3453e8..05e2ae2aa 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Icon.php +++ b/library/vendor/Zend/Gdata/App/Extension/Icon.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:icon element diff --git a/library/vendor/Zend/Gdata/App/Extension/Id.php b/library/vendor/Zend/Gdata/App/Extension/Id.php index 5d120c029..d6f77154b 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Id.php +++ b/library/vendor/Zend/Gdata/App/Extension/Id.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:id element diff --git a/library/vendor/Zend/Gdata/App/Extension/Link.php b/library/vendor/Zend/Gdata/App/Extension/Link.php index a7ecacacc..cbd4793f6 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Link.php +++ b/library/vendor/Zend/Gdata/App/Extension/Link.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Data model for representing an atom:link element diff --git a/library/vendor/Zend/Gdata/App/Extension/Logo.php b/library/vendor/Zend/Gdata/App/Extension/Logo.php index 3d509da24..40f549e17 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Logo.php +++ b/library/vendor/Zend/Gdata/App/Extension/Logo.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:logo element diff --git a/library/vendor/Zend/Gdata/App/Extension/Name.php b/library/vendor/Zend/Gdata/App/Extension/Name.php index 3d4a5ec96..4d5c7471c 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Name.php +++ b/library/vendor/Zend/Gdata/App/Extension/Name.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:name element diff --git a/library/vendor/Zend/Gdata/App/Extension/Person.php b/library/vendor/Zend/Gdata/App/Extension/Person.php index 237616bc3..9937ca5bc 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Person.php +++ b/library/vendor/Zend/Gdata/App/Extension/Person.php @@ -24,22 +24,18 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * @see Zend_Gdata_App_Extension_Name */ -require_once 'Zend/Gdata/App/Extension/Name.php'; /** * @see Zend_Gdata_App_Extension_Email */ -require_once 'Zend/Gdata/App/Extension/Email.php'; /** * @see Zend_Gdata_App_Extension_Uri */ -require_once 'Zend/Gdata/App/Extension/Uri.php'; /** * Base class for people (currently used by atom:author, atom:contributor) diff --git a/library/vendor/Zend/Gdata/App/Extension/Published.php b/library/vendor/Zend/Gdata/App/Extension/Published.php index 6986f075a..96d3045de 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Published.php +++ b/library/vendor/Zend/Gdata/App/Extension/Published.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:published element diff --git a/library/vendor/Zend/Gdata/App/Extension/Rights.php b/library/vendor/Zend/Gdata/App/Extension/Rights.php index 2d9ed1ceb..3d5963c92 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Rights.php +++ b/library/vendor/Zend/Gdata/App/Extension/Rights.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension_Text */ -require_once 'Zend/Gdata/App/Extension/Text.php'; /** * Represents the atom:rights element diff --git a/library/vendor/Zend/Gdata/App/Extension/Source.php b/library/vendor/Zend/Gdata/App/Extension/Source.php index 279bd4038..c9f07e29a 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Source.php +++ b/library/vendor/Zend/Gdata/App/Extension/Source.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_App_Entry */ -require_once 'Zend/Gdata/App/Entry.php'; /** * @see Zend_Gdata_App_FeedSourceParent */ -require_once 'Zend/Gdata/App/FeedSourceParent.php'; /** * @category Zend diff --git a/library/vendor/Zend/Gdata/App/Extension/Subtitle.php b/library/vendor/Zend/Gdata/App/Extension/Subtitle.php index 315d0b336..cdfd7974c 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Subtitle.php +++ b/library/vendor/Zend/Gdata/App/Extension/Subtitle.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension_Text */ -require_once 'Zend/Gdata/App/Extension/Text.php'; /** * Represents the atom:subtitle element diff --git a/library/vendor/Zend/Gdata/App/Extension/Summary.php b/library/vendor/Zend/Gdata/App/Extension/Summary.php index f42ae6f1e..116228e8e 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Summary.php +++ b/library/vendor/Zend/Gdata/App/Extension/Summary.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension_Text */ -require_once 'Zend/Gdata/App/Extension/Text.php'; /** * Represents the atom:summary element diff --git a/library/vendor/Zend/Gdata/App/Extension/Text.php b/library/vendor/Zend/Gdata/App/Extension/Text.php index c091e584b..a409be45b 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Text.php +++ b/library/vendor/Zend/Gdata/App/Extension/Text.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Abstract class for data models that require only text and type-- such as: diff --git a/library/vendor/Zend/Gdata/App/Extension/Title.php b/library/vendor/Zend/Gdata/App/Extension/Title.php index 814160ac2..b7df017b0 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Title.php +++ b/library/vendor/Zend/Gdata/App/Extension/Title.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension_Text */ -require_once 'Zend/Gdata/App/Extension/Text.php'; /** * Represents the atom:title element diff --git a/library/vendor/Zend/Gdata/App/Extension/Updated.php b/library/vendor/Zend/Gdata/App/Extension/Updated.php index 5bad419e3..e4343ef26 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Updated.php +++ b/library/vendor/Zend/Gdata/App/Extension/Updated.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:updated element diff --git a/library/vendor/Zend/Gdata/App/Extension/Uri.php b/library/vendor/Zend/Gdata/App/Extension/Uri.php index 34127c8f4..2cc41b7fe 100644 --- a/library/vendor/Zend/Gdata/App/Extension/Uri.php +++ b/library/vendor/Zend/Gdata/App/Extension/Uri.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:uri element diff --git a/library/vendor/Zend/Gdata/App/Feed.php b/library/vendor/Zend/Gdata/App/Feed.php index 0c7306801..e1b1421b5 100755 --- a/library/vendor/Zend/Gdata/App/Feed.php +++ b/library/vendor/Zend/Gdata/App/Feed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_App_Entry */ -require_once 'Zend/Gdata/App/Entry.php'; /** * @see Zend_Gdata_App_FeedSourceParent */ -require_once 'Zend/Gdata/App/FeedSourceParent.php'; /** * Atom feed class @@ -281,7 +279,6 @@ class Zend_Gdata_App_Feed extends Zend_Gdata_App_FeedSourceParent { $nextLink = $this->getNextLink(); if (!$nextLink) { - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_Exception('No link to next set ' . 'of results found.'); } @@ -302,7 +299,6 @@ class Zend_Gdata_App_Feed extends Zend_Gdata_App_FeedSourceParent { $previousLink = $this->getPreviousLink(); if (!$previousLink) { - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_Exception('No link to previous set ' . 'of results found.'); } diff --git a/library/vendor/Zend/Gdata/App/FeedEntryParent.php b/library/vendor/Zend/Gdata/App/FeedEntryParent.php index 0b60e9fd9..e0462cdee 100755 --- a/library/vendor/Zend/Gdata/App/FeedEntryParent.php +++ b/library/vendor/Zend/Gdata/App/FeedEntryParent.php @@ -24,52 +24,42 @@ /** * @see Zend_Gdata_App_Extension_Element */ -require_once 'Zend/Gdata/App/Extension/Element.php'; /** * @see Zend_Gdata_App_Extension_Author */ -require_once 'Zend/Gdata/App/Extension/Author.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; /** * @see Zend_Gdata_App_Extension_Contributor */ -require_once 'Zend/Gdata/App/Extension/Contributor.php'; /** * @see Zend_Gdata_App_Extension_Id */ -require_once 'Zend/Gdata/App/Extension/Id.php'; /** * @see Zend_Gdata_App_Extension_Link */ -require_once 'Zend/Gdata/App/Extension/Link.php'; /** * @see Zend_Gdata_App_Extension_Rights */ -require_once 'Zend/Gdata/App/Extension/Rights.php'; /** * @see Zend_Gdata_App_Extension_Title */ -require_once 'Zend/Gdata/App/Extension/Title.php'; /** * @see Zend_Gdata_App_Extension_Updated */ -require_once 'Zend/Gdata/App/Extension/Updated.php'; /** * Zend_Version */ -require_once 'Zend/Version.php'; /** * Abstract class for common functionality in entries and feeds @@ -593,7 +583,6 @@ abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base public function setMajorProtocolVersion($value) { if (!($value >= 1) && ($value !== null)) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException( 'Major protocol version must be >= 1'); } @@ -623,7 +612,6 @@ abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base public function setMinorProtocolVersion($value) { if (!($value >= 0)) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException( 'Minor protocol version must be >= 0 or null'); } diff --git a/library/vendor/Zend/Gdata/App/FeedSourceParent.php b/library/vendor/Zend/Gdata/App/FeedSourceParent.php index 0b6d8c60c..808e61988 100644 --- a/library/vendor/Zend/Gdata/App/FeedSourceParent.php +++ b/library/vendor/Zend/Gdata/App/FeedSourceParent.php @@ -24,32 +24,26 @@ /** * @see Zend_Gdata_App_Entry */ -require_once 'Zend/Gdata/App/Entry.php'; /** * @see Zend_Gdata_App_FeedSourceParent */ -require_once 'Zend/Gdata/App/FeedEntryParent.php'; /** * @see Zend_Gdata_App_Extension_Generator */ -require_once 'Zend/Gdata/App/Extension/Generator.php'; /** * @see Zend_Gdata_App_Extension_Icon */ -require_once 'Zend/Gdata/App/Extension/Icon.php'; /** * @see Zend_Gdata_App_Extension_Logo */ -require_once 'Zend/Gdata/App/Extension/Logo.php'; /** * @see Zend_Gdata_App_Extension_Subtitle */ -require_once 'Zend/Gdata/App/Extension/Subtitle.php'; /** * Atom feed class diff --git a/library/vendor/Zend/Gdata/App/HttpException.php b/library/vendor/Zend/Gdata/App/HttpException.php index 830ca3145..fe8383708 100644 --- a/library/vendor/Zend/Gdata/App/HttpException.php +++ b/library/vendor/Zend/Gdata/App/HttpException.php @@ -24,12 +24,10 @@ /** * Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; /** * Zend_Http_Client_Exception */ -require_once 'Zend/Http/Client/Exception.php'; /** * Gdata exceptions diff --git a/library/vendor/Zend/Gdata/App/IOException.php b/library/vendor/Zend/Gdata/App/IOException.php index cb6bfaf65..a7af34460 100644 --- a/library/vendor/Zend/Gdata/App/IOException.php +++ b/library/vendor/Zend/Gdata/App/IOException.php @@ -25,7 +25,6 @@ /** * Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; /** * Gdata App IO exceptions. diff --git a/library/vendor/Zend/Gdata/App/InvalidArgumentException.php b/library/vendor/Zend/Gdata/App/InvalidArgumentException.php index 8d783673b..8b1c8b330 100644 --- a/library/vendor/Zend/Gdata/App/InvalidArgumentException.php +++ b/library/vendor/Zend/Gdata/App/InvalidArgumentException.php @@ -24,7 +24,6 @@ /** * Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; /** * Gdata exceptions diff --git a/library/vendor/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php b/library/vendor/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php index 2c29735e5..dbd9c7c37 100644 --- a/library/vendor/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php +++ b/library/vendor/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php @@ -24,7 +24,6 @@ /** * @see Zend_Http_Client_Adapter_Socket */ -require_once 'Zend/Http/Client/Adapter/Socket.php'; /** * Overrides the traditional socket-based adapter class for Zend_Http_Client to diff --git a/library/vendor/Zend/Gdata/App/MediaEntry.php b/library/vendor/Zend/Gdata/App/MediaEntry.php index 21ccc4283..ad4b3b019 100644 --- a/library/vendor/Zend/Gdata/App/MediaEntry.php +++ b/library/vendor/Zend/Gdata/App/MediaEntry.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_App_Entry */ -require_once 'Zend/Gdata/App/Entry.php'; /** * @see Zend_Gdata_App_MediaSource */ -require_once 'Zend/Gdata/App/MediaSource.php'; /** * @see Zend_Gdata_MediaMimeStream */ -require_once 'Zend/Gdata/MediaMimeStream.php'; /** * Concrete class for working with Atom entries containing multi-part data. @@ -109,7 +106,6 @@ class Zend_Gdata_App_MediaEntry extends Zend_Gdata_App_Entry if ($value instanceof Zend_Gdata_App_MediaSource) { $this->_mediaSource = $value; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must specify the media data as a class that conforms to Zend_Gdata_App_MediaSource.'); } diff --git a/library/vendor/Zend/Gdata/App/MediaFileSource.php b/library/vendor/Zend/Gdata/App/MediaFileSource.php index a08870639..4396ad33f 100644 --- a/library/vendor/Zend/Gdata/App/MediaFileSource.php +++ b/library/vendor/Zend/Gdata/App/MediaFileSource.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_MediaData */ -require_once 'Zend/Gdata/App/BaseMediaSource.php'; /** * Concrete class to use a file handle as an attachment within a MediaEntry. @@ -76,14 +75,12 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource $fileHandle = fopen($this->getFilename(), 'r', true); $result = fread($fileHandle, filesize($this->getFilename())); if ($result === false) { - require_once 'Zend/Gdata/App/IOException.php'; throw new Zend_Gdata_App_IOException("Error reading file - " . $this->getFilename() . '. Read failed.'); } fclose($fileHandle); return $result; } else { - require_once 'Zend/Gdata/App/IOException.php'; throw new Zend_Gdata_App_IOException("Error reading file - " . $this->getFilename() . '. File is not readable.'); } diff --git a/library/vendor/Zend/Gdata/App/Util.php b/library/vendor/Zend/Gdata/App/Util.php index c03c61344..acb87956b 100644 --- a/library/vendor/Zend/Gdata/App/Util.php +++ b/library/vendor/Zend/Gdata/App/Util.php @@ -53,7 +53,6 @@ class Zend_Gdata_App_Util } else { $ts = strtotime($timestamp); if ($ts === false) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException("Invalid timestamp: $timestamp."); } return date('Y-m-d\TH:i:s', $ts); @@ -77,7 +76,6 @@ class Zend_Gdata_App_Util // Sanity check: Make sure that the collection isn't empty if (sizeof($collection) == 0) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception("Empty namespace collection encountered."); } @@ -102,7 +100,6 @@ class Zend_Gdata_App_Util // Guard: A namespace wasn't found. Either none were registered, or // the current protcol version is lower than the maximum namespace. if (!$found) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception("Namespace compatible with current protocol not found."); } diff --git a/library/vendor/Zend/Gdata/App/VersionException.php b/library/vendor/Zend/Gdata/App/VersionException.php index 2c138a6ae..52ad894e5 100644 --- a/library/vendor/Zend/Gdata/App/VersionException.php +++ b/library/vendor/Zend/Gdata/App/VersionException.php @@ -24,7 +24,6 @@ /** * Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; /** * Gdata APP exceptions diff --git a/library/vendor/Zend/Gdata/AuthSub.php b/library/vendor/Zend/Gdata/AuthSub.php index 376ba07c9..535368ba2 100644 --- a/library/vendor/Zend/Gdata/AuthSub.php +++ b/library/vendor/Zend/Gdata/AuthSub.php @@ -24,12 +24,10 @@ /** * Zend_Gdata_HttpClient */ -require_once 'Zend/Gdata/HttpClient.php'; /** * Zend_Version */ -require_once 'Zend/Version.php'; /** * Wrapper around Zend_Http_Client to facilitate Google's "Account Authentication @@ -118,7 +116,6 @@ class Zend_Gdata_AuthSub try { $response = $client->request('GET'); } catch (Zend_Http_Client_Exception $e) { - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } @@ -134,7 +131,6 @@ class Zend_Gdata_AuthSub } return $goog_resp['Token']; } else { - require_once 'Zend/Gdata/App/AuthException.php'; throw new Zend_Gdata_App_AuthException( 'Token upgrade failed. Reason: ' . $response->getBody()); } @@ -170,7 +166,6 @@ class Zend_Gdata_AuthSub $response = $client->request('GET'); } catch (Zend_Http_Client_Exception $e) { ob_end_clean(); - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } ob_end_clean(); @@ -212,7 +207,6 @@ class Zend_Gdata_AuthSub $response = $client->request('GET'); } catch (Zend_Http_Client_Exception $e) { ob_end_clean(); - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } ob_end_clean(); @@ -232,7 +226,6 @@ class Zend_Gdata_AuthSub $client = new Zend_Gdata_HttpClient(); } if (!$client instanceof Zend_Gdata_HttpClient) { - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException('Client is not an instance of Zend_Gdata_HttpClient.'); } $useragent = 'Zend_Framework_Gdata/' . Zend_Version::VERSION; diff --git a/library/vendor/Zend/Gdata/Books.php b/library/vendor/Zend/Gdata/Books.php index e4ac10389..d0b349704 100755 --- a/library/vendor/Zend/Gdata/Books.php +++ b/library/vendor/Zend/Gdata/Books.php @@ -24,32 +24,26 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_DublinCore */ -require_once 'Zend/Gdata/DublinCore.php'; /** * @see Zend_Gdata_Books_CollectionEntry */ -require_once 'Zend/Gdata/Books/CollectionEntry.php'; /** * @see Zend_Gdata_Books_CollectionFeed */ -require_once 'Zend/Gdata/Books/CollectionFeed.php'; /** * @see Zend_Gdata_Books_VolumeEntry */ -require_once 'Zend/Gdata/Books/VolumeEntry.php'; /** * @see Zend_Gdata_Books_VolumeFeed */ -require_once 'Zend/Gdata/Books/VolumeFeed.php'; /** * Service class for interacting with the Books service diff --git a/library/vendor/Zend/Gdata/Books/CollectionEntry.php b/library/vendor/Zend/Gdata/Books/CollectionEntry.php index 0ee73a192..c67fbcff1 100644 --- a/library/vendor/Zend/Gdata/Books/CollectionEntry.php +++ b/library/vendor/Zend/Gdata/Books/CollectionEntry.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * Describes an entry in a feed of collections diff --git a/library/vendor/Zend/Gdata/Books/CollectionFeed.php b/library/vendor/Zend/Gdata/Books/CollectionFeed.php index 54a57cf96..47600a4d8 100644 --- a/library/vendor/Zend/Gdata/Books/CollectionFeed.php +++ b/library/vendor/Zend/Gdata/Books/CollectionFeed.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * Describes a Book Search collection feed diff --git a/library/vendor/Zend/Gdata/Books/Extension/AnnotationLink.php b/library/vendor/Zend/Gdata/Books/Extension/AnnotationLink.php index cf6fcb003..78dee0a34 100644 --- a/library/vendor/Zend/Gdata/Books/Extension/AnnotationLink.php +++ b/library/vendor/Zend/Gdata/Books/Extension/AnnotationLink.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Books_Extension_BooksLink */ -require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; /** * Describes an annotation link diff --git a/library/vendor/Zend/Gdata/Books/Extension/BooksCategory.php b/library/vendor/Zend/Gdata/Books/Extension/BooksCategory.php index 794b4136f..157f4abd3 100644 --- a/library/vendor/Zend/Gdata/Books/Extension/BooksCategory.php +++ b/library/vendor/Zend/Gdata/Books/Extension/BooksCategory.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Describes a books category diff --git a/library/vendor/Zend/Gdata/Books/Extension/BooksLink.php b/library/vendor/Zend/Gdata/Books/Extension/BooksLink.php index a162b0355..b747ac895 100644 --- a/library/vendor/Zend/Gdata/Books/Extension/BooksLink.php +++ b/library/vendor/Zend/Gdata/Books/Extension/BooksLink.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension_Link */ -require_once 'Zend/Gdata/App/Extension/Link.php'; /** * Extends the base Link class with Books extensions diff --git a/library/vendor/Zend/Gdata/Books/Extension/Embeddability.php b/library/vendor/Zend/Gdata/Books/Extension/Embeddability.php index 1ac5f38c4..1b350c02a 100644 --- a/library/vendor/Zend/Gdata/Books/Extension/Embeddability.php +++ b/library/vendor/Zend/Gdata/Books/Extension/Embeddability.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Describes an embeddability diff --git a/library/vendor/Zend/Gdata/Books/Extension/InfoLink.php b/library/vendor/Zend/Gdata/Books/Extension/InfoLink.php index bbb0d9b11..086cf1789 100644 --- a/library/vendor/Zend/Gdata/Books/Extension/InfoLink.php +++ b/library/vendor/Zend/Gdata/Books/Extension/InfoLink.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_Books_Extension_BooksLink */ -require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; /** * Describes an info link diff --git a/library/vendor/Zend/Gdata/Books/Extension/PreviewLink.php b/library/vendor/Zend/Gdata/Books/Extension/PreviewLink.php index df329e789..da2604304 100644 --- a/library/vendor/Zend/Gdata/Books/Extension/PreviewLink.php +++ b/library/vendor/Zend/Gdata/Books/Extension/PreviewLink.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Books_Extension_BooksLink */ -require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; /** * Describes a preview link diff --git a/library/vendor/Zend/Gdata/Books/Extension/Review.php b/library/vendor/Zend/Gdata/Books/Extension/Review.php index d2f8448b5..463e9581e 100644 --- a/library/vendor/Zend/Gdata/Books/Extension/Review.php +++ b/library/vendor/Zend/Gdata/Books/Extension/Review.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * User-provided review diff --git a/library/vendor/Zend/Gdata/Books/Extension/ThumbnailLink.php b/library/vendor/Zend/Gdata/Books/Extension/ThumbnailLink.php index 544433737..112d358af 100644 --- a/library/vendor/Zend/Gdata/Books/Extension/ThumbnailLink.php +++ b/library/vendor/Zend/Gdata/Books/Extension/ThumbnailLink.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Books_Extension_BooksLink */ -require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; /** * Describes a thumbnail link diff --git a/library/vendor/Zend/Gdata/Books/Extension/Viewability.php b/library/vendor/Zend/Gdata/Books/Extension/Viewability.php index 65cc05624..f336e63d7 100644 --- a/library/vendor/Zend/Gdata/Books/Extension/Viewability.php +++ b/library/vendor/Zend/Gdata/Books/Extension/Viewability.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Describes a viewability diff --git a/library/vendor/Zend/Gdata/Books/VolumeEntry.php b/library/vendor/Zend/Gdata/Books/VolumeEntry.php index 5280c06f2..05cb55322 100644 --- a/library/vendor/Zend/Gdata/Books/VolumeEntry.php +++ b/library/vendor/Zend/Gdata/Books/VolumeEntry.php @@ -24,77 +24,62 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_Comments */ -require_once 'Zend/Gdata/Extension/Comments.php'; /** * @see Zend_Gdata_DublinCore_Extension_Creator */ -require_once 'Zend/Gdata/DublinCore/Extension/Creator.php'; /** * @see Zend_Gdata_DublinCore_Extension_Date */ -require_once 'Zend/Gdata/DublinCore/Extension/Date.php'; /** * @see Zend_Gdata_DublinCore_Extension_Description */ -require_once 'Zend/Gdata/DublinCore/Extension/Description.php'; /** * @see Zend_Gdata_Books_Extension_Embeddability */ -require_once 'Zend/Gdata/Books/Extension/Embeddability.php'; /** * @see Zend_Gdata_DublinCore_Extension_Format */ -require_once 'Zend/Gdata/DublinCore/Extension/Format.php'; /** * @see Zend_Gdata_DublinCore_Extension_Identifier */ -require_once 'Zend/Gdata/DublinCore/Extension/Identifier.php'; /** * @see Zend_Gdata_DublinCore_Extension_Language */ -require_once 'Zend/Gdata/DublinCore/Extension/Language.php'; /** * @see Zend_Gdata_DublinCore_Extension_Publisher */ -require_once 'Zend/Gdata/DublinCore/Extension/Publisher.php'; /** * @see Zend_Gdata_Extension_Rating */ -require_once 'Zend/Gdata/Extension/Rating.php'; /** * @see Zend_Gdata_Books_Extension_Review */ -require_once 'Zend/Gdata/Books/Extension/Review.php'; /** * @see Zend_Gdata_DublinCore_Extension_Subject */ -require_once 'Zend/Gdata/DublinCore/Extension/Subject.php'; /** * @see Zend_Gdata_DublinCore_Extension_Title */ -require_once 'Zend/Gdata/DublinCore/Extension/Title.php'; /** * @see Zend_Gdata_Books_Extension_Viewability */ -require_once 'Zend/Gdata/Books/Extension/Viewability.php'; /** * Describes an entry in a feed of Book Search volumes @@ -637,7 +622,6 @@ class Zend_Gdata_Books_VolumeEntry extends Zend_Gdata_Entry $fullId = $this->getId()->getText(); $position = strrpos($fullId, '/'); if ($position === false) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Slash not found in atom:id'); } else { return substr($fullId, strrpos($fullId,'/') + 1); diff --git a/library/vendor/Zend/Gdata/Books/VolumeFeed.php b/library/vendor/Zend/Gdata/Books/VolumeFeed.php index fff211c54..02596883e 100644 --- a/library/vendor/Zend/Gdata/Books/VolumeFeed.php +++ b/library/vendor/Zend/Gdata/Books/VolumeFeed.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * Describes a Book Search volume feed diff --git a/library/vendor/Zend/Gdata/Books/VolumeQuery.php b/library/vendor/Zend/Gdata/Books/VolumeQuery.php index 9ef5ee3d5..0a6008ba7 100755 --- a/library/vendor/Zend/Gdata/Books/VolumeQuery.php +++ b/library/vendor/Zend/Gdata/Books/VolumeQuery.php @@ -24,12 +24,10 @@ /** * Zend_Gdata_Books */ -require_once('Zend/Gdata/Books.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Books volumes diff --git a/library/vendor/Zend/Gdata/Calendar.php b/library/vendor/Zend/Gdata/Calendar.php index a779d8792..4d0c6cd8e 100644 --- a/library/vendor/Zend/Gdata/Calendar.php +++ b/library/vendor/Zend/Gdata/Calendar.php @@ -24,27 +24,22 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_Calendar_EventFeed */ -require_once 'Zend/Gdata/Calendar/EventFeed.php'; /** * @see Zend_Gdata_Calendar_EventEntry */ -require_once 'Zend/Gdata/Calendar/EventEntry.php'; /** * @see Zend_Gdata_Calendar_ListFeed */ -require_once 'Zend/Gdata/Calendar/ListFeed.php'; /** * @see Zend_Gdata_Calendar_ListEntry */ -require_once 'Zend/Gdata/Calendar/ListEntry.php'; /** * Service class for interacting with the Google Calendar data API @@ -115,7 +110,6 @@ class Zend_Gdata_Calendar extends Zend_Gdata public function getCalendarEventEntry($location = null) { if ($location == null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -146,7 +140,6 @@ class Zend_Gdata_Calendar extends Zend_Gdata public function getCalendarListEntry($location = null) { if ($location == null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { diff --git a/library/vendor/Zend/Gdata/Calendar/EventEntry.php b/library/vendor/Zend/Gdata/Calendar/EventEntry.php index ba4725312..3eb7a215f 100644 --- a/library/vendor/Zend/Gdata/Calendar/EventEntry.php +++ b/library/vendor/Zend/Gdata/Calendar/EventEntry.php @@ -24,32 +24,26 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Kind_EventEntry */ -require_once 'Zend/Gdata/Kind/EventEntry.php'; /** * @see Zend_Gdata_Calendar_Extension_SendEventNotifications */ -require_once 'Zend/Gdata/Calendar/Extension/SendEventNotifications.php'; /** * @see Zend_Gdata_Calendar_Extension_Timezone */ -require_once 'Zend/Gdata/Calendar/Extension/Timezone.php'; /** * @see Zend_Gdata_Calendar_Extension_Link */ -require_once 'Zend/Gdata/Calendar/Extension/Link.php'; /** * @see Zend_Gdata_Calendar_Extension_QuickAdd */ -require_once 'Zend/Gdata/Calendar/Extension/QuickAdd.php'; /** * Data model class for a Google Calendar Event Entry diff --git a/library/vendor/Zend/Gdata/Calendar/EventFeed.php b/library/vendor/Zend/Gdata/Calendar/EventFeed.php index 6a01b9578..603a4fd89 100644 --- a/library/vendor/Zend/Gdata/Calendar/EventFeed.php +++ b/library/vendor/Zend/Gdata/Calendar/EventFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Extension_Timezone */ -require_once 'Zend/Gdata/Calendar/Extension/Timezone.php'; /** * Data model for a Google Calendar feed of events diff --git a/library/vendor/Zend/Gdata/Calendar/EventQuery.php b/library/vendor/Zend/Gdata/Calendar/EventQuery.php index 52406a9d8..a83b05fe7 100644 --- a/library/vendor/Zend/Gdata/Calendar/EventQuery.php +++ b/library/vendor/Zend/Gdata/Calendar/EventQuery.php @@ -24,12 +24,10 @@ /** * Zend_Gdata_App_util */ -require_once('Zend/Gdata/App/Util.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Calendar events @@ -377,7 +375,6 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query return false; break; default: - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Invalid query param value for futureevents: ' . $value . ' It must be a boolean.'); @@ -399,7 +396,6 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } elseif ($value == 'true' | $value == 'false') { $this->_params['singleevents'] = $value; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Invalid query param value for futureevents: ' . $value . ' It must be a boolean.'); @@ -425,7 +421,6 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query return false; break; default: - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Invalid query param value for futureevents: ' . $value . ' It must be a boolean.'); @@ -448,7 +443,6 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } elseif ($value == 'true' | $value == 'false') { $this->_params['futureevents'] = $value; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Invalid query param value for futureevents: ' . $value . ' It must be a boolean.'); diff --git a/library/vendor/Zend/Gdata/Calendar/Extension/AccessLevel.php b/library/vendor/Zend/Gdata/Calendar/Extension/AccessLevel.php index 2da2409c2..67f4dc01e 100644 --- a/library/vendor/Zend/Gdata/Calendar/Extension/AccessLevel.php +++ b/library/vendor/Zend/Gdata/Calendar/Extension/AccessLevel.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:accessLevel element used by the Calendar data API diff --git a/library/vendor/Zend/Gdata/Calendar/Extension/Color.php b/library/vendor/Zend/Gdata/Calendar/Extension/Color.php index 79c6306dd..8318b646b 100644 --- a/library/vendor/Zend/Gdata/Calendar/Extension/Color.php +++ b/library/vendor/Zend/Gdata/Calendar/Extension/Color.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:color element used by the Calendar data API diff --git a/library/vendor/Zend/Gdata/Calendar/Extension/Hidden.php b/library/vendor/Zend/Gdata/Calendar/Extension/Hidden.php index f59610b5f..32f500630 100644 --- a/library/vendor/Zend/Gdata/Calendar/Extension/Hidden.php +++ b/library/vendor/Zend/Gdata/Calendar/Extension/Hidden.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:hidden element used by the Calendar data API @@ -90,7 +89,6 @@ class Zend_Gdata_Calendar_Extension_Hidden extends Zend_Gdata_Extension $this->_value = false; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for gCal:selected#value."); } break; diff --git a/library/vendor/Zend/Gdata/Calendar/Extension/Link.php b/library/vendor/Zend/Gdata/Calendar/Extension/Link.php index b528e9c58..4eca70ca9 100644 --- a/library/vendor/Zend/Gdata/Calendar/Extension/Link.php +++ b/library/vendor/Zend/Gdata/Calendar/Extension/Link.php @@ -23,12 +23,10 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/App/Extension/Link.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Calendar/Extension/WebContent.php'; /** diff --git a/library/vendor/Zend/Gdata/Calendar/Extension/QuickAdd.php b/library/vendor/Zend/Gdata/Calendar/Extension/QuickAdd.php index 9e70b8a80..2b92ff677 100644 --- a/library/vendor/Zend/Gdata/Calendar/Extension/QuickAdd.php +++ b/library/vendor/Zend/Gdata/Calendar/Extension/QuickAdd.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:quickAdd element used by the Calendar data API diff --git a/library/vendor/Zend/Gdata/Calendar/Extension/Selected.php b/library/vendor/Zend/Gdata/Calendar/Extension/Selected.php index 27b92c1a5..13ef9b6dd 100644 --- a/library/vendor/Zend/Gdata/Calendar/Extension/Selected.php +++ b/library/vendor/Zend/Gdata/Calendar/Extension/Selected.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:selected element used by the Calendar data API @@ -90,7 +89,6 @@ class Zend_Gdata_Calendar_Extension_Selected extends Zend_Gdata_Extension $this->_value = false; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for gCal:selected#value."); } break; diff --git a/library/vendor/Zend/Gdata/Calendar/Extension/SendEventNotifications.php b/library/vendor/Zend/Gdata/Calendar/Extension/SendEventNotifications.php index cd8f8a202..029fe313d 100644 --- a/library/vendor/Zend/Gdata/Calendar/Extension/SendEventNotifications.php +++ b/library/vendor/Zend/Gdata/Calendar/Extension/SendEventNotifications.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent an entry's sendEventNotifications diff --git a/library/vendor/Zend/Gdata/Calendar/Extension/Timezone.php b/library/vendor/Zend/Gdata/Calendar/Extension/Timezone.php index a0897a9e1..a762e8346 100644 --- a/library/vendor/Zend/Gdata/Calendar/Extension/Timezone.php +++ b/library/vendor/Zend/Gdata/Calendar/Extension/Timezone.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:timezone element used by the Calendar data API diff --git a/library/vendor/Zend/Gdata/Calendar/Extension/WebContent.php b/library/vendor/Zend/Gdata/Calendar/Extension/WebContent.php index eb2685cc0..cb399107b 100644 --- a/library/vendor/Zend/Gdata/Calendar/Extension/WebContent.php +++ b/library/vendor/Zend/Gdata/Calendar/Extension/WebContent.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:webContent element used by the Calendar data API diff --git a/library/vendor/Zend/Gdata/Calendar/ListEntry.php b/library/vendor/Zend/Gdata/Calendar/ListEntry.php index 44da1478f..b349b8806 100644 --- a/library/vendor/Zend/Gdata/Calendar/ListEntry.php +++ b/library/vendor/Zend/Gdata/Calendar/ListEntry.php @@ -24,43 +24,35 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Calendar_Extension_AccessLevel */ -require_once 'Zend/Gdata/Calendar/Extension/AccessLevel.php'; /** * @see Zend_Calendar_Extension_Color */ -require_once 'Zend/Gdata/Calendar/Extension/Color.php'; /** * @see Zend_Calendar_Extension_Hidden */ -require_once 'Zend/Gdata/Calendar/Extension/Hidden.php'; /** * @see Zend_Calendar_Extension_Selected */ -require_once 'Zend/Gdata/Calendar/Extension/Selected.php'; /** * @see Zend_Gdata_Extension_EventStatus */ -require_once 'Zend/Gdata/Extension/EventStatus.php'; /** * @see Zend_Gdata_Extension_Visibility */ -require_once 'Zend/Gdata/Extension/Visibility.php'; /** * @see Zend_Extension_Where */ -require_once 'Zend/Gdata/Extension/Where.php'; /** * Represents a Calendar entry in the Calendar data API meta feed of a user's diff --git a/library/vendor/Zend/Gdata/Calendar/ListFeed.php b/library/vendor/Zend/Gdata/Calendar/ListFeed.php index cd1f8015a..5c8023e0d 100644 --- a/library/vendor/Zend/Gdata/Calendar/ListFeed.php +++ b/library/vendor/Zend/Gdata/Calendar/ListFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Extension_Timezone */ -require_once 'Zend/Gdata/Calendar/Extension/Timezone.php'; /** * Represents the meta-feed list of calendars diff --git a/library/vendor/Zend/Gdata/ClientLogin.php b/library/vendor/Zend/Gdata/ClientLogin.php index 76462cbc0..fcc9817f0 100644 --- a/library/vendor/Zend/Gdata/ClientLogin.php +++ b/library/vendor/Zend/Gdata/ClientLogin.php @@ -24,12 +24,10 @@ /** * Zend_Gdata_HttpClient */ -require_once 'Zend/Gdata/HttpClient.php'; /** * Zend_Version */ -require_once 'Zend/Version.php'; /** * Class to facilitate Google's "Account Authentication @@ -87,7 +85,6 @@ class Zend_Gdata_ClientLogin $accountType = 'HOSTED_OR_GOOGLE') { if (! ($email && $password)) { - require_once 'Zend/Gdata/App/AuthException.php'; throw new Zend_Gdata_App_AuthException( 'Please set your Google credentials before trying to ' . 'authenticate'); @@ -97,7 +94,6 @@ class Zend_Gdata_ClientLogin $client = new Zend_Gdata_HttpClient(); } if (!$client instanceof Zend_Http_Client) { - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException( 'Client is not an instance of Zend_Http_Client.'); } @@ -123,7 +119,6 @@ class Zend_Gdata_ClientLogin (string) $loginCaptcha); } else { - require_once 'Zend/Gdata/App/AuthException.php'; throw new Zend_Gdata_App_AuthException( 'Please provide both a token ID and a user\'s response ' . 'to the CAPTCHA challenge.'); @@ -137,7 +132,6 @@ class Zend_Gdata_ClientLogin try { $response = $client->request('POST'); } catch (Zend_Http_Client_Exception $e) { - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } ob_end_clean(); @@ -166,12 +160,10 @@ class Zend_Gdata_ClientLogin // Check if the server asked for a CAPTCHA if (array_key_exists('Error', $goog_resp) && $goog_resp['Error'] == 'CaptchaRequired') { - require_once 'Zend/Gdata/App/CaptchaRequiredException.php'; throw new Zend_Gdata_App_CaptchaRequiredException( $goog_resp['CaptchaToken'], $goog_resp['CaptchaUrl']); } else { - require_once 'Zend/Gdata/App/AuthException.php'; throw new Zend_Gdata_App_AuthException('Authentication with Google failed. Reason: ' . (isset($goog_resp['Error']) ? $goog_resp['Error'] : 'Unspecified.')); } diff --git a/library/vendor/Zend/Gdata/Docs.php b/library/vendor/Zend/Gdata/Docs.php index 49fd038e9..cac9ecbd0 100755 --- a/library/vendor/Zend/Gdata/Docs.php +++ b/library/vendor/Zend/Gdata/Docs.php @@ -24,27 +24,22 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_Docs_DocumentListFeed */ -require_once 'Zend/Gdata/Docs/DocumentListFeed.php'; /** * @see Zend_Gdata_Docs_DocumentListEntry */ -require_once 'Zend/Gdata/Docs/DocumentListEntry.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; /** * @see Zend_Gdata_App_Extension_Title */ -require_once 'Zend/Gdata/App/Extension/Title.php'; /** * Service class for interacting with the Google Document List data API @@ -148,7 +143,6 @@ class Zend_Gdata_Docs extends Zend_Gdata public function getDocumentListEntry($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null' ); diff --git a/library/vendor/Zend/Gdata/Docs/DocumentListEntry.php b/library/vendor/Zend/Gdata/Docs/DocumentListEntry.php index e58101729..db5f20c53 100755 --- a/library/vendor/Zend/Gdata/Docs/DocumentListEntry.php +++ b/library/vendor/Zend/Gdata/Docs/DocumentListEntry.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_EntryAtom */ -require_once 'Zend/Gdata/Entry.php'; /** * Represents a Documents List entry in the Documents List data API meta feed diff --git a/library/vendor/Zend/Gdata/Docs/DocumentListFeed.php b/library/vendor/Zend/Gdata/Docs/DocumentListFeed.php index 9bc8edfad..0adeefd0a 100755 --- a/library/vendor/Zend/Gdata/Docs/DocumentListFeed.php +++ b/library/vendor/Zend/Gdata/Docs/DocumentListFeed.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** diff --git a/library/vendor/Zend/Gdata/Docs/Query.php b/library/vendor/Zend/Gdata/Docs/Query.php index 5976095db..a25b410ca 100755 --- a/library/vendor/Zend/Gdata/Docs/Query.php +++ b/library/vendor/Zend/Gdata/Docs/Query.php @@ -24,7 +24,6 @@ /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Document List documents @@ -202,7 +201,6 @@ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query if ($this->_visibility !== null) { $uri .= '/' . $this->_visibility; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'A visibility must be provided for cell queries.'); } @@ -210,7 +208,6 @@ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query if ($this->_projection !== null) { $uri .= '/' . $this->_projection; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'A projection must be provided for cell queries.'); } diff --git a/library/vendor/Zend/Gdata/DublinCore.php b/library/vendor/Zend/Gdata/DublinCore.php index a96261aca..09a83bb47 100755 --- a/library/vendor/Zend/Gdata/DublinCore.php +++ b/library/vendor/Zend/Gdata/DublinCore.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * Service class for interacting with the services which use the diff --git a/library/vendor/Zend/Gdata/DublinCore/Extension/Creator.php b/library/vendor/Zend/Gdata/DublinCore/Extension/Creator.php index f0dd3cc5d..246275e3a 100644 --- a/library/vendor/Zend/Gdata/DublinCore/Extension/Creator.php +++ b/library/vendor/Zend/Gdata/DublinCore/Extension/Creator.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Entity primarily responsible for making the resource diff --git a/library/vendor/Zend/Gdata/DublinCore/Extension/Date.php b/library/vendor/Zend/Gdata/DublinCore/Extension/Date.php index b2995688f..630ef619b 100644 --- a/library/vendor/Zend/Gdata/DublinCore/Extension/Date.php +++ b/library/vendor/Zend/Gdata/DublinCore/Extension/Date.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Point or period of time associated with an event in the lifecycle of the diff --git a/library/vendor/Zend/Gdata/DublinCore/Extension/Description.php b/library/vendor/Zend/Gdata/DublinCore/Extension/Description.php index 0d9cc3ad7..26cb00030 100644 --- a/library/vendor/Zend/Gdata/DublinCore/Extension/Description.php +++ b/library/vendor/Zend/Gdata/DublinCore/Extension/Description.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Account of the resource diff --git a/library/vendor/Zend/Gdata/DublinCore/Extension/Format.php b/library/vendor/Zend/Gdata/DublinCore/Extension/Format.php index c6b4445b6..f7a2020cb 100644 --- a/library/vendor/Zend/Gdata/DublinCore/Extension/Format.php +++ b/library/vendor/Zend/Gdata/DublinCore/Extension/Format.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * File format, physical medium, or dimensions of the resource diff --git a/library/vendor/Zend/Gdata/DublinCore/Extension/Identifier.php b/library/vendor/Zend/Gdata/DublinCore/Extension/Identifier.php index 8d8fc5276..3821c6171 100644 --- a/library/vendor/Zend/Gdata/DublinCore/Extension/Identifier.php +++ b/library/vendor/Zend/Gdata/DublinCore/Extension/Identifier.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * An unambiguous reference to the resource within a given context diff --git a/library/vendor/Zend/Gdata/DublinCore/Extension/Language.php b/library/vendor/Zend/Gdata/DublinCore/Extension/Language.php index 69f2b6411..2ce74aaa1 100644 --- a/library/vendor/Zend/Gdata/DublinCore/Extension/Language.php +++ b/library/vendor/Zend/Gdata/DublinCore/Extension/Language.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Language of the resource diff --git a/library/vendor/Zend/Gdata/DublinCore/Extension/Publisher.php b/library/vendor/Zend/Gdata/DublinCore/Extension/Publisher.php index 5641acd10..cec2dfe8c 100644 --- a/library/vendor/Zend/Gdata/DublinCore/Extension/Publisher.php +++ b/library/vendor/Zend/Gdata/DublinCore/Extension/Publisher.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Entity responsible for making the resource available diff --git a/library/vendor/Zend/Gdata/DublinCore/Extension/Rights.php b/library/vendor/Zend/Gdata/DublinCore/Extension/Rights.php index d79a3cc28..b6cf84fb5 100644 --- a/library/vendor/Zend/Gdata/DublinCore/Extension/Rights.php +++ b/library/vendor/Zend/Gdata/DublinCore/Extension/Rights.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Information about rights held in and over the resource diff --git a/library/vendor/Zend/Gdata/DublinCore/Extension/Subject.php b/library/vendor/Zend/Gdata/DublinCore/Extension/Subject.php index 3d0ee3402..2e8b09aaa 100644 --- a/library/vendor/Zend/Gdata/DublinCore/Extension/Subject.php +++ b/library/vendor/Zend/Gdata/DublinCore/Extension/Subject.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Topic of the resource diff --git a/library/vendor/Zend/Gdata/DublinCore/Extension/Title.php b/library/vendor/Zend/Gdata/DublinCore/Extension/Title.php index a13ee5d20..51bb78529 100644 --- a/library/vendor/Zend/Gdata/DublinCore/Extension/Title.php +++ b/library/vendor/Zend/Gdata/DublinCore/Extension/Title.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Name given to the resource diff --git a/library/vendor/Zend/Gdata/Entry.php b/library/vendor/Zend/Gdata/Entry.php index 84991d497..c1e8b7c00 100644 --- a/library/vendor/Zend/Gdata/Entry.php +++ b/library/vendor/Zend/Gdata/Entry.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_App_MediaEntry */ -require_once 'Zend/Gdata/App/MediaEntry.php'; /** * Represents the Gdata flavor of an Atom entry @@ -119,7 +117,6 @@ class Zend_Gdata_Entry extends Zend_Gdata_App_MediaEntry $this->_etag = $etag; } elseif ($this->_etag != $etag) { - require_once('Zend/Gdata/App/IOException.php'); throw new Zend_Gdata_App_IOException("ETag mismatch"); } break; diff --git a/library/vendor/Zend/Gdata/Exif.php b/library/vendor/Zend/Gdata/Exif.php index ce3372b8a..35c04e352 100755 --- a/library/vendor/Zend/Gdata/Exif.php +++ b/library/vendor/Zend/Gdata/Exif.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * Service class for interacting with the services which use the EXIF extensions diff --git a/library/vendor/Zend/Gdata/Exif/Entry.php b/library/vendor/Zend/Gdata/Exif/Entry.php index 33c593143..69501de7a 100755 --- a/library/vendor/Zend/Gdata/Exif/Entry.php +++ b/library/vendor/Zend/Gdata/Exif/Entry.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * @see Zend_Gdata_Exif_Extension_Tags */ -require_once 'Zend/Gdata/Exif/Extension/Tags.php'; /** * An Atom entry containing EXIF metadata. diff --git a/library/vendor/Zend/Gdata/Exif/Extension/Distance.php b/library/vendor/Zend/Gdata/Exif/Extension/Distance.php index 51e2e03b3..ca7cafa79 100755 --- a/library/vendor/Zend/Gdata/Exif/Extension/Distance.php +++ b/library/vendor/Zend/Gdata/Exif/Extension/Distance.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:distance element used by the Gdata Exif extensions. diff --git a/library/vendor/Zend/Gdata/Exif/Extension/Exposure.php b/library/vendor/Zend/Gdata/Exif/Extension/Exposure.php index 1baf789f7..fb06b0514 100755 --- a/library/vendor/Zend/Gdata/Exif/Extension/Exposure.php +++ b/library/vendor/Zend/Gdata/Exif/Extension/Exposure.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:exposure element used by the Gdata Exif extensions. diff --git a/library/vendor/Zend/Gdata/Exif/Extension/FStop.php b/library/vendor/Zend/Gdata/Exif/Extension/FStop.php index 0001769a4..ed266d9af 100755 --- a/library/vendor/Zend/Gdata/Exif/Extension/FStop.php +++ b/library/vendor/Zend/Gdata/Exif/Extension/FStop.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:fStop element used by the Gdata Exif extensions. diff --git a/library/vendor/Zend/Gdata/Exif/Extension/Flash.php b/library/vendor/Zend/Gdata/Exif/Extension/Flash.php index 3cca778a2..053689210 100755 --- a/library/vendor/Zend/Gdata/Exif/Extension/Flash.php +++ b/library/vendor/Zend/Gdata/Exif/Extension/Flash.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:flash element used by the Gdata Exif extensions. diff --git a/library/vendor/Zend/Gdata/Exif/Extension/FocalLength.php b/library/vendor/Zend/Gdata/Exif/Extension/FocalLength.php index 8770caed5..0cf064f17 100755 --- a/library/vendor/Zend/Gdata/Exif/Extension/FocalLength.php +++ b/library/vendor/Zend/Gdata/Exif/Extension/FocalLength.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:focalLength element used by the Gdata Exif extensions. diff --git a/library/vendor/Zend/Gdata/Exif/Extension/ImageUniqueId.php b/library/vendor/Zend/Gdata/Exif/Extension/ImageUniqueId.php index be50bc152..12ed5d4ab 100755 --- a/library/vendor/Zend/Gdata/Exif/Extension/ImageUniqueId.php +++ b/library/vendor/Zend/Gdata/Exif/Extension/ImageUniqueId.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:imageUniqueId element used by the Gdata Exif extensions. diff --git a/library/vendor/Zend/Gdata/Exif/Extension/Iso.php b/library/vendor/Zend/Gdata/Exif/Extension/Iso.php index afc6d9acd..3589d64cd 100755 --- a/library/vendor/Zend/Gdata/Exif/Extension/Iso.php +++ b/library/vendor/Zend/Gdata/Exif/Extension/Iso.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:iso element used by the Gdata Exif extensions. diff --git a/library/vendor/Zend/Gdata/Exif/Extension/Make.php b/library/vendor/Zend/Gdata/Exif/Extension/Make.php index 33d32ddbe..156bead24 100755 --- a/library/vendor/Zend/Gdata/Exif/Extension/Make.php +++ b/library/vendor/Zend/Gdata/Exif/Extension/Make.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:make element used by the Gdata Exif extensions. diff --git a/library/vendor/Zend/Gdata/Exif/Extension/Model.php b/library/vendor/Zend/Gdata/Exif/Extension/Model.php index c4373f876..68443b09f 100755 --- a/library/vendor/Zend/Gdata/Exif/Extension/Model.php +++ b/library/vendor/Zend/Gdata/Exif/Extension/Model.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:model element used by the Gdata Exif extensions. diff --git a/library/vendor/Zend/Gdata/Exif/Extension/Tags.php b/library/vendor/Zend/Gdata/Exif/Extension/Tags.php index 49ea815dc..2d7cc1d82 100755 --- a/library/vendor/Zend/Gdata/Exif/Extension/Tags.php +++ b/library/vendor/Zend/Gdata/Exif/Extension/Tags.php @@ -24,62 +24,50 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * @see Zend_Gdata_Exif_Extension_Distance */ -require_once 'Zend/Gdata/Exif/Extension/Distance.php'; /** * @see Zend_Gdata_Exif_Extension_Exposure */ -require_once 'Zend/Gdata/Exif/Extension/Exposure.php'; /** * @see Zend_Gdata_Exif_Extension_Flash */ -require_once 'Zend/Gdata/Exif/Extension/Flash.php'; /** * @see Zend_Gdata_Exif_Extension_FocalLength */ -require_once 'Zend/Gdata/Exif/Extension/FocalLength.php'; /** * @see Zend_Gdata_Exif_Extension_FStop */ -require_once 'Zend/Gdata/Exif/Extension/FStop.php'; /** * @see Zend_Gdata_Exif_Extension_ImageUniqueId */ -require_once 'Zend/Gdata/Exif/Extension/ImageUniqueId.php'; /** * @see Zend_Gdata_Exif_Extension_Iso */ -require_once 'Zend/Gdata/Exif/Extension/Iso.php'; /** * @see Zend_Gdata_Exif_Extension_Make */ -require_once 'Zend/Gdata/Exif/Extension/Make.php'; /** * @see Zend_Gdata_Exif_Extension_Model */ -require_once 'Zend/Gdata/Exif/Extension/Model.php'; /** * @see Zend_Gdata_Exif_Extension_Time */ -require_once 'Zend/Gdata/Exif/Extension/Time.php'; /** * Represents the exif:tags element used by the Gdata Exif extensions. diff --git a/library/vendor/Zend/Gdata/Exif/Extension/Time.php b/library/vendor/Zend/Gdata/Exif/Extension/Time.php index e6db7c5c6..c9ded50d0 100755 --- a/library/vendor/Zend/Gdata/Exif/Extension/Time.php +++ b/library/vendor/Zend/Gdata/Exif/Extension/Time.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:time element used by the Gdata Exif extensions. diff --git a/library/vendor/Zend/Gdata/Exif/Feed.php b/library/vendor/Zend/Gdata/Exif/Feed.php index a4effd0ae..e396096c6 100755 --- a/library/vendor/Zend/Gdata/Exif/Feed.php +++ b/library/vendor/Zend/Gdata/Exif/Feed.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_eed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; /** * @see Zend_Gdata_Exif_Entry */ -require_once 'Zend/Gdata/Exif/Entry.php'; /** * Feed for Gdata EXIF data entries. diff --git a/library/vendor/Zend/Gdata/Extension.php b/library/vendor/Zend/Gdata/Extension.php index daed4d4c3..1d7f642aa 100644 --- a/library/vendor/Zend/Gdata/Extension.php +++ b/library/vendor/Zend/Gdata/Extension.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents a Gdata extension diff --git a/library/vendor/Zend/Gdata/Extension/AttendeeStatus.php b/library/vendor/Zend/Gdata/Extension/AttendeeStatus.php index 13f3bddb4..60fde6a4c 100644 --- a/library/vendor/Zend/Gdata/Extension/AttendeeStatus.php +++ b/library/vendor/Zend/Gdata/Extension/AttendeeStatus.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent an attendee's status (gd:attendeeStatus) diff --git a/library/vendor/Zend/Gdata/Extension/AttendeeType.php b/library/vendor/Zend/Gdata/Extension/AttendeeType.php index fabce30ef..8e9996bee 100644 --- a/library/vendor/Zend/Gdata/Extension/AttendeeType.php +++ b/library/vendor/Zend/Gdata/Extension/AttendeeType.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent an attendee's type (gd:attendeeType) diff --git a/library/vendor/Zend/Gdata/Extension/Comments.php b/library/vendor/Zend/Gdata/Extension/Comments.php index 5f6d6f7ad..ba51da91e 100644 --- a/library/vendor/Zend/Gdata/Extension/Comments.php +++ b/library/vendor/Zend/Gdata/Extension/Comments.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * Represents the gd:comments element diff --git a/library/vendor/Zend/Gdata/Extension/EntryLink.php b/library/vendor/Zend/Gdata/Extension/EntryLink.php index 7020531f4..4b4473285 100644 --- a/library/vendor/Zend/Gdata/Extension/EntryLink.php +++ b/library/vendor/Zend/Gdata/Extension/EntryLink.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * Represents the gd:entryLink element diff --git a/library/vendor/Zend/Gdata/Extension/EventStatus.php b/library/vendor/Zend/Gdata/Extension/EventStatus.php index 49f38e4ab..a5a4cf9bc 100644 --- a/library/vendor/Zend/Gdata/Extension/EventStatus.php +++ b/library/vendor/Zend/Gdata/Extension/EventStatus.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the gd:eventStatus element diff --git a/library/vendor/Zend/Gdata/Extension/ExtendedProperty.php b/library/vendor/Zend/Gdata/Extension/ExtendedProperty.php index c42a27d89..4c1222613 100644 --- a/library/vendor/Zend/Gdata/Extension/ExtendedProperty.php +++ b/library/vendor/Zend/Gdata/Extension/ExtendedProperty.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Data model for gd:extendedProperty element, used by some Gdata diff --git a/library/vendor/Zend/Gdata/Extension/FeedLink.php b/library/vendor/Zend/Gdata/Extension/FeedLink.php index 61dd63013..69d72e017 100644 --- a/library/vendor/Zend/Gdata/Extension/FeedLink.php +++ b/library/vendor/Zend/Gdata/Extension/FeedLink.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * Represents the gd:feedLink element diff --git a/library/vendor/Zend/Gdata/Extension/OpenSearchItemsPerPage.php b/library/vendor/Zend/Gdata/Extension/OpenSearchItemsPerPage.php index e4252cea9..114905ab6 100644 --- a/library/vendor/Zend/Gdata/Extension/OpenSearchItemsPerPage.php +++ b/library/vendor/Zend/Gdata/Extension/OpenSearchItemsPerPage.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the openSearch:itemsPerPage element diff --git a/library/vendor/Zend/Gdata/Extension/OpenSearchStartIndex.php b/library/vendor/Zend/Gdata/Extension/OpenSearchStartIndex.php index 0efa2c0ed..8cdcb1328 100644 --- a/library/vendor/Zend/Gdata/Extension/OpenSearchStartIndex.php +++ b/library/vendor/Zend/Gdata/Extension/OpenSearchStartIndex.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the openSeach:startIndex element diff --git a/library/vendor/Zend/Gdata/Extension/OpenSearchTotalResults.php b/library/vendor/Zend/Gdata/Extension/OpenSearchTotalResults.php index b17419d89..de40751dd 100644 --- a/library/vendor/Zend/Gdata/Extension/OpenSearchTotalResults.php +++ b/library/vendor/Zend/Gdata/Extension/OpenSearchTotalResults.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the openSearch:totalResults element diff --git a/library/vendor/Zend/Gdata/Extension/OriginalEvent.php b/library/vendor/Zend/Gdata/Extension/OriginalEvent.php index 7a4b1bcda..767dbff52 100644 --- a/library/vendor/Zend/Gdata/Extension/OriginalEvent.php +++ b/library/vendor/Zend/Gdata/Extension/OriginalEvent.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_When */ -require_once 'Zend/Gdata/Extension/When.php'; /** * Represents the gd:originalEvent element diff --git a/library/vendor/Zend/Gdata/Extension/Rating.php b/library/vendor/Zend/Gdata/Extension/Rating.php index 3d4d8c576..9ee9a4fde 100644 --- a/library/vendor/Zend/Gdata/Extension/Rating.php +++ b/library/vendor/Zend/Gdata/Extension/Rating.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Implements the gd:rating element diff --git a/library/vendor/Zend/Gdata/Extension/Recurrence.php b/library/vendor/Zend/Gdata/Extension/Recurrence.php index 6a7153004..f0c6ce15a 100644 --- a/library/vendor/Zend/Gdata/Extension/Recurrence.php +++ b/library/vendor/Zend/Gdata/Extension/Recurrence.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the gd:recurrence element diff --git a/library/vendor/Zend/Gdata/Extension/RecurrenceException.php b/library/vendor/Zend/Gdata/Extension/RecurrenceException.php index 1dc730efb..e98f037b1 100644 --- a/library/vendor/Zend/Gdata/Extension/RecurrenceException.php +++ b/library/vendor/Zend/Gdata/Extension/RecurrenceException.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Extension_EntryLink */ -require_once 'Zend/Gdata/Extension/EntryLink.php'; /** * @see Zend_Gdata_Extension_OriginalEvent */ -require_once 'Zend/Gdata/Extension/OriginalEvent.php'; /** * Data model class to represent an entry's recurrenceException diff --git a/library/vendor/Zend/Gdata/Extension/Reminder.php b/library/vendor/Zend/Gdata/Extension/Reminder.php index 4ebb5a820..a440f3137 100644 --- a/library/vendor/Zend/Gdata/Extension/Reminder.php +++ b/library/vendor/Zend/Gdata/Extension/Reminder.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Implements the gd:reminder element used to set/retrieve notifications diff --git a/library/vendor/Zend/Gdata/Extension/Transparency.php b/library/vendor/Zend/Gdata/Extension/Transparency.php index c1f4bb7d7..cf466d32b 100644 --- a/library/vendor/Zend/Gdata/Extension/Transparency.php +++ b/library/vendor/Zend/Gdata/Extension/Transparency.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent an entry's transparency diff --git a/library/vendor/Zend/Gdata/Extension/Visibility.php b/library/vendor/Zend/Gdata/Extension/Visibility.php index 559253a50..77469d339 100644 --- a/library/vendor/Zend/Gdata/Extension/Visibility.php +++ b/library/vendor/Zend/Gdata/Extension/Visibility.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent an entry's visibility diff --git a/library/vendor/Zend/Gdata/Extension/When.php b/library/vendor/Zend/Gdata/Extension/When.php index 15fa20b59..a871da95a 100644 --- a/library/vendor/Zend/Gdata/Extension/When.php +++ b/library/vendor/Zend/Gdata/Extension/When.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Extension_Reminder */ -require_once 'Zend/Gdata/Extension/Reminder.php'; /** * Represents the gd:when element diff --git a/library/vendor/Zend/Gdata/Extension/Where.php b/library/vendor/Zend/Gdata/Extension/Where.php index 79a951334..61b0b8ffe 100644 --- a/library/vendor/Zend/Gdata/Extension/Where.php +++ b/library/vendor/Zend/Gdata/Extension/Where.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Extension_EntryLink */ -require_once 'Zend/Gdata/Extension/EntryLink.php'; /** * Data model class to represent a location (gd:where element) diff --git a/library/vendor/Zend/Gdata/Extension/Who.php b/library/vendor/Zend/Gdata/Extension/Who.php index 98ac8b1ca..572d1047e 100644 --- a/library/vendor/Zend/Gdata/Extension/Who.php +++ b/library/vendor/Zend/Gdata/Extension/Who.php @@ -24,22 +24,18 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Extension_AttendeeStatus */ -require_once 'Zend/Gdata/Extension/AttendeeStatus.php'; /** * @see Zend_Gdata_Extension_AttendeeType */ -require_once 'Zend/Gdata/Extension/AttendeeType.php'; /** * @see Zend_Gdata_Extension_EntryLink */ -require_once 'Zend/Gdata/Extension/EntryLink.php'; /** * Data model class to represent a participant diff --git a/library/vendor/Zend/Gdata/Feed.php b/library/vendor/Zend/Gdata/Feed.php index 0057ec638..679586229 100644 --- a/library/vendor/Zend/Gdata/Feed.php +++ b/library/vendor/Zend/Gdata/Feed.php @@ -24,32 +24,26 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_App_Feed */ -require_once 'Zend/Gdata/App/Feed.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_OpenSearchTotalResults */ -require_once 'Zend/Gdata/Extension/OpenSearchTotalResults.php'; /** * @see Zend_Gdata_Extension_OpenSearchStartIndex */ -require_once 'Zend/Gdata/Extension/OpenSearchStartIndex.php'; /** * @see Zend_Gdata_Extension_OpenSearchItemsPerPage */ -require_once 'Zend/Gdata/Extension/OpenSearchItemsPerPage.php'; /** * The Gdata flavor of an Atom Feed @@ -172,7 +166,6 @@ class Zend_Gdata_Feed extends Zend_Gdata_App_Feed $this->_etag = $etag; } elseif ($this->_etag != $etag) { - require_once('Zend/Gdata/App/IOException.php'); throw new Zend_Gdata_App_IOException("ETag mismatch"); } break; diff --git a/library/vendor/Zend/Gdata/Gapps.php b/library/vendor/Zend/Gdata/Gapps.php index f31a9914f..fa1e9aa21 100644 --- a/library/vendor/Zend/Gdata/Gapps.php +++ b/library/vendor/Zend/Gdata/Gapps.php @@ -24,42 +24,34 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_Gapps_UserFeed */ -require_once 'Zend/Gdata/Gapps/UserFeed.php'; /** * @see Zend_Gdata_Gapps_NicknameFeed */ -require_once 'Zend/Gdata/Gapps/NicknameFeed.php'; /** * @see Zend_Gdata_Gapps_GroupFeed */ -require_once 'Zend/Gdata/Gapps/GroupFeed.php'; /** * @see Zend_Gdata_Gapps_MemberFeed */ -require_once 'Zend/Gdata/Gapps/MemberFeed.php'; /** * @see Zend_Gdata_Gapps_OwnerFeed */ -require_once 'Zend/Gdata/Gapps/OwnerFeed.php'; /** * @see Zend_Gdata_Gapps_EmailListFeed */ -require_once 'Zend/Gdata/Gapps/EmailListFeed.php'; /** * @see Zend_Gdata_Gapps_EmailListRecipientFeed */ -require_once 'Zend/Gdata/Gapps/EmailListRecipientFeed.php'; /** @@ -159,7 +151,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata // completes. (See ZF-5949) $response = $e->getResponse(); if (!$response) { - require_once('Zend/Gdata/App/IOException.php'); throw new Zend_Gdata_App_IOException('No HTTP response received (possible connection failure)'); } @@ -167,7 +158,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata // Check to see if there is an AppsForYourDomainErrors // datastructure in the response. If so, convert it to // an exception and throw it. - require_once 'Zend/Gdata/Gapps/ServiceException.php'; $error = new Zend_Gdata_Gapps_ServiceException(); $error->importFromString($response->getBody()); throw $error; @@ -341,7 +331,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata } else if ($this->_domain !== null) { return self::APPS_BASE_FEED_URI . '/' . $this->_domain; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Domain must be specified.'); } @@ -429,7 +418,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function getMemberFeed($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -454,7 +442,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function getOwnerFeed($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -501,7 +488,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function getEmailListRecipientFeed($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -524,7 +510,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function getUserEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -547,7 +532,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function getNicknameEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -570,7 +554,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function getGroupEntry($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -593,7 +576,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function getMemberEntry($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -616,7 +598,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function getOwnerEntry($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -639,7 +620,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function getEmailListEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -662,7 +642,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function getEmailListRecipientEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -757,7 +736,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function insertMember($member, $uri = null) { if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } @@ -781,7 +759,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function insertOwner($owner, $uri = null) { if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } @@ -829,7 +806,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata public function insertEmailListRecipient($recipient, $uri = null) { if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } elseif ($uri instanceof Zend_Gdata_Gapps_EmailListEntry) { @@ -862,7 +838,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata // Autoloading disabled on next line for compatibility // with magic factories. See ZF-6660. if (!class_exists($name . '_' . $class, false)) { - require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($name . '_' . $class); } $foundClassName = $name . '_' . $class; @@ -877,7 +852,6 @@ class Zend_Gdata_Gapps extends Zend_Gdata $args = array_merge(array($this->getDomain()), $args); return $reflectionObj->newInstanceArgs($args); } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( "Unable to find '${class}' in registered packages"); } diff --git a/library/vendor/Zend/Gdata/Gapps/EmailListEntry.php b/library/vendor/Zend/Gdata/Gapps/EmailListEntry.php index 8cfdf0ee4..cd25ac87d 100644 --- a/library/vendor/Zend/Gdata/Gapps/EmailListEntry.php +++ b/library/vendor/Zend/Gdata/Gapps/EmailListEntry.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_Gapps_Extension_EmailList */ -require_once 'Zend/Gdata/Gapps/Extension/EmailList.php'; /** * Data model class for a Google Apps Email List Entry. diff --git a/library/vendor/Zend/Gdata/Gapps/EmailListFeed.php b/library/vendor/Zend/Gdata/Gapps/EmailListFeed.php index 205be2908..3f7411387 100644 --- a/library/vendor/Zend/Gdata/Gapps/EmailListFeed.php +++ b/library/vendor/Zend/Gdata/Gapps/EmailListFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_EmailListEntry */ -require_once 'Zend/Gdata/Gapps/EmailListEntry.php'; /** * Data model for a collection of Google Apps email list entries, usually diff --git a/library/vendor/Zend/Gdata/Gapps/EmailListQuery.php b/library/vendor/Zend/Gdata/Gapps/EmailListQuery.php index cede601cc..a6eff0c0a 100644 --- a/library/vendor/Zend/Gdata/Gapps/EmailListQuery.php +++ b/library/vendor/Zend/Gdata/Gapps/EmailListQuery.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps email list entries. diff --git a/library/vendor/Zend/Gdata/Gapps/EmailListRecipientEntry.php b/library/vendor/Zend/Gdata/Gapps/EmailListRecipientEntry.php index 4a13e1ea0..2f5b40c14 100644 --- a/library/vendor/Zend/Gdata/Gapps/EmailListRecipientEntry.php +++ b/library/vendor/Zend/Gdata/Gapps/EmailListRecipientEntry.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_Who */ -require_once 'Zend/Gdata/Extension/Who.php'; /** * Data model class for a Google Apps Email List Recipient Entry. diff --git a/library/vendor/Zend/Gdata/Gapps/EmailListRecipientFeed.php b/library/vendor/Zend/Gdata/Gapps/EmailListRecipientFeed.php index 489c5b389..8de3135bf 100644 --- a/library/vendor/Zend/Gdata/Gapps/EmailListRecipientFeed.php +++ b/library/vendor/Zend/Gdata/Gapps/EmailListRecipientFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_EmailListRecipientEntry */ -require_once 'Zend/Gdata/Gapps/EmailListRecipientEntry.php'; /** * Data model for a collection of Google Apps email list recipient entries, diff --git a/library/vendor/Zend/Gdata/Gapps/EmailListRecipientQuery.php b/library/vendor/Zend/Gdata/Gapps/EmailListRecipientQuery.php index c5751b918..ac1d2a018 100644 --- a/library/vendor/Zend/Gdata/Gapps/EmailListRecipientQuery.php +++ b/library/vendor/Zend/Gdata/Gapps/EmailListRecipientQuery.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps email list recipient @@ -141,7 +140,6 @@ class Zend_Gdata_Gapps_EmailListRecipientQuery extends Zend_Gdata_Gapps_Query if ($this->_emailListName !== null) { $uri .= '/' . $this->_emailListName; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'EmailListName must not be null'); } diff --git a/library/vendor/Zend/Gdata/Gapps/Error.php b/library/vendor/Zend/Gdata/Gapps/Error.php index a239a72b1..8171b50a2 100644 --- a/library/vendor/Zend/Gdata/Gapps/Error.php +++ b/library/vendor/Zend/Gdata/Gapps/Error.php @@ -25,7 +25,6 @@ /** * Zend_Gdata_App_Base */ -require_once 'Zend/Gdata/App/Base.php'; /** * Gdata Gapps Error class. This class is used to represent errors returned diff --git a/library/vendor/Zend/Gdata/Gapps/Extension/EmailList.php b/library/vendor/Zend/Gdata/Gapps/Extension/EmailList.php index 4ae0c2b0b..b45d20c27 100644 --- a/library/vendor/Zend/Gdata/Gapps/Extension/EmailList.php +++ b/library/vendor/Zend/Gdata/Gapps/Extension/EmailList.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:emailList element used by the Apps data API. This diff --git a/library/vendor/Zend/Gdata/Gapps/Extension/Login.php b/library/vendor/Zend/Gdata/Gapps/Extension/Login.php index e97c8034e..fef157a0a 100644 --- a/library/vendor/Zend/Gdata/Gapps/Extension/Login.php +++ b/library/vendor/Zend/Gdata/Gapps/Extension/Login.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:login element used by the Apps data API. This @@ -209,7 +207,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension $this->_admin = false; } else { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#admin."); } break; @@ -221,7 +218,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension $this->_agreedToTerms = false; } else { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#agreedToTerms."); } break; @@ -233,7 +229,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension $this->_suspended = false; } else { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#suspended."); } break; @@ -245,7 +240,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension $this->_changePasswordAtNextLogin = false; } else { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#changePasswordAtNextLogin."); } break; @@ -342,7 +336,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension public function getAdmin() { if (!(is_bool($this->_admin))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for admin.'); } return $this->_admin; @@ -359,7 +352,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension public function setAdmin($value) { if (!(is_bool($value))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.'); } $this->_admin = $value; @@ -376,7 +368,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension public function getAgreedToTerms() { if (!(is_bool($this->_agreedToTerms))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for agreedToTerms.'); } return $this->_agreedToTerms; @@ -393,7 +384,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension public function setAgreedToTerms($value) { if (!(is_bool($value))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.'); } $this->_agreedToTerms = $value; @@ -410,7 +400,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension public function getSuspended() { if (!(is_bool($this->_suspended))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for suspended.'); } return $this->_suspended; @@ -427,7 +416,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension public function setSuspended($value) { if (!(is_bool($value))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.'); } $this->_suspended = $value; @@ -444,7 +432,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension public function getChangePasswordAtNextLogin() { if (!(is_bool($this->_changePasswordAtNextLogin))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for changePasswordAtNextLogin.'); } return $this->_changePasswordAtNextLogin; @@ -462,7 +449,6 @@ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension public function setChangePasswordAtNextLogin($value) { if (!(is_bool($value))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.'); } $this->_changePasswordAtNextLogin = $value; diff --git a/library/vendor/Zend/Gdata/Gapps/Extension/Name.php b/library/vendor/Zend/Gdata/Gapps/Extension/Name.php index 2b06c42be..72f546aef 100644 --- a/library/vendor/Zend/Gdata/Gapps/Extension/Name.php +++ b/library/vendor/Zend/Gdata/Gapps/Extension/Name.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:name element used by the Apps data API. This is used diff --git a/library/vendor/Zend/Gdata/Gapps/Extension/Nickname.php b/library/vendor/Zend/Gdata/Gapps/Extension/Nickname.php index 407c55adb..f5b8dd8ac 100644 --- a/library/vendor/Zend/Gdata/Gapps/Extension/Nickname.php +++ b/library/vendor/Zend/Gdata/Gapps/Extension/Nickname.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:nickname element used by the Apps data API. This diff --git a/library/vendor/Zend/Gdata/Gapps/Extension/Property.php b/library/vendor/Zend/Gdata/Gapps/Extension/Property.php index 6b9fde26c..91c7f475c 100644 --- a/library/vendor/Zend/Gdata/Gapps/Extension/Property.php +++ b/library/vendor/Zend/Gdata/Gapps/Extension/Property.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:Property element used by the Apps data API. diff --git a/library/vendor/Zend/Gdata/Gapps/Extension/Quota.php b/library/vendor/Zend/Gdata/Gapps/Extension/Quota.php index 4146ac60e..a3b88af0a 100644 --- a/library/vendor/Zend/Gdata/Gapps/Extension/Quota.php +++ b/library/vendor/Zend/Gdata/Gapps/Extension/Quota.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:quota element used by the Apps data API. This is diff --git a/library/vendor/Zend/Gdata/Gapps/GroupEntry.php b/library/vendor/Zend/Gdata/Gapps/GroupEntry.php index 1910c894d..e85a3ea46 100644 --- a/library/vendor/Zend/Gdata/Gapps/GroupEntry.php +++ b/library/vendor/Zend/Gdata/Gapps/GroupEntry.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Gapps_Extension_Property */ -require_once 'Zend/Gdata/Gapps/Extension/Property.php'; /** * Data model class for a Google Apps Group Entry. diff --git a/library/vendor/Zend/Gdata/Gapps/GroupFeed.php b/library/vendor/Zend/Gdata/Gapps/GroupFeed.php index 3132ee729..8cce1eea7 100644 --- a/library/vendor/Zend/Gdata/Gapps/GroupFeed.php +++ b/library/vendor/Zend/Gdata/Gapps/GroupFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_GroupEntry */ -require_once 'Zend/Gdata/Gapps/GroupEntry.php'; /** * Data model for a collection of Google Apps group entries, usually diff --git a/library/vendor/Zend/Gdata/Gapps/GroupQuery.php b/library/vendor/Zend/Gdata/Gapps/GroupQuery.php index 2132819eb..2d063a906 100644 --- a/library/vendor/Zend/Gdata/Gapps/GroupQuery.php +++ b/library/vendor/Zend/Gdata/Gapps/GroupQuery.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps group entries. diff --git a/library/vendor/Zend/Gdata/Gapps/MemberEntry.php b/library/vendor/Zend/Gdata/Gapps/MemberEntry.php index 93ff1da5a..2e9bf4fc1 100644 --- a/library/vendor/Zend/Gdata/Gapps/MemberEntry.php +++ b/library/vendor/Zend/Gdata/Gapps/MemberEntry.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Gapps_Extension_Property */ -require_once 'Zend/Gdata/Gapps/Extension/Property.php'; /** * Data model class for a Google Apps Member Entry. diff --git a/library/vendor/Zend/Gdata/Gapps/MemberFeed.php b/library/vendor/Zend/Gdata/Gapps/MemberFeed.php index 504a78301..83a02c73e 100644 --- a/library/vendor/Zend/Gdata/Gapps/MemberFeed.php +++ b/library/vendor/Zend/Gdata/Gapps/MemberFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_MemberEntry */ -require_once 'Zend/Gdata/Gapps/MemberEntry.php'; /** * Data model for a collection of Google Apps member entries, usually diff --git a/library/vendor/Zend/Gdata/Gapps/MemberQuery.php b/library/vendor/Zend/Gdata/Gapps/MemberQuery.php index 87b2ca9a9..c3d24cb26 100644 --- a/library/vendor/Zend/Gdata/Gapps/MemberQuery.php +++ b/library/vendor/Zend/Gdata/Gapps/MemberQuery.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps member entries. @@ -177,7 +176,6 @@ class Zend_Gdata_Gapps_MemberQuery extends Zend_Gdata_Gapps_Query if ($this->_groupId !== null) { $uri .= '/' . $this->_groupId; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'groupId must not be null'); } diff --git a/library/vendor/Zend/Gdata/Gapps/NicknameEntry.php b/library/vendor/Zend/Gdata/Gapps/NicknameEntry.php index 2324e2542..a9b20e175 100644 --- a/library/vendor/Zend/Gdata/Gapps/NicknameEntry.php +++ b/library/vendor/Zend/Gdata/Gapps/NicknameEntry.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Gapps_Extension_Login */ -require_once 'Zend/Gdata/Gapps/Extension/Login.php'; /** * @see Zend_Gdata_Gapps_Extension_Nickname */ -require_once 'Zend/Gdata/Gapps/Extension/Nickname.php'; /** * Data model class for a Google Apps Nickname Entry. diff --git a/library/vendor/Zend/Gdata/Gapps/NicknameFeed.php b/library/vendor/Zend/Gdata/Gapps/NicknameFeed.php index fc2a2c6bd..2d7d052c0 100644 --- a/library/vendor/Zend/Gdata/Gapps/NicknameFeed.php +++ b/library/vendor/Zend/Gdata/Gapps/NicknameFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_NicknameEntry */ -require_once 'Zend/Gdata/Gapps/NicknameEntry.php'; /** * Data model for a collection of Google Apps nickname entries, usually diff --git a/library/vendor/Zend/Gdata/Gapps/NicknameQuery.php b/library/vendor/Zend/Gdata/Gapps/NicknameQuery.php index bee774199..0ec5c7def 100644 --- a/library/vendor/Zend/Gdata/Gapps/NicknameQuery.php +++ b/library/vendor/Zend/Gdata/Gapps/NicknameQuery.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps nickname entries. diff --git a/library/vendor/Zend/Gdata/Gapps/OwnerEntry.php b/library/vendor/Zend/Gdata/Gapps/OwnerEntry.php index 993a0cf15..18db9c700 100644 --- a/library/vendor/Zend/Gdata/Gapps/OwnerEntry.php +++ b/library/vendor/Zend/Gdata/Gapps/OwnerEntry.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Gapps_Extension_Property */ -require_once 'Zend/Gdata/Gapps/Extension/Property.php'; /** * Data model class for a Google Apps Owner Entry. diff --git a/library/vendor/Zend/Gdata/Gapps/OwnerFeed.php b/library/vendor/Zend/Gdata/Gapps/OwnerFeed.php index 79386aeee..c85e3f5bc 100644 --- a/library/vendor/Zend/Gdata/Gapps/OwnerFeed.php +++ b/library/vendor/Zend/Gdata/Gapps/OwnerFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_OwnerEntry */ -require_once 'Zend/Gdata/Gapps/OwnerEntry.php'; /** * Data model for a collection of Google Apps owner entries, usually diff --git a/library/vendor/Zend/Gdata/Gapps/OwnerQuery.php b/library/vendor/Zend/Gdata/Gapps/OwnerQuery.php index 9ed0e283e..f1cddc675 100644 --- a/library/vendor/Zend/Gdata/Gapps/OwnerQuery.php +++ b/library/vendor/Zend/Gdata/Gapps/OwnerQuery.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps owner entries. @@ -129,7 +128,6 @@ class Zend_Gdata_Gapps_OwnerQuery extends Zend_Gdata_Gapps_Query if ($this->_groupId !== null) { $uri .= '/' . $this->_groupId; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'groupId must not be null'); } diff --git a/library/vendor/Zend/Gdata/Gapps/Query.php b/library/vendor/Zend/Gdata/Gapps/Query.php index 061e10c77..d2d5da205 100644 --- a/library/vendor/Zend/Gdata/Gapps/Query.php +++ b/library/vendor/Zend/Gdata/Gapps/Query.php @@ -24,12 +24,10 @@ /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); /** * Zend_Gdata_Gapps */ -require_once('Zend/Gdata/Gapps.php'); /** * Assists in constructing queries for Google Apps entries. This class @@ -114,7 +112,6 @@ abstract class Zend_Gdata_Gapps_Query extends Zend_Gdata_Query return Zend_Gdata_Gapps::APPS_BASE_FEED_URI . '/' . $this->_domain; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Domain must be specified.'); } diff --git a/library/vendor/Zend/Gdata/Gapps/ServiceException.php b/library/vendor/Zend/Gdata/Gapps/ServiceException.php index 78045a55e..262d3dd6a 100644 --- a/library/vendor/Zend/Gdata/Gapps/ServiceException.php +++ b/library/vendor/Zend/Gdata/Gapps/ServiceException.php @@ -25,15 +25,12 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Zend_Gdata_Gapps_Error */ -require_once 'Zend/Gdata/Gapps/Error.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** * Gdata Gapps Exception class. This is thrown when an @@ -86,7 +83,6 @@ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception // Make sure that we don't try to index an error that doesn't // contain an index value. if ($error->getErrorCode() == null) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception("Error encountered without corresponding error code."); } @@ -167,7 +163,6 @@ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception @ini_restore('track_errors'); if (!$doc) { - require_once 'Zend/Gdata/App/Exception.php'; // $php_errormsg is automatically generated by PHP if // an error occurs while calling loadXML(), above. throw new Zend_Gdata_App_Exception("DOMDocument cannot parse XML: $php_errormsg"); @@ -177,7 +172,6 @@ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception // If it isn't, something has gone horribly wrong. $rootElement = $doc->getElementsByTagName($this->_rootElement)->item(0); if (!$rootElement) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('No root <' . $this->_rootElement . '> element found, cannot parse feed.'); } @@ -190,7 +184,6 @@ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception } return $this; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('XML passed to transferFromXML cannot be null'); } diff --git a/library/vendor/Zend/Gdata/Gapps/UserEntry.php b/library/vendor/Zend/Gdata/Gapps/UserEntry.php index 402bbdeec..414813f24 100644 --- a/library/vendor/Zend/Gdata/Gapps/UserEntry.php +++ b/library/vendor/Zend/Gdata/Gapps/UserEntry.php @@ -24,27 +24,22 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_Gapps_Extension_Login */ -require_once 'Zend/Gdata/Gapps/Extension/Login.php'; /** * @see Zend_Gdata_Gapps_Extension_Name */ -require_once 'Zend/Gdata/Gapps/Extension/Name.php'; /** * @see Zend_Gdata_Gapps_Extension_Quota */ -require_once 'Zend/Gdata/Gapps/Extension/Quota.php'; /** * Data model class for a Google Apps User Entry. diff --git a/library/vendor/Zend/Gdata/Gapps/UserFeed.php b/library/vendor/Zend/Gdata/Gapps/UserFeed.php index b4c284864..68660ed1c 100644 --- a/library/vendor/Zend/Gdata/Gapps/UserFeed.php +++ b/library/vendor/Zend/Gdata/Gapps/UserFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_UserEntry */ -require_once 'Zend/Gdata/Gapps/UserEntry.php'; /** * Data model for a collection of Google Apps user entries, usually diff --git a/library/vendor/Zend/Gdata/Gapps/UserQuery.php b/library/vendor/Zend/Gdata/Gapps/UserQuery.php index 867e23bf4..019abfc5f 100644 --- a/library/vendor/Zend/Gdata/Gapps/UserQuery.php +++ b/library/vendor/Zend/Gdata/Gapps/UserQuery.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps user entries. diff --git a/library/vendor/Zend/Gdata/Gbase.php b/library/vendor/Zend/Gdata/Gbase.php index 4360ef7a7..b66e81f6d 100644 --- a/library/vendor/Zend/Gdata/Gbase.php +++ b/library/vendor/Zend/Gdata/Gbase.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * Service class for interacting with the Google Base data API diff --git a/library/vendor/Zend/Gdata/Gbase/Entry.php b/library/vendor/Zend/Gdata/Gbase/Entry.php index 4ae2353b8..8e83a61c6 100644 --- a/library/vendor/Zend/Gdata/Gbase/Entry.php +++ b/library/vendor/Zend/Gdata/Gbase/Entry.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * Base class for working with Google Base entries. diff --git a/library/vendor/Zend/Gdata/Gbase/Extension/BaseAttribute.php b/library/vendor/Zend/Gdata/Gbase/Extension/BaseAttribute.php index 265fba7b8..79078c94a 100644 --- a/library/vendor/Zend/Gdata/Gbase/Extension/BaseAttribute.php +++ b/library/vendor/Zend/Gdata/Gbase/Extension/BaseAttribute.php @@ -23,7 +23,6 @@ /** * @see Zend_Gdata_App_Extension_Element */ -require_once 'Zend/Gdata/App/Extension/Element.php'; /** * Concrete class for working with ItemType elements. diff --git a/library/vendor/Zend/Gdata/Gbase/Feed.php b/library/vendor/Zend/Gdata/Gbase/Feed.php index f08f9f616..d82109760 100644 --- a/library/vendor/Zend/Gdata/Gbase/Feed.php +++ b/library/vendor/Zend/Gdata/Gbase/Feed.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * Base class for the Google Base Feed diff --git a/library/vendor/Zend/Gdata/Gbase/ItemEntry.php b/library/vendor/Zend/Gdata/Gbase/ItemEntry.php index e9bde2c32..94a192c59 100644 --- a/library/vendor/Zend/Gdata/Gbase/ItemEntry.php +++ b/library/vendor/Zend/Gdata/Gbase/ItemEntry.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gbase_Entry */ -require_once 'Zend/Gdata/Gbase/Entry.php'; /** * Concrete class for working with Item entries. diff --git a/library/vendor/Zend/Gdata/Gbase/ItemFeed.php b/library/vendor/Zend/Gdata/Gbase/ItemFeed.php index 960df36de..865ba77aa 100644 --- a/library/vendor/Zend/Gdata/Gbase/ItemFeed.php +++ b/library/vendor/Zend/Gdata/Gbase/ItemFeed.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gbase_Feed */ -require_once 'Zend/Gdata/Gbase/Feed.php'; /** * Represents the Google Base Customer Items Feed diff --git a/library/vendor/Zend/Gdata/Gbase/ItemQuery.php b/library/vendor/Zend/Gdata/Gbase/ItemQuery.php index 23a046c96..db1c84d46 100644 --- a/library/vendor/Zend/Gdata/Gbase/ItemQuery.php +++ b/library/vendor/Zend/Gdata/Gbase/ItemQuery.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Gbase_Query */ -require_once 'Zend/Gdata/Gbase/Query.php'; /** diff --git a/library/vendor/Zend/Gdata/Gbase/Query.php b/library/vendor/Zend/Gdata/Gbase/Query.php index 5b44ca2ba..4e834969c 100644 --- a/library/vendor/Zend/Gdata/Gbase/Query.php +++ b/library/vendor/Zend/Gdata/Gbase/Query.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Query */ -require_once 'Zend/Gdata/Query.php'; /** * Assists in constructing queries for Google Base diff --git a/library/vendor/Zend/Gdata/Gbase/SnippetEntry.php b/library/vendor/Zend/Gdata/Gbase/SnippetEntry.php index 1d6b67881..f2d96278c 100644 --- a/library/vendor/Zend/Gdata/Gbase/SnippetEntry.php +++ b/library/vendor/Zend/Gdata/Gbase/SnippetEntry.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gbase_Entry */ -require_once 'Zend/Gdata/Gbase/Entry.php'; /** * Concrete class for working with Snippet entries. diff --git a/library/vendor/Zend/Gdata/Gbase/SnippetFeed.php b/library/vendor/Zend/Gdata/Gbase/SnippetFeed.php index e9b07d670..bb03b2191 100644 --- a/library/vendor/Zend/Gdata/Gbase/SnippetFeed.php +++ b/library/vendor/Zend/Gdata/Gbase/SnippetFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * Represents the Google Base Snippets Feed diff --git a/library/vendor/Zend/Gdata/Gbase/SnippetQuery.php b/library/vendor/Zend/Gdata/Gbase/SnippetQuery.php index 3daea9162..7bcc967ff 100644 --- a/library/vendor/Zend/Gdata/Gbase/SnippetQuery.php +++ b/library/vendor/Zend/Gdata/Gbase/SnippetQuery.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gbase_Query */ -require_once 'Zend/Gdata/Gbase/Query.php'; /** * Assists in constructing queries for Google Base Snippets Feed diff --git a/library/vendor/Zend/Gdata/Geo.php b/library/vendor/Zend/Gdata/Geo.php index e1bc4cbde..94bc1fedf 100755 --- a/library/vendor/Zend/Gdata/Geo.php +++ b/library/vendor/Zend/Gdata/Geo.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * Service class for interacting with the services which use the diff --git a/library/vendor/Zend/Gdata/Geo/Entry.php b/library/vendor/Zend/Gdata/Geo/Entry.php index 8b55ecaaf..627c2bc04 100755 --- a/library/vendor/Zend/Gdata/Geo/Entry.php +++ b/library/vendor/Zend/Gdata/Geo/Entry.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Geo */ -require_once 'Zend/Gdata/Geo.php'; /** * @see Zend_Gdata_Geo_Extension_GeoRssWhere */ -require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; /** * An Atom entry containing Geograpic data. diff --git a/library/vendor/Zend/Gdata/Geo/Extension/GeoRssWhere.php b/library/vendor/Zend/Gdata/Geo/Extension/GeoRssWhere.php index 2410403bc..64905dada 100755 --- a/library/vendor/Zend/Gdata/Geo/Extension/GeoRssWhere.php +++ b/library/vendor/Zend/Gdata/Geo/Extension/GeoRssWhere.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Geo */ -require_once 'Zend/Gdata/Geo.php'; /** * @see Zend_Gdata_Geo_Extension_GmlPoint */ -require_once 'Zend/Gdata/Geo/Extension/GmlPoint.php'; /** diff --git a/library/vendor/Zend/Gdata/Geo/Extension/GmlPoint.php b/library/vendor/Zend/Gdata/Geo/Extension/GmlPoint.php index 161e0e7f3..1255e35c7 100755 --- a/library/vendor/Zend/Gdata/Geo/Extension/GmlPoint.php +++ b/library/vendor/Zend/Gdata/Geo/Extension/GmlPoint.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Geo */ -require_once 'Zend/Gdata/Geo.php'; /** * @see Zend_Gdata_Geo_Extension_GmlPos */ -require_once 'Zend/Gdata/Geo/Extension/GmlPos.php'; /** diff --git a/library/vendor/Zend/Gdata/Geo/Extension/GmlPos.php b/library/vendor/Zend/Gdata/Geo/Extension/GmlPos.php index b9cd0094b..7968f6981 100755 --- a/library/vendor/Zend/Gdata/Geo/Extension/GmlPos.php +++ b/library/vendor/Zend/Gdata/Geo/Extension/GmlPos.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Geo */ -require_once 'Zend/Gdata/Geo.php'; /** * Represents the gml:pos element used by the Gdata Geo extensions. diff --git a/library/vendor/Zend/Gdata/Geo/Feed.php b/library/vendor/Zend/Gdata/Geo/Feed.php index 9bfe239a3..6f371142e 100755 --- a/library/vendor/Zend/Gdata/Geo/Feed.php +++ b/library/vendor/Zend/Gdata/Geo/Feed.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_eed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Geo */ -require_once 'Zend/Gdata/Geo.php'; /** * @see Zend_Gdata_Geo_Entry */ -require_once 'Zend/Gdata/Geo/Entry.php'; /** * Feed for Gdata Geographic data entries. diff --git a/library/vendor/Zend/Gdata/Health.php b/library/vendor/Zend/Gdata/Health.php index 2c290d753..80c1ff3c9 100755 --- a/library/vendor/Zend/Gdata/Health.php +++ b/library/vendor/Zend/Gdata/Health.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * Service class for interacting with the Google Health Data API diff --git a/library/vendor/Zend/Gdata/Health/Extension/Ccr.php b/library/vendor/Zend/Gdata/Health/Extension/Ccr.php index 928081592..acb061299 100755 --- a/library/vendor/Zend/Gdata/Health/Extension/Ccr.php +++ b/library/vendor/Zend/Gdata/Health/Extension/Ccr.php @@ -23,12 +23,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_App_Extension_Element */ -require_once 'Zend/Gdata/App/Extension/Element.php'; /** * Concrete class for working with CCR elements. diff --git a/library/vendor/Zend/Gdata/Health/ProfileEntry.php b/library/vendor/Zend/Gdata/Health/ProfileEntry.php index cb033993c..f16df4f0a 100755 --- a/library/vendor/Zend/Gdata/Health/ProfileEntry.php +++ b/library/vendor/Zend/Gdata/Health/ProfileEntry.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * Concrete class for working with Health profile entries. diff --git a/library/vendor/Zend/Gdata/Health/ProfileFeed.php b/library/vendor/Zend/Gdata/Health/ProfileFeed.php index 9e00b9e00..5a28446ca 100755 --- a/library/vendor/Zend/Gdata/Health/ProfileFeed.php +++ b/library/vendor/Zend/Gdata/Health/ProfileFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * Represents a Google Health user's Profile Feed diff --git a/library/vendor/Zend/Gdata/Health/ProfileListEntry.php b/library/vendor/Zend/Gdata/Health/ProfileListEntry.php index ea149ed6a..c9497deab 100755 --- a/library/vendor/Zend/Gdata/Health/ProfileListEntry.php +++ b/library/vendor/Zend/Gdata/Health/ProfileListEntry.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * Concrete class for working with Health profile list entries. diff --git a/library/vendor/Zend/Gdata/Health/ProfileListFeed.php b/library/vendor/Zend/Gdata/Health/ProfileListFeed.php index 72e516773..c0f642ecb 100755 --- a/library/vendor/Zend/Gdata/Health/ProfileListFeed.php +++ b/library/vendor/Zend/Gdata/Health/ProfileListFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * Represents a Google Health user's Profile List Feed diff --git a/library/vendor/Zend/Gdata/Health/Query.php b/library/vendor/Zend/Gdata/Health/Query.php index 3c4108bd8..8509065ac 100755 --- a/library/vendor/Zend/Gdata/Health/Query.php +++ b/library/vendor/Zend/Gdata/Health/Query.php @@ -24,12 +24,10 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Health diff --git a/library/vendor/Zend/Gdata/HttpAdapterStreamingProxy.php b/library/vendor/Zend/Gdata/HttpAdapterStreamingProxy.php index 7a2cd107b..6cae14d2a 100644 --- a/library/vendor/Zend/Gdata/HttpAdapterStreamingProxy.php +++ b/library/vendor/Zend/Gdata/HttpAdapterStreamingProxy.php @@ -24,7 +24,6 @@ /** * @see Zend_Http_Client_Adapter_Proxy */ -require_once 'Zend/Http/Client/Adapter/Proxy.php'; /** * Extends the proxy HTTP adapter to handle streams instead of discrete body @@ -59,13 +58,11 @@ class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Prox { // If no proxy is set, throw an error if (! $this->config['proxy_host']) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('No proxy host set!'); } // Make sure we're properly connected if (! $this->socket) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are not connected'); } @@ -74,7 +71,6 @@ class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Prox $port = $this->config['proxy_port']; if ($this->connected_to[0] != $host || $this->connected_to[1] != $port) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are connected to the wrong proxy ' . 'server'); @@ -109,7 +105,6 @@ class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Prox // Send the request headers if (! @fwrite($this->socket, $request)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to proxy server'); } @@ -117,7 +112,6 @@ class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Prox //read from $body, write to socket while ($body->hasData()) { if (! @fwrite($this->socket, $body->read(self::CHUNK_SIZE))) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to server'); } diff --git a/library/vendor/Zend/Gdata/HttpAdapterStreamingSocket.php b/library/vendor/Zend/Gdata/HttpAdapterStreamingSocket.php index aa1661727..a09b8bf5b 100644 --- a/library/vendor/Zend/Gdata/HttpAdapterStreamingSocket.php +++ b/library/vendor/Zend/Gdata/HttpAdapterStreamingSocket.php @@ -24,7 +24,6 @@ /** * @see Zend_Http_Client_Adapter_Socket */ -require_once 'Zend/Http/Client/Adapter/Socket.php'; /** * Extends the default HTTP adapter to handle streams instead of discrete body @@ -61,7 +60,6 @@ class Zend_Gdata_HttpAdapterStreamingSocket extends Zend_Http_Client_Adapter_Soc { // Make sure we're properly connected if (! $this->socket) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are not connected'); } @@ -69,7 +67,6 @@ class Zend_Gdata_HttpAdapterStreamingSocket extends Zend_Http_Client_Adapter_Soc $host = $uri->getHost(); $host = (strtolower($uri->getScheme()) == 'https' ? $this->config['ssltransport'] : 'tcp') . '://' . $host; if ($this->connected_to[0] != $host || $this->connected_to[1] != $uri->getPort()) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are connected to the wrong host'); } @@ -89,7 +86,6 @@ class Zend_Gdata_HttpAdapterStreamingSocket extends Zend_Http_Client_Adapter_Soc // Send the headers over $request .= "\r\n"; if (! @fwrite($this->socket, $request)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to server'); } @@ -99,7 +95,6 @@ class Zend_Gdata_HttpAdapterStreamingSocket extends Zend_Http_Client_Adapter_Soc $chunk = $body->read(self::CHUNK_SIZE); while ($chunk !== FALSE) { if (! @fwrite($this->socket, $chunk)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to server'); } diff --git a/library/vendor/Zend/Gdata/HttpClient.php b/library/vendor/Zend/Gdata/HttpClient.php index b1f3f4ec5..c82847e6c 100644 --- a/library/vendor/Zend/Gdata/HttpClient.php +++ b/library/vendor/Zend/Gdata/HttpClient.php @@ -23,7 +23,6 @@ /** * Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; /** * Gdata Http Client object. @@ -98,7 +97,6 @@ class Zend_Gdata_HttpClient extends Zend_Http_Client $useIncludePath = false) { $fp = @fopen($file, "r", $useIncludePath); if (!$fp) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException('Failed to open private key file for AuthSub.'); } @@ -124,7 +122,6 @@ class Zend_Gdata_HttpClient extends Zend_Http_Client */ public function setAuthSubPrivateKey($key, $passphrase = null) { if ($key != null && !function_exists('openssl_pkey_get_private')) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You cannot enable secure AuthSub if the openssl module ' . 'is not enabled in your PHP installation.'); @@ -218,7 +215,6 @@ class Zend_Gdata_HttpClient extends Zend_Http_Client $signSuccess = openssl_sign($dataToSign, $signature, $pKeyId, OPENSSL_ALGO_SHA1); if (!$signSuccess) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'openssl_signing failure - returned false'); } diff --git a/library/vendor/Zend/Gdata/Kind/EventEntry.php b/library/vendor/Zend/Gdata/Kind/EventEntry.php index 4810aa2d5..8fa5fa3e4 100644 --- a/library/vendor/Zend/Gdata/Kind/EventEntry.php +++ b/library/vendor/Zend/Gdata/Kind/EventEntry.php @@ -23,67 +23,54 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * @see Zend_Gdata_Extension_Where */ -require_once 'Zend/Gdata/Extension/Where.php'; /** * @see Zend_Gdata_Extension_When */ -require_once 'Zend/Gdata/Extension/When.php'; /** * @see Zend_Gdata_Extension_Who */ -require_once 'Zend/Gdata/Extension/Who.php'; /** * @see Zend_Gdata_Extension_Recurrence */ -require_once 'Zend/Gdata/Extension/Recurrence.php'; /** * @see Zend_Gdata_Extension_EventStatus */ -require_once 'Zend/Gdata/Extension/EventStatus.php'; /** * @see Zend_Gdata_Extension_Comments */ -require_once 'Zend/Gdata/Extension/Comments.php'; /** * @see Zend_Gdata_Extension_Transparency */ -require_once 'Zend/Gdata/Extension/Transparency.php'; /** * @see Zend_Gdata_Extension_Visibility */ -require_once 'Zend/Gdata/Extension/Visibility.php'; /** * @see Zend_Gdata_Extension_ExtendedProperty */ -require_once 'Zend/Gdata/Extension/ExtendedProperty.php'; /** * @see Zend_Gdata_Extension_OriginalEvent */ -require_once 'Zend/Gdata/Extension/OriginalEvent.php'; /** * @see Zend_Gdata_Extension_EntryLink */ -require_once 'Zend/Gdata/Extension/EntryLink.php'; /** * Data model for the Gdata Event "Kind". Google Calendar has a separate @@ -210,7 +197,6 @@ class Zend_Gdata_Kind_EventEntry extends Zend_Gdata_Entry $this->_visibility = $visiblity; break; case $this->lookupNamespace('gd') . ':' . 'recurrenceException'; - require_once 'Zend/Gdata/Extension/RecurrenceException.php'; $recurrenceException = new Zend_Gdata_Extension_RecurrenceException(); $recurrenceException ->transferFromDOM($child); $this->_recurrenceException[] = $recurrenceException; diff --git a/library/vendor/Zend/Gdata/Media.php b/library/vendor/Zend/Gdata/Media.php index b29417daa..9e6b15d9b 100755 --- a/library/vendor/Zend/Gdata/Media.php +++ b/library/vendor/Zend/Gdata/Media.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * Service class for interacting with the services which use the media extensions diff --git a/library/vendor/Zend/Gdata/Media/Entry.php b/library/vendor/Zend/Gdata/Media/Entry.php index d3b7b415b..f42042542 100755 --- a/library/vendor/Zend/Gdata/Media/Entry.php +++ b/library/vendor/Zend/Gdata/Media/Entry.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Media */ -require_once 'Zend/Gdata/Media.php'; /** * @see Zend_Gdata_Media_Extension_MediaGroup */ -require_once 'Zend/Gdata/Media/Extension/MediaGroup.php'; /** * Represents the Gdata flavor of an Atom entry diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaCategory.php b/library/vendor/Zend/Gdata/Media/Extension/MediaCategory.php index 6e41da006..28fb1feee 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaCategory.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaCategory.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:category element diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaContent.php b/library/vendor/Zend/Gdata/Media/Extension/MediaContent.php index d7ab7f20f..b0159f83c 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaContent.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaContent.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the media:content element of Media RSS. diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaCopyright.php b/library/vendor/Zend/Gdata/Media/Extension/MediaCopyright.php index 59d4078e3..5299fa67c 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaCopyright.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaCopyright.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:copyright element diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaCredit.php b/library/vendor/Zend/Gdata/Media/Extension/MediaCredit.php index c4bc69da6..2f51581ac 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaCredit.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaCredit.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:credit element diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaDescription.php b/library/vendor/Zend/Gdata/Media/Extension/MediaDescription.php index da879ff25..ee043e45f 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaDescription.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaDescription.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:description element diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaGroup.php b/library/vendor/Zend/Gdata/Media/Extension/MediaGroup.php index d24485663..c2ddaf326 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaGroup.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaGroup.php @@ -24,77 +24,62 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Media_Extension_MediaContent */ -require_once 'Zend/Gdata/Media/Extension/MediaContent.php'; /** * @see Zend_Gdata_Media_Extension_MediaCategory */ -require_once 'Zend/Gdata/Media/Extension/MediaCategory.php'; /** * @see Zend_Gdata_Media_Extension_MediaCopyright */ -require_once 'Zend/Gdata/Media/Extension/MediaCopyright.php'; /** * @see Zend_Gdata_Media_Extension_MediaCredit */ -require_once 'Zend/Gdata/Media/Extension/MediaCredit.php'; /** * @see Zend_Gdata_Media_Extension_MediaDescription */ -require_once 'Zend/Gdata/Media/Extension/MediaDescription.php'; /** * @see Zend_Gdata_Media_Extension_MediaHash */ -require_once 'Zend/Gdata/Media/Extension/MediaHash.php'; /** * @see Zend_Gdata_Media_Extension_MediaKeywords */ -require_once 'Zend/Gdata/Media/Extension/MediaKeywords.php'; /** * @see Zend_Gdata_Media_Extension_MediaPlayer */ -require_once 'Zend/Gdata/Media/Extension/MediaPlayer.php'; /** * @see Zend_Gdata_Media_Extension_MediaRating */ -require_once 'Zend/Gdata/Media/Extension/MediaRating.php'; /** * @see Zend_Gdata_Media_Extension_MediaRestriction */ -require_once 'Zend/Gdata/Media/Extension/MediaRestriction.php'; /** * @see Zend_Gdata_Media_Extension_MediaText */ -require_once 'Zend/Gdata/Media/Extension/MediaText.php'; /** * @see Zend_Gdata_Media_Extension_MediaThumbnail */ -require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php'; /** * @see Zend_Gdata_Media_Extension_MediaTitle */ -require_once 'Zend/Gdata/Media/Extension/MediaTitle.php'; /** diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaHash.php b/library/vendor/Zend/Gdata/Media/Extension/MediaHash.php index 87e06b29a..9cefd86db 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaHash.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaHash.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:hash element diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaKeywords.php b/library/vendor/Zend/Gdata/Media/Extension/MediaKeywords.php index cb4eb903d..86b247ea2 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaKeywords.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaKeywords.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:keywords element diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaPlayer.php b/library/vendor/Zend/Gdata/Media/Extension/MediaPlayer.php index 8dd18485f..fe782bd1c 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaPlayer.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaPlayer.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:player element diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaRating.php b/library/vendor/Zend/Gdata/Media/Extension/MediaRating.php index 0adb9c349..0ad010261 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaRating.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaRating.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:rating element diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaRestriction.php b/library/vendor/Zend/Gdata/Media/Extension/MediaRestriction.php index cf01b7d98..3b4fb2225 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaRestriction.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaRestriction.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:restriction element diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaText.php b/library/vendor/Zend/Gdata/Media/Extension/MediaText.php index e5521363a..6ea9adc9b 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaText.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaText.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:text element diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaThumbnail.php b/library/vendor/Zend/Gdata/Media/Extension/MediaThumbnail.php index 4a5014440..b4d75120b 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaThumbnail.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaThumbnail.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:thumbnail element diff --git a/library/vendor/Zend/Gdata/Media/Extension/MediaTitle.php b/library/vendor/Zend/Gdata/Media/Extension/MediaTitle.php index 41bf298ee..723f1981c 100755 --- a/library/vendor/Zend/Gdata/Media/Extension/MediaTitle.php +++ b/library/vendor/Zend/Gdata/Media/Extension/MediaTitle.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:title element in MediaRSS diff --git a/library/vendor/Zend/Gdata/Media/Feed.php b/library/vendor/Zend/Gdata/Media/Feed.php index bb2c878ab..322739d73 100755 --- a/library/vendor/Zend/Gdata/Media/Feed.php +++ b/library/vendor/Zend/Gdata/Media/Feed.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_eed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Media */ -require_once 'Zend/Gdata/Media.php'; /** * @see Zend_Gdata_Media_Entry */ -require_once 'Zend/Gdata/Media/Entry.php'; /** * The Gdata flavor of an Atom Feed with media support diff --git a/library/vendor/Zend/Gdata/MediaMimeStream.php b/library/vendor/Zend/Gdata/MediaMimeStream.php index ffd324871..d0bb2457f 100644 --- a/library/vendor/Zend/Gdata/MediaMimeStream.php +++ b/library/vendor/Zend/Gdata/MediaMimeStream.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_MimeFile */ -require_once 'Zend/Gdata/MimeFile.php'; /** * @see Zend_Gdata_MimeBodyString */ -require_once 'Zend/Gdata/MimeBodyString.php'; /** @@ -92,7 +90,6 @@ class Zend_Gdata_MediaMimeStream $fileContentType = null) { if (!file_exists($filePath) || !is_readable($filePath)) { - require_once 'Zend/Gdata/App/IOException.php'; throw new Zend_Gdata_App_IOException('File to be uploaded at ' . $filePath . ' does not exist or is not readable.'); } diff --git a/library/vendor/Zend/Gdata/Photos.php b/library/vendor/Zend/Gdata/Photos.php index b20d8fc7e..3cee013de 100755 --- a/library/vendor/Zend/Gdata/Photos.php +++ b/library/vendor/Zend/Gdata/Photos.php @@ -24,22 +24,18 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_Photos_UserFeed */ -require_once 'Zend/Gdata/Photos/UserFeed.php'; /** * @see Zend_Gdata_Photos_AlbumFeed */ -require_once 'Zend/Gdata/Photos/AlbumFeed.php'; /** * @see Zend_Gdata_Photos_PhotoFeed */ -require_once 'Zend/Gdata/Photos/PhotoFeed.php'; /** * Service class for interacting with the Google Photos Data API. @@ -187,7 +183,6 @@ class Zend_Gdata_Photos extends Zend_Gdata public function getAlbumFeed($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -240,7 +235,6 @@ class Zend_Gdata_Photos extends Zend_Gdata public function getUserEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -265,7 +259,6 @@ class Zend_Gdata_Photos extends Zend_Gdata public function getAlbumEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -290,7 +283,6 @@ class Zend_Gdata_Photos extends Zend_Gdata public function getPhotoEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -315,7 +307,6 @@ class Zend_Gdata_Photos extends Zend_Gdata public function getTagEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -340,7 +331,6 @@ class Zend_Gdata_Photos extends Zend_Gdata public function getCommentEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -396,7 +386,6 @@ class Zend_Gdata_Photos extends Zend_Gdata $uri = $uri->getLink(self::FEED_LINK_PATH)->href; } if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } @@ -422,7 +411,6 @@ class Zend_Gdata_Photos extends Zend_Gdata $uri = $uri->getLink(self::FEED_LINK_PATH)->href; } if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } @@ -449,7 +437,6 @@ class Zend_Gdata_Photos extends Zend_Gdata $uri = $uri->getLink(self::FEED_LINK_PATH)->href; } if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } diff --git a/library/vendor/Zend/Gdata/Photos/AlbumEntry.php b/library/vendor/Zend/Gdata/Photos/AlbumEntry.php index b53a5bf2c..18a533984 100755 --- a/library/vendor/Zend/Gdata/Photos/AlbumEntry.php +++ b/library/vendor/Zend/Gdata/Photos/AlbumEntry.php @@ -24,67 +24,54 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Photos_Extension_Access */ -require_once 'Zend/Gdata/Photos/Extension/Access.php'; /** * @see Zend_Gdata_Photos_Extension_BytesUsed */ -require_once 'Zend/Gdata/Photos/Extension/BytesUsed.php'; /** * @see Zend_Gdata_Photos_Extension_Location */ -require_once 'Zend/Gdata/Photos/Extension/Location.php'; /** * @see Zend_Gdata_Photos_Extension_Name */ -require_once 'Zend/Gdata/Photos/Extension/Name.php'; /** * @see Zend_Gdata_Photos_Extension_NumPhotos */ -require_once 'Zend/Gdata/Photos/Extension/NumPhotos.php'; /** * @see Zend_Gdata_Photos_Extension_NumPhotosRemaining */ -require_once 'Zend/Gdata/Photos/Extension/NumPhotosRemaining.php'; /** * @see Zend_Gdata_Photos_Extension_CommentCount */ -require_once 'Zend/Gdata/Photos/Extension/CommentCount.php'; /** * @see Zend_Gdata_Photos_Extension_CommentingEnabled */ -require_once 'Zend/Gdata/Photos/Extension/CommentingEnabled.php'; /** * @see Zend_Gdata_Photos_Extension_Id */ -require_once 'Zend/Gdata/Photos/Extension/Id.php'; /** * @see Zend_Gdata_Geo_Extension_GeoRssWhere */ -require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; /** * @see Zend_Gdata_Media_Extension_MediaGroup */ -require_once 'Zend/Gdata/Media/Extension/MediaGroup.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Data model class for a Photo Album Entry. diff --git a/library/vendor/Zend/Gdata/Photos/AlbumFeed.php b/library/vendor/Zend/Gdata/Photos/AlbumFeed.php index 6986f052c..73515a77c 100755 --- a/library/vendor/Zend/Gdata/Photos/AlbumFeed.php +++ b/library/vendor/Zend/Gdata/Photos/AlbumFeed.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Photos_AlbumEntry */ -require_once 'Zend/Gdata/Photos/AlbumEntry.php'; /** * Data model for a collection of album entries, usually @@ -238,7 +235,6 @@ class Zend_Gdata_Photos_AlbumFeed extends Zend_Gdata_Feed $entryClassName = $this->_entryKindClassMapping[$category->term]; break; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Entry is missing kind declaration.'); } } diff --git a/library/vendor/Zend/Gdata/Photos/AlbumQuery.php b/library/vendor/Zend/Gdata/Photos/AlbumQuery.php index 935e857ef..39068a593 100755 --- a/library/vendor/Zend/Gdata/Photos/AlbumQuery.php +++ b/library/vendor/Zend/Gdata/Photos/AlbumQuery.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Photos_UserQuery */ -require_once('Zend/Gdata/Photos/UserQuery.php'); /** * Assists in constructing album queries for various entries. @@ -134,11 +133,9 @@ class Zend_Gdata_Photos_AlbumQuery extends Zend_Gdata_Photos_UserQuery } elseif ($this->getAlbumName() === null && $this->getAlbumId() !== null) { $uri .= '/albumid/' . $this->getAlbumId(); } elseif ($this->getAlbumName() !== null && $this->getAlbumId() !== null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'AlbumName and AlbumId cannot both be non-null'); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'AlbumName and AlbumId cannot both be null'); } diff --git a/library/vendor/Zend/Gdata/Photos/CommentEntry.php b/library/vendor/Zend/Gdata/Photos/CommentEntry.php index 093412b85..55d59a3d3 100755 --- a/library/vendor/Zend/Gdata/Photos/CommentEntry.php +++ b/library/vendor/Zend/Gdata/Photos/CommentEntry.php @@ -24,27 +24,22 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Photos_Extension_Id */ -require_once 'Zend/Gdata/Photos/Extension/Id.php'; /** * @see Zend_Gdata_Photos_Extension_PhotoId */ -require_once 'Zend/Gdata/Photos/Extension/PhotoId.php'; /** * @see Zend_Gdata_Photos_Extension_Weight */ -require_once 'Zend/Gdata/Photos/Extension/Weight.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Data model class for a Comment Entry. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Access.php b/library/vendor/Zend/Gdata/Photos/Extension/Access.php index dc6367f2e..3fe09d008 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Access.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Access.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:access element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/AlbumId.php b/library/vendor/Zend/Gdata/Photos/Extension/AlbumId.php index 91cdcbe66..942c918b4 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/AlbumId.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/AlbumId.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:albumid element used by the API. This diff --git a/library/vendor/Zend/Gdata/Photos/Extension/BytesUsed.php b/library/vendor/Zend/Gdata/Photos/Extension/BytesUsed.php index 5d50f37c0..41b655d14 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/BytesUsed.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/BytesUsed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:bytesUsed element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Checksum.php b/library/vendor/Zend/Gdata/Photos/Extension/Checksum.php index 705a85f2c..3c8acb8cf 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Checksum.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Checksum.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:checksum element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Client.php b/library/vendor/Zend/Gdata/Photos/Extension/Client.php index b6fa67e69..62554e805 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Client.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Client.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:client element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/CommentCount.php b/library/vendor/Zend/Gdata/Photos/Extension/CommentCount.php index 9018f41e4..9b5630268 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/CommentCount.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/CommentCount.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:commentCount element used by the API. This diff --git a/library/vendor/Zend/Gdata/Photos/Extension/CommentingEnabled.php b/library/vendor/Zend/Gdata/Photos/Extension/CommentingEnabled.php index 24c2b41ac..c9ff7f498 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/CommentingEnabled.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/CommentingEnabled.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:commentingEnabled element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Height.php b/library/vendor/Zend/Gdata/Photos/Extension/Height.php index 8634f9e53..b569cfa47 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Height.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Height.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:height element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Id.php b/library/vendor/Zend/Gdata/Photos/Extension/Id.php index 26ff7cbb3..710b61418 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Id.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Id.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:id element used by the API. This class diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Location.php b/library/vendor/Zend/Gdata/Photos/Extension/Location.php index 0401dd98b..d85a3b876 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Location.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Location.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:location element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php b/library/vendor/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php index 67e2497af..a28fafa22 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:maxPhotosPerAlbum element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Name.php b/library/vendor/Zend/Gdata/Photos/Extension/Name.php index b5989ac5c..74781bd0c 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Name.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Name.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:name element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Nickname.php b/library/vendor/Zend/Gdata/Photos/Extension/Nickname.php index e9628a89a..90a676e4a 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Nickname.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Nickname.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:nickname element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/NumPhotos.php b/library/vendor/Zend/Gdata/Photos/Extension/NumPhotos.php index a0a85b632..b4971d130 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/NumPhotos.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/NumPhotos.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:numphotos element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php b/library/vendor/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php index a8249abd0..702acb97d 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:numphotosremaining element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/PhotoId.php b/library/vendor/Zend/Gdata/Photos/Extension/PhotoId.php index a6257f645..8ea64e2db 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/PhotoId.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/PhotoId.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:id element used by the Picasa API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Position.php b/library/vendor/Zend/Gdata/Photos/Extension/Position.php index 329402311..6096889e7 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Position.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Position.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:position element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/QuotaCurrent.php b/library/vendor/Zend/Gdata/Photos/Extension/QuotaCurrent.php index b781d382a..c398cc9ce 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/QuotaCurrent.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/QuotaCurrent.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:quotaCurrent element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/QuotaLimit.php b/library/vendor/Zend/Gdata/Photos/Extension/QuotaLimit.php index e122c7da3..60b3add73 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/QuotaLimit.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/QuotaLimit.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:quotaLimit element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Rotation.php b/library/vendor/Zend/Gdata/Photos/Extension/Rotation.php index d96ee47ea..70cbffa48 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Rotation.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Rotation.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:rotation element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Size.php b/library/vendor/Zend/Gdata/Photos/Extension/Size.php index 21e97557d..5e4c6da0f 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Size.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Size.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:size element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Thumbnail.php b/library/vendor/Zend/Gdata/Photos/Extension/Thumbnail.php index 4b3f63640..d0aef4c9c 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Thumbnail.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Thumbnail.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:thumbnail element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Timestamp.php b/library/vendor/Zend/Gdata/Photos/Extension/Timestamp.php index 98467c1fd..4494a88a7 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Timestamp.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Timestamp.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:timestamp element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/User.php b/library/vendor/Zend/Gdata/Photos/Extension/User.php index 617af3e32..57f1346a8 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/User.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/User.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:user element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Version.php b/library/vendor/Zend/Gdata/Photos/Extension/Version.php index 36f51ef21..b77238db0 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Version.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Version.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:version element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Weight.php b/library/vendor/Zend/Gdata/Photos/Extension/Weight.php index 32b077856..7bc655737 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Weight.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Weight.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:weight element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/Extension/Width.php b/library/vendor/Zend/Gdata/Photos/Extension/Width.php index 39257da74..c78aab181 100755 --- a/library/vendor/Zend/Gdata/Photos/Extension/Width.php +++ b/library/vendor/Zend/Gdata/Photos/Extension/Width.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:width element used by the API. diff --git a/library/vendor/Zend/Gdata/Photos/PhotoEntry.php b/library/vendor/Zend/Gdata/Photos/PhotoEntry.php index 4d693daa4..20e3ee49f 100755 --- a/library/vendor/Zend/Gdata/Photos/PhotoEntry.php +++ b/library/vendor/Zend/Gdata/Photos/PhotoEntry.php @@ -24,82 +24,66 @@ /** * @see Zend_Gdata_MediaEntry */ -require_once 'Zend/Gdata/Media/Entry.php'; /** * @see Zend_Gdata_Photos_Extension_PhotoId */ -require_once 'Zend/Gdata/Photos/Extension/PhotoId.php'; /** * @see Zend_Gdata_Photos_Extension_Version */ -require_once 'Zend/Gdata/Photos/Extension/Version.php'; /** * @see Zend_Gdata_Photos_Extension_AlbumId */ -require_once 'Zend/Gdata/Photos/Extension/AlbumId.php'; /** * @see Zend_Gdata_Photos_Extension_Id */ -require_once 'Zend/Gdata/Photos/Extension/Id.php'; /** * @see Zend_Gdata_Photos_Extension_Width */ -require_once 'Zend/Gdata/Photos/Extension/Width.php'; /** * @see Zend_Gdata_Photos_Extension_Height */ -require_once 'Zend/Gdata/Photos/Extension/Height.php'; /** * @see Zend_Gdata_Photos_Extension_Size */ -require_once 'Zend/Gdata/Photos/Extension/Size.php'; /** * @see Zend_Gdata_Photos_Extension_Client */ -require_once 'Zend/Gdata/Photos/Extension/Client.php'; /** * @see Zend_Gdata_Photos_Extension_Checksum */ -require_once 'Zend/Gdata/Photos/Extension/Checksum.php'; /** * @see Zend_Gdata_Photos_Extension_Timestamp */ -require_once 'Zend/Gdata/Photos/Extension/Timestamp.php'; /** * @see Zend_Gdata_Photos_Extension_CommentingEnabled */ -require_once 'Zend/Gdata/Photos/Extension/CommentingEnabled.php'; /** * @see Zend_Gdata_Photos_Extension_CommentCount */ -require_once 'Zend/Gdata/Photos/Extension/CommentCount.php'; /** * @see Zend_Gdata_Exif_Extension_Tags */ -require_once 'Zend/Gdata/Exif/Extension/Tags.php'; /** * @see Zend_Gdata_Geo_Extension_GeoRssWhere */ -require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Data model class for a Comment Entry. diff --git a/library/vendor/Zend/Gdata/Photos/PhotoFeed.php b/library/vendor/Zend/Gdata/Photos/PhotoFeed.php index 010b4911f..147287047 100755 --- a/library/vendor/Zend/Gdata/Photos/PhotoFeed.php +++ b/library/vendor/Zend/Gdata/Photos/PhotoFeed.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Photos_PhotoEntry */ -require_once 'Zend/Gdata/Photos/PhotoEntry.php'; /** * Data model for a collection of photo entries, usually @@ -265,7 +262,6 @@ class Zend_Gdata_Photos_PhotoFeed extends Zend_Gdata_Feed $entryClassName = $this->_entryKindClassMapping[$category->term]; break; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Entry is missing kind declaration.'); } } diff --git a/library/vendor/Zend/Gdata/Photos/PhotoQuery.php b/library/vendor/Zend/Gdata/Photos/PhotoQuery.php index 5f4904795..a00e46696 100755 --- a/library/vendor/Zend/Gdata/Photos/PhotoQuery.php +++ b/library/vendor/Zend/Gdata/Photos/PhotoQuery.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gapps_Picasa_AlbumQuery */ -require_once('Zend/Gdata/Photos/AlbumQuery.php'); /** * Assists in constructing queries for comment/tag entries. @@ -87,7 +86,6 @@ class Zend_Gdata_Photos_PhotoQuery extends Zend_Gdata_Photos_AlbumQuery if ($this->getPhotoId() !== null) { $uri .= '/photoid/' . $this->getPhotoId(); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'PhotoId cannot be null'); } diff --git a/library/vendor/Zend/Gdata/Photos/TagEntry.php b/library/vendor/Zend/Gdata/Photos/TagEntry.php index de2df5dcb..2a16fde48 100755 --- a/library/vendor/Zend/Gdata/Photos/TagEntry.php +++ b/library/vendor/Zend/Gdata/Photos/TagEntry.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Photos_Extension_Weight */ -require_once 'Zend/Gdata/Photos/Extension/Weight.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Data model class for a Tag Entry. diff --git a/library/vendor/Zend/Gdata/Photos/UserEntry.php b/library/vendor/Zend/Gdata/Photos/UserEntry.php index b6422b158..659346909 100755 --- a/library/vendor/Zend/Gdata/Photos/UserEntry.php +++ b/library/vendor/Zend/Gdata/Photos/UserEntry.php @@ -24,47 +24,38 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; /** * @see Zend_Gdata_Photos_Extension_Nickname */ -require_once 'Zend/Gdata/Photos/Extension/Nickname.php'; /** * @see Zend_Gdata_Photos_Extension_Thumbnail */ -require_once 'Zend/Gdata/Photos/Extension/Thumbnail.php'; /** * @see Zend_Gdata_Photos_Extension_QuotaCurrent */ -require_once 'Zend/Gdata/Photos/Extension/QuotaCurrent.php'; /** * @see Zend_Gdata_Photos_Extension_QuotaLimit */ -require_once 'Zend/Gdata/Photos/Extension/QuotaLimit.php'; /** * @see Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum */ -require_once 'Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php'; /** * @see Zend_Gdata_Photos_Extension_User */ -require_once 'Zend/Gdata/Photos/Extension/User.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Data model class for a User Entry. diff --git a/library/vendor/Zend/Gdata/Photos/UserFeed.php b/library/vendor/Zend/Gdata/Photos/UserFeed.php index b7069e42a..b124991fd 100755 --- a/library/vendor/Zend/Gdata/Photos/UserFeed.php +++ b/library/vendor/Zend/Gdata/Photos/UserFeed.php @@ -24,37 +24,30 @@ /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Photos_UserEntry */ -require_once 'Zend/Gdata/Photos/UserEntry.php'; /** * @see Zend_Gdata_Photos_AlbumEntry */ -require_once 'Zend/Gdata/Photos/AlbumEntry.php'; /** * @see Zend_Gdata_Photos_PhotoEntry */ -require_once 'Zend/Gdata/Photos/PhotoEntry.php'; /** * @see Zend_Gdata_Photos_TagEntry */ -require_once 'Zend/Gdata/Photos/TagEntry.php'; /** * @see Zend_Gdata_Photos_CommentEntry */ -require_once 'Zend/Gdata/Photos/CommentEntry.php'; /** * Data model for a collection of entries for a specific user, usually @@ -144,7 +137,6 @@ class Zend_Gdata_Photos_UserFeed extends Zend_Gdata_Feed $entryClassName = $this->_entryKindClassMapping[$category->term]; break; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Entry is missing kind declaration.'); } } diff --git a/library/vendor/Zend/Gdata/Photos/UserQuery.php b/library/vendor/Zend/Gdata/Photos/UserQuery.php index ef984f849..8a22cc614 100755 --- a/library/vendor/Zend/Gdata/Photos/UserQuery.php +++ b/library/vendor/Zend/Gdata/Photos/UserQuery.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for user entries. @@ -325,7 +324,6 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query if ($this->getType() !== null) { $uri .= '/' . $this->getType(); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Type must be feed or entry, not null'); } @@ -333,7 +331,6 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query if ($this->getProjection() !== null) { $uri .= '/' . $this->getProjection(); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Projection must not be null'); } @@ -342,7 +339,6 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query $uri .= '/user/' . $this->getUser(); } else { // Should never occur due to setter behavior - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'User must not be null'); } diff --git a/library/vendor/Zend/Gdata/Query.php b/library/vendor/Zend/Gdata/Query.php index 251a59c53..8326a458a 100644 --- a/library/vendor/Zend/Gdata/Query.php +++ b/library/vendor/Zend/Gdata/Query.php @@ -24,7 +24,6 @@ /** * Zend_Gdata_App_Util */ -require_once 'Zend/Gdata/App/Util.php'; /** * Provides a mechanism to build a query URL for Gdata services. @@ -399,7 +398,6 @@ class Zend_Gdata_Query if (method_exists($this, $method)) { return call_user_func(array(&$this, $method)); } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Property ' . $name . ' does not exist'); } } @@ -410,7 +408,6 @@ class Zend_Gdata_Query if (method_exists($this, $method)) { return call_user_func(array(&$this, $method), $val); } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Property ' . $name . ' does not exist'); } } diff --git a/library/vendor/Zend/Gdata/Spreadsheets.php b/library/vendor/Zend/Gdata/Spreadsheets.php index dc3582bfd..19846eed4 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets.php +++ b/library/vendor/Zend/Gdata/Spreadsheets.php @@ -24,62 +24,50 @@ /** * Zend_Gdata */ -require_once('Zend/Gdata.php'); /** * Zend_Gdata_Spreadsheets_SpreadsheetFeed */ -require_once('Zend/Gdata/Spreadsheets/SpreadsheetFeed.php'); /** * Zend_Gdata_Spreadsheets_WorksheetFeed */ -require_once('Zend/Gdata/Spreadsheets/WorksheetFeed.php'); /** * Zend_Gdata_Spreadsheets_CellFeed */ -require_once('Zend/Gdata/Spreadsheets/CellFeed.php'); /** * Zend_Gdata_Spreadsheets_ListFeed */ -require_once('Zend/Gdata/Spreadsheets/ListFeed.php'); /** * Zend_Gdata_Spreadsheets_SpreadsheetEntry */ -require_once('Zend/Gdata/Spreadsheets/SpreadsheetEntry.php'); /** * Zend_Gdata_Spreadsheets_WorksheetEntry */ -require_once('Zend/Gdata/Spreadsheets/WorksheetEntry.php'); /** * Zend_Gdata_Spreadsheets_CellEntry */ -require_once('Zend/Gdata/Spreadsheets/CellEntry.php'); /** * Zend_Gdata_Spreadsheets_ListEntry */ -require_once('Zend/Gdata/Spreadsheets/ListEntry.php'); /** * Zend_Gdata_Spreadsheets_DocumentQuery */ -require_once('Zend/Gdata/Spreadsheets/DocumentQuery.php'); /** * Zend_Gdata_Spreadsheets_ListQuery */ -require_once('Zend/Gdata/Spreadsheets/ListQuery.php'); /** * Zend_Gdata_Spreadsheets_CellQuery */ -require_once('Zend/Gdata/Spreadsheets/CellQuery.php'); /** * Gdata Spreadsheets diff --git a/library/vendor/Zend/Gdata/Spreadsheets/CellEntry.php b/library/vendor/Zend/Gdata/Spreadsheets/CellEntry.php index 2592f4908..2049e68f4 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/CellEntry.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/CellEntry.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_Cell */ -require_once 'Zend/Gdata/Spreadsheets/Extension/Cell.php'; /** * Concrete class for working with Cell entries. diff --git a/library/vendor/Zend/Gdata/Spreadsheets/CellFeed.php b/library/vendor/Zend/Gdata/Spreadsheets/CellFeed.php index b00a2ccff..e29c81d28 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/CellFeed.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/CellFeed.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_RowCount */ -require_once 'Zend/Gdata/Spreadsheets/Extension/RowCount.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_ColCount */ -require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php'; /** * diff --git a/library/vendor/Zend/Gdata/Spreadsheets/CellQuery.php b/library/vendor/Zend/Gdata/Spreadsheets/CellQuery.php index 8198aa0fc..b6e389a6d 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/CellQuery.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/CellQuery.php @@ -24,12 +24,10 @@ /** * Zend_Gdata_App_util */ -require_once('Zend/Gdata/App/Util.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Spreadsheets cells @@ -368,28 +366,24 @@ class Zend_Gdata_Spreadsheets_CellQuery extends Zend_Gdata_Query if ($this->_spreadsheetKey != null) { $uri .= '/'.$this->_spreadsheetKey; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A spreadsheet key must be provided for cell queries.'); } if ($this->_worksheetId != null) { $uri .= '/'.$this->_worksheetId; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A worksheet id must be provided for cell queries.'); } if ($this->_visibility != null) { $uri .= '/'.$this->_visibility; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A visibility must be provided for cell queries.'); } if ($this->_projection != null) { $uri .= '/'.$this->_projection; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A projection must be provided for cell queries.'); } diff --git a/library/vendor/Zend/Gdata/Spreadsheets/DocumentQuery.php b/library/vendor/Zend/Gdata/Spreadsheets/DocumentQuery.php index a53a05481..6ec9004d8 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/DocumentQuery.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/DocumentQuery.php @@ -24,12 +24,10 @@ /** * Zend_Gdata_App_util */ -require_once('Zend/Gdata/App/Util.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Spreadsheets documents @@ -224,14 +222,12 @@ class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query if ($this->_visibility != null) { $uri .= '/'.$this->_visibility; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A visibility must be provided for document queries.'); } if ($this->_projection != null) { $uri .= '/'.$this->_projection; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A projection must be provided for document queries.'); } @@ -250,7 +246,6 @@ class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query if ($this->_documentType != null) { $uri .= '/'.$this->_documentType; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A document type must be provided for document queries.'); } @@ -263,7 +258,6 @@ class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query if ($this->_spreadsheetKey != null) { $uri .= '/'.$this->_spreadsheetKey; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A spreadsheet key must be provided for worksheet document queries.'); } $uri .= $this->appendVisibilityProjection(); diff --git a/library/vendor/Zend/Gdata/Spreadsheets/Extension/Cell.php b/library/vendor/Zend/Gdata/Spreadsheets/Extension/Cell.php index dbc910606..8349ae1d7 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/Extension/Cell.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/Extension/Cell.php @@ -23,12 +23,10 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** diff --git a/library/vendor/Zend/Gdata/Spreadsheets/Extension/ColCount.php b/library/vendor/Zend/Gdata/Spreadsheets/Extension/ColCount.php index 731cec823..fa4381ef3 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/Extension/ColCount.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/Extension/ColCount.php @@ -23,12 +23,10 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** diff --git a/library/vendor/Zend/Gdata/Spreadsheets/Extension/Custom.php b/library/vendor/Zend/Gdata/Spreadsheets/Extension/Custom.php index 24d658ddd..6daf49cb4 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/Extension/Custom.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/Extension/Custom.php @@ -23,12 +23,10 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** diff --git a/library/vendor/Zend/Gdata/Spreadsheets/Extension/RowCount.php b/library/vendor/Zend/Gdata/Spreadsheets/Extension/RowCount.php index 8b606fa4d..d66754bfc 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/Extension/RowCount.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/Extension/RowCount.php @@ -23,12 +23,10 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** diff --git a/library/vendor/Zend/Gdata/Spreadsheets/ListEntry.php b/library/vendor/Zend/Gdata/Spreadsheets/ListEntry.php index 9f955f212..e8b1829a9 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/ListEntry.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/ListEntry.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_Custom */ -require_once 'Zend/Gdata/Spreadsheets/Extension/Custom.php'; /** * Concrete class for working with List entries. @@ -175,7 +173,6 @@ class Zend_Gdata_Spreadsheets_ListEntry extends Zend_Gdata_Entry $key = array_search($element, $this->_customByName); unset($this->_customByName[$key]); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Element does not exist.'); } @@ -198,7 +195,6 @@ class Zend_Gdata_Spreadsheets_ListEntry extends Zend_Gdata_Entry $key = array_search($element, $this->_custom); unset($this->_custom[$key]); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Element does not exist.'); } diff --git a/library/vendor/Zend/Gdata/Spreadsheets/ListFeed.php b/library/vendor/Zend/Gdata/Spreadsheets/ListFeed.php index e7145b307..478f1142f 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/ListFeed.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/ListFeed.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * diff --git a/library/vendor/Zend/Gdata/Spreadsheets/ListQuery.php b/library/vendor/Zend/Gdata/Spreadsheets/ListQuery.php index 9fa304243..476bc92f3 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/ListQuery.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/ListQuery.php @@ -24,12 +24,10 @@ /** * Zend_Gdata_App_util */ -require_once('Zend/Gdata/App/Util.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Spreadsheets lists @@ -260,28 +258,24 @@ class Zend_Gdata_Spreadsheets_ListQuery extends Zend_Gdata_Query if ($this->_spreadsheetKey != null) { $uri .= '/'.$this->_spreadsheetKey; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A spreadsheet key must be provided for list queries.'); } if ($this->_worksheetId != null) { $uri .= '/'.$this->_worksheetId; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A worksheet id must be provided for list queries.'); } if ($this->_visibility != null) { $uri .= '/'.$this->_visibility; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A visibility must be provided for list queries.'); } if ($this->_projection != null) { $uri .= '/'.$this->_projection; } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A projection must be provided for list queries.'); } diff --git a/library/vendor/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php b/library/vendor/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php index 1570eaa43..9205e394a 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * Concrete class for working with Atom entries. diff --git a/library/vendor/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php b/library/vendor/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php index 2108f1f81..58c6f40ff 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * diff --git a/library/vendor/Zend/Gdata/Spreadsheets/WorksheetEntry.php b/library/vendor/Zend/Gdata/Spreadsheets/WorksheetEntry.php index 278b4d010..0070871d5 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/WorksheetEntry.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/WorksheetEntry.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_RowCount */ -require_once 'Zend/Gdata/Spreadsheets/Extension/RowCount.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_ColCount */ -require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php'; /** * Concrete class for working with Worksheet entries. diff --git a/library/vendor/Zend/Gdata/Spreadsheets/WorksheetFeed.php b/library/vendor/Zend/Gdata/Spreadsheets/WorksheetFeed.php index a2bebec65..5892f95aa 100644 --- a/library/vendor/Zend/Gdata/Spreadsheets/WorksheetFeed.php +++ b/library/vendor/Zend/Gdata/Spreadsheets/WorksheetFeed.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * diff --git a/library/vendor/Zend/Gdata/YouTube.php b/library/vendor/Zend/Gdata/YouTube.php index 3b9f2a0a2..5b4f12297 100644 --- a/library/vendor/Zend/Gdata/YouTube.php +++ b/library/vendor/Zend/Gdata/YouTube.php @@ -24,55 +24,44 @@ /** * @see Zend_Gdata_Media */ -require_once 'Zend/Gdata/Media.php'; /** * @see Zend_Gdata_YouTube_VideoEntry */ -require_once 'Zend/Gdata/YouTube/VideoEntry.php'; /** * @see Zend_Gdata_YouTube_VideoFeed */ -require_once 'Zend/Gdata/YouTube/VideoFeed.php'; /** * @see Zend_Gdata_YouTube_CommentFeed */ -require_once 'Zend/Gdata/YouTube/CommentFeed.php'; /** * @see Zend_Gdata_YouTube_PlaylistListFeed */ -require_once 'Zend/Gdata/YouTube/PlaylistListFeed.php'; /** * @see Zend_Gdata_YouTube_SubscriptionFeed */ -require_once 'Zend/Gdata/YouTube/SubscriptionFeed.php'; /** * @see Zend_Gdata_YouTube_ContactFeed */ -require_once 'Zend/Gdata/YouTube/ContactFeed.php'; /** * @see Zend_Gdata_YouTube_PlaylistVideoFeed */ -require_once 'Zend/Gdata/YouTube/PlaylistVideoFeed.php'; /** * @see Zend_Gdata_YouTube_ActivityFeed */ -require_once 'Zend/Gdata/YouTube/ActivityFeed.php'; /** * @see Zend_Gdata_YouTube_InboxFeed */ -require_once 'Zend/Gdata/YouTube/InboxFeed.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** * Service class for interacting with the YouTube Data API. @@ -229,7 +218,6 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media $client = new Zend_Http_Client(); } if (!$client instanceof Zend_Http_Client) { - require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException( 'Argument is not an instance of Zend_Http_Client.'); } @@ -658,7 +646,6 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media @ini_restore('track_errors'); if (!$doc) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( "Zend_Gdata_YouTube::parseFormUploadTokenResponse - " . "DOMDocument cannot parse XML: $php_errormsg"); @@ -684,7 +671,6 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media if ($tokenText != null && $urlText != null) { return array('token' => $tokenText, 'url' => $urlText); } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Form upload token not found in response'); } @@ -706,7 +692,6 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media $response = $this->post($videoEntry, $url); return self::parseFormUploadTokenResponse($response->getBody()); } else { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Url must be provided as a string URL'); } @@ -724,7 +709,6 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media public function getActivityForUser($username) { if ($this->getMajorProtocolVersion() == 1) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('User activity feeds ' . 'are not available in API version 1.'); } @@ -735,7 +719,6 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media } else { if (count(explode(',', $username)) > self::ACTIVITY_FEED_MAX_USERS) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Activity feed can only retrieve for activity for up to ' . self::ACTIVITY_FEED_MAX_USERS . ' users per request'); @@ -755,7 +738,6 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media public function getFriendActivityForCurrentUser() { if (!$this->isAuthenticated()) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('You must be authenticated to ' . 'use the getFriendActivityForCurrentUser function in Zend_' . 'Gdata_YouTube.'); @@ -773,7 +755,6 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media public function getInboxFeedForCurrentUser() { if (!$this->isAuthenticated()) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('You must be authenticated to ' . 'use the getInboxFeedForCurrentUser function in Zend_' . 'Gdata_YouTube.'); @@ -803,7 +784,6 @@ class Zend_Gdata_YouTube extends Zend_Gdata_Media $videoId = null, $recipientUserName) { if (!$videoId && !$videoEntry) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Expecting either a valid videoID or a videoEntry object in ' . 'Zend_Gdata_YouTube->sendVideoMessage().'); diff --git a/library/vendor/Zend/Gdata/YouTube/ActivityEntry.php b/library/vendor/Zend/Gdata/YouTube/ActivityEntry.php index 614f01392..099de242c 100644 --- a/library/vendor/Zend/Gdata/YouTube/ActivityEntry.php +++ b/library/vendor/Zend/Gdata/YouTube/ActivityEntry.php @@ -24,22 +24,18 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_YouTube_Extension_VideoId */ -require_once 'Zend/Gdata/YouTube/Extension/VideoId.php'; /** * @see Zend_Gdata_YouTube_Extension_Username */ -require_once 'Zend/Gdata/YouTube/Extension/Username.php'; /** * @see Zend_Gdata_YouTube_Extension_Rating */ -require_once 'Zend/Gdata/Extension/Rating.php'; /** * A concrete class for working with YouTube user activity entries. diff --git a/library/vendor/Zend/Gdata/YouTube/ActivityFeed.php b/library/vendor/Zend/Gdata/YouTube/ActivityFeed.php index 1b4425d9a..474a1081f 100644 --- a/library/vendor/Zend/Gdata/YouTube/ActivityFeed.php +++ b/library/vendor/Zend/Gdata/YouTube/ActivityFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_YouTube_ActivityEntry */ -require_once 'Zend/Gdata/YouTube/ActivityEntry.php'; /** * A feed of user activity entries for YouTube diff --git a/library/vendor/Zend/Gdata/YouTube/CommentEntry.php b/library/vendor/Zend/Gdata/YouTube/CommentEntry.php index 7e73c22d5..491f7e535 100644 --- a/library/vendor/Zend/Gdata/YouTube/CommentEntry.php +++ b/library/vendor/Zend/Gdata/YouTube/CommentEntry.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; /** * The YouTube comments flavor of an Atom Entry diff --git a/library/vendor/Zend/Gdata/YouTube/CommentFeed.php b/library/vendor/Zend/Gdata/YouTube/CommentFeed.php index b2be685ea..81647bdcd 100644 --- a/library/vendor/Zend/Gdata/YouTube/CommentFeed.php +++ b/library/vendor/Zend/Gdata/YouTube/CommentFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_feed */ -require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_YouTube_CommentEntry */ -require_once 'Zend/Gdata/YouTube/CommentEntry.php'; /** * The YouTube comments flavor of an Atom Feed diff --git a/library/vendor/Zend/Gdata/YouTube/ContactEntry.php b/library/vendor/Zend/Gdata/YouTube/ContactEntry.php index f8a15325d..039bca63e 100644 --- a/library/vendor/Zend/Gdata/YouTube/ContactEntry.php +++ b/library/vendor/Zend/Gdata/YouTube/ContactEntry.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_YouTube_UserProfileEntry */ -require_once 'Zend/Gdata/YouTube/UserProfileEntry.php'; /** * @see Zend_Gdata_YouTube_Extension_Status */ -require_once 'Zend/Gdata/YouTube/Extension/Status.php'; /** * The YouTube contacts flavor of an Atom Entry with media support diff --git a/library/vendor/Zend/Gdata/YouTube/ContactFeed.php b/library/vendor/Zend/Gdata/YouTube/ContactFeed.php index ccdb891b8..3d93d941a 100644 --- a/library/vendor/Zend/Gdata/YouTube/ContactFeed.php +++ b/library/vendor/Zend/Gdata/YouTube/ContactFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_ContactEntry */ -require_once 'Zend/Gdata/YouTube/ContactEntry.php'; /** * The YouTube contacts flavor of an Atom Feed with media support diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/AboutMe.php b/library/vendor/Zend/Gdata/YouTube/Extension/AboutMe.php index abcb1d7e6..ee8a7a668 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/AboutMe.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/AboutMe.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:aboutMe element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Age.php b/library/vendor/Zend/Gdata/YouTube/Extension/Age.php index a716ebd63..272042f95 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Age.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Age.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:age element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Books.php b/library/vendor/Zend/Gdata/YouTube/Extension/Books.php index eeceac093..2a75c1806 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Books.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Books.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:books element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Company.php b/library/vendor/Zend/Gdata/YouTube/Extension/Company.php index ab4d4be5f..06b07d6a0 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Company.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Company.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:company element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Control.php b/library/vendor/Zend/Gdata/YouTube/Extension/Control.php index 74ac17b86..ce3dc0c78 100755 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Control.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Control.php @@ -23,12 +23,10 @@ /** * @see Zend_Gdata_App_Extension_Control */ -require_once 'Zend/Gdata/App/Extension/Control.php'; /** * @see Zend_Gdata_YouTube_Extension_State */ -require_once 'Zend/Gdata/YouTube/Extension/State.php'; /** diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/CountHint.php b/library/vendor/Zend/Gdata/YouTube/Extension/CountHint.php index 330c8088a..6b4764556 100755 --- a/library/vendor/Zend/Gdata/YouTube/Extension/CountHint.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/CountHint.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:countHint element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Description.php b/library/vendor/Zend/Gdata/YouTube/Extension/Description.php index cd45cf3e5..9508332e2 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Description.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Description.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:description element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Duration.php b/library/vendor/Zend/Gdata/YouTube/Extension/Duration.php index 35072f7fc..117fc082c 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Duration.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Duration.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:duration element used by the YouTube data API diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/FirstName.php b/library/vendor/Zend/Gdata/YouTube/Extension/FirstName.php index 9518cd3df..258079a62 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/FirstName.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/FirstName.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:firstName element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Gender.php b/library/vendor/Zend/Gdata/YouTube/Extension/Gender.php index 3cfa4c165..ebfa2df52 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Gender.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Gender.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:gender element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Hobbies.php b/library/vendor/Zend/Gdata/YouTube/Extension/Hobbies.php index 4a2bc5f8a..027a452f4 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Hobbies.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Hobbies.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:hobbies element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Hometown.php b/library/vendor/Zend/Gdata/YouTube/Extension/Hometown.php index 8a889bd96..05a9d8a6e 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Hometown.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Hometown.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:hometown element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/LastName.php b/library/vendor/Zend/Gdata/YouTube/Extension/LastName.php index fbbced1a8..b79390b25 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/LastName.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/LastName.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:lastName element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Link.php b/library/vendor/Zend/Gdata/YouTube/Extension/Link.php index 01cec7d48..fa5973f03 100755 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Link.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Link.php @@ -23,12 +23,10 @@ /** * @see Zend_Gdata_App_Extension_Link */ -require_once 'Zend/Gdata/App/Extension/Link.php'; /** * @see Zend_Gdata_YouTube_Extension_Token */ -require_once 'Zend/Gdata/YouTube/Extension/Token.php'; /** diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Location.php b/library/vendor/Zend/Gdata/YouTube/Extension/Location.php index 54cbdd15a..ef3af9ce4 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Location.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Location.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:location element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/MediaContent.php b/library/vendor/Zend/Gdata/YouTube/Extension/MediaContent.php index 612456ca1..f4addc4c0 100755 --- a/library/vendor/Zend/Gdata/YouTube/Extension/MediaContent.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/MediaContent.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Media_Extension_MediaContent */ -require_once 'Zend/Gdata/Media/Extension/MediaContent.php'; /** * Represents the media:content element of Media RSS. diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/MediaCredit.php b/library/vendor/Zend/Gdata/YouTube/Extension/MediaCredit.php index 0a22aff5a..20ad595ec 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/MediaCredit.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/MediaCredit.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the YouTube specific media:credit element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/MediaGroup.php b/library/vendor/Zend/Gdata/YouTube/Extension/MediaGroup.php index ec22c13c1..bdbf2c40b 100755 --- a/library/vendor/Zend/Gdata/YouTube/Extension/MediaGroup.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/MediaGroup.php @@ -24,42 +24,34 @@ /** * @see Zend_Gdata_Media_Extension_MediaGroup */ -require_once 'Zend/Gdata/Media/Extension/MediaGroup.php'; /** * @see Zend_Gdata_YouTube_Extension_MediaContent */ -require_once 'Zend/Gdata/YouTube/Extension/MediaContent.php'; /** * @see Zend_Gdata_YouTube_Extension_Duration */ -require_once 'Zend/Gdata/YouTube/Extension/Duration.php'; /** * @see Zend_Gdata_YouTube_Extension_MediaRating */ -require_once 'Zend/Gdata/YouTube/Extension/MediaRating.php'; /** * @see Zend_Gdata_YouTube_Extension_MediaCredit */ -require_once 'Zend/Gdata/YouTube/Extension/MediaCredit.php'; /** * @see Zend_Gdata_YouTube_Extension_Private */ -require_once 'Zend/Gdata/YouTube/Extension/Private.php'; /** * @see Zend_Gdata_YouTube_Extension_VideoId */ -require_once 'Zend/Gdata/YouTube/Extension/VideoId.php'; /** * @see Zend_Gdata_YouTube_Extension_Uploaded */ -require_once 'Zend/Gdata/YouTube/Extension/Uploaded.php'; /** * This class represents the media:group element of Media RSS. diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/MediaRating.php b/library/vendor/Zend/Gdata/YouTube/Extension/MediaRating.php index 8a7368be1..c31491485 100755 --- a/library/vendor/Zend/Gdata/YouTube/Extension/MediaRating.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/MediaRating.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the media:rating element specific to YouTube. diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Movies.php b/library/vendor/Zend/Gdata/YouTube/Extension/Movies.php index bdb80abb5..9e052bd12 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Movies.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Movies.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:movies element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Music.php b/library/vendor/Zend/Gdata/YouTube/Extension/Music.php index ea95773c6..56c5f0d51 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Music.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Music.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:music element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/NoEmbed.php b/library/vendor/Zend/Gdata/YouTube/Extension/NoEmbed.php index aaa700eb6..7c0f5bf22 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/NoEmbed.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/NoEmbed.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:noembed element used by the YouTube data API diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Occupation.php b/library/vendor/Zend/Gdata/YouTube/Extension/Occupation.php index ab04394c4..78b20595d 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Occupation.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Occupation.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:occupation element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/PlaylistId.php b/library/vendor/Zend/Gdata/YouTube/Extension/PlaylistId.php index 69264ae28..8a46138d0 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/PlaylistId.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/PlaylistId.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:playlistId element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/PlaylistTitle.php b/library/vendor/Zend/Gdata/YouTube/Extension/PlaylistTitle.php index 150075386..3c8244432 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/PlaylistTitle.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/PlaylistTitle.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:playlistTitle element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Position.php b/library/vendor/Zend/Gdata/YouTube/Extension/Position.php index ffd56cd5f..bbf283ba7 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Position.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Position.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent a playlist item's position in the list (yt:position) diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Private.php b/library/vendor/Zend/Gdata/YouTube/Extension/Private.php index f8a6599d2..a10ca53ee 100755 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Private.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Private.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:private element used by the YouTube data API diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/QueryString.php b/library/vendor/Zend/Gdata/YouTube/Extension/QueryString.php index 952d18807..c0a746da5 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/QueryString.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/QueryString.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:queryString element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Racy.php b/library/vendor/Zend/Gdata/YouTube/Extension/Racy.php index 1dda7cd74..f0040b083 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Racy.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Racy.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:racy element used by the YouTube data API diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Recorded.php b/library/vendor/Zend/Gdata/YouTube/Extension/Recorded.php index 4d2ac35cf..7f05f9ac7 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Recorded.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Recorded.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:recorded element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Relationship.php b/library/vendor/Zend/Gdata/YouTube/Extension/Relationship.php index 3e82ca694..e2ac64b63 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Relationship.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Relationship.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:relationship element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/ReleaseDate.php b/library/vendor/Zend/Gdata/YouTube/Extension/ReleaseDate.php index bf7bb61a4..6351fda36 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/ReleaseDate.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/ReleaseDate.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:releaseDate element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/School.php b/library/vendor/Zend/Gdata/YouTube/Extension/School.php index 753521661..e9598e6f9 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/School.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/School.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:school element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/State.php b/library/vendor/Zend/Gdata/YouTube/Extension/State.php index 6d24db519..a2acbddae 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/State.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/State.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:state element used by the YouTube data API diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Statistics.php b/library/vendor/Zend/Gdata/YouTube/Extension/Statistics.php index 4cd901f0f..4db16ca30 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Statistics.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Statistics.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:statistics element used by the YouTube data API diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Status.php b/library/vendor/Zend/Gdata/YouTube/Extension/Status.php index e3d0f43fe..16fd9e8bc 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Status.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Status.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:status element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Token.php b/library/vendor/Zend/Gdata/YouTube/Extension/Token.php index d8e2505a1..fc217bf7b 100755 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Token.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Token.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:token element used by the YouTube data API diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Uploaded.php b/library/vendor/Zend/Gdata/YouTube/Extension/Uploaded.php index 51e5177c4..4a7f1cce0 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Uploaded.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Uploaded.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:uploaded element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/Username.php b/library/vendor/Zend/Gdata/YouTube/Extension/Username.php index 24a98e471..7ab5d0c77 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/Username.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/Username.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:username element diff --git a/library/vendor/Zend/Gdata/YouTube/Extension/VideoId.php b/library/vendor/Zend/Gdata/YouTube/Extension/VideoId.php index 5e687d30b..376f0e3b3 100644 --- a/library/vendor/Zend/Gdata/YouTube/Extension/VideoId.php +++ b/library/vendor/Zend/Gdata/YouTube/Extension/VideoId.php @@ -24,7 +24,6 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:videoid element diff --git a/library/vendor/Zend/Gdata/YouTube/InboxEntry.php b/library/vendor/Zend/Gdata/YouTube/InboxEntry.php index 4446e7a27..926dffbd7 100644 --- a/library/vendor/Zend/Gdata/YouTube/InboxEntry.php +++ b/library/vendor/Zend/Gdata/YouTube/InboxEntry.php @@ -24,27 +24,22 @@ /** * @see Zend_Gdata_Media_Entry */ -require_once 'Zend/Gdata/Media/Entry.php'; /** * @see Zend_Gdata_Extension_Rating */ -require_once 'Zend/Gdata/Extension/Rating.php'; /** * @see Zend_Gdata_Extension_Comments */ -require_once 'Zend/Gdata/Extension/Comments.php'; /** * @see Zend_Gdata_YouTube_Extension_Statistics */ -require_once 'Zend/Gdata/YouTube/Extension/Statistics.php'; /** * @see Zend_Gdata_YouTube_Extension_Description */ -require_once 'Zend/Gdata/YouTube/Extension/Description.php'; /** @@ -179,7 +174,6 @@ class Zend_Gdata_YouTube_InboxEntry extends Zend_Gdata_Media_Entry public function getDescription() { if ($this->getMajorProtocolVersion() == 2) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getDescription ' . ' method is only supported in version 1 of the YouTube ' . 'API.'); @@ -199,7 +193,6 @@ class Zend_Gdata_YouTube_InboxEntry extends Zend_Gdata_Media_Entry public function setDescription($description = null) { if ($this->getMajorProtocolVersion() == 2) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setDescription ' . ' method is only supported in version 1 of the YouTube ' . 'API.'); diff --git a/library/vendor/Zend/Gdata/YouTube/InboxFeed.php b/library/vendor/Zend/Gdata/YouTube/InboxFeed.php index 1d32fd6a2..1f2b7d39b 100644 --- a/library/vendor/Zend/Gdata/YouTube/InboxFeed.php +++ b/library/vendor/Zend/Gdata/YouTube/InboxFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_InboxEntry */ -require_once 'Zend/Gdata/YouTube/InboxEntry.php'; /** * The YouTube inbox feed list flavor of an Atom Feed with media support diff --git a/library/vendor/Zend/Gdata/YouTube/MediaEntry.php b/library/vendor/Zend/Gdata/YouTube/MediaEntry.php index 287cf581c..59c8ed18e 100755 --- a/library/vendor/Zend/Gdata/YouTube/MediaEntry.php +++ b/library/vendor/Zend/Gdata/YouTube/MediaEntry.php @@ -24,17 +24,14 @@ /** * @see Zend_Gdata_Media */ -require_once 'Zend/Gdata/Media.php'; /** * @see Zend_Gdata_Media_Entry */ -require_once 'Zend/Gdata/Media/Entry.php'; /** * @see Zend_Gdata_YouTube_Extension_MediaGroup */ -require_once 'Zend/Gdata/YouTube/Extension/MediaGroup.php'; /** * Represents the YouTube flavor of a Gdata Media Entry diff --git a/library/vendor/Zend/Gdata/YouTube/PlaylistListEntry.php b/library/vendor/Zend/Gdata/YouTube/PlaylistListEntry.php index 278aaed5d..a3873cf5b 100644 --- a/library/vendor/Zend/Gdata/YouTube/PlaylistListEntry.php +++ b/library/vendor/Zend/Gdata/YouTube/PlaylistListEntry.php @@ -24,32 +24,26 @@ /** * @see Zend_Gdata_YouTube */ -require_once 'Zend/Gdata/YouTube.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_YouTube_Extension_Description */ -require_once 'Zend/Gdata/YouTube/Extension/Description.php'; /** * @see Zend_Gdata_YouTube_Extension_PlaylistId */ -require_once 'Zend/Gdata/YouTube/Extension/PlaylistId.php'; /** * @see Zend_Gdata_YouTube_Extension_CountHint */ -require_once 'Zend/Gdata/YouTube/Extension/CountHint.php'; /** * Represents the YouTube video playlist flavor of an Atom entry @@ -218,7 +212,6 @@ class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The yt:countHint ' . 'element is not supported in versions earlier than 2.'); } else { @@ -236,7 +229,6 @@ class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The yt:playlistId ' . 'element is not supported in versions earlier than 2.'); } else { diff --git a/library/vendor/Zend/Gdata/YouTube/PlaylistListFeed.php b/library/vendor/Zend/Gdata/YouTube/PlaylistListFeed.php index a9bed902f..18e024edd 100644 --- a/library/vendor/Zend/Gdata/YouTube/PlaylistListFeed.php +++ b/library/vendor/Zend/Gdata/YouTube/PlaylistListFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_PlaylistListEntry */ -require_once 'Zend/Gdata/YouTube/PlaylistListEntry.php'; /** * The YouTube video playlist flavor of an Atom Feed with media support diff --git a/library/vendor/Zend/Gdata/YouTube/PlaylistVideoEntry.php b/library/vendor/Zend/Gdata/YouTube/PlaylistVideoEntry.php index 05e323c65..a2914bebf 100644 --- a/library/vendor/Zend/Gdata/YouTube/PlaylistVideoEntry.php +++ b/library/vendor/Zend/Gdata/YouTube/PlaylistVideoEntry.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_YouTube_VideoEntry */ -require_once 'Zend/Gdata/YouTube/VideoEntry.php'; /** * @see Zend_Gdata_YouTube_Extension_Position */ -require_once 'Zend/Gdata/YouTube/Extension/Position.php'; /** * Represents the YouTube video playlist flavor of an Atom entry diff --git a/library/vendor/Zend/Gdata/YouTube/PlaylistVideoFeed.php b/library/vendor/Zend/Gdata/YouTube/PlaylistVideoFeed.php index 36e62dcfe..2b3ec0de3 100644 --- a/library/vendor/Zend/Gdata/YouTube/PlaylistVideoFeed.php +++ b/library/vendor/Zend/Gdata/YouTube/PlaylistVideoFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_PlaylistVideoEntry */ -require_once 'Zend/Gdata/YouTube/PlaylistVideoEntry.php'; /** * The YouTube video playlist flavor of an Atom Feed with media support diff --git a/library/vendor/Zend/Gdata/YouTube/SubscriptionEntry.php b/library/vendor/Zend/Gdata/YouTube/SubscriptionEntry.php index 9a23d5a93..ffe3c06e4 100644 --- a/library/vendor/Zend/Gdata/YouTube/SubscriptionEntry.php +++ b/library/vendor/Zend/Gdata/YouTube/SubscriptionEntry.php @@ -24,47 +24,38 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_YouTube_Extension_Description */ -require_once 'Zend/Gdata/YouTube/Extension/Description.php'; /** * @see Zend_Gdata_YouTube_Extension_PlaylistTitle */ -require_once 'Zend/Gdata/YouTube/Extension/PlaylistTitle.php'; /** * @see Zend_Gdata_YouTube_Extension_PlaylistId */ -require_once 'Zend/Gdata/YouTube/Extension/PlaylistId.php'; /** * @see Zend_Gdata_Media_Extension_MediaThumbnail */ -require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php'; /** * @see Zend_Gdata_YouTube_Extension_Username */ -require_once 'Zend/Gdata/YouTube/Extension/Username.php'; /** * @see Zend_Gdata_YouTube_Extension_CountHint */ -require_once 'Zend/Gdata/YouTube/Extension/CountHint.php'; /** * @see Zend_Gdata_YouTube_Extension_QueryString */ -require_once 'Zend/Gdata/YouTube/Extension/QueryString.php'; /** * Represents the YouTube video subscription flavor of an Atom entry @@ -287,7 +278,6 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getPlaylistId ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -308,7 +298,6 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setPlaylistTitle ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -351,7 +340,6 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getPlaylistTitle ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -372,7 +360,6 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setPlaylistTitle ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -392,7 +379,6 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getCountHint ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -411,7 +397,6 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getMediaThumbnail ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); diff --git a/library/vendor/Zend/Gdata/YouTube/SubscriptionFeed.php b/library/vendor/Zend/Gdata/YouTube/SubscriptionFeed.php index 4be017484..238c3ba2c 100644 --- a/library/vendor/Zend/Gdata/YouTube/SubscriptionFeed.php +++ b/library/vendor/Zend/Gdata/YouTube/SubscriptionFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_SubscriptionEntry */ -require_once 'Zend/Gdata/YouTube/SubscriptionEntry.php'; /** * The YouTube video subscription list flavor of an Atom Feed with media support diff --git a/library/vendor/Zend/Gdata/YouTube/UserProfileEntry.php b/library/vendor/Zend/Gdata/YouTube/UserProfileEntry.php index fc5f2cd84..bdf5216e5 100644 --- a/library/vendor/Zend/Gdata/YouTube/UserProfileEntry.php +++ b/library/vendor/Zend/Gdata/YouTube/UserProfileEntry.php @@ -24,107 +24,86 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_YouTube_Extension_Description */ -require_once 'Zend/Gdata/YouTube/Extension/Description.php'; /** * @see Zend_Gdata_YouTube_Extension_AboutMe */ -require_once 'Zend/Gdata/YouTube/Extension/AboutMe.php'; /** * @see Zend_Gdata_YouTube_Extension_Age */ -require_once 'Zend/Gdata/YouTube/Extension/Age.php'; /** * @see Zend_Gdata_YouTube_Extension_Username */ -require_once 'Zend/Gdata/YouTube/Extension/Username.php'; /** * @see Zend_Gdata_YouTube_Extension_Books */ -require_once 'Zend/Gdata/YouTube/Extension/Books.php'; /** * @see Zend_Gdata_YouTube_Extension_Company */ -require_once 'Zend/Gdata/YouTube/Extension/Company.php'; /** * @see Zend_Gdata_YouTube_Extension_Hobbies */ -require_once 'Zend/Gdata/YouTube/Extension/Hobbies.php'; /** * @see Zend_Gdata_YouTube_Extension_Hometown */ -require_once 'Zend/Gdata/YouTube/Extension/Hometown.php'; /** * @see Zend_Gdata_YouTube_Extension_Location */ -require_once 'Zend/Gdata/YouTube/Extension/Location.php'; /** * @see Zend_Gdata_YouTube_Extension_Movies */ -require_once 'Zend/Gdata/YouTube/Extension/Movies.php'; /** * @see Zend_Gdata_YouTube_Extension_Music */ -require_once 'Zend/Gdata/YouTube/Extension/Music.php'; /** * @see Zend_Gdata_YouTube_Extension_Occupation */ -require_once 'Zend/Gdata/YouTube/Extension/Occupation.php'; /** * @see Zend_Gdata_YouTube_Extension_School */ -require_once 'Zend/Gdata/YouTube/Extension/School.php'; /** * @see Zend_Gdata_YouTube_Extension_Gender */ -require_once 'Zend/Gdata/YouTube/Extension/Gender.php'; /** * @see Zend_Gdata_YouTube_Extension_Relationship */ -require_once 'Zend/Gdata/YouTube/Extension/Relationship.php'; /** * @see Zend_Gdata_YouTube_Extension_FirstName */ -require_once 'Zend/Gdata/YouTube/Extension/FirstName.php'; /** * @see Zend_Gdata_YouTube_Extension_LastName */ -require_once 'Zend/Gdata/YouTube/Extension/LastName.php'; /** * @see Zend_Gdata_YouTube_Extension_Statistics */ -require_once 'Zend/Gdata/YouTube/Extension/Statistics.php'; /** * @see Zend_Gdata_Media_Extension_MediaThumbnail */ -require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php'; /** * Represents the YouTube video playlist flavor of an Atom entry @@ -499,7 +478,6 @@ class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setAboutMe ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -519,7 +497,6 @@ class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getAboutMe ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -539,7 +516,6 @@ class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setFirstName ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -559,7 +535,6 @@ class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getFirstName ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -579,7 +554,6 @@ class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setLastName ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -599,7 +573,6 @@ class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getLastName ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -618,7 +591,6 @@ class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getStatistics ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -637,7 +609,6 @@ class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getThumbnail ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); diff --git a/library/vendor/Zend/Gdata/YouTube/VideoEntry.php b/library/vendor/Zend/Gdata/YouTube/VideoEntry.php index 7b6be2976..33560a112 100644 --- a/library/vendor/Zend/Gdata/YouTube/VideoEntry.php +++ b/library/vendor/Zend/Gdata/YouTube/VideoEntry.php @@ -24,67 +24,54 @@ /** * @see Zend_Gdata_Extension_Comments */ -require_once 'Zend/Gdata/Extension/Comments.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_YouTube_MediaEntry */ -require_once 'Zend/Gdata/YouTube/MediaEntry.php'; /** * @see Zend_Gdata_YouTube_Extension_MediaGroup */ -require_once 'Zend/Gdata/YouTube/Extension/MediaGroup.php'; /** * @see Zend_Gdata_YouTube_Extension_NoEmbed */ -require_once 'Zend/Gdata/YouTube/Extension/NoEmbed.php'; /** * @see Zend_Gdata_YouTube_Extension_Statistics */ -require_once 'Zend/Gdata/YouTube/Extension/Statistics.php'; /** * @see Zend_Gdata_YouTube_Extension_Link */ -require_once 'Zend/Gdata/YouTube/Extension/Link.php'; /** * @see Zend_Gdata_YouTube_Extension_Racy */ -require_once 'Zend/Gdata/YouTube/Extension/Racy.php'; /** * @see Zend_Gdata_Extension_Rating */ -require_once 'Zend/Gdata/Extension/Rating.php'; /** * @see Zend_Gdata_Geo_Extension_GeoRssWhere */ -require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; /** * @see Zend_Gdata_YouTube_Extension_Control */ -require_once 'Zend/Gdata/YouTube/Extension/Control.php'; /** * @see Zend_Gdata_YouTube_Extension_Recorded */ -require_once 'Zend/Gdata/YouTube/Extension/Recorded.php'; /** * @see Zend_Gdata_YouTube_Extension_Location */ -require_once 'Zend/Gdata/YouTube/Extension/Location.php'; /** * Represents the YouTube video flavor of an Atom entry @@ -427,7 +414,6 @@ class Zend_Gdata_YouTube_VideoEntry extends Zend_Gdata_YouTube_MediaEntry public function setRacy($racy = null) { if ($this->getMajorProtocolVersion() == 2) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException( 'Calling getRacy() on a YouTube VideoEntry is deprecated ' . 'as of version 2 of the API.'); @@ -446,7 +432,6 @@ class Zend_Gdata_YouTube_VideoEntry extends Zend_Gdata_YouTube_MediaEntry public function getRacy() { if ($this->getMajorProtocolVersion() == 2) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException( 'Calling getRacy() on a YouTube VideoEntry is deprecated ' . 'as of version 2 of the API.'); @@ -580,7 +565,6 @@ class Zend_Gdata_YouTube_VideoEntry extends Zend_Gdata_YouTube_MediaEntry $fullId = $this->getId()->getText(); $position = strrpos($fullId, '/'); if ($position === false) { - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Slash not found in atom:id of ' . $fullId); } else { @@ -1062,12 +1046,10 @@ class Zend_Gdata_YouTube_VideoEntry extends Zend_Gdata_YouTube_MediaEntry public function setVideoRating($ratingValue) { if ($ratingValue < 1 || $ratingValue > 5) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Rating for video entry must be between 1 and 5 inclusive.'); } - require_once 'Zend/Gdata/Extension/Rating.php'; $rating = new Zend_Gdata_Extension_Rating(null, 1, 5, null, $ratingValue); $this->setRating($rating); diff --git a/library/vendor/Zend/Gdata/YouTube/VideoFeed.php b/library/vendor/Zend/Gdata/YouTube/VideoFeed.php index 39658a0a3..e8a572c4c 100644 --- a/library/vendor/Zend/Gdata/YouTube/VideoFeed.php +++ b/library/vendor/Zend/Gdata/YouTube/VideoFeed.php @@ -24,12 +24,10 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_VideoEntry */ -require_once 'Zend/Gdata/YouTube/VideoEntry.php'; /** * The YouTube video flavor of an Atom Feed with media support diff --git a/library/vendor/Zend/Gdata/YouTube/VideoQuery.php b/library/vendor/Zend/Gdata/YouTube/VideoQuery.php index f51fd552d..3b8f4b8c1 100644 --- a/library/vendor/Zend/Gdata/YouTube/VideoQuery.php +++ b/library/vendor/Zend/Gdata/YouTube/VideoQuery.php @@ -24,12 +24,10 @@ /** * Zend_Gdata_YouTube */ -require_once('Zend/Gdata/YouTube.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for YouTube videos @@ -77,7 +75,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query break; case 'related': if ($videoId === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Video ID must be set for feed of type: ' . $feedType); } else { @@ -87,7 +84,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query break; case 'responses': if ($videoId === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_Exception( 'Video ID must be set for feed of type: ' . $feedType); } else { @@ -97,7 +93,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query break; case 'comments': if ($videoId === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_Exception( 'Video ID must be set for feed of type: ' . $feedType); } else { @@ -109,7 +104,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query } break; default: - require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Unknown feed type'); break; } @@ -130,7 +124,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query default: $parameters = explode(',', $value); if (count($parameters) != 2) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must provide 2 coordinates to the location ' . 'URL parameter'); @@ -143,7 +136,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query $temp = substr($temp, 0, -1); } if (!is_numeric($temp)) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Value provided to location parameter must' . ' be in the form of two coordinates'); @@ -224,7 +216,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query case null: unset($this->_params['time']); default: - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Unknown time value'); break; @@ -250,7 +241,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query unset($this->_params['uploader']); break; default: - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Unknown value for uploader'); } @@ -348,7 +338,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query case null: unset($this->_params['safeSearch']); default: - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'The safeSearch parameter only supports the values '. '\'none\', \'moderate\' or \'strict\'.'); @@ -464,7 +453,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query switch($name) { case 'location-radius': if ($majorProtocolVersion == 1) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException("The $name " . "parameter is only supported in version 2."); } @@ -472,7 +460,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query case 'racy': if ($majorProtocolVersion == 2) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException("The $name " . "parameter is not supported in version 2. " . "Please use 'safeSearch'."); @@ -481,7 +468,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query case 'safeSearch': if ($majorProtocolVersion == 1) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException("The $name " . "parameter is only supported in version 2. " . "Please use 'racy'."); @@ -490,7 +476,6 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query case 'uploader': if ($majorProtocolVersion == 1) { - require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException("The $name " . "parameter is only supported in version 2."); } diff --git a/library/vendor/Zend/Http/Client.php b/library/vendor/Zend/Http/Client.php index eb994b3e3..0a3d1bb5b 100644 --- a/library/vendor/Zend/Http/Client.php +++ b/library/vendor/Zend/Http/Client.php @@ -24,30 +24,25 @@ /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; /** * @see Zend_Http_Client_Adapter_Interface */ -require_once 'Zend/Http/Client/Adapter/Interface.php'; /** * @see Zend_Http_Response */ -require_once 'Zend/Http/Response.php'; /** * @see Zend_Http_Response_Stream */ -require_once 'Zend/Http/Response/Stream.php'; /** * Zend_Http_Client is an implementation of an HTTP client in PHP. The client @@ -308,7 +303,6 @@ class Zend_Http_Client if (!$uri instanceof Zend_Uri_Http) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Passed parameter is not a valid HTTP URI.'); } @@ -356,7 +350,6 @@ class Zend_Http_Client } elseif (! is_array($config)) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Array or Zend_Config object expected, got ' . gettype($config)); } @@ -386,7 +379,6 @@ class Zend_Http_Client public function setMethod($method = self::GET) { if (! preg_match('/^[^\x00-\x1f\x7f-\xff\(\)<>@,;:\\\\"\/\[\]\?={}\s]+$/', $method)) { - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("'{$method}' is not a valid HTTP request method."); } @@ -444,7 +436,6 @@ class Zend_Http_Client // Make sure the name is valid if we are in strict mode if ($this->config['strict'] && (! preg_match('/^[a-zA-Z0-9-]+$/', $name))) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("{$name} is not a valid HTTP header name"); } @@ -607,7 +598,6 @@ class Zend_Http_Client // Check we got a proper authentication type if (! defined('self::AUTH_' . strtoupper($type))) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Invalid or not supported authentication type: '$type'"); } @@ -643,7 +633,6 @@ class Zend_Http_Client $this->cookiejar = null; } else { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Invalid parameter type passed as CookieJar'); } @@ -707,7 +696,6 @@ class Zend_Http_Client if (preg_match("/[=,; \t\r\n\013\014]/", $cookie)) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Cookie name cannot contain these characters: =,; \t\r\n\013\014 ({$cookie})"); } @@ -747,7 +735,6 @@ class Zend_Http_Client if ($data === null) { if (($data = @file_get_contents($filename)) === false) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Unable to read file '{$filename}' for upload"); } @@ -919,7 +906,6 @@ class Zend_Http_Client Zend_Loader::loadClass($adapter); } catch (Zend_Exception $e) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}", 0, $e); } @@ -928,7 +914,6 @@ class Zend_Http_Client if (! $adapter instanceof Zend_Http_Client_Adapter_Interface) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Passed adapter is not a HTTP connection adapter'); } @@ -991,7 +976,6 @@ class Zend_Http_Client if ($this->adapter instanceof Zend_Http_Client_Adapter_Interface) { $this->adapter->close(); } - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Could not open temp file {$this->_stream_name}"); } @@ -1009,7 +993,6 @@ class Zend_Http_Client { if (! $this->uri instanceof Zend_Uri_Http) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('No valid URI has been passed to the client'); } @@ -1056,7 +1039,6 @@ class Zend_Http_Client // check that adapter supports streaming before using it if(is_resource($body) && !($this->adapter instanceof Zend_Http_Client_Adapter_Stream)) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Adapter does not support streaming'); } @@ -1070,7 +1052,6 @@ class Zend_Http_Client $this->adapter->setOutputStream($stream); } else { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Adapter does not support streaming'); } } @@ -1081,7 +1062,6 @@ class Zend_Http_Client $response = $this->adapter->read(); if (! $response) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Unable to read response, or response is empty'); } @@ -1338,7 +1318,6 @@ class Zend_Http_Client } /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Cannot handle content type '{$this->enctype}' automatically." . " Please use Zend_Http_Client::setRawData to send this kind of content."); break; @@ -1500,7 +1479,6 @@ class Zend_Http_Client // In basic authentication, the user name cannot contain ":" if (strpos($user, ':') !== false) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("The user name cannot contain ':' in 'Basic' HTTP authentication"); } @@ -1515,7 +1493,6 @@ class Zend_Http_Client default: /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Not a supported HTTP authentication type: '$type'"); } diff --git a/library/vendor/Zend/Http/Client/Adapter/Curl.php b/library/vendor/Zend/Http/Client/Adapter/Curl.php index fd595104c..f870942be 100644 --- a/library/vendor/Zend/Http/Client/Adapter/Curl.php +++ b/library/vendor/Zend/Http/Client/Adapter/Curl.php @@ -24,16 +24,13 @@ /** * @see Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; /** * @see Zend_Http_Client_Adapter_Interface */ -require_once 'Zend/Http/Client/Adapter/Interface.php'; /** * @see Zend_Http_Client_Adapter_Stream */ -require_once 'Zend/Http/Client/Adapter/Stream.php'; /** * An adapter class for Zend_Http_Client based on the curl extension. @@ -100,7 +97,6 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac public function __construct() { if (!extension_loaded('curl')) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('cURL extension has to be loaded to use this Zend_Http_Client adapter.'); } $this->_invalidOverwritableCurlOptions = array( @@ -135,7 +131,6 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac $config = $config->toArray(); } elseif (! is_array($config)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Array or Zend_Config object expected, got ' . gettype($config) ); @@ -240,7 +235,6 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac if (!$this->_curl) { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Unable to Connect to ' . $host . ':' . $port); } @@ -273,12 +267,10 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac { // Make sure we're properly connected if (!$this->_curl) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are not connected"); } if ($this->_connected_to[0] != $uri->getHost() || $this->_connected_to[1] != $uri->getPort()) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are connected to the wrong host"); } @@ -315,7 +307,6 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac } if (!isset($this->_config['curloptions'][CURLOPT_INFILESIZE])) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Cannot set a file-handle for cURL option CURLOPT_INFILE without also setting its size in CURLOPT_INFILESIZE."); } @@ -357,12 +348,10 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac default: // For now, through an exception for unsupported request methods - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Method currently not supported"); } if(is_resource($body) && $curlMethod != CURLOPT_PUT) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Streaming requests are allowed only with PUT"); } @@ -425,7 +414,6 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac foreach ((array)$this->_config['curloptions'] as $k => $v) { if (!in_array($k, $this->_invalidOverwritableCurlOptions)) { if (curl_setopt($this->_curl, $k, $v) == false) { - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception(sprintf("Unknown or erroreous cURL option '%s' set", $k)); } } @@ -444,7 +432,6 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac $request .= $body; if (empty($this->_response)) { - require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Error in cURL request: " . curl_error($this->_curl)); } diff --git a/library/vendor/Zend/Http/Client/Adapter/Exception.php b/library/vendor/Zend/Http/Client/Adapter/Exception.php index 42975a638..6f8f9a3cd 100644 --- a/library/vendor/Zend/Http/Client/Adapter/Exception.php +++ b/library/vendor/Zend/Http/Client/Adapter/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Http_Client_Exception */ -require_once 'Zend/Http/Client/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Http/Client/Adapter/Proxy.php b/library/vendor/Zend/Http/Client/Adapter/Proxy.php index b7c1a8bc0..3225c9b74 100644 --- a/library/vendor/Zend/Http/Client/Adapter/Proxy.php +++ b/library/vendor/Zend/Http/Client/Adapter/Proxy.php @@ -24,15 +24,12 @@ /** * @see Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; /** * @see Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; /** * @see Zend_Http_Client_Adapter_Socket */ -require_once 'Zend/Http/Client/Adapter/Socket.php'; /** * HTTP Proxy-supporting Zend_Http_Client adapter class, based on the default @@ -135,7 +132,6 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket // Make sure we're properly connected if (!$this->socket) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are not connected' ); @@ -147,7 +143,6 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket if ($this->connected_to[0] != "tcp://$host" || $this->connected_to[1] != $port ) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are connected to the wrong proxy server' ); @@ -211,7 +206,6 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket // Send the request if (!@fwrite($this->socket, $request)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to proxy server' ); @@ -219,7 +213,6 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket if(is_resource($body)) { if(stream_copy_to_stream($body, $this->socket) == 0) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to server' ); @@ -267,7 +260,6 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket // Send the request if (!@fwrite($this->socket, $request)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to proxy server' ); @@ -288,7 +280,6 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket // Check that the response from the proxy is 200 if (Zend_Http_Response::extractCode($response) != 200) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Unable to connect to HTTPS proxy. Server response: ' . $response ); @@ -312,7 +303,6 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket } if (!$success) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Unable to connect to HTTPS server through proxy: could not ' . 'negotiate secure connection.' diff --git a/library/vendor/Zend/Http/Client/Adapter/Socket.php b/library/vendor/Zend/Http/Client/Adapter/Socket.php index fe8bf34d0..319419942 100644 --- a/library/vendor/Zend/Http/Client/Adapter/Socket.php +++ b/library/vendor/Zend/Http/Client/Adapter/Socket.php @@ -24,15 +24,12 @@ /** * @see Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; /** * @see Zend_Http_Client_Adapter_Interface */ -require_once 'Zend/Http/Client/Adapter/Interface.php'; /** * @see Zend_Http_Client_Adapter_Stream */ -require_once 'Zend/Http/Client/Adapter/Stream.php'; /** * A sockets based (stream_socket_client) adapter class for Zend_Http_Client. Can be used @@ -113,7 +110,6 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf $config = $config->toArray(); } elseif (! is_array($config)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Array or Zend_Config object expected, got ' . gettype($config) ); @@ -157,7 +153,6 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf } else { // Invalid parameter - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( "Expecting either a stream context resource or array, got " . gettype($context) ); @@ -206,14 +201,12 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf if ($this->config['sslcert'] !== null) { if (! stream_context_set_option($context, 'ssl', 'local_cert', $this->config['sslcert'])) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Unable to set sslcert option'); } } if ($this->config['sslpassphrase'] !== null) { if (! stream_context_set_option($context, 'ssl', 'passphrase', $this->config['sslpassphrase'])) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Unable to set sslpassphrase option'); } } @@ -231,14 +224,12 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf if (! $this->socket) { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Unable to Connect to ' . $host . ':' . $port . '. Error #' . $errno . ': ' . $errstr); } // Set the stream timeout if (! stream_set_timeout($this->socket, (int) $this->config['timeout'])) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Unable to set the connection timeout'); } @@ -261,14 +252,12 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf { // Make sure we're properly connected if (! $this->socket) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are not connected'); } $host = $uri->getHost(); $host = (strtolower($uri->getScheme()) == 'https' ? $this->config['ssltransport'] : 'tcp') . '://' . $host; if ($this->connected_to[0] != $host || $this->connected_to[1] != $uri->getPort()) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are connected to the wrong host'); } @@ -293,13 +282,11 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf // Send the request if (! @fwrite($this->socket, $request)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Error writing request to server'); } if(is_resource($body)) { if(stream_copy_to_stream($body, $this->socket) == 0) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Error writing request to server'); } } @@ -365,7 +352,6 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf $chunksize = trim($line); if (! ctype_xdigit($chunksize)) { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Invalid chunk size "' . $chunksize . '" unable to read chunked body'); } @@ -404,7 +390,6 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf } while ($chunksize > 0); } else { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Cannot handle "' . $headers['transfer-encoding'] . '" transfer encoding'); } @@ -507,7 +492,6 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf $timedout = $info['timed_out']; if ($timedout) { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( "Read timed out after {$this->config['timeout']} seconds", Zend_Http_Client_Adapter_Exception::READ_TIMEOUT diff --git a/library/vendor/Zend/Http/Client/Adapter/Test.php b/library/vendor/Zend/Http/Client/Adapter/Test.php index 85491c333..cb490cbc8 100644 --- a/library/vendor/Zend/Http/Client/Adapter/Test.php +++ b/library/vendor/Zend/Http/Client/Adapter/Test.php @@ -23,15 +23,12 @@ /** * @see Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; /** * @see Zend_Http_Response */ -require_once 'Zend/Http/Response.php'; /** * @see Zend_Http_Client_Adapter_Interface */ -require_once 'Zend/Http/Client/Adapter/Interface.php'; /** * A testing-purposes adapter. @@ -109,7 +106,6 @@ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interfac $config = $config->toArray(); } elseif (! is_array($config)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Array or Zend_Config object expected, got ' . gettype($config) ); @@ -134,7 +130,6 @@ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interfac { if ($this->_nextRequestWillFail) { $this->_nextRequestWillFail = false; - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Request failed'); } } @@ -229,7 +224,6 @@ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interfac public function setResponseIndex($index) { if ($index < 0 || $index >= count($this->responses)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Index out of range of response buffer size'); } diff --git a/library/vendor/Zend/Http/Client/Exception.php b/library/vendor/Zend/Http/Client/Exception.php index 98071e95e..b7f753a9c 100644 --- a/library/vendor/Zend/Http/Client/Exception.php +++ b/library/vendor/Zend/Http/Client/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Http_Exception */ -require_once 'Zend/Http/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Http/Cookie.php b/library/vendor/Zend/Http/Cookie.php index a9b74184c..c8ef3094e 100644 --- a/library/vendor/Zend/Http/Cookie.php +++ b/library/vendor/Zend/Http/Cookie.php @@ -24,7 +24,6 @@ /** * @see Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; /** @@ -110,17 +109,14 @@ class Zend_Http_Cookie public function __construct($name, $value, $domain, $expires = null, $path = null, $secure = false) { if (preg_match("/[=,; \t\r\n\013\014]/", $name)) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Cookie name cannot contain these characters: =,; \\t\\r\\n\\013\\014 ({$name})"); } if (! $this->name = (string) $name) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Cookies must have a name'); } if (! $this->domain = (string) $domain) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Cookies must have a domain'); } @@ -234,7 +230,6 @@ class Zend_Http_Cookie // Make sure we have a valid Zend_Uri_Http object if (! ($uri->valid() && ($uri->getScheme() == 'http' || $uri->getScheme() =='https'))) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Passed URI is not a valid HTTP or HTTPS URI'); } @@ -334,7 +329,6 @@ class Zend_Http_Cookie * * @see Zend_Date */ - require_once 'Zend/Date.php'; $expireDate = new Zend_Date($v); $expires = $expireDate->getTimestamp(); @@ -377,12 +371,10 @@ class Zend_Http_Cookie public static function matchCookieDomain($cookieDomain, $host) { if (! $cookieDomain) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$cookieDomain is expected to be a cookie domain"); } if (! $host) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$host is expected to be a host name"); } @@ -410,12 +402,10 @@ class Zend_Http_Cookie public static function matchCookiePath($cookiePath, $path) { if (! $cookiePath) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$cookiePath is expected to be a cookie path"); } if (! $path) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$path is expected to be a host name"); } diff --git a/library/vendor/Zend/Http/CookieJar.php b/library/vendor/Zend/Http/CookieJar.php index e77edaac4..94fcbebba 100644 --- a/library/vendor/Zend/Http/CookieJar.php +++ b/library/vendor/Zend/Http/CookieJar.php @@ -23,15 +23,12 @@ /** * @see Zend_Uri */ -require_once "Zend/Uri.php"; /** * @see Zend_Http_Cookie */ -require_once "Zend/Http/Cookie.php"; /** * @see Zend_Http_Response */ -require_once "Zend/Http/Response.php"; /** * A Zend_Http_CookieJar object is designed to contain and maintain HTTP cookies, and should @@ -139,7 +136,6 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate $this->cookies[$domain][$path][$cookie->getName()] = $cookie; $this->_rawCookies[] = $cookie; } else { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Supplient argument is not a valid cookie string or object'); } } @@ -155,7 +151,6 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate public function addCookiesFromResponse($response, $ref_uri, $encodeValue = true) { if (! $response instanceof Zend_Http_Response) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('$response is expected to be a Response object, ' . gettype($response) . ' was passed'); } @@ -202,7 +197,6 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate { if (is_string($uri)) $uri = Zend_Uri::factory($uri); if (! $uri instanceof Zend_Uri_Http) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Invalid URI string or object passed"); } @@ -241,7 +235,6 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate } if (! $uri instanceof Zend_Uri_Http) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Invalid URI specified'); } @@ -268,7 +261,6 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate break; default: - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Invalid value passed for \$ret_as: {$ret_as}"); break; } diff --git a/library/vendor/Zend/Http/Exception.php b/library/vendor/Zend/Http/Exception.php index 708b1a6c8..696f19931 100644 --- a/library/vendor/Zend/Http/Exception.php +++ b/library/vendor/Zend/Http/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Http/Header/Exception/InvalidArgumentException.php b/library/vendor/Zend/Http/Header/Exception/InvalidArgumentException.php index 249cc5e27..5c47a1ca2 100644 --- a/library/vendor/Zend/Http/Header/Exception/InvalidArgumentException.php +++ b/library/vendor/Zend/Http/Header/Exception/InvalidArgumentException.php @@ -23,7 +23,6 @@ /** * @see Zend_Http_Exception */ -require_once 'Zend/Http/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Http/Header/Exception/RuntimeException.php b/library/vendor/Zend/Http/Header/Exception/RuntimeException.php index ea04333c9..1c894933a 100644 --- a/library/vendor/Zend/Http/Header/Exception/RuntimeException.php +++ b/library/vendor/Zend/Http/Header/Exception/RuntimeException.php @@ -23,7 +23,6 @@ /** * @see Zend_Http_Exception */ -require_once 'Zend/Http/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Http/Header/SetCookie.php b/library/vendor/Zend/Http/Header/SetCookie.php index a69800888..721f26f54 100644 --- a/library/vendor/Zend/Http/Header/SetCookie.php +++ b/library/vendor/Zend/Http/Header/SetCookie.php @@ -24,12 +24,10 @@ /** * @see Zend_Http_Header_Exception_InvalidArgumentException */ -require_once "Zend/Http/Header/Exception/InvalidArgumentException.php"; /** * @see Zend_Http_Header_Exception_RuntimeException */ -require_once "Zend/Http/Header/Exception/RuntimeException.php"; /** * Zend_Http_Client is an implementation of an HTTP client in PHP. The client diff --git a/library/vendor/Zend/Http/Response.php b/library/vendor/Zend/Http/Response.php index 39466e947..d166fd6a8 100644 --- a/library/vendor/Zend/Http/Response.php +++ b/library/vendor/Zend/Http/Response.php @@ -152,7 +152,6 @@ class Zend_Http_Response { // Make sure the response code is valid and set it if (self::responseCodeAsText($code) === null) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("{$code} is not a valid HTTP response code"); } @@ -162,7 +161,6 @@ class Zend_Http_Response if (is_int($name)) { $header = explode(":", $value, 2); if (count($header) != 2) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("'{$value}' is not a valid HTTP header"); } @@ -178,7 +176,6 @@ class Zend_Http_Response // Set the HTTP version if (! preg_match('|^\d\.\d$|', $version)) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Invalid HTTP response version: $version"); } @@ -575,7 +572,6 @@ class Zend_Http_Response while (trim($body)) { if (! preg_match("/^([\da-fA-F]+)[^\r\n]*\r\n/sm", $body, $m)) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Error parsing body - doesn't seem to be a chunked message"); } @@ -603,7 +599,6 @@ class Zend_Http_Response public static function decodeGzip($body) { if (! function_exists('gzinflate')) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception( 'zlib extension is required in order to decode "gzip" encoding' ); @@ -623,7 +618,6 @@ class Zend_Http_Response public static function decodeDeflate($body) { if (! function_exists('gzuncompress')) { - require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception( 'zlib extension is required in order to decode "deflate" encoding' ); diff --git a/library/vendor/Zend/Http/UserAgent.php b/library/vendor/Zend/Http/UserAgent.php index 79a624021..52a1c591b 100644 --- a/library/vendor/Zend/Http/UserAgent.php +++ b/library/vendor/Zend/Http/UserAgent.php @@ -224,7 +224,6 @@ class Zend_Http_UserAgent implements Serializable && !$options instanceof ArrayAccess && !$options instanceof Traversable ) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Invalid argument; expected array, Zend_Config object, or object implementing ArrayAccess and Traversable; received %s', (is_object($options) ? get_class($options) : gettype($options)) @@ -323,7 +322,6 @@ class Zend_Http_UserAgent implements Serializable if (is_array($deviceConfig) && isset($deviceConfig['classname'])) { $device = (string) $deviceConfig['classname']; if (!class_exists($device)) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Invalid classname "%s" provided in device configuration for browser type "%s"', $device, @@ -450,7 +448,6 @@ class Zend_Http_UserAgent implements Serializable public function setStorage(Zend_Http_UserAgent_Storage $storage) { if ($this->_immutable) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception( 'The User-Agent device object has already been retrieved; the storage object is now immutable' ); @@ -508,7 +505,6 @@ class Zend_Http_UserAgent implements Serializable // Verify that Config parameters are in an array. if (!is_array($config) && !$config instanceof Traversable) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Config parameters must be in an array or a Traversable object; received "%s"', (is_object($config) ? get_class($config) : gettype($config)) @@ -589,7 +585,6 @@ class Zend_Http_UserAgent implements Serializable public function setBrowserType($browserType) { if ($this->_immutable) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception( 'The User-Agent device object has already been retrieved; the browser type is now immutable' ); @@ -631,14 +626,12 @@ class Zend_Http_UserAgent implements Serializable public function setServer($server) { if ($this->_immutable) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception( 'The User-Agent device object has already been retrieved; the server array is now immutable' ); } if (!is_array($server) && !$server instanceof Traversable) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Expected an array or object implementing Traversable; received %s', (is_object($server) ? get_class($server) : gettype($server)) @@ -692,7 +685,6 @@ class Zend_Http_UserAgent implements Serializable public function setServerValue($key, $value) { if ($this->_immutable) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception( 'The User-Agent device object has already been retrieved; the server array is now immutable' ); @@ -717,19 +709,16 @@ class Zend_Http_UserAgent implements Serializable if (is_string($loader)) { if (!class_exists($loader)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($loader); } $loader = new $loader(); } elseif (!is_object($loader)) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Expected a plugin loader class or object; received %s', gettype($loader) )); } if (!$loader instanceof Zend_Loader_PluginLoader) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Expected an object extending Zend_Loader_PluginLoader; received %s', get_class($loader) @@ -763,7 +752,6 @@ class Zend_Http_UserAgent implements Serializable { $type = $this->_validateLoaderType($type); if (!isset($this->_loaders[$type])) { - require_once 'Zend/Loader/PluginLoader.php'; $this->setPluginLoader($type, new Zend_Loader_PluginLoader()); } return $this->_loaders[$type]; @@ -785,7 +773,6 @@ class Zend_Http_UserAgent implements Serializable if (!in_array($type, $this->_loaderTypes)) { $types = implode(', ', $this->_loaderTypes); - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Expected one of "%s" for plugin loader type; received "%s"', $types, diff --git a/library/vendor/Zend/Http/UserAgent/AbstractDevice.php b/library/vendor/Zend/Http/UserAgent/AbstractDevice.php index f62c705bb..1efd85953 100644 --- a/library/vendor/Zend/Http/UserAgent/AbstractDevice.php +++ b/library/vendor/Zend/Http/UserAgent/AbstractDevice.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Device.php'; /** * Abstract Class to define a browser device. @@ -769,7 +768,6 @@ abstract class Zend_Http_UserAgent_AbstractDevice $config = $config[$browserType]['features']; if (empty($config['classname'])) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter must have a "classname" config parameter defined'); } @@ -778,12 +776,10 @@ abstract class Zend_Http_UserAgent_AbstractDevice if (isset($config['path'])) { $path = $config['path']; } else { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter must have a "path" config parameter defined'); } if (false === include_once ($path)) { - require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter path that does not exist'); } } diff --git a/library/vendor/Zend/Http/UserAgent/Bot.php b/library/vendor/Zend/Http/UserAgent/Bot.php index ac40c6f06..013bfc017 100644 --- a/library/vendor/Zend/Http/UserAgent/Bot.php +++ b/library/vendor/Zend/Http/UserAgent/Bot.php @@ -18,7 +18,6 @@ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Bot browser type matcher diff --git a/library/vendor/Zend/Http/UserAgent/Checker.php b/library/vendor/Zend/Http/UserAgent/Checker.php index 9e93001d3..d397d4bb3 100644 --- a/library/vendor/Zend/Http/UserAgent/Checker.php +++ b/library/vendor/Zend/Http/UserAgent/Checker.php @@ -18,7 +18,6 @@ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Desktop.php'; /** * Checker browser type matcher diff --git a/library/vendor/Zend/Http/UserAgent/Console.php b/library/vendor/Zend/Http/UserAgent/Console.php index de387149b..15d0275ff 100644 --- a/library/vendor/Zend/Http/UserAgent/Console.php +++ b/library/vendor/Zend/Http/UserAgent/Console.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Desktop.php'; /** * Console browser type matcher diff --git a/library/vendor/Zend/Http/UserAgent/Desktop.php b/library/vendor/Zend/Http/UserAgent/Desktop.php index 81c3c5ccc..0381cb361 100644 --- a/library/vendor/Zend/Http/UserAgent/Desktop.php +++ b/library/vendor/Zend/Http/UserAgent/Desktop.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Desktop browser type matcher diff --git a/library/vendor/Zend/Http/UserAgent/Email.php b/library/vendor/Zend/Http/UserAgent/Email.php index 284f2013e..5769bd56c 100644 --- a/library/vendor/Zend/Http/UserAgent/Email.php +++ b/library/vendor/Zend/Http/UserAgent/Email.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Desktop.php'; /** * Email browser type matcher diff --git a/library/vendor/Zend/Http/UserAgent/Exception.php b/library/vendor/Zend/Http/UserAgent/Exception.php index 9050a06d8..996044788 100644 --- a/library/vendor/Zend/Http/UserAgent/Exception.php +++ b/library/vendor/Zend/Http/UserAgent/Exception.php @@ -22,7 +22,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Http/UserAgent/Features/Adapter/Browscap.php b/library/vendor/Zend/Http/UserAgent/Features/Adapter/Browscap.php index 25f194acb..becf5885c 100644 --- a/library/vendor/Zend/Http/UserAgent/Features/Adapter/Browscap.php +++ b/library/vendor/Zend/Http/UserAgent/Features/Adapter/Browscap.php @@ -22,7 +22,6 @@ /** * Zend_Http_UserAgent_Features_Adapter_Interface */ -require_once 'Zend/Http/UserAgent/Features/Adapter.php'; /** * Features adapter utilizing PHP's native browscap support @@ -49,7 +48,6 @@ class Zend_Http_UserAgent_Features_Adapter_Browscap { $browscap = ini_get('browscap'); if (empty($browscap) || !file_exists($browscap)) { - require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception(sprintf( '%s requires a browscap entry in php.ini pointing to a valid browscap.ini; none present', __CLASS__ diff --git a/library/vendor/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php b/library/vendor/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php index 344307580..3794e4ca6 100644 --- a/library/vendor/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php +++ b/library/vendor/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php @@ -22,7 +22,6 @@ /** * Zend_Http_UserAgent_Features_Adapter_Interface */ -require_once 'Zend/Http/UserAgent/Features/Adapter.php'; /** * Features adapter build with the Tera Wurfl Api @@ -46,7 +45,6 @@ class Zend_Http_UserAgent_Features_Adapter_DeviceAtlas implements Zend_Http_User { if (!class_exists('Mobi_Mtld_DA_Api')) { if (!isset($config['deviceatlas'])) { - require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('"DeviceAtlas" configuration is not defined'); } } @@ -55,16 +53,13 @@ class Zend_Http_UserAgent_Features_Adapter_DeviceAtlas implements Zend_Http_User if (!class_exists('Mobi_Mtld_DA_Api')) { if (empty($config['deviceatlas_lib_dir'])) { - require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('The "deviceatlas_lib_dir" parameter is not defined'); } // Include the Device Atlas file from the specified lib_dir - require_once ($config['deviceatlas_lib_dir'] . '/Mobi/Mtld/DA/Api.php'); } if (empty($config['deviceatlas_data'])) { - require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('The "deviceatlas_data" parameter is not defined'); } diff --git a/library/vendor/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php b/library/vendor/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php index 9ec1fa5a5..9af1cfe82 100644 --- a/library/vendor/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php +++ b/library/vendor/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php @@ -22,7 +22,6 @@ /** * Zend_Http_UserAgent_Features_Adapter_Interface */ -require_once 'Zend/Http/UserAgent/Features/Adapter.php'; /** * Features adapter build with the Tera Wurfl Api @@ -50,7 +49,6 @@ class Zend_Http_UserAgent_Features_Adapter_TeraWurfl implements Zend_Http_UserAg // if (!isset($config['terawurfl'])) { // No configuration - require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('"TeraWurfl" configuration is not defined'); } @@ -58,12 +56,10 @@ class Zend_Http_UserAgent_Features_Adapter_TeraWurfl implements Zend_Http_UserAg if (empty($config['terawurfl_lib_dir'])) { // No lib_dir given - require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('The "terawurfl_lib_dir" parameter is not defined'); } // Include the Tera-WURFL file - require_once ($config['terawurfl_lib_dir'] . '/TeraWurfl.php'); } diff --git a/library/vendor/Zend/Http/UserAgent/Features/Exception.php b/library/vendor/Zend/Http/UserAgent/Features/Exception.php index 55377bade..7ed46eeb8 100644 --- a/library/vendor/Zend/Http/UserAgent/Features/Exception.php +++ b/library/vendor/Zend/Http/UserAgent/Features/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Browser_Exception */ -require_once 'Zend/Http/UserAgent/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Http/UserAgent/Feed.php b/library/vendor/Zend/Http/UserAgent/Feed.php index b370f3470..b912943bb 100644 --- a/library/vendor/Zend/Http/UserAgent/Feed.php +++ b/library/vendor/Zend/Http/UserAgent/Feed.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Feed browser type matcher diff --git a/library/vendor/Zend/Http/UserAgent/Mobile.php b/library/vendor/Zend/Http/UserAgent/Mobile.php index b10898a90..e65a10822 100644 --- a/library/vendor/Zend/Http/UserAgent/Mobile.php +++ b/library/vendor/Zend/Http/UserAgent/Mobile.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Mobile browser type matcher diff --git a/library/vendor/Zend/Http/UserAgent/Offline.php b/library/vendor/Zend/Http/UserAgent/Offline.php index bdbe6ddf1..452c2dba3 100644 --- a/library/vendor/Zend/Http/UserAgent/Offline.php +++ b/library/vendor/Zend/Http/UserAgent/Offline.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Desktop.php'; /** * Offline browser type matcher diff --git a/library/vendor/Zend/Http/UserAgent/Probe.php b/library/vendor/Zend/Http/UserAgent/Probe.php index a2a6cdfb5..7673a238d 100644 --- a/library/vendor/Zend/Http/UserAgent/Probe.php +++ b/library/vendor/Zend/Http/UserAgent/Probe.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Probe browser type matcher diff --git a/library/vendor/Zend/Http/UserAgent/Spam.php b/library/vendor/Zend/Http/UserAgent/Spam.php index 0d7f6e6dc..678b2ec11 100644 --- a/library/vendor/Zend/Http/UserAgent/Spam.php +++ b/library/vendor/Zend/Http/UserAgent/Spam.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Spam browser type matcher diff --git a/library/vendor/Zend/Http/UserAgent/Storage/Exception.php b/library/vendor/Zend/Http/UserAgent/Storage/Exception.php index 04c34ad16..70fafba39 100644 --- a/library/vendor/Zend/Http/UserAgent/Storage/Exception.php +++ b/library/vendor/Zend/Http/UserAgent/Storage/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Http_UserAgent_Exception */ -require_once 'Zend/Http/UserAgent/Exception.php'; /** diff --git a/library/vendor/Zend/Http/UserAgent/Storage/NonPersistent.php b/library/vendor/Zend/Http/UserAgent/Storage/NonPersistent.php index 81851ecf3..485329d40 100644 --- a/library/vendor/Zend/Http/UserAgent/Storage/NonPersistent.php +++ b/library/vendor/Zend/Http/UserAgent/Storage/NonPersistent.php @@ -24,7 +24,6 @@ /** * @see Zend_Http_UserAgent_Storage_Interface */ -require_once 'Zend/Http/UserAgent/Storage.php'; /** diff --git a/library/vendor/Zend/Http/UserAgent/Storage/Session.php b/library/vendor/Zend/Http/UserAgent/Storage/Session.php index 69578622f..14b3cdab7 100644 --- a/library/vendor/Zend/Http/UserAgent/Storage/Session.php +++ b/library/vendor/Zend/Http/UserAgent/Storage/Session.php @@ -22,12 +22,10 @@ /** * @see Zend_Http_UserAgent_Storage */ -require_once 'Zend/Http/UserAgent/Storage.php'; /** * @see Zend_Session_Namespace */ -require_once 'Zend/Session/Namespace.php'; /** * @package Zend_Http @@ -87,7 +85,6 @@ class Zend_Http_UserAgent_Storage_Session implements Zend_Http_UserAgent_Storage $options = (array) $options; } if (null !== $options && !is_array($options)) { - require_once 'Zend/Http/UserAgent/Storage/Exception.php'; throw new Zend_Http_UserAgent_Storage_Exception(sprintf( 'Expected array or object options; "%s" provided', gettype($options) diff --git a/library/vendor/Zend/Http/UserAgent/Text.php b/library/vendor/Zend/Http/UserAgent/Text.php index 7d070e74b..c9e37f78e 100644 --- a/library/vendor/Zend/Http/UserAgent/Text.php +++ b/library/vendor/Zend/Http/UserAgent/Text.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Text browser type matcher diff --git a/library/vendor/Zend/Http/UserAgent/Validator.php b/library/vendor/Zend/Http/UserAgent/Validator.php index 83e131862..78ade5e54 100644 --- a/library/vendor/Zend/Http/UserAgent/Validator.php +++ b/library/vendor/Zend/Http/UserAgent/Validator.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Desktop.php'; /** * Validator browser type matcher diff --git a/library/vendor/Zend/Json.php b/library/vendor/Zend/Json.php index ab6aa5cb5..2287b6f55 100644 --- a/library/vendor/Zend/Json.php +++ b/library/vendor/Zend/Json.php @@ -24,10 +24,8 @@ * * @see Zend_Json_Expr */ -require_once 'Zend/Json/Expr.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** * Class for encoding to and decoding from JSON. @@ -82,12 +80,10 @@ class Zend_Json if (strtolower($encodedValue) === 'null') { return null; } elseif ($decode === null) { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Decoding failed'); } // php >= 5.3 } elseif (($jsonLastErr = json_last_error()) != JSON_ERROR_NONE) { - require_once 'Zend/Json/Exception.php'; switch ($jsonLastErr) { case JSON_ERROR_DEPTH: throw new Zend_Json_Exception('Decoding failed: Maximum stack depth exceeded'); @@ -103,7 +99,6 @@ class Zend_Json return $decode; } - require_once 'Zend/Json/Decoder.php'; return Zend_Json_Decoder::decode($encodedValue, $objectDecodeType); } @@ -145,7 +140,6 @@ class Zend_Json /** * @see Zend_Json_Encoder */ - require_once "Zend/Json/Encoder.php"; $valueToEncode = self::_recursiveJsonExprFinder($valueToEncode, $javascriptExpressions); } @@ -153,7 +147,6 @@ class Zend_Json if (function_exists('json_encode') && self::$useBuiltinEncoderDecoder !== true) { $encodedResult = json_encode($valueToEncode); } else { - require_once 'Zend/Json/Encoder.php'; $encodedResult = Zend_Json_Encoder::encode($valueToEncode, $cycleCheck, $options); } @@ -265,7 +258,6 @@ class Zend_Json // Keep an eye on how deeply we are involved in recursion. if ($recursionDepth > self::$maxRecursionDepthAllowed) { // XML tree is too deep. Exit now by throwing an exception. - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception( "Function _processXml exceeded the allowed recursion depth of " . self::$maxRecursionDepthAllowed); @@ -349,7 +341,6 @@ class Zend_Json // If it is not a valid XML content, throw an exception. if ($simpleXmlElementObject == null) { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Function fromXml was called with an invalid XML formatted string.'); } // End of if ($simpleXmlElementObject == null) diff --git a/library/vendor/Zend/Json/Decoder.php b/library/vendor/Zend/Json/Decoder.php index ecdc4c554..7a9709374 100644 --- a/library/vendor/Zend/Json/Decoder.php +++ b/library/vendor/Zend/Json/Decoder.php @@ -22,7 +22,6 @@ /** * @see Zend_Json */ -require_once 'Zend/Json.php'; /** * Decode JSON encoded string to PHP variable constructs @@ -144,10 +143,8 @@ class Zend_Json_Decoder public static function decode($source = null, $objectDecodeType = Zend_Json::TYPE_ARRAY) { if (null === $source) { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Must specify JSON encoded source for decoding'); } elseif (!is_string($source)) { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Can only decode JSON encoded strings'); } @@ -203,7 +200,6 @@ class Zend_Json_Decoder while ($tok && $tok != self::RBRACE) { if ($tok != self::DATUM || ! is_string($this->_tokenValue)) { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Missing key in object encoding: ' . $this->_source); } @@ -211,7 +207,6 @@ class Zend_Json_Decoder $tok = $this->_getNextToken(); if ($tok != self::COLON) { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Missing ":" in object encoding: ' . $this->_source); } @@ -224,7 +219,6 @@ class Zend_Json_Decoder } if ($tok != self::COMMA) { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Missing "," in object encoding: ' . $this->_source); } @@ -274,7 +268,6 @@ class Zend_Json_Decoder } if ($tok != self::COMMA) { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Missing "," in array encoding: ' . $this->_source); } @@ -388,7 +381,6 @@ class Zend_Json_Decoder $result .= '\''; break; default: - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception("Illegal escape " . "sequence '" . $chr . "'"); } @@ -440,7 +432,6 @@ class Zend_Json_Decoder if (is_numeric($datum)) { if (preg_match('/^0\d+$/', $datum)) { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception("Octal notation not supported by JSON (value: $datum)"); } else { $val = intval($datum); @@ -448,7 +439,6 @@ class Zend_Json_Decoder $this->_tokenValue = ($val == $fVal ? $val : $fVal); } } else { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception("Illegal number format: $datum"); } @@ -456,7 +446,6 @@ class Zend_Json_Decoder $this->_offset = $start + strlen($datum); } } else { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Illegal Token'); } diff --git a/library/vendor/Zend/Json/Encoder.php b/library/vendor/Zend/Json/Encoder.php index a4d9e5cb1..fe581cdff 100644 --- a/library/vendor/Zend/Json/Encoder.php +++ b/library/vendor/Zend/Json/Encoder.php @@ -122,7 +122,6 @@ class Zend_Json_Encoder return '"* RECURSION (' . get_class($value) . ') *"'; } else { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception( 'Cycles not supported in JSON encoding, cycle introduced by ' . 'class "' . get_class($value) . '"' @@ -406,7 +405,6 @@ class Zend_Json_Encoder { $cls = new ReflectionClass($className); if (! $cls->isInstantiable()) { - require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception("$className must be instantiable"); } diff --git a/library/vendor/Zend/Json/Exception.php b/library/vendor/Zend/Json/Exception.php index 37180e809..a970631a6 100644 --- a/library/vendor/Zend/Json/Exception.php +++ b/library/vendor/Zend/Json/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Json/Server.php b/library/vendor/Zend/Json/Server.php index 1ad12bf04..88df7b895 100644 --- a/library/vendor/Zend/Json/Server.php +++ b/library/vendor/Zend/Json/Server.php @@ -22,7 +22,6 @@ /** * @see Zend_Server_Abstract */ -require_once 'Zend/Server/Abstract.php'; /** * @category Zend @@ -89,12 +88,10 @@ class Zend_Json_Server extends Zend_Server_Abstract public function addFunction($function, $namespace = '') { if (!is_string($function) && (!is_array($function) || (2 > count($function)))) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Unable to attach function; invalid'); } if (!is_callable($function)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Unable to attach function; does not exist'); } @@ -104,7 +101,6 @@ class Zend_Json_Server extends Zend_Server_Abstract $argv = array_slice($argv, 2); } - require_once 'Zend/Server/Reflection.php'; if (is_string($function)) { $method = Zend_Server_Reflection::reflectFunction($function, $argv, $namespace); } else { @@ -147,7 +143,6 @@ class Zend_Json_Server extends Zend_Server_Abstract $argv = array_slice($argv, 3); } - require_once 'Zend/Server/Reflection.php'; $reflection = Zend_Server_Reflection::reflectClass($class, $argv, $namespace); foreach ($reflection->getMethods() as $method) { @@ -166,7 +161,6 @@ class Zend_Json_Server extends Zend_Server_Abstract */ public function fault($fault = null, $code = 404, $data = null) { - require_once 'Zend/Json/Server/Error.php'; $error = new Zend_Json_Server_Error($fault, $code, $data); $this->getResponse()->setError($error); return $error; @@ -181,7 +175,6 @@ class Zend_Json_Server extends Zend_Server_Abstract public function handle($request = false) { if ((false !== $request) && (!$request instanceof Zend_Json_Server_Request)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid request type provided; cannot handle'); } elseif ($request) { $this->setRequest($request); @@ -212,7 +205,6 @@ class Zend_Json_Server extends Zend_Server_Abstract public function loadFunctions($definition) { if (!is_array($definition) && (!$definition instanceof Zend_Server_Definition)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid definition provided to loadFunctions()'); } @@ -246,7 +238,6 @@ class Zend_Json_Server extends Zend_Server_Abstract public function getRequest() { if (null === ($request = $this->_request)) { - require_once 'Zend/Json/Server/Request/Http.php'; $this->setRequest(new Zend_Json_Server_Request_Http()); } return $this->_request; @@ -272,7 +263,6 @@ class Zend_Json_Server extends Zend_Server_Abstract public function getResponse() { if (null === ($response = $this->_response)) { - require_once 'Zend/Json/Server/Response/Http.php'; $this->setResponse(new Zend_Json_Server_Response_Http()); } return $this->_response; @@ -332,7 +322,6 @@ class Zend_Json_Server extends Zend_Server_Abstract public function getServiceMap() { if (null === $this->_serviceMap) { - require_once 'Zend/Json/Server/Smd.php'; $this->_serviceMap = new Zend_Json_Server_Smd(); } return $this->_serviceMap; @@ -479,7 +468,6 @@ class Zend_Json_Server extends Zend_Server_Abstract { if (null === $this->_smdMethods) { $this->_smdMethods = array(); - require_once 'Zend/Json/Server/Smd.php'; $methods = get_class_methods('Zend_Json_Server_Smd'); foreach ($methods as $key => $method) { if (!preg_match('/^(set|get)/', $method)) { diff --git a/library/vendor/Zend/Json/Server/Cache.php b/library/vendor/Zend/Json/Server/Cache.php index 72c67e696..164396dae 100644 --- a/library/vendor/Zend/Json/Server/Cache.php +++ b/library/vendor/Zend/Json/Server/Cache.php @@ -21,7 +21,6 @@ */ /** Zend_Server_Cache */ -require_once 'Zend/Server/Cache.php'; /** * Zend_Json_Server_Cache: cache Zend_Json_Server server definition and SMD diff --git a/library/vendor/Zend/Json/Server/Error.php b/library/vendor/Zend/Json/Server/Error.php index 699f89059..df0b09e13 100644 --- a/library/vendor/Zend/Json/Server/Error.php +++ b/library/vendor/Zend/Json/Server/Error.php @@ -181,7 +181,6 @@ class Zend_Json_Server_Error */ public function toJson() { - require_once 'Zend/Json.php'; return Zend_Json::encode($this->toArray()); } diff --git a/library/vendor/Zend/Json/Server/Exception.php b/library/vendor/Zend/Json/Server/Exception.php index a46f483e0..932044ca2 100644 --- a/library/vendor/Zend/Json/Server/Exception.php +++ b/library/vendor/Zend/Json/Server/Exception.php @@ -20,7 +20,6 @@ */ /** Zend_Json_Exception */ -require_once 'Zend/Json/Exception.php'; /** * Zend_Json_Server exceptions diff --git a/library/vendor/Zend/Json/Server/Request.php b/library/vendor/Zend/Json/Server/Request.php index 3ac69634a..e91c24ad5 100644 --- a/library/vendor/Zend/Json/Server/Request.php +++ b/library/vendor/Zend/Json/Server/Request.php @@ -247,7 +247,6 @@ class Zend_Json_Server_Request */ public function loadJson($json) { - require_once 'Zend/Json.php'; $options = Zend_Json::decode($json); $this->setOptions($options); } @@ -273,7 +272,6 @@ class Zend_Json_Server_Request $jsonArray['jsonrpc'] = '2.0'; } - require_once 'Zend/Json.php'; return Zend_Json::encode($jsonArray); } diff --git a/library/vendor/Zend/Json/Server/Request/Http.php b/library/vendor/Zend/Json/Server/Request/Http.php index d54cb0020..880d47f84 100644 --- a/library/vendor/Zend/Json/Server/Request/Http.php +++ b/library/vendor/Zend/Json/Server/Request/Http.php @@ -22,7 +22,6 @@ /** * @see Zend_Json_Server_Request */ -require_once 'Zend/Json/Server/Request.php'; /** * @category Zend diff --git a/library/vendor/Zend/Json/Server/Response.php b/library/vendor/Zend/Json/Server/Response.php index 8ada63cad..c073ba5c6 100644 --- a/library/vendor/Zend/Json/Server/Response.php +++ b/library/vendor/Zend/Json/Server/Response.php @@ -188,7 +188,6 @@ class Zend_Json_Server_Response $response['jsonrpc'] = $version; } - require_once 'Zend/Json.php'; return Zend_Json::encode($response); } diff --git a/library/vendor/Zend/Json/Server/Response/Http.php b/library/vendor/Zend/Json/Server/Response/Http.php index fc448d4d9..dbae9bb18 100644 --- a/library/vendor/Zend/Json/Server/Response/Http.php +++ b/library/vendor/Zend/Json/Server/Response/Http.php @@ -22,7 +22,6 @@ /** * @see Zend_Json_Server_Response */ -require_once 'Zend/Json/Server/Response.php'; /** * @category Zend diff --git a/library/vendor/Zend/Json/Server/Smd.php b/library/vendor/Zend/Json/Server/Smd.php index a3f046448..a9181d661 100644 --- a/library/vendor/Zend/Json/Server/Smd.php +++ b/library/vendor/Zend/Json/Server/Smd.php @@ -129,7 +129,6 @@ class Zend_Json_Server_Smd public function setTransport($transport) { if (!in_array($transport, $this->_transportTypes)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid transport "%s" specified', $transport)); } $this->_transport = $transport; @@ -155,7 +154,6 @@ class Zend_Json_Server_Smd public function setEnvelope($envelopeType) { if (!in_array($envelopeType, $this->_envelopeTypes)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid envelope type "%s"', $envelopeType)); } $this->_envelope = $envelopeType; @@ -182,7 +180,6 @@ class Zend_Json_Server_Smd public function setContentType($type) { if (!preg_match($this->_contentTypeRegex, $type)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid content type "%s" specified', $type)); } $this->_contentType = $type; @@ -295,7 +292,6 @@ class Zend_Json_Server_Smd */ public function addService($service) { - require_once 'Zend/Json/Server/Smd/Service.php'; if ($service instanceof Zend_Json_Server_Smd_Service) { $name = $service->getName(); @@ -303,12 +299,10 @@ class Zend_Json_Server_Smd $service = new Zend_Json_Server_Smd_Service($service); $name = $service->getName(); } else { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid service passed to addService()'); } if (array_key_exists($name, $this->_services)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Attempt to register a service already registered detected'); } $this->_services[$name] = $service; @@ -463,7 +457,6 @@ class Zend_Json_Server_Smd */ public function toJson() { - require_once 'Zend/Json.php'; return Zend_Json::encode($this->toArray()); } diff --git a/library/vendor/Zend/Json/Server/Smd/Service.php b/library/vendor/Zend/Json/Server/Smd/Service.php index 4d0d13249..6fca73e20 100644 --- a/library/vendor/Zend/Json/Server/Smd/Service.php +++ b/library/vendor/Zend/Json/Server/Smd/Service.php @@ -21,7 +21,6 @@ /** * @see Zend_Json_Server_Smd */ -require_once 'Zend/Json/Server/Smd.php'; /** * Create Service Mapping Description for a method @@ -130,7 +129,6 @@ class Zend_Json_Server_Smd_Service } if (null == $this->getName()) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('SMD service description requires a name; none provided'); } } @@ -167,7 +165,6 @@ class Zend_Json_Server_Smd_Service { $name = (string) $name; if (!preg_match($this->_nameRegex, $name)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid name "%s" provided for service; must follow PHP method naming conventions', $name)); } $this->_name = $name; @@ -195,7 +192,6 @@ class Zend_Json_Server_Smd_Service public function setTransport($transport) { if (!in_array($transport, $this->_transportTypes)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid transport "%s"; please select one of (%s)', $transport, implode(', ', $this->_transportTypes))); } @@ -244,7 +240,6 @@ class Zend_Json_Server_Smd_Service public function setEnvelope($envelopeType) { if (!in_array($envelopeType, $this->_envelopeTypes)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid envelope type "%s"; please specify one of (%s)', $envelopeType, implode(', ', $this->_envelopeTypes))); } @@ -279,7 +274,6 @@ class Zend_Json_Server_Smd_Service $type[$key] = $this->_validateParamType($paramType); } } else { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid param type provided'); } @@ -383,7 +377,6 @@ class Zend_Json_Server_Smd_Service $type[$key] = $this->_validateParamType($returnType, true); } } else { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid param type provided ("' . gettype($type) .'")'); } $this->_return = $type; @@ -430,7 +423,6 @@ class Zend_Json_Server_Smd_Service { $service = array($this->getName() => $this->toArray()); - require_once 'Zend/Json.php'; return Zend_Json::encode($service); } @@ -454,7 +446,6 @@ class Zend_Json_Server_Smd_Service protected function _validateParamType($type, $isReturn = false) { if (!is_string($type)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid param type provided ("' . $type .'")'); } @@ -464,7 +455,6 @@ class Zend_Json_Server_Smd_Service $paramType = $this->_paramMap[$type]; if (!$isReturn && ('null' == $paramType)) { - require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid param type provided ("' . $type . '")'); } diff --git a/library/vendor/Zend/Layout.php b/library/vendor/Zend/Layout.php index fdb4867e9..f62c8ecf5 100644 --- a/library/vendor/Zend/Layout.php +++ b/library/vendor/Zend/Layout.php @@ -149,7 +149,6 @@ class Zend_Layout } elseif ($options instanceof Zend_Config) { $this->setConfig($options); } else { - require_once 'Zend/Layout/Exception.php'; throw new Zend_Layout_Exception('Invalid option provided to constructor'); } } @@ -232,7 +231,6 @@ class Zend_Layout if ($options instanceof Zend_Config) { $options = $options->toArray(); } elseif (!is_array($options)) { - require_once 'Zend/Layout/Exception.php'; throw new Zend_Layout_Exception('setOptions() expects either an array or a Zend_Config object'); } @@ -263,11 +261,9 @@ class Zend_Layout protected function _initPlugin() { $pluginClass = $this->getPluginClass(); - require_once 'Zend/Controller/Front.php'; $front = Zend_Controller_Front::getInstance(); if (!$front->hasPlugin($pluginClass)) { if (!class_exists($pluginClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($pluginClass); } $front->registerPlugin( @@ -286,10 +282,8 @@ class Zend_Layout protected function _initHelper() { $helperClass = $this->getHelperClass(); - require_once 'Zend/Controller/Action/HelperBroker.php'; if (!Zend_Controller_Action_HelperBroker::hasHelper('layout')) { if (!class_exists($helperClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($helperClass); } Zend_Controller_Action_HelperBroker::getStack()->offsetSet(-90, new $helperClass($this)); @@ -316,7 +310,6 @@ class Zend_Layout protected function _initVarContainer() { if (null === $this->_container) { - require_once 'Zend/View/Helper/Placeholder/Registry.php'; $this->_container = Zend_View_Helper_Placeholder_Registry::getRegistry()->getContainer(__CLASS__); } @@ -563,7 +556,6 @@ class Zend_Layout public function getView() { if (null === $this->_view) { - require_once 'Zend/Controller/Action/HelperBroker.php'; $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); if (null === $viewRenderer->view) { $viewRenderer->initView(); @@ -637,7 +629,6 @@ class Zend_Layout public function getInflector() { if (null === $this->_inflector) { - require_once 'Zend/Filter/Inflector.php'; $inflector = new Zend_Filter_Inflector(); $inflector->setTargetReference($this->_inflectorTarget) ->addRules(array(':script' => array('Word_CamelCaseToDash', 'StringToLower'))) @@ -754,7 +745,6 @@ class Zend_Layout return $this; } - require_once 'Zend/Layout/Exception.php'; throw new Zend_Layout_Exception('Invalid values passed to assign()'); } diff --git a/library/vendor/Zend/Layout/Controller/Action/Helper/Layout.php b/library/vendor/Zend/Layout/Controller/Action/Helper/Layout.php index 79edc45db..fff066c44 100644 --- a/library/vendor/Zend/Layout/Controller/Action/Helper/Layout.php +++ b/library/vendor/Zend/Layout/Controller/Action/Helper/Layout.php @@ -21,7 +21,6 @@ */ /** Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Helper for interacting with Zend_Layout objects @@ -64,7 +63,6 @@ class Zend_Layout_Controller_Action_Helper_Layout extends Zend_Controller_Action /** * @see Zend_Layout */ - require_once 'Zend/Layout.php'; $layout = Zend_Layout::getMvcInstance(); } @@ -94,7 +92,6 @@ class Zend_Layout_Controller_Action_Helper_Layout extends Zend_Controller_Action /** * @see Zend_Controller_Front */ - require_once 'Zend/Controller/Front.php'; $this->_frontController = Zend_Controller_Front::getInstance(); } @@ -112,7 +109,6 @@ class Zend_Layout_Controller_Action_Helper_Layout extends Zend_Controller_Action /** * @see Zend_Layout */ - require_once 'Zend/Layout.php'; if (null === ($this->_layout = Zend_Layout::getMvcInstance())) { $this->_layout = new Zend_Layout(); } @@ -180,7 +176,6 @@ class Zend_Layout_Controller_Action_Helper_Layout extends Zend_Controller_Action return call_user_func_array(array($layout, $method), $args); } - require_once 'Zend/Layout/Exception.php'; throw new Zend_Layout_Exception(sprintf("Invalid method '%s' called on layout action helper", $method)); } } diff --git a/library/vendor/Zend/Layout/Controller/Plugin/Layout.php b/library/vendor/Zend/Layout/Controller/Plugin/Layout.php index 474f05198..6831d4ff2 100644 --- a/library/vendor/Zend/Layout/Controller/Plugin/Layout.php +++ b/library/vendor/Zend/Layout/Controller/Plugin/Layout.php @@ -20,7 +20,6 @@ */ /** Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; /** * Render layouts diff --git a/library/vendor/Zend/Layout/Exception.php b/library/vendor/Zend/Layout/Exception.php index 728fdf5d5..9acf06626 100644 --- a/library/vendor/Zend/Layout/Exception.php +++ b/library/vendor/Zend/Layout/Exception.php @@ -21,7 +21,6 @@ /** Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Loader.php b/library/vendor/Zend/Loader.php index a2b3de1c0..8084e1281 100644 --- a/library/vendor/Zend/Loader.php +++ b/library/vendor/Zend/Loader.php @@ -56,7 +56,6 @@ class Zend_Loader } if ((null !== $dirs) && !is_string($dirs) && !is_array($dirs)) { - require_once 'Zend/Exception.php'; throw new Zend_Exception('Directory argument must be a string or an array'); } @@ -83,7 +82,6 @@ class Zend_Loader } if (!class_exists($class, false) && !interface_exists($class, false)) { - require_once 'Zend/Exception.php'; throw new Zend_Exception("File \"$file\" does not exist or class \"$class\" was not found in the file"); } } @@ -252,7 +250,6 @@ class Zend_Loader public static function registerAutoload($class = 'Zend_Loader', $enabled = true) { trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated as of 1.8.0 and will be removed with 2.0.0; use Zend_Loader_Autoloader instead', E_USER_NOTICE); - require_once 'Zend/Loader/Autoloader.php'; $autoloader = Zend_Loader_Autoloader::getInstance(); $autoloader->setFallbackAutoloader(true); @@ -260,7 +257,6 @@ class Zend_Loader self::loadClass($class); $methods = get_class_methods($class); if (!in_array('autoload', (array) $methods)) { - require_once 'Zend/Exception.php'; throw new Zend_Exception("The class \"$class\" does not have an autoload() method"); } @@ -287,7 +283,6 @@ class Zend_Loader * Security check */ if (preg_match('/[^a-z0-9\\/\\\\_.:-]/i', $filename)) { - require_once 'Zend/Exception.php'; throw new Zend_Exception('Security check: Illegal character in filename'); } } diff --git a/library/vendor/Zend/Loader/Autoloader.php b/library/vendor/Zend/Loader/Autoloader.php index ed5a2c43d..3a683c24f 100644 --- a/library/vendor/Zend/Loader/Autoloader.php +++ b/library/vendor/Zend/Loader/Autoloader.php @@ -21,7 +21,6 @@ */ /** Zend_Loader */ -require_once 'Zend/Loader.php'; /** * Autoloader stack and namespace autoloader diff --git a/library/vendor/Zend/Loader/Autoloader/Resource.php b/library/vendor/Zend/Loader/Autoloader/Resource.php index b1fc183d6..dd579f2ef 100644 --- a/library/vendor/Zend/Loader/Autoloader/Resource.php +++ b/library/vendor/Zend/Loader/Autoloader/Resource.php @@ -21,7 +21,6 @@ */ /** Zend_Loader_Autoloader_Interface */ -require_once 'Zend/Loader/Autoloader/Interface.php'; /** * Resource loader @@ -71,7 +70,6 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac $options = $options->toArray(); } if (!is_array($options)) { - require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Options must be passed to resource loader constructor'); } @@ -81,14 +79,12 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac if ((null === $namespace) || (null === $this->getBasePath()) ) { - require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Resource loader requires both a namespace and a base path for initialization'); } if (!empty($namespace)) { $namespace .= '_'; } - require_once 'Zend/Loader/Autoloader.php'; Zend_Loader_Autoloader::getInstance()->unshiftAutoloader($this, $namespace); } @@ -117,18 +113,15 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac if ('get' == substr($method, 0, 3)) { $type = strtolower(substr($method, 3)); if (!$this->hasResourceType($type)) { - require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception("Invalid resource type $type; cannot load resource"); } if (empty($args)) { - require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception("Cannot load resources; no resource specified"); } $resource = array_shift($args); return $this->load($resource, $type); } - require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception("Method '$method' is not supported"); } @@ -284,7 +277,6 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac $type = strtolower($type); if (!isset($this->_resourceTypes[$type])) { if (null === $namespace) { - require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Initial definition of a resource type must include a namespace'); } $namespaceTopLevel = $this->getNamespace(); @@ -294,7 +286,6 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac ); } if (!is_string($path)) { - require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Invalid path specification provided; must be string'); } $this->_resourceTypes[$type]['path'] = $this->getBasePath() . '/' . rtrim($path, '\/'); @@ -334,11 +325,9 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac { foreach ($types as $type => $spec) { if (!is_array($spec)) { - require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('addResourceTypes() expects an array of arrays'); } if (!isset($spec['path'])) { - require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('addResourceTypes() expects each array to include a paths element'); } $paths = $spec['path']; @@ -454,12 +443,10 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac if (null === $type) { $type = $this->getDefaultResourceType(); if (empty($type)) { - require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('No resource type specified'); } } if (!$this->hasResourceType($type)) { - require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Invalid resource type specified'); } $namespace = $this->_resourceTypes[$type]['namespace']; diff --git a/library/vendor/Zend/Loader/AutoloaderFactory.php b/library/vendor/Zend/Loader/AutoloaderFactory.php index 3d872faed..8c638900b 100644 --- a/library/vendor/Zend/Loader/AutoloaderFactory.php +++ b/library/vendor/Zend/Loader/AutoloaderFactory.php @@ -18,7 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once dirname(__FILE__) . '/SplAutoloader.php'; if (class_exists('Zend_Loader_AutoloaderFactory')) return; @@ -81,7 +80,6 @@ abstract class Zend_Loader_AutoloaderFactory } if (!is_array($options) && !($options instanceof Traversable)) { - require_once 'Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException( 'Options provided must be an array or Traversable' ); @@ -91,7 +89,6 @@ abstract class Zend_Loader_AutoloaderFactory if (!isset(self::$loaders[$class])) { $autoloader = self::getStandardAutoloader(); if (!class_exists($class) && !$autoloader->autoload($class)) { - require_once 'Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException(sprintf( 'Autoloader class "%s" not loaded', $class @@ -102,7 +99,6 @@ abstract class Zend_Loader_AutoloaderFactory // additionally instanceof is also broken for this use case if (version_compare(PHP_VERSION, '5.3.7', '>=')) { if (!is_subclass_of($class, 'Zend_Loader_SplAutoloader')) { - require_once 'Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException(sprintf( 'Autoloader class %s must implement Zend\\Loader\\SplAutoloader', $class @@ -145,7 +141,6 @@ abstract class Zend_Loader_AutoloaderFactory public static function getRegisteredAutoloader($class) { if (!isset(self::$loaders[$class])) { - require_once 'Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException(sprintf('Autoloader class "%s" not loaded', $class)); } return self::$loaders[$class]; @@ -202,7 +197,6 @@ abstract class Zend_Loader_AutoloaderFactory $stdAutoloader = substr(strrchr(self::STANDARD_AUTOLOADER, '_'), 1); if (!class_exists(self::STANDARD_AUTOLOADER)) { - require_once dirname(__FILE__) . "/$stdAutoloader.php"; } $loader = new Zend_Loader_StandardAutoloader(); self::$standardAutoloader = $loader; diff --git a/library/vendor/Zend/Loader/ClassMapAutoloader.php b/library/vendor/Zend/Loader/ClassMapAutoloader.php index c1923ac5f..7e6615c01 100644 --- a/library/vendor/Zend/Loader/ClassMapAutoloader.php +++ b/library/vendor/Zend/Loader/ClassMapAutoloader.php @@ -19,7 +19,6 @@ */ // Grab SplAutoloader interface -require_once dirname(__FILE__) . '/SplAutoloader.php'; /** * Class-map autoloader @@ -95,7 +94,6 @@ class Zend_Loader_ClassMapAutoloader implements Zend_Loader_SplAutoloader } if (!is_array($map)) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Map file provided does not return a map'); } @@ -117,7 +115,6 @@ class Zend_Loader_ClassMapAutoloader implements Zend_Loader_SplAutoloader public function registerAutoloadMaps($locations) { if (!is_array($locations) && !($locations instanceof Traversable)) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Map list must be an array or implement Traversable'); } foreach ($locations as $location) { @@ -145,7 +142,6 @@ class Zend_Loader_ClassMapAutoloader implements Zend_Loader_SplAutoloader public function autoload($class) { if (isset($this->map[$class])) { - require_once $this->map[$class]; } } @@ -177,7 +173,6 @@ class Zend_Loader_ClassMapAutoloader implements Zend_Loader_SplAutoloader protected function loadMapFromFile($location) { if (!file_exists($location)) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Map file provided does not exist'); } diff --git a/library/vendor/Zend/Loader/Exception.php b/library/vendor/Zend/Loader/Exception.php index 394788bcb..00d9194f3 100644 --- a/library/vendor/Zend/Loader/Exception.php +++ b/library/vendor/Zend/Loader/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Loader/Exception/InvalidArgumentException.php b/library/vendor/Zend/Loader/Exception/InvalidArgumentException.php index 18304c65d..a5007232c 100644 --- a/library/vendor/Zend/Loader/Exception/InvalidArgumentException.php +++ b/library/vendor/Zend/Loader/Exception/InvalidArgumentException.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once dirname(__FILE__) . '/../Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Loader/PluginLoader.php b/library/vendor/Zend/Loader/PluginLoader.php index 0e51a9d08..344744911 100644 --- a/library/vendor/Zend/Loader/PluginLoader.php +++ b/library/vendor/Zend/Loader/PluginLoader.php @@ -21,10 +21,8 @@ */ /** Zend_Loader_PluginLoader_Interface */ -require_once 'Zend/Loader/PluginLoader/Interface.php'; /** Zend_Loader */ -require_once 'Zend/Loader.php'; /** * Generic plugin class loader @@ -153,7 +151,6 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface public function addPrefixPath($prefix, $path) { if (!is_string($prefix) || !is_string($path)) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Zend_Loader_PluginLoader::addPrefixPath() method only takes strings for prefix and path.'); } @@ -258,14 +255,12 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface } if (!isset($registry[$prefix])) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Prefix ' . $prefix . ' was not found in the PluginLoader.'); } if ($path != null) { $pos = array_search($path, $registry[$prefix]); if (false === $pos) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Prefix ' . $prefix . ' / Path ' . $path . ' was not found in the PluginLoader.'); } unset($registry[$prefix][$pos]); @@ -420,7 +415,6 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface foreach ($registry as $prefix => $paths) { $message .= "\n$prefix: " . implode(PATH_SEPARATOR, $paths); } - require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception($message); } @@ -457,15 +451,12 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface } if (!file_exists($file) && !file_exists(dirname($file))) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Specified file does not exist and/or directory does not exist (' . $file . ')'); } if (file_exists($file) && !is_writable($file)) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Specified file is not writeable (' . $file . ')'); } if (!file_exists($file) && file_exists(dirname($file)) && !is_writable(dirname($file))) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Specified file is not writeable (' . $file . ')'); } diff --git a/library/vendor/Zend/Loader/PluginLoader/Exception.php b/library/vendor/Zend/Loader/PluginLoader/Exception.php index 50e9d8c2f..1eb32b88d 100644 --- a/library/vendor/Zend/Loader/PluginLoader/Exception.php +++ b/library/vendor/Zend/Loader/PluginLoader/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Loader_Exception */ -require_once 'Zend/Loader/Exception.php'; /** * Plugin class loader exceptions diff --git a/library/vendor/Zend/Loader/StandardAutoloader.php b/library/vendor/Zend/Loader/StandardAutoloader.php index 31a5c1e45..b360f8f64 100644 --- a/library/vendor/Zend/Loader/StandardAutoloader.php +++ b/library/vendor/Zend/Loader/StandardAutoloader.php @@ -19,7 +19,6 @@ */ // Grab SplAutoloader interface -require_once dirname(__FILE__) . '/SplAutoloader.php'; /** * PSR-0 compliant autoloader @@ -98,7 +97,6 @@ class Zend_Loader_StandardAutoloader implements Zend_Loader_SplAutoloader public function setOptions($options) { if (!is_array($options) && !($options instanceof Traversable)) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Options must be either an array or Traversable'); } @@ -174,7 +172,6 @@ class Zend_Loader_StandardAutoloader implements Zend_Loader_SplAutoloader public function registerNamespaces($namespaces) { if (!is_array($namespaces) && !$namespaces instanceof Traversable) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Namespace pairs must be either an array or Traversable'); } @@ -207,7 +204,6 @@ class Zend_Loader_StandardAutoloader implements Zend_Loader_SplAutoloader public function registerPrefixes($prefixes) { if (!is_array($prefixes) && !$prefixes instanceof Traversable) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Prefix pairs must be either an array or Traversable'); } @@ -306,7 +302,6 @@ class Zend_Loader_StandardAutoloader implements Zend_Loader_SplAutoloader protected function loadClass($class, $type) { if (!in_array($type, array(self::LOAD_NS, self::LOAD_PREFIX, self::ACT_AS_FALLBACK))) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException(); } diff --git a/library/vendor/Zend/Locale.php b/library/vendor/Zend/Locale.php index 6b0860cd5..3f7e38542 100644 --- a/library/vendor/Zend/Locale.php +++ b/library/vendor/Zend/Locale.php @@ -1188,12 +1188,10 @@ class Zend_Locale { if (($locale === 'auto') or ($locale === 'root') or ($locale === 'default') or ($locale === 'environment') or ($locale === 'browser')) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception('Only full qualified locales can be used as default!'); } if (($quality < 0.1) or ($quality > 100)) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Quality must be between 0.1 and 100"); } @@ -1209,7 +1207,6 @@ class Zend_Locale if (isset(self::$_localeData[$elocale[0]]) === true) { self::$_default = array($elocale[0] => $quality); } else { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown locale '" . (string) $locale . "' can not be set as default!"); } } @@ -1232,7 +1229,6 @@ class Zend_Locale return self::$_environment; } - require_once 'Zend/Locale/Data/Translation.php'; $language = setlocale(LC_ALL, 0); $languages = explode(';', $language); @@ -1461,7 +1457,6 @@ class Zend_Locale */ public static function getTranslationList($path = null, $locale = null, $value = null) { - require_once 'Zend/Locale/Data.php'; $locale = self::findLocale($locale); $result = Zend_Locale_Data::getList($locale, $path, $value); if (empty($result) === true) { @@ -1535,7 +1530,6 @@ class Zend_Locale */ public static function getTranslation($value = null, $path = null, $locale = null) { - require_once 'Zend/Locale/Data.php'; $locale = self::findLocale($locale); $result = Zend_Locale_Data::getContent($locale, $path, $value); if (empty($result) === true && '0' !== $result) { @@ -1610,7 +1604,6 @@ class Zend_Locale */ public static function getQuestion($locale = null) { - require_once 'Zend/Locale/Data.php'; $locale = self::findLocale($locale); $quest = Zend_Locale_Data::getList($locale, 'question'); $yes = explode(':', $quest['yes']); @@ -1740,7 +1733,6 @@ class Zend_Locale public static function findLocale($locale = null) { if ($locale === null) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -1755,7 +1747,6 @@ class Zend_Locale $locale = Zend_Locale::getLocaleToTerritory($locale); if (empty($locale)) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("The locale '$locale' is no known locale"); } } else { @@ -1807,7 +1798,6 @@ class Zend_Locale */ public static function getCache() { - require_once 'Zend/Locale/Data.php'; return Zend_Locale_Data::getCache(); } @@ -1819,7 +1809,6 @@ class Zend_Locale */ public static function setCache(Zend_Cache_Core $cache) { - require_once 'Zend/Locale/Data.php'; Zend_Locale_Data::setCache($cache); } @@ -1830,7 +1819,6 @@ class Zend_Locale */ public static function hasCache() { - require_once 'Zend/Locale/Data.php'; return Zend_Locale_Data::hasCache(); } @@ -1841,7 +1829,6 @@ class Zend_Locale */ public static function removeCache() { - require_once 'Zend/Locale/Data.php'; Zend_Locale_Data::removeCache(); } @@ -1853,7 +1840,6 @@ class Zend_Locale */ public static function clearCache($tag = null) { - require_once 'Zend/Locale/Data.php'; Zend_Locale_Data::clearCache($tag); } @@ -1865,7 +1851,6 @@ class Zend_Locale */ public static function disableCache($flag) { - require_once 'Zend/Locale/Data.php'; Zend_Locale_Data::disableCache($flag); } @@ -1918,7 +1903,6 @@ class Zend_Locale // This can only happen when someone extends Zend_Locale and erases the default if ($locale === null) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception('Autodetection of Locale has been failed!'); } diff --git a/library/vendor/Zend/Locale/Data.php b/library/vendor/Zend/Locale/Data.php index d7d060bbc..614a799eb 100644 --- a/library/vendor/Zend/Locale/Data.php +++ b/library/vendor/Zend/Locale/Data.php @@ -23,10 +23,8 @@ /** * include needed classes */ -require_once 'Zend/Locale.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** * Locale data reader, handles the CLDR @@ -157,7 +155,6 @@ class Zend_Locale_Data if (empty(self::$_ldml[(string) $locale])) { $filename = dirname(__FILE__) . '/Data/' . $locale . '.xml'; if (!file_exists($filename)) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Missing locale file '$filename' for '$locale' locale."); } @@ -288,7 +285,6 @@ class Zend_Locale_Data } if (!(Zend_Locale::isLocale((string) $locale, null, false))) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Locale (" . (string) $locale . ") is a unknown locale"); } @@ -313,7 +309,6 @@ class Zend_Locale_Data $locale = self::_checkLocale($locale); if (!isset(self::$_cache) && !self::$_cacheDisabled) { - require_once 'Zend/Cache.php'; self::$_cache = Zend_Cache::factory( 'Core', 'File', @@ -933,7 +928,6 @@ class Zend_Locale_Data break; default : - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown list ($path) for parsing locale data."); break; } @@ -963,7 +957,6 @@ class Zend_Locale_Data $locale = self::_checkLocale($locale); if (!isset(self::$_cache) && !self::$_cacheDisabled) { - require_once 'Zend/Cache.php'; self::$_cache = Zend_Cache::factory( 'Core', 'File', @@ -1476,7 +1469,6 @@ class Zend_Locale_Data break; default : - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown detail ($path) for parsing locale data."); break; } diff --git a/library/vendor/Zend/Locale/Exception.php b/library/vendor/Zend/Locale/Exception.php index 74b12254b..864fdb7de 100644 --- a/library/vendor/Zend/Locale/Exception.php +++ b/library/vendor/Zend/Locale/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Locale/Format.php b/library/vendor/Zend/Locale/Format.php index c74f31714..50851bdfb 100644 --- a/library/vendor/Zend/Locale/Format.php +++ b/library/vendor/Zend/Locale/Format.php @@ -23,7 +23,6 @@ /** * include needed classes */ -require_once 'Zend/Locale/Data.php'; /** * @category Zend @@ -98,7 +97,6 @@ class Zend_Locale_Format } $options['number_format'] = Zend_Locale_Data::getContent($locale, 'decimalnumber'); } else if ((gettype($value) !== 'string') and ($value !== NULL)) { - require_once 'Zend/Locale/Exception.php'; $stringValue = (string)(is_array($value) ? implode(' ', $value) : $value); throw new Zend_Locale_Exception("Unknown number format type '" . gettype($value) . "'. " . "Format '$stringValue' must be a valid number format string."); @@ -113,7 +111,6 @@ class Zend_Locale_Format } $options['date_format'] = Zend_Locale_Format::getDateFormat($locale); } else if ((gettype($value) !== 'string') and ($value !== NULL)) { - require_once 'Zend/Locale/Exception.php'; $stringValue = (string)(is_array($value) ? implode(' ', $value) : $value); throw new Zend_Locale_Exception("Unknown dateformat type '" . gettype($value) . "'. " . "Format '$stringValue' must be a valid ISO or PHP date format string."); @@ -127,7 +124,6 @@ class Zend_Locale_Format case 'format_type' : if (($value != 'php') && ($value != 'iso')) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown date format type '$value'. Only 'iso' and 'php'" . " are supported."); } @@ -135,7 +131,6 @@ class Zend_Locale_Format case 'fix_date' : if (($value !== true) && ($value !== false)) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Enabling correction of dates must be either true or false" . "(fix_date='$value')."); } @@ -163,13 +158,11 @@ class Zend_Locale_Format } if (($value < -1) || ($value > 30)) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("'$value' precision is not a whole number less than 30."); } break; default: - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown option: '$name' = '$value'"); break; @@ -204,7 +197,6 @@ class Zend_Locale_Format $from = strtolower($from); $source = Zend_Locale_Data::getContent('en', 'numberingsystem', $from); if (empty($source)) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown script '$from'. Use 'Latn' for digits 0,1,2,3,4,5,6,7,8,9."); } @@ -212,7 +204,6 @@ class Zend_Locale_Format $to = strtolower($to); $target = Zend_Locale_Data::getContent('en', 'numberingsystem', $to); if (empty($target)) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown script '$to'. Use 'Latn' for digits 0,1,2,3,4,5,6,7,8,9."); } } else { @@ -251,7 +242,6 @@ class Zend_Locale_Format } if (!self::isNumber($input, $options)) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception('No localized value in ' . $input . ' found, or the given number does not match the localized format'); } @@ -300,7 +290,6 @@ class Zend_Locale_Format public static function toNumber($value, array $options = array()) { // load class within method for speed - require_once 'Zend/Locale/Math.php'; $value = Zend_Locale_Math::floatalize($value); $value = Zend_Locale_Math::normalize($value); @@ -346,7 +335,6 @@ class Zend_Locale_Format if (iconv_strpos($format, '0') === false) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception('Wrong format... missing 0'); } @@ -889,7 +877,6 @@ class Zend_Locale_Format if (empty($parse)) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown date format, neither date nor time in '" . $format . "' found"); } ksort($parse); @@ -909,7 +896,6 @@ class Zend_Locale_Format if (count($splitted[0]) == 0) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("No date part in '$date' found."); } if (count($splitted[0]) == 1) { @@ -1015,7 +1001,6 @@ class Zend_Locale_Format (isset($result['year']) and (iconv_strpos($date, $result['year']) === false)))) { if ($options['fix_date'] !== true) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (false month, $position, $month)"); } @@ -1031,7 +1016,6 @@ class Zend_Locale_Format if ($result['day'] > 31) { if ($options['fix_date'] !== true) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (d <> y)"); } @@ -1047,7 +1031,6 @@ class Zend_Locale_Format if ($result['month'] > 31) { if ($options['fix_date'] !== true) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (M <> y)"); } @@ -1063,7 +1046,6 @@ class Zend_Locale_Format if ($result['month'] > 12) { if ($options['fix_date'] !== true || $result['month'] > 31) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (M <> d)"); } @@ -1131,7 +1113,6 @@ class Zend_Locale_Format { $format = Zend_Locale_Data::getContent($locale, 'date'); if (empty($format)) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("failed to receive data from locale $locale"); } @@ -1231,7 +1212,6 @@ class Zend_Locale_Format { $format = Zend_Locale_Data::getContent($locale, 'time'); if (empty($format)) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("failed to receive data from locale $locale"); } return $format; @@ -1270,7 +1250,6 @@ class Zend_Locale_Format { $format = Zend_Locale_Data::getContent($locale, 'datetime'); if (empty($format)) { - require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("failed to receive data from locale $locale"); } return $format; diff --git a/library/vendor/Zend/Locale/Math.php b/library/vendor/Zend/Locale/Math.php index 98f491e16..a82814c38 100644 --- a/library/vendor/Zend/Locale/Math.php +++ b/library/vendor/Zend/Locale/Math.php @@ -350,6 +350,5 @@ class Zend_Locale_Math if (!extension_loaded('bcmath') || (defined('TESTS_ZEND_LOCALE_BCMATH_ENABLED') && !TESTS_ZEND_LOCALE_BCMATH_ENABLED) ) { - require_once 'Zend/Locale/Math/PhpMath.php'; Zend_Locale_Math_PhpMath::disable(); } diff --git a/library/vendor/Zend/Locale/Math/Exception.php b/library/vendor/Zend/Locale/Math/Exception.php index ef949ca4a..0c9662cc6 100644 --- a/library/vendor/Zend/Locale/Math/Exception.php +++ b/library/vendor/Zend/Locale/Math/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Exception */ -require_once 'Zend/Locale/Exception.php'; /** diff --git a/library/vendor/Zend/Locale/Math/PhpMath.php b/library/vendor/Zend/Locale/Math/PhpMath.php index a2c296319..82025f2b0 100644 --- a/library/vendor/Zend/Locale/Math/PhpMath.php +++ b/library/vendor/Zend/Locale/Math/PhpMath.php @@ -70,7 +70,6 @@ class Zend_Locale_Math_PhpMath extends Zend_Locale_Math $op2 = self::normalize($op2); $result = $op1 + $op2; if (is_infinite($result) or (abs($result - $op2 - $op1) > $precision)) { - require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("addition overflow: $op1 + $op2 != $result", $op1, $op2, $result); } @@ -93,7 +92,6 @@ class Zend_Locale_Math_PhpMath extends Zend_Locale_Math $op2 = self::normalize($op2); $result = $op1 - $op2; if (is_infinite($result) or (abs($result + $op2 - $op1) > $precision)) { - require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("subtraction overflow: $op1 - $op2 != $result", $op1, $op2, $result); } @@ -115,7 +113,6 @@ class Zend_Locale_Math_PhpMath extends Zend_Locale_Math $result = pow($op1, $op2); if (is_infinite($result) or is_nan($result)) { - require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("power overflow: $op1 ^ $op2", $op1, $op2, $result); } @@ -135,7 +132,6 @@ class Zend_Locale_Math_PhpMath extends Zend_Locale_Math $op2 = self::normalize($op2); $result = $op1 * $op2; if (is_infinite($result) or is_nan($result)) { - require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("multiplication overflow: $op1 * $op2 != $result", $op1, $op2, $result); } @@ -149,7 +145,6 @@ class Zend_Locale_Math_PhpMath extends Zend_Locale_Math } if (empty($op2)) { - require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("can not divide by zero", $op1, $op2, null); } if (empty($op1)) { @@ -159,7 +154,6 @@ class Zend_Locale_Math_PhpMath extends Zend_Locale_Math $op2 = self::normalize($op2); $result = $op1 / $op2; if (is_infinite($result) or is_nan($result)) { - require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("division overflow: $op1 / $op2 != $result", $op1, $op2, $result); } @@ -199,7 +193,6 @@ class Zend_Locale_Math_PhpMath extends Zend_Locale_Math } $result = $op1 % $op2; if (is_nan($result) or (($op1 - $result) % $op2 != 0)) { - require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("modulus calculation error: $op1 % $op2 != $result", $op1, $op2, $result); } @@ -235,7 +228,6 @@ class Zend_Locale_Math_PhpMath extends Zend_Locale_Math public static function Scale($scale) { if ($scale > 9) { - require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("can not scale to precision $scale", $scale, null, null); } self::$defaultScale = $scale; diff --git a/library/vendor/Zend/Log.php b/library/vendor/Zend/Log.php index f18f967df..d2d6bc692 100644 --- a/library/vendor/Zend/Log.php +++ b/library/vendor/Zend/Log.php @@ -132,7 +132,6 @@ class Zend_Log if (!is_array($config) || empty($config)) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Configuration must be an array or instance of Zend_Config'); } @@ -147,7 +146,6 @@ class Zend_Log if (!$log instanceof Zend_Log) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Passed className does not belong to a descendant of Zend_Log'); } @@ -186,7 +184,6 @@ class Zend_Log ? get_class($writer) : 'The specified writer'; /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("{$writerName} does not extend Zend_Log_Writer_Abstract!"); } @@ -219,7 +216,6 @@ class Zend_Log ? get_class($filter) : 'The specified filter'; /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("{$filterName} does not implement Zend_Log_Filter_Interface"); } @@ -242,7 +238,6 @@ class Zend_Log ? get_class($formatter) : 'The specified formatter'; /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception($formatterName . ' does not implement Zend_Log_Formatter_Interface'); } @@ -265,7 +260,6 @@ class Zend_Log } if (!is_array($config) || empty($config)) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( 'Configuration must be an array or instance of Zend_Config' ); @@ -274,13 +268,11 @@ class Zend_Log $params = isset($config[ $type .'Params' ]) ? $config[ $type .'Params' ] : array(); $className = $this->getClassName($config, $type, $namespace); if (!class_exists($className)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($className); } $reflection = new ReflectionClass($className); if (!$reflection->implementsInterface('Zend_Log_FactoryInterface')) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( $className . ' does not implement Zend_Log_FactoryInterface and can not be constructed from config.' ); @@ -301,7 +293,6 @@ class Zend_Log protected function getClassName($config, $type, $defaultNamespace) { if (!isset($config[$type . 'Name'])) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("Specify {$type}Name in the configuration array"); } @@ -374,7 +365,6 @@ class Zend_Log switch (count($params)) { case 0: /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Missing log message'); case 1: $message = array_shift($params); @@ -388,7 +378,6 @@ class Zend_Log $this->log($message, $priority, $extras); } else { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Bad log priority'); } } @@ -407,13 +396,11 @@ class Zend_Log // sanity checks if (empty($this->_writers)) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('No writers were added'); } if (! isset($this->_priorities[$priority])) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Bad log priority'); } @@ -467,7 +454,6 @@ class Zend_Log if (isset($this->_priorities[$priority]) || false !== array_search($name, $this->_priorities)) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Existing priorities cannot be overwritten'); } @@ -488,7 +474,6 @@ class Zend_Log { if (is_int($filter)) { /** @see Zend_Log_Filter_Priority */ - require_once 'Zend/Log/Filter/Priority.php'; $filter = new Zend_Log_Filter_Priority($filter); } elseif ($filter instanceof Zend_Config || is_array($filter)) { @@ -496,7 +481,6 @@ class Zend_Log } elseif(! $filter instanceof Zend_Log_Filter_Interface) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Invalid filter provided'); } @@ -519,7 +503,6 @@ class Zend_Log if (!$writer instanceof Zend_Log_Writer_Abstract) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( 'Writer must be an instance of Zend_Log_Writer_Abstract' . ' or you should pass a configuration array' diff --git a/library/vendor/Zend/Log/Exception.php b/library/vendor/Zend/Log/Exception.php index fedc56e77..5dbf39cdb 100644 --- a/library/vendor/Zend/Log/Exception.php +++ b/library/vendor/Zend/Log/Exception.php @@ -20,7 +20,6 @@ */ /** Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Log/Filter/Abstract.php b/library/vendor/Zend/Log/Filter/Abstract.php index d3ec6bbe9..0e2a61ef7 100644 --- a/library/vendor/Zend/Log/Filter/Abstract.php +++ b/library/vendor/Zend/Log/Filter/Abstract.php @@ -21,10 +21,8 @@ */ /** @see Zend_Log_Filter_Interface */ -require_once 'Zend/Log/Filter/Interface.php'; /** @see Zend_Log_FactoryInterface */ -require_once 'Zend/Log/FactoryInterface.php'; /** * @category Zend @@ -51,7 +49,6 @@ abstract class Zend_Log_Filter_Abstract } if (!is_array($config)) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Configuration must be an array or instance of Zend_Config'); } diff --git a/library/vendor/Zend/Log/Filter/Message.php b/library/vendor/Zend/Log/Filter/Message.php index 671d87e4f..c8ef242b0 100644 --- a/library/vendor/Zend/Log/Filter/Message.php +++ b/library/vendor/Zend/Log/Filter/Message.php @@ -21,7 +21,6 @@ */ /** Zend_Log_Filter_Abstract */ -require_once 'Zend/Log/Filter/Abstract.php'; /** * @category Zend @@ -48,7 +47,6 @@ class Zend_Log_Filter_Message extends Zend_Log_Filter_Abstract public function __construct($regexp) { if (@preg_match($regexp, '') === false) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("Invalid regular expression '$regexp'"); } $this->_regexp = $regexp; diff --git a/library/vendor/Zend/Log/Filter/Priority.php b/library/vendor/Zend/Log/Filter/Priority.php index c8733b61b..eeb086f72 100644 --- a/library/vendor/Zend/Log/Filter/Priority.php +++ b/library/vendor/Zend/Log/Filter/Priority.php @@ -21,7 +21,6 @@ */ /** Zend_Log_Filter_Abstract */ -require_once 'Zend/Log/Filter/Abstract.php'; /** * @category Zend @@ -55,7 +54,6 @@ class Zend_Log_Filter_Priority extends Zend_Log_Filter_Abstract public function __construct($priority, $operator = null) { if (! is_int($priority)) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Priority must be an integer'); } diff --git a/library/vendor/Zend/Log/Filter/Suppress.php b/library/vendor/Zend/Log/Filter/Suppress.php index 162763a20..e60a46416 100644 --- a/library/vendor/Zend/Log/Filter/Suppress.php +++ b/library/vendor/Zend/Log/Filter/Suppress.php @@ -21,7 +21,6 @@ */ /** Zend_Log_Filter_Interface */ -require_once 'Zend/Log/Filter/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Log/Formatter/Abstract.php b/library/vendor/Zend/Log/Formatter/Abstract.php index eeed23da2..ab858464d 100644 --- a/library/vendor/Zend/Log/Formatter/Abstract.php +++ b/library/vendor/Zend/Log/Formatter/Abstract.php @@ -21,10 +21,8 @@ */ /** @see Zend_Log_Formatter_Interface */ -require_once 'Zend/Log/Formatter/Interface.php'; /** @see Zend_Log_FactoryInterface */ -require_once 'Zend/Log/FactoryInterface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Log/Formatter/Firebug.php b/library/vendor/Zend/Log/Formatter/Firebug.php index 88d46219b..501ecf5b8 100644 --- a/library/vendor/Zend/Log/Formatter/Firebug.php +++ b/library/vendor/Zend/Log/Formatter/Firebug.php @@ -21,7 +21,6 @@ */ /** Zend_Log_Formatter_Abstract */ -require_once 'Zend/Log/Formatter/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Log/Formatter/Simple.php b/library/vendor/Zend/Log/Formatter/Simple.php index 7cd6d4fbc..fa2a24711 100644 --- a/library/vendor/Zend/Log/Formatter/Simple.php +++ b/library/vendor/Zend/Log/Formatter/Simple.php @@ -21,7 +21,6 @@ */ /** Zend_Log_Formatter_Abstract */ -require_once 'Zend/Log/Formatter/Abstract.php'; /** * @category Zend @@ -54,7 +53,6 @@ class Zend_Log_Formatter_Simple extends Zend_Log_Formatter_Abstract } if (!is_string($format)) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Format must be a string'); } diff --git a/library/vendor/Zend/Log/Formatter/Xml.php b/library/vendor/Zend/Log/Formatter/Xml.php index 9e8f3172a..162db6ce3 100644 --- a/library/vendor/Zend/Log/Formatter/Xml.php +++ b/library/vendor/Zend/Log/Formatter/Xml.php @@ -21,7 +21,6 @@ */ /** Zend_Log_Formatter_Abstract */ -require_once 'Zend/Log/Formatter/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Log/Writer/Abstract.php b/library/vendor/Zend/Log/Writer/Abstract.php index f491eba22..019ad1524 100644 --- a/library/vendor/Zend/Log/Writer/Abstract.php +++ b/library/vendor/Zend/Log/Writer/Abstract.php @@ -21,7 +21,6 @@ */ /** Zend_Log_Filter_Priority */ -require_once 'Zend/Log/Filter/Priority.php'; /** * @category Zend @@ -59,7 +58,6 @@ abstract class Zend_Log_Writer_Abstract implements Zend_Log_FactoryInterface if (!$filter instanceof Zend_Log_Filter_Interface) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Invalid filter provided'); } @@ -127,7 +125,6 @@ abstract class Zend_Log_Writer_Abstract implements Zend_Log_FactoryInterface } if (!is_array($config)) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( 'Configuration must be an array or instance of Zend_Config' ); diff --git a/library/vendor/Zend/Log/Writer/Db.php b/library/vendor/Zend/Log/Writer/Db.php index 71ba2e289..bd5c28faa 100644 --- a/library/vendor/Zend/Log/Writer/Db.php +++ b/library/vendor/Zend/Log/Writer/Db.php @@ -21,7 +21,6 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend @@ -103,7 +102,6 @@ class Zend_Log_Writer_Db extends Zend_Log_Writer_Abstract */ public function setFormatter(Zend_Log_Formatter_Interface $formatter) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception(get_class($this) . ' does not support formatting'); } @@ -127,7 +125,6 @@ class Zend_Log_Writer_Db extends Zend_Log_Writer_Abstract protected function _write($event) { if ($this->_db === null) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Database adapter is null'); } diff --git a/library/vendor/Zend/Log/Writer/Firebug.php b/library/vendor/Zend/Log/Writer/Firebug.php index 59c591a9b..1458bfc82 100644 --- a/library/vendor/Zend/Log/Writer/Firebug.php +++ b/library/vendor/Zend/Log/Writer/Firebug.php @@ -21,16 +21,12 @@ */ /** Zend_Log */ -require_once 'Zend/Log.php'; /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Formatter_Firebug */ -require_once 'Zend/Log/Formatter/Firebug.php'; /** Zend_Wildfire_Plugin_FirePhp */ -require_once 'Zend/Wildfire/Plugin/FirePhp.php'; /** * Writes log messages to the Firebug Console via FirePHP. diff --git a/library/vendor/Zend/Log/Writer/Mail.php b/library/vendor/Zend/Log/Writer/Mail.php index 3c57f62ed..23520355c 100644 --- a/library/vendor/Zend/Log/Writer/Mail.php +++ b/library/vendor/Zend/Log/Writer/Mail.php @@ -21,13 +21,10 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Exception */ -require_once 'Zend/Log/Exception.php'; /** Zend_Log_Formatter_Simple*/ -require_once 'Zend/Log/Formatter/Simple.php'; /** * Class used for writing log messages to email via Zend_Mail. @@ -172,7 +169,6 @@ class Zend_Log_Writer_Mail extends Zend_Log_Writer_Abstract } if (!$layout instanceof Zend_Layout) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Mail must be an instance of Zend_Layout or an array'); } $this->_layout = $layout; diff --git a/library/vendor/Zend/Log/Writer/Mock.php b/library/vendor/Zend/Log/Writer/Mock.php index 92072fc69..7999ab593 100644 --- a/library/vendor/Zend/Log/Writer/Mock.php +++ b/library/vendor/Zend/Log/Writer/Mock.php @@ -21,7 +21,6 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Log/Writer/Null.php b/library/vendor/Zend/Log/Writer/Null.php index 270444e1c..f8510ed7a 100644 --- a/library/vendor/Zend/Log/Writer/Null.php +++ b/library/vendor/Zend/Log/Writer/Null.php @@ -21,7 +21,6 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Log/Writer/Stream.php b/library/vendor/Zend/Log/Writer/Stream.php index 935356add..58adb85aa 100644 --- a/library/vendor/Zend/Log/Writer/Stream.php +++ b/library/vendor/Zend/Log/Writer/Stream.php @@ -21,10 +21,8 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Formatter_Simple */ -require_once 'Zend/Log/Formatter/Simple.php'; /** * @category Zend @@ -60,12 +58,10 @@ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract if (is_resource($streamOrUrl)) { if (get_resource_type($streamOrUrl) != 'stream') { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Resource is not a stream'); } if ($mode != 'a') { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Mode cannot be changed on existing streams'); } @@ -76,7 +72,6 @@ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract } if (! $this->_stream = @fopen($streamOrUrl, $mode, false)) { - require_once 'Zend/Log/Exception.php'; $msg = "\"$streamOrUrl\" cannot be opened with mode \"$mode\""; throw new Zend_Log_Exception($msg); } @@ -131,7 +126,6 @@ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract $line = $this->_formatter->format($event); if (false === @fwrite($this->_stream, $line)) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("Unable to write to stream"); } } diff --git a/library/vendor/Zend/Log/Writer/Syslog.php b/library/vendor/Zend/Log/Writer/Syslog.php index 46ef3c71f..a96951100 100644 --- a/library/vendor/Zend/Log/Writer/Syslog.php +++ b/library/vendor/Zend/Log/Writer/Syslog.php @@ -21,10 +21,8 @@ */ /** Zend_Log */ -require_once 'Zend/Log.php'; /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; /** * Writes log messages to syslog @@ -195,14 +193,12 @@ class Zend_Log_Writer_Syslog extends Zend_Log_Writer_Abstract } if (!in_array($facility, $this->_validFacilities)) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Invalid log facility provided; please see http://php.net/openlog for a list of valid facility values'); } if ('WIN' == strtoupper(substr(PHP_OS, 0, 3)) && ($facility !== LOG_USER) ) { - require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Only LOG_USER is a valid log facility on Windows'); } diff --git a/library/vendor/Zend/Log/Writer/ZendMonitor.php b/library/vendor/Zend/Log/Writer/ZendMonitor.php index 2ff1908db..cc0d24b99 100644 --- a/library/vendor/Zend/Log/Writer/ZendMonitor.php +++ b/library/vendor/Zend/Log/Writer/ZendMonitor.php @@ -21,7 +21,6 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mail.php b/library/vendor/Zend/Mail.php index abe4b2647..518e89831 100644 --- a/library/vendor/Zend/Mail.php +++ b/library/vendor/Zend/Mail.php @@ -23,22 +23,18 @@ /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; /** * @see Zend_Mime_Message */ -require_once 'Zend/Mime/Message.php'; /** * @see Zend_Mime_Part */ -require_once 'Zend/Mime/Part.php'; /** @@ -248,7 +244,6 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Invalid content type "' . $type . '"'); } @@ -342,7 +337,6 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Invalid encoding "' . $encoding . '"'); } $this->_headerEncoding = $encoding; @@ -676,7 +670,6 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('From Header set twice'); } @@ -702,7 +695,6 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Reply-To Header set twice'); } @@ -800,7 +792,6 @@ class Zend_Mail extends Zend_Mime_Message public function setFromToDefaultFrom() { $from = self::getDefaultFrom(); if($from === null) { - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception( 'No default From Address set to use'); } @@ -850,7 +841,6 @@ class Zend_Mail extends Zend_Mime_Message public function setReplyToFromDefault() { $replyTo = self::getDefaultReplyTo(); if($replyTo === null) { - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception( 'No default Reply-To Address set to use'); } @@ -877,7 +867,6 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Return-Path Header set twice'); } return $this; @@ -929,7 +918,6 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Subject set twice'); } return $this; @@ -978,7 +966,6 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('String representations of Date Header must be ' . 'strtotime()-compatible'); } @@ -989,7 +976,6 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception(__METHOD__ . ' only accepts UNIX timestamps, Zend_Date objects, ' . ' and strtotime()-compatible strings'); } @@ -999,7 +985,6 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Date Header set twice'); } return $this; @@ -1055,7 +1040,6 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Message-ID set twice'); } @@ -1139,7 +1123,6 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Cannot set standard header from addHeader()'); } @@ -1172,7 +1155,6 @@ class Zend_Mail extends Zend_Mime_Message { if ($transport === null) { if (! self::$_defaultTransport instanceof Zend_Mail_Transport_Abstract) { - require_once 'Zend/Mail/Transport/Sendmail.php'; $transport = new Zend_Mail_Transport_Sendmail(); } else { $transport = self::$_defaultTransport; diff --git a/library/vendor/Zend/Mail/Exception.php b/library/vendor/Zend/Mail/Exception.php index 47311242b..33a68f186 100644 --- a/library/vendor/Zend/Mail/Exception.php +++ b/library/vendor/Zend/Mail/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Mail/Message.php b/library/vendor/Zend/Mail/Message.php index 331bda9a5..3f819d102 100644 --- a/library/vendor/Zend/Mail/Message.php +++ b/library/vendor/Zend/Mail/Message.php @@ -23,12 +23,10 @@ /** * Zend_Mail_Part */ -require_once 'Zend/Mail/Part.php'; /** * Zend_Mail_Message_Interface */ -require_once 'Zend/Mail/Message/Interface.php'; /** * @category Zend @@ -63,7 +61,6 @@ class Zend_Mail_Message extends Zend_Mail_Part implements Zend_Mail_Message_Inte /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('could not open file'); } } else { diff --git a/library/vendor/Zend/Mail/Message/File.php b/library/vendor/Zend/Mail/Message/File.php index bee3ebbfb..9ef6635ec 100644 --- a/library/vendor/Zend/Mail/Message/File.php +++ b/library/vendor/Zend/Mail/Message/File.php @@ -23,12 +23,10 @@ /** * Zend_Mail_Part */ -require_once 'Zend/Mail/Part/File.php'; /** * Zend_Mail_Message_Interface */ -require_once 'Zend/Mail/Message/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mail/Part.php b/library/vendor/Zend/Mail/Part.php index b2a8b5b28..c5a9aa0f3 100644 --- a/library/vendor/Zend/Mail/Part.php +++ b/library/vendor/Zend/Mail/Part.php @@ -23,12 +23,10 @@ /** * @see Zend_Mime_Decode */ -require_once 'Zend/Mime/Decode.php'; /** * @see Zend_Mail_Part_Interface */ -require_once 'Zend/Mail/Part/Interface.php'; /** @@ -114,14 +112,12 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('handler is not a valid mail handler'); } if (!isset($params['id'])) { /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('need a message id with a handler'); } @@ -162,14 +158,12 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception("Class '{$class}' does not exist"); } if ( !is_subclass_of($class, 'Zend_Mail_Part_Interface') ) { /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception("Class '{$class}' must implement Zend_Mail_Part_Interface"); } @@ -224,7 +218,6 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no content'); } } @@ -264,7 +257,6 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no boundary found in content type to split message'); } $parts = Zend_Mime_Decode::splitMessageStruct($this->_content, $boundary); @@ -295,7 +287,6 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } @@ -310,7 +301,6 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } @@ -392,7 +382,6 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception("no Header with Name $name or $lowerName found"); } } diff --git a/library/vendor/Zend/Mail/Part/File.php b/library/vendor/Zend/Mail/Part/File.php index e96bdcd63..76b4a51b8 100644 --- a/library/vendor/Zend/Mail/Part/File.php +++ b/library/vendor/Zend/Mail/Part/File.php @@ -23,12 +23,10 @@ /** * @see Zend_Mime_Decode */ -require_once 'Zend/Mime/Decode.php'; /** * @see Zend_Mail_Part */ -require_once 'Zend/Mail/Part.php'; /** @@ -60,7 +58,6 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no file given in params'); } @@ -73,7 +70,6 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('could not open file'); } if (isset($params['startPos'])) { @@ -103,7 +99,6 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no boundary found in content type to split message'); } @@ -119,7 +114,6 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('error reading file'); } @@ -188,7 +182,6 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } diff --git a/library/vendor/Zend/Mail/Protocol/Abstract.php b/library/vendor/Zend/Mail/Protocol/Abstract.php index 8b54b9d42..f7784d7bb 100644 --- a/library/vendor/Zend/Mail/Protocol/Abstract.php +++ b/library/vendor/Zend/Mail/Protocol/Abstract.php @@ -25,13 +25,11 @@ /** * @see Zend_Validate */ -require_once 'Zend/Validate.php'; /** * @see Zend_Validate_Hostname */ -require_once 'Zend/Validate/Hostname.php'; /** @@ -141,7 +139,6 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); } @@ -273,7 +270,6 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($errorStr); } @@ -281,7 +277,6 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Could not set stream timeout'); } @@ -315,7 +310,6 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No connection has been established to ' . $this->_host); } @@ -330,7 +324,6 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Could not send request to ' . $this->_host); } @@ -351,7 +344,6 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No connection has been established to ' . $this->_host); } @@ -373,7 +365,6 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($this->_host . ' has timed out'); } @@ -381,7 +372,6 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Could not read from ' . $this->_host); } @@ -427,7 +417,6 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($errMsg, $cmd); } diff --git a/library/vendor/Zend/Mail/Protocol/Exception.php b/library/vendor/Zend/Mail/Protocol/Exception.php index 4d14b7e4c..17f223cda 100644 --- a/library/vendor/Zend/Mail/Protocol/Exception.php +++ b/library/vendor/Zend/Mail/Protocol/Exception.php @@ -24,7 +24,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Mail/Exception.php'; /** diff --git a/library/vendor/Zend/Mail/Protocol/Imap.php b/library/vendor/Zend/Mail/Protocol/Imap.php index eee2161db..55f5f6254 100644 --- a/library/vendor/Zend/Mail/Protocol/Imap.php +++ b/library/vendor/Zend/Mail/Protocol/Imap.php @@ -96,7 +96,6 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot connect to host; error = ' . $errstr . ' (errno = ' . $errno . ' )'); } @@ -105,7 +104,6 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('host doesn\'t allow connection'); } @@ -116,7 +114,6 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot enable TLS'); } } @@ -135,7 +132,6 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot read - connection closed?'); } @@ -348,14 +344,12 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot write - connection closed?'); } if (!$this->_assumedNextLine('+ ')) { /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot send literal string'); } $line = $token[1]; @@ -368,7 +362,6 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot write - connection closed?'); } } @@ -629,7 +622,6 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('the single id was not found in response'); } diff --git a/library/vendor/Zend/Mail/Protocol/Pop3.php b/library/vendor/Zend/Mail/Protocol/Pop3.php index ca3171727..5d6496f6c 100644 --- a/library/vendor/Zend/Mail/Protocol/Pop3.php +++ b/library/vendor/Zend/Mail/Protocol/Pop3.php @@ -105,7 +105,6 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot connect to host; error = ' . $errstr . ' (errno = ' . $errno . ' )'); } @@ -127,7 +126,6 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot enable TLS'); } } @@ -150,7 +148,6 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('send failed - connection closed?'); } } @@ -170,7 +167,6 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('read failed - connection closed?'); } @@ -186,7 +182,6 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('last request failed'); } @@ -385,7 +380,6 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('top not supported and no fallback wanted'); } } diff --git a/library/vendor/Zend/Mail/Protocol/Smtp.php b/library/vendor/Zend/Mail/Protocol/Smtp.php index 221442e88..3dcc8a611 100644 --- a/library/vendor/Zend/Mail/Protocol/Smtp.php +++ b/library/vendor/Zend/Mail/Protocol/Smtp.php @@ -25,13 +25,11 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; /** * @see Zend_Mail_Protocol_Abstract */ -require_once 'Zend/Mail/Protocol/Abstract.php'; /** @@ -140,7 +138,6 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($config['ssl'] . ' is unsupported SSL type'); break; } @@ -182,7 +179,6 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Cannot issue HELO to existing session'); } @@ -191,7 +187,6 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); } @@ -207,7 +202,6 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Unable to connect via TLS'); } $this->_ehlo($host); @@ -253,7 +247,6 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('A valid session has not been started'); } @@ -280,7 +273,6 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No sender reverse path has been supplied'); } @@ -305,7 +297,6 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No recipient forward path has been supplied'); } @@ -403,7 +394,6 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Already authenticated for this session'); } } diff --git a/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php b/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php index 395744e21..7bd276bca 100644 --- a/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php +++ b/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php @@ -24,7 +24,6 @@ /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; /** diff --git a/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Login.php b/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Login.php index 2aefac71a..3d68f0270 100644 --- a/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Login.php +++ b/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Login.php @@ -24,7 +24,6 @@ /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; /** diff --git a/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Plain.php b/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Plain.php index a0c50f274..063244f86 100644 --- a/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Plain.php +++ b/library/vendor/Zend/Mail/Protocol/Smtp/Auth/Plain.php @@ -24,7 +24,6 @@ /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; /** diff --git a/library/vendor/Zend/Mail/Storage/Abstract.php b/library/vendor/Zend/Mail/Storage/Abstract.php index 4dc55c215..228da9965 100644 --- a/library/vendor/Zend/Mail/Storage/Abstract.php +++ b/library/vendor/Zend/Mail/Storage/Abstract.php @@ -82,7 +82,6 @@ abstract class Zend_Mail_Storage_Abstract implements Countable, ArrayAccess, See /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception($var . ' not found'); } @@ -264,7 +263,6 @@ abstract class Zend_Mail_Storage_Abstract implements Countable, ArrayAccess, See /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot write mail messages via array access'); } diff --git a/library/vendor/Zend/Mail/Storage/Exception.php b/library/vendor/Zend/Mail/Storage/Exception.php index 1ddb2c4db..39f201e7e 100644 --- a/library/vendor/Zend/Mail/Storage/Exception.php +++ b/library/vendor/Zend/Mail/Storage/Exception.php @@ -24,7 +24,6 @@ /** * @see Zend_Mail_Exception */ -require_once 'Zend/Mail/Exception.php'; /** diff --git a/library/vendor/Zend/Mail/Storage/Folder.php b/library/vendor/Zend/Mail/Storage/Folder.php index 4b352eac5..26ca89923 100644 --- a/library/vendor/Zend/Mail/Storage/Folder.php +++ b/library/vendor/Zend/Mail/Storage/Folder.php @@ -154,7 +154,6 @@ class Zend_Mail_Storage_Folder implements RecursiveIterator /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("no subfolder named $name"); } diff --git a/library/vendor/Zend/Mail/Storage/Folder/Maildir.php b/library/vendor/Zend/Mail/Storage/Folder/Maildir.php index ff28922a7..8f63f87c4 100644 --- a/library/vendor/Zend/Mail/Storage/Folder/Maildir.php +++ b/library/vendor/Zend/Mail/Storage/Folder/Maildir.php @@ -24,17 +24,14 @@ /** * @see Zend_Mail_Storage_Folder */ -require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Maildir */ -require_once 'Zend/Mail/Storage/Maildir.php'; /** @@ -90,7 +87,6 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -123,7 +119,6 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("can't read folders in maildir"); } $dirs = array(); @@ -152,7 +147,6 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while reading maildir'); } array_push($stack, $parent); @@ -171,7 +165,6 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while reading maildir'); } } @@ -208,7 +201,6 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("folder $rootFolder not found"); } return $currentFolder; @@ -238,7 +230,6 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable", 0, $e); } // seems like file has vanished; rebuilding folder tree - but it's still an exception @@ -246,7 +237,6 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('seems like the maildir has vanished, I\'ve rebuild the ' . 'folder tree, search for an other folder and try again', 0, $e); } diff --git a/library/vendor/Zend/Mail/Storage/Folder/Mbox.php b/library/vendor/Zend/Mail/Storage/Folder/Mbox.php index 483b046a9..dd91595ba 100644 --- a/library/vendor/Zend/Mail/Storage/Folder/Mbox.php +++ b/library/vendor/Zend/Mail/Storage/Folder/Mbox.php @@ -24,17 +24,14 @@ /** * @see Zend_Mail_Storage_Folder */ -require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Mbox */ -require_once 'Zend/Mail/Storage/Mbox.php'; /** @@ -86,7 +83,6 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('use Zend_Mail_Storage_Mbox for a single file'); } @@ -94,7 +90,6 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -130,7 +125,6 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("can't read dir $currentDir"); } while (($entry = readdir($dh)) !== false) { @@ -182,7 +176,6 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("folder $rootFolder not found"); } return $currentFolder; @@ -212,7 +205,6 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable", 0, $e); } // seems like file has vanished; rebuilding folder tree - but it's still an exception @@ -220,7 +212,6 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('seems like the mbox file has vanished, I\'ve rebuild the ' . 'folder tree, search for an other folder and try again', 0, $e); } diff --git a/library/vendor/Zend/Mail/Storage/Imap.php b/library/vendor/Zend/Mail/Storage/Imap.php index 102d749ec..e1864461c 100644 --- a/library/vendor/Zend/Mail/Storage/Imap.php +++ b/library/vendor/Zend/Mail/Storage/Imap.php @@ -24,37 +24,30 @@ /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Protocol_Imap */ -require_once 'Zend/Mail/Protocol/Imap.php'; /** * @see Zend_Mail_Storage_Writable_Interface */ -require_once 'Zend/Mail/Storage/Writable/Interface.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Folder */ -require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Message */ -require_once 'Zend/Mail/Message.php'; /** * @see Zend_Mail_Storage */ -require_once 'Zend/Mail/Storage.php'; /** * @category Zend @@ -116,7 +109,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('No selected folder to count'); } @@ -189,7 +181,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -213,7 +204,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -250,7 +240,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot select INBOX, is this a valid transport?', 0, $e); } return; @@ -260,7 +249,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('need at least user in params'); } @@ -275,7 +263,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot login, user or password wrong'); } $this->selectFolder(isset($params->folder) ? $params->folder : 'INBOX'); @@ -305,7 +292,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not do nothing'); } } @@ -325,7 +311,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot set deleted flag'); } // TODO: expunge here or at close? we can handle an error here better and are more fail safe @@ -333,7 +318,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('message marked as deleted, but could not expunge'); } } @@ -379,7 +363,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } @@ -399,7 +382,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('folder not found'); } @@ -437,7 +419,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while constructing folder tree'); } } @@ -463,7 +444,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot change folder, maybe it does not exist'); } } @@ -506,7 +486,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot create folder'); } } @@ -528,7 +507,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot delete folder'); } } @@ -553,7 +531,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot rename folder'); } } @@ -582,7 +559,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot create message, please check if the folder exists and your flags'); } } @@ -601,7 +577,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot copy message, does the folder exist?'); } } @@ -636,7 +611,6 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot set flags, have you tried to set the recent flag or special chars?'); } } diff --git a/library/vendor/Zend/Mail/Storage/Maildir.php b/library/vendor/Zend/Mail/Storage/Maildir.php index 3c938cf13..47c791c7c 100644 --- a/library/vendor/Zend/Mail/Storage/Maildir.php +++ b/library/vendor/Zend/Mail/Storage/Maildir.php @@ -24,17 +24,14 @@ /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Message_File */ -require_once 'Zend/Mail/Message/File.php'; /** * @see Zend_Mail_Storage */ -require_once 'Zend/Mail/Storage.php'; /** @@ -122,7 +119,6 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('id does not exist'); } @@ -134,7 +130,6 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('field does not exist'); } @@ -200,7 +195,6 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -234,7 +228,6 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -270,7 +263,6 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -278,7 +270,6 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid maildir given'); } @@ -322,7 +313,6 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open maildir'); } $this->_getMaildirFiles($dh, $dirname . '/cur/'); @@ -336,7 +326,6 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot read recent mails in maildir'); } } @@ -422,7 +411,6 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('maildir is (currently) read-only'); } @@ -469,7 +457,6 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } } diff --git a/library/vendor/Zend/Mail/Storage/Mbox.php b/library/vendor/Zend/Mail/Storage/Mbox.php index 293202e94..4778f1fec 100644 --- a/library/vendor/Zend/Mail/Storage/Mbox.php +++ b/library/vendor/Zend/Mail/Storage/Mbox.php @@ -25,17 +25,14 @@ * @see Zend_Loader * May be used in constructor, but commented out for now */ -// require_once 'Zend/Loader.php'; /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Message_File */ -require_once 'Zend/Mail/Message/File.php'; /** @@ -124,7 +121,6 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('id does not exist'); } @@ -180,7 +176,6 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } $messagePos = $this->_getPos($id); @@ -204,7 +199,6 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } $messagePos = $this->_getPos($id); @@ -229,7 +223,6 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid filename given in params'); } @@ -290,7 +283,6 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open mbox file'); } $this->_filename = $filename; @@ -301,7 +293,6 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('file is not a valid mbox format'); } @@ -362,7 +353,6 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('mbox is read-only'); } @@ -438,7 +428,6 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open mbox file'); } } diff --git a/library/vendor/Zend/Mail/Storage/Pop3.php b/library/vendor/Zend/Mail/Storage/Pop3.php index c027160fa..aa8f7dd70 100644 --- a/library/vendor/Zend/Mail/Storage/Pop3.php +++ b/library/vendor/Zend/Mail/Storage/Pop3.php @@ -24,17 +24,14 @@ /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Protocol_Pop3 */ -require_once 'Zend/Mail/Protocol/Pop3.php'; /** * @see Zend_Mail_Message */ -require_once 'Zend/Mail/Message.php'; /** @@ -112,7 +109,6 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -135,7 +131,6 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -177,7 +172,6 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('need at least user in params'); } @@ -279,7 +273,6 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } diff --git a/library/vendor/Zend/Mail/Storage/Writable/Maildir.php b/library/vendor/Zend/Mail/Storage/Writable/Maildir.php index d1f87f1cc..35c559cd5 100644 --- a/library/vendor/Zend/Mail/Storage/Writable/Maildir.php +++ b/library/vendor/Zend/Mail/Storage/Writable/Maildir.php @@ -24,12 +24,10 @@ /** * @see Zend_Mail_Storage_Folder_Maildir */ -require_once 'Zend/Mail/Storage/Folder/Maildir.php'; /** * @see Zend_Mail_Storage_Writable_Interface */ -require_once 'Zend/Mail/Storage/Writable/Interface.php'; /** @@ -66,7 +64,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('maildir must be a directory if already exists'); } } else { @@ -74,7 +71,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; $dir = dirname($dir); if (!file_exists($dir)) { throw new Zend_Mail_Storage_Exception("parent $dir not found"); @@ -93,7 +89,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not create subdir ' . $subdir); } } @@ -154,7 +149,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('folder already exists'); } @@ -162,7 +156,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid name - folder parts may not be empty'); } @@ -178,7 +171,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid name - no directory seprator allowed in folder name'); } @@ -199,7 +191,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while creating new folder, may be created incompletly'); } @@ -241,7 +232,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('delete children first'); } @@ -249,7 +239,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont delete INBOX'); } @@ -257,7 +246,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont delete selected folder'); } @@ -271,7 +259,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error opening $subdir"); } while (($entry = readdir($dh)) !== false) { @@ -282,7 +269,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error cleaning $subdir"); } } @@ -292,7 +278,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error removing $subdir"); } } @@ -304,7 +289,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error removing maindir"); } @@ -345,7 +329,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('new folder cannot be a child of old folder'); } @@ -356,7 +339,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont rename INBOX'); } @@ -364,7 +346,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont rename selected folder'); } @@ -387,7 +368,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while moving ' . $subdir); } } @@ -442,7 +422,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('problems creating tmp dir'); } } @@ -464,7 +443,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not open temp file'); } break; @@ -476,7 +454,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("tried $max_tries unique ids for a temp file, but all were taken" . ' - giving up'); } @@ -500,7 +477,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('recent flag may not be set'); } @@ -520,7 +496,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unknown flag(s): ' . $wanted_flags); } @@ -545,7 +520,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('storage is over quota!'); } @@ -587,7 +561,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot link message file to final dir'); } @unlink($temp_file['filename']); @@ -618,7 +591,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('storage is over quota!'); } @@ -656,13 +628,11 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot copy message file'); } else if (!link($temp_file['filename'], $new_file)) { /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot link message file to final dir'); } @unlink($temp_file['filename']); @@ -701,7 +671,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('target is current folder'); } @@ -734,7 +703,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot move message file'); } @unlink($temp_file['filename']); @@ -770,7 +738,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot rename file'); } @@ -799,7 +766,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot remove message'); } unset($this->_files[$id - 1]); @@ -839,7 +805,6 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open maildirsize'); } $definition = fgets($fh); diff --git a/library/vendor/Zend/Mail/Transport/Abstract.php b/library/vendor/Zend/Mail/Transport/Abstract.php index bc1c521a3..44ddc1f40 100644 --- a/library/vendor/Zend/Mail/Transport/Abstract.php +++ b/library/vendor/Zend/Mail/Transport/Abstract.php @@ -24,7 +24,6 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; /** @@ -184,7 +183,6 @@ abstract class Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Missing Zend_Mail object in _mail property'); } @@ -213,7 +211,6 @@ abstract class Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Exception('At least one mail header line is too long'); } } @@ -280,7 +277,6 @@ abstract class Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('No body specified'); } @@ -319,7 +315,6 @@ abstract class Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Empty mail cannot be sent'); } diff --git a/library/vendor/Zend/Mail/Transport/Exception.php b/library/vendor/Zend/Mail/Transport/Exception.php index bd9763514..077e120c9 100644 --- a/library/vendor/Zend/Mail/Transport/Exception.php +++ b/library/vendor/Zend/Mail/Transport/Exception.php @@ -24,7 +24,6 @@ /** * @see Zend_Mail_Exception */ -require_once 'Zend/Mail/Exception.php'; /** diff --git a/library/vendor/Zend/Mail/Transport/File.php b/library/vendor/Zend/Mail/Transport/File.php index bacc98b90..666562fec 100644 --- a/library/vendor/Zend/Mail/Transport/File.php +++ b/library/vendor/Zend/Mail/Transport/File.php @@ -23,7 +23,6 @@ /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; /** @@ -106,7 +105,6 @@ class Zend_Mail_Transport_File extends Zend_Mail_Transport_Abstract $file = $this->_path . DIRECTORY_SEPARATOR . call_user_func($this->_callback, $this); if (!is_writable(dirname($file))) { - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception(sprintf( 'Target directory "%s" does not exist or is not writable', dirname($file) @@ -116,7 +114,6 @@ class Zend_Mail_Transport_File extends Zend_Mail_Transport_Abstract $email = $this->header . $this->EOL . $this->body; if (!file_put_contents($file, $email)) { - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Unable to send mail'); } } diff --git a/library/vendor/Zend/Mail/Transport/Sendmail.php b/library/vendor/Zend/Mail/Transport/Sendmail.php index 60bece430..6de19d540 100644 --- a/library/vendor/Zend/Mail/Transport/Sendmail.php +++ b/library/vendor/Zend/Mail/Transport/Sendmail.php @@ -24,7 +24,6 @@ /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; /** @@ -113,7 +112,6 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract * Exception is thrown here because * $parameters is a public property */ - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception( 'Parameters were set but are not a string' ); @@ -133,7 +131,6 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Unable to send mail. ' . $this->_errstr); } } @@ -157,7 +154,6 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('_prepareHeaders requires a registered Zend_Mail object'); } @@ -169,7 +165,6 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Missing To addresses'); } } else { @@ -178,7 +173,6 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Missing To header'); } diff --git a/library/vendor/Zend/Mail/Transport/Smtp.php b/library/vendor/Zend/Mail/Transport/Smtp.php index 78965dd4d..6b856c629 100644 --- a/library/vendor/Zend/Mail/Transport/Smtp.php +++ b/library/vendor/Zend/Mail/Transport/Smtp.php @@ -24,17 +24,14 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; /** @@ -192,7 +189,6 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract $connectionClass .= '_Auth_' . ucwords($this->_auth); } if (!class_exists($connectionClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($connectionClass); } $this->setConnection(new $connectionClass($this->_host, $this->_port, $this->_config)); @@ -231,7 +227,6 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('_prepareHeaders requires a registered Zend_Mail object'); } diff --git a/library/vendor/Zend/Markup.php b/library/vendor/Zend/Markup.php index e5e63e754..671ca1d92 100644 --- a/library/vendor/Zend/Markup.php +++ b/library/vendor/Zend/Markup.php @@ -22,7 +22,6 @@ /** * @see Zend_Loader_PluginLoader */ -require_once 'Zend/Loader/PluginLoader.php'; /** * @category Zend diff --git a/library/vendor/Zend/Markup/Exception.php b/library/vendor/Zend/Markup/Exception.php index b659cc796..45ce1bb7d 100644 --- a/library/vendor/Zend/Markup/Exception.php +++ b/library/vendor/Zend/Markup/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Exception class for Zend_Markup diff --git a/library/vendor/Zend/Markup/Parser/Bbcode.php b/library/vendor/Zend/Markup/Parser/Bbcode.php index f0c963fd1..43f15b62f 100644 --- a/library/vendor/Zend/Markup/Parser/Bbcode.php +++ b/library/vendor/Zend/Markup/Parser/Bbcode.php @@ -23,12 +23,10 @@ /** * @see Zend_Markup_TokenList */ -require_once 'Zend/Markup/TokenList.php'; /** * @see Zend_Markup_Parser_ParserInterface */ -require_once 'Zend/Markup/Parser/ParserInterface.php'; /** * @category Zend @@ -159,7 +157,6 @@ class Zend_Markup_Parser_Bbcode implements Zend_Markup_Parser_ParserInterface /** * @see Zend_Markup_Parser_Exception */ - require_once 'Zend/Markup/Parser/Exception.php'; throw new Zend_Markup_Parser_Exception('Value to parse should be a string.'); } @@ -167,7 +164,6 @@ class Zend_Markup_Parser_Bbcode implements Zend_Markup_Parser_ParserInterface /** * @see Zend_Markup_Parser_Exception */ - require_once 'Zend/Markup/Parser/Exception.php'; throw new Zend_Markup_Parser_Exception('Value to parse cannot be left empty.'); } diff --git a/library/vendor/Zend/Markup/Parser/Exception.php b/library/vendor/Zend/Markup/Parser/Exception.php index 477fbdfa9..d6d103a2e 100644 --- a/library/vendor/Zend/Markup/Parser/Exception.php +++ b/library/vendor/Zend/Markup/Parser/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Markup_Exception */ -require_once 'Zend/Markup/Exception.php'; /** * Exception class for Zend_Markup_Parser diff --git a/library/vendor/Zend/Markup/Renderer/Exception.php b/library/vendor/Zend/Markup/Renderer/Exception.php index b8bfcd988..981d18708 100644 --- a/library/vendor/Zend/Markup/Renderer/Exception.php +++ b/library/vendor/Zend/Markup/Renderer/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Markup_Exception */ -require_once 'Zend/Markup/Exception.php'; /** * Exception class for Zend_Markup_Renderer diff --git a/library/vendor/Zend/Markup/Renderer/Html.php b/library/vendor/Zend/Markup/Renderer/Html.php index 2d1437f9d..1a5aaf5bd 100644 --- a/library/vendor/Zend/Markup/Renderer/Html.php +++ b/library/vendor/Zend/Markup/Renderer/Html.php @@ -23,19 +23,15 @@ /** * @see Zend_Filter_HtmlEntities */ -require_once 'Zend/Filter/HtmlEntities.php'; /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/PregReplace.php'; /** * @see Zend_Filter_Callback */ -require_once 'Zend/Filter/Callback.php'; /** * @see Zend_Markup_Renderer_RendererAbstract */ -require_once 'Zend/Markup/Renderer/RendererAbstract.php'; /** * HTML renderer diff --git a/library/vendor/Zend/Markup/Renderer/Html/Code.php b/library/vendor/Zend/Markup/Renderer/Html/Code.php index 4d3e47c9a..3a7a73ed7 100644 --- a/library/vendor/Zend/Markup/Renderer/Html/Code.php +++ b/library/vendor/Zend/Markup/Renderer/Html/Code.php @@ -23,7 +23,6 @@ /** * @see Zend_Markup_Renderer_Html_HtmlAbstract */ -require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; /** * Tag interface diff --git a/library/vendor/Zend/Markup/Renderer/Html/HtmlAbstract.php b/library/vendor/Zend/Markup/Renderer/Html/HtmlAbstract.php index c87b63bc5..6796e8679 100644 --- a/library/vendor/Zend/Markup/Renderer/Html/HtmlAbstract.php +++ b/library/vendor/Zend/Markup/Renderer/Html/HtmlAbstract.php @@ -23,7 +23,6 @@ /** * @see Zend_Markup_Renderer_TokenConverterInterface */ -require_once 'Zend/Markup/Renderer/TokenConverterInterface.php'; /** * Tag interface diff --git a/library/vendor/Zend/Markup/Renderer/Html/Img.php b/library/vendor/Zend/Markup/Renderer/Html/Img.php index cce2c9c38..47f6d5e5c 100644 --- a/library/vendor/Zend/Markup/Renderer/Html/Img.php +++ b/library/vendor/Zend/Markup/Renderer/Html/Img.php @@ -23,11 +23,9 @@ /** * @see Zend_Markup_Renderer_Html */ -require_once 'Zend/Markup/Renderer/Html.php'; /** * @see Zend_Markup_Renderer_Html_HtmlAbstract */ -require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; /** * Tag interface diff --git a/library/vendor/Zend/Markup/Renderer/Html/List.php b/library/vendor/Zend/Markup/Renderer/Html/List.php index 6f10b0b38..b896d4800 100644 --- a/library/vendor/Zend/Markup/Renderer/Html/List.php +++ b/library/vendor/Zend/Markup/Renderer/Html/List.php @@ -23,7 +23,6 @@ /** * @see Zend_Markup_Renderer_Html_HtmlAbstract */ -require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; /** * Tag interface diff --git a/library/vendor/Zend/Markup/Renderer/Html/Url.php b/library/vendor/Zend/Markup/Renderer/Html/Url.php index 46ed67582..e19352078 100644 --- a/library/vendor/Zend/Markup/Renderer/Html/Url.php +++ b/library/vendor/Zend/Markup/Renderer/Html/Url.php @@ -23,11 +23,9 @@ /** * @see Zend_Markup_Renderer_Html */ -require_once 'Zend/Markup/Renderer/Html.php'; /** * @see Zend_Markup_Renderer_Html_HtmlAbstract */ -require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; /** * Tag interface diff --git a/library/vendor/Zend/Markup/Renderer/RendererAbstract.php b/library/vendor/Zend/Markup/Renderer/RendererAbstract.php index 35cfe5261..f4b3f42d8 100644 --- a/library/vendor/Zend/Markup/Renderer/RendererAbstract.php +++ b/library/vendor/Zend/Markup/Renderer/RendererAbstract.php @@ -23,15 +23,12 @@ /** * @see Zend_config */ -require_once 'Zend/Config.php'; /** * @see Zend_Filter */ -require_once 'Zend/Filter.php'; /** * @see Zend_Markup_Renderer_TokenConverterInterface */ -require_once 'Zend/Markup/Renderer/TokenConverterInterface.php'; /** * Defines the basic rendering functionality @@ -205,7 +202,6 @@ abstract class Zend_Markup_Renderer_RendererAbstract public function addMarkup($name, $type, array $options) { if (!isset($options['group']) && ($type ^ self::TYPE_ALIAS)) { - require_once 'Zend/Markup/Renderer/Exception.php'; throw new Zend_Markup_Renderer_Exception("There is no render group defined."); } @@ -227,7 +223,6 @@ abstract class Zend_Markup_Renderer_RendererAbstract // add a callback tag if (isset($options['callback'])) { if (!($options['callback'] instanceof Zend_Markup_Renderer_TokenConverterInterface)) { - require_once 'Zend/Markup/Renderer/Exception.php'; throw new Zend_Markup_Renderer_Exception("Not a valid tag callback."); } if (method_exists($options['callback'], 'setRenderer')) { @@ -244,7 +239,6 @@ abstract class Zend_Markup_Renderer_RendererAbstract } elseif ($type & self::TYPE_ALIAS) { // add an alias if (empty($options['name'])) { - require_once 'Zend/Markup/Renderer/Exception.php'; throw new Zend_Markup_Renderer_Exception( 'No alias was provided but tag was defined as such'); } @@ -424,7 +418,6 @@ abstract class Zend_Markup_Renderer_RendererAbstract $markup['callback'] = new $class; if (!($markup['callback'] instanceof Zend_Markup_Renderer_TokenConverterInterface)) { - require_once 'Zend/Markup/Renderer/Exception.php'; throw new Zend_Markup_Renderer_Exception("Callback for tag '$name' found, but it isn't valid."); } diff --git a/library/vendor/Zend/Markup/Token.php b/library/vendor/Zend/Markup/Token.php index a168798d0..859d2df20 100644 --- a/library/vendor/Zend/Markup/Token.php +++ b/library/vendor/Zend/Markup/Token.php @@ -23,7 +23,6 @@ /** * @see Zend_Markup_TokenList */ -require_once 'Zend/Markup/TokenList.php'; /** * @category Zend diff --git a/library/vendor/Zend/Markup/TokenList.php b/library/vendor/Zend/Markup/TokenList.php index 135a3704c..aa9bf6515 100644 --- a/library/vendor/Zend/Markup/TokenList.php +++ b/library/vendor/Zend/Markup/TokenList.php @@ -22,7 +22,6 @@ /** * @see Zend_Markup_Token */ -require_once 'Zend/Markup/Token.php'; /** * @category Zend diff --git a/library/vendor/Zend/Measure/Abstract.php b/library/vendor/Zend/Measure/Abstract.php index 19584938b..1664fa0c2 100644 --- a/library/vendor/Zend/Measure/Abstract.php +++ b/library/vendor/Zend/Measure/Abstract.php @@ -22,17 +22,14 @@ /** * @see Zend_Locale */ -require_once 'Zend/Locale.php'; /** * @see Zend_Locale_Math */ -require_once 'Zend/Locale/Math.php'; /** * @see Zend_Locale_Format */ -require_once 'Zend/Locale/Format.php'; /** * Abstract class for all measurements @@ -92,7 +89,6 @@ abstract class Zend_Measure_Abstract } if (isset($this->_units[$type]) === false) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception("Type ($type) is unknown"); } @@ -119,7 +115,6 @@ abstract class Zend_Measure_Abstract public function setLocale($locale = null, $check = false) { if (empty($locale)) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale') === true) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -131,7 +126,6 @@ abstract class Zend_Measure_Abstract if (!Zend_Locale::isLocale($locale, true, false)) { if (!Zend_Locale::isLocale($locale, false, false)) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception("Language (" . (string) $locale . ") is unknown"); } @@ -194,14 +188,12 @@ abstract class Zend_Measure_Abstract } if (empty($this->_units[$type])) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception("Type ($type) is unknown"); } try { $value = Zend_Locale_Format::getNumber($value, array('locale' => $locale)); } catch(Exception $e) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception($e->getMessage(), $e->getCode(), $e); } @@ -230,7 +222,6 @@ abstract class Zend_Measure_Abstract public function setType($type) { if (empty($this->_units[$type])) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception("Type ($type) is unknown"); } diff --git a/library/vendor/Zend/Measure/Acceleration.php b/library/vendor/Zend/Measure/Acceleration.php index da03ddbed..ae0969feb 100644 --- a/library/vendor/Zend/Measure/Acceleration.php +++ b/library/vendor/Zend/Measure/Acceleration.php @@ -23,8 +23,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling acceleration conversions diff --git a/library/vendor/Zend/Measure/Angle.php b/library/vendor/Zend/Measure/Angle.php index 40c258ff9..712b9645a 100644 --- a/library/vendor/Zend/Measure/Angle.php +++ b/library/vendor/Zend/Measure/Angle.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling angle conversions diff --git a/library/vendor/Zend/Measure/Area.php b/library/vendor/Zend/Measure/Area.php index fd8d16f9d..927733521 100644 --- a/library/vendor/Zend/Measure/Area.php +++ b/library/vendor/Zend/Measure/Area.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling area conversions diff --git a/library/vendor/Zend/Measure/Binary.php b/library/vendor/Zend/Measure/Binary.php index 4c129f1f8..c1147aaeb 100644 --- a/library/vendor/Zend/Measure/Binary.php +++ b/library/vendor/Zend/Measure/Binary.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling binary conversions diff --git a/library/vendor/Zend/Measure/Capacitance.php b/library/vendor/Zend/Measure/Capacitance.php index dff545956..75064f2c0 100644 --- a/library/vendor/Zend/Measure/Capacitance.php +++ b/library/vendor/Zend/Measure/Capacitance.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling capacitance conversions diff --git a/library/vendor/Zend/Measure/Cooking/Volume.php b/library/vendor/Zend/Measure/Cooking/Volume.php index 2ef2bb143..fbe59e6ad 100644 --- a/library/vendor/Zend/Measure/Cooking/Volume.php +++ b/library/vendor/Zend/Measure/Cooking/Volume.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling cooking volume conversions diff --git a/library/vendor/Zend/Measure/Cooking/Weight.php b/library/vendor/Zend/Measure/Cooking/Weight.php index e85959e67..2c4fd3f6a 100644 --- a/library/vendor/Zend/Measure/Cooking/Weight.php +++ b/library/vendor/Zend/Measure/Cooking/Weight.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling cooking weight conversions diff --git a/library/vendor/Zend/Measure/Current.php b/library/vendor/Zend/Measure/Current.php index ab3b708ba..8ae37f258 100644 --- a/library/vendor/Zend/Measure/Current.php +++ b/library/vendor/Zend/Measure/Current.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling current conversions diff --git a/library/vendor/Zend/Measure/Density.php b/library/vendor/Zend/Measure/Density.php index 3a7d02142..98d3e82c3 100644 --- a/library/vendor/Zend/Measure/Density.php +++ b/library/vendor/Zend/Measure/Density.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling density conversions diff --git a/library/vendor/Zend/Measure/Energy.php b/library/vendor/Zend/Measure/Energy.php index 723a30550..987c3b1ae 100644 --- a/library/vendor/Zend/Measure/Energy.php +++ b/library/vendor/Zend/Measure/Energy.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling energy conversions diff --git a/library/vendor/Zend/Measure/Exception.php b/library/vendor/Zend/Measure/Exception.php index 2e12a6044..00eb5bdc2 100644 --- a/library/vendor/Zend/Measure/Exception.php +++ b/library/vendor/Zend/Measure/Exception.php @@ -22,7 +22,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Exception class diff --git a/library/vendor/Zend/Measure/Flow/Mass.php b/library/vendor/Zend/Measure/Flow/Mass.php index a6001b6c9..087caa0e4 100644 --- a/library/vendor/Zend/Measure/Flow/Mass.php +++ b/library/vendor/Zend/Measure/Flow/Mass.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling flow mass conversions diff --git a/library/vendor/Zend/Measure/Flow/Mole.php b/library/vendor/Zend/Measure/Flow/Mole.php index 70550583b..5c0ffc737 100644 --- a/library/vendor/Zend/Measure/Flow/Mole.php +++ b/library/vendor/Zend/Measure/Flow/Mole.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling flow mole conversions diff --git a/library/vendor/Zend/Measure/Flow/Volume.php b/library/vendor/Zend/Measure/Flow/Volume.php index 160493bc1..01420d287 100644 --- a/library/vendor/Zend/Measure/Flow/Volume.php +++ b/library/vendor/Zend/Measure/Flow/Volume.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling flow volume conversions diff --git a/library/vendor/Zend/Measure/Force.php b/library/vendor/Zend/Measure/Force.php index b3d3d4f38..18dc3b0ac 100644 --- a/library/vendor/Zend/Measure/Force.php +++ b/library/vendor/Zend/Measure/Force.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling force conversions diff --git a/library/vendor/Zend/Measure/Frequency.php b/library/vendor/Zend/Measure/Frequency.php index f4c89cc55..a5630364f 100644 --- a/library/vendor/Zend/Measure/Frequency.php +++ b/library/vendor/Zend/Measure/Frequency.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling flow volume conversions diff --git a/library/vendor/Zend/Measure/Illumination.php b/library/vendor/Zend/Measure/Illumination.php index 4e6e41996..b87ac9a0c 100644 --- a/library/vendor/Zend/Measure/Illumination.php +++ b/library/vendor/Zend/Measure/Illumination.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling illumination conversions diff --git a/library/vendor/Zend/Measure/Length.php b/library/vendor/Zend/Measure/Length.php index 45bdfa2b0..c4434a4e7 100644 --- a/library/vendor/Zend/Measure/Length.php +++ b/library/vendor/Zend/Measure/Length.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling length conversions diff --git a/library/vendor/Zend/Measure/Lightness.php b/library/vendor/Zend/Measure/Lightness.php index 38153782b..1f9ddf065 100644 --- a/library/vendor/Zend/Measure/Lightness.php +++ b/library/vendor/Zend/Measure/Lightness.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling temperature conversions diff --git a/library/vendor/Zend/Measure/Number.php b/library/vendor/Zend/Measure/Number.php index b4e565128..5431eb50c 100644 --- a/library/vendor/Zend/Measure/Number.php +++ b/library/vendor/Zend/Measure/Number.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling number conversions @@ -155,7 +153,6 @@ class Zend_Measure_Number extends Zend_Measure_Abstract if (!Zend_Locale::isLocale($locale, true, false)) { if (!Zend_Locale::isLocale($locale, true, false)) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception("Language (" . (string) $locale . ") is unknown"); } @@ -169,7 +166,6 @@ class Zend_Measure_Number extends Zend_Measure_Abstract } if (isset($this->_units[$type]) === false) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception("Type ($type) is unknown"); } @@ -191,7 +187,6 @@ class Zend_Measure_Number extends Zend_Measure_Abstract } if (empty($this->_units[$type])) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception('unknown type of number:' . $type); } @@ -255,7 +250,6 @@ class Zend_Measure_Number extends Zend_Measure_Abstract try { $value = Zend_Locale_Format::getInteger($value, array('locale' => $locale)); } catch (Exception $e) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception($e->getMessage(), $e->getCode(), $e); } if (call_user_func(Zend_Locale_Math::$comp, $value, 0) < 0) { @@ -342,7 +336,6 @@ class Zend_Measure_Number extends Zend_Measure_Abstract --$count; if ($count === 0) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception("Your value '$tempvalue' cannot be processed because it extends 200 digits"); } } @@ -369,7 +362,6 @@ class Zend_Measure_Number extends Zend_Measure_Abstract --$count; if ($count === 0) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception("Your value '$tempvalue' cannot be processed because it extends 200 digits"); } } @@ -393,7 +385,6 @@ class Zend_Measure_Number extends Zend_Measure_Abstract public function setType($type) { if (empty($this->_units[$type]) === true) { - require_once 'Zend/Measure/Exception.php'; throw new Zend_Measure_Exception('Unknown type of number:' . $type); } diff --git a/library/vendor/Zend/Measure/Power.php b/library/vendor/Zend/Measure/Power.php index d80d53a9f..9009a3533 100644 --- a/library/vendor/Zend/Measure/Power.php +++ b/library/vendor/Zend/Measure/Power.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling power conversions diff --git a/library/vendor/Zend/Measure/Pressure.php b/library/vendor/Zend/Measure/Pressure.php index 7f37551b1..44399f500 100644 --- a/library/vendor/Zend/Measure/Pressure.php +++ b/library/vendor/Zend/Measure/Pressure.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling pressure conversions diff --git a/library/vendor/Zend/Measure/Speed.php b/library/vendor/Zend/Measure/Speed.php index c24abeb06..ab1457656 100644 --- a/library/vendor/Zend/Measure/Speed.php +++ b/library/vendor/Zend/Measure/Speed.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling speed conversions diff --git a/library/vendor/Zend/Measure/Temperature.php b/library/vendor/Zend/Measure/Temperature.php index 33ce85a12..f1062d7da 100644 --- a/library/vendor/Zend/Measure/Temperature.php +++ b/library/vendor/Zend/Measure/Temperature.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling temperature conversions diff --git a/library/vendor/Zend/Measure/Time.php b/library/vendor/Zend/Measure/Time.php index 0f3c871f6..05dad3f05 100644 --- a/library/vendor/Zend/Measure/Time.php +++ b/library/vendor/Zend/Measure/Time.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling time conversions diff --git a/library/vendor/Zend/Measure/Torque.php b/library/vendor/Zend/Measure/Torque.php index 426ecd8bd..aa5870cc1 100644 --- a/library/vendor/Zend/Measure/Torque.php +++ b/library/vendor/Zend/Measure/Torque.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling torque conversions diff --git a/library/vendor/Zend/Measure/Viscosity/Dynamic.php b/library/vendor/Zend/Measure/Viscosity/Dynamic.php index e20be90c9..6733464c6 100644 --- a/library/vendor/Zend/Measure/Viscosity/Dynamic.php +++ b/library/vendor/Zend/Measure/Viscosity/Dynamic.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling acceleration conversions diff --git a/library/vendor/Zend/Measure/Viscosity/Kinematic.php b/library/vendor/Zend/Measure/Viscosity/Kinematic.php index 3d2544b68..b89da976e 100644 --- a/library/vendor/Zend/Measure/Viscosity/Kinematic.php +++ b/library/vendor/Zend/Measure/Viscosity/Kinematic.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling acceleration conversions diff --git a/library/vendor/Zend/Measure/Volume.php b/library/vendor/Zend/Measure/Volume.php index c652a88c2..fbcfc8e34 100644 --- a/library/vendor/Zend/Measure/Volume.php +++ b/library/vendor/Zend/Measure/Volume.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling acceleration conversions diff --git a/library/vendor/Zend/Measure/Weight.php b/library/vendor/Zend/Measure/Weight.php index 369bc4777..ca97e9555 100644 --- a/library/vendor/Zend/Measure/Weight.php +++ b/library/vendor/Zend/Measure/Weight.php @@ -22,8 +22,6 @@ /** * Implement needed classes */ -require_once 'Zend/Measure/Abstract.php'; -require_once 'Zend/Locale.php'; /** * Class for handling weight conversions diff --git a/library/vendor/Zend/Memory.php b/library/vendor/Zend/Memory.php index 6f193a1f3..31724e72c 100644 --- a/library/vendor/Zend/Memory.php +++ b/library/vendor/Zend/Memory.php @@ -20,16 +20,12 @@ */ /** Zend_Memory_Exception */ -require_once 'Zend/Memory/Manager.php'; /** Zend_Memory_Value */ -require_once 'Zend/Memory/Value.php'; /** Zend_Memory_Container */ -require_once 'Zend/Memory/Container.php'; /** Zend_Memory_Exception */ -require_once 'Zend/Cache.php'; /** * @category Zend @@ -65,7 +61,6 @@ class Zend_Memory } if (!$backendIsFound) { - require_once 'Zend/Memory/Exception.php'; throw new Zend_Memory_Exception("Incorrect backend ($backend)"); } @@ -73,7 +68,6 @@ class Zend_Memory // For perfs reasons, we do not use the Zend_Loader::loadClass() method // (security controls are explicit) - require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php'; $backendObject = new $backendClass($backendOptions); diff --git a/library/vendor/Zend/Memory/AccessController.php b/library/vendor/Zend/Memory/AccessController.php index 25069d91c..c1d67efac 100644 --- a/library/vendor/Zend/Memory/AccessController.php +++ b/library/vendor/Zend/Memory/AccessController.php @@ -22,7 +22,6 @@ /** * Zend_Memory_Container_Interface */ -require_once 'Zend/Memory/Container/Interface.php'; /** * Memory object container access controller. diff --git a/library/vendor/Zend/Memory/Container.php b/library/vendor/Zend/Memory/Container.php index ddbea8656..90980b5f3 100644 --- a/library/vendor/Zend/Memory/Container.php +++ b/library/vendor/Zend/Memory/Container.php @@ -20,7 +20,6 @@ */ /** Zend_Memory_Container_Interface */ -require_once 'Zend/Memory/Container/Interface.php'; /** * Memory value container diff --git a/library/vendor/Zend/Memory/Container/Locked.php b/library/vendor/Zend/Memory/Container/Locked.php index 4e98b4145..297b819fe 100644 --- a/library/vendor/Zend/Memory/Container/Locked.php +++ b/library/vendor/Zend/Memory/Container/Locked.php @@ -20,7 +20,6 @@ */ /** Zend_Memory_Container */ -require_once 'Zend/Memory/Container.php'; /** * Memory value container diff --git a/library/vendor/Zend/Memory/Container/Movable.php b/library/vendor/Zend/Memory/Container/Movable.php index e4350cca0..5a3c9f961 100644 --- a/library/vendor/Zend/Memory/Container/Movable.php +++ b/library/vendor/Zend/Memory/Container/Movable.php @@ -20,10 +20,8 @@ */ /** Zend_Memory_Container */ -require_once 'Zend/Memory/Container.php'; /** Zend_Memory_Value */ -require_once 'Zend/Memory/Value.php'; /** * Memory value container @@ -135,7 +133,6 @@ class Zend_Memory_Container_Movable extends Zend_Memory_Container { public function __get($property) { if ($property != 'value') { - require_once 'Zend/Memory/Exception.php'; throw new Zend_Memory_Exception('Unknown property: Zend_Memory_container::$' . $property); } @@ -157,7 +154,6 @@ class Zend_Memory_Container_Movable extends Zend_Memory_Container { public function __set($property, $value) { if ($property != 'value') { - require_once 'Zend/Memory/Exception.php'; throw new Zend_Memory_Exception('Unknown property: Zend_Memory_container::$' . $property); } diff --git a/library/vendor/Zend/Memory/Exception.php b/library/vendor/Zend/Memory/Exception.php index a0bd3414b..78aa640c5 100644 --- a/library/vendor/Zend/Memory/Exception.php +++ b/library/vendor/Zend/Memory/Exception.php @@ -21,7 +21,6 @@ /** Zend_Controller_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Memory/Manager.php b/library/vendor/Zend/Memory/Manager.php index 74a09be91..a203812c6 100644 --- a/library/vendor/Zend/Memory/Manager.php +++ b/library/vendor/Zend/Memory/Manager.php @@ -20,13 +20,10 @@ */ /** Zend_Memory_Container_Movable */ -require_once 'Zend/Memory/Container/Movable.php'; /** Zend_Memory_Container_Locked */ -require_once 'Zend/Memory/Container/Locked.php'; /** Zend_Memory_AccessController */ -require_once 'Zend/Memory/AccessController.php'; /** @@ -407,7 +404,6 @@ class Zend_Memory_Manager } } - require_once 'Zend/Memory/Exception.php'; throw new Zend_Memory_Exception('Memory manager can\'t get enough space.'); } diff --git a/library/vendor/Zend/Mime/Decode.php b/library/vendor/Zend/Mime/Decode.php index 87ad56808..2c631e83f 100644 --- a/library/vendor/Zend/Mime/Decode.php +++ b/library/vendor/Zend/Mime/Decode.php @@ -22,7 +22,6 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mime/Exception.php b/library/vendor/Zend/Mime/Exception.php index 32dd45afd..3e032867f 100644 --- a/library/vendor/Zend/Mime/Exception.php +++ b/library/vendor/Zend/Mime/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Mime/Message.php b/library/vendor/Zend/Mime/Message.php index 60d6ecb1e..1df1df3ea 100644 --- a/library/vendor/Zend/Mime/Message.php +++ b/library/vendor/Zend/Mime/Message.php @@ -23,12 +23,10 @@ /** * Zend_Mime */ -require_once 'Zend/Mime.php'; /** * Zend_Mime_Part */ -require_once 'Zend/Mime/Part.php'; /** @@ -242,7 +240,6 @@ class Zend_Mime_Message */ public static function createFromMessage($message, $boundary, $EOL = Zend_Mime::LINEEND) { - require_once 'Zend/Mime/Decode.php'; $parts = Zend_Mime_Decode::splitMessageStruct($message, $boundary, $EOL); $res = new self(); diff --git a/library/vendor/Zend/Mime/Part.php b/library/vendor/Zend/Mime/Part.php index 2859c78b6..3628a9825 100644 --- a/library/vendor/Zend/Mime/Part.php +++ b/library/vendor/Zend/Mime/Part.php @@ -22,7 +22,6 @@ /** * Zend_Mime */ -require_once 'Zend/Mime.php'; /** * Class representing a MIME part. @@ -92,7 +91,6 @@ class Zend_Mime_Part { public function getEncodedStream() { if (!$this->_isStream) { - require_once 'Zend/Mime/Exception.php'; throw new Zend_Mime_Exception('Attempt to get a stream from a string part'); } @@ -109,7 +107,6 @@ class Zend_Mime_Part { ) ); if (!is_resource($filter)) { - require_once 'Zend/Mime/Exception.php'; throw new Zend_Mime_Exception('Failed to append quoted-printable filter'); } break; @@ -124,7 +121,6 @@ class Zend_Mime_Part { ) ); if (!is_resource($filter)) { - require_once 'Zend/Mime/Exception.php'; throw new Zend_Mime_Exception('Failed to append base64 filter'); } break; diff --git a/library/vendor/Zend/Mobile/Exception.php b/library/vendor/Zend/Mobile/Exception.php index ed4aaa177..c092c9a5f 100644 --- a/library/vendor/Zend/Mobile/Exception.php +++ b/library/vendor/Zend/Mobile/Exception.php @@ -20,7 +20,6 @@ */ /** Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mobile/Push/Abstract.php b/library/vendor/Zend/Mobile/Push/Abstract.php index abce0737b..c63595ff3 100644 --- a/library/vendor/Zend/Mobile/Push/Abstract.php +++ b/library/vendor/Zend/Mobile/Push/Abstract.php @@ -21,10 +21,8 @@ */ /** Zend_Mobile_Push_Interface **/ -require_once 'Zend/Mobile/Push/Interface.php'; /** Zend_Mobile_Push_Exception **/ -require_once 'Zend/Mobile/Push/Exception.php'; /** * Push Abstract diff --git a/library/vendor/Zend/Mobile/Push/Apns.php b/library/vendor/Zend/Mobile/Push/Apns.php index fff3e9464..bb50958d6 100644 --- a/library/vendor/Zend/Mobile/Push/Apns.php +++ b/library/vendor/Zend/Mobile/Push/Apns.php @@ -21,10 +21,8 @@ */ /** Zend_Mobile_Push_Abstract **/ -require_once 'Zend/Mobile/Push/Abstract.php'; /** Zend_Mobile_Push_Message_Apns **/ -require_once 'Zend/Mobile/Push/Message/Apns.php'; /** * APNS Push @@ -169,7 +167,6 @@ class Zend_Mobile_Push_Apns extends Zend_Mobile_Push_Abstract ); if (!is_resource($this->_socket)) { - require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; throw new Zend_Mobile_Push_Exception_ServerUnavailable(sprintf('Unable to connect: %s: %d (%s)', $uri, $errno, @@ -331,7 +328,6 @@ class Zend_Mobile_Push_Apns extends Zend_Mobile_Push_Abstract . $payload; $ret = $this->_write($payload); if ($ret === false) { - require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; throw new Zend_Mobile_Push_Exception_ServerUnavailable('Unable to send message'); } // check for errors from apple @@ -346,31 +342,24 @@ class Zend_Mobile_Push_Apns extends Zend_Mobile_Push_Abstract throw new Zend_Mobile_Push_Exception('A processing error has occurred on the apple push notification server.'); break; case 2: - require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; throw new Zend_Mobile_Push_Exception_InvalidToken('Missing token; you must set a token for the message.'); break; case 3: - require_once 'Zend/Mobile/Push/Exception/InvalidTopic.php'; throw new Zend_Mobile_Push_Exception_InvalidTopic('Missing id; you must set an id for the message.'); break; case 4: - require_once 'Zend/Mobile/Push/Exception/InvalidPayload.php'; throw new Zend_Mobile_Push_Exception_InvalidPayload('Missing message; the message must always have some content.'); break; case 5: - require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; throw new Zend_Mobile_Push_Exception_InvalidToken('Bad token. This token is too big and is not a regular apns token.'); break; case 6: - require_once 'Zend/Mobile/Push/Exception/InvalidTopic.php'; throw new Zend_Mobile_Push_Exception_InvalidTopic('The message id is too big; reduce the size of the id.'); break; case 7: - require_once 'Zend/Mobile/Push/Exception/InvalidPayload.php'; throw new Zend_Mobile_Push_Exception_InvalidPayload('The message is too big; reduce the size of the message.'); break; case 8: - require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; throw new Zend_Mobile_Push_Exception_InvalidToken('Bad token. Remove this token from being sent to again.'); break; default: diff --git a/library/vendor/Zend/Mobile/Push/Exception.php b/library/vendor/Zend/Mobile/Push/Exception.php index 40793752c..adba861ec 100644 --- a/library/vendor/Zend/Mobile/Push/Exception.php +++ b/library/vendor/Zend/Mobile/Push/Exception.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Exception */ -require_once 'Zend/Mobile/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mobile/Push/Exception/DeviceQuotaExceeded.php b/library/vendor/Zend/Mobile/Push/Exception/DeviceQuotaExceeded.php index 8375c0950..ca0941f20 100644 --- a/library/vendor/Zend/Mobile/Push/Exception/DeviceQuotaExceeded.php +++ b/library/vendor/Zend/Mobile/Push/Exception/DeviceQuotaExceeded.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Exception */ -require_once 'Zend/Mobile/Push/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mobile/Push/Exception/InvalidAuthToken.php b/library/vendor/Zend/Mobile/Push/Exception/InvalidAuthToken.php index 435caa8eb..b5c360e25 100644 --- a/library/vendor/Zend/Mobile/Push/Exception/InvalidAuthToken.php +++ b/library/vendor/Zend/Mobile/Push/Exception/InvalidAuthToken.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Exception */ -require_once 'Zend/Mobile/Push/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mobile/Push/Exception/InvalidPayload.php b/library/vendor/Zend/Mobile/Push/Exception/InvalidPayload.php index 448f0e9b6..afbaab041 100644 --- a/library/vendor/Zend/Mobile/Push/Exception/InvalidPayload.php +++ b/library/vendor/Zend/Mobile/Push/Exception/InvalidPayload.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Exception */ -require_once 'Zend/Mobile/Push/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mobile/Push/Exception/InvalidRegistration.php b/library/vendor/Zend/Mobile/Push/Exception/InvalidRegistration.php index ecf83e8df..0c28552ed 100644 --- a/library/vendor/Zend/Mobile/Push/Exception/InvalidRegistration.php +++ b/library/vendor/Zend/Mobile/Push/Exception/InvalidRegistration.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Exception */ -require_once 'Zend/Mobile/Push/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mobile/Push/Exception/InvalidToken.php b/library/vendor/Zend/Mobile/Push/Exception/InvalidToken.php index 47a1a73cd..fa004acf8 100644 --- a/library/vendor/Zend/Mobile/Push/Exception/InvalidToken.php +++ b/library/vendor/Zend/Mobile/Push/Exception/InvalidToken.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Exception */ -require_once 'Zend/Mobile/Push/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mobile/Push/Exception/InvalidTopic.php b/library/vendor/Zend/Mobile/Push/Exception/InvalidTopic.php index 3f88ec759..2a580aa67 100644 --- a/library/vendor/Zend/Mobile/Push/Exception/InvalidTopic.php +++ b/library/vendor/Zend/Mobile/Push/Exception/InvalidTopic.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Exception */ -require_once 'Zend/Mobile/Push/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mobile/Push/Exception/QuotaExceeded.php b/library/vendor/Zend/Mobile/Push/Exception/QuotaExceeded.php index 6c8668fe9..c1b6d9aa1 100644 --- a/library/vendor/Zend/Mobile/Push/Exception/QuotaExceeded.php +++ b/library/vendor/Zend/Mobile/Push/Exception/QuotaExceeded.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Exception */ -require_once 'Zend/Mobile/Push/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mobile/Push/Exception/ServerUnavailable.php b/library/vendor/Zend/Mobile/Push/Exception/ServerUnavailable.php index f429dfe51..133697f24 100644 --- a/library/vendor/Zend/Mobile/Push/Exception/ServerUnavailable.php +++ b/library/vendor/Zend/Mobile/Push/Exception/ServerUnavailable.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Exception */ -require_once 'Zend/Mobile/Push/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mobile/Push/Gcm.php b/library/vendor/Zend/Mobile/Push/Gcm.php index 34127d44f..5e2e47e02 100644 --- a/library/vendor/Zend/Mobile/Push/Gcm.php +++ b/library/vendor/Zend/Mobile/Push/Gcm.php @@ -21,16 +21,12 @@ */ /** Zend_Http_Client **/ -require_once 'Zend/Http/Client.php'; /** Zend_Mobile_Push_Abstract **/ -require_once 'Zend/Mobile/Push/Abstract.php'; /** Zend_Mobile_Push_Message_Gcm **/ -require_once 'Zend/Mobile/Push/Message/Gcm.php'; /** Zend_Mobile_Push_Response_Gcm **/ -require_once 'Zend/Mobile/Push/Response/Gcm.php'; /** * GCM Push @@ -143,19 +139,15 @@ class Zend_Mobile_Push_Gcm extends Zend_Mobile_Push_Abstract switch ($response->getStatus()) { case 500: - require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; throw new Zend_Mobile_Push_Exception_ServerUnavailable('The server encountered an internal error, try again'); break; case 503: - require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; throw new Zend_Mobile_Push_Exception_ServerUnavailable('The server was unavailable, check Retry-After header'); break; case 401: - require_once 'Zend/Mobile/Push/Exception/InvalidAuthToken.php'; throw new Zend_Mobile_Push_Exception_InvalidAuthToken('There was an error authenticating the sender account'); break; case 400: - require_once 'Zend/Mobile/Push/Exception/InvalidPayload.php'; throw new Zend_Mobile_Push_Exception_InvalidPayload('The request could not be parsed as JSON or contains invalid fields'); break; } diff --git a/library/vendor/Zend/Mobile/Push/Message/Abstract.php b/library/vendor/Zend/Mobile/Push/Message/Abstract.php index a411a3e0c..181ce824b 100644 --- a/library/vendor/Zend/Mobile/Push/Message/Abstract.php +++ b/library/vendor/Zend/Mobile/Push/Message/Abstract.php @@ -21,10 +21,8 @@ */ /** Zend_Mobile_Push_Message_Interface **/ -require_once 'Zend/Mobile/Push/Message/Interface.php'; /** Zend_Mobile_Push_Message_Exception **/ -require_once 'Zend/Mobile/Push/Message/Exception.php'; /** * Message Abstract diff --git a/library/vendor/Zend/Mobile/Push/Message/Apns.php b/library/vendor/Zend/Mobile/Push/Message/Apns.php index f4768798c..232b1b872 100644 --- a/library/vendor/Zend/Mobile/Push/Message/Apns.php +++ b/library/vendor/Zend/Mobile/Push/Message/Apns.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Message_Abstract **/ -require_once 'Zend/Mobile/Push/Message/Abstract.php'; /** * Apns Message diff --git a/library/vendor/Zend/Mobile/Push/Message/Exception.php b/library/vendor/Zend/Mobile/Push/Message/Exception.php index d1a136079..e2e047eb1 100644 --- a/library/vendor/Zend/Mobile/Push/Message/Exception.php +++ b/library/vendor/Zend/Mobile/Push/Message/Exception.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Exception */ -require_once 'Zend/Mobile/Push/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Mobile/Push/Message/Gcm.php b/library/vendor/Zend/Mobile/Push/Message/Gcm.php index a15e70a38..f06e1fb1a 100644 --- a/library/vendor/Zend/Mobile/Push/Message/Gcm.php +++ b/library/vendor/Zend/Mobile/Push/Message/Gcm.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Message_Abstract **/ -require_once 'Zend/Mobile/Push/Message/Abstract.php'; /** * Gcm Message diff --git a/library/vendor/Zend/Mobile/Push/Message/Mpns.php b/library/vendor/Zend/Mobile/Push/Message/Mpns.php index b5aea92aa..43511a135 100644 --- a/library/vendor/Zend/Mobile/Push/Message/Mpns.php +++ b/library/vendor/Zend/Mobile/Push/Message/Mpns.php @@ -20,10 +20,8 @@ */ /** Zend_Mobile_Push_Message_Abstract **/ -require_once 'Zend/Mobile/Push/Message/Abstract.php'; /** Zend_Uri **/ -require_once 'Zend/Uri.php'; /** * Mpns Message diff --git a/library/vendor/Zend/Mobile/Push/Message/Mpns/Raw.php b/library/vendor/Zend/Mobile/Push/Message/Mpns/Raw.php index 05491e0c9..eaa3276f7 100644 --- a/library/vendor/Zend/Mobile/Push/Message/Mpns/Raw.php +++ b/library/vendor/Zend/Mobile/Push/Message/Mpns/Raw.php @@ -20,10 +20,8 @@ */ /** Zend_Mobile_Push_Message_Mpns **/ -require_once 'Zend/Mobile/Push/Message/Mpns.php'; /** Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** * Mpns Raw Message diff --git a/library/vendor/Zend/Mobile/Push/Message/Mpns/Tile.php b/library/vendor/Zend/Mobile/Push/Message/Mpns/Tile.php index ee980d969..eca0b7e00 100644 --- a/library/vendor/Zend/Mobile/Push/Message/Mpns/Tile.php +++ b/library/vendor/Zend/Mobile/Push/Message/Mpns/Tile.php @@ -20,7 +20,6 @@ */ /** Zend_Mobile_Push_Message_Mpns **/ -require_once 'Zend/Mobile/Push/Message/Mpns.php'; /** * Mpns Tile Message diff --git a/library/vendor/Zend/Mobile/Push/Message/Mpns/Toast.php b/library/vendor/Zend/Mobile/Push/Message/Mpns/Toast.php index 723373a57..6e86abdbd 100644 --- a/library/vendor/Zend/Mobile/Push/Message/Mpns/Toast.php +++ b/library/vendor/Zend/Mobile/Push/Message/Mpns/Toast.php @@ -20,7 +20,6 @@ */ /** Zend_Mobile_Push_Message_Mpns **/ -require_once 'Zend/Mobile/Push/Message/Mpns.php'; /** * Mpns Toast Message diff --git a/library/vendor/Zend/Mobile/Push/Mpns.php b/library/vendor/Zend/Mobile/Push/Mpns.php index 06936727a..ba91adb2c 100644 --- a/library/vendor/Zend/Mobile/Push/Mpns.php +++ b/library/vendor/Zend/Mobile/Push/Mpns.php @@ -21,13 +21,10 @@ */ /** Zend_Http_Client **/ -require_once 'Zend/Http/Client.php'; /** Zend_Mobile_Push_Abstract **/ -require_once 'Zend/Mobile/Push/Abstract.php'; /** Zend_Mobile_Push_Message_Mpns **/ -require_once 'Zend/Mobile/Push/Message/Mpns.php'; /** * Mpns Push @@ -113,35 +110,28 @@ class Zend_Mobile_Push_Mpns extends Zend_Mobile_Push_Abstract case 200: // check headers for response? need to test how this actually works to correctly handle different states. if ($response->getHeader('NotificationStatus') == 'QueueFull') { - require_once 'Zend/Mobile/Push/Exception/DeviceQuotaExceeded.php'; throw new Zend_Mobile_Push_Exception_DeviceQuotaExceeded('The devices push notification queue is full, use exponential backoff'); } break; case 400: - require_once 'Zend/Mobile/Push/Exception/InvalidPayload.php'; throw new Zend_Mobile_Push_Exception_InvalidPayload('The message xml was invalid'); break; case 401: - require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; throw new Zend_Mobile_Push_Exception_InvalidToken('The device token is not valid or there is a mismatch between certificates'); break; case 404: - require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; throw new Zend_Mobile_Push_Exception_InvalidToken('The device subscription is invalid, stop sending notifications to this device'); break; case 405: throw new Zend_Mobile_Push_Exception('Invalid method, only POST is allowed'); // will never be hit unless overwritten break; case 406: - require_once 'Zend/Mobile/Push/Exception/QuotaExceeded.php'; throw new Zend_Mobile_Push_Exception_QuotaExceeded('The unauthenticated web service has reached the per-day throttling limit'); break; case 412: - require_once 'Zend/Mobile/Push/Exception/InvalidToken.php'; throw new Zend_Mobile_Push_Exception_InvalidToken('The device is in an inactive state. You may retry once per hour'); break; case 503: - require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; throw new Zend_Mobile_Push_Exception_ServerUnavailable('The server was unavailable.'); break; default: diff --git a/library/vendor/Zend/Mobile/Push/Response/Gcm.php b/library/vendor/Zend/Mobile/Push/Response/Gcm.php index 06633d68c..d21565730 100644 --- a/library/vendor/Zend/Mobile/Push/Response/Gcm.php +++ b/library/vendor/Zend/Mobile/Push/Response/Gcm.php @@ -91,7 +91,6 @@ class Zend_Mobile_Push_Response_Gcm { if ($responseString) { if (!$response = json_decode($responseString, true)) { - require_once 'Zend/Mobile/Push/Exception/ServerUnavailable.php'; throw new Zend_Mobile_Push_Exception_ServerUnavailable('The server gave us an invalid response, try again later'); } $this->setResponse($response); diff --git a/library/vendor/Zend/Mobile/Push/Test/ApnsProxy.php b/library/vendor/Zend/Mobile/Push/Test/ApnsProxy.php index 9f48edc29..2dc9fec9f 100644 --- a/library/vendor/Zend/Mobile/Push/Test/ApnsProxy.php +++ b/library/vendor/Zend/Mobile/Push/Test/ApnsProxy.php @@ -21,7 +21,6 @@ */ /** Zend_Mobile_Push_Apns **/ -require_once 'Zend/Mobile/Push/Apns.php'; /** * Apns Test Proxy diff --git a/library/vendor/Zend/Navigation.php b/library/vendor/Zend/Navigation.php index c93dc325d..034bd62a9 100644 --- a/library/vendor/Zend/Navigation.php +++ b/library/vendor/Zend/Navigation.php @@ -22,7 +22,6 @@ /** * @see Zend_Navigation_Container */ -require_once 'Zend/Navigation/Container.php'; /** * A simple container class for {@link Zend_Navigation_Page} pages @@ -45,7 +44,6 @@ class Zend_Navigation extends Zend_Navigation_Container if (is_array($pages) || $pages instanceof Zend_Config) { $this->addPages($pages); } elseif (null !== $pages) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $pages must be an array, an ' . 'instance of Zend_Config, or null'); diff --git a/library/vendor/Zend/Navigation/Container.php b/library/vendor/Zend/Navigation/Container.php index d406fb3e3..767320818 100644 --- a/library/vendor/Zend/Navigation/Container.php +++ b/library/vendor/Zend/Navigation/Container.php @@ -107,16 +107,13 @@ abstract class Zend_Navigation_Container implements RecursiveIterator, Countable public function addPage($page) { if ($page === $this) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'A page cannot have itself as a parent'); } if (is_array($page) || $page instanceof Zend_Config) { - require_once 'Zend/Navigation/Page.php'; $page = Zend_Navigation_Page::factory($page); } elseif (!$page instanceof Zend_Navigation_Page) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $page must be an instance of ' . 'Zend_Navigation_Page or Zend_Config, or an array'); @@ -161,7 +158,6 @@ abstract class Zend_Navigation_Container implements RecursiveIterator, Countable } if (!is_array($pages)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $pages must be an array, an ' . 'instance of Zend_Config or an instance of ' . @@ -471,7 +467,6 @@ abstract class Zend_Navigation_Container implements RecursiveIterator, Countable return $this->{$match[1]}($match[2], $arguments[0], !empty($arguments[1])); } - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( sprintf( 'Bad method call: Unknown method %s::%s', @@ -518,7 +513,6 @@ abstract class Zend_Navigation_Container implements RecursiveIterator, Countable if (isset($this->_pages[$hash])) { return $this->_pages[$hash]; } else { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Corruption detected in container; ' . 'invalid key found in internal iterator'); diff --git a/library/vendor/Zend/Navigation/Exception.php b/library/vendor/Zend/Navigation/Exception.php index 218f8f676..b17b8e9c2 100644 --- a/library/vendor/Zend/Navigation/Exception.php +++ b/library/vendor/Zend/Navigation/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Navigation exception diff --git a/library/vendor/Zend/Navigation/Page.php b/library/vendor/Zend/Navigation/Page.php index 915bc2b63..485efd773 100644 --- a/library/vendor/Zend/Navigation/Page.php +++ b/library/vendor/Zend/Navigation/Page.php @@ -22,7 +22,6 @@ /** * @see Zend_Navigation_Container */ -require_once 'Zend/Navigation/Container.php'; /** * Base class for Zend_Navigation_Page pages @@ -214,7 +213,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container } if (!is_array($options)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $options must be an array or Zend_Config'); } @@ -237,13 +235,11 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container } if (!class_exists($type)) { - require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($type); } $page = new $type($options); if (!$page instanceof Zend_Navigation_Page) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception(sprintf( 'Invalid argument: Detected type "%s", which ' . 'is not an instance of Zend_Navigation_Page', @@ -259,13 +255,10 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container isset($options['params']); if ($hasMvc) { - require_once 'Zend/Navigation/Page/Mvc.php'; return new Zend_Navigation_Page_Mvc($options); } elseif ($hasUri) { - require_once 'Zend/Navigation/Page/Uri.php'; return new Zend_Navigation_Page_Uri($options); } else { - require_once 'Zend/Navigation/Exception.php'; $message = 'Invalid argument: Unable to determine class to instantiate'; if (isset($options['label'])) { @@ -349,7 +342,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function setLabel($label) { if (null !== $label && !is_string($label)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $label must be a string or null'); } @@ -378,7 +370,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function setFragment($fragment) { if (null !== $fragment && !is_string($fragment)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $fragment must be a string or null'); } @@ -408,7 +399,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function setId($id = null) { if (null !== $id && !is_string($id) && !is_numeric($id)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $id must be a string, number or null'); } @@ -439,7 +429,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function setClass($class = null) { if (null !== $class && !is_string($class)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $class must be a string or null'); } @@ -469,7 +458,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function setTitle($title = null) { if (null !== $title && !is_string($title)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $title must be a non-empty string'); } @@ -499,7 +487,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function setTarget($target = null) { if (null !== $target && !is_string($target)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $target must be a string or null'); } @@ -532,7 +519,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container if (null !== $character && (!is_string($character) || 1 != strlen($character))) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $character must be a single character or null' ); @@ -574,7 +560,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container } if (!is_array($relations)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $relations must be an ' . 'array or an instance of Zend_Config'); @@ -637,7 +622,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container } if (!is_array($relations)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $relations must be an ' . 'array or an instance of Zend_Config'); @@ -690,14 +674,12 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function setCustomHtmlAttrib($name, $value) { if (!is_string($name)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $name must be a string' ); } if (null !== $value && !is_string($value)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $value must be a string or null' ); @@ -722,7 +704,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function getCustomHtmlAttrib($name) { if (!is_string($name)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $name must be a string' ); @@ -768,7 +749,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function removeCustomHtmlAttrib($name) { if (!is_string($name)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $name must be a string' ); @@ -810,7 +790,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container } if (null !== $order && !is_int($order)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $order must be an integer or null, ' . 'or a string that casts to an integer'); @@ -855,7 +834,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container $resource instanceof Zend_Acl_Resource_Interface) { $this->_resource = $resource; } else { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $resource must be null, a string, ' . ' or an instance of Zend_Acl_Resource_Interface'); @@ -1008,7 +986,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function setParent(Zend_Navigation_Container $parent = null) { if ($parent === $this) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'A page cannot have itself as a parent'); } @@ -1058,7 +1035,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function set($property, $value) { if (!is_string($property) || empty($property)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $property must be a non-empty string'); } @@ -1089,7 +1065,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container public function get($property) { if (!is_string($property) || empty($property)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $property must be a non-empty string'); } @@ -1171,7 +1146,6 @@ abstract class Zend_Navigation_Page extends Zend_Navigation_Container { $method = 'set' . self::_normalizePropertyName($name); if (method_exists($this, $method)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception(sprintf( 'Unsetting native property "%s" is not allowed', $name)); diff --git a/library/vendor/Zend/Navigation/Page/Mvc.php b/library/vendor/Zend/Navigation/Page/Mvc.php index 8e0327ff9..62a91f42f 100644 --- a/library/vendor/Zend/Navigation/Page/Mvc.php +++ b/library/vendor/Zend/Navigation/Page/Mvc.php @@ -23,19 +23,16 @@ /** * @see Zend_Navigation_Page */ -require_once 'Zend/Navigation/Page.php'; /** * @see Zend_Controller_Action_HelperBroker */ -require_once 'Zend/Controller/Action/HelperBroker.php'; /** * Used to check if page is active * * @see Zend_Controller_Front */ -require_once 'Zend/Controller/Front.php'; /** * Represents a page that is defined using module, controller, action, route @@ -263,7 +260,6 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page $scheme = $this->getScheme(); if (null !== $scheme) { if (null === self::$_schemeHelper) { - require_once 'Zend/View/Helper/ServerUrl.php'; self::$_schemeHelper = new Zend_View_Helper_ServerUrl(); } @@ -291,7 +287,6 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page public function setAction($action) { if (null !== $action && !is_string($action)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $action must be a string or null' ); @@ -327,7 +322,6 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page public function setController($controller) { if (null !== $controller && !is_string($controller)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $controller must be a string or null' ); @@ -363,7 +357,6 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page public function setModule($module) { if (null !== $module && !is_string($module)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $module must be a string or null' ); @@ -529,7 +522,6 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page public function setRoute($route) { if (null !== $route && (!is_string($route) || strlen($route) < 1)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $route must be a non-empty string or null' ); @@ -622,7 +614,6 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page public function setScheme($scheme) { if (null !== $scheme && !is_string($scheme)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $scheme must be a string or null' ); diff --git a/library/vendor/Zend/Navigation/Page/Uri.php b/library/vendor/Zend/Navigation/Page/Uri.php index e7414b060..e44e4a3b2 100644 --- a/library/vendor/Zend/Navigation/Page/Uri.php +++ b/library/vendor/Zend/Navigation/Page/Uri.php @@ -23,7 +23,6 @@ /** * @see Zend_Navigation_Page_Abstract */ -require_once 'Zend/Navigation/Page.php'; /** * Represents a page that is defined by specifying a URI @@ -53,7 +52,6 @@ class Zend_Navigation_Page_Uri extends Zend_Navigation_Page public function setUri($uri) { if (null !== $uri && !is_string($uri)) { - require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $uri must be a string or null'); } diff --git a/library/vendor/Zend/Oauth.php b/library/vendor/Zend/Oauth.php index 92e47374d..87dcceee4 100644 --- a/library/vendor/Zend/Oauth.php +++ b/library/vendor/Zend/Oauth.php @@ -20,7 +20,6 @@ */ /** Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; /** * @category Zend diff --git a/library/vendor/Zend/Oauth/Client.php b/library/vendor/Zend/Oauth/Client.php index 2d34faefb..5cc7e46d3 100644 --- a/library/vendor/Zend/Oauth/Client.php +++ b/library/vendor/Zend/Oauth/Client.php @@ -20,16 +20,12 @@ */ /** Zend_Oauth */ -require_once 'Zend/Oauth.php'; /** Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; /** Zend_Oauth_Http_Utility */ -require_once 'Zend/Oauth/Http/Utility.php'; /** Zend_Oauth_Config */ -require_once 'Zend/Oauth/Config.php'; /** * @category Zend @@ -248,7 +244,6 @@ class Zend_Oauth_Client extends Zend_Http_Client $this->setHeaders('Authorization', $oauthHeaderValue); } elseif ($requestScheme == Zend_Oauth::REQUEST_SCHEME_POSTBODY) { if ($requestMethod == self::GET) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'The client is configured to' . ' pass OAuth parameters through a POST body but request method' @@ -285,7 +280,6 @@ class Zend_Oauth_Client extends Zend_Http_Client $this->getUri()->setQuery($query); $this->paramsGet = array(); } else { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Invalid request scheme: ' . $requestScheme); } } @@ -321,7 +315,6 @@ class Zend_Oauth_Client extends Zend_Http_Client public function __call($method, array $args) { if (!method_exists($this->_config, $method)) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Method does not exist: ' . $method); } return call_user_func_array(array($this->_config,$method), $args); diff --git a/library/vendor/Zend/Oauth/Config.php b/library/vendor/Zend/Oauth/Config.php index 4edd2c15b..8d64ec35c 100644 --- a/library/vendor/Zend/Oauth/Config.php +++ b/library/vendor/Zend/Oauth/Config.php @@ -20,13 +20,10 @@ */ /** Zend_Oauth */ -require_once 'Zend/Oauth.php'; /** Zend_Uri */ -require_once 'Zend/Uri.php'; /** Zend_Oauth_Config_Interface */ -require_once 'Zend/Oauth/Config/ConfigInterface.php'; /** * @category Zend @@ -297,7 +294,6 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface 'HMAC-SHA1', 'HMAC-SHA256', 'RSA-SHA1', 'PLAINTEXT' )) ) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Unsupported signature method: ' . $method . '. Supported are HMAC-SHA1, RSA-SHA1, PLAINTEXT and HMAC-SHA256'); @@ -332,7 +328,6 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface Zend_Oauth::REQUEST_SCHEME_QUERYSTRING, )) ) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $scheme . '\' is an unsupported request scheme' ); @@ -340,7 +335,6 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface if ($scheme == Zend_Oauth::REQUEST_SCHEME_POSTBODY && $this->getRequestMethod() == Zend_Oauth::GET ) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'Cannot set POSTBODY request method if HTTP method set to GET' ); @@ -391,7 +385,6 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface public function setCallbackUrl($url) { if (!Zend_Uri::check($url) && $url !== 'oob') { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -420,7 +413,6 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface public function setSiteUrl($url) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -449,7 +441,6 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface public function setRequestTokenUrl($url) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -484,7 +475,6 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface public function setAccessTokenUrl($url) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -531,7 +521,6 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface public function setAuthorizeUrl($url) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -584,7 +573,6 @@ class Zend_Oauth_Config implements Zend_Oauth_Config_ConfigInterface Zend_Oauth::OPTIONS, )) ) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Invalid method: ' . $method); } $this->_requestMethod = $method; diff --git a/library/vendor/Zend/Oauth/Consumer.php b/library/vendor/Zend/Oauth/Consumer.php index 8fc3658e7..ee11e6382 100644 --- a/library/vendor/Zend/Oauth/Consumer.php +++ b/library/vendor/Zend/Oauth/Consumer.php @@ -20,25 +20,18 @@ */ /** Zend_Oauth */ -require_once 'Zend/Oauth.php'; /** Zend_Uri */ -require_once 'Zend/Uri.php'; /** Zend_Oauth_Http_RequestToken */ -require_once 'Zend/Oauth/Http/RequestToken.php'; /** Zend_Oauth_Http_UserAuthorization */ -require_once 'Zend/Oauth/Http/UserAuthorization.php'; /** Zend_Oauth_Http_AccessToken */ -require_once 'Zend/Oauth/Http/AccessToken.php'; /** Zend_Oauth_Token_AuthorizedRequest */ -require_once 'Zend/Oauth/Token/AuthorizedRequest.php'; /** Zend_Oauth_Config */ -require_once 'Zend/Oauth/Config.php'; /** * @category Zend @@ -189,7 +182,6 @@ class Zend_Oauth_Consumer extends Zend_Oauth ) { $authorizedToken = new Zend_Oauth_Token_AuthorizedRequest($queryData); if (!$authorizedToken->isValid()) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'Response from Service Provider is not a valid authorized request token'); } @@ -211,14 +203,12 @@ class Zend_Oauth_Consumer extends Zend_Oauth } if (isset($token)) { if ($authorizedToken->getToken() !== $token->getToken()) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'Authorized token from Service Provider does not match' . ' supplied Request Token details' ); } } else { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Request token must be passed to method'); } $this->_requestToken = $token; @@ -271,7 +261,6 @@ class Zend_Oauth_Consumer extends Zend_Oauth public function __call($method, array $args) { if (!method_exists($this->_config, $method)) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Method does not exist: '.$method); } return call_user_func_array(array($this->_config,$method), $args); diff --git a/library/vendor/Zend/Oauth/Exception.php b/library/vendor/Zend/Oauth/Exception.php index 67f439190..4b7749e43 100644 --- a/library/vendor/Zend/Oauth/Exception.php +++ b/library/vendor/Zend/Oauth/Exception.php @@ -22,7 +22,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Oauth/Http.php b/library/vendor/Zend/Oauth/Http.php index 923c4ece4..9a532e24e 100644 --- a/library/vendor/Zend/Oauth/Http.php +++ b/library/vendor/Zend/Oauth/Http.php @@ -20,10 +20,8 @@ */ /** Zend_Oauth_Http_Utility */ -require_once 'Zend/Oauth/Http/Utility.php'; /** Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; /** * @category Zend @@ -105,7 +103,6 @@ class Zend_Oauth_Http public function setMethod($method) { if (!in_array($method, array(Zend_Oauth::POST, Zend_Oauth::GET))) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('invalid HTTP method: ' . $method); } $this->_preferredRequestMethod = $method; @@ -174,7 +171,6 @@ class Zend_Oauth_Http try { $response = $this->_attemptRequest($params); } catch (Zend_Http_Client_Exception $e) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Error in HTTP request', null, $e); } if ($response !== null) { @@ -230,7 +226,6 @@ class Zend_Oauth_Http $this->_preferredRequestScheme = Zend_Oauth::REQUEST_SCHEME_QUERYSTRING; break; default: - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'Could not retrieve a valid Token response from Token URL:' . ($response !== null diff --git a/library/vendor/Zend/Oauth/Http/AccessToken.php b/library/vendor/Zend/Oauth/Http/AccessToken.php index d5548c5f4..b7180c38f 100644 --- a/library/vendor/Zend/Oauth/Http/AccessToken.php +++ b/library/vendor/Zend/Oauth/Http/AccessToken.php @@ -20,10 +20,8 @@ */ /** Zend_Oauth_Http */ -require_once 'Zend/Oauth/Http.php'; /** Zend_Oauth_Token_Access */ -require_once 'Zend/Oauth/Token/Access.php'; /** * @category Zend diff --git a/library/vendor/Zend/Oauth/Http/RequestToken.php b/library/vendor/Zend/Oauth/Http/RequestToken.php index 52e5b4368..53a263cce 100644 --- a/library/vendor/Zend/Oauth/Http/RequestToken.php +++ b/library/vendor/Zend/Oauth/Http/RequestToken.php @@ -20,10 +20,8 @@ */ /** Zend_Oauth_Http */ -require_once 'Zend/Oauth/Http.php'; /** Zend_Oauth_Token_Request */ -require_once 'Zend/Oauth/Token/Request.php'; /** * @category Zend diff --git a/library/vendor/Zend/Oauth/Http/UserAuthorization.php b/library/vendor/Zend/Oauth/Http/UserAuthorization.php index b7e84d6f0..b1564779d 100644 --- a/library/vendor/Zend/Oauth/Http/UserAuthorization.php +++ b/library/vendor/Zend/Oauth/Http/UserAuthorization.php @@ -20,10 +20,8 @@ */ /** Zend_Oauth_Http */ -require_once 'Zend/Oauth/Http.php'; /** Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; /** * @category Zend diff --git a/library/vendor/Zend/Oauth/Http/Utility.php b/library/vendor/Zend/Oauth/Http/Utility.php index 66d5a7987..2c9bd0a37 100644 --- a/library/vendor/Zend/Oauth/Http/Utility.php +++ b/library/vendor/Zend/Oauth/Http/Utility.php @@ -20,10 +20,8 @@ */ /** Zend_Oauth */ -require_once 'Zend/Oauth.php'; /** Zend_Oauth_Http */ -require_once 'Zend/Oauth/Http.php'; /** * @category Zend @@ -154,7 +152,6 @@ class Zend_Oauth_Http_Utility $className = 'Zend_Oauth_Signature_' . ucfirst(strtolower($signatureMethod)); } - require_once str_replace('_', '/', $className) . '.php'; $signatureObject = new $className($consumerSecret, $tokenSecret, $hashAlgo); return $signatureObject->sign($params, $method, $url); } diff --git a/library/vendor/Zend/Oauth/Signature/Hmac.php b/library/vendor/Zend/Oauth/Signature/Hmac.php index 2e78c807c..1e8dd772f 100644 --- a/library/vendor/Zend/Oauth/Signature/Hmac.php +++ b/library/vendor/Zend/Oauth/Signature/Hmac.php @@ -20,10 +20,8 @@ */ /** Zend_Oauth_Signature_SignatureAbstract */ -require_once 'Zend/Oauth/Signature/SignatureAbstract.php'; /** Zend_Crypt_Hmac */ -require_once 'Zend/Crypt/Hmac.php'; /** * @category Zend diff --git a/library/vendor/Zend/Oauth/Signature/Plaintext.php b/library/vendor/Zend/Oauth/Signature/Plaintext.php index 27b7fed28..743cbe37c 100644 --- a/library/vendor/Zend/Oauth/Signature/Plaintext.php +++ b/library/vendor/Zend/Oauth/Signature/Plaintext.php @@ -20,7 +20,6 @@ */ /** Zend_Oauth_Signature_SignatureAbstract */ -require_once 'Zend/Oauth/Signature/SignatureAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Oauth/Signature/Rsa.php b/library/vendor/Zend/Oauth/Signature/Rsa.php index 54768c31d..b593db1dc 100644 --- a/library/vendor/Zend/Oauth/Signature/Rsa.php +++ b/library/vendor/Zend/Oauth/Signature/Rsa.php @@ -20,10 +20,8 @@ */ /** Zend_Oauth_Signature_SignatureAbstract */ -require_once 'Zend/Oauth/Signature/SignatureAbstract.php'; /** Zend_Crypt_Rsa */ -require_once 'Zend/Crypt/Rsa.php'; /** * @category Zend diff --git a/library/vendor/Zend/Oauth/Signature/SignatureAbstract.php b/library/vendor/Zend/Oauth/Signature/SignatureAbstract.php index 3ddcb9939..4d8d7f77c 100644 --- a/library/vendor/Zend/Oauth/Signature/SignatureAbstract.php +++ b/library/vendor/Zend/Oauth/Signature/SignatureAbstract.php @@ -20,10 +20,8 @@ */ /** Zend_Oauth_Http_Utility */ -require_once 'Zend/Oauth/Http/Utility.php'; /** Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; /** * @category Zend diff --git a/library/vendor/Zend/Oauth/Token.php b/library/vendor/Zend/Oauth/Token.php index 4eff68b29..f39a5a941 100644 --- a/library/vendor/Zend/Oauth/Token.php +++ b/library/vendor/Zend/Oauth/Token.php @@ -20,7 +20,6 @@ */ /** Zend_Oauth_Http_Utility */ -require_once 'Zend/Oauth/Http/Utility.php'; /** * @category Zend diff --git a/library/vendor/Zend/Oauth/Token/Access.php b/library/vendor/Zend/Oauth/Token/Access.php index 25faa7c91..f9034ab4d 100644 --- a/library/vendor/Zend/Oauth/Token/Access.php +++ b/library/vendor/Zend/Oauth/Token/Access.php @@ -20,16 +20,12 @@ */ /** Zend_Oauth_Token */ -require_once 'Zend/Oauth/Token.php'; /** Zend_Oauth_Http */ -require_once 'Zend/Oauth/Http.php'; /** Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; /** Zend_Oauth_Client */ -require_once 'Zend/Oauth/Client.php'; /** * @category Zend @@ -52,7 +48,6 @@ class Zend_Oauth_Token_Access extends Zend_Oauth_Token $url, Zend_Oauth_Config_ConfigInterface $config, array $customParams = null, $realm = null ) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -72,7 +67,6 @@ class Zend_Oauth_Token_Access extends Zend_Oauth_Token public function toQueryString($url, Zend_Oauth_Config_ConfigInterface $config, array $params = null) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); diff --git a/library/vendor/Zend/Oauth/Token/AuthorizedRequest.php b/library/vendor/Zend/Oauth/Token/AuthorizedRequest.php index 93d6aeb1a..ac62aaaab 100644 --- a/library/vendor/Zend/Oauth/Token/AuthorizedRequest.php +++ b/library/vendor/Zend/Oauth/Token/AuthorizedRequest.php @@ -20,7 +20,6 @@ */ /** Zend_Oauth_Token */ -require_once 'Zend/Oauth/Token.php'; /** * @category Zend diff --git a/library/vendor/Zend/Oauth/Token/Request.php b/library/vendor/Zend/Oauth/Token/Request.php index a2cd65810..103113b5a 100644 --- a/library/vendor/Zend/Oauth/Token/Request.php +++ b/library/vendor/Zend/Oauth/Token/Request.php @@ -20,7 +20,6 @@ */ /** Zend_Oauth_Token */ -require_once 'Zend/Oauth/Token.php'; /** * @category Zend diff --git a/library/vendor/Zend/OpenId.php b/library/vendor/Zend/OpenId.php index 4fc678499..41a528bae 100644 --- a/library/vendor/Zend/OpenId.php +++ b/library/vendor/Zend/OpenId.php @@ -23,7 +23,6 @@ /** * @see Zend_Controller_Response_Abstract */ -require_once "Zend/Controller/Response/Abstract.php"; /** * Static class that contains common utility functions for @@ -430,7 +429,6 @@ class Zend_OpenId $url = Zend_OpenId::absoluteUrl($url); $body = ""; if (null === $response) { - require_once "Zend/Controller/Response/Http.php"; $response = new Zend_Controller_Response_Http(); } @@ -507,7 +505,6 @@ class Zend_OpenId return mhash(MHASH_SHA256 , $data); } } - require_once "Zend/OpenId/Exception.php"; throw new Zend_OpenId_Exception( 'Unsupported digest algorithm "' . $func . '".', Zend_OpenId_Exception::UNSUPPORTED_DIGEST); @@ -526,7 +523,6 @@ class Zend_OpenId */ static public function hashHmac($macFunc, $data, $secret) { -// require_once "Zend/Crypt/Hmac.php"; // return Zend_Crypt_Hmac::compute($secret, $macFunc, $data, Zend_Crypt_Hmac::BINARY); if (function_exists('hash_hmac')) { return hash_hmac($macFunc, $data, $secret, true); @@ -563,7 +559,6 @@ class Zend_OpenId } return $bn; } - require_once "Zend/OpenId/Exception.php"; throw new Zend_OpenId_Exception( 'The system doesn\'t have proper big integer extension', Zend_OpenId_Exception::UNSUPPORTED_LONG_MATH); @@ -592,7 +587,6 @@ class Zend_OpenId if ($cmp == 0) { return "\0"; } else if ($cmp < 0) { - require_once "Zend/OpenId/Exception.php"; throw new Zend_OpenId_Exception( 'Big integer arithmetic error', Zend_OpenId_Exception::ERROR_LONG_MATH); @@ -607,7 +601,6 @@ class Zend_OpenId } return $bin; } - require_once "Zend/OpenId/Exception.php"; throw new Zend_OpenId_Exception( 'The system doesn\'t have proper big integer extension', Zend_OpenId_Exception::UNSUPPORTED_LONG_MATH); @@ -710,7 +703,6 @@ class Zend_OpenId $bn_secret = bcpowmod($bn_pub_key, $dh['priv_key'], $dh['p']); return self::bigNumToBin($bn_secret); } - require_once "Zend/OpenId/Exception.php"; throw new Zend_OpenId_Exception( 'The system doesn\'t have proper big integer extension', Zend_OpenId_Exception::UNSUPPORTED_LONG_MATH); diff --git a/library/vendor/Zend/OpenId/Consumer.php b/library/vendor/Zend/OpenId/Consumer.php index b1521407b..43e343865 100644 --- a/library/vendor/Zend/OpenId/Consumer.php +++ b/library/vendor/Zend/OpenId/Consumer.php @@ -24,22 +24,18 @@ /** * @see Zend_OpenId */ -require_once "Zend/OpenId.php"; /** * @see Zend_OpenId_Extension */ -require_once "Zend/OpenId/Extension.php"; /** * @see Zend_OpenId_Consumer_Storage */ -require_once "Zend/OpenId/Consumer/Storage.php"; /** * @see Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; /** * OpenID consumer implementation @@ -115,7 +111,6 @@ class Zend_OpenId_Consumer $dumbMode = false) { if ($storage === null) { - require_once "Zend/OpenId/Consumer/Storage/File.php"; $this->_storage = new Zend_OpenId_Consumer_Storage_File(); } else { $this->_storage = $storage; @@ -221,7 +216,6 @@ class Zend_OpenId_Consumer $identity = $_SESSION["zend_openid"]["claimed_id"]; } } else { - require_once "Zend/Session/Namespace.php"; $this->_session = new Zend_Session_Namespace("zend_openid"); if ($this->_session->identity === $identity) { $identity = $this->_session->claimed_id; @@ -906,7 +900,6 @@ class Zend_OpenId_Consumer "identity" => $id, "claimed_id" => $claimedId); } else { - require_once "Zend/Session/Namespace.php"; $this->_session = new Zend_Session_Namespace("zend_openid"); $this->_session->identity = $id; $this->_session->claimed_id = $claimedId; diff --git a/library/vendor/Zend/OpenId/Consumer/Storage/File.php b/library/vendor/Zend/OpenId/Consumer/Storage/File.php index db94a9b7a..914a82142 100644 --- a/library/vendor/Zend/OpenId/Consumer/Storage/File.php +++ b/library/vendor/Zend/OpenId/Consumer/Storage/File.php @@ -24,7 +24,6 @@ /** * @see Zend_OpenId_Consumer_Storage */ -require_once "Zend/OpenId/Consumer/Storage.php"; /** * External storage implemmentation using serialized files @@ -73,7 +72,6 @@ class Zend_OpenId_Consumer_Storage_File extends Zend_OpenId_Consumer_Storage /** * @see Zend_OpenId_Exception */ - require_once 'Zend/OpenId/Exception.php'; throw new Zend_OpenId_Exception( 'Cannot access storage directory ' . $dir, Zend_OpenId_Exception::ERROR_STORAGE); @@ -83,7 +81,6 @@ class Zend_OpenId_Consumer_Storage_File extends Zend_OpenId_Consumer_Storage /** * @see Zend_OpenId_Exception */ - require_once 'Zend/OpenId/Exception.php'; throw new Zend_OpenId_Exception( 'Cannot create a lock file in the directory ' . $dir, Zend_OpenId_Exception::ERROR_STORAGE); @@ -93,7 +90,6 @@ class Zend_OpenId_Consumer_Storage_File extends Zend_OpenId_Consumer_Storage /** * @see Zend_OpenId_Exception */ - require_once 'Zend/OpenId/Exception.php'; throw new Zend_OpenId_Exception( 'Cannot create a lock file in the directory ' . $dir, Zend_OpenId_Exception::ERROR_STORAGE); @@ -103,7 +99,6 @@ class Zend_OpenId_Consumer_Storage_File extends Zend_OpenId_Consumer_Storage /** * @see Zend_OpenId_Exception */ - require_once 'Zend/OpenId/Exception.php'; throw new Zend_OpenId_Exception( 'Cannot create a lock file in the directory ' . $dir, Zend_OpenId_Exception::ERROR_STORAGE); diff --git a/library/vendor/Zend/OpenId/Exception.php b/library/vendor/Zend/OpenId/Exception.php index 2e3c3e75a..4a7b867d4 100644 --- a/library/vendor/Zend/OpenId/Exception.php +++ b/library/vendor/Zend/OpenId/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Exception */ -require_once "Zend/Exception.php"; /** * Exception class for Zend_OpenId diff --git a/library/vendor/Zend/OpenId/Extension/Sreg.php b/library/vendor/Zend/OpenId/Extension/Sreg.php index db7ad4488..525153518 100644 --- a/library/vendor/Zend/OpenId/Extension/Sreg.php +++ b/library/vendor/Zend/OpenId/Extension/Sreg.php @@ -23,7 +23,6 @@ /** * @see Zend_OpenId_Extension */ -require_once "Zend/OpenId/Extension.php"; /** * 'Simple Refistration Extension' for Zend_OpenId diff --git a/library/vendor/Zend/OpenId/Provider.php b/library/vendor/Zend/OpenId/Provider.php index 6310a1a2b..19f5411cd 100644 --- a/library/vendor/Zend/OpenId/Provider.php +++ b/library/vendor/Zend/OpenId/Provider.php @@ -24,12 +24,10 @@ /** * @see Zend_OpenId */ -require_once "Zend/OpenId.php"; /** * @see Zend_OpenId_Extension */ -require_once "Zend/OpenId/Extension.php"; /** * OpenID provider (server) implementation @@ -123,13 +121,11 @@ class Zend_OpenId_Provider } $this->_trustUrl = $trustUrl; if ($user === null) { - require_once "Zend/OpenId/Provider/User/Session.php"; $this->_user = new Zend_OpenId_Provider_User_Session(); } else { $this->_user = $user; } if ($storage === null) { - require_once "Zend/OpenId/Provider/Storage/File.php"; $this->_storage = new Zend_OpenId_Provider_Storage_File(); } else { $this->_storage = $storage; diff --git a/library/vendor/Zend/OpenId/Provider/Storage/File.php b/library/vendor/Zend/OpenId/Provider/Storage/File.php index 64447be14..1ddf62501 100644 --- a/library/vendor/Zend/OpenId/Provider/Storage/File.php +++ b/library/vendor/Zend/OpenId/Provider/Storage/File.php @@ -24,7 +24,6 @@ /** * @see Zend_OpenId_Provider_Storage */ -require_once "Zend/OpenId/Provider/Storage.php"; /** * External storage implemmentation using serialized files diff --git a/library/vendor/Zend/OpenId/Provider/User/Session.php b/library/vendor/Zend/OpenId/Provider/User/Session.php index 18607dc21..026d4b3c0 100644 --- a/library/vendor/Zend/OpenId/Provider/User/Session.php +++ b/library/vendor/Zend/OpenId/Provider/User/Session.php @@ -24,12 +24,10 @@ /** * @see Zend_OpenId_Provider_User */ -require_once "Zend/OpenId/Provider/User.php"; /** * @see Zend_Session_Namespace */ -require_once "Zend/Session/Namespace.php"; /** * Class to get/store information about logged in user in Web Browser using diff --git a/library/vendor/Zend/Paginator.php b/library/vendor/Zend/Paginator.php index 6da6a8dec..8640f677d 100644 --- a/library/vendor/Zend/Paginator.php +++ b/library/vendor/Zend/Paginator.php @@ -22,12 +22,10 @@ /** * @see Zend_Loader_PluginLoader */ -require_once 'Zend/Loader/PluginLoader.php'; /** * @see Zend_Json */ -require_once 'Zend/Json.php'; /** * @category Zend @@ -290,7 +288,6 @@ class Zend_Paginator implements Countable, IteratorAggregate /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('No adapter for type ' . $type); } @@ -456,7 +453,6 @@ class Zend_Paginator implements Countable, IteratorAggregate /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception( 'Zend_Paginator only accepts instances of the type ' . @@ -700,7 +696,6 @@ class Zend_Paginator implements Countable, IteratorAggregate /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('Page ' . $pageNumber . ' does not exist'); } @@ -715,7 +710,6 @@ class Zend_Paginator implements Countable, IteratorAggregate /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('Page ' . $pageNumber . ' does not' . ' contain item number ' . $itemNumber); @@ -916,7 +910,6 @@ class Zend_Paginator implements Countable, IteratorAggregate /** * @see Zend_Controller_Action_HelperBroker */ - require_once 'Zend/Controller/Action/HelperBroker.php'; $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); if ($viewRenderer->view === null) { @@ -1144,7 +1137,6 @@ class Zend_Paginator implements Countable, IteratorAggregate /** * @see Zend_View_Exception */ - require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception('Scrolling style must implement ' . 'Zend_Paginator_ScrollingStyle_Interface'); @@ -1164,7 +1156,6 @@ class Zend_Paginator implements Countable, IteratorAggregate /** * @see Zend_View_Exception */ - require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception('Scrolling style must be a class ' . 'name or object implementing Zend_Paginator_ScrollingStyle_Interface'); diff --git a/library/vendor/Zend/Paginator/Adapter/Array.php b/library/vendor/Zend/Paginator/Adapter/Array.php index a8251d101..0af9e66b0 100644 --- a/library/vendor/Zend/Paginator/Adapter/Array.php +++ b/library/vendor/Zend/Paginator/Adapter/Array.php @@ -22,7 +22,6 @@ /** * @see Zend_Paginator_Adapter_Interface */ -require_once 'Zend/Paginator/Adapter/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Paginator/Adapter/DbSelect.php b/library/vendor/Zend/Paginator/Adapter/DbSelect.php index ccc47dfee..94b201b56 100644 --- a/library/vendor/Zend/Paginator/Adapter/DbSelect.php +++ b/library/vendor/Zend/Paginator/Adapter/DbSelect.php @@ -22,17 +22,14 @@ /** * @see Zend_Paginator_Adapter_Interface */ -require_once 'Zend/Paginator/Adapter/Interface.php'; /** * @see Zend_Db */ -require_once 'Zend/Db.php'; /** * @see Zend_Db_Select */ -require_once 'Zend/Db/Select.php'; /** * @category Zend @@ -134,7 +131,6 @@ class Zend_Paginator_Adapter_DbSelect implements Zend_Paginator_Adapter_Interfac /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('Row count column not found'); } @@ -148,7 +144,6 @@ class Zend_Paginator_Adapter_DbSelect implements Zend_Paginator_Adapter_Interfac /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('Invalid row count'); } diff --git a/library/vendor/Zend/Paginator/Adapter/DbTableSelect.php b/library/vendor/Zend/Paginator/Adapter/DbTableSelect.php index d51289786..c87f3f995 100644 --- a/library/vendor/Zend/Paginator/Adapter/DbTableSelect.php +++ b/library/vendor/Zend/Paginator/Adapter/DbTableSelect.php @@ -22,7 +22,6 @@ /** * @see Zend_Paginator_Adapter_DbSelect */ -require_once 'Zend/Paginator/Adapter/DbSelect.php'; /** * @category Zend diff --git a/library/vendor/Zend/Paginator/Adapter/Iterator.php b/library/vendor/Zend/Paginator/Adapter/Iterator.php index 4445505a3..f69804e2e 100644 --- a/library/vendor/Zend/Paginator/Adapter/Iterator.php +++ b/library/vendor/Zend/Paginator/Adapter/Iterator.php @@ -22,12 +22,10 @@ /** * @see Zend_Paginator_Adapter_Interface */ -require_once 'Zend/Paginator/Adapter/Interface.php'; /** * @see Zend_Paginator_SerializableLimitIterator */ -require_once 'Zend/Paginator/SerializableLimitIterator.php'; /** * @category Zend @@ -63,7 +61,6 @@ class Zend_Paginator_Adapter_Iterator implements Zend_Paginator_Adapter_Interfac /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('Iterator must implement Countable'); } diff --git a/library/vendor/Zend/Paginator/Adapter/Null.php b/library/vendor/Zend/Paginator/Adapter/Null.php index 0b40de704..f53b9e70e 100644 --- a/library/vendor/Zend/Paginator/Adapter/Null.php +++ b/library/vendor/Zend/Paginator/Adapter/Null.php @@ -22,7 +22,6 @@ /** * @see Zend_Paginator_Adapter_Interface */ -require_once 'Zend/Paginator/Adapter/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Paginator/Exception.php b/library/vendor/Zend/Paginator/Exception.php index 96aec1738..455671284 100644 --- a/library/vendor/Zend/Paginator/Exception.php +++ b/library/vendor/Zend/Paginator/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Paginator/ScrollingStyle/All.php b/library/vendor/Zend/Paginator/ScrollingStyle/All.php index 17217a7a8..52d3a5165 100644 --- a/library/vendor/Zend/Paginator/ScrollingStyle/All.php +++ b/library/vendor/Zend/Paginator/ScrollingStyle/All.php @@ -22,7 +22,6 @@ /** * @see Zend_Paginator_ScrollingStyle_Interface */ -require_once 'Zend/Paginator/ScrollingStyle/Interface.php'; /** * A scrolling style that returns every page in the collection. diff --git a/library/vendor/Zend/Paginator/ScrollingStyle/Elastic.php b/library/vendor/Zend/Paginator/ScrollingStyle/Elastic.php index 9cbe4863b..ab708fc14 100644 --- a/library/vendor/Zend/Paginator/ScrollingStyle/Elastic.php +++ b/library/vendor/Zend/Paginator/ScrollingStyle/Elastic.php @@ -22,7 +22,6 @@ /** * @see Zend_Paginator_ScrollingStyle_Sliding */ -require_once 'Zend/Paginator/ScrollingStyle/Sliding.php'; /** * A Google-like scrolling style. Incrementally expands the range to about diff --git a/library/vendor/Zend/Paginator/ScrollingStyle/Jumping.php b/library/vendor/Zend/Paginator/ScrollingStyle/Jumping.php index 226ffbd10..651d5eefa 100644 --- a/library/vendor/Zend/Paginator/ScrollingStyle/Jumping.php +++ b/library/vendor/Zend/Paginator/ScrollingStyle/Jumping.php @@ -22,7 +22,6 @@ /** * @see Zend_Paginator_ScrollingStyle_Interface */ -require_once 'Zend/Paginator/ScrollingStyle/Interface.php'; /** * A scrolling style in which the cursor advances to the upper bound diff --git a/library/vendor/Zend/Paginator/ScrollingStyle/Sliding.php b/library/vendor/Zend/Paginator/ScrollingStyle/Sliding.php index 0e0671d5c..532efe3bb 100644 --- a/library/vendor/Zend/Paginator/ScrollingStyle/Sliding.php +++ b/library/vendor/Zend/Paginator/ScrollingStyle/Sliding.php @@ -22,7 +22,6 @@ /** * @see Zend_Paginator_ScrollingStyle_Interface */ -require_once 'Zend/Paginator/ScrollingStyle/Interface.php'; /** * A Yahoo! Search-like scrolling style. The cursor will advance to diff --git a/library/vendor/Zend/ProgressBar.php b/library/vendor/Zend/ProgressBar.php index c2a3f4e8d..5bcb00d98 100644 --- a/library/vendor/Zend/ProgressBar.php +++ b/library/vendor/Zend/ProgressBar.php @@ -89,7 +89,6 @@ class Zend_ProgressBar { // Check min/max values and set them if ($min > $max) { - require_once 'Zend/ProgressBar/Exception.php'; throw new Zend_ProgressBar_Exception('$max must be greater than $min'); } @@ -99,7 +98,6 @@ class Zend_ProgressBar // See if we have to open a session namespace if ($persistenceNamespace !== null) { - require_once 'Zend/Session/Namespace.php'; $this->_persistenceNamespace = new Zend_Session_Namespace($persistenceNamespace); } diff --git a/library/vendor/Zend/ProgressBar/Adapter/Console.php b/library/vendor/Zend/ProgressBar/Adapter/Console.php index bf8a33588..7b4ae8dae 100644 --- a/library/vendor/Zend/ProgressBar/Adapter/Console.php +++ b/library/vendor/Zend/ProgressBar/Adapter/Console.php @@ -20,12 +20,10 @@ /** * @see Zend_ProgressBar_Adapter */ -require_once 'Zend/ProgressBar/Adapter.php'; /** * @see Zend_Text_MultiByte */ -require_once 'Zend/Text/MultiByte.php'; /** * Zend_ProgressBar_Adapter_Console offers a text-based progressbar for console @@ -190,7 +188,6 @@ class Zend_ProgressBar_Adapter_Console extends Zend_ProgressBar_Adapter $stream = @fopen($resource, 'w'); if ($stream === false) { - require_once 'Zend/ProgressBar/Adapter/Exception.php'; throw new Zend_ProgressBar_Adapter_Exception('Unable to open stream'); } @@ -269,7 +266,6 @@ class Zend_ProgressBar_Adapter_Console extends Zend_ProgressBar_Adapter self::ELEMENT_TEXT); if (count(array_diff($elements, $allowedElements)) > 0) { - require_once 'Zend/ProgressBar/Adapter/Exception.php'; throw new Zend_ProgressBar_Adapter_Exception('Invalid element found in $elements array'); } @@ -290,7 +286,6 @@ class Zend_ProgressBar_Adapter_Console extends Zend_ProgressBar_Adapter public function setBarLeftChar($char) { if (empty($char)) { - require_once 'Zend/ProgressBar/Adapter/Exception.php'; throw new Zend_ProgressBar_Adapter_Exception('Character may not be empty'); } @@ -309,7 +304,6 @@ class Zend_ProgressBar_Adapter_Console extends Zend_ProgressBar_Adapter public function setBarRightChar($char) { if (empty($char)) { - require_once 'Zend/ProgressBar/Adapter/Exception.php'; throw new Zend_ProgressBar_Adapter_Exception('Character may not be empty'); } @@ -370,7 +364,6 @@ class Zend_ProgressBar_Adapter_Console extends Zend_ProgressBar_Adapter self::FINISH_ACTION_NONE); if (!in_array($action, $allowedActions)) { - require_once 'Zend/ProgressBar/Adapter/Exception.php'; throw new Zend_ProgressBar_Adapter_Exception('Invalid finish action specified'); } diff --git a/library/vendor/Zend/ProgressBar/Adapter/Exception.php b/library/vendor/Zend/ProgressBar/Adapter/Exception.php index 0071be861..c98664b48 100644 --- a/library/vendor/Zend/ProgressBar/Adapter/Exception.php +++ b/library/vendor/Zend/ProgressBar/Adapter/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_ProgressBar_Exception */ -require_once 'Zend/ProgressBar/Exception.php'; /** * Exception class for Zend_ProgressBar_Adapter diff --git a/library/vendor/Zend/ProgressBar/Adapter/JsPull.php b/library/vendor/Zend/ProgressBar/Adapter/JsPull.php index a8d39ded5..4dcfbaba3 100644 --- a/library/vendor/Zend/ProgressBar/Adapter/JsPull.php +++ b/library/vendor/Zend/ProgressBar/Adapter/JsPull.php @@ -20,12 +20,10 @@ /** * @see Zend_Json */ -require_once 'Zend/Json.php'; /** * @see Zend_ProgressBar_Adapter */ -require_once 'Zend/ProgressBar/Adapter.php'; /** * Zend_ProgressBar_Adapter_JsPull offers a simple method for updating a diff --git a/library/vendor/Zend/ProgressBar/Adapter/JsPush.php b/library/vendor/Zend/ProgressBar/Adapter/JsPush.php index f6f4e1649..461f40d39 100644 --- a/library/vendor/Zend/ProgressBar/Adapter/JsPush.php +++ b/library/vendor/Zend/ProgressBar/Adapter/JsPush.php @@ -20,12 +20,10 @@ /** * @see Zend_Json */ -require_once 'Zend/Json.php'; /** * @see Zend_ProgressBar_Adapter */ -require_once 'Zend/ProgressBar/Adapter.php'; /** * Zend_ProgressBar_Adapter_JsPush offers a simple method for updating a diff --git a/library/vendor/Zend/ProgressBar/Exception.php b/library/vendor/Zend/ProgressBar/Exception.php index 6e71aa7ac..043ce9ba4 100644 --- a/library/vendor/Zend/ProgressBar/Exception.php +++ b/library/vendor/Zend/ProgressBar/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Exception class for Zend_ProgressBar diff --git a/library/vendor/Zend/Queue.php b/library/vendor/Zend/Queue.php index 04149aa92..773c816f2 100644 --- a/library/vendor/Zend/Queue.php +++ b/library/vendor/Zend/Queue.php @@ -106,7 +106,6 @@ class Zend_Queue implements Countable if ((null === $adapter) && (!is_array($options) && (!$options instanceof Zend_Config)) ) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('No valid params passed to constructor'); } @@ -227,7 +226,6 @@ class Zend_Queue implements Countable ); if (!class_exists($adapterName)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($adapterName); } @@ -239,7 +237,6 @@ class Zend_Queue implements Countable } if (!$adapter instanceof Zend_Queue_Adapter_AdapterInterface) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Adapter class '" . get_class($adapterName) . "' does not implement Zend_Queue_Adapter_AdapterInterface"); } @@ -324,12 +321,10 @@ class Zend_Queue implements Countable public function createQueue($name, $timeout = null) { if (!is_string($name)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$name is not a string'); } if ((null !== $timeout) && !is_integer($timeout)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$timeout must be an integer'); } @@ -378,7 +373,6 @@ class Zend_Queue implements Countable /** * @see Zend_Queue_Adapter_Null */ - require_once('Zend/Queue/Adapter/Null.php'); $this->setAdapter(new Zend_Queue_Adapter_Null($this->getOptions())); return $deleted; @@ -439,12 +433,10 @@ class Zend_Queue implements Countable public function receive($maxMessages=null, $timeout=null) { if (($maxMessages !== null) && !is_integer($maxMessages)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$maxMessages must be an integer or null'); } if (($timeout !== null) && !is_integer($timeout)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$timeout must be an integer or null'); } @@ -524,7 +516,6 @@ class Zend_Queue implements Countable /** * @see Zend_Queue_Exception */ - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("$name is not a string"); } diff --git a/library/vendor/Zend/Queue/Adapter/Activemq.php b/library/vendor/Zend/Queue/Adapter/Activemq.php index 807a58052..ca2ab7caf 100644 --- a/library/vendor/Zend/Queue/Adapter/Activemq.php +++ b/library/vendor/Zend/Queue/Adapter/Activemq.php @@ -23,17 +23,14 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * @see Zend_Queue_Adapter_Stomp_Client */ -require_once 'Zend/Queue/Stomp/Client.php'; /** * @see Zend_Queue_Adapter_Stomp_Frame */ -require_once 'Zend/Queue/Stomp/Frame.php'; /** * Class for using Stomp to talk to an Stomp compliant server @@ -103,7 +100,6 @@ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract if ((false !== $response) && ($response->getCommand() != 'CONNECTED') ) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Unable to authenticate to '".$options['scheme'].'://'.$options['host'].':'.$options['port']."'"); } } @@ -132,7 +128,6 @@ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract */ public function create($name, $timeout=null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('create() is not supported in ' . get_class($this)); } @@ -145,7 +140,6 @@ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract */ public function delete($name) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('delete() is not supported in ' . get_class($this)); } @@ -177,7 +171,6 @@ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract */ public function getQueues() { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('getQueues() is not supported in this adapter'); } @@ -253,7 +246,6 @@ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract break; default: $block = print_r($response, true); - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Invalid response received: ' . $block); } } @@ -269,7 +261,6 @@ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract $classname = $queue->getMessageSetClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -309,7 +300,6 @@ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract $classname = $queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -324,7 +314,6 @@ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract */ public function count(Zend_Queue $queue=null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('count() is not supported in this adapter'); } @@ -337,7 +326,6 @@ class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract */ public function isExists($name) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('isExists() is not supported in this adapter'); } diff --git a/library/vendor/Zend/Queue/Adapter/AdapterAbstract.php b/library/vendor/Zend/Queue/Adapter/AdapterAbstract.php index 80c54f0da..8374aba2e 100644 --- a/library/vendor/Zend/Queue/Adapter/AdapterAbstract.php +++ b/library/vendor/Zend/Queue/Adapter/AdapterAbstract.php @@ -23,12 +23,10 @@ /** * @see Zend_Queue */ -require_once 'Zend/Queue.php'; /** * @see Zend_Queue_Adapter_AdapterInterface */ -require_once 'Zend/Queue/Adapter/AdapterInterface.php'; /** * Class for connecting to queues performing common operations. @@ -106,7 +104,6 @@ abstract class Zend_Queue_Adapter_AdapterAbstract * Verify that adapter parameters are in an array. */ if (!is_array($options)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Adapter options must be an array or Zend_Config object'); } @@ -121,7 +118,6 @@ abstract class Zend_Queue_Adapter_AdapterAbstract // Normalize the options and merge with the defaults if (array_key_exists('options', $options)) { if (!is_array($options['options'])) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array 'options' must be an array"); } diff --git a/library/vendor/Zend/Queue/Adapter/Array.php b/library/vendor/Zend/Queue/Adapter/Array.php index 63c17ac6a..12a6079e6 100644 --- a/library/vendor/Zend/Queue/Adapter/Array.php +++ b/library/vendor/Zend/Queue/Adapter/Array.php @@ -23,7 +23,6 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * Class for using a standard PHP array as a queue @@ -146,7 +145,6 @@ class Zend_Queue_Adapter_Array extends Zend_Queue_Adapter_AdapterAbstract /** * @see Zend_Queue_Exception */ - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue does not exist'); } @@ -172,7 +170,6 @@ class Zend_Queue_Adapter_Array extends Zend_Queue_Adapter_AdapterAbstract } if (!$this->isExists($queue->getName())) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue does not exist:' . $queue->getName()); } @@ -196,7 +193,6 @@ class Zend_Queue_Adapter_Array extends Zend_Queue_Adapter_AdapterAbstract $classname = $queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -255,7 +251,6 @@ class Zend_Queue_Adapter_Array extends Zend_Queue_Adapter_AdapterAbstract $classname = $queue->getMessageSetClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); diff --git a/library/vendor/Zend/Queue/Adapter/Db.php b/library/vendor/Zend/Queue/Adapter/Db.php index c2fc10c81..87ce40fab 100644 --- a/library/vendor/Zend/Queue/Adapter/Db.php +++ b/library/vendor/Zend/Queue/Adapter/Db.php @@ -23,27 +23,22 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * @see Zend_Db_Select */ -require_once 'Zend/Db/Select.php'; /** * @see Zend_Db */ -require_once 'Zend/Db.php'; /** * @see Zend_Queue_Adapter_Db_Queue */ -require_once 'Zend/Queue/Adapter/Db/Queue.php'; /** * @see Zend_Queue_Adapter_Db_Message */ -require_once 'Zend/Queue/Adapter/Db/Message.php'; /** * Class for using connecting to a Zend_Db-based queuing system @@ -88,7 +83,6 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract } if (!is_bool($this->_options['options'][Zend_Db_Select::FOR_UPDATE])) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Options array item: Zend_Db_Select::FOR_UPDATE must be boolean'); } @@ -121,27 +115,22 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract { $options = &$this->_options['driverOptions']; if (!array_key_exists('type', $options)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array must have a key for 'type' for the database type to use"); } if (!array_key_exists('host', $options)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array must have a key for 'host' for the host to use"); } if (!array_key_exists('username', $options)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array must have a key for 'username' for the username to use"); } if (!array_key_exists('password', $options)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array must have a key for 'password' for the password to use"); } if (!array_key_exists('dbname', $options)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array must have a key for 'dbname' for the database to use"); } @@ -151,7 +140,6 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract try { $db = Zend_Db::factory($type, $options); } catch (Zend_Db_Exception $e) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Error connecting to database: ' . $e->getMessage(), $e->getCode(), $e); } @@ -214,7 +202,6 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract return true; } } catch (Exception $e) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e); } @@ -245,7 +232,6 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract try { $queue->delete(); } catch (Exception $e) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -334,7 +320,6 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract } if (!$this->isExists($queue->getName())) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue does not exist:' . $queue->getName()); } @@ -348,7 +333,6 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract try { $msg->save(); } catch (Exception $e) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e); } @@ -359,7 +343,6 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract $classname = $queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -433,7 +416,6 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract } catch (Exception $e) { $db->rollBack(); - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e); } @@ -445,7 +427,6 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract $classname = $queue->getMessageSetClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -525,7 +506,6 @@ class Zend_Queue_Adapter_Db extends Zend_Queue_Adapter_AdapterAbstract $queue = $this->_queueTable->fetchRow($query); if ($queue === null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue does not exist: ' . $name); } diff --git a/library/vendor/Zend/Queue/Adapter/Db/Message.php b/library/vendor/Zend/Queue/Adapter/Db/Message.php index 4d5517965..ad170fdd7 100644 --- a/library/vendor/Zend/Queue/Adapter/Db/Message.php +++ b/library/vendor/Zend/Queue/Adapter/Db/Message.php @@ -23,7 +23,6 @@ /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Queue/Adapter/Db/Queue.php b/library/vendor/Zend/Queue/Adapter/Db/Queue.php index 063b09922..30242ca49 100644 --- a/library/vendor/Zend/Queue/Adapter/Db/Queue.php +++ b/library/vendor/Zend/Queue/Adapter/Db/Queue.php @@ -23,7 +23,6 @@ /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Queue/Adapter/Memcacheq.php b/library/vendor/Zend/Queue/Adapter/Memcacheq.php index b6ec5f396..5f70fd13f 100644 --- a/library/vendor/Zend/Queue/Adapter/Memcacheq.php +++ b/library/vendor/Zend/Queue/Adapter/Memcacheq.php @@ -23,7 +23,6 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * Class for using connecting to a Zend_Cache-based queuing system @@ -74,7 +73,6 @@ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract public function __construct($options, Zend_Queue $queue = null) { if (!extension_loaded('memcache')) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Memcache extension does not appear to be loaded'); } @@ -94,7 +92,6 @@ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract $result = $this->_cache->connect($options['host'], $options['port']); if ($result === false) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Could not connect to MemcacheQ'); } @@ -233,7 +230,6 @@ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract */ public function count(Zend_Queue $queue=null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('count() is not supported in this adapter'); } @@ -256,7 +252,6 @@ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract } if (!$this->isExists($queue->getName())) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue does not exist:' . $queue->getName()); } @@ -270,7 +265,6 @@ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract $result = $this->_cache->set($queue->getName(), $message, 0, 0); if ($result === false) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('failed to insert message into queue:' . $queue->getName()); } @@ -281,7 +275,6 @@ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract $classname = $queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -329,7 +322,6 @@ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract $classname = $queue->getMessageSetClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -347,7 +339,6 @@ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract */ public function deleteMessage(Zend_Queue_Message $message) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('deleteMessage() is not supported in ' . get_class($this)); } @@ -401,7 +392,6 @@ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract $this->_socket = fsockopen($this->_host, $this->_port, $errno, $errstr, 10); } if ($this->_socket === false) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Could not open a connection to $this->_host:$this->_port errno=$errno : $errstr"); } diff --git a/library/vendor/Zend/Queue/Adapter/Null.php b/library/vendor/Zend/Queue/Adapter/Null.php index 794c06ba0..dc40aff5b 100644 --- a/library/vendor/Zend/Queue/Adapter/Null.php +++ b/library/vendor/Zend/Queue/Adapter/Null.php @@ -23,7 +23,6 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * Class testing. No supported functions. Also used to disable a Zend_Queue. @@ -59,7 +58,6 @@ class Zend_Queue_Adapter_Null extends Zend_Queue_Adapter_AdapterAbstract */ public function isExists($name) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -71,7 +69,6 @@ class Zend_Queue_Adapter_Null extends Zend_Queue_Adapter_AdapterAbstract */ public function create($name, $timeout=null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -82,7 +79,6 @@ class Zend_Queue_Adapter_Null extends Zend_Queue_Adapter_AdapterAbstract */ public function delete($name) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -93,7 +89,6 @@ class Zend_Queue_Adapter_Null extends Zend_Queue_Adapter_AdapterAbstract */ public function getQueues() { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -104,7 +99,6 @@ class Zend_Queue_Adapter_Null extends Zend_Queue_Adapter_AdapterAbstract */ public function count(Zend_Queue $queue=null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -119,7 +113,6 @@ class Zend_Queue_Adapter_Null extends Zend_Queue_Adapter_AdapterAbstract */ public function send($message, Zend_Queue $queue=null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -130,7 +123,6 @@ class Zend_Queue_Adapter_Null extends Zend_Queue_Adapter_AdapterAbstract */ public function receive($maxMessages=null, $timeout=null, Zend_Queue $queue=null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -141,7 +133,6 @@ class Zend_Queue_Adapter_Null extends Zend_Queue_Adapter_AdapterAbstract */ public function deleteMessage(Zend_Queue_Message $message) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } diff --git a/library/vendor/Zend/Queue/Adapter/PlatformJobQueue.php b/library/vendor/Zend/Queue/Adapter/PlatformJobQueue.php index dafabd017..7d8819955 100644 --- a/library/vendor/Zend/Queue/Adapter/PlatformJobQueue.php +++ b/library/vendor/Zend/Queue/Adapter/PlatformJobQueue.php @@ -23,7 +23,6 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * Zend Platform JobQueue adapter @@ -53,34 +52,28 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst parent::__construct($options, $queue); if (!extension_loaded("jobqueue_client")) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Platform Job Queue extension does not appear to be loaded'); } if (! isset($this->_options['daemonOptions'])) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Job Queue host and password should be provided'); } $options = $this->_options['daemonOptions']; if (!array_key_exists('host', $options)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Platform Job Queue host should be provided'); } if (!array_key_exists('password', $options)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Platform Job Queue password should be provided'); } $this->_zendQueue = new ZendApi_Queue($options['host']); if (!$this->_zendQueue) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Platform Job Queue connection failed'); } if (!$this->_zendQueue->login($options['password'])) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Job Queue login failed'); } @@ -102,7 +95,6 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst */ public function isExists($name) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('isExists() is not supported in this adapter'); } @@ -116,7 +108,6 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst */ public function create($name, $timeout=null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('create() is not supported in ' . get_class($this)); } @@ -129,7 +120,6 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst */ public function delete($name) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('delete() is not supported in ' . get_class($this)); } @@ -141,7 +131,6 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst */ public function getQueues() { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('getQueues() is not supported in this adapter'); } @@ -154,7 +143,6 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst public function count(Zend_Queue $queue = null) { if ($queue !== null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue parameter is not supported'); } @@ -176,14 +164,12 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst public function send($message, Zend_Queue $queue = null) { if ($queue !== null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue parameter is not supported'); } // This adapter can work only for this message type $classname = $this->_queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } @@ -199,7 +185,6 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst $jobId = $this->_zendQueue->addJob($platformJob); if (!$jobId) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Failed to add a job to queue: ' . $this->_zendQueue->getLastError()); } @@ -224,7 +209,6 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst } if ($queue !== null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue shouldn\'t be set'); } @@ -232,7 +216,6 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst $classname = $this->_queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } @@ -245,7 +228,6 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst $classname = $this->_queue->getMessageSetClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -264,7 +246,6 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst public function deleteMessage(Zend_Queue_Message $message) { if (get_class($message) != $this->_queue->getMessageClass()) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception( 'Failed to remove job from the queue; only messages of type ' . 'Zend_Queue_Message_PlatformJob may be used' @@ -332,11 +313,9 @@ class Zend_Queue_Adapter_PlatformJobQueue extends Zend_Queue_Adapter_AdapterAbst $this->_zendQueue = new ZendApi_Queue($options['host']); if (!$this->_zendQueue) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Platform Job Queue connection failed'); } if (!$this->_zendQueue->login($options['password'])) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Job Queue login failed'); } } diff --git a/library/vendor/Zend/Queue/Exception.php b/library/vendor/Zend/Queue/Exception.php index ec464edf9..d1101604b 100644 --- a/library/vendor/Zend/Queue/Exception.php +++ b/library/vendor/Zend/Queue/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Queue/Message.php b/library/vendor/Zend/Queue/Message.php index 9557ca02a..5f1e72d8f 100644 --- a/library/vendor/Zend/Queue/Message.php +++ b/library/vendor/Zend/Queue/Message.php @@ -79,7 +79,6 @@ class Zend_Queue_Message $result = get_class($options['queue']); } - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception( '$options[\'queue\'] = ' . $result @@ -89,7 +88,6 @@ class Zend_Queue_Message } if (isset($options['data'])) { if (!is_array($options['data'])) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Data must be an array'); } $this->_data = $options['data']; @@ -106,7 +104,6 @@ class Zend_Queue_Message public function __get($key) { if (!array_key_exists($key, $this->_data)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Specified field \"$key\" is not in the message"); } return $this->_data[$key]; @@ -123,7 +120,6 @@ class Zend_Queue_Message public function __set($key, $value) { if (!array_key_exists($key, $this->_data)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Specified field \"$key\" is not in the message"); } $this->_data[$key] = $value; diff --git a/library/vendor/Zend/Queue/Message/Iterator.php b/library/vendor/Zend/Queue/Message/Iterator.php index 39c32013d..92c24b5b7 100644 --- a/library/vendor/Zend/Queue/Message/Iterator.php +++ b/library/vendor/Zend/Queue/Message/Iterator.php @@ -93,14 +93,12 @@ class Zend_Queue_Message_Iterator implements Iterator, Countable } if (!is_array($options['data'])) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('array optionsuration must have $options[\'data\'] = array'); } // load the message class $classname = $this->_messageClass; if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } diff --git a/library/vendor/Zend/Queue/Message/PlatformJob.php b/library/vendor/Zend/Queue/Message/PlatformJob.php index 97ba79a18..94e143327 100644 --- a/library/vendor/Zend/Queue/Message/PlatformJob.php +++ b/library/vendor/Zend/Queue/Message/PlatformJob.php @@ -23,7 +23,6 @@ /** * @see Zend_Queue_Message */ -require_once 'Zend/Queue/Message.php'; /** * Class for managing Zend Platform JobQueue jobs via Zend_Queue @@ -68,7 +67,6 @@ class Zend_Queue_Message_PlatformJob extends Zend_Queue_Message { if (isset($options['data'])) { if (!($options['data'] instanceof ZendApi_Job)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Data must be an instance of ZendApi_Job'); } $this->_job = $options['data']; @@ -77,7 +75,6 @@ class Zend_Queue_Message_PlatformJob extends Zend_Queue_Message parent::__construct($options); if (!isset($options['script'])) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('The script is mandatory data'); } diff --git a/library/vendor/Zend/Queue/Stomp/Client.php b/library/vendor/Zend/Queue/Stomp/Client.php index 052e7393b..6e41506b0 100644 --- a/library/vendor/Zend/Queue/Stomp/Client.php +++ b/library/vendor/Zend/Queue/Stomp/Client.php @@ -88,7 +88,6 @@ class Zend_Queue_Stomp_Client public function addConnection($scheme, $host, $port, $class = 'Zend_Queue_Stomp_Client_Connection') { if (!class_exists($class)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } diff --git a/library/vendor/Zend/Queue/Stomp/Client/Connection.php b/library/vendor/Zend/Queue/Stomp/Client/Connection.php index a67f4d24d..9350f0c24 100644 --- a/library/vendor/Zend/Queue/Stomp/Client/Connection.php +++ b/library/vendor/Zend/Queue/Stomp/Client/Connection.php @@ -23,7 +23,6 @@ /** * @see Zend_Queue_Stomp_Client_ConnectionInterface */ -require_once 'Zend/Queue/Stomp/Client/ConnectionInterface.php'; /** * The Stomp client interacts with a Stomp server. @@ -72,7 +71,6 @@ class Zend_Queue_Stomp_Client_Connection if ($this->_socket === false) { // aparently there is some reason that fsockopen will return false // but it normally throws an error. - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Unable to connect to $str; error = $errstr ( errno = $errno )"); } @@ -136,7 +134,6 @@ class Zend_Queue_Stomp_Client_Connection public function ping() { if (!is_resource($this->_socket)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Not connected to Stomp server'); } return true; @@ -157,7 +154,6 @@ class Zend_Queue_Stomp_Client_Connection $bytes = fwrite($this->_socket, $output, strlen($output)); if ($bytes === false || $bytes == 0) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('No bytes written'); } @@ -205,7 +201,6 @@ class Zend_Queue_Stomp_Client_Connection // check to make sure that the connection is not lost. if ($data === false) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Connection lost'); } @@ -264,14 +259,12 @@ class Zend_Queue_Stomp_Client_Connection $class = $this->getFrameClass(); if (!class_exists($class)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } $frame = new $class(); if (!$frame instanceof Zend_Queue_Stomp_FrameInterface) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Invalid Frame class provided; must implement Zend_Queue_Stomp_FrameInterface'); } diff --git a/library/vendor/Zend/Queue/Stomp/Frame.php b/library/vendor/Zend/Queue/Stomp/Frame.php index 23a6d83e4..47edeb805 100644 --- a/library/vendor/Zend/Queue/Stomp/Frame.php +++ b/library/vendor/Zend/Queue/Stomp/Frame.php @@ -23,7 +23,6 @@ /** * @see Zend_Queue_Stomp_FrameInterface */ -require_once 'Zend/Queue/Stomp/FrameInterface.php'; /** * This class represents a Stomp Frame @@ -105,7 +104,6 @@ class Zend_Queue_Stomp_Frame public function setAutoContentLength($auto) { if (!is_bool($auto)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$auto is not a boolean'); } @@ -151,12 +149,10 @@ class Zend_Queue_Stomp_Frame */ public function setHeader($header, $value) { if (!is_string($header)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$header is not a string: ' . print_r($header, true)); } if (!is_scalar($value)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$value is not a string: ' . print_r($value, true)); } @@ -177,7 +173,6 @@ class Zend_Queue_Stomp_Frame public function getHeader($header) { if (!is_string($header)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$header is not a string'); } @@ -212,7 +207,6 @@ class Zend_Queue_Stomp_Frame public function setBody($body) { if (!is_string($body) && $body !== null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$body is not a string or null'); } @@ -244,7 +238,6 @@ class Zend_Queue_Stomp_Frame public function setCommand($command) { if (!is_string($command) && $command !== null) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$command is not a string or null'); } @@ -261,7 +254,6 @@ class Zend_Queue_Stomp_Frame public function toFrame() { if ($this->getCommand() === false) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('You must set the command'); } @@ -319,7 +311,6 @@ class Zend_Queue_Stomp_Frame public function fromFrame($frame) { if (!is_string($frame)) { - require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$frame is not a string'); } diff --git a/library/vendor/Zend/Reflection/Class.php b/library/vendor/Zend/Reflection/Class.php index 5835b00df..f7d0ff913 100644 --- a/library/vendor/Zend/Reflection/Class.php +++ b/library/vendor/Zend/Reflection/Class.php @@ -22,17 +22,14 @@ /** * @see Zend_Reflection_Property */ -require_once 'Zend/Reflection/Property.php'; /** * @see Zend_Reflection_Method */ -require_once 'Zend/Reflection/Method.php'; /** * Zend_Reflection_Docblock */ -require_once 'Zend/Reflection/Docblock.php'; /** * @category Zend @@ -51,7 +48,6 @@ class Zend_Reflection_Class extends ReflectionClass { $instance = new $reflectionClass($this->getFileName()); if (!$instance instanceof Zend_Reflection_File) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_File'); } return $instance; @@ -67,13 +63,11 @@ class Zend_Reflection_Class extends ReflectionClass public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock') { if ('' == $this->getDocComment()) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock'); } $instance = new $reflectionClass($this); if (!$instance instanceof Zend_Reflection_Docblock) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Docblock'); } return $instance; @@ -125,7 +119,6 @@ class Zend_Reflection_Class extends ReflectionClass while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Class'); } $zendReflections[] = $instance; @@ -148,7 +141,6 @@ class Zend_Reflection_Class extends ReflectionClass $zendReflection = new $reflectionClass($this->getName(), $phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Method) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Method'); } @@ -170,7 +162,6 @@ class Zend_Reflection_Class extends ReflectionClass while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($this->getName(), $phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Method) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Method'); } $zendReflections[] = $instance; @@ -192,7 +183,6 @@ class Zend_Reflection_Class extends ReflectionClass if ($phpReflection) { $zendReflection = new $reflectionClass($phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Class'); } unset($phpReflection); @@ -214,7 +204,6 @@ class Zend_Reflection_Class extends ReflectionClass $phpReflection = parent::getProperty($name); $zendReflection = new $reflectionClass($this->getName(), $phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Property) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Property'); } unset($phpReflection); @@ -235,7 +224,6 @@ class Zend_Reflection_Class extends ReflectionClass while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($this->getName(), $phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Property) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Property'); } $zendReflections[] = $instance; diff --git a/library/vendor/Zend/Reflection/Docblock.php b/library/vendor/Zend/Reflection/Docblock.php index 644ddfe85..512048603 100644 --- a/library/vendor/Zend/Reflection/Docblock.php +++ b/library/vendor/Zend/Reflection/Docblock.php @@ -22,7 +22,6 @@ /** * @see Zend_Reflection_Docblock_Tag */ -require_once 'Zend/Reflection/Docblock/Tag.php'; /** * @category Zend @@ -115,7 +114,6 @@ class Zend_Reflection_Docblock implements Reflector if ($commentOrReflector instanceof Reflector) { $this->_reflector = $commentOrReflector; if (!method_exists($commentOrReflector, 'getDocComment')) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Reflector must contain method "getDocComment"'); } $docComment = $commentOrReflector->getDocComment(); @@ -128,12 +126,10 @@ class Zend_Reflection_Docblock implements Reflector } elseif (is_string($commentOrReflector)) { $docComment = $commentOrReflector; } else { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception(get_class($this) . ' must have a (string) DocComment or a Reflector in the constructor'); } if ($docComment == '') { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('DocComment cannot be empty'); } diff --git a/library/vendor/Zend/Reflection/Docblock/Tag.php b/library/vendor/Zend/Reflection/Docblock/Tag.php index 0cbce94f4..f9d0081d9 100644 --- a/library/vendor/Zend/Reflection/Docblock/Tag.php +++ b/library/vendor/Zend/Reflection/Docblock/Tag.php @@ -20,7 +20,6 @@ */ /** Zend_Loader */ -require_once 'Zend/Loader.php'; /** * @category Zend @@ -59,7 +58,6 @@ class Zend_Reflection_Docblock_Tag implements Reflector $matches = array(); if (!preg_match('#^@(\w+)(\s|$)#', $tagDocblockLine, $matches)) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('No valid tag name found within provided docblock line.'); } @@ -113,7 +111,6 @@ class Zend_Reflection_Docblock_Tag implements Reflector // find the line if (!preg_match('#^@(\w+)(?:\s+([^\s].*)|$)?#', $tagDocblockLine, $matches)) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line does not contain a valid tag'); } diff --git a/library/vendor/Zend/Reflection/Docblock/Tag/Param.php b/library/vendor/Zend/Reflection/Docblock/Tag/Param.php index 78b448db2..00cb5fc33 100644 --- a/library/vendor/Zend/Reflection/Docblock/Tag/Param.php +++ b/library/vendor/Zend/Reflection/Docblock/Tag/Param.php @@ -20,7 +20,6 @@ */ /** Zend_Reflection_Docblock_Tag */ -require_once 'Zend/Reflection/Docblock/Tag.php'; /** * @category Zend @@ -50,12 +49,10 @@ class Zend_Reflection_Docblock_Tag_Param extends Zend_Reflection_Docblock_Tag $matches = array(); if (!preg_match('#^@(\w+)\s+([^\s]+)(?:\s+(\$\S+))?(?:\s+(.*))?#s', $tagDocblockLine, $matches)) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag'); } if ($matches[1] != 'param') { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid @param tag'); } diff --git a/library/vendor/Zend/Reflection/Docblock/Tag/Return.php b/library/vendor/Zend/Reflection/Docblock/Tag/Return.php index c0e27bf1f..74c8df5a4 100644 --- a/library/vendor/Zend/Reflection/Docblock/Tag/Return.php +++ b/library/vendor/Zend/Reflection/Docblock/Tag/Return.php @@ -20,7 +20,6 @@ */ /** Zend_Reflection_Docblock_Tag */ -require_once 'Zend/Reflection/Docblock/Tag.php'; /** * @category Zend @@ -44,12 +43,10 @@ class Zend_Reflection_Docblock_Tag_Return extends Zend_Reflection_Docblock_Tag public function __construct($tagDocblockLine) { if (!preg_match('#^@(\w+)\s+([^\s]+)(?:\s+(.*))?#', $tagDocblockLine, $matches)) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag'); } if ($matches[1] != 'return') { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid @return tag'); } diff --git a/library/vendor/Zend/Reflection/Exception.php b/library/vendor/Zend/Reflection/Exception.php index 3fd1af5fe..05ce568b4 100644 --- a/library/vendor/Zend/Reflection/Exception.php +++ b/library/vendor/Zend/Reflection/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Reflection/Extension.php b/library/vendor/Zend/Reflection/Extension.php index 6edcfb18f..ca3fe6ea8 100644 --- a/library/vendor/Zend/Reflection/Extension.php +++ b/library/vendor/Zend/Reflection/Extension.php @@ -22,12 +22,10 @@ /** * @see Zend_Reflection_Class */ -require_once 'Zend/Reflection/Class.php'; /** * @see Zend_Reflection_Function */ -require_once 'Zend/Reflection/Function.php'; /** * @category Zend @@ -50,7 +48,6 @@ class Zend_Reflection_Extension extends ReflectionExtension while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Function) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Function'); } $zendReflections[] = $instance; @@ -73,7 +70,6 @@ class Zend_Reflection_Extension extends ReflectionExtension while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } $zendReflections[] = $instance; diff --git a/library/vendor/Zend/Reflection/File.php b/library/vendor/Zend/Reflection/File.php index a860bc988..991496239 100644 --- a/library/vendor/Zend/Reflection/File.php +++ b/library/vendor/Zend/Reflection/File.php @@ -22,12 +22,10 @@ /** * @see Zend_Reflection_Class */ -require_once 'Zend/Reflection/Class.php'; /** * @see Zend_Reflection_Function */ -require_once 'Zend/Reflection/Function.php'; /** * @category Zend @@ -101,7 +99,6 @@ class Zend_Reflection_File implements Reflector } if (!$fileRealpath || !in_array($fileRealpath, get_included_files())) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('File ' . $file . ' must be required before it can be reflected'); } @@ -118,7 +115,6 @@ class Zend_Reflection_File implements Reflector */ public static function findRealpathInIncludePath($fileName) { - require_once 'Zend/Loader.php'; $includePaths = Zend_Loader::explodeIncludePath(); while (count($includePaths) > 0) { $filePath = array_shift($includePaths) . DIRECTORY_SEPARATOR . $fileName; @@ -194,7 +190,6 @@ class Zend_Reflection_File implements Reflector { $instance = new $reflectionClass($this); if (!$instance instanceof Zend_Reflection_Docblock) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Docblock'); } return $instance; @@ -212,7 +207,6 @@ class Zend_Reflection_File implements Reflector foreach ($this->_classes as $class) { $instance = new $reflectionClass($class); if (!$instance instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } $classes[] = $instance; @@ -232,7 +226,6 @@ class Zend_Reflection_File implements Reflector foreach ($this->_functions as $function) { $instance = new $reflectionClass($function); if (!$instance instanceof Zend_Reflection_Function) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Function'); } $functions[] = $instance; @@ -255,7 +248,6 @@ class Zend_Reflection_File implements Reflector $selected = current($this->_classes); $instance = new $reflectionClass($selected); if (!$instance instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class given; must extend Zend_Reflection_Class'); } return $instance; @@ -264,13 +256,11 @@ class Zend_Reflection_File implements Reflector if (in_array($name, $this->_classes)) { $instance = new $reflectionClass($name); if (!$instance instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class given; must extend Zend_Reflection_Class'); } return $instance; } - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Class by name ' . $name . ' not found.'); } diff --git a/library/vendor/Zend/Reflection/Function.php b/library/vendor/Zend/Reflection/Function.php index 3e6b8b2ce..17daac6de 100644 --- a/library/vendor/Zend/Reflection/Function.php +++ b/library/vendor/Zend/Reflection/Function.php @@ -22,7 +22,6 @@ /** * @see Zend_Reflection_Parameter */ -require_once 'Zend/Reflection/Parameter.php'; /** * @category Zend @@ -41,12 +40,10 @@ class Zend_Reflection_Function extends ReflectionFunction public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock') { if ('' == ($comment = $this->getDocComment())) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock'); } $instance = new $reflectionClass($comment); if (!$instance instanceof Zend_Reflection_Docblock) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock'); } return $instance; @@ -100,7 +97,6 @@ class Zend_Reflection_Function extends ReflectionFunction while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($this->getName(), $phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Parameter) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Parameter'); } $zendReflections[] = $instance; @@ -119,7 +115,6 @@ class Zend_Reflection_Function extends ReflectionFunction { $docblock = $this->getDocblock(); if (!$docblock->hasTag('return')) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Function does not specify an @return annotation tag; cannot determine return type'); } $tag = $docblock->getTag('return'); diff --git a/library/vendor/Zend/Reflection/Method.php b/library/vendor/Zend/Reflection/Method.php index e0137dc72..e57c0de5b 100644 --- a/library/vendor/Zend/Reflection/Method.php +++ b/library/vendor/Zend/Reflection/Method.php @@ -22,17 +22,14 @@ /** * @see Zend_Reflection_Class */ -require_once 'Zend/Reflection/Class.php'; /** * @see Zend_Reflection_Docblock */ -require_once 'Zend/Reflection/Docblock.php'; /** * @see Zend_Reflection_Parameter */ -require_once 'Zend/Reflection/Parameter.php'; /** * @category Zend @@ -51,13 +48,11 @@ class Zend_Reflection_Method extends ReflectionMethod public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock') { if ('' == $this->getDocComment()) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock'); } $instance = new $reflectionClass($this); if (!$instance instanceof Zend_Reflection_Docblock) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock'); } return $instance; @@ -91,7 +86,6 @@ class Zend_Reflection_Method extends ReflectionMethod $phpReflection = parent::getDeclaringClass(); $zendReflection = new $reflectionClass($phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } unset($phpReflection); @@ -111,7 +105,6 @@ class Zend_Reflection_Method extends ReflectionMethod while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass(array($this->getDeclaringClass()->getName(), $this->getName()), $phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Parameter) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Parameter'); } $zendReflections[] = $instance; diff --git a/library/vendor/Zend/Reflection/Parameter.php b/library/vendor/Zend/Reflection/Parameter.php index 758cf65b0..45c1627e4 100644 --- a/library/vendor/Zend/Reflection/Parameter.php +++ b/library/vendor/Zend/Reflection/Parameter.php @@ -43,7 +43,6 @@ class Zend_Reflection_Parameter extends ReflectionParameter $phpReflection = parent::getDeclaringClass(); $zendReflection = new $reflectionClass($phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } unset($phpReflection); @@ -65,7 +64,6 @@ class Zend_Reflection_Parameter extends ReflectionParameter $zendReflection = new $reflectionClass($phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } unset($phpReflection); @@ -95,7 +93,6 @@ class Zend_Reflection_Parameter extends ReflectionParameter $zendReflection = new $reflectionClass($phpReflection->getName()); } if (!$zendReflection instanceof $baseClass) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend ' . $baseClass); } unset($phpReflection); diff --git a/library/vendor/Zend/Reflection/Property.php b/library/vendor/Zend/Reflection/Property.php index 8b64d88c8..bef76ac26 100644 --- a/library/vendor/Zend/Reflection/Property.php +++ b/library/vendor/Zend/Reflection/Property.php @@ -38,7 +38,6 @@ class Zend_Reflection_Property extends ReflectionProperty $phpReflection = parent::getDeclaringClass(); $zendReflection = new $reflectionClass($phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } unset($phpReflection); @@ -60,7 +59,6 @@ class Zend_Reflection_Property extends ReflectionProperty $r = new $reflectionClass($docblock); if (!$r instanceof Zend_Reflection_Docblock) { - require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock'); } return $r; diff --git a/library/vendor/Zend/Registry.php b/library/vendor/Zend/Registry.php index 56492c9b6..2c52a0d52 100644 --- a/library/vendor/Zend/Registry.php +++ b/library/vendor/Zend/Registry.php @@ -66,7 +66,6 @@ class Zend_Registry extends ArrayObject public static function setInstance(Zend_Registry $registry) { if (self::$_registry !== null) { - require_once 'Zend/Exception.php'; throw new Zend_Exception('Registry is already initialized'); } @@ -97,12 +96,10 @@ class Zend_Registry extends ArrayObject public static function setClassName($registryClassName = 'Zend_Registry') { if (self::$_registry !== null) { - require_once 'Zend/Exception.php'; throw new Zend_Exception('Registry is already initialized'); } if (!is_string($registryClassName)) { - require_once 'Zend/Exception.php'; throw new Zend_Exception("Argument is not a class name"); } @@ -110,7 +107,6 @@ class Zend_Registry extends ArrayObject * @see Zend_Loader */ if (!class_exists($registryClassName)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($registryClassName); } @@ -143,7 +139,6 @@ class Zend_Registry extends ArrayObject $instance = self::getInstance(); if (!$instance->offsetExists($index)) { - require_once 'Zend/Exception.php'; throw new Zend_Exception("No entry is registered for key '$index'"); } diff --git a/library/vendor/Zend/Rest/Client.php b/library/vendor/Zend/Rest/Client.php index c64fe0f3b..876edbbeb 100644 --- a/library/vendor/Zend/Rest/Client.php +++ b/library/vendor/Zend/Rest/Client.php @@ -22,13 +22,10 @@ /** Zend_Service_Abstract */ -require_once 'Zend/Service/Abstract.php'; /** Zend_Rest_Client_Result */ -require_once 'Zend/Rest/Client/Result.php'; /** Zend_Uri */ -require_once 'Zend/Uri.php'; /** * @category Zend @@ -109,7 +106,6 @@ class Zend_Rest_Client extends Zend_Service_Abstract { // Get the URI object and configure it if (!$this->_uri instanceof Zend_Uri_Http) { - require_once 'Zend/Rest/Client/Exception.php'; throw new Zend_Rest_Client_Exception('URI object must be set before performing call'); } diff --git a/library/vendor/Zend/Rest/Client/Exception.php b/library/vendor/Zend/Rest/Client/Exception.php index c813a1ccf..93443941d 100644 --- a/library/vendor/Zend/Rest/Client/Exception.php +++ b/library/vendor/Zend/Rest/Client/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Rest_Exception */ -require_once 'Zend/Rest/Exception.php'; /** diff --git a/library/vendor/Zend/Rest/Client/Result.php b/library/vendor/Zend/Rest/Client/Result.php index d173643f0..bac3d5b90 100644 --- a/library/vendor/Zend/Rest/Client/Result.php +++ b/library/vendor/Zend/Rest/Client/Result.php @@ -20,7 +20,6 @@ * @version $Id$ */ -require_once 'Zend/Xml/Security.php'; /** * @category Zend @@ -59,7 +58,6 @@ class Zend_Rest_Client_Result implements IteratorAggregate { $message = "REST Response Error: " . $this->_errstr; $this->_errstr = null; } - require_once "Zend/Rest/Client/Result/Exception.php"; throw new Zend_Rest_Client_Result_Exception($message); } } diff --git a/library/vendor/Zend/Rest/Client/Result/Exception.php b/library/vendor/Zend/Rest/Client/Result/Exception.php index 2101c3525..9cf161970 100644 --- a/library/vendor/Zend/Rest/Client/Result/Exception.php +++ b/library/vendor/Zend/Rest/Client/Result/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Rest_Client_Exception */ -require_once "Zend/Rest/Client/Exception.php"; /** * Zend_Rest_Client_Result_Exception diff --git a/library/vendor/Zend/Rest/Controller.php b/library/vendor/Zend/Rest/Controller.php index a0a0c8172..097d553ad 100644 --- a/library/vendor/Zend/Rest/Controller.php +++ b/library/vendor/Zend/Rest/Controller.php @@ -20,7 +20,6 @@ */ /** Zend_Controller_Action */ -require_once 'Zend/Controller/Action.php'; /** * An abstract class to guide implementation of action controllers for use with diff --git a/library/vendor/Zend/Rest/Exception.php b/library/vendor/Zend/Rest/Exception.php index 85acc8f84..0cdf90e2d 100644 --- a/library/vendor/Zend/Rest/Exception.php +++ b/library/vendor/Zend/Rest/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Rest/Route.php b/library/vendor/Zend/Rest/Route.php index 76771fdf5..363713889 100644 --- a/library/vendor/Zend/Rest/Route.php +++ b/library/vendor/Zend/Rest/Route.php @@ -22,22 +22,18 @@ /** * @see Zend_Controller_Router_Route_Interface */ -require_once 'Zend/Controller/Router/Route/Interface.php'; /** * @see Zend_Controller_Router_Route_Module */ -require_once 'Zend/Controller/Router/Route/Module.php'; /** * @see Zend_Controller_Dispatcher_Interface */ -require_once 'Zend/Controller/Dispatcher/Interface.php'; /** * @see Zend_Controller_Request_Abstract */ -require_once 'Zend/Controller/Request/Abstract.php'; /** * Rest Route diff --git a/library/vendor/Zend/Rest/Server.php b/library/vendor/Zend/Rest/Server.php index 72686b3cd..961429e8d 100644 --- a/library/vendor/Zend/Rest/Server.php +++ b/library/vendor/Zend/Rest/Server.php @@ -23,17 +23,14 @@ /** * @see Zend_Server_Interface */ -require_once 'Zend/Server/Interface.php'; /** * @see Zend_Server_Reflection */ -require_once 'Zend/Server/Reflection.php'; /** * @see Zend_Server_Abstract */ -require_once 'Zend/Server/Abstract.php'; /** * @category Zend @@ -216,7 +213,6 @@ class Zend_Rest_Server implements Zend_Server_Interface $result = false; if (count($calling_args) < count($func_args)) { - require_once 'Zend/Rest/Server/Exception.php'; $result = $this->fault(new Zend_Rest_Server_Exception('Invalid Method Call to ' . $this->_method . '. Missing argument(s): ' . implode(', ', $missing_args) . '.'), 400); } @@ -241,21 +237,18 @@ class Zend_Rest_Server implements Zend_Server_Interface } } } else { - require_once "Zend/Rest/Server/Exception.php"; $result = $this->fault( new Zend_Rest_Server_Exception("Unknown Method '$this->_method'."), 404 ); } } else { - require_once "Zend/Rest/Server/Exception.php"; $result = $this->fault( new Zend_Rest_Server_Exception("Unknown Method '$this->_method'."), 404 ); } } else { - require_once "Zend/Rest/Server/Exception.php"; $result = $this->fault( new Zend_Rest_Server_Exception("No Method Specified."), 404 @@ -528,7 +521,6 @@ class Zend_Rest_Server implements Zend_Server_Interface if (is_callable($func) && !in_array($func, self::$magicMethods)) { $this->_functions[$func] = $this->_reflection->reflectFunction($func); } else { - require_once 'Zend/Rest/Server/Exception.php'; throw new Zend_Rest_Server_Exception("Invalid Method Added to Service."); } } @@ -598,7 +590,6 @@ class Zend_Rest_Server implements Zend_Server_Interface $object = $this->_functions[$this->_method]->getDeclaringClass()->newInstance(); } } catch (Exception $e) { - require_once 'Zend/Rest/Server/Exception.php'; throw new Zend_Rest_Server_Exception('Error instantiating class ' . $class . ' to invoke method ' . $this->_functions[$this->_method]->getName() . ' (' . $e->getMessage() . ') ', diff --git a/library/vendor/Zend/Rest/Server/Exception.php b/library/vendor/Zend/Rest/Server/Exception.php index 9a000e32e..b591e7091 100644 --- a/library/vendor/Zend/Rest/Server/Exception.php +++ b/library/vendor/Zend/Rest/Server/Exception.php @@ -24,7 +24,6 @@ /** * Zend_Rest_Exception */ -require_once 'Zend/Rest/Exception.php'; /** diff --git a/library/vendor/Zend/SOURCE b/library/vendor/Zend/SOURCE index cc14483dd..3783790ca 100644 --- a/library/vendor/Zend/SOURCE +++ b/library/vendor/Zend/SOURCE @@ -4,3 +4,4 @@ rm -r Auth/Adapter/Ldap.php Cache/Backend/{Apc.php,Libmemcached.php,Memcached.ph Db/{Adapter,Statement}/{Db2*,Mysqli*,Oracle*} Db/Adapter/Pdo/{Ibm*,Mssql.php,Oci.php} \ Db/Statement/Pdo/{Ibm.php,Oci.php} Dojo* Feed* Ldap* Pdf* Search/ \ Serializer/Adapter/Igbinary.php Service/ Soap/ +find . -type f -name \*.php -execdir sed -i '' '/require_once/d' "{}" \; diff --git a/library/vendor/Zend/Serializer.php b/library/vendor/Zend/Serializer.php index 8f91a201f..b622c9a6e 100644 --- a/library/vendor/Zend/Serializer.php +++ b/library/vendor/Zend/Serializer.php @@ -20,7 +20,6 @@ */ /** @see Zend_Loader_PluginLoader */ -require_once 'Zend/Loader/PluginLoader.php'; /** * @category Zend @@ -61,14 +60,12 @@ class Zend_Serializer try { $adapterClass = $adapterLoader->load($adapterName); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Can\'t load serializer adapter "'.$adapterName.'"', 0, $e); } // ZF-8842: // check that the loaded class implements Zend_Serializer_Adapter_AdapterInterface without execute code if (!in_array('Zend_Serializer_Adapter_AdapterInterface', class_implements($adapterClass))) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('The serializer adapter class "'.$adapterClass.'" must implement Zend_Serializer_Adapter_AdapterInterface'); } diff --git a/library/vendor/Zend/Serializer/Adapter/AdapterAbstract.php b/library/vendor/Zend/Serializer/Adapter/AdapterAbstract.php index a6c73c001..5d4b19ede 100644 --- a/library/vendor/Zend/Serializer/Adapter/AdapterAbstract.php +++ b/library/vendor/Zend/Serializer/Adapter/AdapterAbstract.php @@ -21,7 +21,6 @@ */ /** @see Zend_Serializer_Adapter_AdapterInterface */ -require_once 'Zend/Serializer/Adapter/AdapterInterface.php'; /** * @category Zend @@ -103,7 +102,6 @@ abstract class Zend_Serializer_Adapter_AdapterAbstract implements Zend_Serialize { $name = (string) $name; if (!array_key_exists($name, $this->_options)) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Unknown option name "'.$name.'"'); } diff --git a/library/vendor/Zend/Serializer/Adapter/Amf0.php b/library/vendor/Zend/Serializer/Adapter/Amf0.php index 6ab649193..ee92cf5bc 100644 --- a/library/vendor/Zend/Serializer/Adapter/Amf0.php +++ b/library/vendor/Zend/Serializer/Adapter/Amf0.php @@ -21,19 +21,14 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** @see Zend_Amf_Parse_OutputStream */ -require_once 'Zend/Amf/Parse/OutputStream.php'; /** @see Zend_Amf_Parse_Amf0_Serializer */ -require_once 'Zend/Amf/Parse/Amf0/Serializer.php'; /** @see Zend_Amf_Parse_InputStream */ -require_once 'Zend/Amf/Parse/InputStream.php'; /** @see Zend_Amf_Parse_Amf0_Deserializer */ -require_once 'Zend/Amf/Parse/Amf0/Deserializer.php'; /** * @category Zend @@ -60,7 +55,6 @@ class Zend_Serializer_Adapter_Amf0 extends Zend_Serializer_Adapter_AdapterAbstra $serializer->writeTypeMarker($value); return $stream->getStream(); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Serialization failed by previous error', 0, $e); } } @@ -80,7 +74,6 @@ class Zend_Serializer_Adapter_Amf0 extends Zend_Serializer_Adapter_AdapterAbstra $deserializer = new Zend_Amf_Parse_Amf0_Deserializer($stream); return $deserializer->readTypeMarker(); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Unserialization failed by previous error', 0, $e); } } diff --git a/library/vendor/Zend/Serializer/Adapter/Amf3.php b/library/vendor/Zend/Serializer/Adapter/Amf3.php index a292cb272..d698c6f48 100644 --- a/library/vendor/Zend/Serializer/Adapter/Amf3.php +++ b/library/vendor/Zend/Serializer/Adapter/Amf3.php @@ -21,19 +21,14 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** @see Zend_Amf_Parse_OutputStream */ -require_once 'Zend/Amf/Parse/OutputStream.php'; /** @see Zend_Amf_Parse_Amf3_Serializer */ -require_once 'Zend/Amf/Parse/Amf3/Serializer.php'; /** @see Zend_Amf_Parse_InputStream */ -require_once 'Zend/Amf/Parse/InputStream.php'; /** @see Zend_Amf_Parse_Amf3_Deserializer */ -require_once 'Zend/Amf/Parse/Amf3/Deserializer.php'; /** * @category Zend @@ -60,7 +55,6 @@ class Zend_Serializer_Adapter_Amf3 extends Zend_Serializer_Adapter_AdapterAbstra $serializer->writeTypeMarker($value); return $stream->getStream(); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Serialization failed by previous error', 0, $e); } } @@ -80,7 +74,6 @@ class Zend_Serializer_Adapter_Amf3 extends Zend_Serializer_Adapter_AdapterAbstra $deserializer = new Zend_Amf_Parse_Amf3_Deserializer($stream); return $deserializer->readTypeMarker(); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Unserialization failed by previous error', 0, $e); } } diff --git a/library/vendor/Zend/Serializer/Adapter/Json.php b/library/vendor/Zend/Serializer/Adapter/Json.php index 023ba3748..c0cc2ce34 100644 --- a/library/vendor/Zend/Serializer/Adapter/Json.php +++ b/library/vendor/Zend/Serializer/Adapter/Json.php @@ -21,10 +21,8 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** @see Zend_Json */ -require_once 'Zend/Json.php'; /** * @category Zend @@ -59,7 +57,6 @@ class Zend_Serializer_Adapter_Json extends Zend_Serializer_Adapter_AdapterAbstra try { return Zend_Json::encode($value, $opts['cycleCheck'], $opts); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Serialization failed', 0, $e); } } @@ -78,10 +75,8 @@ class Zend_Serializer_Adapter_Json extends Zend_Serializer_Adapter_AdapterAbstra try { $ret = Zend_Json::decode($json, $opts['objectDecodeType']); } catch (Zend_Json_Exception $e) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Invalid json data'); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Unserialization failed by previous error', 0, $e); } diff --git a/library/vendor/Zend/Serializer/Adapter/PhpCode.php b/library/vendor/Zend/Serializer/Adapter/PhpCode.php index 40166dd6f..ea1d84a90 100644 --- a/library/vendor/Zend/Serializer/Adapter/PhpCode.php +++ b/library/vendor/Zend/Serializer/Adapter/PhpCode.php @@ -21,7 +21,6 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** * @category Zend @@ -59,7 +58,6 @@ class Zend_Serializer_Adapter_PhpCode extends Zend_Serializer_Adapter_AdapterAbs $eval = @eval('$ret=' . $code . ';'); if ($eval === false) { $lastErr = error_get_last(); - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('eval failed: ' . $lastErr['message']); } return $ret; diff --git a/library/vendor/Zend/Serializer/Adapter/PhpSerialize.php b/library/vendor/Zend/Serializer/Adapter/PhpSerialize.php index 57acc278f..4b6f44672 100644 --- a/library/vendor/Zend/Serializer/Adapter/PhpSerialize.php +++ b/library/vendor/Zend/Serializer/Adapter/PhpSerialize.php @@ -21,7 +21,6 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** * @category Zend @@ -65,7 +64,6 @@ class Zend_Serializer_Adapter_PhpSerialize extends Zend_Serializer_Adapter_Adapt $ret = serialize($value); if ($ret === false) { $lastErr = error_get_last(); - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception($lastErr['message']); } return $ret; @@ -86,7 +84,6 @@ class Zend_Serializer_Adapter_PhpSerialize extends Zend_Serializer_Adapter_Adapt $ret = @unserialize($serialized); if ($ret === false && $serialized !== self::$_serializedFalse) { $lastErr = error_get_last(); - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception($lastErr['message']); } return $ret; diff --git a/library/vendor/Zend/Serializer/Adapter/PythonPickle.php b/library/vendor/Zend/Serializer/Adapter/PythonPickle.php index 78c0c399a..7d798ce85 100644 --- a/library/vendor/Zend/Serializer/Adapter/PythonPickle.php +++ b/library/vendor/Zend/Serializer/Adapter/PythonPickle.php @@ -21,7 +21,6 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** * @link http://www.python.org @@ -192,7 +191,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt { $int = (int) $number; if ($int < 0 || $int > 3) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Invalid or unknown protocol version "'.$number.'"'); } return $int; @@ -264,7 +262,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt } elseif (is_object($value)) { $this->_writeObject($value); } else { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception( 'PHP-Type "'.gettype($value).'" isn\'t serializable with '.get_class($this) ); @@ -613,7 +610,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt } if (!count($this->_stack)) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('No data found'); } @@ -757,7 +753,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt $this->_loadProto(); break; default: - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Invalid or unknown opcode "'.$op.'"'); } } @@ -774,7 +769,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt $lastStack = count($this->_stack)-1; if (!isset($this->_stack[$lastStack])) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('No stack exist'); } $this->_memo[$id] = & $this->_stack[$lastStack]; @@ -792,7 +786,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt $lastStack = count($this->_stack)-1; if (!isset($this->_stack[$lastStack])) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('No stack exist'); } $this->_memo[$id] = & $this->_stack[$lastStack]; @@ -814,7 +807,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt $lastStack = count($this->_stack)-1; if (!isset($this->_stack[$lastStack])) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('No stack exist'); } $this->_memo[$id] = & $this->_stack[$lastStack]; @@ -831,7 +823,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt $id = (int)$this->_readline(); if (!array_key_exists($id, $this->_memo)) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Get id "' . $id . '" not found in momo'); } $this->_stack[] = & $this->_memo[$id]; @@ -848,7 +839,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt $id = ord($this->_read(1)); if (!array_key_exists($id, $this->_memo)) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Get id "' . $id . '" not found in momo'); } $this->_stack[] = & $this->_memo[$id]; @@ -869,7 +859,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt list(, $id) = unpack('l', $bin); if (!array_key_exists($id, $this->_memo)) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Get id "' . $id . '" not found in momo'); } $this->_stack[] = & $this->_memo[$id]; @@ -1150,7 +1139,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt . chr(0x80 | $uniCode >> 6 & 0x3F) . chr(0x80 | $uniCode & 0x3F); } else { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Unsupported unicode character found "' . dechex($uniCode) . '"'); } @@ -1366,7 +1354,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt { $proto = ord($this->_read(1)); if ($proto < 2 || $proto > 3) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Invalid protocol version detected'); } $this->_protocol = $proto; @@ -1384,7 +1371,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt protected function _read($len) { if (($this->_pos + $len) > $this->_pickleLen) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('End of data'); } @@ -1408,7 +1394,6 @@ class Zend_Serializer_Adapter_PythonPickle extends Zend_Serializer_Adapter_Adapt } if ($eolPos === false) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('No new line found'); } $ret = substr($this->_pickle, $this->_pos, $eolPos-$this->_pos); diff --git a/library/vendor/Zend/Serializer/Adapter/Wddx.php b/library/vendor/Zend/Serializer/Adapter/Wddx.php index 41d5154f9..cf40c8e2e 100644 --- a/library/vendor/Zend/Serializer/Adapter/Wddx.php +++ b/library/vendor/Zend/Serializer/Adapter/Wddx.php @@ -21,13 +21,10 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; /** * @link http://www.infoloom.com/gcaconfs/WEB/chicago98/simeonov.HTM @@ -57,7 +54,6 @@ class Zend_Serializer_Adapter_Wddx extends Zend_Serializer_Adapter_AdapterAbstra public function __construct($opts = array()) { if (!extension_loaded('wddx')) { - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('PHP extension "wddx" is required for this adapter'); } @@ -84,7 +80,6 @@ class Zend_Serializer_Adapter_Wddx extends Zend_Serializer_Adapter_AdapterAbstra if ($wddx === false) { $lastErr = error_get_last(); - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception($lastErr['message']); } return $wddx; @@ -115,7 +110,6 @@ class Zend_Serializer_Adapter_Wddx extends Zend_Serializer_Adapter_AdapterAbstra $errMsg = $e->getMessage(); } - require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception($errMsg); } diff --git a/library/vendor/Zend/Serializer/Exception.php b/library/vendor/Zend/Serializer/Exception.php index 7e2c102c5..d714bbdc1 100644 --- a/library/vendor/Zend/Serializer/Exception.php +++ b/library/vendor/Zend/Serializer/Exception.php @@ -20,7 +20,6 @@ */ /** @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Server/Abstract.php b/library/vendor/Zend/Server/Abstract.php index 404126c92..1356cb5dc 100644 --- a/library/vendor/Zend/Server/Abstract.php +++ b/library/vendor/Zend/Server/Abstract.php @@ -19,32 +19,26 @@ */ /** Zend_Server_Interface */ -require_once 'Zend/Server/Interface.php'; /** * Zend_Server_Definition */ -require_once 'Zend/Server/Definition.php'; /** * Zend_Server_Method_Definition */ -require_once 'Zend/Server/Method/Definition.php'; /** * Zend_Server_Method_Callback */ -require_once 'Zend/Server/Method/Callback.php'; /** * Zend_Server_Method_Prototype */ -require_once 'Zend/Server/Method/Prototype.php'; /** * Zend_Server_Method_Parameter */ -require_once 'Zend/Server/Method/Parameter.php'; /** * Zend_Server_Abstract @@ -162,7 +156,6 @@ abstract class Zend_Server_Abstract implements Zend_Server_Interface $method = empty($ns) ? $name : $ns . '.' . $name; if (!$this->_overwriteExistingMethods && $this->_table->hasMethod($method)) { - require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Duplicate method registered: ' . $method); } diff --git a/library/vendor/Zend/Server/Cache.php b/library/vendor/Zend/Server/Cache.php index 3c893c8c5..ef2cf3c8d 100644 --- a/library/vendor/Zend/Server/Cache.php +++ b/library/vendor/Zend/Server/Cache.php @@ -86,8 +86,6 @@ class Zend_Server_Cache * * * if (!Zend_Server_Cache::get($filename, $server)) { - * require_once 'Some/Service/Class.php'; - * require_once 'Another/Service/Class.php'; * * // Attach Some_Service_Class with namespace 'some' * $server->attach('Some_Service_Class', 'some'); diff --git a/library/vendor/Zend/Server/Definition.php b/library/vendor/Zend/Server/Definition.php index 5e3d743c5..35e9387fe 100644 --- a/library/vendor/Zend/Server/Definition.php +++ b/library/vendor/Zend/Server/Definition.php @@ -76,10 +76,8 @@ class Zend_Server_Definition implements Countable, Iterator public function addMethod($method, $name = null) { if (is_array($method)) { - require_once 'Zend/Server/Method/Definition.php'; $method = new Zend_Server_Method_Definition($method); } elseif (!$method instanceof Zend_Server_Method_Definition) { - require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Invalid method provided'); } @@ -92,12 +90,10 @@ class Zend_Server_Definition implements Countable, Iterator $name = $method->getName(); } if (null === $name) { - require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('No method name provided'); } if (!$this->_overwriteExistingMethods && array_key_exists($name, $this->_methods)) { - require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception(sprintf('Method by name of "%s" already exists', $name)); } $this->_methods[$name] = $method; diff --git a/library/vendor/Zend/Server/Exception.php b/library/vendor/Zend/Server/Exception.php index 0bea95669..f3ee4d303 100644 --- a/library/vendor/Zend/Server/Exception.php +++ b/library/vendor/Zend/Server/Exception.php @@ -21,7 +21,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Zend_Server_Reflection exceptions diff --git a/library/vendor/Zend/Server/Method/Callback.php b/library/vendor/Zend/Server/Method/Callback.php index cf2f29dc9..5193fd2c1 100644 --- a/library/vendor/Zend/Server/Method/Callback.php +++ b/library/vendor/Zend/Server/Method/Callback.php @@ -166,7 +166,6 @@ class Zend_Server_Method_Callback public function setType($type) { if (!in_array($type, $this->_types)) { - require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Invalid method callback type passed to ' . __CLASS__ . '::' . __METHOD__); } $this->_type = $type; diff --git a/library/vendor/Zend/Server/Method/Definition.php b/library/vendor/Zend/Server/Method/Definition.php index d5ccb32b3..b89e13454 100644 --- a/library/vendor/Zend/Server/Method/Definition.php +++ b/library/vendor/Zend/Server/Method/Definition.php @@ -122,10 +122,8 @@ class Zend_Server_Method_Definition public function setCallback($callback) { if (is_array($callback)) { - require_once 'Zend/Server/Method/Callback.php'; $callback = new Zend_Server_Method_Callback($callback); } elseif (!$callback instanceof Zend_Server_Method_Callback) { - require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Invalid method callback provided'); } $this->_callback = $callback; @@ -151,10 +149,8 @@ class Zend_Server_Method_Definition public function addPrototype($prototype) { if (is_array($prototype)) { - require_once 'Zend/Server/Method/Prototype.php'; $prototype = new Zend_Server_Method_Prototype($prototype); } elseif (!$prototype instanceof Zend_Server_Method_Prototype) { - require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Invalid method prototype provided'); } $this->_prototypes[] = $prototype; @@ -229,7 +225,6 @@ class Zend_Server_Method_Definition public function setObject($object) { if (!is_object($object) && (null !== $object)) { - require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Invalid object passed to ' . __CLASS__ . '::' . __METHOD__); } $this->_object = $object; diff --git a/library/vendor/Zend/Server/Method/Prototype.php b/library/vendor/Zend/Server/Method/Prototype.php index 664c52676..810caf799 100644 --- a/library/vendor/Zend/Server/Method/Prototype.php +++ b/library/vendor/Zend/Server/Method/Prototype.php @@ -95,7 +95,6 @@ class Zend_Server_Method_Prototype $this->_parameterNameMap[$name] = count($this->_parameters) - 1; } } else { - require_once 'Zend/Server/Method/Parameter.php'; $parameter = new Zend_Server_Method_Parameter(array( 'type' => (string) $parameter, )); diff --git a/library/vendor/Zend/Server/Reflection.php b/library/vendor/Zend/Server/Reflection.php index bf77be0bd..12f2b65c9 100644 --- a/library/vendor/Zend/Server/Reflection.php +++ b/library/vendor/Zend/Server/Reflection.php @@ -21,12 +21,10 @@ /** * Zend_Server_Reflection_Function */ -require_once 'Zend/Server/Reflection/Function.php'; /** * Zend_Server_Reflection_Class */ -require_once 'Zend/Server/Reflection/Class.php'; /** * Reflection for determining method signatures to use with server classes @@ -64,12 +62,10 @@ class Zend_Server_Reflection } elseif (class_exists($class)) { $reflection = new ReflectionClass($class); } else { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid class or object passed to attachClass()'); } if ($argv && !is_array($argv)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid argv argument passed to reflectClass'); } @@ -96,13 +92,11 @@ class Zend_Server_Reflection public static function reflectFunction($function, $argv = false, $namespace = '') { if (!is_string($function) || !function_exists($function)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid function "' . $function . '" passed to reflectFunction'); } if ($argv && !is_array($argv)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid argv argument passed to reflectClass'); } diff --git a/library/vendor/Zend/Server/Reflection/Class.php b/library/vendor/Zend/Server/Reflection/Class.php index 3f0b8a436..7834c2ebf 100644 --- a/library/vendor/Zend/Server/Reflection/Class.php +++ b/library/vendor/Zend/Server/Reflection/Class.php @@ -21,7 +21,6 @@ /** * Zend_Server_Reflection_Method */ -require_once 'Zend/Server/Reflection/Method.php'; /** * Class/Object reflection @@ -105,7 +104,6 @@ class Zend_Server_Reflection_Class return call_user_func_array(array($this->_reflection, $method), $args); } - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid reflection method'); } @@ -176,7 +174,6 @@ class Zend_Server_Reflection_Class } if (!is_string($namespace) || !preg_match('/[a-z0-9_\.]+/i', $namespace)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid namespace'); } diff --git a/library/vendor/Zend/Server/Reflection/Exception.php b/library/vendor/Zend/Server/Reflection/Exception.php index 8e3cee52c..3cce3b74d 100644 --- a/library/vendor/Zend/Server/Reflection/Exception.php +++ b/library/vendor/Zend/Server/Reflection/Exception.php @@ -21,7 +21,6 @@ /** * @see Zend_Server_Exception */ -require_once 'Zend/Server/Exception.php'; /** * Zend_Server_Reflection exceptions diff --git a/library/vendor/Zend/Server/Reflection/Function.php b/library/vendor/Zend/Server/Reflection/Function.php index eb2ee9c06..50892639e 100644 --- a/library/vendor/Zend/Server/Reflection/Function.php +++ b/library/vendor/Zend/Server/Reflection/Function.php @@ -21,7 +21,6 @@ /** * Zend_Server_Reflection_Function_Abstract */ -require_once 'Zend/Server/Reflection/Function/Abstract.php'; /** * Function Reflection diff --git a/library/vendor/Zend/Server/Reflection/Function/Abstract.php b/library/vendor/Zend/Server/Reflection/Function/Abstract.php index 40b15c309..ce325f572 100644 --- a/library/vendor/Zend/Server/Reflection/Function/Abstract.php +++ b/library/vendor/Zend/Server/Reflection/Function/Abstract.php @@ -21,17 +21,14 @@ /** * Zend_Server_Reflection_Node */ -require_once 'Zend/Server/Reflection/Node.php'; /** * Zend_Server_Reflection_Parameter */ -require_once 'Zend/Server/Reflection/Parameter.php'; /** * Zend_Server_Reflection_Prototype */ -require_once 'Zend/Server/Reflection/Prototype.php'; /** * Function/Method Reflection @@ -115,7 +112,6 @@ abstract class Zend_Server_Reflection_Function_Abstract // testing here. if ((!$r instanceof ReflectionFunction) && (!$r instanceof ReflectionMethod)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid reflection class'); } $this->_reflection = $r; @@ -346,7 +342,6 @@ abstract class Zend_Server_Reflection_Function_Abstract } if (count($paramTypesTmp) != $paramCount) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception( 'Variable number of arguments is not supported for services (except optional parameters). ' . 'Number of function arguments in ' . $function->getDeclaringClass()->getName() . '::' @@ -380,7 +375,6 @@ abstract class Zend_Server_Reflection_Function_Abstract return call_user_func_array(array($this->_reflection, $method), $args); } - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid reflection method ("' .$method. '")'); } @@ -430,7 +424,6 @@ abstract class Zend_Server_Reflection_Function_Abstract } if (!is_string($namespace) || !preg_match('/[a-z0-9_\.]+/i', $namespace)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid namespace'); } @@ -456,7 +449,6 @@ abstract class Zend_Server_Reflection_Function_Abstract public function setDescription($string) { if (!is_string($string)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid description'); } diff --git a/library/vendor/Zend/Server/Reflection/Method.php b/library/vendor/Zend/Server/Reflection/Method.php index 8b56dd8e8..64c380a59 100644 --- a/library/vendor/Zend/Server/Reflection/Method.php +++ b/library/vendor/Zend/Server/Reflection/Method.php @@ -21,7 +21,6 @@ /** * Zend_Server_Reflection_Function_Abstract */ -require_once 'Zend/Server/Reflection/Function/Abstract.php'; /** * Method Reflection diff --git a/library/vendor/Zend/Server/Reflection/Parameter.php b/library/vendor/Zend/Server/Reflection/Parameter.php index e6f2e277e..51944367d 100644 --- a/library/vendor/Zend/Server/Reflection/Parameter.php +++ b/library/vendor/Zend/Server/Reflection/Parameter.php @@ -82,7 +82,6 @@ class Zend_Server_Reflection_Parameter return call_user_func_array(array($this->_reflection, $method), $args); } - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid reflection method'); } @@ -105,7 +104,6 @@ class Zend_Server_Reflection_Parameter public function setType($type) { if (!is_string($type) && (null !== $type)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid parameter type'); } @@ -131,7 +129,6 @@ class Zend_Server_Reflection_Parameter public function setDescription($description) { if (!is_string($description) && (null !== $description)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid parameter description'); } diff --git a/library/vendor/Zend/Server/Reflection/Prototype.php b/library/vendor/Zend/Server/Reflection/Prototype.php index 23bd87736..f3c7501b9 100644 --- a/library/vendor/Zend/Server/Reflection/Prototype.php +++ b/library/vendor/Zend/Server/Reflection/Prototype.php @@ -21,12 +21,10 @@ /** * Zend_Server_Reflection_ReturnValue */ -require_once 'Zend/Server/Reflection/ReturnValue.php'; /** * Zend_Server_Reflection_Parameter */ -require_once 'Zend/Server/Reflection/Parameter.php'; /** * Method/Function prototypes @@ -54,14 +52,12 @@ class Zend_Server_Reflection_Prototype $this->_return = $return; if (!is_array($params) && (null !== $params)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid parameters'); } if (is_array($params)) { foreach ($params as $param) { if (!$param instanceof Zend_Server_Reflection_Parameter) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('One or more params are invalid'); } } diff --git a/library/vendor/Zend/Server/Reflection/ReturnValue.php b/library/vendor/Zend/Server/Reflection/ReturnValue.php index 4d0ddb0f8..14cc89f59 100644 --- a/library/vendor/Zend/Server/Reflection/ReturnValue.php +++ b/library/vendor/Zend/Server/Reflection/ReturnValue.php @@ -75,7 +75,6 @@ class Zend_Server_Reflection_ReturnValue public function setType($type) { if (!is_string($type) && (null !== $type)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid parameter type'); } @@ -101,7 +100,6 @@ class Zend_Server_Reflection_ReturnValue public function setDescription($description) { if (!is_string($description) && (null !== $description)) { - require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid parameter description'); } diff --git a/library/vendor/Zend/Session.php b/library/vendor/Zend/Session.php index 54d01846a..9d117c8bc 100644 --- a/library/vendor/Zend/Session.php +++ b/library/vendor/Zend/Session.php @@ -25,17 +25,14 @@ /** * @see Zend_Session_Abstract */ -require_once 'Zend/Session/Abstract.php'; /** * @see Zend_Session_Namespace */ -require_once 'Zend/Session/Namespace.php'; /** * @see Zend_Session_SaveHandler_Interface */ -require_once 'Zend/Session/SaveHandler/Interface.php'; /** @@ -223,7 +220,6 @@ class Zend_Session extends Zend_Session_Abstract } else { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("Unknown option: $userOptionName = $userOptionValue"); } } @@ -308,7 +304,6 @@ class Zend_Session extends Zend_Session_Abstract { if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("You must call " . __CLASS__ . '::' . __FUNCTION__ . "() before any output has been sent to the browser; output started in {$filename}/{$linenum}"); } @@ -429,7 +424,6 @@ class Zend_Session extends Zend_Session_Abstract } if (self::$_sessionStarted && self::$_destroyed) { - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('The session was explicitly destroyed during this request, attempting to re-start is not allowed.'); } @@ -445,14 +439,12 @@ class Zend_Session extends Zend_Session_Abstract // In strict mode, do not allow auto-starting Zend_Session, such as via "new Zend_Session_Namespace()" if (self::$_strict && $options === true) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('You must explicitly start the session with Zend_Session::start() when session options are set to strict.'); } $filename = $linenum = null; if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("Session must be started before any output has been sent to the browser;" . " output started in {$filename}/{$linenum}"); } @@ -460,7 +452,6 @@ class Zend_Session extends Zend_Session_Abstract // See http://www.php.net/manual/en/ref.session.php for explanation if (!self::$_unitTestEnabled && defined('SID')) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('session has already been started by session.auto-start or session_start()'); } @@ -475,7 +466,6 @@ class Zend_Session extends Zend_Session_Abstract if (!self::$_unitTestEnabled) { if (self::$_throwStartupExceptions) { - require_once 'Zend/Session/Exception.php'; set_error_handler(array('Zend_Session_Exception', 'handleSessionStartError'), $errorLevel); } @@ -663,20 +653,17 @@ class Zend_Session extends Zend_Session_Abstract { if (!self::$_unitTestEnabled && defined('SID')) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('The session has already been started. The session id must be set first.'); } if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("You must call ".__CLASS__.'::'.__FUNCTION__. "() before any output has been sent to the browser; output started in {$filename}/{$linenum}"); } if (!is_string($id) || $id === '') { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('You must provide a non-empty string as a session identifier.'); } @@ -806,13 +793,11 @@ class Zend_Session extends Zend_Session_Abstract { foreach ($_SESSION['__ZF']['VALID'] as $validator_name => $valid_data) { if (!class_exists($validator_name)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($validator_name); } $validator = new $validator_name; if ($validator->validate() === false) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("This session is not valid according to {$validator_name}."); } } @@ -869,7 +854,6 @@ class Zend_Session extends Zend_Session_Abstract { if (parent::$_readable === false) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_READABLE_MSG); } diff --git a/library/vendor/Zend/Session/Abstract.php b/library/vendor/Zend/Session/Abstract.php index fcc29447a..57639eff4 100644 --- a/library/vendor/Zend/Session/Abstract.php +++ b/library/vendor/Zend/Session/Abstract.php @@ -82,7 +82,6 @@ abstract class Zend_Session_Abstract /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG); } @@ -108,7 +107,6 @@ abstract class Zend_Session_Abstract /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_WRITABLE_MSG); } @@ -143,7 +141,6 @@ abstract class Zend_Session_Abstract /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG); } diff --git a/library/vendor/Zend/Session/Exception.php b/library/vendor/Zend/Session/Exception.php index 69ec39677..c87ace3d0 100644 --- a/library/vendor/Zend/Session/Exception.php +++ b/library/vendor/Zend/Session/Exception.php @@ -24,7 +24,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Session/Namespace.php b/library/vendor/Zend/Session/Namespace.php index 254b4f2b1..d5ffafba5 100644 --- a/library/vendor/Zend/Session/Namespace.php +++ b/library/vendor/Zend/Session/Namespace.php @@ -24,13 +24,11 @@ /** * @see Zend_Session */ -require_once 'Zend/Session.php'; /** * @see Zend_Session_Abstract */ -require_once 'Zend/Session/Abstract.php'; /** @@ -105,7 +103,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Session namespace must be a non-empty string.'); } @@ -113,7 +110,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Session namespace must not start with an underscore.'); } @@ -121,7 +117,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Session namespace must not start with a number.'); } @@ -129,7 +124,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("A session namespace object already exists for this namespace ('$namespace'), and no additional accessors (session namespace objects) for this namespace are permitted."); } @@ -146,7 +140,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG); } @@ -280,7 +273,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -302,7 +294,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('This session/namespace has been marked as read-only.'); } @@ -310,7 +301,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -318,7 +308,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG); } @@ -367,7 +356,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Result must be an array. Got: ' . gettype($result)); } $_SESSION[$this->_namespace] = $result; @@ -387,7 +375,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -407,7 +394,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -430,7 +416,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG); } @@ -438,7 +423,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Seconds must be positive.'); } @@ -478,7 +462,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG); } @@ -486,7 +469,6 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Hops must be positive number.'); } diff --git a/library/vendor/Zend/Session/SaveHandler/DbTable.php b/library/vendor/Zend/Session/SaveHandler/DbTable.php index 3f246b600..18f8d6834 100644 --- a/library/vendor/Zend/Session/SaveHandler/DbTable.php +++ b/library/vendor/Zend/Session/SaveHandler/DbTable.php @@ -23,22 +23,18 @@ /** * @see Zend_Session */ -require_once 'Zend/Session.php'; /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; /** * @see Zend_Db_Table_Row_Abstract */ -require_once 'Zend/Db/Table/Row/Abstract.php'; /** * @see Zend_Config */ -require_once 'Zend/Config.php'; /** * Zend_Session_SaveHandler_DbTable @@ -168,7 +164,6 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( '$config must be an instance of Zend_Config or array of key/value pairs containing ' @@ -232,7 +227,6 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception(); } else if (empty($lifetime)) { $this->_lifetime = (int) ini_get('session.gc_maxlifetime'); @@ -420,7 +414,6 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception('session.save_path is a path and not a table name.'); } @@ -452,7 +445,6 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Value for configuration option '" . self::PRIMARY_ASSIGNMENT . "' must have an assignment " @@ -461,7 +453,6 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Value for configuration option '" . self::PRIMARY_ASSIGNMENT . "' must have an assignment " @@ -481,7 +472,6 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Configuration must define '" . self::MODIFIED_COLUMN . "' which names the " @@ -490,7 +480,6 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Configuration must define '" . self::LIFETIME_COLUMN . "' which names the " @@ -499,7 +488,6 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Configuration must define '" . self::DATA_COLUMN . "' which names the " diff --git a/library/vendor/Zend/Session/SaveHandler/Exception.php b/library/vendor/Zend/Session/SaveHandler/Exception.php index 363e3015a..b103d1f2d 100644 --- a/library/vendor/Zend/Session/SaveHandler/Exception.php +++ b/library/vendor/Zend/Session/SaveHandler/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Session_Exception */ -require_once 'Zend/Session/Exception.php'; /** * Zend_Session_SaveHandler_Exception diff --git a/library/vendor/Zend/Session/Validator/Abstract.php b/library/vendor/Zend/Session/Validator/Abstract.php index 37766ef04..2c79f3265 100644 --- a/library/vendor/Zend/Session/Validator/Abstract.php +++ b/library/vendor/Zend/Session/Validator/Abstract.php @@ -23,7 +23,6 @@ /** * @see Zend_Session_Validator_Interface */ -require_once 'Zend/Session/Validator/Interface.php'; /** * Zend_Session_Validator_Abstract diff --git a/library/vendor/Zend/Session/Validator/HttpUserAgent.php b/library/vendor/Zend/Session/Validator/HttpUserAgent.php index 468bcf9dd..1e2d495d5 100644 --- a/library/vendor/Zend/Session/Validator/HttpUserAgent.php +++ b/library/vendor/Zend/Session/Validator/HttpUserAgent.php @@ -23,7 +23,6 @@ /** * @see Zend_Session_Validator_Abstract */ -require_once 'Zend/Session/Validator/Abstract.php'; /** * Zend_Session_Validator_HttpUserAgent diff --git a/library/vendor/Zend/Stdlib/CallbackHandler.php b/library/vendor/Zend/Stdlib/CallbackHandler.php index bb52138f8..45a1272bc 100644 --- a/library/vendor/Zend/Stdlib/CallbackHandler.php +++ b/library/vendor/Zend/Stdlib/CallbackHandler.php @@ -96,7 +96,6 @@ class Zend_Stdlib_CallbackHandler $callable = is_callable($callback); restore_error_handler(); if (!$callable || $this->error) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException('Invalid callback provided; not callable'); } @@ -272,7 +271,6 @@ class Zend_Stdlib_CallbackHandler list($class, $method) = explode('::', $callback, 2); if (!class_exists($class)) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException(sprintf( 'Static method call "%s" refers to a class that does not exist', $callback @@ -281,7 +279,6 @@ class Zend_Stdlib_CallbackHandler $r = new ReflectionClass($class); if (!$r->hasMethod($method)) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException(sprintf( 'Static method call "%s" refers to a method that does not exist', $callback @@ -289,7 +286,6 @@ class Zend_Stdlib_CallbackHandler } $m = $r->getMethod($method); if (!$m->isStatic()) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException(sprintf( 'Static method call "%s" refers to a method that is not static', $callback diff --git a/library/vendor/Zend/Stdlib/Exception/InvalidCallbackException.php b/library/vendor/Zend/Stdlib/Exception/InvalidCallbackException.php index 84b4672fa..11e8ddc57 100644 --- a/library/vendor/Zend/Stdlib/Exception/InvalidCallbackException.php +++ b/library/vendor/Zend/Stdlib/Exception/InvalidCallbackException.php @@ -18,7 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/Exception.php'; /** * Invalid callback exception diff --git a/library/vendor/Zend/Stdlib/PriorityQueue.php b/library/vendor/Zend/Stdlib/PriorityQueue.php index d145d46c3..47bf68f00 100644 --- a/library/vendor/Zend/Stdlib/PriorityQueue.php +++ b/library/vendor/Zend/Stdlib/PriorityQueue.php @@ -18,7 +18,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/SplPriorityQueue.php'; /** * Re-usable, serializable priority queue implementation diff --git a/library/vendor/Zend/Tag/Cloud.php b/library/vendor/Zend/Tag/Cloud.php index 8955d396e..bf0b4e0de 100644 --- a/library/vendor/Zend/Tag/Cloud.php +++ b/library/vendor/Zend/Tag/Cloud.php @@ -23,7 +23,6 @@ /** * @see Zend_Tag_Item */ -require_once 'Zend/Tag/Item.php'; /** * @category Zend @@ -150,7 +149,6 @@ class Zend_Tag_Cloud } else if (is_array($tag)) { $itemList[] = new Zend_Tag_Item($tag); } else { - require_once 'Zend/Tag/Cloud/Exception.php'; throw new Zend_Tag_Cloud_Exception('Tag must be an instance of Zend_Tag_Taggable or an array'); } } @@ -172,7 +170,6 @@ class Zend_Tag_Cloud } else if (is_array($tag)) { $tags[] = new Zend_Tag_Item($tag); } else { - require_once 'Zend/Tag/Cloud/Exception.php'; throw new Zend_Tag_Cloud_Exception('Tag must be an instance of Zend_Tag_Taggable or an array'); } @@ -201,7 +198,6 @@ class Zend_Tag_Cloud public function getItemList() { if (null === $this->_tags) { - require_once 'Zend/Tag/ItemList.php'; $this->setItemList(new Zend_Tag_ItemList()); } return $this->_tags; @@ -233,7 +229,6 @@ class Zend_Tag_Cloud } if (!($decorator instanceof Zend_Tag_Cloud_Decorator_Cloud)) { - require_once 'Zend/Tag/Cloud/Exception.php'; throw new Zend_Tag_Cloud_Exception('Decorator is no instance of Zend_Tag_Cloud_Decorator_Cloud'); } @@ -281,7 +276,6 @@ class Zend_Tag_Cloud } if (!($decorator instanceof Zend_Tag_Cloud_Decorator_Tag)) { - require_once 'Zend/Tag/Cloud/Exception.php'; throw new Zend_Tag_Cloud_Exception('Decorator is no instance of Zend_Tag_Cloud_Decorator_Tag'); } @@ -326,7 +320,6 @@ class Zend_Tag_Cloud $prefix = 'Zend_Tag_Cloud_Decorator_'; $pathPrefix = 'Zend/Tag/Cloud/Decorator/'; - require_once 'Zend/Loader/PluginLoader.php'; $this->_pluginLoader = new Zend_Loader_PluginLoader(array($prefix => $pathPrefix)); } diff --git a/library/vendor/Zend/Tag/Cloud/Decorator/Exception.php b/library/vendor/Zend/Tag/Cloud/Decorator/Exception.php index e97ee1203..9406e75f4 100644 --- a/library/vendor/Zend/Tag/Cloud/Decorator/Exception.php +++ b/library/vendor/Zend/Tag/Cloud/Decorator/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Tag_Cloud_Exception */ -require_once 'Zend/Tag/Cloud/Exception.php'; /** * Exception class for Zend_Tag_Cloud_Decorator diff --git a/library/vendor/Zend/Tag/Cloud/Decorator/HtmlCloud.php b/library/vendor/Zend/Tag/Cloud/Decorator/HtmlCloud.php index 98c9744fd..3173b31ad 100644 --- a/library/vendor/Zend/Tag/Cloud/Decorator/HtmlCloud.php +++ b/library/vendor/Zend/Tag/Cloud/Decorator/HtmlCloud.php @@ -23,7 +23,6 @@ /** * @see Zend_Tag_Cloud_Decorator_Cloud */ -require_once 'Zend/Tag/Cloud/Decorator/Cloud.php'; /** * Simple HTML decorator for clouds diff --git a/library/vendor/Zend/Tag/Cloud/Decorator/HtmlTag.php b/library/vendor/Zend/Tag/Cloud/Decorator/HtmlTag.php index 9ef46fc7a..aba758b23 100644 --- a/library/vendor/Zend/Tag/Cloud/Decorator/HtmlTag.php +++ b/library/vendor/Zend/Tag/Cloud/Decorator/HtmlTag.php @@ -23,7 +23,6 @@ /** * @see Zend_Tag_Cloud_Decorator_Tag */ -require_once 'Zend/Tag/Cloud/Decorator/Tag.php'; /** * Simple HTML decorator for tags @@ -98,13 +97,11 @@ class Zend_Tag_Cloud_Decorator_HtmlTag extends Zend_Tag_Cloud_Decorator_Tag { if (is_array($classList)) { if (count($classList) === 0) { - require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; throw new Zend_Tag_Cloud_Decorator_Exception('Classlist is empty'); } foreach ($classList as $class) { if (!is_string($class)) { - require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; throw new Zend_Tag_Cloud_Decorator_Exception('Classlist contains an invalid classname'); } } @@ -158,7 +155,6 @@ class Zend_Tag_Cloud_Decorator_HtmlTag extends Zend_Tag_Cloud_Decorator_Tag public function setFontSizeUnit($fontSizeUnit) { if (!in_array($fontSizeUnit, $this->_alloweFontSizeUnits)) { - require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; throw new Zend_Tag_Cloud_Decorator_Exception('Invalid fontsize unit specified'); } @@ -208,7 +204,6 @@ class Zend_Tag_Cloud_Decorator_HtmlTag extends Zend_Tag_Cloud_Decorator_Tag public function setMaxFontSize($maxFontSize) { if (!is_numeric($maxFontSize)) { - require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; throw new Zend_Tag_Cloud_Decorator_Exception('Fontsize must be numeric'); } @@ -237,7 +232,6 @@ class Zend_Tag_Cloud_Decorator_HtmlTag extends Zend_Tag_Cloud_Decorator_Tag public function setMinFontSize($minFontSize) { if (!is_numeric($minFontSize)) { - require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; throw new Zend_Tag_Cloud_Decorator_Exception('Fontsize must be numeric'); } diff --git a/library/vendor/Zend/Tag/Cloud/Exception.php b/library/vendor/Zend/Tag/Cloud/Exception.php index 7121afec0..b6bc8d4ae 100644 --- a/library/vendor/Zend/Tag/Cloud/Exception.php +++ b/library/vendor/Zend/Tag/Cloud/Exception.php @@ -22,7 +22,6 @@ /** * Zend_Tag_Exception */ -require_once 'Zend/Tag/Exception.php'; /** * Exception class for Zend_Tag_Cloud diff --git a/library/vendor/Zend/Tag/Exception.php b/library/vendor/Zend/Tag/Exception.php index 1b8eb7872..a42606bbb 100644 --- a/library/vendor/Zend/Tag/Exception.php +++ b/library/vendor/Zend/Tag/Exception.php @@ -22,7 +22,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Exception class for Zend_Tag diff --git a/library/vendor/Zend/Tag/Item.php b/library/vendor/Zend/Tag/Item.php index b1ced0b8e..699601ec9 100644 --- a/library/vendor/Zend/Tag/Item.php +++ b/library/vendor/Zend/Tag/Item.php @@ -23,7 +23,6 @@ /** * @see Zend_Tag_Taggable */ -require_once 'Zend/Tag/Taggable.php'; /** * @category Zend @@ -81,19 +80,16 @@ class Zend_Tag_Item implements Zend_Tag_Taggable } if (!is_array($options)) { - require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Invalid options provided to constructor'); } $this->setOptions($options); if ($this->_title === null) { - require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Title was not set'); } if ($this->_weight === null) { - require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Weight was not set'); } } @@ -140,7 +136,6 @@ class Zend_Tag_Item implements Zend_Tag_Taggable public function setTitle($title) { if (!is_string($title)) { - require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Title must be a string'); } @@ -168,7 +163,6 @@ class Zend_Tag_Item implements Zend_Tag_Taggable public function setWeight($weight) { if (!is_numeric($weight)) { - require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Weight must be numeric'); } diff --git a/library/vendor/Zend/Tag/ItemList.php b/library/vendor/Zend/Tag/ItemList.php index 18ad879d4..83607b8e0 100644 --- a/library/vendor/Zend/Tag/ItemList.php +++ b/library/vendor/Zend/Tag/ItemList.php @@ -23,7 +23,6 @@ /** * @see Zend_Tag_Taggable */ -require_once 'Zend/Tag/Taggable.php'; /** * @category Zend @@ -61,7 +60,6 @@ class Zend_Tag_ItemList implements Countable, SeekableIterator, ArrayAccess { // Don't allow an empty value list if (count($values) === 0) { - require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Value list may not be empty'); } @@ -215,7 +213,6 @@ class Zend_Tag_ItemList implements Countable, SeekableIterator, ArrayAccess // We need to make that check here, as the method signature must be // compatible with ArrayAccess::offsetSet() if (!($item instanceof Zend_Tag_Taggable)) { - require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Item must implement Zend_Tag_Taggable'); } diff --git a/library/vendor/Zend/Test/DbAdapter.php b/library/vendor/Zend/Test/DbAdapter.php index 7187745e7..b32076f76 100644 --- a/library/vendor/Zend/Test/DbAdapter.php +++ b/library/vendor/Zend/Test/DbAdapter.php @@ -23,17 +23,14 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once "Zend/Db/Adapter/Abstract.php"; /** * @see Zend_Test_DbStatement */ -require_once "Zend/Test/DbStatement.php"; /** * @see Zend_Db_Profiler */ -require_once 'Zend/Db/Profiler.php'; /** * Testing Database Adapter which acts as a stack for SQL Results diff --git a/library/vendor/Zend/Test/DbStatement.php b/library/vendor/Zend/Test/DbStatement.php index 2a9a33762..3a3a0242b 100644 --- a/library/vendor/Zend/Test/DbStatement.php +++ b/library/vendor/Zend/Test/DbStatement.php @@ -23,7 +23,6 @@ /** * @see Zend_Db_Statement_Interface */ -require_once "Zend/Db/Statement/Interface.php"; /** * Testing Database Statement that acts as a stack to SQL resultsets. @@ -305,7 +304,6 @@ class Zend_Test_DbStatement implements Zend_Db_Statement_Interface return false; } else { if(count($row) < $col) { - require_once "Zend/Db/Statement/Exception.php"; throw new Zend_Db_Statement_Exception( "Column Position '".$col."' is out of bounds." ); diff --git a/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery34.php b/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery34.php index ae3eb07a3..a67d4a482 100644 --- a/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery34.php +++ b/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery34.php @@ -21,7 +21,6 @@ */ /** @see Zend_Dom_Query */ -require_once 'Zend/Dom/Query.php'; /** * Zend_Dom_Query-based PHPUnit Constraint @@ -149,7 +148,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -165,7 +163,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint switch ($assertType) { case self::ASSERT_CONTENT_CONTAINS: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No content provided against which to match'); } $this->_content = $content = $argv[2]; @@ -174,7 +171,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint : $this->_matchContent($result, $content); case self::ASSERT_CONTENT_REGEX: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match'); } $this->_content = $content = $argv[2]; @@ -185,7 +181,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint case self::ASSERT_CONTENT_COUNT_MIN: case self::ASSERT_CONTENT_COUNT_MAX: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No count provided against which to compare'); } $this->_content = $content = $argv[2]; @@ -212,7 +207,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint */ public function fail($other, $description, $not = false) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_CONTENT_CONTAINS: $failure = 'Failed asserting node denoted by %s CONTAINS content "%s"'; diff --git a/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery37.php b/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery37.php index 045f52b84..fd7798035 100644 --- a/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery37.php +++ b/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery37.php @@ -21,7 +21,6 @@ */ /** @see Zend_Dom_Query */ -require_once 'Zend/Dom/Query.php'; /** * Zend_Dom_Query-based PHPUnit Constraint @@ -157,7 +156,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -171,7 +169,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint switch ($assertType) { case self::ASSERT_CONTENT_CONTAINS: if (!$match) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No content provided against which to match'); } $this->_content = $match; @@ -180,7 +177,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint : $this->_matchContent($result, $match); case self::ASSERT_CONTENT_REGEX: if (!$match) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match'); } $this->_content = $match; @@ -191,7 +187,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint case self::ASSERT_CONTENT_COUNT_MIN: case self::ASSERT_CONTENT_COUNT_MAX: if ($match === false) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No count provided against which to compare'); } $this->_content = $match; @@ -224,7 +219,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint */ public function fail($other, $description, PHPUnit_Framework_ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_CONTENT_CONTAINS: $failure = 'Failed asserting node denoted by %s CONTAINS content "%s"'; diff --git a/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery41.php b/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery41.php index 91f6ef69d..a60c1dbb7 100644 --- a/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery41.php +++ b/library/vendor/Zend/Test/PHPUnit/Constraint/DomQuery41.php @@ -21,7 +21,6 @@ */ /** @see Zend_Dom_Query */ -require_once 'Zend/Dom/Query.php'; /** * Zend_Dom_Query-based PHPUnit Constraint @@ -157,7 +156,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -171,7 +169,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint switch ($assertType) { case self::ASSERT_CONTENT_CONTAINS: if (!$match) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No content provided against which to match'); } $this->_content = $match; @@ -180,7 +177,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint : $this->_matchContent($result, $match); case self::ASSERT_CONTENT_REGEX: if (!$match) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match'); } $this->_content = $match; @@ -191,7 +187,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint case self::ASSERT_CONTENT_COUNT_MIN: case self::ASSERT_CONTENT_COUNT_MAX: if ($match === false) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No count provided against which to compare'); } $this->_content = $match; @@ -226,7 +221,6 @@ class Zend_Test_PHPUnit_Constraint_DomQuery extends PHPUnit_Framework_Constraint */ public function fail($other, $description, \SebastianBergmann\Comparator\ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_CONTENT_CONTAINS: $failure = 'Failed asserting node denoted by %s CONTAINS content "%s"'; diff --git a/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect34.php b/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect34.php index d0f80ff2c..51dcec8fd 100644 --- a/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect34.php +++ b/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect34.php @@ -103,7 +103,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint public function evaluate($other, $assertType = null) { if (!$other instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Redirect constraint assertions require a response object'); } @@ -113,7 +112,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -126,7 +124,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint switch ($assertType) { case self::ASSERT_REDIRECT_TO: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No redirect URL provided against which to match'); } $this->_match = $match = $argv[2]; @@ -135,7 +132,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint : $this->_match($response, $match); case self::ASSERT_REDIRECT_REGEX: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match redirect'); } $this->_match = $match = $argv[2]; @@ -166,7 +162,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint */ public function fail($other, $description, $not = false) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_REDIRECT_TO: $failure = 'Failed asserting response redirects to "%s"'; diff --git a/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect37.php b/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect37.php index a6cd1aca8..2227d2183 100644 --- a/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect37.php +++ b/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect37.php @@ -109,7 +109,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint public function evaluate($other, $assertType = null, $variable = FALSE) { if (!$other instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Redirect constraint assertions require a response object'); } @@ -119,7 +118,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -132,7 +130,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint switch ($assertType) { case self::ASSERT_REDIRECT_TO: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No redirect URL provided against which to match'); } $this->_match = $match = $argv[2]; @@ -141,7 +138,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint : $this->_match($response, $match); case self::ASSERT_REDIRECT_REGEX: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match redirect'); } $this->_match = $match = $argv[2]; @@ -178,7 +174,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint */ public function fail($other, $description, PHPUnit_Framework_ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_REDIRECT_TO: $failure = 'Failed asserting response redirects to "%s"'; diff --git a/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect41.php b/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect41.php index c471b274e..902c1cfd5 100644 --- a/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect41.php +++ b/library/vendor/Zend/Test/PHPUnit/Constraint/Redirect41.php @@ -109,7 +109,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint public function evaluate($other, $assertType = null, $variable = FALSE) { if (!$other instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Redirect constraint assertions require a response object'); } @@ -119,7 +118,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -132,7 +130,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint switch ($assertType) { case self::ASSERT_REDIRECT_TO: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No redirect URL provided against which to match'); } $this->_match = $match = $argv[2]; @@ -141,7 +138,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint : $this->_match($response, $match); case self::ASSERT_REDIRECT_REGEX: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match redirect'); } $this->_match = $match = $argv[2]; @@ -180,7 +176,6 @@ class Zend_Test_PHPUnit_Constraint_Redirect extends PHPUnit_Framework_Constraint */ public function fail($other, $description, \SebastianBergmann\Comparator\ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_REDIRECT_TO: $failure = 'Failed asserting response redirects to "%s"'; diff --git a/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php b/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php index 3b0545d4c..62cedc90c 100644 --- a/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php +++ b/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php @@ -114,7 +114,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons public function evaluate($other, $assertType = null) { if (!$other instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Header constraint assertions require a response object'); } @@ -124,7 +123,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -137,7 +135,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons switch ($assertType) { case self::ASSERT_RESPONSE_CODE: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No response code provided against which to match'); } $this->_code = $code = $argv[2]; @@ -146,7 +143,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons : $this->_code($response, $code); case self::ASSERT_HEADER: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No header provided against which to match'); } $this->_header = $header = $argv[2]; @@ -155,7 +151,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons : $this->_header($response, $header); case self::ASSERT_HEADER_CONTAINS: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . __FUNCTION__); } $this->_header = $header = $argv[2]; @@ -165,7 +160,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons : $this->_headerContains($response, $header, $match); case self::ASSERT_HEADER_REGEX: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . __FUNCTION__); } $this->_header = $header = $argv[2]; @@ -174,7 +168,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons ? $this->_notHeaderRegex($response, $header, $match) : $this->_headerRegex($response, $header, $match); default: - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Invalid assertion type ' . __FUNCTION__); } } @@ -191,7 +184,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons */ public function fail($other, $description, $not = false) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_RESPONSE_CODE: $failure = 'Failed asserting response code "%s"'; diff --git a/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php b/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php index 3f7738d96..df3fd5b6d 100644 --- a/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php +++ b/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php @@ -122,7 +122,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons public function evaluate($response, $assertType = '', $variable = FALSE) { if (!$response instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Header constraint assertions require a response object'); } @@ -132,7 +131,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -144,7 +142,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons switch ($assertType) { case self::ASSERT_RESPONSE_CODE: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No response code provided against which to match'); } $this->_code = $code = $argv[2]; @@ -153,7 +150,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons : $this->_code($response, $code); case self::ASSERT_HEADER: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No header provided against which to match'); } $this->_header = $header = $argv[2]; @@ -162,7 +158,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons : $this->_header($response, $header); case self::ASSERT_HEADER_CONTAINS: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . $assertType); } $this->_header = $header = $argv[2]; @@ -172,7 +167,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons : $this->_headerContains($response, $header, $match); case self::ASSERT_HEADER_REGEX: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . $assertType); } $this->_header = $header = $argv[2]; @@ -181,7 +175,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons ? $this->_notHeaderRegex($response, $header, $match) : $this->_headerRegex($response, $header, $match); default: - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Invalid assertion type ' . $assertType); } } @@ -204,7 +197,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons */ public function fail($other, $description, PHPUnit_Framework_ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_RESPONSE_CODE: $failure = 'Failed asserting response code "%s"'; diff --git a/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php b/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php index efacefa93..6d6c09ecf 100644 --- a/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php +++ b/library/vendor/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php @@ -122,7 +122,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons public function evaluate($response, $assertType = '', $variable = FALSE) { if (!$response instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Header constraint assertions require a response object'); } @@ -132,7 +131,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -144,7 +142,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons switch ($assertType) { case self::ASSERT_RESPONSE_CODE: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No response code provided against which to match'); } $this->_code = $code = $argv[2]; @@ -153,7 +150,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons : $this->_code($response, $code); case self::ASSERT_HEADER: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No header provided against which to match'); } $this->_header = $header = $argv[2]; @@ -162,7 +158,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons : $this->_header($response, $header); case self::ASSERT_HEADER_CONTAINS: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . $assertType); } $this->_header = $header = $argv[2]; @@ -172,7 +167,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons : $this->_headerContains($response, $header, $match); case self::ASSERT_HEADER_REGEX: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . $assertType); } $this->_header = $header = $argv[2]; @@ -181,7 +175,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons ? $this->_notHeaderRegex($response, $header, $match) : $this->_headerRegex($response, $header, $match); default: - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Invalid assertion type ' . $assertType); } } @@ -206,7 +199,6 @@ class Zend_Test_PHPUnit_Constraint_ResponseHeader extends PHPUnit_Framework_Cons */ public function fail($other, $description, \SebastianBergmann\Comparator\ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_RESPONSE_CODE: $failure = 'Failed asserting response code "%s"'; diff --git a/library/vendor/Zend/Test/PHPUnit/ControllerTestCase.php b/library/vendor/Zend/Test/PHPUnit/ControllerTestCase.php index 1b8827d8d..684537277 100644 --- a/library/vendor/Zend/Test/PHPUnit/ControllerTestCase.php +++ b/library/vendor/Zend/Test/PHPUnit/ControllerTestCase.php @@ -20,19 +20,14 @@ */ /** @see Zend_Controller_Front */ -require_once 'Zend/Controller/Front.php'; /** @see Zend_Controller_Action_HelperBroker */ -require_once 'Zend/Controller/Action/HelperBroker.php'; /** @see Zend_Layout */ -require_once 'Zend/Layout.php'; /** @see Zend_Session */ -require_once 'Zend/Session.php'; /** @see Zend_Registry */ -require_once 'Zend/Registry.php'; /** * Functional testing scaffold for MVC applications @@ -87,7 +82,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function __set($name, $value) { if (in_array($name, array('request', 'response', 'frontController'))) { - require_once 'Zend/Exception.php'; throw new Zend_Exception(sprintf('Setting %s object manually is not allowed', $name)); } $this->$name = $value; @@ -148,7 +142,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te } elseif (is_callable($this->bootstrap)) { call_user_func($this->bootstrap); } elseif (is_string($this->bootstrap)) { - require_once 'Zend/Loader.php'; if (Zend_Loader::isReadable($this->bootstrap)) { include $this->bootstrap; } @@ -284,7 +277,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertQuery($path, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__)) { @@ -302,7 +294,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotQuery($path, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__)) { @@ -321,7 +312,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertQueryContentContains($path, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $match)) { @@ -340,7 +330,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotQueryContentContains($path, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $match)) { @@ -359,7 +348,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertQueryContentRegex($path, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $pattern)) { @@ -378,7 +366,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotQueryContentRegex($path, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $pattern)) { @@ -397,7 +384,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertQueryCount($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $count)) { @@ -416,7 +402,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotQueryCount($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $count)) { @@ -435,7 +420,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertQueryCountMin($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $count)) { @@ -454,7 +438,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertQueryCountMax($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $count)) { @@ -483,7 +466,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertXpath($path, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -502,7 +484,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotXpath($path, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -522,7 +503,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertXpathContentContains($path, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -542,7 +522,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotXpathContentContains($path, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -562,7 +541,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertXpathContentRegex($path, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -582,7 +560,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotXpathContentRegex($path, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -602,7 +579,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertXpathCount($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -622,7 +598,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotXpathCount($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -642,7 +617,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertXpathCountMin($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -662,7 +636,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertXpathCountMax($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -680,7 +653,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertRedirect($message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__)) { @@ -697,7 +669,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotRedirect($message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__)) { @@ -715,7 +686,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertRedirectTo($url, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $url)) { @@ -733,7 +703,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotRedirectTo($url, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $url)) { @@ -751,7 +720,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertRedirectRegex($pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $pattern)) { @@ -769,7 +737,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotRedirectRegex($pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $pattern)) { @@ -787,7 +754,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertResponseCode($code, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $code)) { @@ -805,7 +771,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotResponseCode($code, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $constraint->setNegate(true); $response = $this->response; @@ -824,7 +789,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertHeader($header, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $header)) { @@ -842,7 +806,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotHeader($header, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $constraint->setNegate(true); $response = $this->response; @@ -862,7 +825,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertHeaderContains($header, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $header, $match)) { @@ -881,7 +843,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotHeaderContains($header, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $constraint->setNegate(true); $response = $this->response; @@ -901,7 +862,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertHeaderRegex($header, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $header, $pattern)) { @@ -920,7 +880,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function assertNotHeaderRegex($header, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $constraint->setNegate(true); $response = $this->response; @@ -1116,7 +1075,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function getRequest() { if (null === $this->_request) { - require_once 'Zend/Controller/Request/HttpTestCase.php'; $this->_request = new Zend_Controller_Request_HttpTestCase; } return $this->_request; @@ -1130,7 +1088,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function getResponse() { if (null === $this->_response) { - require_once 'Zend/Controller/Response/HttpTestCase.php'; $this->_response = new Zend_Controller_Response_HttpTestCase; } return $this->_response; @@ -1144,7 +1101,6 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function getQuery() { if (null === $this->_query) { - require_once 'Zend/Dom/Query.php'; $this->_query = new Zend_Dom_Query; } return $this->_query; diff --git a/library/vendor/Zend/Test/PHPUnit/DatabaseTestCase.php b/library/vendor/Zend/Test/PHPUnit/DatabaseTestCase.php index f6f5e54d9..9002f0ad1 100644 --- a/library/vendor/Zend/Test/PHPUnit/DatabaseTestCase.php +++ b/library/vendor/Zend/Test/PHPUnit/DatabaseTestCase.php @@ -23,27 +23,22 @@ /** * @see Zend_Test_PHPUnit_Db_Operation_Truncate */ -require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php"; /** * @see Zend_Test_PHPUnit_Db_Operation_Insert */ -require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php"; /** * @see Zend_Test_PHPUnit_Db_DataSet_DbTableDataSet */ -require_once "Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php"; /** * @see Zend_Test_PHPUnit_Db_DataSet_DbTable */ -require_once "Zend/Test/PHPUnit/Db/DataSet/DbTable.php"; /** * @see Zend_Test_PHPUnit_Db_DataSet_DbRowset */ -require_once "Zend/Test/PHPUnit/Db/DataSet/DbRowset.php"; /** * Generic Testcase for Zend Framework related DbUnit Testing with PHPUnit diff --git a/library/vendor/Zend/Test/PHPUnit/Db/Connection.php b/library/vendor/Zend/Test/PHPUnit/Db/Connection.php index c3263482d..ce32d2e5a 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/Connection.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/Connection.php @@ -23,12 +23,10 @@ /** * @see Zend_Test_PHPUnit_Db_DataSet_QueryTable */ -require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php"; /** * @see Zend_Test_PHPUnit_Db_Metadata_Generic */ -require_once "Zend/Test/PHPUnit/Db/Metadata/Generic.php"; /** * Generic Abstraction of Zend_Db Connections in the PHPUnit Database Extension context. diff --git a/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php b/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php index 3f612f3d3..b665f3397 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php @@ -23,7 +23,6 @@ /** * @see Zend_Db_Table_Rowset_Abstract */ -require_once "Zend/Db/Table/Rowset/Abstract.php"; /** * Use a Zend_Db Rowset as a datatable for assertions with other PHPUnit Database extension tables. @@ -50,7 +49,6 @@ class Zend_Test_PHPUnit_Db_DataSet_DbRowset extends PHPUnit_Extensions_Database_ if($table !== null) { $tableName = $table->info('name'); } else { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception( 'No table name was given to Rowset Table and table name cannot be infered from the table, '. 'because the rowset is disconnected from database.' diff --git a/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbTable.php b/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbTable.php index b0c8e24a0..13e854f6c 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbTable.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbTable.php @@ -23,7 +23,6 @@ /** * @see Zend_Db_Table_Abstract */ -require_once "Zend/Db/Table/Abstract.php"; /** * Use a Zend_Db_Table for assertions with other PHPUnit Database Extension table types. diff --git a/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php b/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php index 3d113f259..fa2ed8765 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php @@ -23,7 +23,6 @@ /** * @see Zend_Test_PHPUnit_Db_DataSet_DbTable */ -require_once "Zend/Test/PHPUnit/Db/DataSet/DbTable.php"; /** * Aggregate several Zend_Db_Table instances into a dataset. diff --git a/library/vendor/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php b/library/vendor/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php index 44b9f8ad6..1b24c8f31 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php @@ -23,12 +23,10 @@ /** * @see Zend_Test_PHPUnit_Db_DataSet_QueryTable */ -require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php"; /** * @see Zend_Db_Select */ -require_once "Zend/Db/Select.php"; /** * Uses several query strings or Zend_Db_Select objects to form a dataset of tables for assertion with other datasets. @@ -50,7 +48,6 @@ class Zend_Test_PHPUnit_Db_DataSet_QueryDataSet extends PHPUnit_Extensions_Datab public function __construct(PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection) { if( !($databaseConnection instanceof Zend_Test_PHPUnit_Db_Connection) ) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Zend_Test_PHPUnit_Db_DataSet_QueryDataSet only works with Zend_Test_PHPUnit_Db_Connection connections-"); } $this->databaseConnection = $databaseConnection; diff --git a/library/vendor/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php b/library/vendor/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php index 32722db1a..4b02f9c3b 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php @@ -42,7 +42,6 @@ class Zend_Test_PHPUnit_Db_DataSet_QueryTable extends PHPUnit_Extensions_Databas public function __construct($tableName, $query, PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection) { if( !($databaseConnection instanceof Zend_Test_PHPUnit_Db_Connection) ) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Zend_Test_PHPUnit_Db_DataSet_QueryTable only works with Zend_Test_PHPUnit_Db_Connection connections-"); } parent::__construct($tableName, $query, $databaseConnection); diff --git a/library/vendor/Zend/Test/PHPUnit/Db/Exception.php b/library/vendor/Zend/Test/PHPUnit/Db/Exception.php index 7bd2d4d9b..c2e4aab9d 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/Exception.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Exception */ -require_once "Zend/Exception.php"; /** * Exception for Zend_Test_PHPUnit_Database package diff --git a/library/vendor/Zend/Test/PHPUnit/Db/Metadata/Generic.php b/library/vendor/Zend/Test/PHPUnit/Db/Metadata/Generic.php index f6c63ba51..0f06b010a 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/Metadata/Generic.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/Metadata/Generic.php @@ -23,7 +23,6 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once "Zend/Db/Adapter/Abstract.php"; /** * Generic Metadata accessor for the Zend_Db adapters diff --git a/library/vendor/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php b/library/vendor/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php index 949e975b2..97842a3e2 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php @@ -23,7 +23,6 @@ /** * @see Zend_Test_PHPUnit_Db_Connection */ -require_once "Zend/Test/PHPUnit/Db/Connection.php"; /** * Delete All Operation that can be executed on set up or tear down of a database tester. @@ -44,7 +43,6 @@ class Zend_Test_PHPUnit_Db_Operation_DeleteAll implements PHPUnit_Extensions_Dat public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } diff --git a/library/vendor/Zend/Test/PHPUnit/Db/Operation/Insert.php b/library/vendor/Zend/Test/PHPUnit/Db/Operation/Insert.php index 791b4cbf9..b28e8dccf 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/Operation/Insert.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/Operation/Insert.php @@ -23,7 +23,6 @@ /** * @see Zend_Test_PHPUnit_Db_Connection */ -require_once "Zend/Test/PHPUnit/Db/Connection.php"; /** * Operation for Inserting on setup or teardown of a database tester. @@ -44,7 +43,6 @@ class Zend_Test_PHPUnit_Db_Operation_Insert implements PHPUnit_Extensions_Databa public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } diff --git a/library/vendor/Zend/Test/PHPUnit/Db/Operation/Truncate.php b/library/vendor/Zend/Test/PHPUnit/Db/Operation/Truncate.php index 12316581a..624971b9f 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/Operation/Truncate.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/Operation/Truncate.php @@ -23,7 +23,6 @@ /** * @see Zend_Test_PHPUnit_Db_Connection */ -require_once "Zend/Test/PHPUnit/Db/Connection.php"; /** * Operation for Truncating on setup or teardown of a database tester. @@ -46,7 +45,6 @@ class Zend_Test_PHPUnit_Db_Operation_Truncate implements PHPUnit_Extensions_Data public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } @@ -81,7 +79,6 @@ class Zend_Test_PHPUnit_Db_Operation_Truncate implements PHPUnit_Extensions_Data } else { $db->query('IMPORT FROM /dev/null OF DEL REPLACE INTO '.$tableName); }*/ - require_once "Zend/Exception.php"; throw Zend_Exception("IBM Db2 TRUNCATE not supported."); } else if($this->_isMssqlOrOracle($db)) { $db->query('TRUNCATE TABLE '.$tableName); diff --git a/library/vendor/Zend/Test/PHPUnit/Db/SimpleTester.php b/library/vendor/Zend/Test/PHPUnit/Db/SimpleTester.php index bdc00c4dc..66e7daad5 100644 --- a/library/vendor/Zend/Test/PHPUnit/Db/SimpleTester.php +++ b/library/vendor/Zend/Test/PHPUnit/Db/SimpleTester.php @@ -23,12 +23,10 @@ /** * @see Zend_Test_PHPUnit_Db_Operation_Truncate */ -require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php"; /** * @see Zend_Test_PHPUnit_Db_Operation_Insert */ -require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php"; /** * Simple Tester for Database Tests when the Abstract Test Case cannot be used. @@ -50,7 +48,6 @@ class Zend_Test_PHPUnit_Db_SimpleTester extends PHPUnit_Extensions_Database_Defa public function __construct(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } diff --git a/library/vendor/Zend/Text/Exception.php b/library/vendor/Zend/Text/Exception.php index 150825052..3c8509842 100644 --- a/library/vendor/Zend/Text/Exception.php +++ b/library/vendor/Zend/Text/Exception.php @@ -22,7 +22,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Exception class for Zend_Text diff --git a/library/vendor/Zend/Text/Figlet.php b/library/vendor/Zend/Text/Figlet.php index f1a308692..1affba3a9 100644 --- a/library/vendor/Zend/Text/Figlet.php +++ b/library/vendor/Zend/Text/Figlet.php @@ -447,7 +447,6 @@ class Zend_Text_Figlet $textLength = @iconv_strlen($text, 'UTF-8'); if ($textLength === false) { - require_once 'Zend/Text/Figlet/Exception.php'; throw new Zend_Text_Figlet_Exception('$text is not encoded with ' . $encoding); } @@ -968,14 +967,12 @@ class Zend_Text_Figlet { // Check if the font file exists if (!file_exists($fontFile)) { - require_once 'Zend/Text/Figlet/Exception.php'; throw new Zend_Text_Figlet_Exception($fontFile . ': Font file not found'); } // Check if gzip support is required if (substr($fontFile, -3) === '.gz') { if (!function_exists('gzcompress')) { - require_once 'Zend/Text/Figlet/Exception.php'; throw new Zend_Text_Figlet_Exception('GZIP library is required for ' . 'gzip compressed font files'); } @@ -989,7 +986,6 @@ class Zend_Text_Figlet // Try to open the file $fp = fopen($fontFile, 'rb'); if ($fp === false) { - require_once 'Zend/Text/Figlet/Exception.php'; throw new Zend_Text_Figlet_Exception($fontFile . ': Could not open file'); } @@ -1013,7 +1009,6 @@ class Zend_Text_Figlet $this->_fontSmush); if ($magic !== self::FONTFILE_MAGIC_NUMBER || $numsRead < 5) { - require_once 'Zend/Text/Figlet/Exception.php'; throw new Zend_Text_Figlet_Exception($fontFile . ': Not a FIGlet 2 font file'); } diff --git a/library/vendor/Zend/Text/Figlet/Exception.php b/library/vendor/Zend/Text/Figlet/Exception.php index e3758acbf..91293c4bf 100644 --- a/library/vendor/Zend/Text/Figlet/Exception.php +++ b/library/vendor/Zend/Text/Figlet/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Text_Exception */ -require_once 'Zend/Text/Exception.php'; /** * Exception class for Zend_Figlet diff --git a/library/vendor/Zend/Text/Table.php b/library/vendor/Zend/Text/Table.php index f510109b8..a82cf3948 100644 --- a/library/vendor/Zend/Text/Table.php +++ b/library/vendor/Zend/Text/Table.php @@ -130,7 +130,6 @@ class Zend_Text_Table // Check if column widths were set // @todo When column widths were not set, assume auto-sizing if ($this->_columnWidths === null) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('You must define the column widths'); } @@ -188,13 +187,11 @@ class Zend_Text_Table public function setColumnWidths(array $columnWidths) { if (count($columnWidths) === 0) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('You must supply at least one column'); } foreach ($columnWidths as $columnNum => $columnWidth) { if (is_int($columnWidth) === false or $columnWidth < 1) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('Column ' . $columnNum . ' has an invalid' . ' column width'); } @@ -258,7 +255,6 @@ class Zend_Text_Table $prefix = 'Zend_Text_Table_Decorator_'; $pathPrefix = 'Zend/Text/Table/Decorator/'; - require_once 'Zend/Loader/PluginLoader.php'; $this->_pluginLoader = new Zend_Loader_PluginLoader(array($prefix => $pathPrefix)); } @@ -330,18 +326,14 @@ class Zend_Text_Table public function appendRow($row) { if (!is_array($row) && !($row instanceof Zend_Text_Table_Row)) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('$row must be an array or instance of Zend_Text_Table_Row'); } if (is_array($row)) { if (count($row) > count($this->_columnWidths)) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('Row contains too many columns'); } - require_once 'Zend/Text/Table/Row.php'; - require_once 'Zend/Text/Table/Column.php'; $data = $row; $row = new Zend_Text_Table_Row(); @@ -373,7 +365,6 @@ class Zend_Text_Table { // There should be at least one row if (count($this->_rows) === 0) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('No rows were added to the table yet'); } diff --git a/library/vendor/Zend/Text/Table/Column.php b/library/vendor/Zend/Text/Table/Column.php index 9bb18cac6..f57be501a 100644 --- a/library/vendor/Zend/Text/Table/Column.php +++ b/library/vendor/Zend/Text/Table/Column.php @@ -22,12 +22,10 @@ /** * @see Zend_Text_Table */ -require_once 'Zend/Text/Table.php'; /** * @see Zend_Text_MultiByte */ -require_once 'Zend/Text/MultiByte.php'; /** * Column class for Zend_Text_Table_Row @@ -112,7 +110,6 @@ class Zend_Text_Table_Column public function setContent($content, $charset = null) { if (is_string($content) === false) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('$content must be a string'); } @@ -147,7 +144,6 @@ class Zend_Text_Table_Column public function setAlign($align) { if (in_array($align, $this->_allowedAligns) === false) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('Invalid align supplied'); } @@ -166,7 +162,6 @@ class Zend_Text_Table_Column public function setColSpan($colSpan) { if (is_int($colSpan) === false or $colSpan < 1) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('$colSpan must be an integer and greater than 0'); } @@ -197,14 +192,12 @@ class Zend_Text_Table_Column public function render($columnWidth, $padding = 0) { if (is_int($columnWidth) === false or $columnWidth < 1) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('$columnWidth must be an integer and greater than 0'); } $columnWidth -= ($padding * 2); if ($columnWidth < 1) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('Padding (' . $padding . ') is greater than column width'); } diff --git a/library/vendor/Zend/Text/Table/Decorator/Ascii.php b/library/vendor/Zend/Text/Table/Decorator/Ascii.php index 3a32ac117..3e993a77b 100644 --- a/library/vendor/Zend/Text/Table/Decorator/Ascii.php +++ b/library/vendor/Zend/Text/Table/Decorator/Ascii.php @@ -22,7 +22,6 @@ /** * @see Zend_Text_Table_Decorator_Interface */ -require_once 'Zend/Text/Table/Decorator/Interface.php'; /** * ASCII Decorator for Zend_Text_Table diff --git a/library/vendor/Zend/Text/Table/Decorator/Unicode.php b/library/vendor/Zend/Text/Table/Decorator/Unicode.php index 6f2210242..dd88336f1 100644 --- a/library/vendor/Zend/Text/Table/Decorator/Unicode.php +++ b/library/vendor/Zend/Text/Table/Decorator/Unicode.php @@ -22,7 +22,6 @@ /** * @see Zend_Text_Table_Decorator_Interface */ -require_once 'Zend/Text/Table/Decorator/Interface.php'; /** * Unicode Decorator for Zend_Text_Table diff --git a/library/vendor/Zend/Text/Table/Exception.php b/library/vendor/Zend/Text/Table/Exception.php index 1aa74ce5a..6f1b526ba 100644 --- a/library/vendor/Zend/Text/Table/Exception.php +++ b/library/vendor/Zend/Text/Table/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Text_Exception */ -require_once 'Zend/Text/Exception.php'; /** * Exception class for Zend_Text_Table diff --git a/library/vendor/Zend/Text/Table/Row.php b/library/vendor/Zend/Text/Table/Row.php index 8e5473d77..f4d1dfd0f 100644 --- a/library/vendor/Zend/Text/Table/Row.php +++ b/library/vendor/Zend/Text/Table/Row.php @@ -60,7 +60,6 @@ class Zend_Text_Table_Row extract($options, EXTR_IF_EXISTS); } - require_once 'Zend/Text/Table/Column.php'; $column = new Zend_Text_Table_Column($content, $align, $colSpan, $encoding); @@ -118,7 +117,6 @@ class Zend_Text_Table_Row public function getColumnWidths() { if ($this->_columnWidths === null) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('No columns were rendered yet'); } @@ -144,7 +142,6 @@ class Zend_Text_Table_Row // If there is no single column, create a column which spans over the // entire row if (count($this->_columns) === 0) { - require_once 'Zend/Text/Table/Column.php'; $this->appendColumn(new Zend_Text_Table_Column(null, null, count($columnWidths))); } @@ -158,7 +155,6 @@ class Zend_Text_Table_Row // Verify if there are enough column widths defined if (($colNum + $colSpan) > count($columnWidths)) { - require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('Too many columns'); } diff --git a/library/vendor/Zend/TimeSync.php b/library/vendor/Zend/TimeSync.php index a7d1feaf8..a1c8011cb 100644 --- a/library/vendor/Zend/TimeSync.php +++ b/library/vendor/Zend/TimeSync.php @@ -23,7 +23,6 @@ /** * Zend_Date */ -require_once 'Zend/Date.php'; /** * @category Zend @@ -164,7 +163,6 @@ class Zend_TimeSync implements IteratorAggregate if (isset($this->_timeservers[$alias]) === true) { $this->_current = $this->_timeservers[$alias]; } else { - require_once 'Zend/TimeSync/Exception.php'; throw new Zend_TimeSync_Exception("'$alias' does not point to valid timeserver"); } } @@ -185,7 +183,6 @@ class Zend_TimeSync implements IteratorAggregate if (isset(Zend_TimeSync::$options[$key]) === true) { return Zend_TimeSync::$options[$key]; } else { - require_once 'Zend/TimeSync/Exception.php'; throw new Zend_TimeSync_Exception("'$key' does not point to valid option"); } } @@ -204,14 +201,12 @@ class Zend_TimeSync implements IteratorAggregate if (isset($this->_current) && $this->_current !== false) { return $this->_current; } else { - require_once 'Zend/TimeSync/Exception.php'; throw new Zend_TimeSync_Exception('there is no timeserver set'); } } if (isset($this->_timeservers[$alias]) === true) { return $this->_timeservers[$alias]; } else { - require_once 'Zend/TimeSync/Exception.php'; throw new Zend_TimeSync_Exception("'$alias' does not point to valid timeserver"); } } @@ -239,7 +234,6 @@ class Zend_TimeSync implements IteratorAggregate */ public function getDate($locale = null) { - require_once 'Zend/TimeSync/Exception.php'; foreach ($this->_timeservers as $alias => $server) { $this->_current = $server; try { @@ -288,13 +282,11 @@ class Zend_TimeSync implements IteratorAggregate $protocol = ucfirst(strtolower($protocol)); if (!in_array($protocol, $this->_allowedSchemes)) { - require_once 'Zend/TimeSync/Exception.php'; throw new Zend_TimeSync_Exception("'$protocol' is not a supported protocol"); } $className = 'Zend_TimeSync_' . $protocol; if (!class_exists($className)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($className); } $timeServerObj = new $className($adress, $port); diff --git a/library/vendor/Zend/TimeSync/Exception.php b/library/vendor/Zend/TimeSync/Exception.php index 28d65327f..544cfd9a3 100644 --- a/library/vendor/Zend/TimeSync/Exception.php +++ b/library/vendor/Zend/TimeSync/Exception.php @@ -22,7 +22,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Exception class for Zend_TimeSync diff --git a/library/vendor/Zend/TimeSync/Ntp.php b/library/vendor/Zend/TimeSync/Ntp.php index 7bb1668e1..6827c1e62 100644 --- a/library/vendor/Zend/TimeSync/Ntp.php +++ b/library/vendor/Zend/TimeSync/Ntp.php @@ -22,7 +22,6 @@ /** * Zend_TimeSync_Protocol */ -require_once 'Zend/TimeSync/Protocol.php'; /** * NTP Protocol handling class diff --git a/library/vendor/Zend/TimeSync/Sntp.php b/library/vendor/Zend/TimeSync/Sntp.php index 703e1b247..56c0109bd 100644 --- a/library/vendor/Zend/TimeSync/Sntp.php +++ b/library/vendor/Zend/TimeSync/Sntp.php @@ -22,7 +22,6 @@ /** * Zend_TimeSync_Protocol */ -require_once 'Zend/TimeSync/Protocol.php'; /** * SNTP Protocol handling class diff --git a/library/vendor/Zend/Tool/Framework/Action/Base.php b/library/vendor/Zend/Tool/Framework/Action/Base.php index 190fb1a09..8be89092c 100644 --- a/library/vendor/Zend/Tool/Framework/Action/Base.php +++ b/library/vendor/Zend/Tool/Framework/Action/Base.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Action_Interface */ -require_once 'Zend/Tool/Framework/Action/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Action/Exception.php b/library/vendor/Zend/Tool/Framework/Action/Exception.php index dafadfd3c..0a25e6bbc 100644 --- a/library/vendor/Zend/Tool/Framework/Action/Exception.php +++ b/library/vendor/Zend/Tool/Framework/Action/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Exception */ -require_once 'Zend/Tool/Framework/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Action/Repository.php b/library/vendor/Zend/Tool/Framework/Action/Repository.php index 129130531..68c923944 100644 --- a/library/vendor/Zend/Tool/Framework/Action/Repository.php +++ b/library/vendor/Zend/Tool/Framework/Action/Repository.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Registry_EnabledInterface */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; /** * @category Zend @@ -66,12 +65,10 @@ class Zend_Tool_Framework_Action_Repository $actionName = $action->getName(); if ($actionName == '' || $actionName == 'Base') { - require_once 'Zend/Tool/Framework/Action/Exception.php'; throw new Zend_Tool_Framework_Action_Exception('An action name for the provided action could not be determined.'); } if (!$overrideExistingAction && array_key_exists(strtolower($actionName), $this->_actions)) { - require_once 'Zend/Tool/Framework/Action/Exception.php'; throw new Zend_Tool_Framework_Action_Exception('An action by the name ' . $actionName . ' is already registered and $overrideExistingAction is set to false.'); } diff --git a/library/vendor/Zend/Tool/Framework/Client/Abstract.php b/library/vendor/Zend/Tool/Framework/Client/Abstract.php index 337f347ea..a5502c9aa 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Abstract.php +++ b/library/vendor/Zend/Tool/Framework/Client/Abstract.php @@ -23,12 +23,10 @@ /** * @see Zend_Loader_Autoloader */ -require_once 'Zend/Loader/Autoloader.php'; /** * @see Zend_Tool_Framework_Registry_EnabledInterface */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; /** * @category Zend @@ -113,8 +111,6 @@ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framewor // setup the debug log if (!$this->_debugLogger instanceof Zend_Log) { - require_once 'Zend/Log.php'; - require_once 'Zend/Log/Writer/Null.php'; $this->_debugLogger = new Zend_Log(new Zend_Log_Writer_Null()); } @@ -131,7 +127,6 @@ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framewor $this->_registry->getManifestRepository()->process(); if ($this instanceof Zend_Tool_Framework_Client_Interactive_InputInterface) { - require_once 'Zend/Tool/Framework/Client/Interactive/InputHandler.php'; } if ($this instanceof Zend_Tool_Framework_Client_Interactive_OutputInterface) { @@ -203,7 +198,6 @@ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framewor public function promptInteractiveInput($inputRequest) { if (!$this->hasInteractiveInput()) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('promptInteractive() cannot be called on a non-interactive client.'); } @@ -229,12 +223,10 @@ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framewor if ($this->_registry->getRequest()->isDispatchable()) { if ($this->_registry->getRequest()->getActionName() == null) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('Client failed to setup the action name.'); } if ($this->_registry->getRequest()->getProviderName() == null) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('Client failed to setup the provider name.'); } @@ -274,7 +266,6 @@ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framewor // ensure that we can pretend if this is a pretend request if ($request->isPretend() && (!$provider instanceof Zend_Tool_Framework_Provider_Pretendable)) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('Dispatcher error - provider does not support pretend'); } @@ -283,7 +274,6 @@ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framewor $specialtyName = $this->_registry->getRequest()->getSpecialtyName(); if (!$actionableMethod = $providerSignature->getActionableMethodByActionName($actionName, $specialtyName)) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('Dispatcher error - actionable method not found'); } @@ -302,12 +292,10 @@ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framewor $promptSting = $this->getMissingParameterPromptString($provider, $actionableMethod['action'], $methodParameterValue['name']); $parameterPromptValue = $this->promptInteractiveInput($promptSting)->getContent(); if ($parameterPromptValue == null) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('Value supplied for required parameter "' . $methodParameterValue['name'] . '" is empty'); } $callParameters[] = $parameterPromptValue; } else { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('A required parameter "' . $methodParameterValue['name'] . '" was not supplied.'); } } else { @@ -325,7 +313,6 @@ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framewor } elseif (method_exists($class, $methodName . 'Action')) { call_user_func_array(array($class, $methodName . 'Action'), $callParameters); } else { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('Not a supported method.'); } } diff --git a/library/vendor/Zend/Tool/Framework/Client/Config.php b/library/vendor/Zend/Tool/Framework/Client/Config.php index 5197da901..da26dda17 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Config.php +++ b/library/vendor/Zend/Tool/Framework/Client/Config.php @@ -66,7 +66,6 @@ class Zend_Tool_Framework_Client_Config public function setConfigFilepath($configFilepath) { if (!file_exists($configFilepath)) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('Provided path to config ' . $configFilepath . ' does not exist'); } @@ -87,19 +86,15 @@ class Zend_Tool_Framework_Client_Config switch ($suffix) { case '.ini': - require_once 'Zend/Config/Ini.php'; $this->_config = new Zend_Config_Ini($configFilepath, null, array('allowModifications' => true)); break; case '.xml': - require_once 'Zend/Config/Xml.php'; $this->_config = new Zend_Config_Xml($configFilepath, null, array('allowModifications' => true)); break; case '.php': - require_once 'Zend/Config.php'; $this->_config = new Zend_Config(include $configFilepath, true); break; default: - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('Unknown config file type ' . $suffix . ' at location ' . $configFilepath ); @@ -187,7 +182,6 @@ class Zend_Tool_Framework_Client_Config public function getConfigInstance() { if(!$this->exists()) { - require_once "Zend/Tool/Framework/Client/Exception.php"; throw new Zend_Tool_Framework_Client_Exception("Client has no persistent configuration."); } @@ -221,20 +215,16 @@ class Zend_Tool_Framework_Client_Config $suffix = substr($this->getConfigFilepath(), -4); switch($suffix) { case '.ini': - require_once "Zend/Config/Writer/Ini.php"; $writer = new Zend_Config_Writer_Ini(); $writer->setRenderWithoutSections(); break; case '.xml': - require_once "Zend/Config/Writer/Xml.php"; $writer = new Zend_Config_Writer_Xml(); break; case '.php': - require_once "Zend/Config/Writer/Array.php"; $writer = new Zend_Config_Writer_Array(); break; default: - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('Unknown config file type ' . $suffix . ' at location ' . $this->getConfigFilepath() ); diff --git a/library/vendor/Zend/Tool/Framework/Client/Console.php b/library/vendor/Zend/Tool/Framework/Client/Console.php index be3a7cb18..a02aaccf6 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Console.php +++ b/library/vendor/Zend/Tool/Framework/Client/Console.php @@ -23,17 +23,14 @@ /** * @see Zend_Tool_Framework_Client_Abstract */ -require_once 'Zend/Tool/Framework/Client/Abstract.php'; /** * @see Zend_Tool_Framework_Client_Interactive_InputInterface */ -require_once 'Zend/Tool/Framework/Client/Interactive/InputInterface.php'; /** * @see Zend_Tool_Framework_Client_Interactive_OutputInterface */ -require_once 'Zend/Tool/Framework/Client/Interactive/OutputInterface.php'; /** * Zend_Tool_Framework_Client_Console - the CLI Client implementation for Zend_Tool_Framework diff --git a/library/vendor/Zend/Tool/Framework/Client/Console/ArgumentParser.php b/library/vendor/Zend/Tool/Framework/Client/Console/ArgumentParser.php index 50154ceba..606882b54 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Console/ArgumentParser.php +++ b/library/vendor/Zend/Tool/Framework/Client/Console/ArgumentParser.php @@ -23,12 +23,10 @@ /** * @see Zend_Console_GetOpt */ -require_once 'Zend/Console/Getopt.php'; /** * @see Zend_Tool_Framework_Registry_EnabledInterface */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; /** * @category Zend @@ -117,7 +115,6 @@ class Zend_Tool_Framework_Client_Console_ArgumentParser implements Zend_Tool_Fra { if ($this->_request == null || $this->_response == null) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('The client registry must have both a request and response registered.'); } @@ -303,7 +300,6 @@ class Zend_Tool_Framework_Client_Console_ArgumentParser implements Zend_Tool_Fra // if no action, handle error if (!$actionMetadata) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('Action \'' . $consoleActionName . '\' is not a valid action.'); } @@ -355,7 +351,6 @@ class Zend_Tool_Framework_Client_Console_ArgumentParser implements Zend_Tool_Fra } if (!$providerMetadata) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception( 'Provider \'' . $consoleProviderFull . '\' is not a valid provider.' ); @@ -387,7 +382,6 @@ class Zend_Tool_Framework_Client_Console_ArgumentParser implements Zend_Tool_Fra } if (!$providerSpecialtyMetadata) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception( 'Provider \'' . $consoleSpecialtyName . '\' is not a valid specialty.' ); @@ -516,7 +510,6 @@ class Zend_Tool_Framework_Client_Console_ArgumentParser implements Zend_Tool_Fra */ protected function _createHelpResponse($options = array()) { - require_once 'Zend/Tool/Framework/Client/Console/HelpSystem.php'; $helpSystem = new Zend_Tool_Framework_Client_Console_HelpSystem(); $helpSystem->setRegistry($this->_registry); diff --git a/library/vendor/Zend/Tool/Framework/Client/Console/HelpSystem.php b/library/vendor/Zend/Tool/Framework/Client/Console/HelpSystem.php index 18a586c9b..27f162b98 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Console/HelpSystem.php +++ b/library/vendor/Zend/Tool/Framework/Client/Console/HelpSystem.php @@ -159,7 +159,6 @@ class Zend_Tool_Framework_Client_Console_HelpSystem /** * @see Zend_Version */ - require_once 'Zend/Version.php'; $this->_response->appendContent('Zend Framework', array('color' => array('hiWhite'), 'separator' => false)); $this->_response->appendContent(' Command Line Console Tool v' . Zend_Version::VERSION . ''); return $this; diff --git a/library/vendor/Zend/Tool/Framework/Client/Console/Manifest.php b/library/vendor/Zend/Tool/Framework/Client/Console/Manifest.php index 0a6584087..2aaaab04f 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Console/Manifest.php +++ b/library/vendor/Zend/Tool/Framework/Client/Console/Manifest.php @@ -23,32 +23,26 @@ /** * @see Zend_Tool_Framework_Manifest_MetadataManifestable */ -require_once 'Zend/Tool/Framework/Manifest/MetadataManifestable.php'; /** * @see Zend_Filter */ -require_once 'Zend/Filter.php'; /** * @see Zend_Filter_Word_CamelCaseToDash */ -require_once 'Zend/Filter/Word/CamelCaseToDash.php'; /** * @see Zend_Filter_StringToLower */ -require_once 'Zend/Filter/StringToLower.php'; /** * @see Zend_Tool_Framework_Metadata_Tool */ -require_once 'Zend/Tool/Framework/Metadata/Tool.php'; /** * @see Zend_Tool_Framework_Registry_EnabledInterface */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; /** * Zend_Tool_Framework_Client_ConsoleClient_Manifest diff --git a/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php b/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php index 944242950..d00941cae 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php +++ b/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/AlignCenter.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once "Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php"; /** * Try to align a given text central on the screen. diff --git a/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php b/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php index 656c1b201..1dc0a25e0 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php +++ b/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/Blockize.php @@ -19,7 +19,6 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once "Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php"; /** * Take a text and block it into several lines of a fixed length. diff --git a/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php b/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php index 89d0b782f..138fccaed 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php +++ b/library/vendor/Zend/Tool/Framework/Client/Console/ResponseDecorator/Indention.php @@ -19,7 +19,6 @@ * @version $Id$ */ -require_once "Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php"; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Client/Exception.php b/library/vendor/Zend/Tool/Framework/Client/Exception.php index 6a23f0228..b049b2d2f 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Exception.php +++ b/library/vendor/Zend/Tool/Framework/Client/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Exception */ -require_once 'Zend/Tool/Framework/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Client/Interactive/InputHandler.php b/library/vendor/Zend/Tool/Framework/Client/Interactive/InputHandler.php index d561cc51f..f8b29a3b2 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Interactive/InputHandler.php +++ b/library/vendor/Zend/Tool/Framework/Client/Interactive/InputHandler.php @@ -44,10 +44,8 @@ class Zend_Tool_Framework_Client_Interactive_InputHandler public function setInputRequest($inputRequest) { if (is_string($inputRequest)) { - require_once 'Zend/Tool/Framework/Client/Interactive/InputRequest.php'; $inputRequest = new Zend_Tool_Framework_Client_Interactive_InputRequest($inputRequest); } elseif (!$inputRequest instanceof Zend_Tool_Framework_Client_Interactive_InputRequest) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('promptInteractive() requires either a string or an instance of Zend_Tool_Framework_Client_Interactive_InputRequest.'); } @@ -60,10 +58,8 @@ class Zend_Tool_Framework_Client_Interactive_InputHandler $inputResponse = $this->_client->handleInteractiveInputRequest($this->_inputRequest); if (is_string($inputResponse)) { - require_once 'Zend/Tool/Framework/Client/Interactive/InputResponse.php'; $inputResponse = new Zend_Tool_Framework_Client_Interactive_InputResponse($inputResponse); } elseif (!$inputResponse instanceof Zend_Tool_Framework_Client_Interactive_InputResponse) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('The registered $_interactiveCallback for the client must either return a string or an instance of Zend_Tool_Framework_Client_Interactive_InputResponse.'); } diff --git a/library/vendor/Zend/Tool/Framework/Client/Manifest.php b/library/vendor/Zend/Tool/Framework/Client/Manifest.php index 4c28ef841..fd6768806 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Manifest.php +++ b/library/vendor/Zend/Tool/Framework/Client/Manifest.php @@ -23,32 +23,26 @@ /** * @see Zend_Tool_Framework_Manifest_MetadataManifestable */ -require_once 'Zend/Tool/Framework/Manifest/MetadataManifestable.php'; /** * @see Zend_Filter */ -require_once 'Zend/Filter.php'; /** * @see Zend_Filter_Word_CamelCaseToDash */ -require_once 'Zend/Filter/Word/CamelCaseToDash.php'; /** * @see Zend_Filter_StringToLower */ -require_once 'Zend/Filter/StringToLower.php'; /** * @see Zend_Tool_Framework_Metadata_Tool */ -require_once 'Zend/Tool/Framework/Metadata/Tool.php'; /** * @see Zend_Tool_Framework_Registry_EnabledInterface */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; /** * Zend_Tool_Framework_Client_ConsoleClient_Manifest diff --git a/library/vendor/Zend/Tool/Framework/Client/Response.php b/library/vendor/Zend/Tool/Framework/Client/Response.php index 4eb107038..fa932ee00 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Response.php +++ b/library/vendor/Zend/Tool/Framework/Client/Response.php @@ -62,7 +62,6 @@ class Zend_Tool_Framework_Client_Response public function setContentCallback($callback) { if (!is_callable($callback)) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('The callback provided is not callable'); } $this->_callback = $callback; diff --git a/library/vendor/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php b/library/vendor/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php index 6b94fa63d..966b9fcad 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php +++ b/library/vendor/Zend/Tool/Framework/Client/Response/ContentDecorator/Separator.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Client_Response_ContentDecorator_Interface */ -require_once 'Zend/Tool/Framework/Client/Response/ContentDecorator/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Client/Storage.php b/library/vendor/Zend/Tool/Framework/Client/Storage.php index 0bb66bfb9..99d54dc08 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Storage.php +++ b/library/vendor/Zend/Tool/Framework/Client/Storage.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Client_Storage_AdapterInterface */ -require_once 'Zend/Tool/Framework/Client/Storage/AdapterInterface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Client/Storage/Directory.php b/library/vendor/Zend/Tool/Framework/Client/Storage/Directory.php index 52534e665..bfaa16bd1 100644 --- a/library/vendor/Zend/Tool/Framework/Client/Storage/Directory.php +++ b/library/vendor/Zend/Tool/Framework/Client/Storage/Directory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Client_Storage_AdapterInterface */ -require_once 'Zend/Tool/Framework/Client/Storage/AdapterInterface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Exception.php b/library/vendor/Zend/Tool/Framework/Exception.php index 488773feb..80211d74b 100644 --- a/library/vendor/Zend/Tool/Framework/Exception.php +++ b/library/vendor/Zend/Tool/Framework/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Loader/Abstract.php b/library/vendor/Zend/Tool/Framework/Loader/Abstract.php index cd14cdf64..f9e496eb1 100644 --- a/library/vendor/Zend/Tool/Framework/Loader/Abstract.php +++ b/library/vendor/Zend/Tool/Framework/Loader/Abstract.php @@ -23,11 +23,7 @@ /** * @see Zend_Tool_Framework_Registry_EnabledInterface */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; -require_once 'Zend/Tool/Framework/Loader/Interface.php'; -require_once 'Zend/Tool/Framework/Manifest/Interface.php'; -require_once 'Zend/Tool/Framework/Provider/Interface.php'; /** diff --git a/library/vendor/Zend/Tool/Framework/Loader/BasicLoader.php b/library/vendor/Zend/Tool/Framework/Loader/BasicLoader.php index 1e0f6c240..a376f2617 100644 --- a/library/vendor/Zend/Tool/Framework/Loader/BasicLoader.php +++ b/library/vendor/Zend/Tool/Framework/Loader/BasicLoader.php @@ -23,19 +23,14 @@ /** * @see Zend_Tool_Framework_Loader_Abstract */ -require_once 'Zend/Tool/Framework/Loader/Interface.php'; /** * @see Zend_Tool_Framework_Registry_EnabledInterface */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; -require_once 'Zend/Tool/Framework/Manifest/Interface.php'; -require_once 'Zend/Tool/Framework/Provider/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Loader/IncludePathLoader.php b/library/vendor/Zend/Tool/Framework/Loader/IncludePathLoader.php index a82dfb18a..f1a6acc14 100644 --- a/library/vendor/Zend/Tool/Framework/Loader/IncludePathLoader.php +++ b/library/vendor/Zend/Tool/Framework/Loader/IncludePathLoader.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Framework_Loader_Abstract */ -require_once 'Zend/Tool/Framework/Loader/Abstract.php'; /** * @see Zend_Tool_Framework_Loader_IncludePathLoader_RecursiveFilterIterator */ -require_once 'Zend/Tool/Framework/Loader/IncludePathLoader/RecursiveFilterIterator.php'; /** * @category Zend @@ -46,7 +44,6 @@ class Zend_Tool_Framework_Loader_IncludePathLoader extends Zend_Tool_Framework_L */ protected function _getFiles() { - require_once 'Zend/Loader.php'; $paths = Zend_Loader::explodeIncludePath(); // used for checking similarly named files diff --git a/library/vendor/Zend/Tool/Framework/Manifest/ActionManifestable.php b/library/vendor/Zend/Tool/Framework/Manifest/ActionManifestable.php index 2472fcacb..fe7356fcc 100644 --- a/library/vendor/Zend/Tool/Framework/Manifest/ActionManifestable.php +++ b/library/vendor/Zend/Tool/Framework/Manifest/ActionManifestable.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Manifest_Interface */ -require_once 'Zend/Tool/Framework/Manifest/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Manifest/Exception.php b/library/vendor/Zend/Tool/Framework/Manifest/Exception.php index 176241000..82dd0a4d1 100644 --- a/library/vendor/Zend/Tool/Framework/Manifest/Exception.php +++ b/library/vendor/Zend/Tool/Framework/Manifest/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Exception */ -require_once 'Zend/Tool/Framework/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Manifest/MetadataManifestable.php b/library/vendor/Zend/Tool/Framework/Manifest/MetadataManifestable.php index 140fd2490..fef88c019 100644 --- a/library/vendor/Zend/Tool/Framework/Manifest/MetadataManifestable.php +++ b/library/vendor/Zend/Tool/Framework/Manifest/MetadataManifestable.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Manifest_Interface.php */ -require_once 'Zend/Tool/Framework/Manifest/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Manifest/ProviderManifestable.php b/library/vendor/Zend/Tool/Framework/Manifest/ProviderManifestable.php index 5b07446e3..45f0232f0 100644 --- a/library/vendor/Zend/Tool/Framework/Manifest/ProviderManifestable.php +++ b/library/vendor/Zend/Tool/Framework/Manifest/ProviderManifestable.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Manifest_Interface.php */ -require_once 'Zend/Tool/Framework/Manifest/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Manifest/Repository.php b/library/vendor/Zend/Tool/Framework/Manifest/Repository.php index cb511dc49..3c98ba101 100644 --- a/library/vendor/Zend/Tool/Framework/Manifest/Repository.php +++ b/library/vendor/Zend/Tool/Framework/Manifest/Repository.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Registry_EnabledInterface */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; /** * @category Zend @@ -102,7 +101,6 @@ class Zend_Tool_Framework_Manifest_Repository } if (!$provider instanceof Zend_Tool_Framework_Provider_Interface) { - require_once 'Zend/Tool/Framework/Manifest/Exception.php'; throw new Zend_Tool_Framework_Manifest_Exception( 'A provider provided by the ' . get_class($manifest) . ' does not implement Zend_Tool_Framework_Provider_Interface' @@ -179,13 +177,11 @@ class Zend_Tool_Framework_Manifest_Repository foreach ($metadatas as $metadata) { if (is_array($metadata)) { if (!class_exists('Zend_Tool_Framework_Metadata_Dynamic')) { - require_once 'Zend/Tool/Framework/Metadata/Dynamic.php'; } $metadata = new Zend_Tool_Framework_Metadata_Dynamic($metadata); } if (!$metadata instanceof Zend_Tool_Framework_Metadata_Interface) { - require_once 'Zend/Tool/Framework/Manifest/Exception.php'; throw new Zend_Tool_Framework_Manifest_Exception( 'A Zend_Tool_Framework_Metadata_Interface object was not found in manifest ' . get_class($manifest) ); diff --git a/library/vendor/Zend/Tool/Framework/Metadata/Basic.php b/library/vendor/Zend/Tool/Framework/Metadata/Basic.php index ca182ec4d..8a6d3a0e0 100644 --- a/library/vendor/Zend/Tool/Framework/Metadata/Basic.php +++ b/library/vendor/Zend/Tool/Framework/Metadata/Basic.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Framework_Metadata_Interface */ -require_once 'Zend/Tool/Framework/Metadata/Interface.php'; /** * @see Zend_Tool_Framework_Metadata_Attributable */ -require_once 'Zend/Tool/Framework/Metadata/Attributable.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Metadata/Dynamic.php b/library/vendor/Zend/Tool/Framework/Metadata/Dynamic.php index cb2da5651..8304355d8 100644 --- a/library/vendor/Zend/Tool/Framework/Metadata/Dynamic.php +++ b/library/vendor/Zend/Tool/Framework/Metadata/Dynamic.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Framework_Metadata_Interface */ -require_once 'Zend/Tool/Framework/Metadata/Interface.php'; /** * @see Zend_Tool_Framework_Metadata_Attributable */ -require_once 'Zend/Tool/Framework/Metadata/Attributable.php'; /** * @category Zend @@ -190,7 +188,6 @@ class Zend_Tool_Framework_Metadata_Dynamic } elseif (array_key_exists($name, $this->_dynamicAttributes)) { return $this->_dynamicAttributes[$name]; } else { - require_once 'Zend/Tool/Framework/Registry/Exception.php'; throw new Zend_Tool_Framework_Registry_Exception('Property ' . $name . ' was not located in this metadata.'); } } @@ -211,7 +208,6 @@ class Zend_Tool_Framework_Metadata_Dynamic return $this; } // { -// require_once 'Zend/Tool/Framework/Registry/Exception.php'; // throw new Zend_Tool_Framework_Registry_Exception('Property ' . $name . ' was not located in this registry.'); // } } diff --git a/library/vendor/Zend/Tool/Framework/Metadata/Tool.php b/library/vendor/Zend/Tool/Framework/Metadata/Tool.php index 8501e6c04..7ffbed892 100644 --- a/library/vendor/Zend/Tool/Framework/Metadata/Tool.php +++ b/library/vendor/Zend/Tool/Framework/Metadata/Tool.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Metadata_Basic */ -require_once 'Zend/Tool/Framework/Metadata/Basic.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Provider/Abstract.php b/library/vendor/Zend/Tool/Framework/Provider/Abstract.php index ca14794af..0242e918b 100644 --- a/library/vendor/Zend/Tool/Framework/Provider/Abstract.php +++ b/library/vendor/Zend/Tool/Framework/Provider/Abstract.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Framework_Provider_Interface */ -require_once 'Zend/Tool/Framework/Provider/Interface.php'; /** * @see Zend_Tool_Framework_Registry_EnabledInterface */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; /** diff --git a/library/vendor/Zend/Tool/Framework/Provider/Exception.php b/library/vendor/Zend/Tool/Framework/Provider/Exception.php index e1ae26d38..ff2972ae5 100644 --- a/library/vendor/Zend/Tool/Framework/Provider/Exception.php +++ b/library/vendor/Zend/Tool/Framework/Provider/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Exception */ -require_once 'Zend/Tool/Framework/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/Provider/Repository.php b/library/vendor/Zend/Tool/Framework/Provider/Repository.php index ae41c9dd3..2aef4eca6 100644 --- a/library/vendor/Zend/Tool/Framework/Provider/Repository.php +++ b/library/vendor/Zend/Tool/Framework/Provider/Repository.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Framework_Provider_Signature */ -require_once 'Zend/Tool/Framework/Provider/Signature.php'; /** * @see Zend_Tool_Framework_Registry_EnabledInterface */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; /** * @category Zend @@ -112,7 +110,6 @@ class Zend_Tool_Framework_Provider_Repository (array_key_exists($providerName, $this->_unprocessedProviders) || array_key_exists($providerName, $this->_providers))) { - require_once 'Zend/Tool/Framework/Provider/Exception.php'; throw new Zend_Tool_Framework_Provider_Exception('A provider by the name ' . $providerName . ' is already registered and $overrideExistingProvider is set to false.'); } diff --git a/library/vendor/Zend/Tool/Framework/Provider/Signature.php b/library/vendor/Zend/Tool/Framework/Provider/Signature.php index 5713fdf66..a55f81b47 100644 --- a/library/vendor/Zend/Tool/Framework/Provider/Signature.php +++ b/library/vendor/Zend/Tool/Framework/Provider/Signature.php @@ -23,17 +23,14 @@ /** * @see Zend_Reflection_Class */ -require_once 'Zend/Reflection/Class.php'; /** * @see Zend_Tool_Framework_Registry */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; /** * @see Zend_Tool_Framework_Action_Base */ -require_once 'Zend/Tool/Framework/Action/Base.php'; /** * The purpose of Zend_Tool_Framework_Provider_Signature is to derive @@ -259,7 +256,6 @@ class Zend_Tool_Framework_Provider_Signature implements Zend_Tool_Framework_Regi if ($this->_providerReflection->hasMethod('getSpecialties')) { $specialties = $this->_provider->getSpecialties(); if (!is_array($specialties)) { - require_once 'Zend/Tool/Framework/Provider/Exception.php'; throw new Zend_Tool_Framework_Provider_Exception( 'Provider ' . get_class($this->_provider) . ' must return an array for method getSpecialties().' ); @@ -268,7 +264,6 @@ class Zend_Tool_Framework_Provider_Signature implements Zend_Tool_Framework_Regi $defaultProperties = $this->_providerReflection->getDefaultProperties(); $specialties = (isset($defaultProperties['_specialties'])) ? $defaultProperties['_specialties'] : array(); if (!is_array($specialties)) { - require_once 'Zend/Tool/Framework/Provider/Exception.php'; throw new Zend_Tool_Framework_Provider_Exception( 'Provider ' . get_class($this->_provider) . '\'s property $_specialties must be an array.' ); diff --git a/library/vendor/Zend/Tool/Framework/Registry.php b/library/vendor/Zend/Tool/Framework/Registry.php index 95d41cdfb..c9784fa63 100644 --- a/library/vendor/Zend/Tool/Framework/Registry.php +++ b/library/vendor/Zend/Tool/Framework/Registry.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Registry_Interface */ -require_once 'Zend/Tool/Framework/Registry/Interface.php'; /** * @category Zend @@ -142,7 +141,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter public function getConfig() { if ($this->_config === null) { - require_once 'Zend/Tool/Framework/Client/Config.php'; $this->setConfig(new Zend_Tool_Framework_Client_Config()); } @@ -169,7 +167,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter public function getStorage() { if ($this->_storage === null) { - require_once 'Zend/Tool/Framework/Client/Storage.php'; $this->setStorage(new Zend_Tool_Framework_Client_Storage()); } @@ -199,7 +196,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter public function getLoader() { if ($this->_loader === null) { - require_once 'Zend/Tool/Framework/Loader/IncludePathLoader.php'; $this->setLoader(new Zend_Tool_Framework_Loader_IncludePathLoader()); } @@ -229,7 +225,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter public function getActionRepository() { if ($this->_actionRepository == null) { - require_once 'Zend/Tool/Framework/Action/Repository.php'; $this->setActionRepository(new Zend_Tool_Framework_Action_Repository()); } @@ -259,7 +254,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter public function getProviderRepository() { if ($this->_providerRepository == null) { - require_once 'Zend/Tool/Framework/Provider/Repository.php'; $this->setProviderRepository(new Zend_Tool_Framework_Provider_Repository()); } @@ -289,7 +283,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter public function getManifestRepository() { if ($this->_manifestRepository == null) { - require_once 'Zend/Tool/Framework/Manifest/Repository.php'; $this->setManifestRepository(new Zend_Tool_Framework_Manifest_Repository()); } @@ -316,7 +309,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter public function getRequest() { if ($this->_request == null) { - require_once 'Zend/Tool/Framework/Client/Request.php'; $this->setRequest(new Zend_Tool_Framework_Client_Request()); } @@ -343,7 +335,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter public function getResponse() { if ($this->_response == null) { - require_once 'Zend/Tool/Framework/Client/Response.php'; $this->setResponse(new Zend_Tool_Framework_Client_Response()); } @@ -361,7 +352,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter if (method_exists($this, 'get' . $name)) { return $this->{'get' . $name}(); } else { - require_once 'Zend/Tool/Framework/Registry/Exception.php'; throw new Zend_Tool_Framework_Registry_Exception('Property ' . $name . ' was not located in this registry.'); } } @@ -378,7 +368,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter $this->{'set' . $name}($value); return; } else { - require_once 'Zend/Tool/Framework/Registry/Exception.php'; throw new Zend_Tool_Framework_Registry_Exception('Property ' . $name . ' was not located in this registry.'); } } @@ -392,7 +381,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter public function isObjectRegistryEnablable($object) { if (!is_object($object)) { - require_once 'Zend/Tool/Framework/Registry/Exception.php'; throw new Zend_Tool_Framework_Registry_Exception('isObjectRegistryEnablable() expects an object.'); } @@ -408,7 +396,6 @@ class Zend_Tool_Framework_Registry implements Zend_Tool_Framework_Registry_Inter public function enableRegistryOnObject($object) { if (!$this->isObjectRegistryEnablable($object)) { - require_once 'Zend/Tool/Framework/Registry/Exception.php'; throw new Zend_Tool_Framework_Registry_Exception('Object provided is not registry enablable, check first with Zend_Tool_Framework_Registry::isObjectRegistryEnablable()'); } diff --git a/library/vendor/Zend/Tool/Framework/Registry/Exception.php b/library/vendor/Zend/Tool/Framework/Registry/Exception.php index 1d66c3868..20402de83 100644 --- a/library/vendor/Zend/Tool/Framework/Registry/Exception.php +++ b/library/vendor/Zend/Tool/Framework/Registry/Exception.php @@ -19,7 +19,6 @@ * @version $Id$ */ -require_once 'Zend/Tool/Framework/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/System/Action/Create.php b/library/vendor/Zend/Tool/Framework/System/Action/Create.php index 6eeed3938..b7970f19d 100644 --- a/library/vendor/Zend/Tool/Framework/System/Action/Create.php +++ b/library/vendor/Zend/Tool/Framework/System/Action/Create.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Action_Base */ -require_once 'Zend/Tool/Framework/Action/Base.php'; /** diff --git a/library/vendor/Zend/Tool/Framework/System/Action/Delete.php b/library/vendor/Zend/Tool/Framework/System/Action/Delete.php index 91644d561..be49e0c13 100644 --- a/library/vendor/Zend/Tool/Framework/System/Action/Delete.php +++ b/library/vendor/Zend/Tool/Framework/System/Action/Delete.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Action_Base */ -require_once 'Zend/Tool/Framework/Action/Base.php'; /** diff --git a/library/vendor/Zend/Tool/Framework/System/Manifest.php b/library/vendor/Zend/Tool/Framework/System/Manifest.php index 5fea8e0fb..0dc9fabe2 100644 --- a/library/vendor/Zend/Tool/Framework/System/Manifest.php +++ b/library/vendor/Zend/Tool/Framework/System/Manifest.php @@ -20,14 +20,6 @@ * @version $Id$ */ -require_once 'Zend/Tool/Framework/Manifest/ProviderManifestable.php'; -require_once 'Zend/Tool/Framework/Manifest/ActionManifestable.php'; -require_once 'Zend/Tool/Framework/System/Provider/Version.php'; -require_once 'Zend/Tool/Framework/System/Provider/Config.php'; -require_once 'Zend/Tool/Framework/System/Provider/Phpinfo.php'; -require_once 'Zend/Tool/Framework/System/Provider/Manifest.php'; -require_once 'Zend/Tool/Framework/System/Action/Create.php'; -require_once 'Zend/Tool/Framework/System/Action/Delete.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/System/Provider/Config.php b/library/vendor/Zend/Tool/Framework/System/Provider/Config.php index eeba06e22..a2dba51f7 100644 --- a/library/vendor/Zend/Tool/Framework/System/Provider/Config.php +++ b/library/vendor/Zend/Tool/Framework/System/Provider/Config.php @@ -22,22 +22,18 @@ /** * @see Zend_Tool_Framework_Provider_Abstract */ -require_once "Zend/Tool/Framework/Provider/Abstract.php"; /** * @see Zend_Config */ -require_once "Zend/Config.php"; /** * @see Zend_Config_Writer_Ini */ -require_once "Zend/Config/Writer/Ini.php"; /** * @see Zend_Loader */ -require_once "Zend/Loader.php"; /** * Configuration Provider @@ -74,7 +70,6 @@ class Zend_Tool_Framework_System_Provider_Config extends Zend_Tool_Framework_Pro $resp = $this->_registry->getResponse(); if ($userConfig->exists()) { - require_once "Zend/Tool/Framework/Exception.php"; throw new Zend_Tool_Framework_Exception( "A configuration already exists, cannot create a new one."); } @@ -109,7 +104,6 @@ class Zend_Tool_Framework_System_Provider_Config extends Zend_Tool_Framework_Pro return $homeDirectory; } } - require_once "Zend/Tool/Framework/Exception.php"; throw new Zend_Tool_Framework_Exception("Cannot detect user home directory, set ZF_HOME enviroment variable."); } @@ -200,7 +194,6 @@ class Zend_Tool_Framework_System_Provider_Config extends Zend_Tool_Framework_Pro Zend_Loader::loadClass($className); $reflClass = new ReflectionClass($className); if (!in_array("Zend_Tool_Framework_Provider_Interface", $reflClass->getInterfaceNames())) { - require_once "Zend/Tool/Framework/Exception.php"; throw new Zend_Tool_Framework_Exception("Given class is not a provider"); } $this->_doEnable($className); @@ -233,13 +226,11 @@ class Zend_Tool_Framework_System_Provider_Config extends Zend_Tool_Framework_Pro array("color" => "green", "aligncenter" => true) ); } else { - require_once "Zend/Tool/Framework/Exception.php"; throw new Zend_Tool_Framework_Exception( "Could not write user configuration to persistence." ); } } else { - require_once "Zend/Tool/Framework/Exception.php"; throw new Zend_Tool_Framework_Exception( "Provider/Manifest '".$className."' is already enabled." ); @@ -254,7 +245,6 @@ class Zend_Tool_Framework_System_Provider_Config extends Zend_Tool_Framework_Pro Zend_Loader::loadClass($className); $reflClass = new ReflectionClass($className); if (!in_array("Zend_Tool_Framework_Manifest_Interface", $reflClass->getInterfaceNames())) { - require_once "Zend/Tool/Framework/Exception.php"; throw new Zend_Tool_Framework_Exception("Given class is not a manifest."); } $this->_doEnable($className); @@ -292,13 +282,11 @@ class Zend_Tool_Framework_System_Provider_Config extends Zend_Tool_Framework_Pro array("color" => "green", "aligncenter" => true) ); } else { - require_once "Zend/Tool/Framework/Exception.php"; throw new Zend_Tool_Framework_Exception( "Could not write user configuration to persistence." ); } } else { - require_once "Zend/Tool/Framework/Exception.php"; throw new Zend_Tool_Framework_Exception( "Provider/Manifest '".$className."' is not enabled." ); diff --git a/library/vendor/Zend/Tool/Framework/System/Provider/Manifest.php b/library/vendor/Zend/Tool/Framework/System/Provider/Manifest.php index 2543cafb5..64a9b817a 100644 --- a/library/vendor/Zend/Tool/Framework/System/Provider/Manifest.php +++ b/library/vendor/Zend/Tool/Framework/System/Provider/Manifest.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Framework_Registry_EnabledInterface */ -require_once 'Zend/Tool/Framework/Registry/EnabledInterface.php'; /** * @see Zend_Tool_Framework_Provider_Interface */ -require_once 'Zend/Tool/Framework/Provider/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/System/Provider/Phpinfo.php b/library/vendor/Zend/Tool/Framework/System/Provider/Phpinfo.php index ff8939760..2f9d4441e 100644 --- a/library/vendor/Zend/Tool/Framework/System/Provider/Phpinfo.php +++ b/library/vendor/Zend/Tool/Framework/System/Provider/Phpinfo.php @@ -19,7 +19,6 @@ * @version $Id$ */ -require_once 'Zend/Tool/Framework/Provider/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Framework/System/Provider/Version.php b/library/vendor/Zend/Tool/Framework/System/Provider/Version.php index 48391303e..19d21a5c6 100644 --- a/library/vendor/Zend/Tool/Framework/System/Provider/Version.php +++ b/library/vendor/Zend/Tool/Framework/System/Provider/Version.php @@ -19,9 +19,6 @@ * @version $Id$ */ -require_once 'Zend/Tool/Framework/Registry.php'; -require_once 'Zend/Tool/Framework/Provider/Interface.php'; -require_once 'Zend/Version.php'; /** * Version Provider diff --git a/library/vendor/Zend/Tool/Project/Context/Content/Engine.php b/library/vendor/Zend/Tool/Project/Context/Content/Engine.php index 372aefd70..65af83fab 100644 --- a/library/vendor/Zend/Tool/Project/Context/Content/Engine.php +++ b/library/vendor/Zend/Tool/Project/Context/Content/Engine.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Project_Context_Content_Engine_CodeGenerator */ -require_once 'Zend/Tool/Project/Context/Content/Engine/CodeGenerator.php'; /** * @see Zend_Tool_Project_Context_Content_Engine_Phtml */ -require_once 'Zend/Tool/Project/Context/Content/Engine/Phtml.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Exception.php b/library/vendor/Zend/Tool/Project/Context/Exception.php index 1bdfe67b0..1357bdb0a 100644 --- a/library/vendor/Zend/Tool/Project/Context/Exception.php +++ b/library/vendor/Zend/Tool/Project/Context/Exception.php @@ -19,7 +19,6 @@ * @version $Id$ */ -require_once 'Zend/Tool/Project/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Project/Context/Filesystem/Abstract.php b/library/vendor/Zend/Tool/Project/Context/Filesystem/Abstract.php index 2c483299c..94cf4c761 100644 --- a/library/vendor/Zend/Tool/Project/Context/Filesystem/Abstract.php +++ b/library/vendor/Zend/Tool/Project/Context/Filesystem/Abstract.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Interface */ -require_once 'Zend/Tool/Project/Context/Interface.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Filesystem/Directory.php b/library/vendor/Zend/Tool/Project/Context/Filesystem/Directory.php index 7769a291e..33816b889 100644 --- a/library/vendor/Zend/Tool/Project/Context/Filesystem/Directory.php +++ b/library/vendor/Zend/Tool/Project/Context/Filesystem/Directory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Abstract */ -require_once 'Zend/Tool/Project/Context/Filesystem/Abstract.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Filesystem/File.php b/library/vendor/Zend/Tool/Project/Context/Filesystem/File.php index 4b6703ec5..75e9e52ec 100644 --- a/library/vendor/Zend/Tool/Project/Context/Filesystem/File.php +++ b/library/vendor/Zend/Tool/Project/Context/Filesystem/File.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Abstract */ -require_once 'Zend/Tool/Project/Context/Filesystem/Abstract.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Repository.php b/library/vendor/Zend/Tool/Project/Context/Repository.php index 42d1c2b5e..153b27f4d 100644 --- a/library/vendor/Zend/Tool/Project/Context/Repository.php +++ b/library/vendor/Zend/Tool/Project/Context/Repository.php @@ -19,9 +19,6 @@ * @version $Id$ */ -require_once 'Zend/Tool/Project/Context/System/Interface.php'; -require_once 'Zend/Tool/Project/Context/System/TopLevelRestrictable.php'; -require_once 'Zend/Tool/Project/Context/System/NotOverwritable.php'; /** * @category Zend @@ -84,7 +81,6 @@ class Zend_Tool_Project_Context_Repository implements Countable public function addContextClass($contextClass) { if (!class_exists($contextClass)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($contextClass); } $reflectionContextClass = new ReflectionClass($contextClass); @@ -112,7 +108,6 @@ class Zend_Tool_Project_Context_Repository implements Countable $normalName = $this->_normalizeName($context->getName()); if (isset($this->_shortContextNames[$normalName]) && ($this->_contexts[$this->_shortContextNames[$normalName]]['isOverwritable'] === false) ) { - require_once 'Zend/Tool/Project/Context/Exception.php'; throw new Zend_Tool_Project_Context_Exception('Context ' . $context->getName() . ' is not overwriteable.'); } @@ -131,7 +126,6 @@ class Zend_Tool_Project_Context_Repository implements Countable public function getContext($name) { if (!$this->hasContext($name)) { - require_once 'Zend/Tool/Project/Context/Exception.php'; throw new Zend_Tool_Project_Context_Exception('Context by name ' . $name . ' does not exist in the registry.'); } diff --git a/library/vendor/Zend/Tool/Project/Context/System/ProjectDirectory.php b/library/vendor/Zend/Tool/Project/Context/System/ProjectDirectory.php index 247313164..9e063613b 100644 --- a/library/vendor/Zend/Tool/Project/Context/System/ProjectDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/System/ProjectDirectory.php @@ -23,22 +23,18 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * @see Zend_Tool_Project_Context_System_Interface */ -require_once 'Zend/Tool/Project/Context/System/Interface.php'; /** * @see Zend_Tool_Project_Context_System_TopLevelRestrictable */ -require_once 'Zend/Tool/Project/Context/System/TopLevelRestrictable.php'; /** * @see Zend_Tool_Project_Context_System_NotOverwritable */ -require_once 'Zend/Tool/Project/Context/System/NotOverwritable.php'; /** * This class is the front most class for utilizing Zend_Tool_Project @@ -90,7 +86,6 @@ class Zend_Tool_Project_Context_System_ProjectDirectory // if not, exception. if ($projectDirectory == null) { - require_once 'Zend/Tool/Project/Exception.php'; throw new Zend_Tool_Project_Exception('projectDirectory cannot find the directory for this project.'); } @@ -112,7 +107,6 @@ class Zend_Tool_Project_Context_System_ProjectDirectory if ($registry->getClient()->isInteractive()) { // @todo prompt for override } else { - require_once 'Zend/Tool/Project/Context/Exception.php'; throw new Zend_Tool_Project_Context_Exception('This directory is not empty, project creation aborted.'); } break; diff --git a/library/vendor/Zend/Tool/Project/Context/System/ProjectProfileFile.php b/library/vendor/Zend/Tool/Project/Context/System/ProjectProfileFile.php index 156e641f4..bc1c7f397 100644 --- a/library/vendor/Zend/Tool/Project/Context/System/ProjectProfileFile.php +++ b/library/vendor/Zend/Tool/Project/Context/System/ProjectProfileFile.php @@ -23,22 +23,18 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * @see Zend_Tool_Project_Context_System_Interface */ -require_once 'Zend/Tool/Project/Context/System/Interface.php'; /** * @see Zend_Tool_Project_Context_System_NotOverwritable */ -require_once 'Zend/Tool/Project/Context/System/NotOverwritable.php'; /** * @see Zend_Tool_Project_Profile_FileParser_Xml */ -require_once 'Zend/Tool/Project/Profile/FileParser/Xml.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php b/library/vendor/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php index a84a36a30..5959cc990 100644 --- a/library/vendor/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php @@ -23,17 +23,14 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * @see Zend_Tool_Project_Context_System_Interface */ -require_once 'Zend/Tool/Project/Context/System/Interface.php'; /** * @see Zend_Tool_Project_Context_System_NotOverwritable */ -require_once 'Zend/Tool/Project/Context/System/NotOverwritable.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/AbstractClassFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/AbstractClassFile.php index c0a16a783..90f7a0c3d 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/AbstractClassFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/AbstractClassFile.php @@ -23,7 +23,6 @@ /** * Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ActionMethod.php b/library/vendor/Zend/Tool/Project/Context/Zf/ActionMethod.php index 025a9b73f..d35a2bcac 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ActionMethod.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ActionMethod.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Project_Context_Interface */ -require_once 'Zend/Tool/Project/Context/Interface.php'; /** * @see Zend_Reflection_File */ -require_once 'Zend/Reflection/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project @@ -76,7 +74,6 @@ class Zend_Tool_Project_Context_Zf_ActionMethod implements Zend_Tool_Project_Con $this->_resource->setAppendable(false); $this->_controllerResource = $this->_resource->getParentResource(); if (!$this->_controllerResource->getContext() instanceof Zend_Tool_Project_Context_Zf_ControllerFile) { - require_once 'Zend/Tool/Project/Context/Exception.php'; throw new Zend_Tool_Project_Context_Exception('ActionMethod must be a sub resource of a ControllerFile'); } // make the ControllerFile node appendable so we can tack on the actionMethod. @@ -88,7 +85,6 @@ class Zend_Tool_Project_Context_Zf_ActionMethod implements Zend_Tool_Project_Con * This code block is now commented, its doing to much for init() * if ($this->_controllerPath != '' && self::hasActionMethod($this->_controllerPath, $this->_actionName)) { - require_once 'Zend/Tool/Project/Context/Exception.php'; throw new Zend_Tool_Project_Context_Exception('An action named ' . $this->_actionName . 'Action already exists in this controller'); } */ @@ -160,7 +156,6 @@ class Zend_Tool_Project_Context_Zf_ActionMethod implements Zend_Tool_Project_Con public function create() { if (self::createActionMethod($this->_controllerPath, $this->_actionName) === false) { - require_once 'Zend/Tool/Project/Context/Exception.php'; throw new Zend_Tool_Project_Context_Exception( 'Could not create action within controller ' . $this->_controllerPath . ' with action name ' . $this->_actionName diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ApisDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ApisDirectory.php index abe7e5651..f7a04a550 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ApisDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ApisDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php index 1206c8ec0..07cf68c03 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php index d98ae3ea9..b7291611e 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/CacheDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/CacheDirectory.php index 5c78d51f3..5047a7cbc 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/CacheDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/CacheDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ConfigFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/ConfigFile.php index ce0ca3134..94d392598 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ConfigFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ConfigFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php index 04ff8e802..b8ab87aac 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ConfigsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ControllersDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ControllersDirectory.php index 8cc9c91ba..8c8ba636d 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ControllersDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ControllersDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/DataDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/DataDirectory.php index d7bf006e7..d255645e8 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/DataDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/DataDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/DbTableDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/DbTableDirectory.php index db4f97adb..5d3f2a445 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/DbTableDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/DbTableDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/DocsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/DocsDirectory.php index 211b6f163..7212cffe0 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/DocsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/DocsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/FormFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/FormFile.php index bf23bd475..3acbe3011 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/FormFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/FormFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Zf_AbstractClassFile */ -require_once 'Zend/Tool/Project/Context/Zf/AbstractClassFile.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/FormsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/FormsDirectory.php index 3e73f6d12..2844ee958 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/FormsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/FormsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/HtaccessFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/HtaccessFile.php index e79d3d661..45384226a 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/HtaccessFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/HtaccessFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php index e1ce01b3e..472a42689 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php index 8fd15e9fc..f56a1af47 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php index 50c9144ec..7de019d21 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/LayoutsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/LibraryDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/LibraryDirectory.php index 359532b80..c5b9e284c 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/LibraryDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/LibraryDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/LocalesDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/LocalesDirectory.php index c6c13e32d..1c31fe9af 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/LocalesDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/LocalesDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/LogsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/LogsDirectory.php index 2bb629953..0d475c129 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/LogsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/LogsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ModelFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/ModelFile.php index c86fa03e0..26e2dff4a 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ModelFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ModelFile.php @@ -23,7 +23,6 @@ /** * Zend_Tool_Project_Context_Zf_AbstractClassFile */ -require_once 'Zend/Tool/Project/Context/Zf/AbstractClassFile.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ModelsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ModelsDirectory.php index 89806ec0c..66e0fee33 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ModelsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ModelsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ModuleDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ModuleDirectory.php index fe5ec1244..307f841e7 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ModuleDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ModuleDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ModulesDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ModulesDirectory.php index e65c6791b..1382600e3 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ModulesDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ModulesDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php index d9910cbeb..a361a52c3 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ProjectProviderFile.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * @see Zend_CodeGenerator_Php_File */ -require_once 'Zend/CodeGenerator/Php/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/PublicDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/PublicDirectory.php index 4ed2c9353..b46c1c2b5 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/PublicDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/PublicDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php index b31ebbe61..409574b60 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/PublicImagesDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/PublicIndexFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/PublicIndexFile.php index 02026ec42..d3cd88ee1 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/PublicIndexFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/PublicIndexFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project @@ -78,7 +77,6 @@ set_include_path(implode(PATH_SEPARATOR, array( ))); /** Zend_Application */ -require_once 'Zend/Application.php'; // Create application, bootstrap, and run \$application = new Zend_Application( diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php index 0ad43c285..0ddbcffa6 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/PublicScriptsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php index 2bc75bcff..6e5d33f41 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/PublicStylesheetsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php index c2e6b46dd..500dd198c 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/SearchIndexesDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ServicesDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ServicesDirectory.php index 4967a0ff2..4cb883bfc 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ServicesDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ServicesDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/SessionsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/SessionsDirectory.php index 6123c2d6d..0dccb9b04 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/SessionsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/SessionsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php index 23c6f66dc..fc7b30be7 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TemporaryDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php index 9e710ec9c..48cb51551 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationActionMethod.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Project_Context_Interface */ -require_once 'Zend/Tool/Project/Context/Interface.php'; /** * @see Zend_Reflection_File */ -require_once 'Zend/Reflection/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project @@ -76,7 +74,6 @@ class Zend_Tool_Project_Context_Zf_TestApplicationActionMethod implements Zend_T $this->_resource->setAppendable(false); $this->_testApplicationControllerResource = $this->_resource->getParentResource(); if (!$this->_testApplicationControllerResource->getContext() instanceof Zend_Tool_Project_Context_Zf_TestApplicationControllerFile) { - require_once 'Zend/Tool/Project/Context/Exception.php'; throw new Zend_Tool_Project_Context_Exception('ActionMethod must be a sub resource of a TestApplicationControllerFile'); } // make the ControllerFile node appendable so we can tack on the actionMethod. @@ -141,7 +138,6 @@ class Zend_Tool_Project_Context_Zf_TestApplicationActionMethod implements Zend_T $file = $this->_testApplicationControllerPath; if (!file_exists($file)) { - require_once 'Zend/Tool/Project/Context/Exception.php'; throw new Zend_Tool_Project_Context_Exception( 'Could not create action within test controller ' . $file . ' with action name ' . $this->_forActionName diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php index 92c14db44..5a1f841c3 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationBootstrapFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php index 49af13483..1db9f9d60 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationControllerDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php index 44b550f5d..2b2459d78 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationControllerFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php index 45cff0b68..0197e83ed 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php index 2e6be173a..9c6781ac8 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationModuleDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationModulesDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationModulesDirectory.php index aaca08703..41ed075fe 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationModulesDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestApplicationModulesDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php index 170db049d..7f492e73c 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryBootstrapFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php index 139bdf99c..e581445b8 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryFile.php index ff938722b..3f9926b68 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php index 2ad81d5f8..fd195c738 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestLibraryNamespaceDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php index dd20bf853..80aa09eaf 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestPHPUnitBootstrapFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project @@ -77,7 +76,6 @@ set_include_path(implode(PATH_SEPARATOR, array( get_include_path(), ))); -require_once 'Zend/Loader/Autoloader.php'; Zend_Loader_Autoloader::getInstance(); EOS diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php index 9fb831b12..fac80169f 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestPHPUnitConfigFile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/TestsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/TestsDirectory.php index c9438e135..4a25f72d0 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/TestsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/TestsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/UploadsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/UploadsDirectory.php index 36b135f10..19918a295 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/UploadsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/UploadsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php index 4f9ee0995..dd87fbc68 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php @@ -23,22 +23,18 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * @see Zend_Filter */ -require_once 'Zend/Filter.php'; /** * @see Zend_Filter_Word_CamelCaseToDash */ -require_once 'Zend/Filter/Word/CamelCaseToDash.php'; /** * @see Zend_Filter_StringToLower */ -require_once 'Zend/Filter/StringToLower.php'; /** diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php index 292ac91c2..75393e7cb 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ViewFiltersDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php index fa5a67b67..097034b43 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ViewHelpersDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ViewScriptFile.php b/library/vendor/Zend/Tool/Project/Context/Zf/ViewScriptFile.php index ca85fa3e5..7914e83e5 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ViewScriptFile.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ViewScriptFile.php @@ -23,22 +23,18 @@ /** * @see Zend_Tool_Project_Context_Filesystem_File */ -require_once 'Zend/Tool/Project/Context/Filesystem/File.php'; /** * @see Zend_Filter */ -require_once 'Zend/Filter.php'; /** * @see Zend_Filter_Word_CamelCaseToDash */ -require_once 'Zend/Filter/Word/CamelCaseToDash.php'; /** * @see Zend_Filter_StringToLower */ -require_once 'Zend/Filter/StringToLower.php'; /** diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php index 6b69259b3..4ff80f3cf 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ViewScriptsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ViewsDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ViewsDirectory.php index c5b492675..e9117e245 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ViewsDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ViewsDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project diff --git a/library/vendor/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php b/library/vendor/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php index 35daffe86..b68852f56 100644 --- a/library/vendor/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php +++ b/library/vendor/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Context_Filesystem_Directory */ -require_once 'Zend/Tool/Project/Context/Filesystem/Directory.php'; /** * This class is the front most class for utilizing Zend_Tool_Project @@ -87,7 +86,6 @@ class Zend_Tool_Project_Context_Zf_ZfStandardLibraryDirectory extends Zend_Tool_ */ protected function _getZfPath() { - require_once 'Zend/Loader.php'; foreach (Zend_Loader::explodeIncludePath() as $includePath) { if (!file_exists($includePath) || $includePath[0] == '.') { continue; diff --git a/library/vendor/Zend/Tool/Project/Exception.php b/library/vendor/Zend/Tool/Project/Exception.php index e7be97331..279b3bd5d 100644 --- a/library/vendor/Zend/Tool/Project/Exception.php +++ b/library/vendor/Zend/Tool/Project/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Project/Profile.php b/library/vendor/Zend/Tool/Project/Profile.php index 7634b4b2b..ce3d9e0d0 100644 --- a/library/vendor/Zend/Tool/Project/Profile.php +++ b/library/vendor/Zend/Tool/Project/Profile.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Project_Profile_FileParser_Xml */ -require_once 'Zend/Tool/Project/Profile/FileParser/Xml.php'; /** * @see Zend_Tool_Project_Profile_Resource_Container */ -require_once 'Zend/Tool/Project/Profile/Resource/Container.php'; /** * This class is the front most class for utilizing Zend_Tool_Project @@ -82,7 +80,6 @@ class Zend_Tool_Project_Profile extends Zend_Tool_Project_Profile_Resource_Conta */ public function getIterator() { - require_once 'Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php'; return new RecursiveIteratorIterator( new Zend_Tool_Project_Profile_Iterator_EnabledResourceFilter($this), @@ -98,7 +95,6 @@ class Zend_Tool_Project_Profile extends Zend_Tool_Project_Profile_Resource_Conta public function loadFromData() { if (!isset($this->_attributes['profileData'])) { - require_once 'Zend/Tool/Project/Exception.php'; throw new Zend_Tool_Project_Exception('loadFromData() must have "profileData" set.'); } @@ -150,21 +146,18 @@ class Zend_Tool_Project_Profile extends Zend_Tool_Project_Profile_Resource_Conta { // if no data is supplied, need either a projectProfileFile or a projectDirectory if (!isset($this->_attributes['projectProfileFile']) && !isset($this->_attributes['projectDirectory'])) { - require_once 'Zend/Tool/Project/Exception.php'; throw new Zend_Tool_Project_Exception('loadFromFile() must have at least "projectProfileFile" or "projectDirectory" set.'); } if (isset($this->_attributes['projectProfileFile'])) { $projectProfileFilePath = $this->_attributes['projectProfileFile']; if (!file_exists($projectProfileFilePath)) { - require_once 'Zend/Tool/Project/Exception.php'; throw new Zend_Tool_Project_Exception('"projectProfileFile" was supplied but file was not found at location ' . $projectProfileFilePath); } $this->_attributes['projectDirectory'] = dirname($projectProfileFilePath); } else { $projectProfileFilePath = rtrim($this->_attributes['projectDirectory'], '/\\') . '/.zfproject.xml'; if (!file_exists($projectProfileFilePath)) { - require_once 'Zend/Tool/Project/Exception.php'; throw new Zend_Tool_Project_Exception('"projectDirectory" was supplied but no profile file file was not found at location ' . $projectProfileFilePath); } $this->_attributes['projectProfileFile'] = $projectProfileFilePath; @@ -194,7 +187,6 @@ class Zend_Tool_Project_Profile extends Zend_Tool_Project_Profile_Resource_Conta } if ($file == null) { - require_once 'Zend/Tool/Project/Exception.php'; throw new Zend_Tool_Project_Exception('storeToFile() must have a "projectProfileFile" attribute set.'); } diff --git a/library/vendor/Zend/Tool/Project/Profile/Exception.php b/library/vendor/Zend/Tool/Project/Profile/Exception.php index 1c1018a81..088a3c897 100644 --- a/library/vendor/Zend/Tool/Project/Profile/Exception.php +++ b/library/vendor/Zend/Tool/Project/Profile/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Exception */ -require_once 'Zend/Tool/Project/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Project/Profile/FileParser/Xml.php b/library/vendor/Zend/Tool/Project/Profile/FileParser/Xml.php index a332b4ed7..0a07481cb 100644 --- a/library/vendor/Zend/Tool/Project/Profile/FileParser/Xml.php +++ b/library/vendor/Zend/Tool/Project/Profile/FileParser/Xml.php @@ -20,10 +20,6 @@ * @version $Id$ */ -require_once 'Zend/Tool/Project/Profile/FileParser/Interface.php'; -require_once 'Zend/Tool/Project/Context/Repository.php'; -require_once 'Zend/Tool/Project/Profile.php'; -require_once 'Zend/Tool/Project/Profile/Resource.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Project/Profile/Resource.php b/library/vendor/Zend/Tool/Project/Profile/Resource.php index 1b860c51c..338d84368 100644 --- a/library/vendor/Zend/Tool/Project/Profile/Resource.php +++ b/library/vendor/Zend/Tool/Project/Profile/Resource.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Project_Profile_Resource_Container */ -require_once 'Zend/Tool/Project/Profile/Resource/Container.php'; /** * @see Zend_Tool_Project_Context_Repository */ -require_once 'Zend/Tool/Project/Context/Repository.php'; /** * This class is an iterator that will iterate only over enabled resources diff --git a/library/vendor/Zend/Tool/Project/Profile/Resource/Container.php b/library/vendor/Zend/Tool/Project/Profile/Resource/Container.php index 0a4ea88d4..2774950e4 100644 --- a/library/vendor/Zend/Tool/Project/Profile/Resource/Container.php +++ b/library/vendor/Zend/Tool/Project/Profile/Resource/Container.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Profile_Resource_SearchConstraints */ -require_once 'Zend/Tool/Project/Profile/Resource/SearchConstraints.php'; /** * This class is an iterator that will iterate only over enabled resources @@ -105,7 +104,6 @@ class Zend_Tool_Project_Profile_Resource_Container implements RecursiveIterator, if (count($currentConstraint->params) > 0) { $currentResourceAttributes = $currentResource->getAttributes(); if (!is_array($currentConstraint->params)) { - require_once 'Zend/Tool/Project/Profile/Exception.php'; throw new Zend_Tool_Project_Profile_Exception('Search parameter specifics must be in the form of an array for key "' . $currentConstraint->name .'"'); } @@ -145,7 +143,6 @@ class Zend_Tool_Project_Profile_Resource_Container implements RecursiveIterator, { if (!$appendResourceOrSearchConstraints instanceof Zend_Tool_Project_Profile_Resource_Container) { if (($parentResource = $this->search($appendResourceOrSearchConstraints)) == false) { - require_once 'Zend/Tool/Project/Profile/Exception.php'; throw new Zend_Tool_Project_Profile_Exception('No node was found to append to.'); } } else { @@ -171,11 +168,9 @@ class Zend_Tool_Project_Profile_Resource_Container implements RecursiveIterator, if ($contextRegistry->hasContext($context)) { $context = $contextRegistry->getContext($context); } else { - require_once 'Zend/Tool/Project/Profile/Exception.php'; throw new Zend_Tool_Project_Profile_Exception('Context by name ' . $context . ' was not found in the context registry.'); } } elseif (!$context instanceof Zend_Tool_Project_Context_Interface) { - require_once 'Zend/Tool/Project/Profile/Exception.php'; throw new Zend_Tool_Project_Profile_Exception('Context must be of type string or Zend_Tool_Project_Context_Interface.'); } diff --git a/library/vendor/Zend/Tool/Project/Provider/Abstract.php b/library/vendor/Zend/Tool/Project/Provider/Abstract.php index 0593b2dd2..55a770a21 100644 --- a/library/vendor/Zend/Tool/Project/Provider/Abstract.php +++ b/library/vendor/Zend/Tool/Project/Provider/Abstract.php @@ -23,29 +23,23 @@ /** * @see Zend_Tool_Project_Profile */ -require_once 'Zend/Tool/Project/Profile.php'; /** * @see Zend_Tool_Framework_Provider_Abstract */ -require_once 'Zend/Tool/Framework/Provider/Abstract.php'; /** * @see Zend_Tool_Project_Context_Repository */ -require_once 'Zend/Tool/Project/Context/Repository.php'; /** * @see Zend_Tool_Project_Profile_FileParser_Xml */ -require_once 'Zend/Tool/Project/Profile/FileParser/Xml.php'; /** * @see Zend_Tool_Framework_Registry */ -require_once 'Zend/Tool/Framework/Registry.php'; -require_once 'Zend/Tool/Framework/Provider/Initializable.php'; /** * @category Zend @@ -187,7 +181,6 @@ abstract class Zend_Tool_Project_Provider_Abstract { $profile = $this->_loadProfile(); if ($profile === false) { - require_once 'Zend/Tool/Project/Provider/Exception.php'; throw new Zend_Tool_Project_Provider_Exception('A project profile was not found in the current working directory.'); } return $profile; @@ -234,7 +227,6 @@ abstract class Zend_Tool_Project_Provider_Abstract } if (!class_exists('Zend_Tool_Project_Context_Content_Engine')) { - require_once 'Zend/Tool/Project/Context/Content/Engine.php'; } $engine = new Zend_Tool_Project_Context_Content_Engine($storage); diff --git a/library/vendor/Zend/Tool/Project/Provider/Action.php b/library/vendor/Zend/Tool/Project/Provider/Action.php index f5ff379f9..379e3116c 100644 --- a/library/vendor/Zend/Tool/Project/Provider/Action.php +++ b/library/vendor/Zend/Tool/Project/Provider/Action.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Project_Provider_Abstract */ -require_once 'Zend/Tool/Project/Provider/Abstract.php'; /** * @see Zend_Tool_Framework_Provider_Pretendable */ -require_once 'Zend/Tool/Framework/Provider/Pretendable.php'; /** * @category Zend @@ -136,7 +134,6 @@ class Zend_Tool_Project_Provider_Action $response = $this->_registry->getResponse(); // determine if testing is enabled in the project - require_once 'Zend/Tool/Project/Provider/Test.php'; $testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); if ($testingEnabled && !Zend_Tool_Project_Provider_Test::isPHPUnitAvailable()) { diff --git a/library/vendor/Zend/Tool/Project/Provider/Controller.php b/library/vendor/Zend/Tool/Project/Provider/Controller.php index 4173f6b31..3781693d0 100644 --- a/library/vendor/Zend/Tool/Project/Provider/Controller.php +++ b/library/vendor/Zend/Tool/Project/Provider/Controller.php @@ -117,7 +117,6 @@ class Zend_Tool_Project_Provider_Controller $response = $this->_registry->getResponse(); // determine if testing is enabled in the project - require_once 'Zend/Tool/Project/Provider/Test.php'; $testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); if ($testingEnabled && !Zend_Tool_Project_Provider_Test::isPHPUnitAvailable()) { diff --git a/library/vendor/Zend/Tool/Project/Provider/DbAdapter.php b/library/vendor/Zend/Tool/Project/Provider/DbAdapter.php index b5384b030..fac32ebdb 100644 --- a/library/vendor/Zend/Tool/Project/Provider/DbAdapter.php +++ b/library/vendor/Zend/Tool/Project/Provider/DbAdapter.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Project_Provider_Abstract */ -require_once 'Zend/Tool/Project/Provider/Abstract.php'; /** * @see Zend_Tool_Framework_Provider_Interactable */ -require_once 'Zend/Tool/Framework/Provider/Interactable.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Project/Provider/Exception.php b/library/vendor/Zend/Tool/Project/Provider/Exception.php index 7319a7825..bdfbc54c0 100644 --- a/library/vendor/Zend/Tool/Project/Provider/Exception.php +++ b/library/vendor/Zend/Tool/Project/Provider/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Exception */ -require_once 'Zend/Tool/Project/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Project/Provider/Layout.php b/library/vendor/Zend/Tool/Project/Provider/Layout.php index 6447ae76a..953811343 100644 --- a/library/vendor/Zend/Tool/Project/Provider/Layout.php +++ b/library/vendor/Zend/Tool/Project/Provider/Layout.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Provider_Abstract */ -require_once 'Zend/Tool/Project/Provider/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Project/Provider/Manifest.php b/library/vendor/Zend/Tool/Project/Provider/Manifest.php index 10bdc888f..74b9d5ff0 100644 --- a/library/vendor/Zend/Tool/Project/Provider/Manifest.php +++ b/library/vendor/Zend/Tool/Project/Provider/Manifest.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Framework_Manifest_ProviderManifestable */ -require_once 'Zend/Tool/Framework/Manifest/ProviderManifestable.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Project/Provider/Module.php b/library/vendor/Zend/Tool/Project/Provider/Module.php index 466262957..44cc73a86 100644 --- a/library/vendor/Zend/Tool/Project/Provider/Module.php +++ b/library/vendor/Zend/Tool/Project/Provider/Module.php @@ -23,22 +23,18 @@ /** * @see Zend_Tool_Project_Provider_Abstract */ -require_once 'Zend/Tool/Project/Provider/Abstract.php'; /** * @see Zend_Tool_Framework_Provider_Pretendable */ -require_once 'Zend/Tool/Framework/Provider/Pretendable.php'; /** * @see Zend_Tool_Project_Profile_Iterator_ContextFilter */ -require_once 'Zend/Tool/Project/Profile/Iterator/ContextFilter.php'; /** * @see Zend_Tool_Project_Profile_Iterator_EnabledResourceFilter */ -require_once 'Zend/Tool/Project/Profile/Iterator/EnabledResourceFilter.php'; /** * @category Zend @@ -137,7 +133,6 @@ class Zend_Tool_Project_Provider_Module $this->_loadProfile(self::NO_PROFILE_THROW_EXCEPTION); // determine if testing is enabled in the project - require_once 'Zend/Tool/Project/Provider/Test.php'; //$testingEnabled = Zend_Tool_Project_Provider_Test::isTestingEnabled($this->_loadedProfile); $resources = self::createResources($this->_loadedProfile, $name); diff --git a/library/vendor/Zend/Tool/Project/Provider/Profile.php b/library/vendor/Zend/Tool/Project/Provider/Profile.php index fae5158f3..be3bcdcdd 100644 --- a/library/vendor/Zend/Tool/Project/Provider/Profile.php +++ b/library/vendor/Zend/Tool/Project/Provider/Profile.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Provider_Abstract */ -require_once 'Zend/Tool/Project/Provider/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Project/Provider/Project.php b/library/vendor/Zend/Tool/Project/Provider/Project.php index 959378bb3..165f800f6 100644 --- a/library/vendor/Zend/Tool/Project/Provider/Project.php +++ b/library/vendor/Zend/Tool/Project/Provider/Project.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Provider_Abstract */ -require_once 'Zend/Tool/Project/Provider/Abstract.php'; /** * @category Zend @@ -54,7 +53,6 @@ class Zend_Tool_Project_Provider_Project if (!file_exists($path)) { $created = mkdir($path); if (!$created) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('Could not create requested project directory \'' . $path . '\''); } } @@ -64,7 +62,6 @@ class Zend_Tool_Project_Provider_Project $profile = $this->_loadProfile(self::NO_PROFILE_RETURN_FALSE, $path); if ($profile !== false) { - require_once 'Zend/Tool/Framework/Client/Exception.php'; throw new Zend_Tool_Framework_Client_Exception('A project already exists here'); } diff --git a/library/vendor/Zend/Tool/Project/Provider/ProjectProvider.php b/library/vendor/Zend/Tool/Project/Provider/ProjectProvider.php index 5df340341..75c5efbd9 100644 --- a/library/vendor/Zend/Tool/Project/Provider/ProjectProvider.php +++ b/library/vendor/Zend/Tool/Project/Provider/ProjectProvider.php @@ -20,7 +20,6 @@ */ /** @see Zend_Tool_Project_Provider_Abstract */ -require_once 'Zend/Tool/Project/Provider/Abstract.php'; /** * @category Zend @@ -46,7 +45,6 @@ class Zend_Tool_Project_Provider_ProjectProvider extends Zend_Tool_Project_Provi /** * @see Zend_Tool_Project_Provider_Exception */ - require_once 'Zend/Tool/Project/Provider/Exception.php'; throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_Controller::createResource() expects \"projectProviderName\" is the name of a project provider resource to create.'); } diff --git a/library/vendor/Zend/Tool/Project/Provider/Test.php b/library/vendor/Zend/Tool/Project/Provider/Test.php index 86f9d0c34..4627e104f 100644 --- a/library/vendor/Zend/Tool/Project/Provider/Test.php +++ b/library/vendor/Zend/Tool/Project/Provider/Test.php @@ -23,12 +23,10 @@ /** * @see Zend_Tool_Project_Provider_Abstract */ -require_once 'Zend/Tool/Project/Provider/Abstract.php'; /** * @see Zend_Tool_Project_Provider_Exception */ -require_once 'Zend/Tool/Project/Provider/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Tool/Project/Provider/View.php b/library/vendor/Zend/Tool/Project/Provider/View.php index 2ad1aa7f6..ebd163e06 100644 --- a/library/vendor/Zend/Tool/Project/Provider/View.php +++ b/library/vendor/Zend/Tool/Project/Provider/View.php @@ -23,7 +23,6 @@ /** * @see Zend_Tool_Project_Provider_Abstract */ -require_once 'Zend/Tool/Project/Provider/Abstract.php'; /** * @category Zend @@ -46,12 +45,10 @@ class Zend_Tool_Project_Provider_View extends Zend_Tool_Project_Provider_Abstrac public static function createResource(Zend_Tool_Project_Profile $profile, $actionName, $controllerName, $moduleName = null) { if (!is_string($actionName)) { - require_once 'Zend/Tool/Project/Provider/Exception.php'; throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_View::createResource() expects \"actionName\" is the name of a controller resource to create.'); } if (!is_string($controllerName)) { - require_once 'Zend/Tool/Project/Provider/Exception.php'; throw new Zend_Tool_Project_Provider_Exception('Zend_Tool_Project_Provider_View::createResource() expects \"controllerName\" is the name of a controller resource to create.'); } @@ -68,7 +65,6 @@ class Zend_Tool_Project_Provider_View extends Zend_Tool_Project_Provider_Abstrac $profileSearchParams[] = 'viewScriptsDirectory'; if (($viewScriptsDirectory = $profile->search($profileSearchParams, $noModuleSearch)) === false) { - require_once 'Zend/Tool/Project/Provider/Exception.php'; throw new Zend_Tool_Project_Provider_Exception('This project does not have a viewScriptsDirectory resource.'); } @@ -94,7 +90,6 @@ class Zend_Tool_Project_Provider_View extends Zend_Tool_Project_Provider_Abstrac { if ($controllerName == '' || $actionNameOrSimpleName == '') { - require_once 'Zend/Tool/Project/Provider/Exception.php'; throw new Zend_Tool_Project_Provider_Exception('ControllerName and/or ActionName are empty.'); } diff --git a/library/vendor/Zend/Translate.php b/library/vendor/Zend/Translate.php index 36eeeda67..6264d225a 100644 --- a/library/vendor/Zend/Translate.php +++ b/library/vendor/Zend/Translate.php @@ -22,12 +22,10 @@ /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; /** * @see Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; /** @@ -139,7 +137,6 @@ class Zend_Translate { unset($options['adapter']); $this->_adapter = new $adapter($options); if (!$this->_adapter instanceof Zend_Translate_Adapter) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("Adapter " . $adapter . " does not extend Zend_Translate_Adapter"); } } @@ -214,7 +211,6 @@ class Zend_Translate { if (method_exists($this->_adapter, $method)) { return call_user_func_array(array($this->_adapter, $method), $options); } - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("Unknown method '" . $method . "' called!"); } } diff --git a/library/vendor/Zend/Translate/Adapter.php b/library/vendor/Zend/Translate/Adapter.php index d7b87aea1..6d8ac47c0 100644 --- a/library/vendor/Zend/Translate/Adapter.php +++ b/library/vendor/Zend/Translate/Adapter.php @@ -23,12 +23,10 @@ /** * @see Zend_Locale */ -require_once 'Zend/Locale.php'; /** * @see Zend_Translate_Plural */ -require_once 'Zend/Translate/Plural.php'; /** * Basic adapter class for each translation source adapter @@ -214,7 +212,6 @@ abstract class Zend_Translate_Adapter { } if (!isset($options['content']) || empty($options['content'])) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("Required option 'content' is missing"); } @@ -224,7 +221,6 @@ abstract class Zend_Translate_Adapter { } if ((array_key_exists('log', $options)) && !($options['log'] instanceof Zend_Log)) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Instance of Zend_Log expected for option log'); } @@ -237,7 +233,6 @@ abstract class Zend_Translate_Adapter { $options['locale'] = Zend_Locale::findLocale($options['locale']); } } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("The given Language '{$options['locale']}' does not exist", 0, $e); } @@ -351,7 +346,6 @@ abstract class Zend_Translate_Adapter { } else if ((isset($this->_options[$key]) and ($this->_options[$key] != $option)) or !isset($this->_options[$key])) { if (($key == 'log') && !($option instanceof Zend_Log)) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Instance of Zend_Log expected for option log'); } @@ -429,7 +423,6 @@ abstract class Zend_Translate_Adapter { try { $locale = Zend_Locale::findLocale($locale); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("The given Language ({$locale}) does not exist", 0, $e); } @@ -618,7 +611,6 @@ abstract class Zend_Translate_Adapter { try { $options['locale'] = Zend_Locale::findLocale($options['locale']); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("The given Language '{$options['locale']}' does not exist", 0, $e); } @@ -956,7 +948,6 @@ abstract class Zend_Translate_Adapter { */ public static function clearCache($tag = null) { - require_once 'Zend/Cache.php'; if (self::$_cacheTags) { if ($tag == null) { $tag = 'Zend_Translate'; diff --git a/library/vendor/Zend/Translate/Adapter/Array.php b/library/vendor/Zend/Translate/Adapter/Array.php index a1093eb06..fbbe2161e 100644 --- a/library/vendor/Zend/Translate/Adapter/Array.php +++ b/library/vendor/Zend/Translate/Adapter/Array.php @@ -21,10 +21,8 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; /** @@ -57,7 +55,6 @@ class Zend_Translate_Adapter_Array extends Zend_Translate_Adapter } } if (!is_array($data)) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("Error including array or file '".$data."'"); } diff --git a/library/vendor/Zend/Translate/Adapter/Csv.php b/library/vendor/Zend/Translate/Adapter/Csv.php index 17d641e6b..15ff356fe 100644 --- a/library/vendor/Zend/Translate/Adapter/Csv.php +++ b/library/vendor/Zend/Translate/Adapter/Csv.php @@ -21,10 +21,8 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; /** @@ -85,7 +83,6 @@ class Zend_Translate_Adapter_Csv extends Zend_Translate_Adapter $options = $options + $this->_options; $this->_file = @fopen($filename, 'rb'); if (!$this->_file) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Error opening translation file \'' . $filename . '\'.'); } diff --git a/library/vendor/Zend/Translate/Adapter/Gettext.php b/library/vendor/Zend/Translate/Adapter/Gettext.php index 1d6a5335a..b9cd02245 100644 --- a/library/vendor/Zend/Translate/Adapter/Gettext.php +++ b/library/vendor/Zend/Translate/Adapter/Gettext.php @@ -20,10 +20,8 @@ */ /** Zend_Locale */ -require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; /** * @category Zend @@ -68,12 +66,10 @@ class Zend_Translate_Adapter_Gettext extends Zend_Translate_Adapter { $this->_bigEndian = false; $this->_file = @fopen($filename, 'rb'); if (!$this->_file) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Error opening translation file \'' . $filename . '\'.'); } if (@filesize($filename) < 10) { @fclose($this->_file); - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('\'' . $filename . '\' is not a gettext file'); } @@ -85,7 +81,6 @@ class Zend_Translate_Adapter_Gettext extends Zend_Translate_Adapter { $this->_bigEndian = true; } else { @fclose($this->_file); - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('\'' . $filename . '\' is not a gettext file'); } // read revision - not supported for now diff --git a/library/vendor/Zend/Translate/Adapter/Ini.php b/library/vendor/Zend/Translate/Adapter/Ini.php index 3c2f995d2..595b2f8c6 100644 --- a/library/vendor/Zend/Translate/Adapter/Ini.php +++ b/library/vendor/Zend/Translate/Adapter/Ini.php @@ -20,10 +20,8 @@ */ /** Zend_Locale */ -require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; /** * @category Zend @@ -49,7 +47,6 @@ class Zend_Translate_Adapter_Ini extends Zend_Translate_Adapter { $this->_data = array(); if (!file_exists($data)) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("Ini file '".$data."' not found"); } diff --git a/library/vendor/Zend/Translate/Adapter/Qt.php b/library/vendor/Zend/Translate/Adapter/Qt.php index c428c4a18..7b9122196 100644 --- a/library/vendor/Zend/Translate/Adapter/Qt.php +++ b/library/vendor/Zend/Translate/Adapter/Qt.php @@ -21,16 +21,12 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** @See Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; /** * @category Zend @@ -65,7 +61,6 @@ class Zend_Translate_Adapter_Qt extends Zend_Translate_Adapter { { $this->_data = array(); if (!is_readable($filename)) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.'); } @@ -81,7 +76,6 @@ class Zend_Translate_Adapter_Qt extends Zend_Translate_Adapter { try { Zend_Xml_Security::scanFile($filename); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception( $e->getMessage() ); @@ -93,7 +87,6 @@ class Zend_Translate_Adapter_Qt extends Zend_Translate_Adapter { xml_get_current_line_number($this->_file), $filename); xml_parser_free($this->_file); - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); } diff --git a/library/vendor/Zend/Translate/Adapter/Tbx.php b/library/vendor/Zend/Translate/Adapter/Tbx.php index 924c1f69a..b69bcd1a5 100644 --- a/library/vendor/Zend/Translate/Adapter/Tbx.php +++ b/library/vendor/Zend/Translate/Adapter/Tbx.php @@ -21,16 +21,12 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; /** * @category Zend @@ -62,7 +58,6 @@ class Zend_Translate_Adapter_Tbx extends Zend_Translate_Adapter { { $this->_data = array(); if (!is_readable($filename)) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.'); } @@ -76,7 +71,6 @@ class Zend_Translate_Adapter_Tbx extends Zend_Translate_Adapter { try { Zend_Xml_Security::scanFile($filename); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception( $e->getMessage() ); @@ -88,7 +82,6 @@ class Zend_Translate_Adapter_Tbx extends Zend_Translate_Adapter { xml_get_current_line_number($this->_file), $filename); xml_parser_free($this->_file); - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); } diff --git a/library/vendor/Zend/Translate/Adapter/Tmx.php b/library/vendor/Zend/Translate/Adapter/Tmx.php index eb18d426b..4bb2d61f5 100644 --- a/library/vendor/Zend/Translate/Adapter/Tmx.php +++ b/library/vendor/Zend/Translate/Adapter/Tmx.php @@ -21,16 +21,12 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** @See Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; /** * @category Zend @@ -63,7 +59,6 @@ class Zend_Translate_Adapter_Tmx extends Zend_Translate_Adapter { { $this->_data = array(); if (!is_readable($filename)) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.'); } @@ -81,7 +76,6 @@ class Zend_Translate_Adapter_Tmx extends Zend_Translate_Adapter { try { Zend_Xml_Security::scanFile($filename); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception( $e->getMessage() ); @@ -93,7 +87,6 @@ class Zend_Translate_Adapter_Tmx extends Zend_Translate_Adapter { xml_get_current_line_number($this->_file), $filename); xml_parser_free($this->_file); - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); } diff --git a/library/vendor/Zend/Translate/Adapter/Xliff.php b/library/vendor/Zend/Translate/Adapter/Xliff.php index 4c91084fa..1a5bbdd82 100644 --- a/library/vendor/Zend/Translate/Adapter/Xliff.php +++ b/library/vendor/Zend/Translate/Adapter/Xliff.php @@ -21,16 +21,12 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** @See Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; /** * @category Zend @@ -67,7 +63,6 @@ class Zend_Translate_Adapter_Xliff extends Zend_Translate_Adapter { { $this->_data = array(); if (!is_readable($filename)) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.'); } @@ -88,7 +83,6 @@ class Zend_Translate_Adapter_Xliff extends Zend_Translate_Adapter { try { Zend_Xml_Security::scanFile($filename); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception( $e->getMessage() ); @@ -100,7 +94,6 @@ class Zend_Translate_Adapter_Xliff extends Zend_Translate_Adapter { xml_get_current_line_number($this->_file), $filename); xml_parser_free($this->_file); - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); } diff --git a/library/vendor/Zend/Translate/Adapter/XmlTm.php b/library/vendor/Zend/Translate/Adapter/XmlTm.php index e795aeac6..0e9d6de72 100644 --- a/library/vendor/Zend/Translate/Adapter/XmlTm.php +++ b/library/vendor/Zend/Translate/Adapter/XmlTm.php @@ -21,16 +21,12 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** @See Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; /** * @category Zend @@ -62,7 +58,6 @@ class Zend_Translate_Adapter_XmlTm extends Zend_Translate_Adapter { $this->_data = array(); $this->_lang = $locale; if (!is_readable($filename)) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.'); } @@ -76,7 +71,6 @@ class Zend_Translate_Adapter_XmlTm extends Zend_Translate_Adapter { try { Zend_Xml_Security::scanFile($filename); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception( $e->getMessage() ); @@ -88,7 +82,6 @@ class Zend_Translate_Adapter_XmlTm extends Zend_Translate_Adapter { xml_get_current_line_number($this->_file), $filename); xml_parser_free($this->_file); - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); } diff --git a/library/vendor/Zend/Translate/Exception.php b/library/vendor/Zend/Translate/Exception.php index fe7fe10f2..396a94cf7 100644 --- a/library/vendor/Zend/Translate/Exception.php +++ b/library/vendor/Zend/Translate/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Translate/Plural.php b/library/vendor/Zend/Translate/Plural.php index 34e77bc85..3a83e8789 100644 --- a/library/vendor/Zend/Translate/Plural.php +++ b/library/vendor/Zend/Translate/Plural.php @@ -215,7 +215,6 @@ class Zend_Translate_Plural } if (!is_callable($rule)) { - require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('The given rule can not be called'); } diff --git a/library/vendor/Zend/Uri.php b/library/vendor/Zend/Uri.php index 9c498558a..3bcd9c5d8 100644 --- a/library/vendor/Zend/Uri.php +++ b/library/vendor/Zend/Uri.php @@ -101,13 +101,11 @@ abstract class Zend_Uri $schemeSpecific = isset($uri[1]) === true ? $uri[1] : ''; if (strlen($scheme) === 0) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('An empty string was supplied for the scheme'); } // Security check: $scheme is used to load a class file, so only alphanumerics are allowed. if (ctype_alnum($scheme) === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Illegal scheme supplied, only alphanumeric characters are permitted'); } @@ -126,24 +124,20 @@ abstract class Zend_Uri case 'mailto': // TODO default: - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Scheme \"$scheme\" is not supported"); break; } } - require_once 'Zend/Loader.php'; try { Zend_Loader::loadClass($className); } catch (Exception $e) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("\"$className\" not found"); } $schemeHandler = new $className($scheme, $schemeSpecific); if (! $schemeHandler instanceof Zend_Uri) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("\"$className\" is not an instance of Zend_Uri"); } diff --git a/library/vendor/Zend/Uri/Exception.php b/library/vendor/Zend/Uri/Exception.php index 6b1100ed5..58ef6d1d6 100644 --- a/library/vendor/Zend/Uri/Exception.php +++ b/library/vendor/Zend/Uri/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * Exceptions for Zend_Uri diff --git a/library/vendor/Zend/Uri/Http.php b/library/vendor/Zend/Uri/Http.php index 2fb88373e..4ae5a325c 100644 --- a/library/vendor/Zend/Uri/Http.php +++ b/library/vendor/Zend/Uri/Http.php @@ -22,12 +22,10 @@ /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; /** * @see Zend_Validate_Hostname */ -require_once 'Zend/Validate/Hostname.php'; /** * HTTP(S) URI handler @@ -152,7 +150,6 @@ class Zend_Uri_Http extends Zend_Uri // Validate the URI if ($this->valid() === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Invalid URI supplied'); } } @@ -170,7 +167,6 @@ class Zend_Uri_Http extends Zend_Uri public static function fromString($uri) { if (is_string($uri) === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('$uri is not a string'); } @@ -179,7 +175,6 @@ class Zend_Uri_Http extends Zend_Uri $schemeSpecific = isset($uri[1]) === true ? $uri[1] : ''; if (in_array($scheme, array('http', 'https')) === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Invalid scheme: '$scheme'"); } @@ -201,7 +196,6 @@ class Zend_Uri_Http extends Zend_Uri $pattern = '~^((//)([^/?#]*))([^?#]*)(\?([^#]*))?(#(.*))?$~'; $status = @preg_match($pattern, $schemeSpecific, $matches); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: scheme-specific decomposition failed'); } @@ -220,7 +214,6 @@ class Zend_Uri_Http extends Zend_Uri $pattern = '~^(([^:@]*)(:([^@]*))?@)?((?(?=[[])[[][^]]+[]]|[^:]+))(:(.*))?$~'; $status = @preg_match($pattern, $combo, $matches); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: authority decomposition failed'); } @@ -243,7 +236,6 @@ class Zend_Uri_Http extends Zend_Uri public function getUri() { if ($this->valid() === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('One or more parts of the URI are invalid'); } @@ -316,7 +308,6 @@ class Zend_Uri_Http extends Zend_Uri self::CHAR_ALNUM . self::CHAR_MARK . ';:&=+$,' . '])+$/', $username); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: username validation failed'); } @@ -333,7 +324,6 @@ class Zend_Uri_Http extends Zend_Uri public function setUsername($username) { if ($this->validateUsername($username) === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Username \"$username\" is not a valid HTTP username"); } @@ -383,7 +373,6 @@ class Zend_Uri_Http extends Zend_Uri self::CHAR_ALNUM . self::CHAR_MARK . ';:&=+$,' . '])+$/', $password); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: password validation failed.'); } @@ -400,7 +389,6 @@ class Zend_Uri_Http extends Zend_Uri public function setPassword($password) { if ($this->validatePassword($password) === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Password \"$password\" is not a valid HTTP password."); } @@ -455,7 +443,6 @@ class Zend_Uri_Http extends Zend_Uri public function setHost($host) { if ($this->validateHost($host) === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Host \"$host\" is not a valid HTTP host"); } @@ -507,7 +494,6 @@ class Zend_Uri_Http extends Zend_Uri public function setPort($port) { if ($this->validatePort($port) === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Port \"$port\" is not a valid HTTP port."); } @@ -550,7 +536,6 @@ class Zend_Uri_Http extends Zend_Uri $pattern = '/^' . $this->_regex['path'] . '$/'; $status = @preg_match($pattern, $path); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: path validation failed'); } @@ -567,7 +552,6 @@ class Zend_Uri_Http extends Zend_Uri public function setPath($path) { if ($this->validatePath($path) === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Path \"$path\" is not a valid HTTP path"); } @@ -628,7 +612,6 @@ class Zend_Uri_Http extends Zend_Uri $pattern = '/^' . $this->_regex['uric'] . '*$/'; $status = @preg_match($pattern, $query); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: query validation failed'); } @@ -693,7 +676,6 @@ class Zend_Uri_Http extends Zend_Uri // Make sure the query is valid, and set it if ($this->validateQuery($query) === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("'$query' is not a valid query string"); } @@ -736,7 +718,6 @@ class Zend_Uri_Http extends Zend_Uri $pattern = '/^' . $this->_regex['uric'] . '*$/'; $status = @preg_match($pattern, $fragment); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: fragment validation failed'); } @@ -753,7 +734,6 @@ class Zend_Uri_Http extends Zend_Uri public function setFragment($fragment) { if ($this->validateFragment($fragment) === false) { - require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Fragment \"$fragment\" is not a valid HTTP fragment"); } diff --git a/library/vendor/Zend/Validate.php b/library/vendor/Zend/Validate.php index 81f80ce6b..ab2144cf2 100644 --- a/library/vendor/Zend/Validate.php +++ b/library/vendor/Zend/Validate.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Interface.php'; /** * @category Zend @@ -198,7 +197,6 @@ class Zend_Validate implements Zend_Validate_Interface $className = ucfirst($classBaseName); try { if (!class_exists($className, false)) { - require_once 'Zend/Loader.php'; foreach($namespaces as $namespace) { $class = $namespace . '_' . $className; $file = str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php'; @@ -240,7 +238,6 @@ class Zend_Validate implements Zend_Validate_Interface // fallthrough and continue for missing validation classes } - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Validate class not found from basename '$classBaseName'"); } @@ -251,7 +248,6 @@ class Zend_Validate implements Zend_Validate_Interface */ public static function getMessageLength() { - require_once 'Zend/Validate/Abstract.php'; return Zend_Validate_Abstract::getMessageLength(); } @@ -262,7 +258,6 @@ class Zend_Validate implements Zend_Validate_Interface */ public static function setMessageLength($length = -1) { - require_once 'Zend/Validate/Abstract.php'; Zend_Validate_Abstract::setMessageLength($length); } @@ -273,7 +268,6 @@ class Zend_Validate implements Zend_Validate_Interface */ public static function getDefaultTranslator($translator = null) { - require_once 'Zend/Validate/Abstract.php'; return Zend_Validate_Abstract::getDefaultTranslator(); } @@ -284,7 +278,6 @@ class Zend_Validate implements Zend_Validate_Interface */ public static function setDefaultTranslator($translator = null) { - require_once 'Zend/Validate/Abstract.php'; Zend_Validate_Abstract::setDefaultTranslator($translator); } } diff --git a/library/vendor/Zend/Validate/Abstract.php b/library/vendor/Zend/Validate/Abstract.php index 892f587e1..fa9d24644 100644 --- a/library/vendor/Zend/Validate/Abstract.php +++ b/library/vendor/Zend/Validate/Abstract.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Interface.php'; /** * @category Zend @@ -149,7 +148,6 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface } if (!isset($this->_messageTemplates[$messageKey])) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("No message template exists for key '$messageKey'"); } @@ -191,7 +189,6 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("No property exists by the name '$property'"); } @@ -354,7 +351,6 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid translator specified'); } return $this; @@ -401,7 +397,6 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface } elseif ($translator instanceof Zend_Translate) { self::$_defaultTranslator = $translator->getAdapter(); } else { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid translator specified'); } } @@ -414,7 +409,6 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface public static function getDefaultTranslator() { if (null === self::$_defaultTranslator) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $translator = Zend_Registry::get('Zend_Translate'); if ($translator instanceof Zend_Translate_Adapter) { diff --git a/library/vendor/Zend/Validate/Alnum.php b/library/vendor/Zend/Validate/Alnum.php index 718e9741d..c01dca634 100644 --- a/library/vendor/Zend/Validate/Alnum.php +++ b/library/vendor/Zend/Validate/Alnum.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -133,7 +132,6 @@ class Zend_Validate_Alnum extends Zend_Validate_Abstract /** * @see Zend_Filter_Alnum */ - require_once 'Zend/Filter/Alnum.php'; self::$_filter = new Zend_Filter_Alnum(); } diff --git a/library/vendor/Zend/Validate/Alpha.php b/library/vendor/Zend/Validate/Alpha.php index 958ee079a..c4a7ea617 100644 --- a/library/vendor/Zend/Validate/Alpha.php +++ b/library/vendor/Zend/Validate/Alpha.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -133,7 +132,6 @@ class Zend_Validate_Alpha extends Zend_Validate_Abstract /** * @see Zend_Filter_Alpha */ - require_once 'Zend/Filter/Alpha.php'; self::$_filter = new Zend_Filter_Alpha(); } diff --git a/library/vendor/Zend/Validate/Barcode.php b/library/vendor/Zend/Validate/Barcode.php index 16ba24e96..4e7a9f39a 100644 --- a/library/vendor/Zend/Validate/Barcode.php +++ b/library/vendor/Zend/Validate/Barcode.php @@ -22,12 +22,10 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; /** * @category Zend @@ -100,7 +98,6 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract if (array_key_exists('adapter', $adapter)) { $adapter = $adapter['adapter']; } else { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'adapter'"); } } @@ -132,7 +129,6 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract public function setAdapter($adapter, $options = null) { $adapter = ucfirst(strtolower($adapter)); - require_once 'Zend/Loader.php'; if (Zend_Loader::isReadable('Zend/Validate/Barcode/' . $adapter. '.php')) { $adapter = 'Zend_Validate_Barcode_' . $adapter; } @@ -143,7 +139,6 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract $this->_adapter = new $adapter($options); if (!$this->_adapter instanceof Zend_Validate_Barcode_AdapterInterface) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception( "Adapter " . $adapter . " does not implement Zend_Validate_Barcode_AdapterInterface" ); diff --git a/library/vendor/Zend/Validate/Barcode/AdapterAbstract.php b/library/vendor/Zend/Validate/Barcode/AdapterAbstract.php index 8bc312f05..7bdea8e18 100644 --- a/library/vendor/Zend/Validate/Barcode/AdapterAbstract.php +++ b/library/vendor/Zend/Validate/Barcode/AdapterAbstract.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterInterface */ -require_once 'Zend/Validate/Barcode/AdapterInterface.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Code25.php b/library/vendor/Zend/Validate/Barcode/Code25.php index 8cab339c9..a8168776f 100644 --- a/library/vendor/Zend/Validate/Barcode/Code25.php +++ b/library/vendor/Zend/Validate/Barcode/Code25.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Code25interleaved.php b/library/vendor/Zend/Validate/Barcode/Code25interleaved.php index e189d4914..c1c16cfbf 100644 --- a/library/vendor/Zend/Validate/Barcode/Code25interleaved.php +++ b/library/vendor/Zend/Validate/Barcode/Code25interleaved.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Code39.php b/library/vendor/Zend/Validate/Barcode/Code39.php index ad2f09444..811d2b28a 100644 --- a/library/vendor/Zend/Validate/Barcode/Code39.php +++ b/library/vendor/Zend/Validate/Barcode/Code39.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Code39ext.php b/library/vendor/Zend/Validate/Barcode/Code39ext.php index 53f520048..3a6b56808 100644 --- a/library/vendor/Zend/Validate/Barcode/Code39ext.php +++ b/library/vendor/Zend/Validate/Barcode/Code39ext.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Code93.php b/library/vendor/Zend/Validate/Barcode/Code93.php index e8a3f86e9..7989b5cce 100644 --- a/library/vendor/Zend/Validate/Barcode/Code93.php +++ b/library/vendor/Zend/Validate/Barcode/Code93.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Code93ext.php b/library/vendor/Zend/Validate/Barcode/Code93ext.php index 051ae8a7c..3d0ff2b20 100644 --- a/library/vendor/Zend/Validate/Barcode/Code93ext.php +++ b/library/vendor/Zend/Validate/Barcode/Code93ext.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Ean12.php b/library/vendor/Zend/Validate/Barcode/Ean12.php index 6e11d8f8c..3bcf35b7b 100644 --- a/library/vendor/Zend/Validate/Barcode/Ean12.php +++ b/library/vendor/Zend/Validate/Barcode/Ean12.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Ean13.php b/library/vendor/Zend/Validate/Barcode/Ean13.php index ffa9dc2a1..75789b880 100644 --- a/library/vendor/Zend/Validate/Barcode/Ean13.php +++ b/library/vendor/Zend/Validate/Barcode/Ean13.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Ean14.php b/library/vendor/Zend/Validate/Barcode/Ean14.php index edd495e20..2cb5a2ab1 100644 --- a/library/vendor/Zend/Validate/Barcode/Ean14.php +++ b/library/vendor/Zend/Validate/Barcode/Ean14.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Ean18.php b/library/vendor/Zend/Validate/Barcode/Ean18.php index 72333a6ad..892b4c853 100644 --- a/library/vendor/Zend/Validate/Barcode/Ean18.php +++ b/library/vendor/Zend/Validate/Barcode/Ean18.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Ean2.php b/library/vendor/Zend/Validate/Barcode/Ean2.php index 6f89f5ea9..159a5fba0 100644 --- a/library/vendor/Zend/Validate/Barcode/Ean2.php +++ b/library/vendor/Zend/Validate/Barcode/Ean2.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Ean5.php b/library/vendor/Zend/Validate/Barcode/Ean5.php index 3e17db754..2bba83399 100644 --- a/library/vendor/Zend/Validate/Barcode/Ean5.php +++ b/library/vendor/Zend/Validate/Barcode/Ean5.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Ean8.php b/library/vendor/Zend/Validate/Barcode/Ean8.php index fefb99322..f19b51e2c 100644 --- a/library/vendor/Zend/Validate/Barcode/Ean8.php +++ b/library/vendor/Zend/Validate/Barcode/Ean8.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Gtin12.php b/library/vendor/Zend/Validate/Barcode/Gtin12.php index 51d49b95b..e682bc071 100644 --- a/library/vendor/Zend/Validate/Barcode/Gtin12.php +++ b/library/vendor/Zend/Validate/Barcode/Gtin12.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Gtin13.php b/library/vendor/Zend/Validate/Barcode/Gtin13.php index 241d4356f..0ed60be4f 100644 --- a/library/vendor/Zend/Validate/Barcode/Gtin13.php +++ b/library/vendor/Zend/Validate/Barcode/Gtin13.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Gtin14.php b/library/vendor/Zend/Validate/Barcode/Gtin14.php index 50e15c911..3f43d882e 100644 --- a/library/vendor/Zend/Validate/Barcode/Gtin14.php +++ b/library/vendor/Zend/Validate/Barcode/Gtin14.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Identcode.php b/library/vendor/Zend/Validate/Barcode/Identcode.php index 6981c7ad2..9a8bd9d9e 100644 --- a/library/vendor/Zend/Validate/Barcode/Identcode.php +++ b/library/vendor/Zend/Validate/Barcode/Identcode.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Intelligentmail.php b/library/vendor/Zend/Validate/Barcode/Intelligentmail.php index 4ccd2d9d2..06518c124 100644 --- a/library/vendor/Zend/Validate/Barcode/Intelligentmail.php +++ b/library/vendor/Zend/Validate/Barcode/Intelligentmail.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Issn.php b/library/vendor/Zend/Validate/Barcode/Issn.php index 0fa745a13..7b6ff2d0a 100644 --- a/library/vendor/Zend/Validate/Barcode/Issn.php +++ b/library/vendor/Zend/Validate/Barcode/Issn.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Itf14.php b/library/vendor/Zend/Validate/Barcode/Itf14.php index e350ae081..fab7a423c 100644 --- a/library/vendor/Zend/Validate/Barcode/Itf14.php +++ b/library/vendor/Zend/Validate/Barcode/Itf14.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Leitcode.php b/library/vendor/Zend/Validate/Barcode/Leitcode.php index b41ac0baa..f523b900c 100644 --- a/library/vendor/Zend/Validate/Barcode/Leitcode.php +++ b/library/vendor/Zend/Validate/Barcode/Leitcode.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Planet.php b/library/vendor/Zend/Validate/Barcode/Planet.php index 4195194c3..74ff62c40 100644 --- a/library/vendor/Zend/Validate/Barcode/Planet.php +++ b/library/vendor/Zend/Validate/Barcode/Planet.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Postnet.php b/library/vendor/Zend/Validate/Barcode/Postnet.php index 38860c1f3..a66fb365e 100644 --- a/library/vendor/Zend/Validate/Barcode/Postnet.php +++ b/library/vendor/Zend/Validate/Barcode/Postnet.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Royalmail.php b/library/vendor/Zend/Validate/Barcode/Royalmail.php index 293107fcb..b17a0ea11 100644 --- a/library/vendor/Zend/Validate/Barcode/Royalmail.php +++ b/library/vendor/Zend/Validate/Barcode/Royalmail.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Sscc.php b/library/vendor/Zend/Validate/Barcode/Sscc.php index cba0230d1..2dde1a533 100644 --- a/library/vendor/Zend/Validate/Barcode/Sscc.php +++ b/library/vendor/Zend/Validate/Barcode/Sscc.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Upca.php b/library/vendor/Zend/Validate/Barcode/Upca.php index fa61375a2..8f894c958 100644 --- a/library/vendor/Zend/Validate/Barcode/Upca.php +++ b/library/vendor/Zend/Validate/Barcode/Upca.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Barcode/Upce.php b/library/vendor/Zend/Validate/Barcode/Upce.php index ad2854ecf..907bc0365 100644 --- a/library/vendor/Zend/Validate/Barcode/Upce.php +++ b/library/vendor/Zend/Validate/Barcode/Upce.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Between.php b/library/vendor/Zend/Validate/Between.php index 0bd200c1a..9532dff3c 100644 --- a/library/vendor/Zend/Validate/Between.php +++ b/library/vendor/Zend/Validate/Between.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -115,7 +114,6 @@ class Zend_Validate_Between extends Zend_Validate_Abstract } if (!array_key_exists('min', $options) || !array_key_exists('max', $options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option. 'min' and 'max' has to be given"); } diff --git a/library/vendor/Zend/Validate/Callback.php b/library/vendor/Zend/Validate/Callback.php index cb315d3a5..8029a5fcb 100644 --- a/library/vendor/Zend/Validate/Callback.php +++ b/library/vendor/Zend/Validate/Callback.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -88,7 +87,6 @@ class Zend_Validate_Callback extends Zend_Validate_Abstract } if (null === ($initializedCallack = $this->getCallback())) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('No callback registered'); } } @@ -112,7 +110,6 @@ class Zend_Validate_Callback extends Zend_Validate_Abstract public function setCallback($callback) { if (!is_callable($callback)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid callback given'); } $this->_callback = $callback; diff --git a/library/vendor/Zend/Validate/Ccnum.php b/library/vendor/Zend/Validate/Ccnum.php index 756e7b72e..3a3e1e1eb 100644 --- a/library/vendor/Zend/Validate/Ccnum.php +++ b/library/vendor/Zend/Validate/Ccnum.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -80,7 +79,6 @@ class Zend_Validate_Ccnum extends Zend_Validate_Abstract /** * @see Zend_Filter_Digits */ - require_once 'Zend/Filter/Digits.php'; self::$_filter = new Zend_Filter_Digits(); } diff --git a/library/vendor/Zend/Validate/CreditCard.php b/library/vendor/Zend/Validate/CreditCard.php index 80fa89d84..ca6816190 100644 --- a/library/vendor/Zend/Validate/CreditCard.php +++ b/library/vendor/Zend/Validate/CreditCard.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -227,7 +226,6 @@ class Zend_Validate_CreditCard extends Zend_Validate_Abstract public function setService($service) { if (!is_callable($service)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid callback given'); } @@ -299,7 +297,6 @@ class Zend_Validate_CreditCard extends Zend_Validate_Abstract if (!empty($this->_service)) { try { - require_once 'Zend/Validate/Callback.php'; $callback = new Zend_Validate_Callback($this->_service); $callback->setOptions($this->_type); if (!$callback->isValid($value)) { diff --git a/library/vendor/Zend/Validate/Date.php b/library/vendor/Zend/Validate/Date.php index 0b6004f84..257c26933 100644 --- a/library/vendor/Zend/Validate/Date.php +++ b/library/vendor/Zend/Validate/Date.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -93,7 +92,6 @@ class Zend_Validate_Date extends Zend_Validate_Abstract } if (!array_key_exists('locale', $options)) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $options['locale'] = Zend_Registry::get('Zend_Locale'); } @@ -122,7 +120,6 @@ class Zend_Validate_Date extends Zend_Validate_Abstract */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); return $this; } @@ -171,7 +168,6 @@ class Zend_Validate_Date extends Zend_Validate_Abstract if (($this->_format !== null) || ($this->_locale !== null) || is_array($value) || $value instanceof Zend_Date) { - require_once 'Zend/Date.php'; if (!Zend_Date::isDate($value, $this->_format, $this->_locale)) { if ($this->_checkFormat($value) === false) { $this->_error(self::FALSEFORMAT); @@ -208,7 +204,6 @@ class Zend_Validate_Date extends Zend_Validate_Abstract private function _checkFormat($value) { try { - require_once 'Zend/Locale/Format.php'; $parsed = Zend_Locale_Format::getDate($value, array( 'date_format' => $this->_format, 'format_type' => 'iso', 'fix_date' => false)); diff --git a/library/vendor/Zend/Validate/Db/Abstract.php b/library/vendor/Zend/Validate/Db/Abstract.php index 2ae9393ef..2c1fc30bf 100644 --- a/library/vendor/Zend/Validate/Db/Abstract.php +++ b/library/vendor/Zend/Validate/Db/Abstract.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Class for Database record validation @@ -122,12 +121,10 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract } if (!array_key_exists('table', $options) && !array_key_exists('schema', $options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Table or Schema option missing!'); } if (!array_key_exists('field', $options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Field option missing!'); } @@ -162,7 +159,6 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract if ($this->_adapter === null) { $this->_adapter = Zend_Db_Table_Abstract::getDefaultAdapter(); if (null === $this->_adapter) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('No database adapter present'); } } @@ -178,7 +174,6 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract public function setAdapter($adapter) { if (!($adapter instanceof Zend_Db_Adapter_Abstract)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Adapter option must be a database adapter!'); } diff --git a/library/vendor/Zend/Validate/Db/NoRecordExists.php b/library/vendor/Zend/Validate/Db/NoRecordExists.php index aa8dcc03d..34a23b5d7 100644 --- a/library/vendor/Zend/Validate/Db/NoRecordExists.php +++ b/library/vendor/Zend/Validate/Db/NoRecordExists.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Db_Abstract */ -require_once 'Zend/Validate/Db/Abstract.php'; /** * Confirms a record does not exist in a table. diff --git a/library/vendor/Zend/Validate/Db/RecordExists.php b/library/vendor/Zend/Validate/Db/RecordExists.php index 1a8c4e9dc..94d74e4df 100644 --- a/library/vendor/Zend/Validate/Db/RecordExists.php +++ b/library/vendor/Zend/Validate/Db/RecordExists.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Db_Abstract */ -require_once 'Zend/Validate/Db/Abstract.php'; /** * Confirms a record exists in a table. diff --git a/library/vendor/Zend/Validate/Digits.php b/library/vendor/Zend/Validate/Digits.php index 69d792371..1c10a9fba 100644 --- a/library/vendor/Zend/Validate/Digits.php +++ b/library/vendor/Zend/Validate/Digits.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -77,7 +76,6 @@ class Zend_Validate_Digits extends Zend_Validate_Abstract } if (null === self::$_filter) { - require_once 'Zend/Filter/Digits.php'; self::$_filter = new Zend_Filter_Digits(); } diff --git a/library/vendor/Zend/Validate/EmailAddress.php b/library/vendor/Zend/Validate/EmailAddress.php index 6b7235567..e5e9d04c4 100644 --- a/library/vendor/Zend/Validate/EmailAddress.php +++ b/library/vendor/Zend/Validate/EmailAddress.php @@ -22,12 +22,10 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Validate_Hostname */ -require_once 'Zend/Validate/Hostname.php'; /** * @category Zend @@ -288,7 +286,6 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract public function setValidateMx($mx) { if ((bool) $mx && !$this->validateMxSupported()) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('MX checking not available on this system'); } diff --git a/library/vendor/Zend/Validate/Exception.php b/library/vendor/Zend/Validate/Exception.php index bde8d56a5..12d1e5c73 100644 --- a/library/vendor/Zend/Validate/Exception.php +++ b/library/vendor/Zend/Validate/Exception.php @@ -22,7 +22,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/File/Count.php b/library/vendor/Zend/Validate/File/Count.php index 4b9250aa8..eee298d14 100644 --- a/library/vendor/Zend/Validate/File/Count.php +++ b/library/vendor/Zend/Validate/File/Count.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validator for counting all given files @@ -110,7 +109,6 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract } elseif (is_string($options) || is_numeric($options)) { $options = array('max' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -152,13 +150,11 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract } if (!is_string($min) and !is_numeric($min)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $min = (integer) $min; if (($this->_max !== null) && ($min > $this->_max)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum file count, but $min >" . " {$this->_max}"); } @@ -191,13 +187,11 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract } if (!is_string($max) and !is_numeric($max)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $max = (integer) $max; if (($this->_min !== null) && ($max < $this->_min)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum file count, but " . "$max < {$this->_min}"); } diff --git a/library/vendor/Zend/Validate/File/Crc32.php b/library/vendor/Zend/Validate/File/Crc32.php index 1260ff71a..c932d5fd9 100644 --- a/library/vendor/Zend/Validate/File/Crc32.php +++ b/library/vendor/Zend/Validate/File/Crc32.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_File_Hash */ -require_once 'Zend/Validate/File/Hash.php'; /** * Validator for the crc32 hash of given files @@ -70,7 +69,6 @@ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -157,7 +155,6 @@ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/vendor/Zend/Validate/File/ExcludeExtension.php b/library/vendor/Zend/Validate/File/ExcludeExtension.php index 584b9f02f..7ad0e6f6d 100644 --- a/library/vendor/Zend/Validate/File/ExcludeExtension.php +++ b/library/vendor/Zend/Validate/File/ExcludeExtension.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/File/Extension.php'; /** * Validator for the excluding file extensions @@ -61,7 +60,6 @@ class Zend_Validate_File_ExcludeExtension extends Zend_Validate_File_Extension public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/vendor/Zend/Validate/File/ExcludeMimeType.php b/library/vendor/Zend/Validate/File/ExcludeMimeType.php index 3c7765c0a..f12bc8daa 100644 --- a/library/vendor/Zend/Validate/File/ExcludeMimeType.php +++ b/library/vendor/Zend/Validate/File/ExcludeMimeType.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_File_MimeType */ -require_once 'Zend/Validate/File/MimeType.php'; /** * Validator for the mime type of a file @@ -68,7 +67,6 @@ class Zend_Validate_File_ExcludeMimeType extends Zend_Validate_File_MimeType } // Is file readable ? - require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_READABLE); } diff --git a/library/vendor/Zend/Validate/File/Exists.php b/library/vendor/Zend/Validate/File/Exists.php index 829c8fe33..153cead5d 100644 --- a/library/vendor/Zend/Validate/File/Exists.php +++ b/library/vendor/Zend/Validate/File/Exists.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validator which checks if the file already exists in the directory @@ -72,7 +71,6 @@ class Zend_Validate_File_Exists extends Zend_Validate_Abstract } else if (is_string($directory)) { $directory = explode(',', $directory); } else if (!is_array($directory)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -122,7 +120,6 @@ class Zend_Validate_File_Exists extends Zend_Validate_Abstract if (is_string($directory)) { $directory = explode(',', $directory); } else if (!is_array($directory)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } diff --git a/library/vendor/Zend/Validate/File/Extension.php b/library/vendor/Zend/Validate/File/Extension.php index b1e88a3ed..7a6041f7a 100644 --- a/library/vendor/Zend/Validate/File/Extension.php +++ b/library/vendor/Zend/Validate/File/Extension.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validator for the file extension of a file @@ -187,7 +186,6 @@ class Zend_Validate_File_Extension extends Zend_Validate_Abstract public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/vendor/Zend/Validate/File/FilesSize.php b/library/vendor/Zend/Validate/File/FilesSize.php index a358f6251..fcdbdf96f 100644 --- a/library/vendor/Zend/Validate/File/FilesSize.php +++ b/library/vendor/Zend/Validate/File/FilesSize.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_File_Size */ -require_once 'Zend/Validate/File/Size.php'; /** * Validator for the size of all files which will be validated in sum @@ -76,7 +75,6 @@ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size } elseif (is_scalar($options)) { $options = array('max' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -104,7 +102,6 @@ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size */ public function isValid($value, $file = null) { - require_once 'Zend/Loader.php'; if (is_string($value)) { $value = array($value); } diff --git a/library/vendor/Zend/Validate/File/Hash.php b/library/vendor/Zend/Validate/File/Hash.php index 2bf34dabe..2a669fd83 100644 --- a/library/vendor/Zend/Validate/File/Hash.php +++ b/library/vendor/Zend/Validate/File/Hash.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validator for the hash of given files @@ -70,7 +69,6 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -116,7 +114,6 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract if (is_string($options)) { $options = array($options); } else if (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("False parameter given"); } @@ -129,7 +126,6 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract } if (!in_array($algorithm, $known)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Unknown algorithm '{$algorithm}'"); } @@ -152,7 +148,6 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/vendor/Zend/Validate/File/ImageSize.php b/library/vendor/Zend/Validate/File/ImageSize.php index b5f18d989..65e057d04 100644 --- a/library/vendor/Zend/Validate/File/ImageSize.php +++ b/library/vendor/Zend/Validate/File/ImageSize.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validator for the image size of a image file @@ -140,7 +139,6 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract } } } else if (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -205,7 +203,6 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract { if (isset($options['minwidth'])) { if (($this->_maxwidth !== null) and ($options['minwidth'] > $this->_maxwidth)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum image width must be less than or equal to the " . " maximum image width, but {$options['minwidth']} > {$this->_maxwidth}"); } @@ -213,7 +210,6 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract if (isset($options['maxheight'])) { if (($this->_maxheight !== null) and ($options['minheight'] > $this->_maxheight)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum image height must be less than or equal to the " . " maximum image height, but {$options['minheight']} > {$this->_maxheight}"); } @@ -242,7 +238,6 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract { if (isset($options['maxwidth'])) { if (($this->_minwidth !== null) and ($options['maxwidth'] < $this->_minwidth)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum image width must be greater than or equal to the " . "minimum image width, but {$options['maxwidth']} < {$this->_minwidth}"); } @@ -250,7 +245,6 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract if (isset($options['maxheight'])) { if (($this->_minheight !== null) and ($options['maxheight'] < $this->_minheight)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum image height must be greater than or equal to the " . "minimum image height, but {$options['maxheight']} < {$this->_minwidth}"); } @@ -308,7 +302,6 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_READABLE); } diff --git a/library/vendor/Zend/Validate/File/IsCompressed.php b/library/vendor/Zend/Validate/File/IsCompressed.php index 6a52a74e2..2478b4f0b 100644 --- a/library/vendor/Zend/Validate/File/IsCompressed.php +++ b/library/vendor/Zend/Validate/File/IsCompressed.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_File_MimeType */ -require_once 'Zend/Validate/File/MimeType.php'; /** * Validator which checks if the file already exists in the directory diff --git a/library/vendor/Zend/Validate/File/IsImage.php b/library/vendor/Zend/Validate/File/IsImage.php index b9ba75cdd..4fe2dce48 100644 --- a/library/vendor/Zend/Validate/File/IsImage.php +++ b/library/vendor/Zend/Validate/File/IsImage.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_File_MimeType */ -require_once 'Zend/Validate/File/MimeType.php'; /** * Validator which checks if the file already exists in the directory diff --git a/library/vendor/Zend/Validate/File/Md5.php b/library/vendor/Zend/Validate/File/Md5.php index af86c68f4..2e3d6e2b3 100644 --- a/library/vendor/Zend/Validate/File/Md5.php +++ b/library/vendor/Zend/Validate/File/Md5.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_File_Hash */ -require_once 'Zend/Validate/File/Hash.php'; /** * Validator for the md5 hash of given files @@ -72,7 +71,6 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -161,7 +159,6 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/vendor/Zend/Validate/File/MimeType.php b/library/vendor/Zend/Validate/File/MimeType.php index ab97eb2a5..57d86703c 100644 --- a/library/vendor/Zend/Validate/File/MimeType.php +++ b/library/vendor/Zend/Validate/File/MimeType.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validator for the mime type of a file @@ -136,7 +135,6 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract } elseif (is_string($mimetype)) { $mimetype = explode(',', $mimetype); } elseif (!is_array($mimetype)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Invalid options to validator provided"); } @@ -172,7 +170,6 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract !(@ini_get("safe_mode") == 'On' || @ini_get("safe_mode") === 1) && $this->shouldTryCommonMagicFiles() // @see ZF-11784 ) { - require_once 'Zend/Validate/Exception.php'; foreach ($this->_magicFiles as $file) { // supressing errors which are thrown due to openbase_dir restrictions try { @@ -209,10 +206,8 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract $this->_magicfile = null; } else if (!(class_exists('finfo', false))) { $this->_magicfile = null; - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Magicfile can not be set. There is no finfo extension installed'); } else if (!is_file($file) || !is_readable($file)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('The given magicfile can not be read'); } else { $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME; @@ -221,7 +216,6 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract restore_error_handler(); if (empty($this->_finfo)) { $this->_finfo = null; - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception( sprintf('The given magicfile ("%s") is not accepted by finfo', $file), null, @@ -327,7 +321,6 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract if (is_string($mimetype)) { $mimetype = explode(',', $mimetype); } elseif (!is_array($mimetype)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Invalid options to validator provided"); } @@ -376,7 +369,6 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract } // Is file readable ? - require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_READABLE); } diff --git a/library/vendor/Zend/Validate/File/NotExists.php b/library/vendor/Zend/Validate/File/NotExists.php index f0b39e6bd..033756140 100644 --- a/library/vendor/Zend/Validate/File/NotExists.php +++ b/library/vendor/Zend/Validate/File/NotExists.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_File_Exists */ -require_once 'Zend/Validate/File/Exists.php'; /** * Validator which checks if the destination file does not exist diff --git a/library/vendor/Zend/Validate/File/Sha1.php b/library/vendor/Zend/Validate/File/Sha1.php index f0d41f40d..6d78cac2e 100644 --- a/library/vendor/Zend/Validate/File/Sha1.php +++ b/library/vendor/Zend/Validate/File/Sha1.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_File_Hash */ -require_once 'Zend/Validate/File/Hash.php'; /** * Validator for the sha1 hash of given files @@ -72,7 +71,6 @@ class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -159,7 +157,6 @@ class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/vendor/Zend/Validate/File/Size.php b/library/vendor/Zend/Validate/File/Size.php index 9251599fb..af3a0128b 100644 --- a/library/vendor/Zend/Validate/File/Size.php +++ b/library/vendor/Zend/Validate/File/Size.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validator for the maximum size of a file up to a max of 2GB @@ -107,7 +106,6 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract } elseif (is_string($options) || is_numeric($options)) { $options = array('max' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -181,14 +179,12 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract public function setMin($min) { if (!is_string($min) and !is_numeric($min)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $min = (integer) $this->_fromByteString($min); $max = $this->getMax(true); if (($max !== null) && ($min > $max)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum filesize, but $min >" . " $max"); } @@ -223,14 +219,12 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract public function setMax($max) { if (!is_string($max) && !is_numeric($max)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $max = (integer) $this->_fromByteString($max); $min = $this->getMin(true); if (($min !== null) && ($max < $min)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum filesize, but " . "$max < $min"); } @@ -274,7 +268,6 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/vendor/Zend/Validate/File/Upload.php b/library/vendor/Zend/Validate/File/Upload.php index dff2de0b0..842f1dc1e 100644 --- a/library/vendor/Zend/Validate/File/Upload.php +++ b/library/vendor/Zend/Validate/File/Upload.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validator for the maximum size of a file up to a max of 2GB @@ -112,7 +111,6 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract } if (count($return) === 0) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The file '$file' was not found"); } diff --git a/library/vendor/Zend/Validate/File/WordCount.php b/library/vendor/Zend/Validate/File/WordCount.php index 88c8646c0..ad2abbcec 100644 --- a/library/vendor/Zend/Validate/File/WordCount.php +++ b/library/vendor/Zend/Validate/File/WordCount.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_File_Count */ -require_once 'Zend/Validate/File/Count.php'; /** * Validator for counting all words in a file @@ -64,7 +63,6 @@ class Zend_Validate_File_WordCount extends Zend_Validate_File_Count public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/vendor/Zend/Validate/Float.php b/library/vendor/Zend/Validate/Float.php index 96fdf6a5e..f34efa1a3 100644 --- a/library/vendor/Zend/Validate/Float.php +++ b/library/vendor/Zend/Validate/Float.php @@ -22,12 +22,10 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Locale_Format */ -require_once 'Zend/Locale/Format.php'; /** * @category Zend @@ -70,7 +68,6 @@ class Zend_Validate_Float extends Zend_Validate_Abstract } if (empty($locale)) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -94,7 +91,6 @@ class Zend_Validate_Float extends Zend_Validate_Abstract */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); return $this; } diff --git a/library/vendor/Zend/Validate/GreaterThan.php b/library/vendor/Zend/Validate/GreaterThan.php index 785b20341..91b8d6d8b 100644 --- a/library/vendor/Zend/Validate/GreaterThan.php +++ b/library/vendor/Zend/Validate/GreaterThan.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -72,7 +71,6 @@ class Zend_Validate_GreaterThan extends Zend_Validate_Abstract if (array_key_exists('min', $min)) { $min = $min['min']; } else { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'min'"); } } diff --git a/library/vendor/Zend/Validate/Hex.php b/library/vendor/Zend/Validate/Hex.php index de00caa70..f58997fad 100644 --- a/library/vendor/Zend/Validate/Hex.php +++ b/library/vendor/Zend/Validate/Hex.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/Hostname.php b/library/vendor/Zend/Validate/Hostname.php index fa7631ae5..7c4eb5656 100644 --- a/library/vendor/Zend/Validate/Hostname.php +++ b/library/vendor/Zend/Validate/Hostname.php @@ -22,12 +22,10 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Validate_Ip */ -require_once 'Zend/Validate/Ip.php'; /** * Please note there are two standalone test scripts for testing IDN characters due to problems diff --git a/library/vendor/Zend/Validate/Iban.php b/library/vendor/Zend/Validate/Iban.php index 96da3e67b..7ff58f275 100644 --- a/library/vendor/Zend/Validate/Iban.php +++ b/library/vendor/Zend/Validate/Iban.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validates IBAN Numbers (International Bank Account Numbers) @@ -150,7 +149,6 @@ class Zend_Validate_Iban extends Zend_Validate_Abstract } if (empty($locale)) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -180,10 +178,8 @@ class Zend_Validate_Iban extends Zend_Validate_Abstract public function setLocale($locale = null) { if ($locale !== false) { - require_once 'Zend/Locale.php'; $locale = Zend_Locale::findLocale($locale); if (strlen($locale) < 4) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Region must be given for IBAN validation'); } } diff --git a/library/vendor/Zend/Validate/Identical.php b/library/vendor/Zend/Validate/Identical.php index 79c62226d..e3fbc9d64 100644 --- a/library/vendor/Zend/Validate/Identical.php +++ b/library/vendor/Zend/Validate/Identical.php @@ -20,7 +20,6 @@ */ /** @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/InArray.php b/library/vendor/Zend/Validate/InArray.php index b9cc5dbeb..9a0e9f35d 100644 --- a/library/vendor/Zend/Validate/InArray.php +++ b/library/vendor/Zend/Validate/InArray.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -73,7 +72,6 @@ class Zend_Validate_InArray extends Zend_Validate_Abstract if ($options instanceof Zend_Config) { $options = $options->toArray(); } else if (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Array expected as parameter'); } else { $count = func_num_args(); diff --git a/library/vendor/Zend/Validate/Int.php b/library/vendor/Zend/Validate/Int.php index f8bea6f76..0a186d78e 100644 --- a/library/vendor/Zend/Validate/Int.php +++ b/library/vendor/Zend/Validate/Int.php @@ -22,12 +22,10 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Locale_Format */ -require_once 'Zend/Locale/Format.php'; /** * @category Zend @@ -70,7 +68,6 @@ class Zend_Validate_Int extends Zend_Validate_Abstract } if (empty($locale)) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -96,7 +93,6 @@ class Zend_Validate_Int extends Zend_Validate_Abstract */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); return $this; } diff --git a/library/vendor/Zend/Validate/Ip.php b/library/vendor/Zend/Validate/Ip.php index d62b8c474..6d3f8adf7 100644 --- a/library/vendor/Zend/Validate/Ip.php +++ b/library/vendor/Zend/Validate/Ip.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -104,7 +103,6 @@ class Zend_Validate_Ip extends Zend_Validate_Abstract } if (!$this->_options['allowipv4'] && !$this->_options['allowipv6']) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Nothing to validate. Check your options'); } diff --git a/library/vendor/Zend/Validate/Isbn.php b/library/vendor/Zend/Validate/Isbn.php index df0dc029b..a501e99e0 100644 --- a/library/vendor/Zend/Validate/Isbn.php +++ b/library/vendor/Zend/Validate/Isbn.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -79,7 +78,6 @@ class Zend_Validate_Isbn extends Zend_Validate_Abstract /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options provided.'); } @@ -227,7 +225,6 @@ class Zend_Validate_Isbn extends Zend_Validate_Abstract /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid ISBN separator.'); } @@ -259,7 +256,6 @@ class Zend_Validate_Isbn extends Zend_Validate_Abstract /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid ISBN type'); } diff --git a/library/vendor/Zend/Validate/Ldap/Dn.php b/library/vendor/Zend/Validate/Ldap/Dn.php index 04581c1a7..a784487ed 100644 --- a/library/vendor/Zend/Validate/Ldap/Dn.php +++ b/library/vendor/Zend/Validate/Ldap/Dn.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend diff --git a/library/vendor/Zend/Validate/LessThan.php b/library/vendor/Zend/Validate/LessThan.php index 07b9b80ae..11885e3c7 100644 --- a/library/vendor/Zend/Validate/LessThan.php +++ b/library/vendor/Zend/Validate/LessThan.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -71,7 +70,6 @@ class Zend_Validate_LessThan extends Zend_Validate_Abstract if (array_key_exists('max', $max)) { $max = $max['max']; } else { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'max'"); } } diff --git a/library/vendor/Zend/Validate/NotEmpty.php b/library/vendor/Zend/Validate/NotEmpty.php index 106d40847..93f36dbd9 100644 --- a/library/vendor/Zend/Validate/NotEmpty.php +++ b/library/vendor/Zend/Validate/NotEmpty.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -139,7 +138,6 @@ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract } if (!is_int($type) || ($type < 0) || ($type > self::ALL)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Unknown type'); } diff --git a/library/vendor/Zend/Validate/PostCode.php b/library/vendor/Zend/Validate/PostCode.php index 5d9ea5109..ffcbf1bb5 100644 --- a/library/vendor/Zend/Validate/PostCode.php +++ b/library/vendor/Zend/Validate/PostCode.php @@ -22,12 +22,10 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Locale_Format */ -require_once 'Zend/Locale/Format.php'; /** * @category Zend @@ -78,7 +76,6 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract } if (empty($options)) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $this->setLocale(Zend_Registry::get('Zend_Locale')); } @@ -98,7 +95,6 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract $format = $this->getFormat(); if (empty($format)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("A postcode-format string has to be given for validation"); } } @@ -123,12 +119,10 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); $locale = new Zend_Locale($this->_locale); $region = $locale->getRegion(); if (empty($region)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Unable to detect a region for the locale '$locale'"); } @@ -139,7 +133,6 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract ); if (empty($format)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Unable to detect a postcode format for the region '{$locale->getRegion()}'"); } @@ -167,7 +160,6 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract public function setFormat($format) { if (empty($format) || !is_string($format)) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("A postcode-format string has to be given for validation"); } diff --git a/library/vendor/Zend/Validate/Regex.php b/library/vendor/Zend/Validate/Regex.php index ac3fbf6f6..337e2ab25 100644 --- a/library/vendor/Zend/Validate/Regex.php +++ b/library/vendor/Zend/Validate/Regex.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -76,7 +75,6 @@ class Zend_Validate_Regex extends Zend_Validate_Abstract if (array_key_exists('pattern', $pattern)) { $pattern = $pattern['pattern']; } else { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'pattern'"); } } @@ -107,7 +105,6 @@ class Zend_Validate_Regex extends Zend_Validate_Abstract $status = @preg_match($this->_pattern, "Test"); if (false === $status) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Internal error while using the pattern '$this->_pattern'"); } diff --git a/library/vendor/Zend/Validate/Sitemap/Changefreq.php b/library/vendor/Zend/Validate/Sitemap/Changefreq.php index f574e5fe1..376628094 100644 --- a/library/vendor/Zend/Validate/Sitemap/Changefreq.php +++ b/library/vendor/Zend/Validate/Sitemap/Changefreq.php @@ -23,7 +23,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validates whether a given value is valid as a sitemap value diff --git a/library/vendor/Zend/Validate/Sitemap/Lastmod.php b/library/vendor/Zend/Validate/Sitemap/Lastmod.php index adb95e31d..a28861336 100644 --- a/library/vendor/Zend/Validate/Sitemap/Lastmod.php +++ b/library/vendor/Zend/Validate/Sitemap/Lastmod.php @@ -23,7 +23,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validates whether a given value is valid as a sitemap value diff --git a/library/vendor/Zend/Validate/Sitemap/Loc.php b/library/vendor/Zend/Validate/Sitemap/Loc.php index b67d806a7..03b171246 100644 --- a/library/vendor/Zend/Validate/Sitemap/Loc.php +++ b/library/vendor/Zend/Validate/Sitemap/Loc.php @@ -23,12 +23,10 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; /** * Validates whether a given value is valid as a sitemap value diff --git a/library/vendor/Zend/Validate/Sitemap/Priority.php b/library/vendor/Zend/Validate/Sitemap/Priority.php index 87dd6bbb2..ac2d6e098 100644 --- a/library/vendor/Zend/Validate/Sitemap/Priority.php +++ b/library/vendor/Zend/Validate/Sitemap/Priority.php @@ -23,7 +23,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * Validates whether a given value is valid as a sitemap value diff --git a/library/vendor/Zend/Validate/StringLength.php b/library/vendor/Zend/Validate/StringLength.php index 70cd421d8..732df0e30 100644 --- a/library/vendor/Zend/Validate/StringLength.php +++ b/library/vendor/Zend/Validate/StringLength.php @@ -22,7 +22,6 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -137,7 +136,6 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum length, but $min >" . " $this->_max"); } @@ -170,7 +168,6 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum length, but " . "$max < $this->_min"); } else { @@ -208,7 +205,6 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract $result = ini_set('default_charset', $encoding); } if (!$result) { - require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Given encoding not supported on this OS!'); } diff --git a/library/vendor/Zend/View.php b/library/vendor/Zend/View.php index e6bf2931d..3d8c917eb 100644 --- a/library/vendor/Zend/View.php +++ b/library/vendor/Zend/View.php @@ -23,7 +23,6 @@ /** * Abstract master class for extension. */ -require_once 'Zend/View/Abstract.php'; /** @@ -61,7 +60,6 @@ class Zend_View extends Zend_View_Abstract $this->_useViewStream = (bool) ini_get('short_open_tag') ? false : true; if ($this->_useViewStream) { if (!in_array('zend.view', stream_get_wrappers())) { - require_once 'Zend/View/Stream.php'; stream_wrapper_register('zend.view', 'Zend_View_Stream'); } } diff --git a/library/vendor/Zend/View/Abstract.php b/library/vendor/Zend/View/Abstract.php index aa8db8ae3..571830cf0 100644 --- a/library/vendor/Zend/View/Abstract.php +++ b/library/vendor/Zend/View/Abstract.php @@ -20,13 +20,10 @@ */ /** @see Zend_Loader */ -require_once 'Zend/Loader.php'; /** @see Zend_Loader_PluginLoader */ -require_once 'Zend/Loader/PluginLoader.php'; /** @see Zend_View_Interface */ -require_once 'Zend/View/Interface.php'; /** * Abstract class for Zend_View to help enforce private constructs. @@ -309,7 +306,6 @@ abstract class Zend_View_Abstract implements Zend_View_Interface return; } - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Setting private or protected class members is not allowed'); $e->setView($this); throw $e; @@ -473,7 +469,6 @@ abstract class Zend_View_Abstract implements Zend_View_Interface { $type = strtolower($type); if (!in_array($type, $this->_loaderTypes)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Invalid plugin loader type "%s"', $type)); $e->setView($this); throw $e; @@ -493,7 +488,6 @@ abstract class Zend_View_Abstract implements Zend_View_Interface { $type = strtolower($type); if (!in_array($type, $this->_loaderTypes)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Invalid plugin loader type "%s"; cannot retrieve', $type)); $e->setView($this); throw $e; @@ -581,7 +575,6 @@ abstract class Zend_View_Abstract implements Zend_View_Interface public function registerHelper($helper, $name) { if (!is_object($helper)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('View helper must be an object'); $e->setView($this); throw $e; @@ -589,7 +582,6 @@ abstract class Zend_View_Abstract implements Zend_View_Interface if (!$helper instanceof Zend_View_Interface) { if (!method_exists($helper, $name)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( 'View helper must implement Zend_View_Interface or have a method matching the name provided' ); @@ -802,7 +794,6 @@ abstract class Zend_View_Abstract implements Zend_View_Interface if (is_string($spec)) { // assign by name and value if ('_' == substr($spec, 0, 1)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Setting private or protected class members is not allowed'); $e->setView($this); throw $e; @@ -819,13 +810,11 @@ abstract class Zend_View_Abstract implements Zend_View_Interface $this->$key = $val; } if ($error) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Setting private or protected class members is not allowed'); $e->setView($this); throw $e; } } else { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('assign() expects a string or array, received ' . gettype($spec)); $e->setView($this); throw $e; @@ -962,14 +951,12 @@ abstract class Zend_View_Abstract implements Zend_View_Interface protected function _script($name) { if ($this->isLfiProtectionOn() && preg_match('#\.\.[\\\/]#', $name)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Requested scripts may not include parent directory traversal ("../", "..\\" notation)'); $e->setView($this); throw $e; } if (0 == count($this->_path['script'])) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('no view script directory set; unable to determine location for view script'); $e->setView($this); throw $e; @@ -981,7 +968,6 @@ abstract class Zend_View_Abstract implements Zend_View_Interface } } - require_once 'Zend/View/Exception.php'; $message = "script '$name' not found in path (" . implode(PATH_SEPARATOR, $this->_path['script']) . ")"; diff --git a/library/vendor/Zend/View/Exception.php b/library/vendor/Zend/View/Exception.php index cc881a827..6eabf491c 100644 --- a/library/vendor/Zend/View/Exception.php +++ b/library/vendor/Zend/View/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/View/Helper/Abstract.php b/library/vendor/Zend/View/Helper/Abstract.php index e0f9311e3..4c2d6f406 100644 --- a/library/vendor/Zend/View/Helper/Abstract.php +++ b/library/vendor/Zend/View/Helper/Abstract.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_Interface */ -require_once 'Zend/View/Helper/Interface.php'; /** * @category Zend diff --git a/library/vendor/Zend/View/Helper/Action.php b/library/vendor/Zend/View/Helper/Action.php index 5f37431d8..8bacc41cd 100644 --- a/library/vendor/Zend/View/Helper/Action.php +++ b/library/vendor/Zend/View/Helper/Action.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for rendering output of a controller action @@ -65,7 +64,6 @@ class Zend_View_Helper_Action extends Zend_View_Helper_Abstract $front = Zend_Controller_Front::getInstance(); $modules = $front->getControllerDirectory(); if (empty($modules)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Action helper depends on valid front controller instance'); $e->setView($this->view); throw $e; @@ -75,7 +73,6 @@ class Zend_View_Helper_Action extends Zend_View_Helper_Abstract $response = $front->getResponse(); if (empty($request) || empty($response)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Action view helper requires both a registered request and response object in the front controller instance'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/BaseUrl.php b/library/vendor/Zend/View/Helper/BaseUrl.php index a04dc80d1..f42c6a9f2 100644 --- a/library/vendor/Zend/View/Helper/BaseUrl.php +++ b/library/vendor/Zend/View/Helper/BaseUrl.php @@ -21,7 +21,6 @@ */ /** @see Zend_View_Helper_Abstract */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for retrieving the BaseUrl @@ -82,7 +81,6 @@ class Zend_View_Helper_BaseUrl extends Zend_View_Helper_Abstract { if ($this->_baseUrl === null) { /** @see Zend_Controller_Front */ - require_once 'Zend/Controller/Front.php'; $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl(); // Remove scriptname, eg. index.php from baseUrl diff --git a/library/vendor/Zend/View/Helper/Currency.php b/library/vendor/Zend/View/Helper/Currency.php index b74dc0a6c..3ce7e3583 100644 --- a/library/vendor/Zend/View/Helper/Currency.php +++ b/library/vendor/Zend/View/Helper/Currency.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Currency view helper @@ -49,7 +48,6 @@ class Zend_View_Helper_Currency extends Zend_View_Helper_Abstract public function __construct($currency = null) { if ($currency === null) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Currency')) { $currency = Zend_Registry::get('Zend_Currency'); } @@ -73,7 +71,6 @@ class Zend_View_Helper_Currency extends Zend_View_Helper_Abstract } if (is_string($currency) || ($currency instanceof Zend_Locale)) { - require_once 'Zend/Locale.php'; if (Zend_Locale::isLocale($currency)) { $currency = array('locale' => $currency); } @@ -100,7 +97,6 @@ class Zend_View_Helper_Currency extends Zend_View_Helper_Abstract public function setCurrency($currency = null) { if (!$currency instanceof Zend_Currency) { - require_once 'Zend/Currency.php'; $currency = new Zend_Currency($currency); } $this->_currency = $currency; diff --git a/library/vendor/Zend/View/Helper/DeclareVars.php b/library/vendor/Zend/View/Helper/DeclareVars.php index e6f0de9ca..259ffc7be 100644 --- a/library/vendor/Zend/View/Helper/DeclareVars.php +++ b/library/vendor/Zend/View/Helper/DeclareVars.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for declaring default values of template variables diff --git a/library/vendor/Zend/View/Helper/Doctype.php b/library/vendor/Zend/View/Helper/Doctype.php index 49aba6f0e..4e9cd0655 100644 --- a/library/vendor/Zend/View/Helper/Doctype.php +++ b/library/vendor/Zend/View/Helper/Doctype.php @@ -21,10 +21,8 @@ */ /** Zend_Registry */ -require_once 'Zend/Registry.php'; /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for setting and retrieving the doctype @@ -132,7 +130,6 @@ class Zend_View_Helper_Doctype extends Zend_View_Helper_Abstract break; default: if (substr($doctype, 0, 9) != 'setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/Fieldset.php b/library/vendor/Zend/View/Helper/Fieldset.php index e287eefc9..915c3fdcc 100644 --- a/library/vendor/Zend/View/Helper/Fieldset.php +++ b/library/vendor/Zend/View/Helper/Fieldset.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_FormElement */ -require_once 'Zend/View/Helper/FormElement.php'; /** * Helper for rendering fieldsets diff --git a/library/vendor/Zend/View/Helper/Form.php b/library/vendor/Zend/View/Helper/Form.php index a8d786be5..1e5dffa32 100644 --- a/library/vendor/Zend/View/Helper/Form.php +++ b/library/vendor/Zend/View/Helper/Form.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_FormElement */ -require_once 'Zend/View/Helper/FormElement.php'; /** * Helper for rendering HTML forms diff --git a/library/vendor/Zend/View/Helper/FormButton.php b/library/vendor/Zend/View/Helper/FormButton.php index 6024136a5..435e16d2d 100644 --- a/library/vendor/Zend/View/Helper/FormButton.php +++ b/library/vendor/Zend/View/Helper/FormButton.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormCheckbox.php b/library/vendor/Zend/View/Helper/FormCheckbox.php index 1789b656f..3b9be34e0 100644 --- a/library/vendor/Zend/View/Helper/FormCheckbox.php +++ b/library/vendor/Zend/View/Helper/FormCheckbox.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormElement.php b/library/vendor/Zend/View/Helper/FormElement.php index f6656afdd..816018572 100644 --- a/library/vendor/Zend/View/Helper/FormElement.php +++ b/library/vendor/Zend/View/Helper/FormElement.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_HtmlElement */ -require_once 'Zend/View/Helper/HtmlElement.php'; /** * Base helper for form elements. Extend this, don't use it on its own. @@ -66,7 +65,6 @@ abstract class Zend_View_Helper_FormElement extends Zend_View_Helper_HtmlElement } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid translator specified'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/FormErrors.php b/library/vendor/Zend/View/Helper/FormErrors.php index f46675a9f..7ed8d7340 100644 --- a/library/vendor/Zend/View/Helper/FormErrors.php +++ b/library/vendor/Zend/View/Helper/FormErrors.php @@ -23,7 +23,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormFile.php b/library/vendor/Zend/View/Helper/FormFile.php index c9b9aab52..2a40bd28d 100644 --- a/library/vendor/Zend/View/Helper/FormFile.php +++ b/library/vendor/Zend/View/Helper/FormFile.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormHidden.php b/library/vendor/Zend/View/Helper/FormHidden.php index 33a4c28f9..cbad00199 100644 --- a/library/vendor/Zend/View/Helper/FormHidden.php +++ b/library/vendor/Zend/View/Helper/FormHidden.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormImage.php b/library/vendor/Zend/View/Helper/FormImage.php index c10f52ca4..67849949e 100644 --- a/library/vendor/Zend/View/Helper/FormImage.php +++ b/library/vendor/Zend/View/Helper/FormImage.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormLabel.php b/library/vendor/Zend/View/Helper/FormLabel.php index 379062a7a..ffa25f2ee 100644 --- a/library/vendor/Zend/View/Helper/FormLabel.php +++ b/library/vendor/Zend/View/Helper/FormLabel.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_FormElement **/ -require_once 'Zend/View/Helper/FormElement.php'; /** * Form label helper diff --git a/library/vendor/Zend/View/Helper/FormMultiCheckbox.php b/library/vendor/Zend/View/Helper/FormMultiCheckbox.php index 1ae198f0d..f19698f52 100644 --- a/library/vendor/Zend/View/Helper/FormMultiCheckbox.php +++ b/library/vendor/Zend/View/Helper/FormMultiCheckbox.php @@ -22,7 +22,6 @@ /** Zend_View_Helper_FormRadio */ -require_once 'Zend/View/Helper/FormRadio.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormNote.php b/library/vendor/Zend/View/Helper/FormNote.php index ebd96ee02..d1ebc0e6d 100644 --- a/library/vendor/Zend/View/Helper/FormNote.php +++ b/library/vendor/Zend/View/Helper/FormNote.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormPassword.php b/library/vendor/Zend/View/Helper/FormPassword.php index 6cf95152c..1359eacbd 100644 --- a/library/vendor/Zend/View/Helper/FormPassword.php +++ b/library/vendor/Zend/View/Helper/FormPassword.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormRadio.php b/library/vendor/Zend/View/Helper/FormRadio.php index 00f39edc1..cc2a52ff1 100644 --- a/library/vendor/Zend/View/Helper/FormRadio.php +++ b/library/vendor/Zend/View/Helper/FormRadio.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** @@ -124,7 +123,6 @@ class Zend_View_Helper_FormRadio extends Zend_View_Helper_FormElement $value = (array) $value; // Set up the filter - Alnum + hyphen + underscore - require_once 'Zend/Filter/PregReplace.php'; $pattern = @preg_match('/\pL/u', 'a') ? '/[^\p{L}\p{N}\-\_]/u' // Unicode : '/[^a-zA-Z0-9\-\_]/'; // No Unicode diff --git a/library/vendor/Zend/View/Helper/FormReset.php b/library/vendor/Zend/View/Helper/FormReset.php index 35ab4a697..6859d985b 100644 --- a/library/vendor/Zend/View/Helper/FormReset.php +++ b/library/vendor/Zend/View/Helper/FormReset.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormSelect.php b/library/vendor/Zend/View/Helper/FormSelect.php index 0bdaa3eb7..87460ba74 100644 --- a/library/vendor/Zend/View/Helper/FormSelect.php +++ b/library/vendor/Zend/View/Helper/FormSelect.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormSubmit.php b/library/vendor/Zend/View/Helper/FormSubmit.php index ad5618520..b5b237e3d 100644 --- a/library/vendor/Zend/View/Helper/FormSubmit.php +++ b/library/vendor/Zend/View/Helper/FormSubmit.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormText.php b/library/vendor/Zend/View/Helper/FormText.php index e3fd61fb9..dad1dd06c 100644 --- a/library/vendor/Zend/View/Helper/FormText.php +++ b/library/vendor/Zend/View/Helper/FormText.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/FormTextarea.php b/library/vendor/Zend/View/Helper/FormTextarea.php index c23491d24..3556cd530 100644 --- a/library/vendor/Zend/View/Helper/FormTextarea.php +++ b/library/vendor/Zend/View/Helper/FormTextarea.php @@ -24,7 +24,6 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/vendor/Zend/View/Helper/Gravatar.php b/library/vendor/Zend/View/Helper/Gravatar.php index dab1f799f..1afc4cb11 100644 --- a/library/vendor/Zend/View/Helper/Gravatar.php +++ b/library/vendor/Zend/View/Helper/Gravatar.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_HtmlElement */ -require_once 'Zend/View/Helper/HtmlElement.php'; /** * Helper for retrieving avatars from gravatar.com @@ -194,7 +193,6 @@ class Zend_View_Helper_Gravatar extends Zend_View_Helper_HtmlElement $this->_options['rating'] = $rating; break; default: - require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception(sprintf( 'The rating value "%s" is not allowed', $rating diff --git a/library/vendor/Zend/View/Helper/HeadLink.php b/library/vendor/Zend/View/Helper/HeadLink.php index be43b6266..355b1b34a 100644 --- a/library/vendor/Zend/View/Helper/HeadLink.php +++ b/library/vendor/Zend/View/Helper/HeadLink.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Placeholder_Container_Standalone */ -require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; /** * Zend_Layout_View_Helper_HeadLink @@ -151,7 +150,6 @@ class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_S } if (1 > $argc) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('%s requires at least one argument', $method)); $e->setView($this->view); throw $e; @@ -209,7 +207,6 @@ class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_S public function append($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('append() expects a data token; please use one of the custom append*() methods'); $e->setView($this->view); throw $e; @@ -228,7 +225,6 @@ class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_S public function offsetSet($index, $value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('offsetSet() expects a data token; please use one of the custom offsetSet*() methods'); $e->setView($this->view); throw $e; @@ -246,7 +242,6 @@ class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_S public function prepend($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('prepend() expects a data token; please use one of the custom prepend*() methods'); $e->setView($this->view); throw $e; @@ -264,7 +259,6 @@ class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_S public function set($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('set() expects a data token; please use one of the custom set*() methods'); $e->setView($this->view); throw $e; @@ -419,7 +413,6 @@ class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_S public function createDataAlternate(array $args) { if (3 > count($args)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Alternate tags require 3 arguments; %s provided', count($args))); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/HeadMeta.php b/library/vendor/Zend/View/Helper/HeadMeta.php index b5ba75d99..5df0d79b3 100644 --- a/library/vendor/Zend/View/Helper/HeadMeta.php +++ b/library/vendor/Zend/View/Helper/HeadMeta.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Placeholder_Container_Standalone */ -require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; /** * Zend_Layout_View_Helper_HeadMeta @@ -101,7 +100,6 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S case 'Property': return 'property'; default: - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Invalid type "%s" passed to _normalizeType', $type)); $e->setView($this->view); throw $e; @@ -145,7 +143,6 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S } if (2 > $argc) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Too few arguments provided; requires key value, and content'); $e->setView($this->view); throw $e; @@ -228,7 +225,6 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S public function append($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to append; please use appendMeta()'); $e->setView($this->view); throw $e; @@ -248,7 +244,6 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S public function offsetSet($index, $value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to offsetSet; please use offsetSetName() or offsetSetHttpEquiv()'); $e->setView($this->view); throw $e; @@ -267,7 +262,6 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S public function offsetUnset($index) { if (!in_array($index, $this->getContainer()->getKeys())) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid index passed to offsetUnset()'); $e->setView($this->view); throw $e; @@ -286,7 +280,6 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S public function prepend($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to prepend; please use prependMeta()'); $e->setView($this->view); throw $e; @@ -305,7 +298,6 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S public function set($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to set; please use setMeta()'); $e->setView($this->view); throw $e; @@ -333,7 +325,6 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S public function itemToString(stdClass $item) { if (!in_array($item->type, $this->_typeKeys)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Invalid type "%s" provided for meta', $item->type)); $e->setView($this->view); throw $e; @@ -344,7 +335,6 @@ class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_S foreach ($item->modifiers as $key => $value) { if (!is_null($this->view) && $this->view->doctype()->isHtml5() && $key == 'scheme') { - require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception('Invalid modifier ' . '"scheme" provided; not supported by HTML5'); } diff --git a/library/vendor/Zend/View/Helper/HeadScript.php b/library/vendor/Zend/View/Helper/HeadScript.php index 531654e9d..6e62321e5 100644 --- a/library/vendor/Zend/View/Helper/HeadScript.php +++ b/library/vendor/Zend/View/Helper/HeadScript.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Placeholder_Container_Standalone */ -require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; /** * Helper for setting and retrieving script elements for HTML head section @@ -142,7 +141,6 @@ class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container public function captureStart($captureType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $type = 'text/javascript', $attrs = array()) { if ($this->_captureLock) { - require_once 'Zend/View/Helper/Placeholder/Container/Exception.php'; $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest headScript captures'); $e->setView($this->view); throw $e; @@ -204,7 +202,6 @@ class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container { if (preg_match('/^(?Pset|(ap|pre)pend|offsetSet)(?PFile|Script)$/', $method, $matches)) { if (1 > count($args)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Method "%s" requires at least one argument', $method)); $e->setView($this->view); throw $e; @@ -218,7 +215,6 @@ class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container if ('offsetSet' == $action) { $index = array_shift($args); if (1 > count($args)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Method "%s" requires at least two arguments, an index and source', $method)); $e->setView($this->view); throw $e; @@ -310,7 +306,6 @@ class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container public function append($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid argument passed to append(); please use one of the helper methods, appendScript() or appendFile()'); $e->setView($this->view); throw $e; @@ -328,7 +323,6 @@ class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container public function prepend($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid argument passed to prepend(); please use one of the helper methods, prependScript() or prependFile()'); $e->setView($this->view); throw $e; @@ -346,7 +340,6 @@ class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container public function set($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid argument passed to set(); please use one of the helper methods, setScript() or setFile()'); $e->setView($this->view); throw $e; @@ -365,7 +358,6 @@ class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container public function offsetSet($index, $value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid argument passed to offsetSet(); please use one of the helper methods, offsetSetScript() or offsetSetFile()'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/HeadStyle.php b/library/vendor/Zend/View/Helper/HeadStyle.php index d836d1ab0..b5bed9faf 100644 --- a/library/vendor/Zend/View/Helper/HeadStyle.php +++ b/library/vendor/Zend/View/Helper/HeadStyle.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Placeholder_Container_Standalone */ -require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; /** * Helper for setting and retrieving stylesheets @@ -146,7 +145,6 @@ class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_ } if (1 > $argc) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Method "%s" requires minimally content for the stylesheet', $method)); $e->setView($this->view); throw $e; @@ -200,7 +198,6 @@ class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_ public function append($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to append; please use appendStyle()'); $e->setView($this->view); throw $e; @@ -219,7 +216,6 @@ class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_ public function offsetSet($index, $value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to offsetSet; please use offsetSetStyle()'); $e->setView($this->view); throw $e; @@ -237,7 +233,6 @@ class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_ public function prepend($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to prepend; please use prependStyle()'); $e->setView($this->view); throw $e; @@ -255,7 +250,6 @@ class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_ public function set($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to set; please use setStyle()'); $e->setView($this->view); throw $e; @@ -274,7 +268,6 @@ class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_ public function captureStart($type = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $attrs = null) { if ($this->_captureLock) { - require_once 'Zend/View/Helper/Placeholder/Container/Exception.php'; $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest headStyle captures'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/HeadTitle.php b/library/vendor/Zend/View/Helper/HeadTitle.php index d4ea8802e..7796e13d7 100644 --- a/library/vendor/Zend/View/Helper/HeadTitle.php +++ b/library/vendor/Zend/View/Helper/HeadTitle.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Placeholder_Container_Standalone */ -require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; /** * Helper for setting and retrieving title element for HTML head @@ -100,7 +99,6 @@ class Zend_View_Helper_HeadTitle extends Zend_View_Helper_Placeholder_Container_ Zend_View_Helper_Placeholder_Container_Abstract::SET, Zend_View_Helper_Placeholder_Container_Abstract::PREPEND ))) { - require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception("You must use a valid attach order: 'PREPEND', 'APPEND' or 'SET'"); } @@ -131,7 +129,6 @@ class Zend_View_Helper_HeadTitle extends Zend_View_Helper_Placeholder_Container_ } elseif ($translate instanceof Zend_Translate) { $this->_translator = $translate->getAdapter(); } else { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception("You must set an instance of Zend_Translate or Zend_Translate_Adapter"); $e->setView($this->view); throw $e; @@ -150,7 +147,6 @@ class Zend_View_Helper_HeadTitle extends Zend_View_Helper_Placeholder_Container_ public function getTranslator() { if (null === $this->_translator) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $this->setTranslator(Zend_Registry::get('Zend_Translate')); } diff --git a/library/vendor/Zend/View/Helper/HtmlElement.php b/library/vendor/Zend/View/Helper/HtmlElement.php index b794f4dcd..91a92d1bc 100644 --- a/library/vendor/Zend/View/Helper/HtmlElement.php +++ b/library/vendor/Zend/View/Helper/HtmlElement.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_Abstract */ -require_once 'Zend/View/Helper/Abstract.php'; /** * @category Zend @@ -117,7 +116,6 @@ abstract class Zend_View_Helper_HtmlElement extends Zend_View_Helper_Abstract // Don't escape event attributes; _do_ substitute double quotes with singles if (!is_scalar($val)) { // non-scalar data should be cast to JSON first - require_once 'Zend/Json.php'; $val = Zend_Json::encode($val); } // Escape single quotes inside event attribute values. diff --git a/library/vendor/Zend/View/Helper/HtmlFlash.php b/library/vendor/Zend/View/Helper/HtmlFlash.php index 16834c597..1f40d3f7d 100644 --- a/library/vendor/Zend/View/Helper/HtmlFlash.php +++ b/library/vendor/Zend/View/Helper/HtmlFlash.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_HtmlObject */ -require_once 'Zend/View/Helper/HtmlObject.php'; /** * @category Zend diff --git a/library/vendor/Zend/View/Helper/HtmlList.php b/library/vendor/Zend/View/Helper/HtmlList.php index e9f5871d3..255347744 100644 --- a/library/vendor/Zend/View/Helper/HtmlList.php +++ b/library/vendor/Zend/View/Helper/HtmlList.php @@ -24,7 +24,6 @@ /** * Zend_View_Helper_FormELement */ -require_once 'Zend/View/Helper/FormElement.php'; /** * Helper for ordered and unordered lists @@ -50,7 +49,6 @@ class Zend_View_Helper_HtmlList extends Zend_View_Helper_FormElement public function htmlList(array $items, $ordered = false, $attribs = false, $escape = true) { if (!is_array($items)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('First param must be an array'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/HtmlObject.php b/library/vendor/Zend/View/Helper/HtmlObject.php index 22302e44a..95091b36b 100644 --- a/library/vendor/Zend/View/Helper/HtmlObject.php +++ b/library/vendor/Zend/View/Helper/HtmlObject.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_HtmlElement */ -require_once 'Zend/View/Helper/HtmlElement.php'; /** * @category Zend diff --git a/library/vendor/Zend/View/Helper/HtmlPage.php b/library/vendor/Zend/View/Helper/HtmlPage.php index 8a4a3eb39..9a1c5a754 100644 --- a/library/vendor/Zend/View/Helper/HtmlPage.php +++ b/library/vendor/Zend/View/Helper/HtmlPage.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_HtmlObject */ -require_once 'Zend/View/Helper/HtmlObject.php'; /** * @category Zend diff --git a/library/vendor/Zend/View/Helper/HtmlQuicktime.php b/library/vendor/Zend/View/Helper/HtmlQuicktime.php index 16b9b2572..479493355 100644 --- a/library/vendor/Zend/View/Helper/HtmlQuicktime.php +++ b/library/vendor/Zend/View/Helper/HtmlQuicktime.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_HtmlObject */ -require_once 'Zend/View/Helper/HtmlObject.php'; /** * @category Zend diff --git a/library/vendor/Zend/View/Helper/InlineScript.php b/library/vendor/Zend/View/Helper/InlineScript.php index e74ba242c..52b29d6f1 100644 --- a/library/vendor/Zend/View/Helper/InlineScript.php +++ b/library/vendor/Zend/View/Helper/InlineScript.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_HeadScript */ -require_once 'Zend/View/Helper/HeadScript.php'; /** * Helper for setting and retrieving script elements for inclusion in HTML body diff --git a/library/vendor/Zend/View/Helper/Json.php b/library/vendor/Zend/View/Helper/Json.php index 2d9022063..c61f1e0ed 100644 --- a/library/vendor/Zend/View/Helper/Json.php +++ b/library/vendor/Zend/View/Helper/Json.php @@ -21,13 +21,10 @@ */ /** Zend_Json */ -require_once 'Zend/Json.php'; /** Zend_Controller_Front */ -require_once 'Zend/Controller/Front.php'; /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for simplifying JSON responses @@ -76,7 +73,6 @@ class Zend_View_Helper_Json extends Zend_View_Helper_Abstract $data = Zend_Json::encode($data, null, $options); } if (!$keepLayouts) { - require_once 'Zend/Layout.php'; $layout = Zend_Layout::getMvcInstance(); if ($layout instanceof Zend_Layout) { $layout->disableLayout(); diff --git a/library/vendor/Zend/View/Helper/Layout.php b/library/vendor/Zend/View/Helper/Layout.php index 9d0e701c2..cb229ff72 100644 --- a/library/vendor/Zend/View/Helper/Layout.php +++ b/library/vendor/Zend/View/Helper/Layout.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * View helper for retrieving layout object @@ -44,7 +43,6 @@ class Zend_View_Helper_Layout extends Zend_View_Helper_Abstract public function getLayout() { if (null === $this->_layout) { - require_once 'Zend/Layout.php'; $this->_layout = Zend_Layout::getMvcInstance(); if (null === $this->_layout) { // Implicitly creates layout object diff --git a/library/vendor/Zend/View/Helper/Navigation.php b/library/vendor/Zend/View/Helper/Navigation.php index eb8503494..e58a1ede6 100644 --- a/library/vendor/Zend/View/Helper/Navigation.php +++ b/library/vendor/Zend/View/Helper/Navigation.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_Navigation_HelperAbstract */ -require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; /** * Proxy helper for retrieving navigational helpers and forwarding calls @@ -182,7 +181,6 @@ class Zend_View_Helper_Navigation if (!$helper instanceof Zend_View_Helper_Navigation_Helper) { if ($strict) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( 'Proxy helper "%s" is not an instance of ' . 'Zend_View_Helper_Navigation_Helper', diff --git a/library/vendor/Zend/View/Helper/Navigation/Breadcrumbs.php b/library/vendor/Zend/View/Helper/Navigation/Breadcrumbs.php index 4210a2cb9..9c81b420c 100644 --- a/library/vendor/Zend/View/Helper/Navigation/Breadcrumbs.php +++ b/library/vendor/Zend/View/Helper/Navigation/Breadcrumbs.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_Navigation_HelperAbstract */ -require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; /** * Helper for printing breadcrumbs @@ -259,7 +258,6 @@ class Zend_View_Helper_Navigation_Breadcrumbs } if (empty($partial)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( 'Unable to render menu: No partial view script provided' ); @@ -291,7 +289,6 @@ class Zend_View_Helper_Navigation_Breadcrumbs if (is_array($partial)) { if (count($partial) != 2) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( 'Unable to render menu: A view partial supplied as ' . 'an array must contain two values: partial view ' diff --git a/library/vendor/Zend/View/Helper/Navigation/HelperAbstract.php b/library/vendor/Zend/View/Helper/Navigation/HelperAbstract.php index 2043306e3..d10228bb6 100644 --- a/library/vendor/Zend/View/Helper/Navigation/HelperAbstract.php +++ b/library/vendor/Zend/View/Helper/Navigation/HelperAbstract.php @@ -23,12 +23,10 @@ /** * @see Zend_View_Helper_Navigation_Helper */ -require_once 'Zend/View/Helper/Navigation/Helper.php'; /** * @see Zend_View_Helper_HtmlElement */ -require_once 'Zend/View/Helper/HtmlElement.php'; /** * Base class for navigational helpers @@ -190,7 +188,6 @@ abstract class Zend_View_Helper_Navigation_HelperAbstract { if (null === $this->_container) { // try to fetch from registry first - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Navigation')) { $nav = Zend_Registry::get('Zend_Navigation'); if ($nav instanceof Zend_Navigation_Container) { @@ -199,7 +196,6 @@ abstract class Zend_View_Helper_Navigation_HelperAbstract } // nothing found in registry, create new container - require_once 'Zend/Navigation.php'; $this->_container = new Zend_Navigation(); } @@ -424,7 +420,6 @@ abstract class Zend_View_Helper_Navigation_HelperAbstract public function getTranslator() { if (null === $this->_translator) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $this->setTranslator(Zend_Registry::get('Zend_Translate')); } @@ -488,7 +483,6 @@ abstract class Zend_View_Helper_Navigation_HelperAbstract $role instanceof Zend_Acl_Role_Interface) { $this->_role = $role; } else { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( '$role must be a string, null, or an instance of ' . 'Zend_Acl_Role_Interface; %s given', @@ -967,7 +961,6 @@ abstract class Zend_View_Helper_Navigation_HelperAbstract $role instanceof Zend_Acl_Role_Interface) { self::$_defaultRole = $role; } else { - require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception( '$role must be null|string|Zend_Acl_Role_Interface' ); diff --git a/library/vendor/Zend/View/Helper/Navigation/Links.php b/library/vendor/Zend/View/Helper/Navigation/Links.php index 261e86f6a..e600c6d47 100644 --- a/library/vendor/Zend/View/Helper/Navigation/Links.php +++ b/library/vendor/Zend/View/Helper/Navigation/Links.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_Navigation_HelperAbstract */ -require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; /** * Helper for printing elements @@ -270,7 +269,6 @@ class Zend_View_Helper_Navigation_Links public function findRelation(Zend_Navigation_Page $page, $rel, $type) { if (!in_array($rel, array('rel', 'rev'))) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( 'Invalid argument: $rel must be "rel" or "rev"; "%s" given', $rel)); @@ -709,7 +707,6 @@ class Zend_View_Helper_Navigation_Links public function renderLink(Zend_Navigation_Page $page, $attrib, $relation) { if (!in_array($attrib, array('rel', 'rev'))) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( 'Invalid relation attribute "%s", must be "rel" or "rev"', $attrib)); diff --git a/library/vendor/Zend/View/Helper/Navigation/Menu.php b/library/vendor/Zend/View/Helper/Navigation/Menu.php index 36d59a205..0405b8887 100644 --- a/library/vendor/Zend/View/Helper/Navigation/Menu.php +++ b/library/vendor/Zend/View/Helper/Navigation/Menu.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_Navigation_HelperAbstract */ -require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; /** * Helper for rendering menus from navigation containers @@ -1038,7 +1037,6 @@ class Zend_View_Helper_Navigation_Menu } if (empty($partial)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( 'Unable to render menu: No partial view script provided' ); @@ -1052,7 +1050,6 @@ class Zend_View_Helper_Navigation_Menu if (is_array($partial)) { if (count($partial) != 2) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( 'Unable to render menu: A view partial supplied as ' . 'an array must contain two values: partial view ' diff --git a/library/vendor/Zend/View/Helper/Navigation/Sitemap.php b/library/vendor/Zend/View/Helper/Navigation/Sitemap.php index 0f9a8756d..a3b71fa2b 100644 --- a/library/vendor/Zend/View/Helper/Navigation/Sitemap.php +++ b/library/vendor/Zend/View/Helper/Navigation/Sitemap.php @@ -23,7 +23,6 @@ /** * @see Zend_View_Helper_Navigation_HelperAbstract */ -require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; /** * Helper for printing sitemaps @@ -186,7 +185,6 @@ class Zend_View_Helper_Navigation_Sitemap */ public function setServerUrl($serverUrl) { - require_once 'Zend/Uri.php'; $uri = Zend_Uri::factory($serverUrl); $uri->setFragment(''); $uri->setPath(''); @@ -195,7 +193,6 @@ class Zend_View_Helper_Navigation_Sitemap if ($uri->valid()) { $this->_serverUrl = $uri->getUri(); } else { - require_once 'Zend/Uri/Exception.php'; $e = new Zend_Uri_Exception(sprintf( 'Invalid server URL: "%s"', $serverUrl)); @@ -296,10 +293,6 @@ class Zend_View_Helper_Navigation_Sitemap // check if we should validate using our own validators if ($this->getUseSitemapValidators()) { - require_once 'Zend/Validate/Sitemap/Changefreq.php'; - require_once 'Zend/Validate/Sitemap/Lastmod.php'; - require_once 'Zend/Validate/Sitemap/Loc.php'; - require_once 'Zend/Validate/Sitemap/Priority.php'; // create validators $locValidator = new Zend_Validate_Sitemap_Loc(); @@ -348,7 +341,6 @@ class Zend_View_Helper_Navigation_Sitemap if ($this->getUseSitemapValidators() && !$locValidator->isValid($url)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( 'Encountered an invalid URL for Sitemap XML: "%s"', $url)); @@ -406,7 +398,6 @@ class Zend_View_Helper_Navigation_Sitemap // validate using schema if specified if ($this->getUseSchemaValidation()) { if (!@$dom->schemaValidate(self::SITEMAP_XSD)) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( 'Sitemap is invalid according to XML Schema at "%s"', self::SITEMAP_XSD)); diff --git a/library/vendor/Zend/View/Helper/PaginationControl.php b/library/vendor/Zend/View/Helper/PaginationControl.php index 28c6915bf..b12505044 100644 --- a/library/vendor/Zend/View/Helper/PaginationControl.php +++ b/library/vendor/Zend/View/Helper/PaginationControl.php @@ -94,7 +94,6 @@ class Zend_View_Helper_PaginationControl /** * @see Zend_View_Exception */ - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('No paginator instance provided or incorrect type'); $e->setView($this->view); @@ -107,7 +106,6 @@ class Zend_View_Helper_PaginationControl /** * @see Zend_View_Exception */ - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('No view partial provided and no default set'); $e->setView($this->view); throw $e; @@ -127,7 +125,6 @@ class Zend_View_Helper_PaginationControl /** * @see Zend_View_Exception */ - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('A view partial supplied as an array must contain two values: the filename and its module'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/Partial.php b/library/vendor/Zend/View/Helper/Partial.php index 4a13d0e30..b726f3d7a 100644 --- a/library/vendor/Zend/View/Helper/Partial.php +++ b/library/vendor/Zend/View/Helper/Partial.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for rendering a template fragment in its own variable scope. @@ -76,10 +75,8 @@ class Zend_View_Helper_Partial extends Zend_View_Helper_Abstract } if ((null !== $module) && is_string($module)) { - require_once 'Zend/Controller/Front.php'; $moduleDir = Zend_Controller_Front::getInstance()->getControllerDirectory($module); if (null === $moduleDir) { - require_once 'Zend/View/Helper/Partial/Exception.php'; $e = new Zend_View_Helper_Partial_Exception('Cannot render partial; module does not exist'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/Partial/Exception.php b/library/vendor/Zend/View/Helper/Partial/Exception.php index 504e80970..a4ed78b28 100644 --- a/library/vendor/Zend/View/Helper/Partial/Exception.php +++ b/library/vendor/Zend/View/Helper/Partial/Exception.php @@ -22,7 +22,6 @@ /** Zend_View_Exception */ -require_once 'Zend/View/Exception.php'; /** diff --git a/library/vendor/Zend/View/Helper/PartialLoop.php b/library/vendor/Zend/View/Helper/PartialLoop.php index bd82df150..3a3089027 100644 --- a/library/vendor/Zend/View/Helper/PartialLoop.php +++ b/library/vendor/Zend/View/Helper/PartialLoop.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Partial */ -require_once 'Zend/View/Helper/Partial.php'; /** * Helper for rendering a template fragment in its own variable scope; iterates @@ -70,7 +69,6 @@ class Zend_View_Helper_PartialLoop extends Zend_View_Helper_Partial && (!$model instanceof Traversable) && (is_object($model) && !method_exists($model, 'toArray')) ) { - require_once 'Zend/View/Helper/Partial/Exception.php'; $e = new Zend_View_Helper_Partial_Exception('PartialLoop helper requires iterable data'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/Placeholder.php b/library/vendor/Zend/View/Helper/Placeholder.php index f6348bc6b..c9122de30 100644 --- a/library/vendor/Zend/View/Helper/Placeholder.php +++ b/library/vendor/Zend/View/Helper/Placeholder.php @@ -21,10 +21,8 @@ */ /** Zend_View_Helper_Placeholder_Registry */ -require_once 'Zend/View/Helper/Placeholder/Registry.php'; /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for passing data between otherwise segregated Views. It's called diff --git a/library/vendor/Zend/View/Helper/Placeholder/Container.php b/library/vendor/Zend/View/Helper/Placeholder/Container.php index 97fedf7ee..56e015d96 100644 --- a/library/vendor/Zend/View/Helper/Placeholder/Container.php +++ b/library/vendor/Zend/View/Helper/Placeholder/Container.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Placeholder_Container_Abstract */ -require_once 'Zend/View/Helper/Placeholder/Container/Abstract.php'; /** * Container for placeholder values diff --git a/library/vendor/Zend/View/Helper/Placeholder/Container/Abstract.php b/library/vendor/Zend/View/Helper/Placeholder/Container/Abstract.php index 219a07a9f..02a562e23 100644 --- a/library/vendor/Zend/View/Helper/Placeholder/Container/Abstract.php +++ b/library/vendor/Zend/View/Helper/Placeholder/Container/Abstract.php @@ -260,7 +260,6 @@ abstract class Zend_View_Helper_Placeholder_Container_Abstract extends ArrayObje public function captureStart($type = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $key = null) { if ($this->_captureLock) { - require_once 'Zend/View/Helper/Placeholder/Container/Exception.php'; $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest placeholder captures for the same placeholder'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/Placeholder/Container/Exception.php b/library/vendor/Zend/View/Helper/Placeholder/Container/Exception.php index ebf3e8855..ceb40d352 100644 --- a/library/vendor/Zend/View/Helper/Placeholder/Container/Exception.php +++ b/library/vendor/Zend/View/Helper/Placeholder/Container/Exception.php @@ -22,7 +22,6 @@ /** Zend_View_Exception */ -require_once 'Zend/View/Exception.php'; /** diff --git a/library/vendor/Zend/View/Helper/Placeholder/Container/Standalone.php b/library/vendor/Zend/View/Helper/Placeholder/Container/Standalone.php index 96e65fc1e..fddc73775 100644 --- a/library/vendor/Zend/View/Helper/Placeholder/Container/Standalone.php +++ b/library/vendor/Zend/View/Helper/Placeholder/Container/Standalone.php @@ -21,10 +21,8 @@ */ /** Zend_View_Helper_Placeholder_Registry */ -require_once 'Zend/View/Helper/Placeholder/Registry.php'; /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Base class for targetted placeholder helpers @@ -230,7 +228,6 @@ abstract class Zend_View_Helper_Placeholder_Container_Standalone extends Zend_Vi return $return; } - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Method "' . $method . '" does not exist'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/Placeholder/Registry.php b/library/vendor/Zend/View/Helper/Placeholder/Registry.php index c804735d9..2e3f9ef34 100644 --- a/library/vendor/Zend/View/Helper/Placeholder/Registry.php +++ b/library/vendor/Zend/View/Helper/Placeholder/Registry.php @@ -21,13 +21,10 @@ */ /** Zend_Registry */ -require_once 'Zend/Registry.php'; /** Zend_View_Helper_Placeholder_Container_Abstract */ -require_once 'Zend/View/Helper/Placeholder/Container/Abstract.php'; /** Zend_View_Helper_Placeholder_Container */ -require_once 'Zend/View/Helper/Placeholder/Container.php'; /** * Registry for placeholder containers @@ -160,13 +157,11 @@ class Zend_View_Helper_Placeholder_Registry public function setContainerClass($name) { if (!class_exists($name)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($name); } $reflection = new ReflectionClass($name); if (!$reflection->isSubclassOf(new ReflectionClass('Zend_View_Helper_Placeholder_Container_Abstract'))) { - require_once 'Zend/View/Helper/Placeholder/Registry/Exception.php'; $e = new Zend_View_Helper_Placeholder_Registry_Exception('Invalid Container class specified'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/Placeholder/Registry/Exception.php b/library/vendor/Zend/View/Helper/Placeholder/Registry/Exception.php index a8bc39010..a96f7ee0d 100644 --- a/library/vendor/Zend/View/Helper/Placeholder/Registry/Exception.php +++ b/library/vendor/Zend/View/Helper/Placeholder/Registry/Exception.php @@ -22,7 +22,6 @@ /** Zend_View_Exception */ -require_once 'Zend/View/Exception.php'; /** diff --git a/library/vendor/Zend/View/Helper/RenderToPlaceholder.php b/library/vendor/Zend/View/Helper/RenderToPlaceholder.php index c7f359446..aaf179c2c 100644 --- a/library/vendor/Zend/View/Helper/RenderToPlaceholder.php +++ b/library/vendor/Zend/View/Helper/RenderToPlaceholder.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Renders a template and stores the rendered output as a placeholder diff --git a/library/vendor/Zend/View/Helper/Translate.php b/library/vendor/Zend/View/Helper/Translate.php index 96a25f100..817233f51 100644 --- a/library/vendor/Zend/View/Helper/Translate.php +++ b/library/vendor/Zend/View/Helper/Translate.php @@ -21,10 +21,8 @@ */ /** Zend_Locale */ -require_once 'Zend/Locale.php'; /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Translation view helper @@ -112,7 +110,6 @@ class Zend_View_Helper_Translate extends Zend_View_Helper_Abstract } else if ($translate instanceof Zend_Translate) { $this->_translator = $translate->getAdapter(); } else { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter'); $e->setView($this->view); throw $e; @@ -129,7 +126,6 @@ class Zend_View_Helper_Translate extends Zend_View_Helper_Abstract public function getTranslator() { if ($this->_translator === null) { - require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $this->setTranslator(Zend_Registry::get('Zend_Translate')); } @@ -149,7 +145,6 @@ class Zend_View_Helper_Translate extends Zend_View_Helper_Abstract { $translate = $this->getTranslator(); if ($translate === null) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter'); $e->setView($this->view); throw $e; @@ -169,7 +164,6 @@ class Zend_View_Helper_Translate extends Zend_View_Helper_Abstract { $translate = $this->getTranslator(); if ($translate === null) { - require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter'); $e->setView($this->view); throw $e; diff --git a/library/vendor/Zend/View/Helper/Url.php b/library/vendor/Zend/View/Helper/Url.php index f14762b43..a8cf4e022 100644 --- a/library/vendor/Zend/View/Helper/Url.php +++ b/library/vendor/Zend/View/Helper/Url.php @@ -21,7 +21,6 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for making easy links and getting urls that depend on the routes and router diff --git a/library/vendor/Zend/View/Helper/UserAgent.php b/library/vendor/Zend/View/Helper/UserAgent.php index cf0107671..1c0cae977 100644 --- a/library/vendor/Zend/View/Helper/UserAgent.php +++ b/library/vendor/Zend/View/Helper/UserAgent.php @@ -20,7 +20,6 @@ */ /** Zend_View_Helper_Abstract */ -require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for interacting with UserAgent instance @@ -75,7 +74,6 @@ class Zend_View_Helper_UserAgent extends Zend_View_Helper_Abstract public function getUserAgent() { if (null === $this->_userAgent) { - require_once 'Zend/Http/UserAgent.php'; $this->setUserAgent(new Zend_Http_UserAgent()); } return $this->_userAgent; diff --git a/library/vendor/Zend/Wildfire/Channel/HttpHeaders.php b/library/vendor/Zend/Wildfire/Channel/HttpHeaders.php index f75798942..6a25bcbde 100644 --- a/library/vendor/Zend/Wildfire/Channel/HttpHeaders.php +++ b/library/vendor/Zend/Wildfire/Channel/HttpHeaders.php @@ -21,22 +21,16 @@ */ /** Zend_Wildfire_Channel_Interface */ -require_once 'Zend/Wildfire/Channel/Interface.php'; /** Zend_Controller_Request_Abstract */ -require_once('Zend/Controller/Request/Abstract.php'); /** Zend_Controller_Response_Abstract */ -require_once('Zend/Controller/Response/Abstract.php'); /** Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; /** Zend_Wildfire_Protocol_JsonStream */ -require_once 'Zend/Wildfire/Protocol/JsonStream.php'; /** Zend_Controller_Front **/ -require_once 'Zend/Controller/Front.php'; /** * Implements communication via HTTP request and response headers for Wildfire Protocols. @@ -83,17 +77,14 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract public static function init($class = null) { if (self::$_instance !== null) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Singleton instance of Zend_Wildfire_Channel_HttpHeaders already exists!'); } if ($class !== null) { if (!is_string($class)) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Third argument is not a class string'); } if (!class_exists($class)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } @@ -101,7 +92,6 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract if (!self::$_instance instanceof Zend_Wildfire_Channel_HttpHeaders) { self::$_instance = null; - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Invalid class to third argument. Must be subclass of Zend_Wildfire_Channel_HttpHeaders.'); } } else { @@ -168,7 +158,6 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract case Zend_Wildfire_Protocol_JsonStream::PROTOCOL_URI; return new Zend_Wildfire_Protocol_JsonStream(); } - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Tyring to initialize unknown protocol for URI "'.$uri.'".'); } @@ -314,7 +303,6 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract $this->setRequest($controller->getRequest()); } if (!$this->_request) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Request objects not initialized.'); } return $this->_request; @@ -335,7 +323,6 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract } } if (!$this->_response) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Response objects not initialized.'); } return $this->_response; diff --git a/library/vendor/Zend/Wildfire/Exception.php b/library/vendor/Zend/Wildfire/Exception.php index e51d92293..51d021d28 100644 --- a/library/vendor/Zend/Wildfire/Exception.php +++ b/library/vendor/Zend/Wildfire/Exception.php @@ -21,7 +21,6 @@ /** Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Wildfire/Plugin/FirePhp.php b/library/vendor/Zend/Wildfire/Plugin/FirePhp.php index a4099e0b0..6e3c031aa 100644 --- a/library/vendor/Zend/Wildfire/Plugin/FirePhp.php +++ b/library/vendor/Zend/Wildfire/Plugin/FirePhp.php @@ -21,19 +21,14 @@ */ /** Zend_Controller_Request_Abstract */ -require_once('Zend/Controller/Request/Abstract.php'); /** Zend_Controller_Response_Abstract */ -require_once('Zend/Controller/Response/Abstract.php'); /** Zend_Wildfire_Channel_HttpHeaders */ -require_once 'Zend/Wildfire/Channel/HttpHeaders.php'; /** Zend_Wildfire_Protocol_JsonStream */ -require_once 'Zend/Wildfire/Protocol/JsonStream.php'; /** Zend_Wildfire_Plugin_Interface */ -require_once 'Zend/Wildfire/Plugin/Interface.php'; /** * Primary class for communicating with the FirePHP Firefox Extension. @@ -175,23 +170,19 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface public static function init($class = null) { if (self::$_instance !== null) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Singleton instance of Zend_Wildfire_Plugin_FirePhp already exists!'); } if ($class !== null) { if (!is_string($class)) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Third argument is not a class string'); } if (!class_exists($class)) { - require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } self::$_instance = new $class(); if (!self::$_instance instanceof Zend_Wildfire_Plugin_FirePhp) { self::$_instance = null; - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Invalid class to third argument. Must be subclass of Zend_Wildfire_Plugin_FirePhp.'); } } else { @@ -467,7 +458,6 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface case self::GROUP_END: break; default: - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Log style "'.$meta['Type'].'" not recognized!'); break; } @@ -555,11 +545,9 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface case self::STRUCTURE_URI_DUMP: if (!isset($data['key'])) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('You must supply a key.'); } if (!array_key_exists('data',$data)) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('You must supply data.'); } @@ -579,11 +567,9 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface !is_array($data['meta']) || !array_key_exists('Type',$data['meta'])) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('You must supply a "Type" in the meta information.'); } if (!array_key_exists('data',$data)) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('You must supply data.'); } @@ -599,7 +585,6 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface $value)); default: - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Structure of name "'.$structure.'" is not recognized.'); break; } diff --git a/library/vendor/Zend/Wildfire/Plugin/FirePhp/TableMessage.php b/library/vendor/Zend/Wildfire/Plugin/FirePhp/TableMessage.php index 633d9423d..101d5632d 100644 --- a/library/vendor/Zend/Wildfire/Plugin/FirePhp/TableMessage.php +++ b/library/vendor/Zend/Wildfire/Plugin/FirePhp/TableMessage.php @@ -21,10 +21,8 @@ */ /** Zend_Wildfire_Plugin_FirePhp */ -require_once 'Zend/Wildfire/Plugin/FirePhp.php'; /** Zend_Wildfire_Plugin_FirePhp_Message */ -require_once 'Zend/Wildfire/Plugin/FirePhp/Message.php'; /** * A message envelope that can be updated for the duration of the requet before @@ -109,7 +107,6 @@ class Zend_Wildfire_Plugin_FirePhp_TableMessage extends Zend_Wildfire_Plugin_Fir $count = $this->getRowCount(); if($index < 0 || $index > $count-1) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Row index('.$index.') out of bounds('.$count.')!'); } @@ -128,7 +125,6 @@ class Zend_Wildfire_Plugin_FirePhp_TableMessage extends Zend_Wildfire_Plugin_Fir $count = $this->getRowCount(); if($index < 0 || $index > $count-1) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Row index('.$index.') out of bounds('.$count.')!'); } @@ -156,7 +152,6 @@ class Zend_Wildfire_Plugin_FirePhp_TableMessage extends Zend_Wildfire_Plugin_Fir $count = $this->getRowCount(); if($count==0) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Cannot get last row as no rows exist!'); } diff --git a/library/vendor/Zend/Wildfire/Protocol/JsonStream.php b/library/vendor/Zend/Wildfire/Protocol/JsonStream.php index e46302347..87af4a91c 100644 --- a/library/vendor/Zend/Wildfire/Protocol/JsonStream.php +++ b/library/vendor/Zend/Wildfire/Protocol/JsonStream.php @@ -21,13 +21,10 @@ */ /** Zend_Wildfire_Plugin_Interface */ -require_once 'Zend/Wildfire/Plugin/Interface.php'; /** Zend_Wildfire_Channel_Interface */ -require_once 'Zend/Wildfire/Channel/Interface.php'; /** Zend_Json */ -require_once 'Zend/Json.php'; /** * Encodes messages into the Wildfire JSON Stream Communication Protocol. @@ -158,7 +155,6 @@ class Zend_Wildfire_Protocol_JsonStream public function getPayload(Zend_Wildfire_Channel_Interface $channel) { if (!$channel instanceof Zend_Wildfire_Channel_HttpHeaders) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('The '.get_class($channel).' channel is not supported by the '.get_class($this).' protocol.'); } @@ -217,7 +213,6 @@ class Zend_Wildfire_Protocol_JsonStream $message_index++; if ($message_index > 99999) { - require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Maximum number (99,999) of messages reached!'); } } diff --git a/library/vendor/Zend/Xml/Exception.php b/library/vendor/Zend/Xml/Exception.php index 2c20f7aaa..baa0ffcfe 100644 --- a/library/vendor/Zend/Xml/Exception.php +++ b/library/vendor/Zend/Xml/Exception.php @@ -23,7 +23,6 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/Xml/Security.php b/library/vendor/Zend/Xml/Security.php index 4462b7f17..2fa7e158f 100644 --- a/library/vendor/Zend/Xml/Security.php +++ b/library/vendor/Zend/Xml/Security.php @@ -39,7 +39,6 @@ class Zend_Xml_Security protected static function heuristicScan($xml) { if (strpos($xml, 'childNodes as $child) { if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { if ($child->entities->length > 0) { - require_once 'Exception.php'; throw new Zend_Xml_Exception(self::ENTITY_DETECT); } } @@ -136,7 +134,6 @@ class Zend_Xml_Security public static function scanFile($file, DOMDocument $dom = null) { if (!file_exists($file)) { - require_once 'Exception.php'; throw new Zend_Xml_Exception( "The file $file specified doesn't exist" ); diff --git a/library/vendor/Zend/XmlRpc/Client.php b/library/vendor/Zend/XmlRpc/Client.php index de7cc0ba4..33901a711 100644 --- a/library/vendor/Zend/XmlRpc/Client.php +++ b/library/vendor/Zend/XmlRpc/Client.php @@ -25,44 +25,37 @@ * For handling the HTTP connection to the XML-RPC service * @see Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; /** * Enables object chaining for calling namespaced XML-RPC methods. * @see Zend_XmlRpc_Client_ServerProxy */ -require_once 'Zend/XmlRpc/Client/ServerProxy.php'; /** * Introspects remote servers using the XML-RPC de facto system.* methods * @see Zend_XmlRpc_Client_ServerIntrospection */ -require_once 'Zend/XmlRpc/Client/ServerIntrospection.php'; /** * Represent a native XML-RPC value, used both in sending parameters * to methods and as the parameters retrieve from method calls * @see Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; /** * XML-RPC Request * @see Zend_XmlRpc_Request */ -require_once 'Zend/XmlRpc/Request.php'; /** * XML-RPC Response * @see Zend_XmlRpc_Response */ -require_once 'Zend/XmlRpc/Response.php'; /** * XML-RPC Fault * @see Zend_XmlRpc_Fault */ -require_once 'Zend/XmlRpc/Fault.php'; /** @@ -290,7 +283,6 @@ class Zend_XmlRpc_Client * Exception thrown when an HTTP error occurs * @see Zend_XmlRpc_Client_HttpException */ - require_once 'Zend/XmlRpc/Client/HttpException.php'; throw new Zend_XmlRpc_Client_HttpException( $httpResponse->getMessage(), $httpResponse->getStatus()); @@ -383,7 +375,6 @@ class Zend_XmlRpc_Client * Exception thrown when an XML-RPC fault is returned * @see Zend_XmlRpc_Client_FaultException */ - require_once 'Zend/XmlRpc/Client/FaultException.php'; throw new Zend_XmlRpc_Client_FaultException($fault->getMessage(), $fault->getCode()); } diff --git a/library/vendor/Zend/XmlRpc/Client/Exception.php b/library/vendor/Zend/XmlRpc/Client/Exception.php index bd196f493..96cb7730c 100644 --- a/library/vendor/Zend/XmlRpc/Client/Exception.php +++ b/library/vendor/Zend/XmlRpc/Client/Exception.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Exception */ -require_once 'Zend/XmlRpc/Exception.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Client/FaultException.php b/library/vendor/Zend/XmlRpc/Client/FaultException.php index b4caa088d..34b9f9e4c 100644 --- a/library/vendor/Zend/XmlRpc/Client/FaultException.php +++ b/library/vendor/Zend/XmlRpc/Client/FaultException.php @@ -22,7 +22,6 @@ /** Zend_XmlRpc_Client_Exception */ -require_once 'Zend/XmlRpc/Client/Exception.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Client/HttpException.php b/library/vendor/Zend/XmlRpc/Client/HttpException.php index 5ad173c75..f62c57f4c 100644 --- a/library/vendor/Zend/XmlRpc/Client/HttpException.php +++ b/library/vendor/Zend/XmlRpc/Client/HttpException.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Exception */ -require_once 'Zend/XmlRpc/Client/Exception.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Client/IntrospectException.php b/library/vendor/Zend/XmlRpc/Client/IntrospectException.php index 73ec8f7fa..07104867d 100644 --- a/library/vendor/Zend/XmlRpc/Client/IntrospectException.php +++ b/library/vendor/Zend/XmlRpc/Client/IntrospectException.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Client_Exception */ -require_once 'Zend/XmlRpc/Client/Exception.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Client/ServerIntrospection.php b/library/vendor/Zend/XmlRpc/Client/ServerIntrospection.php index 63e2cb36c..2008c3c72 100644 --- a/library/vendor/Zend/XmlRpc/Client/ServerIntrospection.php +++ b/library/vendor/Zend/XmlRpc/Client/ServerIntrospection.php @@ -56,7 +56,6 @@ class Zend_XmlRpc_Client_ServerIntrospection { $methods = $this->listMethods(); - require_once 'Zend/XmlRpc/Client/FaultException.php'; try { $signatures = $this->getSignatureForEachMethodByMulticall($methods); } catch (Zend_XmlRpc_Client_FaultException $e) { @@ -95,13 +94,11 @@ class Zend_XmlRpc_Client_ServerIntrospection if (! is_array($serverSignatures)) { $type = gettype($serverSignatures); $error = "Multicall return is malformed. Expected array, got $type"; - require_once 'Zend/XmlRpc/Client/IntrospectException.php'; throw new Zend_XmlRpc_Client_IntrospectException($error); } if (count($serverSignatures) != count($methods)) { $error = 'Bad number of signatures received from multicall'; - require_once 'Zend/XmlRpc/Client/IntrospectException.php'; throw new Zend_XmlRpc_Client_IntrospectException($error); } @@ -146,7 +143,6 @@ class Zend_XmlRpc_Client_ServerIntrospection $signature = $this->_system->methodSignature($method); if (!is_array($signature)) { $error = 'Invalid signature for method "' . $method . '"'; - require_once 'Zend/XmlRpc/Client/IntrospectException.php'; throw new Zend_XmlRpc_Client_IntrospectException($error); } return $signature; diff --git a/library/vendor/Zend/XmlRpc/Exception.php b/library/vendor/Zend/XmlRpc/Exception.php index fde2f5fd8..fa132ea5a 100644 --- a/library/vendor/Zend/XmlRpc/Exception.php +++ b/library/vendor/Zend/XmlRpc/Exception.php @@ -23,7 +23,6 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Fault.php b/library/vendor/Zend/XmlRpc/Fault.php index d278ccc6c..37cf68e22 100644 --- a/library/vendor/Zend/XmlRpc/Fault.php +++ b/library/vendor/Zend/XmlRpc/Fault.php @@ -22,7 +22,6 @@ /** * Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; /** * XMLRPC Faults @@ -194,7 +193,6 @@ class Zend_XmlRpc_Fault public function loadXml($fault) { if (!is_string($fault)) { - require_once 'Zend/XmlRpc/Exception.php'; throw new Zend_XmlRpc_Exception('Invalid XML provided to fault'); } @@ -202,7 +200,6 @@ class Zend_XmlRpc_Fault $xml = @new SimpleXMLElement($fault); } catch (Exception $e) { // Not valid XML - require_once 'Zend/XmlRpc/Exception.php'; throw new Zend_XmlRpc_Exception('Failed to parse XML fault: ' . $e->getMessage(), 500, $e); } @@ -214,7 +211,6 @@ class Zend_XmlRpc_Fault if (!$xml->fault->value->struct) { // not a proper fault - require_once 'Zend/XmlRpc/Exception.php'; throw new Zend_XmlRpc_Exception('Invalid fault structure', 500); } @@ -230,7 +226,6 @@ class Zend_XmlRpc_Fault } if (empty($code) && empty($message)) { - require_once 'Zend/XmlRpc/Exception.php'; throw new Zend_XmlRpc_Exception('Fault code and string required'); } @@ -261,7 +256,6 @@ class Zend_XmlRpc_Fault public static function isFault($xml) { $fault = new self(); - require_once 'Zend/XmlRpc/Exception.php'; try { $isFault = $fault->loadXml($xml); } catch (Zend_XmlRpc_Exception $e) { diff --git a/library/vendor/Zend/XmlRpc/Generator/DomDocument.php b/library/vendor/Zend/XmlRpc/Generator/DomDocument.php index abda51b32..8067804dd 100644 --- a/library/vendor/Zend/XmlRpc/Generator/DomDocument.php +++ b/library/vendor/Zend/XmlRpc/Generator/DomDocument.php @@ -23,7 +23,6 @@ /** * @var Zend_XmlRpc_Generator_GeneratorAbstract */ -require_once 'Zend/XmlRpc/Generator/GeneratorAbstract.php'; /** * DOMDocument based implementation of a XML/RPC generator diff --git a/library/vendor/Zend/XmlRpc/Generator/XmlWriter.php b/library/vendor/Zend/XmlRpc/Generator/XmlWriter.php index 4479a25e5..3683ff6e4 100644 --- a/library/vendor/Zend/XmlRpc/Generator/XmlWriter.php +++ b/library/vendor/Zend/XmlRpc/Generator/XmlWriter.php @@ -23,7 +23,6 @@ /** * @var Zend_XmlRpc_Generator_GeneratorAbstract */ -require_once 'Zend/XmlRpc/Generator/GeneratorAbstract.php'; /** * XML generator adapter based on XMLWriter diff --git a/library/vendor/Zend/XmlRpc/Request.php b/library/vendor/Zend/XmlRpc/Request.php index cd7b7c188..8f4274893 100644 --- a/library/vendor/Zend/XmlRpc/Request.php +++ b/library/vendor/Zend/XmlRpc/Request.php @@ -21,18 +21,14 @@ /** * Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; /** * Zend_XmlRpc_Fault */ -require_once 'Zend/XmlRpc/Fault.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; /** * XmlRpc Request object diff --git a/library/vendor/Zend/XmlRpc/Request/Http.php b/library/vendor/Zend/XmlRpc/Request/Http.php index 967e842fa..62990d566 100644 --- a/library/vendor/Zend/XmlRpc/Request/Http.php +++ b/library/vendor/Zend/XmlRpc/Request/Http.php @@ -21,7 +21,6 @@ /** * Zend_XmlRpc_Request */ -require_once 'Zend/XmlRpc/Request.php'; /** * XmlRpc Request object -- Request via HTTP @@ -63,7 +62,6 @@ class Zend_XmlRpc_Request_Http extends Zend_XmlRpc_Request { $xml = @file_get_contents('php://input'); if (!$xml) { - require_once 'Zend/XmlRpc/Fault.php'; $this->_fault = new Zend_XmlRpc_Fault(630); return; } diff --git a/library/vendor/Zend/XmlRpc/Request/Stdin.php b/library/vendor/Zend/XmlRpc/Request/Stdin.php index 43652614b..783ed2a61 100644 --- a/library/vendor/Zend/XmlRpc/Request/Stdin.php +++ b/library/vendor/Zend/XmlRpc/Request/Stdin.php @@ -21,7 +21,6 @@ /** * Zend_XmlRpc_Request */ -require_once 'Zend/XmlRpc/Request.php'; /** * XmlRpc Request object -- Request via STDIN diff --git a/library/vendor/Zend/XmlRpc/Response.php b/library/vendor/Zend/XmlRpc/Response.php index 5a820aa92..b54c6db22 100644 --- a/library/vendor/Zend/XmlRpc/Response.php +++ b/library/vendor/Zend/XmlRpc/Response.php @@ -21,18 +21,14 @@ /** * Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; /** * Zend_XmlRpc_Fault */ -require_once 'Zend/XmlRpc/Fault.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; /** * XmlRpc Response @@ -208,7 +204,6 @@ class Zend_XmlRpc_Response try { if (!isset($xml->params) || !isset($xml->params->param) || !isset($xml->params->param->value)) { - require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Missing XML-RPC value in XML'); } $valueXml = $xml->params->param->value->asXML(); diff --git a/library/vendor/Zend/XmlRpc/Response/Http.php b/library/vendor/Zend/XmlRpc/Response/Http.php index dd3634c02..b6ffe754c 100644 --- a/library/vendor/Zend/XmlRpc/Response/Http.php +++ b/library/vendor/Zend/XmlRpc/Response/Http.php @@ -21,7 +21,6 @@ /** * Zend_XmlRpc_Response */ -require_once 'Zend/XmlRpc/Response.php'; /** * HTTP response diff --git a/library/vendor/Zend/XmlRpc/Server.php b/library/vendor/Zend/XmlRpc/Server.php index a0587c3d6..700e016b5 100644 --- a/library/vendor/Zend/XmlRpc/Server.php +++ b/library/vendor/Zend/XmlRpc/Server.php @@ -23,64 +23,49 @@ /** * Extends Zend_Server_Abstract */ -require_once 'Zend/Server/Abstract.php'; /** * XMLRPC Request */ -require_once 'Zend/XmlRpc/Request.php'; /** * XMLRPC Response */ -require_once 'Zend/XmlRpc/Response.php'; /** * XMLRPC HTTP Response */ -require_once 'Zend/XmlRpc/Response/Http.php'; /** * XMLRPC server fault class */ -require_once 'Zend/XmlRpc/Server/Fault.php'; /** * XMLRPC server system methods class */ -require_once 'Zend/XmlRpc/Server/System.php'; /** * Convert PHP to and from xmlrpc native types */ -require_once 'Zend/XmlRpc/Value.php'; /** * Reflection API for function/method introspection */ -require_once 'Zend/Server/Reflection.php'; /** * Zend_Server_Reflection_Function_Abstract */ -require_once 'Zend/Server/Reflection/Function/Abstract.php'; /** * Specifically grab the Zend_Server_Reflection_Method for manually setting up * system.* methods and handling callbacks in {@link loadFunctions()}. */ -require_once 'Zend/Server/Reflection/Method.php'; /** * An XML-RPC server implementation * * Example: * - * require_once 'Zend/XmlRpc/Server.php'; - * require_once 'Zend/XmlRpc/Server/Cache.php'; - * require_once 'Zend/XmlRpc/Server/Fault.php'; - * require_once 'My/Exception.php'; - * require_once 'My/Fault/Observer.php'; * * // Instantiate server * $server = new Zend_XmlRpc_Server(); @@ -91,8 +76,6 @@ require_once 'Zend/Server/Reflection/Method.php'; * * // Get or build dispatch table: * if (!Zend_XmlRpc_Server_Cache::get($filename, $server)) { - * require_once 'Some/Service/Class.php'; - * require_once 'Another/Service/Class.php'; * * // Attach Some_Service_Class in 'some' namespace * $server->setClass('Some_Service_Class', 'some'); @@ -208,7 +191,6 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract { $system = $this->getSystem(); if (!method_exists($system, $method)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Unknown instance method called on server: ' . $method); } return call_user_func_array(array($system, $method), $params); @@ -233,7 +215,6 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract public function addFunction($function, $namespace = '') { if (!is_string($function) && !is_array($function)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Unable to attach function; invalid', 611); } @@ -246,7 +227,6 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract $function = (array) $function; foreach ($function as $func) { if (!is_string($func) || !function_exists($func)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Unable to attach function; invalid', 611); } $reflection = Zend_Server_Reflection::reflectFunction($func, $argv, $namespace); @@ -274,7 +254,6 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract public function setClass($class, $namespace = '', $argv = null) { if (is_string($class) && !class_exists($class)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Invalid method class', 610); } @@ -304,7 +283,6 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract if (empty($fault)) { $fault = 'Unknown Error'; } - require_once 'Zend/XmlRpc/Server/Exception.php'; $fault = new Zend_XmlRpc_Server_Exception($fault, $code); } @@ -323,7 +301,6 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract if ((!$request || !$request instanceof Zend_XmlRpc_Request) && (null === ($request = $this->getRequest())) ) { - require_once 'Zend/XmlRpc/Request/Http.php'; $request = new Zend_XmlRpc_Request_Http(); $request->setEncoding($this->getEncoding()); } @@ -364,7 +341,6 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract } else { $type = gettype($definition); } - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Unable to load server definition; must be an array or Zend_Server_Definition, received ' . $type, 612); } @@ -428,12 +404,10 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract if (is_string($request) && class_exists($request)) { $request = new $request(); if (!$request instanceof Zend_XmlRpc_Request) { - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Invalid request class'); } $request->setEncoding($this->getEncoding()); } elseif (!$request instanceof Zend_XmlRpc_Request) { - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Invalid request object'); } @@ -462,7 +436,6 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract if (!class_exists($class) or ($c = new ReflectionClass($class) and !$c->isSubclassOf('Zend_XmlRpc_Response'))) { - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Invalid response class'); } $this->_responseClass = $class; @@ -559,7 +532,6 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract // Check for valid method if (!$this->_table->hasMethod($method)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Method "' . $method . '" does not exist', 620); } @@ -592,7 +564,6 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract } } if (!$matched) { - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Calling parameters do not match signature', 623); } diff --git a/library/vendor/Zend/XmlRpc/Server/Cache.php b/library/vendor/Zend/XmlRpc/Server/Cache.php index 6e8aaebc8..609714441 100644 --- a/library/vendor/Zend/XmlRpc/Server/Cache.php +++ b/library/vendor/Zend/XmlRpc/Server/Cache.php @@ -21,7 +21,6 @@ */ /** Zend_Server_Cache */ -require_once 'Zend/Server/Cache.php'; /** * Zend_XmlRpc_Server_Cache: cache Zend_XmlRpc_Server server definition diff --git a/library/vendor/Zend/XmlRpc/Server/Exception.php b/library/vendor/Zend/XmlRpc/Server/Exception.php index 5fb7facc0..f8370bbaf 100644 --- a/library/vendor/Zend/XmlRpc/Server/Exception.php +++ b/library/vendor/Zend/XmlRpc/Server/Exception.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Exception */ -require_once 'Zend/XmlRpc/Exception.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Server/Fault.php b/library/vendor/Zend/XmlRpc/Server/Fault.php index 8e8fb7d98..e8928d185 100644 --- a/library/vendor/Zend/XmlRpc/Server/Fault.php +++ b/library/vendor/Zend/XmlRpc/Server/Fault.php @@ -23,7 +23,6 @@ /** * Zend_XmlRpc_Fault */ -require_once 'Zend/XmlRpc/Fault.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Server/System.php b/library/vendor/Zend/XmlRpc/Server/System.php index 07376cbb4..15c857937 100644 --- a/library/vendor/Zend/XmlRpc/Server/System.php +++ b/library/vendor/Zend/XmlRpc/Server/System.php @@ -70,7 +70,6 @@ class Zend_XmlRpc_Server_System { $table = $this->_server->getDispatchTable(); if (!$table->hasMethod($method)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Method "' . $method . '" does not exist', 640); } @@ -87,7 +86,6 @@ class Zend_XmlRpc_Server_System { $table = $this->_server->getDispatchTable(); if (!$table->hasMethod($method)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Method "' . $method . '" does not exist', 640); } $method = $table->getMethod($method)->toArray(); diff --git a/library/vendor/Zend/XmlRpc/Value.php b/library/vendor/Zend/XmlRpc/Value.php index 08ddf2490..82060de16 100644 --- a/library/vendor/Zend/XmlRpc/Value.php +++ b/library/vendor/Zend/XmlRpc/Value.php @@ -106,10 +106,8 @@ abstract class Zend_XmlRpc_Value { if (!self::$_generator) { if (extension_loaded('xmlwriter')) { - require_once 'Zend/XmlRpc/Generator/XmlWriter.php'; self::$_generator = new Zend_XmlRpc_Generator_XmlWriter(); } else { - require_once 'Zend/XmlRpc/Generator/DomDocument.php'; self::$_generator = new Zend_XmlRpc_Generator_DomDocument(); } } @@ -203,51 +201,40 @@ abstract class Zend_XmlRpc_Value case self::XMLRPC_TYPE_I4: // fall through to the next case case self::XMLRPC_TYPE_INTEGER: - require_once 'Zend/XmlRpc/Value/Integer.php'; return new Zend_XmlRpc_Value_Integer($value); case self::XMLRPC_TYPE_I8: // fall through to the next case case self::XMLRPC_TYPE_APACHEI8: - require_once 'Zend/XmlRpc/Value/BigInteger.php'; return new Zend_XmlRpc_Value_BigInteger($value); case self::XMLRPC_TYPE_DOUBLE: - require_once 'Zend/XmlRpc/Value/Double.php'; return new Zend_XmlRpc_Value_Double($value); case self::XMLRPC_TYPE_BOOLEAN: - require_once 'Zend/XmlRpc/Value/Boolean.php'; return new Zend_XmlRpc_Value_Boolean($value); case self::XMLRPC_TYPE_STRING: - require_once 'Zend/XmlRpc/Value/String.php'; return new Zend_XmlRpc_Value_String($value); case self::XMLRPC_TYPE_BASE64: - require_once 'Zend/XmlRpc/Value/Base64.php'; return new Zend_XmlRpc_Value_Base64($value); case self::XMLRPC_TYPE_NIL: // fall through to the next case case self::XMLRPC_TYPE_APACHENIL: - require_once 'Zend/XmlRpc/Value/Nil.php'; return new Zend_XmlRpc_Value_Nil(); case self::XMLRPC_TYPE_DATETIME: - require_once 'Zend/XmlRpc/Value/DateTime.php'; return new Zend_XmlRpc_Value_DateTime($value); case self::XMLRPC_TYPE_ARRAY: - require_once 'Zend/XmlRpc/Value/Array.php'; return new Zend_XmlRpc_Value_Array($value); case self::XMLRPC_TYPE_STRUCT: - require_once 'Zend/XmlRpc/Value/Struct.php'; return new Zend_XmlRpc_Value_Struct($value); default: - require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Given type is not a '. __CLASS__ .' constant'); } } @@ -306,7 +293,6 @@ abstract class Zend_XmlRpc_Value return $value; } if ($value instanceof Zend_Crypt_Math_BigInteger) { - require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception( 'Using Zend_Crypt_Math_BigInteger to get an ' . 'instance of Zend_XmlRpc_Value_BigInteger is not ' . @@ -318,38 +304,30 @@ abstract class Zend_XmlRpc_Value switch (self::getXmlRpcTypeByValue($value)) { case self::XMLRPC_TYPE_DATETIME: - require_once 'Zend/XmlRpc/Value/DateTime.php'; return new Zend_XmlRpc_Value_DateTime($value); case self::XMLRPC_TYPE_ARRAY: - require_once 'Zend/XmlRpc/Value/Array.php'; return new Zend_XmlRpc_Value_Array($value); case self::XMLRPC_TYPE_STRUCT: - require_once 'Zend/XmlRpc/Value/Struct.php'; return new Zend_XmlRpc_Value_Struct($value); case self::XMLRPC_TYPE_INTEGER: - require_once 'Zend/XmlRpc/Value/Integer.php'; return new Zend_XmlRpc_Value_Integer($value); case self::XMLRPC_TYPE_DOUBLE: - require_once 'Zend/XmlRpc/Value/Double.php'; return new Zend_XmlRpc_Value_Double($value); case self::XMLRPC_TYPE_BOOLEAN: - require_once 'Zend/XmlRpc/Value/Boolean.php'; return new Zend_XmlRpc_Value_Boolean($value); case self::XMLRPC_TYPE_NIL: - require_once 'Zend/XmlRpc/Value/Nil.php'; return new Zend_XmlRpc_Value_Nil; case self::XMLRPC_TYPE_STRING: // Fall through to the next case default: // If type isn't identified (or identified as string), it treated as string - require_once 'Zend/XmlRpc/Value/String.php'; return new Zend_XmlRpc_Value_String($value); } } @@ -375,40 +353,32 @@ abstract class Zend_XmlRpc_Value case self::XMLRPC_TYPE_I4: // Fall through to the next case case self::XMLRPC_TYPE_INTEGER: - require_once 'Zend/XmlRpc/Value/Integer.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Integer($value); break; case self::XMLRPC_TYPE_APACHEI8: // Fall through to the next case case self::XMLRPC_TYPE_I8: - require_once 'Zend/XmlRpc/Value/BigInteger.php'; $xmlrpcValue = new Zend_XmlRpc_Value_BigInteger($value); break; case self::XMLRPC_TYPE_DOUBLE: - require_once 'Zend/XmlRpc/Value/Double.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Double($value); break; case self::XMLRPC_TYPE_BOOLEAN: - require_once 'Zend/XmlRpc/Value/Boolean.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Boolean($value); break; case self::XMLRPC_TYPE_STRING: - require_once 'Zend/XmlRpc/Value/String.php'; $xmlrpcValue = new Zend_XmlRpc_Value_String($value); break; case self::XMLRPC_TYPE_DATETIME: // The value should already be in a iso8601 format - require_once 'Zend/XmlRpc/Value/DateTime.php'; $xmlrpcValue = new Zend_XmlRpc_Value_DateTime($value); break; case self::XMLRPC_TYPE_BASE64: // The value should already be base64 encoded - require_once 'Zend/XmlRpc/Value/Base64.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Base64($value, true); break; case self::XMLRPC_TYPE_NIL: // Fall through to the next case case self::XMLRPC_TYPE_APACHENIL: // The value should always be NULL - require_once 'Zend/XmlRpc/Value/Nil.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Nil(); break; case self::XMLRPC_TYPE_ARRAY: @@ -423,7 +393,6 @@ abstract class Zend_XmlRpc_Value } if (null === $data) { - require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Invalid XML for XML-RPC native '. self::XMLRPC_TYPE_ARRAY .' type: ARRAY tag must contain DATA tag'); } $values = array(); @@ -432,7 +401,6 @@ abstract class Zend_XmlRpc_Value foreach ($data->value as $element) { $values[] = self::_xmlStringToNativeXmlRpc($element); } - require_once 'Zend/XmlRpc/Value/Array.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Array($values); break; case self::XMLRPC_TYPE_STRUCT: @@ -448,11 +416,9 @@ abstract class Zend_XmlRpc_Value } $values[(string)$member->name] = self::_xmlStringToNativeXmlRpc($member->value); } - require_once 'Zend/XmlRpc/Value/Struct.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Struct($values); break; default: - require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Value type \''. $type .'\' parsed from the XML string is not a known XML-RPC native type'); break; } @@ -471,7 +437,6 @@ abstract class Zend_XmlRpc_Value $xml = new SimpleXMLElement($xml); } catch (Exception $e) { // The given string is not a valid XML - require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Failed to create XML-RPC value from XML string: ' . $e->getMessage(), $e->getCode(), $e); } } diff --git a/library/vendor/Zend/XmlRpc/Value/Array.php b/library/vendor/Zend/XmlRpc/Value/Array.php index 7f01b25c4..9da17a1e9 100644 --- a/library/vendor/Zend/XmlRpc/Value/Array.php +++ b/library/vendor/Zend/XmlRpc/Value/Array.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value_Collection */ -require_once 'Zend/XmlRpc/Value/Collection.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Value/Base64.php b/library/vendor/Zend/XmlRpc/Value/Base64.php index b6f77e768..0e6224cdf 100644 --- a/library/vendor/Zend/XmlRpc/Value/Base64.php +++ b/library/vendor/Zend/XmlRpc/Value/Base64.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Value/BigInteger.php b/library/vendor/Zend/XmlRpc/Value/BigInteger.php index 8004e5507..ce7f3e4b5 100644 --- a/library/vendor/Zend/XmlRpc/Value/BigInteger.php +++ b/library/vendor/Zend/XmlRpc/Value/BigInteger.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value_Integer */ -require_once 'Zend/XmlRpc/Value/Integer.php'; /** * @category Zend @@ -40,7 +39,6 @@ class Zend_XmlRpc_Value_BigInteger extends Zend_XmlRpc_Value_Integer */ public function __construct($value) { - require_once 'Zend/Crypt/Math/BigInteger.php'; $integer = new Zend_Crypt_Math_BigInteger; $this->_value = $integer->init($value); $this->_type = self::XMLRPC_TYPE_I8; diff --git a/library/vendor/Zend/XmlRpc/Value/Boolean.php b/library/vendor/Zend/XmlRpc/Value/Boolean.php index 76f994f94..a8234e7b9 100644 --- a/library/vendor/Zend/XmlRpc/Value/Boolean.php +++ b/library/vendor/Zend/XmlRpc/Value/Boolean.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Value/Collection.php b/library/vendor/Zend/XmlRpc/Value/Collection.php index f2194899e..6375a7b8d 100644 --- a/library/vendor/Zend/XmlRpc/Value/Collection.php +++ b/library/vendor/Zend/XmlRpc/Value/Collection.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Value/DateTime.php b/library/vendor/Zend/XmlRpc/Value/DateTime.php index 2957e2066..3140f48ed 100644 --- a/library/vendor/Zend/XmlRpc/Value/DateTime.php +++ b/library/vendor/Zend/XmlRpc/Value/DateTime.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; /** @@ -71,7 +70,6 @@ class Zend_XmlRpc_Value_DateTime extends Zend_XmlRpc_Value_Scalar } else { $timestamp = new DateTime($value); if ($timestamp === false) { // cannot convert the value to a timestamp - require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Cannot convert given value \''. $value .'\' to a timestamp'); } diff --git a/library/vendor/Zend/XmlRpc/Value/Double.php b/library/vendor/Zend/XmlRpc/Value/Double.php index 087cd8de7..7fba38b55 100644 --- a/library/vendor/Zend/XmlRpc/Value/Double.php +++ b/library/vendor/Zend/XmlRpc/Value/Double.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Value/Exception.php b/library/vendor/Zend/XmlRpc/Value/Exception.php index 8003364a9..0fa593d47 100644 --- a/library/vendor/Zend/XmlRpc/Value/Exception.php +++ b/library/vendor/Zend/XmlRpc/Value/Exception.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Exception */ -require_once 'Zend/XmlRpc/Exception.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Value/Integer.php b/library/vendor/Zend/XmlRpc/Value/Integer.php index 9f0e42323..d48e48783 100644 --- a/library/vendor/Zend/XmlRpc/Value/Integer.php +++ b/library/vendor/Zend/XmlRpc/Value/Integer.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; /** @@ -45,7 +44,6 @@ class Zend_XmlRpc_Value_Integer extends Zend_XmlRpc_Value_Scalar public function __construct($value) { if ($value > PHP_INT_MAX) { - require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Overlong integer given'); } diff --git a/library/vendor/Zend/XmlRpc/Value/Nil.php b/library/vendor/Zend/XmlRpc/Value/Nil.php index b4f3d5b23..6b6846d31 100644 --- a/library/vendor/Zend/XmlRpc/Value/Nil.php +++ b/library/vendor/Zend/XmlRpc/Value/Nil.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Value/Scalar.php b/library/vendor/Zend/XmlRpc/Value/Scalar.php index 17f28ae00..54916337e 100644 --- a/library/vendor/Zend/XmlRpc/Value/Scalar.php +++ b/library/vendor/Zend/XmlRpc/Value/Scalar.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; /** diff --git a/library/vendor/Zend/XmlRpc/Value/String.php b/library/vendor/Zend/XmlRpc/Value/String.php index 77e82e03f..923ac06b7 100644 --- a/library/vendor/Zend/XmlRpc/Value/String.php +++ b/library/vendor/Zend/XmlRpc/Value/String.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; /** * @package Zend_XmlRpc diff --git a/library/vendor/Zend/XmlRpc/Value/Struct.php b/library/vendor/Zend/XmlRpc/Value/Struct.php index 01dfc7ad2..91b3211d5 100644 --- a/library/vendor/Zend/XmlRpc/Value/Struct.php +++ b/library/vendor/Zend/XmlRpc/Value/Struct.php @@ -24,7 +24,6 @@ /** * Zend_XmlRpc_Value_Collection */ -require_once 'Zend/XmlRpc/Value/Collection.php'; /**