From 436461b4ab39f091cbb1b51d297e6102a7d44f3c Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 2 Nov 2012 14:45:33 +0700 Subject: [PATCH 1/6] Fix : change self:: with static:: in Zend\Debug\Debug.php in calling static propery/method --- library/Zend/Debug/Debug.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/Zend/Debug/Debug.php b/library/Zend/Debug/Debug.php index c56fd3dd7b4..43c907bf842 100644 --- a/library/Zend/Debug/Debug.php +++ b/library/Zend/Debug/Debug.php @@ -38,10 +38,10 @@ class Debug */ public static function getSapi() { - if (self::$sapi === null) { - self::$sapi = PHP_SAPI; + if (static::$sapi === null) { + static::$sapi = PHP_SAPI; } - return self::$sapi; + return static::$sapi; } /** @@ -53,7 +53,7 @@ public static function getSapi() */ public static function setSapi($sapi) { - self::$sapi = $sapi; + static::$sapi = $sapi; } /** @@ -103,7 +103,7 @@ public static function dump($var, $label=null, $echo=true) // neaten the newlines and indents $output = preg_replace("/\]\=\>\n(\s+)/m", "] => ", $output); - if (self::getSapi() == 'cli') { + if (static::getSapi() == 'cli') { $output = PHP_EOL . $label . PHP_EOL . $output . PHP_EOL; From 5ee2a5a07d1dfc96b4c2dfb1536a456dd126d321 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 2 Nov 2012 17:23:57 +0700 Subject: [PATCH 2/6] Fix : change self:: with static:: in Zend\I18n\Translator\Plural\Rule.php in calling static propery/method --- library/Zend/I18n/Translator/Plural/Rule.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/library/Zend/I18n/Translator/Plural/Rule.php b/library/Zend/I18n/Translator/Plural/Rule.php index 05becd5123b..a0660d24f42 100644 --- a/library/Zend/I18n/Translator/Plural/Rule.php +++ b/library/Zend/I18n/Translator/Plural/Rule.php @@ -182,8 +182,8 @@ protected function evaluateAstPart(array $ast, $number) */ public static function fromString($string) { - if (self::$parser === null) { - self::$parser = new Parser(); + if (static::$parser === null) { + static::$parser = new Parser(); } if (!preg_match('(nplurals=(?P\d+))', $string, $match)) { @@ -202,8 +202,8 @@ public static function fromString($string) )); } - $tree = self::$parser->parse($match['plural']); - $ast = self::createAst($tree); + $tree = static::$parser->parse($match['plural']); + $ast = static::createAst($tree); return new self($numPlurals, $ast); } @@ -230,18 +230,18 @@ protected static function createAst(Symbol $symbol) break; case '!': - $ast['arguments'][] = self::createAst($symbol->first); + $ast['arguments'][] = static::createAst($symbol->first); break; case '?': - $ast['arguments'][] = self::createAst($symbol->first); - $ast['arguments'][] = self::createAst($symbol->second); - $ast['arguments'][] = self::createAst($symbol->third); + $ast['arguments'][] = static::createAst($symbol->first); + $ast['arguments'][] = static::createAst($symbol->second); + $ast['arguments'][] = static::createAst($symbol->third); break; default: - $ast['arguments'][] = self::createAst($symbol->first); - $ast['arguments'][] = self::createAst($symbol->second); + $ast['arguments'][] = static::createAst($symbol->first); + $ast['arguments'][] = static::createAst($symbol->second); break; } From 5061216da82e2c70528aca7e051d36c4055769a1 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 2 Nov 2012 17:33:32 +0700 Subject: [PATCH 3/6] Fix : change self:: with static:: in Zend\Text\Table in calling static propery/method --- library/Zend/Text/Table/Table.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/Zend/Text/Table/Table.php b/library/Zend/Text/Table/Table.php index c0a14545536..f8dc0d132a8 100644 --- a/library/Zend/Text/Table/Table.php +++ b/library/Zend/Text/Table/Table.php @@ -122,7 +122,7 @@ public function __construct($options = null) // If no decorator was given, use default unicode decorator if ($this->decorator === null) { - if (self::getOutputCharset() === 'utf-8') { + if (static::getOutputCharset() === 'utf-8') { $this->setDecorator('unicode'); } else { $this->setDecorator('ascii'); @@ -267,7 +267,7 @@ public function setDefaultColumnAlign($columnNum, $align) */ public static function setInputCharset($charset) { - self::$inputCharset = strtolower($charset); + static::$inputCharset = strtolower($charset); } /** @@ -277,7 +277,7 @@ public static function setInputCharset($charset) */ public static function getInputCharset() { - return self::$inputCharset; + return static::$inputCharset; } /** @@ -287,7 +287,7 @@ public static function getInputCharset() */ public static function setOutputCharset($charset) { - self::$outputCharset = strtolower($charset); + static::$outputCharset = strtolower($charset); } /** @@ -297,7 +297,7 @@ public static function setOutputCharset($charset) */ public static function getOutputCharset() { - return self::$outputCharset; + return static::$outputCharset; } /** From 7cee74889a8a0216a6d12728f754e5182a65126b Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 4 Nov 2012 06:42:12 +0700 Subject: [PATCH 4/6] change self:: with static:: in Zend\XmlRpc\AbstractValue in calling static property/method --- library/Zend/XmlRpc/AbstractValue.php | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/library/Zend/XmlRpc/AbstractValue.php b/library/Zend/XmlRpc/AbstractValue.php index 4186a4af354..828969f909c 100644 --- a/library/Zend/XmlRpc/AbstractValue.php +++ b/library/Zend/XmlRpc/AbstractValue.php @@ -95,15 +95,15 @@ public function getType() */ public static function getGenerator() { - if (!self::$generator) { + if (!static::$generator) { if (extension_loaded('xmlwriter')) { - self::$generator = new Generator\XmlWriter(); + static::$generator = new Generator\XmlWriter(); } else { - self::$generator = new Generator\DomDocument(); + static::$generator = new Generator\DomDocument(); } } - return self::$generator; + return static::$generator; } /** @@ -114,7 +114,7 @@ public static function getGenerator() */ public static function setGenerator(Generator\GeneratorInterface $generator = null) { - self::$generator = $generator; + static::$generator = $generator; } /** @@ -125,9 +125,9 @@ public static function setGenerator(Generator\GeneratorInterface $generator = nu */ public static function setEncoding($encoding) { - $generator = self::getGenerator(); + $generator = static::getGenerator(); $newGenerator = new $generator($encoding); - self::setGenerator($newGenerator); + static::setGenerator($newGenerator); } /** @@ -182,11 +182,11 @@ public static function getXmlRpcValue($value, $type = self::AUTO_DETECT_TYPE) switch ($type) { case self::AUTO_DETECT_TYPE: // Auto detect the XML-RPC native type from the PHP type of $value - return self::_phpVarToNativeXmlRpc($value); + return static::_phpVarToNativeXmlRpc($value); case self::XML_STRING: // Parse the XML string given in $value and get the XML-RPC value in it - return self::_xmlStringToNativeXmlRpc($value); + return static::_xmlStringToNativeXmlRpc($value); case self::XMLRPC_TYPE_I4: // fall through to the next case @@ -293,7 +293,7 @@ protected static function _phpVarToNativeXmlRpc($value) } } - switch (self::getXmlRpcTypeByValue($value)) { + switch (static::getXmlRpcTypeByValue($value)) { case self::XMLRPC_TYPE_DATETIME: return new Value\DateTime($value); @@ -335,9 +335,9 @@ protected static function _phpVarToNativeXmlRpc($value) */ protected static function _xmlStringToNativeXmlRpc($xml) { - self::_createSimpleXMLElement($xml); + static::_createSimpleXMLElement($xml); - self::_extractTypeAndValue($xml, $type, $value); + static::_extractTypeAndValue($xml, $type, $value); switch ($type) { // All valid and known XML-RPC native values @@ -384,13 +384,13 @@ protected static function _xmlStringToNativeXmlRpc($xml) } if (null === $data) { - throw new Exception\ValueException('Invalid XML for XML-RPC native '. self::XMLRPC_TYPE_ARRAY .' type: ARRAY tag must contain DATA tag'); + throw new Exception\ValueException('Invalid XML for XML-RPC native '. static::XMLRPC_TYPE_ARRAY .' type: ARRAY tag must contain DATA tag'); } $values = array(); // Parse all the elements of the array from the XML string // (simple xml element) to Value objects foreach ($data->value as $element) { - $values[] = self::_xmlStringToNativeXmlRpc($element); + $values[] = static::_xmlStringToNativeXmlRpc($element); } $xmlrpcValue = new Value\ArrayValue($values); break; @@ -405,7 +405,7 @@ protected static function _xmlStringToNativeXmlRpc($xml) continue; //throw new Value_Exception('Member of the '. self::XMLRPC_TYPE_STRUCT .' XML-RPC native type must contain a VALUE tag'); } - $values[(string)$member->name] = self::_xmlStringToNativeXmlRpc($member->value); + $values[(string)$member->name] = static::_xmlStringToNativeXmlRpc($member->value); } $xmlrpcValue = new Value\Struct($values); break; From 172da5d8551bdce58394455e32d6813d894bebe9 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 4 Nov 2012 06:43:56 +0700 Subject: [PATCH 5/6] fix accident XMLRPC_TYPE_ARRAY changed to static --- library/Zend/XmlRpc/AbstractValue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Zend/XmlRpc/AbstractValue.php b/library/Zend/XmlRpc/AbstractValue.php index 828969f909c..a429058ef1d 100644 --- a/library/Zend/XmlRpc/AbstractValue.php +++ b/library/Zend/XmlRpc/AbstractValue.php @@ -384,7 +384,7 @@ protected static function _xmlStringToNativeXmlRpc($xml) } if (null === $data) { - throw new Exception\ValueException('Invalid XML for XML-RPC native '. static::XMLRPC_TYPE_ARRAY .' type: ARRAY tag must contain DATA tag'); + throw new Exception\ValueException('Invalid XML for XML-RPC native '. self::XMLRPC_TYPE_ARRAY .' type: ARRAY tag must contain DATA tag'); } $values = array(); // Parse all the elements of the array from the XML string From f5f8a06ef84fe5c9557242a515a09d4f24512218 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Thu, 8 Nov 2012 17:21:34 +0700 Subject: [PATCH 6/6] fix self:: to static:: in others --- library/Zend/Barcode/Barcode.php | 32 +++---- library/Zend/Barcode/Object/Code128.php | 4 +- library/Zend/Captcha/AbstractWord.php | 4 +- library/Zend/Code/Generator/FileGenerator.php | 2 +- .../Code/Generator/FileGeneratorRegistry.php | 2 +- .../Code/Generator/ParameterGenerator.php | 2 +- library/Zend/Config/Factory.php | 14 ++-- library/Zend/Crypt/BlockCipher.php | 10 +-- library/Zend/Crypt/Hash.php | 10 +-- library/Zend/Crypt/Hmac.php | 10 +-- .../Zend/Crypt/Key/Derivation/SaltedS2k.php | 4 +- .../Zend/Crypt/PublicKey/DiffieHellman.php | 6 +- library/Zend/Crypt/Symmetric/Mcrypt.php | 10 +-- .../Db/Adapter/Driver/Pgsql/Statement.php | 2 +- library/Zend/Dom/Css2Xpath.php | 2 +- .../Zend/Feed/PubSubHubbub/PubSubHubbub.php | 12 +-- library/Zend/Feed/Reader/Reader.php | 84 +++++++++---------- library/Zend/Feed/Writer/Writer.php | 48 +++++------ .../File/Transfer/Adapter/AbstractAdapter.php | 2 +- library/Zend/File/Transfer/Adapter/Http.php | 16 ++-- library/Zend/Filter/StaticFilter.php | 6 +- .../Form/Annotation/AnnotationBuilder.php | 2 +- library/Zend/Form/Form.php | 2 +- library/Zend/Http/Client.php | 8 +- library/Zend/Http/Client/Adapter/Socket.php | 4 +- library/Zend/Http/Header/CacheControl.php | 8 +- library/Zend/I18n/Validator/Alnum.php | 8 +- library/Zend/I18n/Validator/Alpha.php | 10 +-- library/Zend/I18n/Validator/PostCode.php | 4 +- library/Zend/Json/Encoder.php | 2 +- library/Zend/Json/Json.php | 28 +++---- library/Zend/Json/Server/Smd.php | 2 +- library/Zend/Ldap/Attribute.php | 24 +++--- library/Zend/Ldap/Converter/Converter.php | 22 ++--- library/Zend/Ldap/Dn.php | 56 ++++++------- library/Zend/Ldap/Filter.php | 4 +- library/Zend/Ldap/Filter/MaskFilter.php | 2 +- library/Zend/Ldap/Ldap.php | 4 +- library/Zend/Ldap/Node.php | 4 +- library/Zend/Ldap/Node/AbstractNode.php | 2 +- library/Zend/Loader/AutoloaderFactory.php | 2 +- library/Zend/Log/Formatter/Base.php | 2 +- library/Zend/Log/Logger.php | 12 +-- library/Zend/Log/Writer/Syslog.php | 8 +- library/Zend/Mail/Storage/Imap.php | 6 +- library/Zend/Mail/Storage/Maildir.php | 2 +- library/Zend/Mime/Decode.php | 6 +- library/Zend/Mime/Mime.php | 14 ++-- library/Zend/Mvc/Router/Http/Segment.php | 2 +- .../Zend/Mvc/Router/RoutePluginManager.php | 2 +- library/Zend/Navigation/Page/AbstractPage.php | 8 +- library/Zend/Navigation/Page/Mvc.php | 6 +- library/Zend/Paginator/Paginator.php | 52 ++++++------ library/Zend/Serializer/Adapter/IgBinary.php | 6 +- .../Zend/Serializer/Adapter/PhpSerialize.php | 6 +- .../Zend/Serializer/Adapter/PythonPickle.php | 36 ++++---- library/Zend/Server/Cache.php | 2 +- library/Zend/Session/Container.php | 12 +-- library/Zend/Session/Validator/RemoteAddr.php | 6 +- library/Zend/Stdlib/ArrayUtils.php | 2 +- library/Zend/Stdlib/CallbackHandler.php | 20 ++--- library/Zend/Stdlib/Glob.php | 20 ++--- library/Zend/Stdlib/Hydrator/Reflection.php | 6 +- library/Zend/Uri/Http.php | 4 +- library/Zend/Validator/AbstractValidator.php | 14 ++-- library/Zend/Validator/Digits.php | 6 +- library/Zend/Validator/Iban.php | 8 +- library/Zend/Validator/StaticValidator.php | 6 +- library/Zend/Version/Version.php | 2 +- .../View/Helper/Navigation/AbstractHelper.php | 12 +-- library/Zend/View/Helper/Navigation/Links.php | 4 +- .../Zend/View/Helper/PaginationControl.php | 14 ++-- library/Zend/XmlRpc/AbstractValue.php | 2 +- library/Zend/XmlRpc/Server.php | 2 +- library/Zend/XmlRpc/Server/Fault.php | 20 ++--- .../Zend/XmlRpc/Value/AbstractCollection.php | 2 +- 76 files changed, 406 insertions(+), 406 deletions(-) diff --git a/library/Zend/Barcode/Barcode.php b/library/Zend/Barcode/Barcode.php index 35911e80830..e78da638cc4 100644 --- a/library/Zend/Barcode/Barcode.php +++ b/library/Zend/Barcode/Barcode.php @@ -56,11 +56,11 @@ class Barcode */ public static function getObjectPluginManager() { - if (!self::$objectPlugins instanceof ObjectPluginManager) { - self::$objectPlugins = new ObjectPluginManager(); + if (!static::$objectPlugins instanceof ObjectPluginManager) { + static::$objectPlugins = new ObjectPluginManager(); } - return self::$objectPlugins; + return static::$objectPlugins; } /** @@ -70,11 +70,11 @@ public static function getObjectPluginManager() */ public static function getRendererPluginManager() { - if (!self::$rendererPlugins instanceof RendererPluginManager) { - self::$rendererPlugins = new RendererPluginManager(); + if (!static::$rendererPlugins instanceof RendererPluginManager) { + static::$rendererPlugins = new RendererPluginManager(); } - return self::$rendererPlugins; + return static::$rendererPlugins; } /** @@ -131,12 +131,12 @@ public static function factory($barcode, } try { - $barcode = self::makeBarcode($barcode, $barcodeConfig); - $renderer = self::makeRenderer($renderer, $rendererConfig); + $barcode = static::makeBarcode($barcode, $barcodeConfig); + $renderer = static::makeRenderer($renderer, $rendererConfig); } catch (Exception\ExceptionInterface $e) { if ($automaticRenderError && !($e instanceof Exception\RendererCreationException)) { - $barcode = self::makeBarcode('error', array( 'text' => $e->getMessage() )); - $renderer = self::makeRenderer($renderer, array()); + $barcode = static::makeBarcode('error', array( 'text' => $e->getMessage() )); + $renderer = static::makeRenderer($renderer, array()); } else { throw $e; } @@ -197,7 +197,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array()) ); } - return self::getObjectPluginManager()->get($barcode, $barcodeConfig); + return static::getObjectPluginManager()->get($barcode, $barcodeConfig); } /** @@ -249,7 +249,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array ); } - return self::getRendererPluginManager()->get($renderer, $rendererConfig); + return static::getRendererPluginManager()->get($renderer, $rendererConfig); } /** @@ -265,7 +265,7 @@ public static function render($barcode, $barcodeConfig = array(), $rendererConfig = array()) { - self::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->render(); + static::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->render(); } /** @@ -282,7 +282,7 @@ public static function draw($barcode, $barcodeConfig = array(), $rendererConfig = array()) { - return self::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->draw(); + return static::factory($barcode, $renderer, $barcodeConfig, $rendererConfig)->draw(); } /** @@ -293,7 +293,7 @@ public static function draw($barcode, */ public static function setBarcodeFont($font) { - self::$staticFont = $font; + static::$staticFont = $font; } /** @@ -303,6 +303,6 @@ public static function setBarcodeFont($font) */ public static function getBarcodeFont() { - return self::$staticFont; + return static::$staticFont; } } diff --git a/library/Zend/Barcode/Object/Code128.php b/library/Zend/Barcode/Object/Code128.php index eed0497d441..e96d7fe638e 100644 --- a/library/Zend/Barcode/Object/Code128.php +++ b/library/Zend/Barcode/Object/Code128.php @@ -218,8 +218,8 @@ protected function convertToBarcodeChars($string) $char = $string[$pos]; $code = null; - if (self::_isDigit($string, $pos, 4) && $currentCharset != 'C' - || self::_isDigit($string, $pos, 2) && $currentCharset == 'C') { + if (static::_isDigit($string, $pos, 4) && $currentCharset != 'C' + || static::_isDigit($string, $pos, 2) && $currentCharset == 'C') { /** * Switch to C if the next 4 chars are numeric or stay C if the next 2 * chars are numeric diff --git a/library/Zend/Captcha/AbstractWord.php b/library/Zend/Captcha/AbstractWord.php index 416103fa9fa..d1847f62942 100644 --- a/library/Zend/Captcha/AbstractWord.php +++ b/library/Zend/Captcha/AbstractWord.php @@ -311,8 +311,8 @@ protected function generateWord() { $word = ''; $wordLen = $this->getWordLen(); - $vowels = $this->useNumbers ? self::$VN : self::$V; - $consonants = $this->useNumbers ? self::$CN : self::$C; + $vowels = $this->useNumbers ? static::$VN : static::$V; + $consonants = $this->useNumbers ? static::$CN : static::$C; for ($i=0; $i < $wordLen; $i = $i + 2) { // generate word with mix of vowels and consonants diff --git a/library/Zend/Code/Generator/FileGenerator.php b/library/Zend/Code/Generator/FileGenerator.php index ead132215eb..66f86f72ed2 100644 --- a/library/Zend/Code/Generator/FileGenerator.php +++ b/library/Zend/Code/Generator/FileGenerator.php @@ -91,7 +91,7 @@ public static function fromReflectedFileName($filePath, $includeIfNotAlreadyIncl include $realpath; } - $codeGenerator = self::fromReflection(($fileReflector = new FileReflection($realpath))); + $codeGenerator = static::fromReflection(($fileReflector = new FileReflection($realpath))); return $codeGenerator; } diff --git a/library/Zend/Code/Generator/FileGeneratorRegistry.php b/library/Zend/Code/Generator/FileGeneratorRegistry.php index e23ccd63244..0d4eba37766 100644 --- a/library/Zend/Code/Generator/FileGeneratorRegistry.php +++ b/library/Zend/Code/Generator/FileGeneratorRegistry.php @@ -40,7 +40,7 @@ public static function registerFileCodeGenerator(FileGenerator $fileCodeGenerato // in the same DIRECTORY_SEPARATOR that realpath would use: $fileName = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $fileName); - self::$fileCodeGenerators[$fileName] = $fileCodeGenerator; + static::$fileCodeGenerators[$fileName] = $fileCodeGenerator; } } diff --git a/library/Zend/Code/Generator/ParameterGenerator.php b/library/Zend/Code/Generator/ParameterGenerator.php index 395d643f79a..b08f42ad349 100644 --- a/library/Zend/Code/Generator/ParameterGenerator.php +++ b/library/Zend/Code/Generator/ParameterGenerator.php @@ -220,7 +220,7 @@ public function generate() { $output = ''; - if ($this->type && !in_array($this->type, self::$simple)) { + if ($this->type && !in_array($this->type, static::$simple)) { $output .= $this->type . ' '; } diff --git a/library/Zend/Config/Factory.php b/library/Zend/Config/Factory.php index 53e5b41c59a..b5386c991d5 100644 --- a/library/Zend/Config/Factory.php +++ b/library/Zend/Config/Factory.php @@ -70,11 +70,11 @@ public static function fromFile($filename, $returnConfigObject = false) } $config = include $filename; - } elseif (isset(self::$extensions[$extension])) { - $reader = self::$extensions[$extension]; + } elseif (isset(static::$extensions[$extension])) { + $reader = static::$extensions[$extension]; if (!$reader instanceof Reader\ReaderInterface) { - $reader = self::getReaderPluginManager()->get($reader); - self::$extensions[$extension] = $reader; + $reader = static::getReaderPluginManager()->get($reader); + static::$extensions[$extension] = $reader; } /** @var Reader\ReaderInterface $reader */ @@ -101,7 +101,7 @@ public static function fromFiles(array $files, $returnConfigObject = false) $config = array(); foreach ($files as $file) { - $config = ArrayUtils::merge($config, self::fromFile($file)); + $config = ArrayUtils::merge($config, static::fromFile($file)); } return ($returnConfigObject) ? new Config($config) : $config; @@ -114,7 +114,7 @@ public static function fromFiles(array $files, $returnConfigObject = false) */ public static function setReaderPluginManager(ReaderPluginManager $readers) { - self::$readers = $readers; + static::$readers = $readers; } /** @@ -150,6 +150,6 @@ public static function registerReader($extension, $reader) )); } - self::$extensions[$extension] = $reader; + static::$extensions[$extension] = $reader; } } diff --git a/library/Zend/Crypt/BlockCipher.php b/library/Zend/Crypt/BlockCipher.php index f82e2146a0b..f2b4667575b 100644 --- a/library/Zend/Crypt/BlockCipher.php +++ b/library/Zend/Crypt/BlockCipher.php @@ -94,7 +94,7 @@ public function __construct(SymmetricInterface $cipher) */ public static function factory($adapter, $options = array()) { - $plugins = self::getSymmetricPluginManager(); + $plugins = static::getSymmetricPluginManager(); $adapter = $plugins->get($adapter, (array) $options); return new self($adapter); } @@ -106,11 +106,11 @@ public static function factory($adapter, $options = array()) */ public static function getSymmetricPluginManager() { - if (self::$symmetricPlugins === null) { - self::setSymmetricPluginManager(new SymmetricPluginManager()); + if (static::$symmetricPlugins === null) { + static::setSymmetricPluginManager(new SymmetricPluginManager()); } - return self::$symmetricPlugins; + return static::$symmetricPlugins; } /** @@ -137,7 +137,7 @@ public static function setSymmetricPluginManager($plugins) (is_object($plugins) ? get_class($plugins) : gettype($plugins)) )); } - self::$symmetricPlugins = $plugins; + static::$symmetricPlugins = $plugins; } /** diff --git a/library/Zend/Crypt/Hash.php b/library/Zend/Crypt/Hash.php index 548f5a6bd41..303d3b78b43 100644 --- a/library/Zend/Crypt/Hash.php +++ b/library/Zend/Crypt/Hash.php @@ -55,7 +55,7 @@ public static function compute($hash, $data, $output = self::OUTPUT_STRING) */ public static function getOutputSize($hash, $output = self::OUTPUT_STRING) { - return strlen(self::compute($hash, 'data', $output)); + return strlen(static::compute($hash, 'data', $output)); } /** @@ -65,10 +65,10 @@ public static function getOutputSize($hash, $output = self::OUTPUT_STRING) */ public static function getSupportedAlgorithms() { - if (empty(self::$supportedAlgorithms)) { - self::$supportedAlgorithms = hash_algos(); + if (empty(static::$supportedAlgorithms)) { + static::$supportedAlgorithms = hash_algos(); } - return self::$supportedAlgorithms; + return static::$supportedAlgorithms; } /** @@ -79,6 +79,6 @@ public static function getSupportedAlgorithms() */ public static function isSupported($algo) { - return in_array($algo, self::getSupportedAlgorithms()); + return in_array($algo, static::getSupportedAlgorithms()); } } diff --git a/library/Zend/Crypt/Hmac.php b/library/Zend/Crypt/Hmac.php index 8c14f273da2..190d65b1b19 100644 --- a/library/Zend/Crypt/Hmac.php +++ b/library/Zend/Crypt/Hmac.php @@ -47,7 +47,7 @@ public static function compute($key, $hash, $data, $output = self::OUTPUT_STRING } $hash = strtolower($hash); - if (!self::isSupported($hash)) { + if (!static::isSupported($hash)) { throw new Exception\InvalidArgumentException( "Hash algorithm is not supported on this PHP installation; provided '{$hash}'" ); @@ -66,7 +66,7 @@ public static function compute($key, $hash, $data, $output = self::OUTPUT_STRING */ public static function getOutputSize($hash, $output = self::OUTPUT_STRING) { - return strlen(self::compute('key', $hash, 'data', $output)); + return strlen(static::compute('key', $hash, 'data', $output)); } /** @@ -76,10 +76,10 @@ public static function getOutputSize($hash, $output = self::OUTPUT_STRING) */ public static function getSupportedAlgorithms() { - if (empty(self::$supportedAlgorithms)) { - self::$supportedAlgorithms = hash_algos(); + if (empty(static::$supportedAlgorithms)) { + static::$supportedAlgorithms = hash_algos(); } - return self::$supportedAlgorithms; + return static::$supportedAlgorithms; } /** diff --git a/library/Zend/Crypt/Key/Derivation/SaltedS2k.php b/library/Zend/Crypt/Key/Derivation/SaltedS2k.php index 8e4b4ed3e7d..72472d5e028 100644 --- a/library/Zend/Crypt/Key/Derivation/SaltedS2k.php +++ b/library/Zend/Crypt/Key/Derivation/SaltedS2k.php @@ -56,12 +56,12 @@ class SaltedS2k */ public static function calc($hash, $password, $salt, $bytes) { - if (!in_array($hash, array_keys(self::$supportedMhashAlgos))) { + if (!in_array($hash, array_keys(static::$supportedMhashAlgos))) { throw new Exception\InvalidArgumentException("The hash algorihtm $hash is not supported by " . __CLASS__); } if (strlen($salt)<8) { throw new Exception\InvalidArgumentException('The salt size must be at least of 8 bytes'); } - return mhash_keygen_s2k(self::$supportedMhashAlgos[$hash], $password, $salt, $bytes); + return mhash_keygen_s2k(static::$supportedMhashAlgos[$hash], $password, $salt, $bytes); } } diff --git a/library/Zend/Crypt/PublicKey/DiffieHellman.php b/library/Zend/Crypt/PublicKey/DiffieHellman.php index 97ce6080b8a..f12e05d26ef 100644 --- a/library/Zend/Crypt/PublicKey/DiffieHellman.php +++ b/library/Zend/Crypt/PublicKey/DiffieHellman.php @@ -120,7 +120,7 @@ public function __construct($prime, $generator, $privateKey = null, $privateKeyF */ public static function useOpensslExtension($flag = true) { - self::$useOpenssl = (boolean) $flag; + static::$useOpenssl = (boolean) $flag; } /** @@ -132,7 +132,7 @@ public static function useOpensslExtension($flag = true) */ public function generateKeys() { - if (function_exists('openssl_dh_compute_key') && self::$useOpenssl !== false) { + if (function_exists('openssl_dh_compute_key') && static::$useOpenssl !== false) { $details = array( 'p' => $this->convert($this->getPrime(), self::FORMAT_NUMBER, self::FORMAT_BINARY), 'g' => $this->convert($this->getGenerator(), self::FORMAT_NUMBER, self::FORMAT_BINARY) @@ -229,7 +229,7 @@ public function getPublicKey($format = self::FORMAT_NUMBER) public function computeSecretKey($publicKey, $publicKeyFormat = self::FORMAT_NUMBER, $secretKeyFormat = self::FORMAT_NUMBER) { - if (function_exists('openssl_dh_compute_key') && self::$useOpenssl !== false) { + if (function_exists('openssl_dh_compute_key') && static::$useOpenssl !== false) { $publicKey = $this->convert($publicKey, $publicKeyFormat, self::FORMAT_BINARY); $secretKey = openssl_dh_compute_key($publicKey, $this->opensslKeyResource); if (false === $secretKey) { diff --git a/library/Zend/Crypt/Symmetric/Mcrypt.php b/library/Zend/Crypt/Symmetric/Mcrypt.php index c6361cfed05..e9cb7ed42af 100644 --- a/library/Zend/Crypt/Symmetric/Mcrypt.php +++ b/library/Zend/Crypt/Symmetric/Mcrypt.php @@ -143,7 +143,7 @@ public function __construct($options = array()) $this->setSalt($value); break; case 'padding': - $plugins = self::getPaddingPluginManager(); + $plugins = static::getPaddingPluginManager(); $padding = $plugins->get($value); $this->padding = $padding; break; @@ -165,7 +165,7 @@ protected function setDefaultOptions($options = array()) return; } if (!isset($options['padding'])) { - $plugins = self::getPaddingPluginManager(); + $plugins = static::getPaddingPluginManager(); $padding = $plugins->get(self::DEFAULT_PADDING); $this->padding = $padding; } @@ -178,11 +178,11 @@ protected function setDefaultOptions($options = array()) */ public static function getPaddingPluginManager() { - if (self::$paddingPlugins === null) { + if (static::$paddingPlugins === null) { self::setPaddingPluginManager(new PaddingPluginManager()); } - return self::$paddingPlugins; + return static::$paddingPlugins; } /** @@ -210,7 +210,7 @@ public static function setPaddingPluginManager($plugins) (is_object($plugins) ? get_class($plugins) : gettype($plugins)) )); } - self::$paddingPlugins = $plugins; + static::$paddingPlugins = $plugins; } /** diff --git a/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php b/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php index 6bef28dd29d..f466b243b18 100644 --- a/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php +++ b/library/Zend/Db/Adapter/Driver/Pgsql/Statement.php @@ -157,7 +157,7 @@ public function prepare($sql = null) ); $this->sql = $sql; - $this->statementName = 'statement' . ++self::$statementIndex; + $this->statementName = 'statement' . ++static::$statementIndex; $this->resource = pg_prepare($this->pgsql, $this->statementName, $sql); } diff --git a/library/Zend/Dom/Css2Xpath.php b/library/Zend/Dom/Css2Xpath.php index c3739d4c1ca..d6f3784ebc5 100644 --- a/library/Zend/Dom/Css2Xpath.php +++ b/library/Zend/Dom/Css2Xpath.php @@ -45,7 +45,7 @@ public static function transform($path) $path = preg_replace('|\s+>\s+|', '>', $path); $segments = preg_split('/\s+/', $path); foreach ($segments as $key => $segment) { - $pathSegment = self::_tokenize($segment); + $pathSegment = static::_tokenize($segment); if (0 == $key) { if (0 === strpos($pathSegment, '[contains(')) { $paths[0] .= '*' . ltrim($pathSegment, '*'); diff --git a/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php b/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php index 5eadfc132c5..b718da8d246 100644 --- a/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php +++ b/library/Zend/Feed/PubSubHubbub/PubSubHubbub.php @@ -78,7 +78,7 @@ public static function detectHubs($source) */ public static function setHttpClient(Http\Client $httpClient) { - self::$httpClient = $httpClient; + static::$httpClient = $httpClient; } /** @@ -90,12 +90,12 @@ public static function setHttpClient(Http\Client $httpClient) */ public static function getHttpClient() { - if (!isset(self::$httpClient)) { - self::$httpClient = new Http\Client; + if (!isset(static::$httpClient)) { + static::$httpClient = new Http\Client; } else { - self::$httpClient->resetParameters(); + static::$httpClient->resetParameters(); } - return self::$httpClient; + return static::$httpClient; } /** @@ -106,7 +106,7 @@ public static function getHttpClient() */ public static function clearHttpClient() { - self::$httpClient = null; + static::$httpClient = null; } /** diff --git a/library/Zend/Feed/Reader/Reader.php b/library/Zend/Feed/Reader/Reader.php index c9a91b726bc..2b1feac8d86 100644 --- a/library/Zend/Feed/Reader/Reader.php +++ b/library/Zend/Feed/Reader/Reader.php @@ -101,7 +101,7 @@ class Reader */ public static function getCache() { - return self::$cache; + return static::$cache; } /** @@ -112,7 +112,7 @@ public static function getCache() */ public static function setCache(CacheStorage $cache) { - self::$cache = $cache; + static::$cache = $cache; } /** @@ -125,7 +125,7 @@ public static function setCache(CacheStorage $cache) */ public static function setHttpClient(Http\Client $httpClient) { - self::$httpClient = $httpClient; + static::$httpClient = $httpClient; } @@ -136,11 +136,11 @@ public static function setHttpClient(Http\Client $httpClient) */ public static function getHttpClient() { - if (!self::$httpClient instanceof Http\Client) { - self::$httpClient = new Http\Client(); + if (!static::$httpClient instanceof Http\Client) { + static::$httpClient = new Http\Client(); } - return self::$httpClient; + return static::$httpClient; } /** @@ -158,7 +158,7 @@ public static function getHttpClient() */ public static function setHttpMethodOverride($override = true) { - self::$httpMethodOverride = $override; + static::$httpMethodOverride = $override; } /** @@ -168,7 +168,7 @@ public static function setHttpMethodOverride($override = true) */ public static function getHttpMethodOverride() { - return self::$httpMethodOverride; + return static::$httpMethodOverride; } /** @@ -179,7 +179,7 @@ public static function getHttpMethodOverride() */ public static function useHttpConditionalGet($bool = true) { - self::$httpConditionalGet = $bool; + static::$httpConditionalGet = $bool; } /** @@ -203,7 +203,7 @@ public static function import($uri, $etag = null, $lastModified = null) $client->setUri($uri); $cacheId = 'Zend_Feed_Reader_' . md5($uri); - if (self::$httpConditionalGet && $cache) { + if (static::$httpConditionalGet && $cache) { $data = $cache->getItem($cacheId); if ($data) { if ($etag === null) { @@ -235,11 +235,11 @@ public static function import($uri, $etag = null, $lastModified = null) $cache->setItem($cacheId . '_lastmodified', $response->getHeaders()->get('Last-Modified')->getFieldValue()); } } - return self::importString($responseXml); + return static::importString($responseXml); } elseif ($cache) { $data = $cache->getItem($cacheId); if ($data) { - return self::importString($data); + return static::importString($data); } $response = $client->send(); if ((int) $response->getStatusCode() !== 200) { @@ -247,13 +247,13 @@ public static function import($uri, $etag = null, $lastModified = null) } $responseXml = $response->getBody(); $cache->setItem($cacheId, $responseXml); - return self::importString($responseXml); + return static::importString($responseXml); } else { $response = $client->send(); if ((int) $response->getStatusCode() !== 200) { throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode()); } - $reader = self::importString($response->getBody()); + $reader = static::importString($response->getBody()); $reader->setOriginalSourceUri($uri); return $reader; } @@ -295,9 +295,9 @@ public static function importString($string) throw new Exception\RuntimeException($errormsg); } - $type = self::detectType($dom); + $type = static::detectType($dom); - self::registerCoreExtensions(); + static::registerCoreExtensions(); if (substr($type, 0, 3) == 'rss') { $reader = new Feed\Rss($dom, $type); @@ -327,7 +327,7 @@ public static function importFile($filename) if ($feed === false) { throw new Exception\RuntimeException("File '{$filename}' could not be loaded", 0, $err); } - return self::importString($feed); + return static::importString($feed); } /** @@ -339,7 +339,7 @@ public static function importFile($filename) */ public static function findFeedLinks($uri) { - $client = self::getHttpClient(); + $client = static::getHttpClient(); $client->setUri($uri); $response = $client->send(); if ($response->getStatusCode() !== 200) { @@ -501,7 +501,7 @@ public static function detectType($feed, $specOnly = false) */ public static function setExtensionManager(ExtensionManager $extensionManager) { - self::$extensionManager = $extensionManager; + static::$extensionManager = $extensionManager; } /** @@ -511,10 +511,10 @@ public static function setExtensionManager(ExtensionManager $extensionManager) */ public static function getExtensionManager() { - if (!isset(self::$extensionManager)) { - self::setExtensionManager(new ExtensionManager()); + if (!isset(static::$extensionManager)) { + static::setExtensionManager(new ExtensionManager()); } - return self::$extensionManager; + return static::$extensionManager; } /** @@ -528,8 +528,8 @@ public static function registerExtension($name) { $feedName = $name . '\Feed'; $entryName = $name . '\Entry'; - $manager = self::getExtensionManager(); - if (self::isRegistered($name)) { + $manager = static::getExtensionManager(); + if (static::isRegistered($name)) { if ($manager->has($feedName) || $manager->has($entryName)) { return; } @@ -540,10 +540,10 @@ public static function registerExtension($name) . ' using Plugin Loader. Check prefix paths are configured and extension exists.'); } if ($manager->has($feedName)) { - self::$extensions['feed'][] = $feedName; + static::$extensions['feed'][] = $feedName; } if ($manager->has($entryName)) { - self::$extensions['entry'][] = $entryName; + static::$extensions['entry'][] = $entryName; } } @@ -557,8 +557,8 @@ public static function isRegistered($extensionName) { $feedName = $extensionName . '\Feed'; $entryName = $extensionName . '\Entry'; - if (in_array($feedName, self::$extensions['feed']) - || in_array($entryName, self::$extensions['entry']) + if (in_array($feedName, static::$extensions['feed']) + || in_array($entryName, static::$extensions['entry']) ) { return true; } @@ -572,7 +572,7 @@ public static function isRegistered($extensionName) */ public static function getExtensions() { - return self::$extensions; + return static::$extensions; } /** @@ -582,12 +582,12 @@ public static function getExtensions() */ public static function reset() { - self::$cache = null; - self::$httpClient = null; - self::$httpMethodOverride = false; - self::$httpConditionalGet = false; - self::$extensionManager = null; - self::$extensions = array( + static::$cache = null; + static::$httpClient = null; + static::$httpMethodOverride = false; + static::$httpConditionalGet = false; + static::$extensionManager = null; + static::$extensions = array( 'feed' => array( 'DublinCore\Feed', 'Atom\Feed' @@ -614,13 +614,13 @@ public static function reset() */ protected static function registerCoreExtensions() { - self::registerExtension('DublinCore'); - self::registerExtension('Content'); - self::registerExtension('Atom'); - self::registerExtension('Slash'); - self::registerExtension('WellFormedWeb'); - self::registerExtension('Thread'); - self::registerExtension('Podcast'); + static::registerExtension('DublinCore'); + static::registerExtension('Content'); + static::registerExtension('Atom'); + static::registerExtension('Slash'); + static::registerExtension('WellFormedWeb'); + static::registerExtension('Thread'); + static::registerExtension('Podcast'); } /** diff --git a/library/Zend/Feed/Writer/Writer.php b/library/Zend/Feed/Writer/Writer.php index 07d82d2cb7c..952dd83eeed 100644 --- a/library/Zend/Feed/Writer/Writer.php +++ b/library/Zend/Feed/Writer/Writer.php @@ -69,7 +69,7 @@ class Writer */ public static function setExtensionManager(ExtensionManager $extensionManager) { - self::$extensionManager = $extensionManager; + static::$extensionManager = $extensionManager; } /** @@ -79,10 +79,10 @@ public static function setExtensionManager(ExtensionManager $extensionManager) */ public static function getExtensionManager() { - if (!isset(self::$extensionManager)) { - self::setExtensionManager(new ExtensionManager()); + if (!isset(static::$extensionManager)) { + static::setExtensionManager(new ExtensionManager()); } - return self::$extensionManager; + return static::$extensionManager; } /** @@ -98,8 +98,8 @@ public static function registerExtension($name) $entryName = $name . '\Entry'; $feedRendererName = $name . '\Renderer\Feed'; $entryRendererName = $name . '\Renderer\Entry'; - $manager = self::getExtensionManager(); - if (self::isRegistered($name)) { + $manager = static::getExtensionManager(); + if (static::isRegistered($name)) { if ($manager->has($feedName) || $manager->has($entryName) || $manager->has($feedRendererName) @@ -117,16 +117,16 @@ public static function registerExtension($name) . 'using Plugin Loader. Check prefix paths are configured and extension exists.'); } if ($manager->has($feedName)) { - self::$extensions['feed'][] = $feedName; + static::$extensions['feed'][] = $feedName; } if ($manager->has($entryName)) { - self::$extensions['entry'][] = $entryName; + static::$extensions['entry'][] = $entryName; } if ($manager->has($feedRendererName)) { - self::$extensions['feedRenderer'][] = $feedRendererName; + static::$extensions['feedRenderer'][] = $feedRendererName; } if ($manager->has($entryRendererName)) { - self::$extensions['entryRenderer'][] = $entryRendererName; + static::$extensions['entryRenderer'][] = $entryRendererName; } } @@ -142,10 +142,10 @@ public static function isRegistered($extensionName) $entryName = $extensionName . '\Entry'; $feedRendererName = $extensionName . '\Renderer\Feed'; $entryRendererName = $extensionName . '\Renderer\Entry'; - if (in_array($feedName, self::$extensions['feed']) - || in_array($entryName, self::$extensions['entry']) - || in_array($feedRendererName, self::$extensions['feedRenderer']) - || in_array($entryRendererName, self::$extensions['entryRenderer']) + if (in_array($feedName, static::$extensions['feed']) + || in_array($entryName, static::$extensions['entry']) + || in_array($feedRendererName, static::$extensions['feedRenderer']) + || in_array($entryRendererName, static::$extensions['entryRenderer']) ) { return true; } @@ -159,7 +159,7 @@ public static function isRegistered($extensionName) */ public static function getExtensions() { - return self::$extensions; + return static::$extensions; } /** @@ -169,8 +169,8 @@ public static function getExtensions() */ public static function reset() { - self::$extensionManager = null; - self::$extensions = array( + static::$extensionManager = null; + static::$extensions = array( 'entry' => array(), 'feed' => array(), 'entryRenderer' => array(), @@ -185,13 +185,13 @@ public static function reset() */ public static function registerCoreExtensions() { - self::registerExtension('DublinCore'); - self::registerExtension('Content'); - self::registerExtension('Atom'); - self::registerExtension('Slash'); - self::registerExtension('WellFormedWeb'); - self::registerExtension('Threading'); - self::registerExtension('ITunes'); + static::registerExtension('DublinCore'); + static::registerExtension('Content'); + static::registerExtension('Atom'); + static::registerExtension('Slash'); + static::registerExtension('WellFormedWeb'); + static::registerExtension('Threading'); + static::registerExtension('ITunes'); } public static function lcfirst($str) diff --git a/library/Zend/File/Transfer/Adapter/AbstractAdapter.php b/library/Zend/File/Transfer/Adapter/AbstractAdapter.php index 6f717d68331..249e6778398 100644 --- a/library/Zend/File/Transfer/Adapter/AbstractAdapter.php +++ b/library/Zend/File/Transfer/Adapter/AbstractAdapter.php @@ -1137,7 +1137,7 @@ public function getFileSize($files = null) foreach ($files as $key => $value) { if (file_exists($value['name']) || file_exists($value['tmp_name'])) { if ($value['options']['useByteString']) { - $result[$key] = self::toByteString($value['size']); + $result[$key] = static::toByteString($value['size']); } else { $result[$key] = $value['size']; } diff --git a/library/Zend/File/Transfer/Adapter/Http.php b/library/Zend/File/Transfer/Adapter/Http.php index a1508d318ae..9238d4c147b 100644 --- a/library/Zend/File/Transfer/Adapter/Http.php +++ b/library/Zend/File/Transfer/Adapter/Http.php @@ -291,7 +291,7 @@ public function isUploaded($files = null) */ public static function getProgress($id = null) { - if (!self::isApcAvailable() && !self::isUploadProgressAvailable()) { + if (!static::isApcAvailable() && !static::isUploadProgressAvailable()) { throw new Exception\PhpEnvironmentException('Neither APC nor UploadProgress extension installed'); } @@ -335,14 +335,14 @@ public static function getProgress($id = null) } if (!empty($id)) { - if (self::isApcAvailable()) { + if (static::isApcAvailable()) { - $call = call_user_func(self::$callbackApc, ini_get('apc.rfc1867_prefix') . $id); + $call = call_user_func(static::$callbackApc, ini_get('apc.rfc1867_prefix') . $id); if (is_array($call)) { $status = $call + $status; } - } elseif (self::isUploadProgressAvailable()) { - $call = call_user_func(self::$callbackUploadProgress, $id); + } elseif (static::isUploadProgressAvailable()) { + $call = call_user_func(static::$callbackUploadProgress, $id); if (is_array($call)) { $status = $call + $status; $status['total'] = $status['bytes_total']; @@ -361,7 +361,7 @@ public static function getProgress($id = null) $status['done'] = true; $status['message'] = 'The upload has been canceled'; } else { - $status['message'] = self::toByteString($status['current']) . " - " . self::toByteString($status['total']); + $status['message'] = static::toByteString($status['current']) . " - " . static::toByteString($status['total']); } $status['id'] = $id; @@ -395,7 +395,7 @@ public static function getProgress($id = null) */ public static function isApcAvailable() { - return (bool) ini_get('apc.enabled') && (bool) ini_get('apc.rfc1867') && is_callable(self::$callbackApc); + return (bool) ini_get('apc.enabled') && (bool) ini_get('apc.rfc1867') && is_callable(static::$callbackApc); } /** @@ -405,7 +405,7 @@ public static function isApcAvailable() */ public static function isUploadProgressAvailable() { - return is_callable(self::$callbackUploadProgress); + return is_callable(static::$callbackUploadProgress); } /** diff --git a/library/Zend/Filter/StaticFilter.php b/library/Zend/Filter/StaticFilter.php index 24305c45aa5..0170dc69afb 100644 --- a/library/Zend/Filter/StaticFilter.php +++ b/library/Zend/Filter/StaticFilter.php @@ -33,7 +33,7 @@ public static function setPluginManager(FilterPluginManager $manager = null) if ($manager instanceof FilterPluginManager) { $manager->setShareByDefault(false); } - self::$plugins = $manager; + static::$plugins = $manager; } /** @@ -43,10 +43,10 @@ public static function setPluginManager(FilterPluginManager $manager = null) */ public static function getPluginManager() { - if (null === self::$plugins) { + if (null === static::$plugins) { static::setPluginManager(new FilterPluginManager()); } - return self::$plugins; + return static::$plugins; } /** diff --git a/library/Zend/Form/Annotation/AnnotationBuilder.php b/library/Zend/Form/Annotation/AnnotationBuilder.php index 5459333d615..d97a96b831f 100644 --- a/library/Zend/Form/Annotation/AnnotationBuilder.php +++ b/library/Zend/Form/Annotation/AnnotationBuilder.php @@ -331,7 +331,7 @@ protected function configureElement($annotations, $reflection, $formSpec, $filte : 'Zend\Form\Element'; // Compose as a fieldset or an element, based on specification type - if (self::isSubclassOf($type, 'Zend\Form\FieldsetInterface')) { + if (static::isSubclassOf($type, 'Zend\Form\FieldsetInterface')) { if (!isset($formSpec['fieldsets'])) { $formSpec['fieldsets'] = array(); } diff --git a/library/Zend/Form/Form.php b/library/Zend/Form/Form.php index 983105dfca6..c3ebf8b0d34 100644 --- a/library/Zend/Form/Form.php +++ b/library/Zend/Form/Form.php @@ -356,7 +356,7 @@ public function setBindOnValidate($bindOnValidateFlag) */ public function bindOnValidate() { - return (self::BIND_ON_VALIDATE === $this->bindOnValidate); + return (static::BIND_ON_VALIDATE === $this->bindOnValidate); } /** diff --git a/library/Zend/Http/Client.php b/library/Zend/Http/Client.php index 5d5bb43797f..9b92f7a6d2a 100644 --- a/library/Zend/Http/Client.php +++ b/library/Zend/Http/Client.php @@ -1173,14 +1173,14 @@ protected function detectFileMimeType($file) // First try with fileinfo functions if (function_exists('finfo_open')) { - if (self::$fileInfoDb === null) { + if (static::$fileInfoDb === null) { ErrorHandler::start(); - self::$fileInfoDb = finfo_open(FILEINFO_MIME); + static::$fileInfoDb = finfo_open(FILEINFO_MIME); ErrorHandler::stop(); } - if (self::$fileInfoDb) { - $type = finfo_file(self::$fileInfoDb, $file); + if (static::$fileInfoDb) { + $type = finfo_file(static::$fileInfoDb, $file); } } elseif (function_exists('mime_content_type')) { diff --git a/library/Zend/Http/Client/Adapter/Socket.php b/library/Zend/Http/Client/Adapter/Socket.php index 764171891a9..7e9c69d7d8c 100644 --- a/library/Zend/Http/Client/Adapter/Socket.php +++ b/library/Zend/Http/Client/Adapter/Socket.php @@ -267,8 +267,8 @@ public function connect($host, $port = 80, $secure = false) } if ($secure || $this->config['sslusecontext']) { - if ($this->config['ssltransport'] && isset(self::$sslCryptoTypes[$this->config['ssltransport']])) { - $sslCryptoMethod = self::$sslCryptoTypes[$this->config['ssltransport']]; + if ($this->config['ssltransport'] && isset(static::$sslCryptoTypes[$this->config['ssltransport']])) { + $sslCryptoMethod = static::$sslCryptoTypes[$this->config['ssltransport']]; } else { $sslCryptoMethod = STREAM_CRYPTO_METHOD_SSLv3_CLIENT; } diff --git a/library/Zend/Http/Header/CacheControl.php b/library/Zend/Http/Header/CacheControl.php index 34ecdd59d07..a4073a689ce 100644 --- a/library/Zend/Http/Header/CacheControl.php +++ b/library/Zend/Http/Header/CacheControl.php @@ -43,7 +43,7 @@ public static function fromString($headerLine) } // @todo implementation details - $header->directives = self::parseValue($value); + $header->directives = static::parseValue($value); return $header; } @@ -171,7 +171,7 @@ protected static function parseValue($value) $lastMatch = null; state_directive: - switch (self::match(array('[a-zA-Z][a-zA-Z_-]*'), $value, $lastMatch)) { + switch (static::match(array('[a-zA-Z][a-zA-Z_-]*'), $value, $lastMatch)) { case 0: $directive = $lastMatch; goto state_value; @@ -183,7 +183,7 @@ protected static function parseValue($value) } state_value: - switch (self::match(array('="[^"]*"', '=[^",\s;]*'), $value, $lastMatch)) { + switch (static::match(array('="[^"]*"', '=[^",\s;]*'), $value, $lastMatch)) { case 0: $directives[$directive] = substr($lastMatch, 2, -1); goto state_separator; @@ -201,7 +201,7 @@ protected static function parseValue($value) } state_separator: - switch (self::match(array('\s*,\s*', '$'), $value, $lastMatch)) { + switch (static::match(array('\s*,\s*', '$'), $value, $lastMatch)) { case 0: goto state_directive; break; diff --git a/library/Zend/I18n/Validator/Alnum.php b/library/Zend/I18n/Validator/Alnum.php index 1f08ab6ecde..b3b2ab76262 100644 --- a/library/Zend/I18n/Validator/Alnum.php +++ b/library/Zend/I18n/Validator/Alnum.php @@ -107,13 +107,13 @@ public function isValid($value) return false; } - if (null === self::$filter) { - self::$filter = new AlnumFilter(); + if (null === static::$filter) { + static::$filter = new AlnumFilter(); } - self::$filter->setAllowWhiteSpace($this->options['allowWhiteSpace']); + static::$filter->setAllowWhiteSpace($this->options['allowWhiteSpace']); - if ($value != self::$filter->filter($value)) { + if ($value != static::$filter->filter($value)) { $this->error(self::NOT_ALNUM); return false; } diff --git a/library/Zend/I18n/Validator/Alpha.php b/library/Zend/I18n/Validator/Alpha.php index 53c96adf27b..0c62cfdb5b7 100644 --- a/library/Zend/I18n/Validator/Alpha.php +++ b/library/Zend/I18n/Validator/Alpha.php @@ -70,14 +70,14 @@ public function isValid($value) return false; } - if (null === self::$filter) { - self::$filter = new AlphaFilter(); + if (null === static::$filter) { + static::$filter = new AlphaFilter(); } - //self::$filter->setAllowWhiteSpace($this->allowWhiteSpace); - self::$filter->setAllowWhiteSpace($this->options['allowWhiteSpace']); + //static::$filter->setAllowWhiteSpace($this->allowWhiteSpace); + static::$filter->setAllowWhiteSpace($this->options['allowWhiteSpace']); - if ($value !== self::$filter->filter($value)) { + if ($value !== static::$filter->filter($value)) { $this->error(self::NOT_ALPHA); return false; } diff --git a/library/Zend/I18n/Validator/PostCode.php b/library/Zend/I18n/Validator/PostCode.php index 6aad8eafa3d..094c20ab59f 100644 --- a/library/Zend/I18n/Validator/PostCode.php +++ b/library/Zend/I18n/Validator/PostCode.php @@ -344,8 +344,8 @@ public function isValid($value) if ('' === $region) { throw new Exception\InvalidArgumentException("Locale must contain a region"); } - if (isset(self::$postCodeRegex[$region])) { - $format = self::$postCodeRegex[$region]; + if (isset(static::$postCodeRegex[$region])) { + $format = static::$postCodeRegex[$region]; } } if (null === $format || '' === $format) { diff --git a/library/Zend/Json/Encoder.php b/library/Zend/Json/Encoder.php index 3c206f46fec..3d8b5025742 100644 --- a/library/Zend/Json/Encoder.php +++ b/library/Zend/Json/Encoder.php @@ -427,7 +427,7 @@ public static function encodeClasses(array $classNames, $package = '') { $result = ''; foreach ($classNames as $className) { - $result .= self::encodeClass($className, $package); + $result .= static::encodeClass($className, $package); } return $result; diff --git a/library/Zend/Json/Json.php b/library/Zend/Json/Json.php index ef76d817e45..1c8bcd5655a 100644 --- a/library/Zend/Json/Json.php +++ b/library/Zend/Json/Json.php @@ -57,7 +57,7 @@ class Json public static function decode($encodedValue, $objectDecodeType = self::TYPE_OBJECT) { $encodedValue = (string) $encodedValue; - if (function_exists('json_decode') && self::$useBuiltinEncoderDecoder !== true) { + if (function_exists('json_decode') && static::$useBuiltinEncoderDecoder !== true) { $decode = json_decode($encodedValue, $objectDecodeType); switch (json_last_error()) { @@ -105,7 +105,7 @@ public static function encode($valueToEncode, $cycleCheck = false, $options = ar if (method_exists($valueToEncode, 'toJson')) { return $valueToEncode->toJson(); } elseif (method_exists($valueToEncode, 'toArray')) { - return self::encode($valueToEncode->toArray(), $cycleCheck, $options); + return static::encode($valueToEncode->toArray(), $cycleCheck, $options); } } @@ -114,11 +114,11 @@ public static function encode($valueToEncode, $cycleCheck = false, $options = ar if (isset($options['enableJsonExprFinder']) && ($options['enableJsonExprFinder'] == true) ) { - $valueToEncode = self::_recursiveJsonExprFinder($valueToEncode, $javascriptExpressions); + $valueToEncode = static::_recursiveJsonExprFinder($valueToEncode, $javascriptExpressions); } // Encoding - if (function_exists('json_encode') && self::$useBuiltinEncoderDecoder !== true) { + if (function_exists('json_encode') && static::$useBuiltinEncoderDecoder !== true) { $encodedResult = json_encode( $valueToEncode, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP @@ -175,11 +175,11 @@ protected static function _recursiveJsonExprFinder( $value = $magicKey; } elseif (is_array($value)) { foreach ($value as $k => $v) { - $value[$k] = self::_recursiveJsonExprFinder($value[$k], $javascriptExpressions, $k); + $value[$k] = static::_recursiveJsonExprFinder($value[$k], $javascriptExpressions, $k); } } elseif (is_object($value)) { foreach ($value as $k => $v) { - $value->$k = self::_recursiveJsonExprFinder($value->$k, $javascriptExpressions, $k); + $value->$k = static::_recursiveJsonExprFinder($value->$k, $javascriptExpressions, $k); } } return $value; @@ -229,23 +229,23 @@ protected static function _getXmlValue($simpleXmlElementObject) protected static function _processXml($simpleXmlElementObject, $ignoreXmlAttributes, $recursionDepth = 0) { // Keep an eye on how deeply we are involved in recursion. - if ($recursionDepth > self::$maxRecursionDepthAllowed) { + if ($recursionDepth > static::$maxRecursionDepthAllowed) { // XML tree is too deep. Exit now by throwing an exception. throw new RecursionException( "Function _processXml exceeded the allowed recursion depth of " - . self::$maxRecursionDepthAllowed + . static::$maxRecursionDepthAllowed ); } $children = $simpleXmlElementObject->children(); $name = $simpleXmlElementObject->getName(); - $value = self::_getXmlValue($simpleXmlElementObject); + $value = static::_getXmlValue($simpleXmlElementObject); $attributes = (array) $simpleXmlElementObject->attributes(); if (!count($children)) { if (!empty($attributes) && !$ignoreXmlAttributes) { foreach ($attributes['@attributes'] as $k => $v) { - $attributes['@attributes'][$k] = self::_getXmlValue($v); + $attributes['@attributes'][$k] = static::_getXmlValue($v); } if (!empty($value)) { $attributes['@text'] = $value; @@ -259,7 +259,7 @@ protected static function _processXml($simpleXmlElementObject, $ignoreXmlAttribu $childArray = array(); foreach ($children as $child) { $childname = $child->getName(); - $element = self::_processXml($child, $ignoreXmlAttributes, $recursionDepth + 1); + $element = static::_processXml($child, $ignoreXmlAttributes, $recursionDepth + 1); if (array_key_exists($childname, $childArray)) { if (empty($subChild[$childname])) { $childArray[$childname] = array($childArray[$childname]); @@ -273,7 +273,7 @@ protected static function _processXml($simpleXmlElementObject, $ignoreXmlAttribu if (!empty($attributes) && !$ignoreXmlAttributes) { foreach ($attributes['@attributes'] as $k => $v) { - $attributes['@attributes'][$k] = self::_getXmlValue($v); + $attributes['@attributes'][$k] = static::_getXmlValue($v); } $childArray['@attributes'] = $attributes['@attributes']; } @@ -323,11 +323,11 @@ public static function fromXml ($xmlStringContents, $ignoreXmlAttributes=true) $resultArray = null; // Call the recursive function to convert the XML into a PHP array. - $resultArray = self::_processXml($simpleXmlElementObject, $ignoreXmlAttributes); + $resultArray = static::_processXml($simpleXmlElementObject, $ignoreXmlAttributes); // Convert the PHP array to JSON using Zend_Json encode method. // It is just that simple. - $jsonStringOutput = self::encode($resultArray); + $jsonStringOutput = static::encode($resultArray); return($jsonStringOutput); } diff --git a/library/Zend/Json/Server/Smd.php b/library/Zend/Json/Server/Smd.php index 88a7801feab..669783b5e13 100644 --- a/library/Zend/Json/Server/Smd.php +++ b/library/Zend/Json/Server/Smd.php @@ -382,7 +382,7 @@ public function toArray() $transport = $this->getTransport(); $envelope = $this->getEnvelope(); $contentType = $this->getContentType(); - $SMDVersion = self::SMD_VERSION; + $SMDVersion = static::SMD_VERSION; $service = compact('transport', 'envelope', 'contentType', 'SMDVersion'); if (null !== ($target = $this->getTarget())) { diff --git a/library/Zend/Ldap/Attribute.php b/library/Zend/Ldap/Attribute.php index 6792fdc2cc4..ba5dc808d23 100644 --- a/library/Zend/Ldap/Attribute.php +++ b/library/Zend/Ldap/Attribute.php @@ -41,13 +41,13 @@ public static function setAttribute(array &$data, $attribName, $value, $append = $valArray = array(); if (is_array($value) || ($value instanceof \Traversable)) { foreach ($value as $v) { - $v = self::valueToLdap($v); + $v = static::valueToLdap($v); if ($v !== null) { $valArray[] = $v; } } } elseif ($value !== null) { - $value = self::valueToLdap($value); + $value = static::valueToLdap($value); if ($value !== null) { $valArray[] = $value; } @@ -80,14 +80,14 @@ public static function getAttribute(array $data, $attribName, $index = null) } $retArray = array(); foreach ($data[$attribName] as $v) { - $retArray[] = self::valueFromLdap($v); + $retArray[] = static::valueFromLdap($v); } return $retArray; } elseif (is_int($index)) { if (!isset($data[$attribName])) { return null; } elseif ($index >= 0 && $index < count($data[$attribName])) { - return self::valueFromLdap($data[$attribName][$index]); + return static::valueFromLdap($data[$attribName][$index]); } else { return null; } @@ -227,8 +227,8 @@ public static function setPassword( } } - $hash = self::createPassword($password, $hashType); - self::setAttribute($data, $attribName, $hash, false); + $hash = static::createPassword($password, $hashType); + static::setAttribute($data, $attribName, $hash, false); } /** @@ -299,18 +299,18 @@ public static function setDateTimeAttribute( $convertedValues = array(); if (is_array($value) || ($value instanceof \Traversable)) { foreach ($value as $v) { - $v = self::valueToLdapDateTime($v, $utc); + $v = static::valueToLdapDateTime($v, $utc); if ($v !== null) { $convertedValues[] = $v; } } } elseif ($value !== null) { - $value = self::valueToLdapDateTime($value, $utc); + $value = static::valueToLdapDateTime($value, $utc); if ($value !== null) { $convertedValues[] = $value; } } - self::setAttribute($data, $attribName, $convertedValues, $append); + static::setAttribute($data, $attribName, $convertedValues, $append); } /** @@ -337,16 +337,16 @@ private static function valueToLdapDateTime($value, $utc) */ public static function getDateTimeAttribute(array $data, $attribName, $index = null) { - $values = self::getAttribute($data, $attribName, $index); + $values = static::getAttribute($data, $attribName, $index); if (is_array($values)) { for ($i = 0; $i < count($values); $i++) { - $newVal = self::valueFromLdapDateTime($values[$i]); + $newVal = static::valueFromLdapDateTime($values[$i]); if ($newVal !== null) { $values[$i] = $newVal; } } } else { - $newVal = self::valueFromLdapDateTime($values); + $newVal = static::valueFromLdapDateTime($values); if ($newVal !== null) { $values = $newVal; } diff --git a/library/Zend/Ldap/Converter/Converter.php b/library/Zend/Ldap/Converter/Converter.php index 30441c810c6..c424d5da871 100644 --- a/library/Zend/Ldap/Converter/Converter.php +++ b/library/Zend/Ldap/Converter/Converter.php @@ -87,10 +87,10 @@ public static function toLdap($value, $type = self::STANDARD) try { switch ($type) { case self::BOOLEAN: - return self::toldapBoolean($value); + return static::toldapBoolean($value); break; case self::GENERALIZED_TIME: - return self::toLdapDatetime($value); + return static::toLdapDatetime($value); break; default: if (is_string($value)) { @@ -98,15 +98,15 @@ public static function toLdap($value, $type = self::STANDARD) } elseif (is_int($value) || is_float($value)) { return (string)$value; } elseif (is_bool($value)) { - return self::toldapBoolean($value); + return static::toldapBoolean($value); } elseif (is_object($value)) { if ($value instanceof DateTime) { - return self::toLdapDatetime($value); + return static::toLdapDatetime($value); } else { - return self::toLdapSerialize($value); + return static::toLdapSerialize($value); } } elseif (is_array($value)) { - return self::toLdapSerialize($value); + return static::toLdapSerialize($value); } elseif (is_resource($value) && get_resource_type($value) === 'stream') { return stream_get_contents($value); } else { @@ -204,23 +204,23 @@ public static function fromLdap($value, $type = self::STANDARD, $dateTimeAsUtc = { switch ($type) { case self::BOOLEAN: - return self::fromldapBoolean($value); + return static::fromldapBoolean($value); break; case self::GENERALIZED_TIME: - return self::fromLdapDateTime($value); + return static::fromLdapDateTime($value); break; default: if (is_numeric($value)) { // prevent numeric values to be treated as date/time return $value; } elseif ('TRUE' === $value || 'FALSE' === $value) { - return self::fromLdapBoolean($value); + return static::fromLdapBoolean($value); } if (preg_match('/^\d{4}[\d\+\-Z\.]*$/', $value)) { - return self::fromLdapDateTime($value, $dateTimeAsUtc); + return static::fromLdapDateTime($value, $dateTimeAsUtc); } try { - return self::fromLdapUnserialize($value); + return static::fromLdapUnserialize($value); } catch (Exception\UnexpectedValueException $e) { // Do nothing } diff --git a/library/Zend/Ldap/Dn.php b/library/Zend/Ldap/Dn.php index da913a62328..e67b622f2c0 100644 --- a/library/Zend/Ldap/Dn.php +++ b/library/Zend/Ldap/Dn.php @@ -54,9 +54,9 @@ class Dn implements \ArrayAccess public static function factory($dn, $caseFold = null) { if (is_array($dn)) { - return self::fromArray($dn, $caseFold); + return static::fromArray($dn, $caseFold); } elseif (is_string($dn)) { - return self::fromString($dn, $caseFold); + return static::fromString($dn, $caseFold); } throw new Exception\LdapException(null, 'Invalid argument type for $dn'); } @@ -75,7 +75,7 @@ public static function fromString($dn, $caseFold = null) if (empty($dn)) { $dnArray = array(); } else { - $dnArray = self::explodeDn((string)$dn); + $dnArray = static::explodeDn((string)$dn); } return new self($dnArray, $caseFold); } @@ -114,8 +114,8 @@ protected function __construct(array $dn, $caseFold) */ public function getRdn($caseFold = null) { - $caseFold = self::sanitizeCaseFold($caseFold, $this->caseFold); - return self::caseFoldRdn($this->get(0, 1, $caseFold), null); + $caseFold = static::sanitizeCaseFold($caseFold, $this->caseFold); + return static::caseFoldRdn($this->get(0, 1, $caseFold), null); } /** @@ -127,8 +127,8 @@ public function getRdn($caseFold = null) */ public function getRdnString($caseFold = null) { - $caseFold = self::sanitizeCaseFold($caseFold, $this->caseFold); - return self::implodeRdn($this->getRdn(), $caseFold); + $caseFold = static::sanitizeCaseFold($caseFold, $this->caseFold); + return static::implodeRdn($this->getRdn(), $caseFold); } /** @@ -159,16 +159,16 @@ public function getParentDn($levelUp = 1) */ public function get($index, $length = 1, $caseFold = null) { - $caseFold = self::sanitizeCaseFold($caseFold, $this->caseFold); + $caseFold = static::sanitizeCaseFold($caseFold, $this->caseFold); $this->assertIndex($index); $length = (int) $length; if ($length <= 0) { $length = 1; } if ($length === 1) { - return self::caseFoldRdn($this->dn[$index], $caseFold); + return static::caseFoldRdn($this->dn[$index], $caseFold); } - return self::caseFoldDn(array_slice($this->dn, $index, $length, false), $caseFold); + return static::caseFoldDn(array_slice($this->dn, $index, $length, false), $caseFold); } /** @@ -182,7 +182,7 @@ public function get($index, $length = 1, $caseFold = null) public function set($index, array $value) { $this->assertIndex($index); - self::assertRdn($value); + static::assertRdn($value); $this->dn[$index] = $value; return $this; } @@ -214,7 +214,7 @@ public function remove($index, $length = 1) */ public function append(array $value) { - self::assertRdn($value); + static::assertRdn($value); $this->dn[] = $value; return $this; } @@ -227,7 +227,7 @@ public function append(array $value) */ public function prepend(array $value) { - self::assertRdn($value); + static::assertRdn($value); array_unshift($this->dn, $value); return $this; } @@ -243,7 +243,7 @@ public function prepend(array $value) public function insert($index, array $value) { $this->assertIndex($index); - self::assertRdn($value); + static::assertRdn($value); $first = array_slice($this->dn, 0, $index + 1); $second = array_slice($this->dn, $index + 1); $this->dn = array_merge($first, array($value), $second); @@ -295,7 +295,7 @@ protected static function assertRdn(array $value) */ public function setCaseFold($caseFold) { - $this->caseFold = self::sanitizeCaseFold($caseFold, self::$defaultCaseFold); + $this->caseFold = static::sanitizeCaseFold($caseFold, static::$defaultCaseFold); } /** @@ -307,8 +307,8 @@ public function setCaseFold($caseFold) */ public function toString($caseFold = null) { - $caseFold = self::sanitizeCaseFold($caseFold, $this->caseFold); - return self::implodeDn($this->dn, $caseFold); + $caseFold = static::sanitizeCaseFold($caseFold, $this->caseFold); + return static::implodeDn($this->dn, $caseFold); } /** @@ -319,12 +319,12 @@ public function toString($caseFold = null) */ public function toArray($caseFold = null) { - $caseFold = self::sanitizeCaseFold($caseFold, $this->caseFold); + $caseFold = static::sanitizeCaseFold($caseFold, $this->caseFold); if ($caseFold === self::ATTR_CASEFOLD_NONE) { return $this->dn; } - return self::caseFoldDn($this->dn, $caseFold); + return static::caseFoldDn($this->dn, $caseFold); } /** @@ -358,7 +358,7 @@ protected static function caseFoldDn(array $dn, $caseFold) { $return = array(); foreach ($dn as $part) { - $return[] = self::caseFoldRdn($part, $caseFold); + $return[] = static::caseFoldRdn($part, $caseFold); } return $return; } @@ -430,7 +430,7 @@ public function offsetUnset($offset) */ public static function setDefaultCaseFold($caseFold) { - self::$defaultCaseFold = self::sanitizeCaseFold($caseFold, self::ATTR_CASEFOLD_NONE); + static::$defaultCaseFold = static::sanitizeCaseFold($caseFold, self::ATTR_CASEFOLD_NONE); } /** @@ -635,7 +635,7 @@ public static function checkDn( if ($ch === '\\') { $state = 3; } elseif ($ch === ',' || $ch === ';' || $ch === 0 || $ch === '+') { - $value = self::unescapeValue(trim(substr($dn, $vo, $di - $vo))); + $value = static::unescapeValue(trim(substr($dn, $vo, $di - $vo))); if (is_array($multi)) { $va[count($va) - 1][] = $value; } else { @@ -685,11 +685,11 @@ public static function checkDn( */ public static function implodeRdn(array $part, $caseFold = null) { - self::assertRdn($part); - $part = self::caseFoldRdn($part, $caseFold); + static::assertRdn($part); + $part = static::caseFoldRdn($part, $caseFold); $rdnParts = array(); foreach ($part as $key => $value) { - $value = self::escapeValue($value); + $value = static::escapeValue($value); $keyId = strtolower($key); $rdnParts[$keyId] = implode('=', array($key, $value)); } @@ -720,7 +720,7 @@ public static function implodeDn(array $dnArray, $caseFold = null, $separator = { $parts = array(); foreach ($dnArray as $p) { - $parts[] = self::implodeRdn($p, $caseFold); + $parts[] = static::implodeRdn($p, $caseFold); } return implode($separator, $parts); @@ -741,12 +741,12 @@ public static function isChildOf($childDn, $parentDn) if ($childDn instanceof Dn) { $cdn = $childDn->toArray(DN::ATTR_CASEFOLD_LOWER); } else { - $cdn = self::explodeDn($childDn, $keys, $vals, DN::ATTR_CASEFOLD_LOWER); + $cdn = static::explodeDn($childDn, $keys, $vals, DN::ATTR_CASEFOLD_LOWER); } if ($parentDn instanceof Dn) { $pdn = $parentDn->toArray(DN::ATTR_CASEFOLD_LOWER); } else { - $pdn = self::explodeDn($parentDn, $keys, $vals, DN::ATTR_CASEFOLD_LOWER); + $pdn = static::explodeDn($parentDn, $keys, $vals, DN::ATTR_CASEFOLD_LOWER); } } catch (Exception\LdapException $e) { return false; diff --git a/library/Zend/Ldap/Filter.php b/library/Zend/Ldap/Filter.php index 2cc794c583a..e8ae6effdd0 100644 --- a/library/Zend/Ldap/Filter.php +++ b/library/Zend/Ldap/Filter.php @@ -216,7 +216,7 @@ private static function createFilterString($attr, $value, $filtertype, $prepend if ($prepend !== null) { $str .= $prepend; } - $str .= self::escapeValue($value); + $str .= static::escapeValue($value); if ($append !== null) { $str .= $append; } @@ -234,7 +234,7 @@ private static function createFilterString($attr, $value, $filtertype, $prepend */ public function __construct($attr, $value, $filtertype, $prepend = null, $append = null) { - $filter = self::createFilterString($attr, $value, $filtertype, $prepend, $append); + $filter = static::createFilterString($attr, $value, $filtertype, $prepend, $append); parent::__construct($filter); } } diff --git a/library/Zend/Ldap/Filter/MaskFilter.php b/library/Zend/Ldap/Filter/MaskFilter.php index f134192a34a..3ed382a8348 100644 --- a/library/Zend/Ldap/Filter/MaskFilter.php +++ b/library/Zend/Ldap/Filter/MaskFilter.php @@ -30,7 +30,7 @@ public function __construct($mask, $value) $args = func_get_args(); array_shift($args); for ($i = 0; $i < count($args); $i++) { - $args[$i] = self::escapeValue($args[$i]); + $args[$i] = static::escapeValue($args[$i]); } $filter = vsprintf($mask, $args); parent::__construct($filter); diff --git a/library/Zend/Ldap/Ldap.php b/library/Zend/Ldap/Ldap.php index 9be957ec997..43692e2d36e 100644 --- a/library/Zend/Ldap/Ldap.php +++ b/library/Zend/Ldap/Ldap.php @@ -1148,7 +1148,7 @@ public function add($dn, array $entry) if (!($dn instanceof Dn)) { $dn = Dn::factory($dn, null); } - self::prepareLdapEntryArray($entry); + static::prepareLdapEntryArray($entry); foreach ($entry as $key => $value) { if (is_array($value) && count($value) === 0) { unset($entry[$key]); @@ -1196,7 +1196,7 @@ public function update($dn, array $entry) if (!($dn instanceof Dn)) { $dn = Dn::factory($dn, null); } - self::prepareLdapEntryArray($entry); + static::prepareLdapEntryArray($entry); $rdnParts = $dn->getRdn(Dn::ATTR_CASEFOLD_LOWER); foreach ($rdnParts as $key => $value) { diff --git a/library/Zend/Ldap/Node.php b/library/Zend/Ldap/Node.php index 887c7a0693a..92305b037e6 100644 --- a/library/Zend/Ldap/Node.php +++ b/library/Zend/Ldap/Node.php @@ -814,7 +814,7 @@ protected function assertChangeableAttribute($name) throw new Exception\LdapException(null, 'DN cannot be changed.'); } elseif (array_key_exists($name, $rdn)) { throw new Exception\LdapException(null, 'Cannot change attribute because it\'s part of the RDN'); - } elseif (in_array($name, self::$systemAttributes)) { + } elseif (in_array($name, static::$systemAttributes)) { throw new Exception\LdapException(null, 'Cannot change attribute because it\'s read-only'); } else { return true; @@ -1039,7 +1039,7 @@ public function getParent(Ldap $ldap = null) $ldap = $this->getLdap(); $parentDn = $this->_getDn()->getParentDn(1); - return self::fromLdap($parentDn, $ldap); + return static::fromLdap($parentDn, $ldap); } /** diff --git a/library/Zend/Ldap/Node/AbstractNode.php b/library/Zend/Ldap/Node/AbstractNode.php index d2955c142ac..6f0bf4d237a 100644 --- a/library/Zend/Ldap/Node/AbstractNode.php +++ b/library/Zend/Ldap/Node/AbstractNode.php @@ -254,7 +254,7 @@ public function getData($includeSystemAttributes = true) if ($includeSystemAttributes === false) { $data = array(); foreach ($this->currentData as $key => $value) { - if (!in_array($key, self::$systemAttributes)) { + if (!in_array($key, static::$systemAttributes)) { $data[$key] = $value; } } diff --git a/library/Zend/Loader/AutoloaderFactory.php b/library/Zend/Loader/AutoloaderFactory.php index 0a95d265dd4..62c6aac419c 100644 --- a/library/Zend/Loader/AutoloaderFactory.php +++ b/library/Zend/Loader/AutoloaderFactory.php @@ -94,7 +94,7 @@ public static function factory($options = null) ); } - if (!self::isSubclassOf($class, 'Zend\Loader\SplAutoloader')) { + if (!static::isSubclassOf($class, 'Zend\Loader\SplAutoloader')) { require_once 'Exception/InvalidArgumentException.php'; throw new Exception\InvalidArgumentException( sprintf('Autoloader class %s must implement Zend\\Loader\\SplAutoloader', $class) diff --git a/library/Zend/Log/Formatter/Base.php b/library/Zend/Log/Formatter/Base.php index a495dfd31db..1b971181c24 100644 --- a/library/Zend/Log/Formatter/Base.php +++ b/library/Zend/Log/Formatter/Base.php @@ -52,7 +52,7 @@ public function format($event) foreach ($event as $key => $value) { // Keep extra as an array if ('extra' === $key) { - $event[$key] = self::format($value); + $event[$key] = static::format($value); } else { $event[$key] = $this->normalize($value); } diff --git a/library/Zend/Log/Logger.php b/library/Zend/Log/Logger.php index 696d568b968..c812065c33e 100644 --- a/library/Zend/Log/Logger.php +++ b/library/Zend/Log/Logger.php @@ -354,7 +354,7 @@ public function debug($message, $extra = array()) public static function registerErrorHandler(Logger $logger) { // Only register once per instance - if (self::$registeredErrorHandler) { + if (static::$registeredErrorHandler) { return false; } @@ -394,7 +394,7 @@ public static function registerErrorHandler(Logger $logger) )); } }); - self::$registeredErrorHandler = true; + static::$registeredErrorHandler = true; return true; } @@ -405,7 +405,7 @@ public static function registerErrorHandler(Logger $logger) public static function unregisterErrorHandler() { restore_error_handler(); - self::$registeredErrorHandler = false; + static::$registeredErrorHandler = false; } /** @@ -419,7 +419,7 @@ public static function unregisterErrorHandler() public static function registerExceptionHandler(Logger $logger) { // Only register once per instance - if (self::$registeredExceptionHandler) { + if (static::$registeredExceptionHandler) { return false; } @@ -438,7 +438,7 @@ public static function registerExceptionHandler(Logger $logger) } $logger->log(Logger::ERR, $exception->getMessage(), $extra); }); - self::$registeredExceptionHandler = true; + static::$registeredExceptionHandler = true; return true; } @@ -448,6 +448,6 @@ public static function registerExceptionHandler(Logger $logger) public static function unregisterExceptionHandler() { restore_exception_handler(); - self::$registeredExceptionHandler = false; + static::$registeredExceptionHandler = false; } } diff --git a/library/Zend/Log/Writer/Syslog.php b/library/Zend/Log/Writer/Syslog.php index 2326a2edb25..469a5cf8e15 100644 --- a/library/Zend/Log/Writer/Syslog.php +++ b/library/Zend/Log/Writer/Syslog.php @@ -149,8 +149,8 @@ protected function initializeValidFacilities() */ protected function initializeSyslog() { - self::$lastApplication = $this->appName; - self::$lastFacility = $this->facility; + static::$lastApplication = $this->appName; + static::$lastFacility = $this->facility; openlog($this->appName, LOG_PID, $this->facility); } @@ -231,8 +231,8 @@ protected function doWrite(array $event) $priority = $this->defaultPriority; } - if ($this->appName !== self::$lastApplication - || $this->facility !== self::$lastFacility + if ($this->appName !== static::$lastApplication + || $this->facility !== static::$lastFacility ) { $this->initializeSyslog(); } diff --git a/library/Zend/Mail/Storage/Imap.php b/library/Zend/Mail/Storage/Imap.php index 72b0268ed94..da2884865b6 100644 --- a/library/Zend/Mail/Storage/Imap.php +++ b/library/Zend/Mail/Storage/Imap.php @@ -77,8 +77,8 @@ public function countMessages($flags = null) $params = array(); foreach ((array) $flags as $flag) { - if (isset(self::$searchFlags[$flag])) { - $params[] = self::$searchFlags[$flag]; + if (isset(static::$searchFlags[$flag])) { + $params[] = static::$searchFlags[$flag]; } else { $params[] = 'KEYWORD'; $params[] = $this->protocol->escapeString($flag); @@ -116,7 +116,7 @@ public function getMessage($id) $flags = array(); foreach ($data['FLAGS'] as $flag) { - $flags[] = isset(self::$knownFlags[$flag]) ? self::$knownFlags[$flag] : $flag; + $flags[] = isset(static::$knownFlags[$flag]) ? static::$knownFlags[$flag] : $flag; } return new $this->messageClass(array('handler' => $this, 'id' => $id, 'headers' => $header, 'flags' => $flags)); diff --git a/library/Zend/Mail/Storage/Maildir.php b/library/Zend/Mail/Storage/Maildir.php index 29373b43cbe..371e30f5397 100644 --- a/library/Zend/Mail/Storage/Maildir.php +++ b/library/Zend/Mail/Storage/Maildir.php @@ -322,7 +322,7 @@ protected function _getMaildirFiles($dh, $dirname, $default_flags = array()) $length = strlen($flags); for ($i = 0; $i < $length; ++$i) { $flag = $flags[$i]; - $named_flags[$flag] = isset(self::$knownFlags[$flag]) ? self::$knownFlags[$flag] : $flag; + $named_flags[$flag] = isset(static::$knownFlags[$flag]) ? static::$knownFlags[$flag] : $flag; } $data = array('uniq' => $uniq, diff --git a/library/Zend/Mime/Decode.php b/library/Zend/Mime/Decode.php index 599dd8728cf..13afa7ad9f3 100644 --- a/library/Zend/Mime/Decode.php +++ b/library/Zend/Mime/Decode.php @@ -76,7 +76,7 @@ public static function splitMime($body, $boundary) */ public static function splitMessageStruct($message, $boundary, $EOL = Mime::LINEEND) { - $parts = self::splitMime($message, $boundary); + $parts = static::splitMime($message, $boundary); if (count($parts) <= 0) { return null; } @@ -84,7 +84,7 @@ public static function splitMessageStruct($message, $boundary, $EOL = Mime::LINE $headers = null; // "Declare" variable before the first usage "for reading" $body = null; // "Declare" variable before the first usage "for reading" foreach ($parts as $part) { - self::splitMessage($part, $headers, $body, $EOL); + static::splitMessage($part, $headers, $body, $EOL); $result[] = array('header' => $headers, 'body' => $body ); } @@ -155,7 +155,7 @@ public static function splitMessage($message, &$headers, &$body, $EOL = Mime::LI */ public static function splitContentType($type, $wantedPart = null) { - return self::splitHeaderField($type, $wantedPart, 'type'); + return static::splitHeaderField($type, $wantedPart, 'type'); } /** diff --git a/library/Zend/Mime/Mime.php b/library/Zend/Mime/Mime.php index 1e587dbd865..6f4e0cdbe74 100644 --- a/library/Zend/Mime/Mime.php +++ b/library/Zend/Mime/Mime.php @@ -99,7 +99,7 @@ class Mime */ public static function isPrintable($str) { - return (strcspn($str, self::$qpKeysString) == strlen($str)); + return (strcspn($str, static::$qpKeysString) == strlen($str)); } /** @@ -154,7 +154,7 @@ public static function encodeQuotedPrintable($str, private static function _encodeQuotedPrintable($str) { $str = str_replace('=', '=3D', $str); - $str = str_replace(self::$qpKeys, self::$qpReplaceValues, $str); + $str = str_replace(static::$qpKeys, static::$qpReplaceValues, $str); $str = rtrim($str); return $str; } @@ -191,7 +191,7 @@ public static function encodeQuotedPrintableHeader($str, $charset, $tmp = ""; while (strlen($str) > 0) { $currentLine = max(count($lines)-1, 0); - $token = self::getNextQuotedPrintableToken($str); + $token = static::getNextQuotedPrintableToken($str); $str = substr($str, strlen($token)); $tmp .= $token; @@ -253,7 +253,7 @@ public static function encodeBase64Header($str, $suffix = '?='; $remainingLength = $lineLength - strlen($prefix) - strlen($suffix); - $encodedValue = self::encodeBase64($str, $remainingLength, $lineEnd); + $encodedValue = static::encodeBase64($str, $remainingLength, $lineEnd); $encodedValue = str_replace($lineEnd, $suffix . $lineEnd . ' ' . $prefix, $encodedValue); $encodedValue = $prefix . $encodedValue . $suffix; return $encodedValue; @@ -285,7 +285,7 @@ public function __construct($boundary = null) { // This string needs to be somewhat unique if ($boundary === null) { - $this->boundary = '=_' . md5(microtime(1) . self::$makeUnique++); + $this->boundary = '=_' . md5(microtime(1) . static::$makeUnique++); } else { $this->boundary = $boundary; } @@ -303,10 +303,10 @@ public static function encode($str, $encoding, $EOL = self::LINEEND) { switch ($encoding) { case self::ENCODING_BASE64: - return self::encodeBase64($str, self::LINELENGTH, $EOL); + return static::encodeBase64($str, self::LINELENGTH, $EOL); case self::ENCODING_QUOTEDPRINTABLE: - return self::encodeQuotedPrintable($str, self::LINELENGTH, $EOL); + return static::encodeQuotedPrintable($str, self::LINELENGTH, $EOL); default: /** diff --git a/library/Zend/Mvc/Router/Http/Segment.php b/library/Zend/Mvc/Router/Http/Segment.php index 4b4fa4596df..d4f30db3611 100644 --- a/library/Zend/Mvc/Router/Http/Segment.php +++ b/library/Zend/Mvc/Router/Http/Segment.php @@ -409,7 +409,7 @@ public function getAssembledParams() private function encode($value) { $encoded = urlencode($value); - $encoded = strtr($encoded, self::$urlencodeCorrectionMap); + $encoded = strtr($encoded, static::$urlencodeCorrectionMap); return $encoded; } diff --git a/library/Zend/Mvc/Router/RoutePluginManager.php b/library/Zend/Mvc/Router/RoutePluginManager.php index c5f62e92ffe..d98f885f4cf 100644 --- a/library/Zend/Mvc/Router/RoutePluginManager.php +++ b/library/Zend/Mvc/Router/RoutePluginManager.php @@ -79,7 +79,7 @@ protected function createFromInvokable($canonicalName, $requestedName) )); } - if (!self::isSubclassOf($invokable, __NAMESPACE__ . '\RouteInterface')) { + if (!static::isSubclassOf($invokable, __NAMESPACE__ . '\RouteInterface')) { throw new Exception\RuntimeException(sprintf( '%s: failed retrieving "%s%s" via invokable class "%s"; class does not implement %s\RouteInterface', __METHOD__, diff --git a/library/Zend/Navigation/Page/AbstractPage.php b/library/Zend/Navigation/Page/AbstractPage.php index a9d0d7859ca..53a64380923 100644 --- a/library/Zend/Navigation/Page/AbstractPage.php +++ b/library/Zend/Navigation/Page/AbstractPage.php @@ -876,7 +876,7 @@ public function set($property, $value) ); } - $method = 'set' . self::normalizePropertyName($property); + $method = 'set' . static::normalizePropertyName($property); if ($method != 'setOptions' && method_exists($this, $method) ) { @@ -907,7 +907,7 @@ public function get($property) ); } - $method = 'get' . self::normalizePropertyName($property); + $method = 'get' . static::normalizePropertyName($property); if (method_exists($this, $method)) { return $this->$method(); @@ -963,7 +963,7 @@ public function __get($name) */ public function __isset($name) { - $method = 'get' . self::normalizePropertyName($name); + $method = 'get' . static::normalizePropertyName($name); if (method_exists($this, $method)) { return true; } @@ -982,7 +982,7 @@ public function __isset($name) */ public function __unset($name) { - $method = 'set' . self::normalizePropertyName($name); + $method = 'set' . static::normalizePropertyName($name); if (method_exists($this, $method)) { throw new Exception\InvalidArgumentException( sprintf( diff --git a/library/Zend/Navigation/Page/Mvc.php b/library/Zend/Navigation/Page/Mvc.php index 0a26f2372ce..eb0869015e3 100644 --- a/library/Zend/Navigation/Page/Mvc.php +++ b/library/Zend/Navigation/Page/Mvc.php @@ -178,7 +178,7 @@ public function getHref() $router = $this->router; if (null === $router) { - $router = self::$defaultRouter; + $router = static::$defaultRouter; } if (!$router instanceof RouteStackInterface) { @@ -411,7 +411,7 @@ public function setRouter(RouteStackInterface $router) */ public static function setDefaultRouter($router) { - self::$defaultRouter = $router; + static::$defaultRouter = $router; } /** @@ -421,7 +421,7 @@ public static function setDefaultRouter($router) */ public static function getDefaultRouter() { - return self::$defaultRouter; + return static::$defaultRouter; } // Public methods: diff --git a/library/Zend/Paginator/Paginator.php b/library/Zend/Paginator/Paginator.php index 89ddc640017..98f20b8bd7a 100644 --- a/library/Zend/Paginator/Paginator.php +++ b/library/Zend/Paginator/Paginator.php @@ -172,18 +172,18 @@ public static function setGlobalConfig($config) throw new Exception\InvalidArgumentException(__METHOD__ . ' expects an array or Traversable'); } - self::$config = $config; + static::$config = $config; if (isset($config['scrolling_style_plugins']) && null !== ($adapters = $config['scrolling_style_plugins']) ) { - self::setScrollingStylePluginManager($adapters); + static::setScrollingStylePluginManager($adapters); } $scrollingStyle = isset($config['scrolling_style']) ? $config['scrolling_style'] : null; if ($scrollingStyle != null) { - self::setDefaultScrollingStyle($scrollingStyle); + static::setDefaultScrollingStyle($scrollingStyle); } } @@ -194,7 +194,7 @@ public static function setGlobalConfig($config) */ public static function getDefaultScrollingStyle() { - return self::$defaultScrollingStyle; + return static::$defaultScrollingStyle; } /** @@ -204,7 +204,7 @@ public static function getDefaultScrollingStyle() */ public static function getDefaultItemCountPerPage() { - return self::$defaultItemCountPerPage; + return static::$defaultItemCountPerPage; } /** @@ -214,7 +214,7 @@ public static function getDefaultItemCountPerPage() */ public static function setDefaultItemCountPerPage($count) { - self::$defaultItemCountPerPage = (int) $count; + static::$defaultItemCountPerPage = (int) $count; } /** @@ -224,7 +224,7 @@ public static function setDefaultItemCountPerPage($count) */ public static function setCache(CacheStorage $cache) { - self::$cache = $cache; + static::$cache = $cache; } /** @@ -234,7 +234,7 @@ public static function setCache(CacheStorage $cache) */ public static function setDefaultScrollingStyle($scrollingStyle = 'Sliding') { - self::$defaultScrollingStyle = $scrollingStyle; + static::$defaultScrollingStyle = $scrollingStyle; } public static function setScrollingStylePluginManager($scrollingAdapters) @@ -254,7 +254,7 @@ public static function setScrollingStylePluginManager($scrollingAdapters) (is_object($scrollingAdapters) ? get_class($scrollingAdapters) : gettype($scrollingAdapters)) )); } - self::$scrollingStyles = $scrollingAdapters; + static::$scrollingStyles = $scrollingAdapters; } /** @@ -265,11 +265,11 @@ public static function setScrollingStylePluginManager($scrollingAdapters) */ public static function getScrollingStylePluginManager() { - if (self::$scrollingStyles === null) { - self::$scrollingStyles = new ScrollingStylePluginManager(); + if (static::$scrollingStyles === null) { + static::$scrollingStyles = new ScrollingStylePluginManager(); } - return self::$scrollingStyles; + return static::$scrollingStyles; } /** @@ -291,7 +291,7 @@ public function __construct($adapter) ); } - $config = self::$config; + $config = static::$config; if (!empty($config)) { $setupMethods = array('ItemCountPerPage', 'PageRange'); @@ -375,19 +375,19 @@ public function clearPageItemCache($pageNumber = null) if (null === $pageNumber) { $prefixLength = strlen(self::CACHE_TAG_PREFIX); - $cacheIterator = self::$cache->getIterator(); + $cacheIterator = static::$cache->getIterator(); $cacheIterator->setMode(CacheIterator::CURRENT_AS_KEY); foreach ($cacheIterator as $key) { - $tags = self::$cache->getTags($key); + $tags = static::$cache->getTags($key); if ($tags && in_array($this->_getCacheInternalId(), $tags)) { if (substr($key, 0, $prefixLength) == self::CACHE_TAG_PREFIX) { - self::$cache->removeItem($this->_getCacheId((int)substr($key, $prefixLength))); + static::$cache->removeItem($this->_getCacheId((int)substr($key, $prefixLength))); } } } } else { $cleanId = $this->_getCacheId($pageNumber); - self::$cache->removeItem($cleanId); + static::$cache->removeItem($cleanId); } return $this; } @@ -544,7 +544,7 @@ public function getItem($itemNumber, $pageNumber = null) public function getItemCountPerPage() { if (empty($this->itemCountPerPage)) { - $this->itemCountPerPage = self::getDefaultItemCountPerPage(); + $this->itemCountPerPage = static::getDefaultItemCountPerPage(); } return $this->itemCountPerPage; @@ -599,7 +599,7 @@ public function getItemsByPage($pageNumber) $pageNumber = $this->normalizePageNumber($pageNumber); if ($this->cacheEnabled()) { - $data = self::$cache->getItem($this->_getCacheId($pageNumber)); + $data = static::$cache->getItem($this->_getCacheId($pageNumber)); if ($data) { return $data; } @@ -621,8 +621,8 @@ public function getItemsByPage($pageNumber) if ($this->cacheEnabled()) { $cacheId = $this->_getCacheId($pageNumber); - self::$cache->setItem($cacheId, $items); - self::$cache->setTags($cacheId, array($this->_getCacheInternalId())); + static::$cache->setItem($cacheId, $items); + static::$cache->setTags($cacheId, array($this->_getCacheInternalId())); } return $items; @@ -712,10 +712,10 @@ public function getPageItemCache() $data = array(); if ($this->cacheEnabled()) { $prefixLength = strlen(self::CACHE_TAG_PREFIX); - $cacheIterator = self::$cache->getIterator(); + $cacheIterator = static::$cache->getIterator(); $cacheIterator->setMode(CacheIterator::CURRENT_AS_VALUE); foreach ($cacheIterator as $key => $value) { - $tags = self::$cache->getTags($key); + $tags = static::$cache->getTags($key); if ($tags && in_array($this->_getCacheInternalId(), $tags)) { if (substr($key, 0, $prefixLength) == self::CACHE_TAG_PREFIX) { $data[(int) substr($key, $prefixLength)] = $value; @@ -839,7 +839,7 @@ public function toJson() */ protected function cacheEnabled() { - return ((self::$cache !== null) && $this->cacheEnabled); + return ((static::$cache !== null) && $this->cacheEnabled); } /** @@ -941,7 +941,7 @@ protected function _createPages($scrollingStyle = null) protected function _loadScrollingStyle($scrollingStyle = null) { if ($scrollingStyle === null) { - $scrollingStyle = self::$defaultScrollingStyle; + $scrollingStyle = static::$defaultScrollingStyle; } switch (strtolower(gettype($scrollingStyle))) { @@ -955,7 +955,7 @@ protected function _loadScrollingStyle($scrollingStyle = null) return $scrollingStyle; case 'string': - return self::getScrollingStylePluginManager()->get($scrollingStyle); + return static::getScrollingStylePluginManager()->get($scrollingStyle); case 'null': // Fall through to default case diff --git a/library/Zend/Serializer/Adapter/IgBinary.php b/library/Zend/Serializer/Adapter/IgBinary.php index 48d2dccce71..de718191b9d 100644 --- a/library/Zend/Serializer/Adapter/IgBinary.php +++ b/library/Zend/Serializer/Adapter/IgBinary.php @@ -38,8 +38,8 @@ public function __construct($options = null) ); } - if (self::$serializedNull === null) { - self::$serializedNull = igbinary_serialize(null); + if (static::$serializedNull === null) { + static::$serializedNull = igbinary_serialize(null); } parent::__construct($options); @@ -74,7 +74,7 @@ public function serialize($value) */ public function unserialize($serialized) { - if ($serialized === self::$serializedNull) { + if ($serialized === static::$serializedNull) { return null; } diff --git a/library/Zend/Serializer/Adapter/PhpSerialize.php b/library/Zend/Serializer/Adapter/PhpSerialize.php index 81bab5f7336..7bf70500e29 100644 --- a/library/Zend/Serializer/Adapter/PhpSerialize.php +++ b/library/Zend/Serializer/Adapter/PhpSerialize.php @@ -34,8 +34,8 @@ public function __construct($options = null) { // needed to check if a returned false is based on a serialize false // or based on failure (igbinary can overwrite [un]serialize functions) - if (self::$serializedFalse === null) { - self::$serializedFalse = serialize(false); + if (static::$serializedFalse === null) { + static::$serializedFalse = serialize(false); } parent::__construct($options); @@ -78,7 +78,7 @@ public function unserialize($serialized) // If we have a serialized boolean false value, just return false; // prevents the unserialize handler from creating an error. - if ($serialized === self::$serializedFalse) { + if ($serialized === static::$serializedFalse) { return false; } diff --git a/library/Zend/Serializer/Adapter/PythonPickle.php b/library/Zend/Serializer/Adapter/PythonPickle.php index 3e11d139c0d..a099b87cac5 100644 --- a/library/Zend/Serializer/Adapter/PythonPickle.php +++ b/library/Zend/Serializer/Adapter/PythonPickle.php @@ -143,8 +143,8 @@ class PythonPickle extends AbstractAdapter public function __construct($options = null) { // init - if (self::$isLittleEndian === null) { - self::$isLittleEndian = (pack('l', 1) === "\x01\x00\x00\x00"); + if (static::$isLittleEndian === null) { + static::$isLittleEndian = (pack('l', 1) === "\x01\x00\x00\x00"); } $this->marker = new stdClass(); @@ -268,7 +268,7 @@ protected function writeGet($id) } else { // LONG_BINGET + pack("pickle .= self::OP_LONG_BINGET . $bin; @@ -290,7 +290,7 @@ protected function writePut($id) } else { // LONG_BINPUT + pack("pickle .= self::OP_LONG_BINPUT . $bin; @@ -350,7 +350,7 @@ protected function writeInt($value) // fits in a 4-byte signed int. // self.write(BININT + pack("pickle .= self::OP_BININT . $bin; @@ -370,7 +370,7 @@ protected function writeFloat($value) } else { // self.write(BINFLOAT + pack('>d', obj)) $bin = pack('d', $value); - if (self::$isLittleEndian === true) { + if (static::$isLittleEndian === true) { $bin = strrev($bin); } $this->pickle .= self::OP_BINFLOAT . $bin; @@ -399,7 +399,7 @@ protected function writeString($value) } else { // self.write(BINSTRING + pack("pickle .= self::OP_BINSTRING . $binLen . $value; @@ -518,7 +518,7 @@ protected function searchMemo($value) */ protected function quoteString($str) { - $quoteArr = self::$quoteString; + $quoteArr = static::$quoteString; if (($cntSingleQuote = substr_count($str, "'")) && ($cntDoubleQuote = substr_count($str, '"')) @@ -750,7 +750,7 @@ protected function loadBinPut() protected function loadLongBinPut() { $bin = $this->read(4); - if (self::$isLittleEndian === false) { + if (static::$isLittleEndian === false) { $bin = strrev($bin); } list(, $id) = unpack('l', $bin); @@ -800,7 +800,7 @@ protected function loadBinGet() protected function loadLongBinGet() { $bin = $this->read(4); - if (self::$isLittleEndian === false) { + if (static::$isLittleEndian === false) { $bin = strrev($bin); } list(, $id) = unpack('l', $bin); @@ -856,7 +856,7 @@ protected function loadInt() protected function loadBinInt() { $bin = $this->read(4); - if (self::$isLittleEndian === false) { + if (static::$isLittleEndian === false) { $bin = strrev($bin); } list(, $int) = unpack('l', $bin); @@ -911,7 +911,7 @@ protected function loadLong1() protected function loadLong4() { $nBin = $this->read(4); - if (self::$isLittleEndian === false) { + if (static::$isLittleEndian === false) { $nBin = strrev($$nBin); } list(, $n) = unpack('l', $nBin); @@ -937,7 +937,7 @@ protected function loadFloat() protected function loadBinFloat() { $bin = $this->read(8); - if (self::$isLittleEndian === true) { + if (static::$isLittleEndian === true) { $bin = strrev($bin); } list(, $float) = unpack('d', $bin); @@ -960,7 +960,7 @@ protected function loadString() protected function loadBinString() { $bin = $this->read(4); - if (!self::$isLittleEndian) { + if (!static::$isLittleEndian) { $bin = strrev($bin); } list(, $len) = unpack('l', $bin); @@ -984,7 +984,7 @@ protected function loadBinBytes() { // read byte length $nBin = $this->read(4); - if (self::$isLittleEndian === false) { + if (static::$isLittleEndian === false) { $nBin = strrev($$nBin); } list(, $n) = unpack('l', $nBin); @@ -1067,7 +1067,7 @@ protected function loadBinUnicode() { // read byte length $n = $this->read(4); - if (self::$isLittleEndian === false) { + if (static::$isLittleEndian === false) { $n = strrev($n); } list(, $n) = unpack('l', $n); @@ -1296,7 +1296,7 @@ protected function readline() */ protected function unquoteString($str) { - $quoteArr = array_flip(self::$quoteString); + $quoteArr = array_flip(static::$quoteString); if ($str[0] == '"') { $quoteArr['\\"'] = '"'; @@ -1341,7 +1341,7 @@ protected function decodeBinLong($data) if ($this->bigIntegerAdapter === null) { $this->bigIntegerAdapter = BigInteger\BigInteger::getDefaultAdapter(); } - if (self::$isLittleEndian === true) { + if (static::$isLittleEndian === true) { $data = strrev($data); } $long = $this->bigIntegerAdapter->binToInt($data, true); diff --git a/library/Zend/Server/Cache.php b/library/Zend/Server/Cache.php index 34cfdd6584e..72688ed188d 100644 --- a/library/Zend/Server/Cache.php +++ b/library/Zend/Server/Cache.php @@ -51,7 +51,7 @@ public static function save($filename, Server $server) if ($methods instanceof Definition) { $definition = new Definition(); foreach ($methods as $method) { - if (in_array($method->getName(), self::$skipMethods)) { + if (in_array($method->getName(), static::$skipMethods)) { continue; } $definition->addMethod($method); diff --git a/library/Zend/Session/Container.php b/library/Zend/Session/Container.php index bf00c837dbc..29ec57fc8e2 100644 --- a/library/Zend/Session/Container.php +++ b/library/Zend/Session/Container.php @@ -88,7 +88,7 @@ public function __construct($name = 'Default', Manager $manager = null) */ public static function setDefaultManager(Manager $manager = null) { - self::$defaultManager = $manager; + static::$defaultManager = $manager; } /** @@ -101,16 +101,16 @@ public static function setDefaultManager(Manager $manager = null) */ public static function getDefaultManager() { - if (null === self::$defaultManager) { - $manager = new self::$managerDefaultClass(); + if (null === static::$defaultManager) { + $manager = new static::$managerDefaultClass(); if (!$manager instanceof Manager) { throw new Exception\InvalidArgumentException( 'Invalid default manager type provided; must implement ManagerInterface' ); } - self::$defaultManager = $manager; + static::$defaultManager = $manager; } - return self::$defaultManager; + return static::$defaultManager; } /** @@ -133,7 +133,7 @@ public function getName() protected function setManager(Manager $manager = null) { if (null === $manager) { - $manager = self::getDefaultManager(); + $manager = static::getDefaultManager(); if (!$manager instanceof Manager) { throw new Exception\InvalidArgumentException( 'Manager provided is invalid; must implement ManagerInterface' diff --git a/library/Zend/Session/Validator/RemoteAddr.php b/library/Zend/Session/Validator/RemoteAddr.php index ad10ba203ea..10ac63de488 100644 --- a/library/Zend/Session/Validator/RemoteAddr.php +++ b/library/Zend/Session/Validator/RemoteAddr.php @@ -72,7 +72,7 @@ public function isValid() */ public static function setUseProxy($useProxy = true) { - self::$useProxy = $useProxy; + static::$useProxy = $useProxy; } /** @@ -82,7 +82,7 @@ public static function setUseProxy($useProxy = true) */ public static function getUseProxy() { - return self::$useProxy; + return static::$useProxy; } /** @@ -92,7 +92,7 @@ public static function getUseProxy() */ protected function getIpAddress() { - if (self::$useProxy) { + if (static::$useProxy) { // proxy IP address if (isset($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP']) { $ips = explode(',', $_SERVER['HTTP_CLIENT_IP']); diff --git a/library/Zend/Stdlib/ArrayUtils.php b/library/Zend/Stdlib/ArrayUtils.php index 1ec57dabdc1..9b8b5357d10 100644 --- a/library/Zend/Stdlib/ArrayUtils.php +++ b/library/Zend/Stdlib/ArrayUtils.php @@ -235,7 +235,7 @@ public static function merge(array $a, array $b) if (is_int($key)) { $a[] = $value; } elseif (is_array($value) && is_array($a[$key])) { - $a[$key] = self::merge($a[$key], $value); + $a[$key] = static::merge($a[$key], $value); } else { $a[$key] = $value; } diff --git a/library/Zend/Stdlib/CallbackHandler.php b/library/Zend/Stdlib/CallbackHandler.php index 7e1f19df711..d516f30fe93 100644 --- a/library/Zend/Stdlib/CallbackHandler.php +++ b/library/Zend/Stdlib/CallbackHandler.php @@ -81,12 +81,12 @@ protected function registerCallback($callback) throw new Exception\InvalidCallbackException('Invalid callback provided; not callable'); } - if (null === self::$hasWeakRefExtension) { - self::$hasWeakRefExtension = class_exists('WeakRef'); + if (null === static::$hasWeakRefExtension) { + static::$hasWeakRefExtension = class_exists('WeakRef'); } // If pecl/weakref is not installed, simply store the callback and return - if (!self::$hasWeakRefExtension) { + if (!static::$hasWeakRefExtension) { $this->callback = $callback; return; } @@ -172,13 +172,13 @@ public function call(array $args = array()) } // Minor performance tweak, if the callback gets called more than once - if (!isset(self::$isPhp54)) { - self::$isPhp54 = version_compare(PHP_VERSION, '5.4.0rc1', '>='); + if (!isset(static::$isPhp54)) { + static::$isPhp54 = version_compare(PHP_VERSION, '5.4.0rc1', '>='); } $argCount = count($args); - if (self::$isPhp54 && is_string($callback)) { + if (static::$isPhp54 && is_string($callback)) { $result = $this->validateStringCallbackFor54($callback); if ($result !== true && $argCount <= 3) { @@ -193,19 +193,19 @@ public function call(array $args = array()) // reached switch ($argCount) { case 0: - if (self::$isPhp54) { + if (static::$isPhp54) { return $callback(); } return call_user_func($callback); case 1: - if (self::$isPhp54) { + if (static::$isPhp54) { return $callback(array_shift($args)); } return call_user_func($callback, array_shift($args)); case 2: $arg1 = array_shift($args); $arg2 = array_shift($args); - if (self::$isPhp54) { + if (static::$isPhp54) { return $callback($arg1, $arg2); } return call_user_func($callback, $arg1, $arg2); @@ -213,7 +213,7 @@ public function call(array $args = array()) $arg1 = array_shift($args); $arg2 = array_shift($args); $arg3 = array_shift($args); - if (self::$isPhp54) { + if (static::$isPhp54) { return $callback($arg1, $arg2, $arg3); } return call_user_func($callback, $arg1, $arg2, $arg3); diff --git a/library/Zend/Stdlib/Glob.php b/library/Zend/Stdlib/Glob.php index 09679c2c759..8bb542b656c 100644 --- a/library/Zend/Stdlib/Glob.php +++ b/library/Zend/Stdlib/Glob.php @@ -42,9 +42,9 @@ abstract class Glob public static function glob($pattern, $flags, $forceFallback = false) { if (!defined('GLOB_BRACE') || $forceFallback) { - return self::fallbackGlob($pattern, $flags); + return static::fallbackGlob($pattern, $flags); } else { - return self::systemGlob($pattern, $flags); + return static::systemGlob($pattern, $flags); } } @@ -92,7 +92,7 @@ protected static function systemGlob($pattern, $flags) protected static function fallbackGlob($pattern, $flags) { if (!$flags & self::GLOB_BRACE) { - return self::systemGlob($pattern, $flags); + return static::systemGlob($pattern, $flags); } $flags &= ~self::GLOB_BRACE; @@ -119,22 +119,22 @@ protected static function fallbackGlob($pattern, $flags) } if ($begin === false) { - return self::systemGlob($pattern, $flags); + return static::systemGlob($pattern, $flags); } - $next = self::nextBraceSub($pattern, $begin + 1, $flags); + $next = static::nextBraceSub($pattern, $begin + 1, $flags); if ($next === null) { - return self::systemGlob($pattern, $flags); + return static::systemGlob($pattern, $flags); } $rest = $next; while ($pattern[$rest] !== '}') { - $rest = self::nextBraceSub($pattern, $rest + 1, $flags); + $rest = static::nextBraceSub($pattern, $rest + 1, $flags); if ($rest === null) { - return self::systemGlob($pattern, $flags); + return static::systemGlob($pattern, $flags); } } @@ -145,7 +145,7 @@ protected static function fallbackGlob($pattern, $flags) . substr($pattern, $p, $next - $p) . substr($pattern, $rest + 1); - $result = self::fallbackGlob($subPattern, $flags | self::GLOB_BRACE); + $result = static::fallbackGlob($subPattern, $flags | self::GLOB_BRACE); if ($result) { $paths = array_merge($paths, $result); @@ -156,7 +156,7 @@ protected static function fallbackGlob($pattern, $flags) } $p = $next + 1; - $next = self::nextBraceSub($pattern, $p, $flags); + $next = static::nextBraceSub($pattern, $p, $flags); } return array_unique($paths); diff --git a/library/Zend/Stdlib/Hydrator/Reflection.php b/library/Zend/Stdlib/Hydrator/Reflection.php index e9d1d66fc01..c6daa716a74 100644 --- a/library/Zend/Stdlib/Hydrator/Reflection.php +++ b/library/Zend/Stdlib/Hydrator/Reflection.php @@ -80,16 +80,16 @@ protected static function getReflProperties($input) throw new Exception\InvalidArgumentException('Input must be a string or an object.'); } - if (!isset(self::$reflProperties[$input])) { + if (!isset(static::$reflProperties[$input])) { $reflClass = new ReflectionClass($input); $reflProperties = $reflClass->getProperties(); foreach ($reflProperties as $property) { $property->setAccessible(true); - self::$reflProperties[$input][$property->getName()] = $property; + static::$reflProperties[$input][$property->getName()] = $property; } } - return self::$reflProperties[$input]; + return static::$reflProperties[$input]; } } diff --git a/library/Zend/Uri/Http.php b/library/Zend/Uri/Http.php index eb5feddfd42..dd0730d2884 100644 --- a/library/Zend/Uri/Http.php +++ b/library/Zend/Uri/Http.php @@ -172,8 +172,8 @@ protected function parseUserInfo() public function getPort() { if (empty($this->port)) { - if (array_key_exists($this->scheme, self::$defaultPorts)) { - return self::$defaultPorts[$this->scheme]; + if (array_key_exists($this->scheme, static::$defaultPorts)) { + return static::$defaultPorts[$this->scheme]; } } return $this->port; diff --git a/library/Zend/Validator/AbstractValidator.php b/library/Zend/Validator/AbstractValidator.php index ec3244f7234..359eca23544 100644 --- a/library/Zend/Validator/AbstractValidator.php +++ b/library/Zend/Validator/AbstractValidator.php @@ -480,7 +480,7 @@ public static function setDefaultTranslator( Translator $translator = null, $textDomain = null ) { - self::$defaultTranslator = $translator; + static::$defaultTranslator = $translator; if (null !== $textDomain) { self::setDefaultTranslatorTextDomain($textDomain); } @@ -493,7 +493,7 @@ public static function setDefaultTranslator( */ public static function getDefaultTranslator() { - return self::$defaultTranslator; + return static::$defaultTranslator; } /** @@ -503,7 +503,7 @@ public static function getDefaultTranslator() */ public static function hasDefaultTranslator() { - return (bool) self::$defaultTranslator; + return (bool) static::$defaultTranslator; } /** @@ -514,7 +514,7 @@ public static function hasDefaultTranslator() */ public static function setDefaultTranslatorTextDomain($textDomain = 'default') { - self::$defaultTranslatorTextDomain = $textDomain; + static::$defaultTranslatorTextDomain = $textDomain; } /** @@ -524,7 +524,7 @@ public static function setDefaultTranslatorTextDomain($textDomain = 'default') */ public static function getDefaultTranslatorTextDomain() { - return self::$defaultTranslatorTextDomain; + return static::$defaultTranslatorTextDomain; } /** @@ -556,7 +556,7 @@ public function isTranslatorEnabled() */ public static function getMessageLength() { - return self::$messageLength; + return static::$messageLength; } /** @@ -566,7 +566,7 @@ public static function getMessageLength() */ public static function setMessageLength($length = -1) { - self::$messageLength = $length; + static::$messageLength = $length; } /** diff --git a/library/Zend/Validator/Digits.php b/library/Zend/Validator/Digits.php index 10043b2a004..5fe9c39283f 100644 --- a/library/Zend/Validator/Digits.php +++ b/library/Zend/Validator/Digits.php @@ -60,11 +60,11 @@ public function isValid($value) return false; } - if (null === self::$filter) { - self::$filter = new DigitsFilter(); + if (null === static::$filter) { + static::$filter = new DigitsFilter(); } - if ($this->getValue() !== self::$filter->filter($this->getValue())) { + if ($this->getValue() !== static::$filter->filter($this->getValue())) { $this->error(self::NOT_DIGITS); return false; } diff --git a/library/Zend/Validator/Iban.php b/library/Zend/Validator/Iban.php index 2eb30aebd25..6a8b928cd41 100644 --- a/library/Zend/Validator/Iban.php +++ b/library/Zend/Validator/Iban.php @@ -180,7 +180,7 @@ public function setCountryCode($countryCode = null) if ($countryCode !== null) { $countryCode = (string) $countryCode; - if (!isset(self::$ibanRegex[$countryCode])) { + if (!isset(static::$ibanRegex[$countryCode])) { throw new Exception\InvalidArgumentException( "Country code '{$countryCode}' invalid by ISO 3166-1 or not supported" ); @@ -234,19 +234,19 @@ public function isValid($value) $countryCode = substr($value, 0, 2); } - if (!array_key_exists($countryCode, self::$ibanRegex)) { + if (!array_key_exists($countryCode, static::$ibanRegex)) { $this->setValue($countryCode); $this->error(self::NOTSUPPORTED); return false; } - if (!$this->allowNonSepa && !in_array($countryCode, self::$sepaCountries)) { + if (!$this->allowNonSepa && !in_array($countryCode, static::$sepaCountries)) { $this->setValue($countryCode); $this->error(self::SEPANOTSUPPORTED); return false; } - if (!preg_match('/^' . self::$ibanRegex[$countryCode] . '$/', $value)) { + if (!preg_match('/^' . static::$ibanRegex[$countryCode] . '$/', $value)) { $this->error(self::FALSEFORMAT); return false; } diff --git a/library/Zend/Validator/StaticValidator.php b/library/Zend/Validator/StaticValidator.php index 0d9f0b25b16..036fc74348e 100644 --- a/library/Zend/Validator/StaticValidator.php +++ b/library/Zend/Validator/StaticValidator.php @@ -33,7 +33,7 @@ public static function setPluginManager(ValidatorPluginManager $plugins = null) if ($plugins instanceof ValidatorPluginManager) { $plugins->setShareByDefault(false); } - self::$plugins = $plugins; + static::$plugins = $plugins; } /** @@ -43,10 +43,10 @@ public static function setPluginManager(ValidatorPluginManager $plugins = null) */ public static function getPluginManager() { - if (null === self::$plugins) { + if (null === static::$plugins) { static::setPluginManager(new ValidatorPluginManager()); } - return self::$plugins; + return static::$plugins; } /** diff --git a/library/Zend/Version/Version.php b/library/Zend/Version/Version.php index 8cd4d38d028..b9b49360285 100644 --- a/library/Zend/Version/Version.php +++ b/library/Zend/Version/Version.php @@ -79,7 +79,7 @@ public static function compareVersion($version) */ public static function getLatest($service = self::VERSION_SERVICE_GITHUB) { - if (null === self::$latestVersion) { + if (null === static::$latestVersion) { static::$latestVersion = 'not available'; if ($service == self::VERSION_SERVICE_GITHUB) { $url = 'https://api.github.com/repos/zendframework/zf2/git/refs/tags/release-'; diff --git a/library/Zend/View/Helper/Navigation/AbstractHelper.php b/library/Zend/View/Helper/Navigation/AbstractHelper.php index 65203d96124..78e16f0833d 100644 --- a/library/Zend/View/Helper/Navigation/AbstractHelper.php +++ b/library/Zend/View/Helper/Navigation/AbstractHelper.php @@ -335,8 +335,8 @@ public function setAcl(Acl\Acl $acl = null) */ public function getAcl() { - if ($this->acl === null && self::$defaultAcl !== null) { - return self::$defaultAcl; + if ($this->acl === null && static::$defaultAcl !== null) { + return static::$defaultAcl; } return $this->acl; @@ -380,8 +380,8 @@ public function setRole($role = null) */ public function getRole() { - if ($this->role === null && self::$defaultRole !== null) { - return self::$defaultRole; + if ($this->role === null && static::$defaultRole !== null) { + return static::$defaultRole; } return $this->role; @@ -850,7 +850,7 @@ protected function normalizeId($value) */ public static function setDefaultAcl(Acl\Acl $acl = null) { - self::$defaultAcl = $acl; + static::$defaultAcl = $acl; } /** @@ -869,7 +869,7 @@ public static function setDefaultRole($role = null) || is_string($role) || $role instanceof Acl\Role\RoleInterface ) { - self::$defaultRole = $role; + static::$defaultRole = $role; } else { throw new Exception\InvalidArgumentException(sprintf( '$role must be null|string|Zend\Permissions\Role\RoleInterface; received "%s"', diff --git a/library/Zend/View/Helper/Navigation/Links.php b/library/Zend/View/Helper/Navigation/Links.php index 71f1479c36a..47d582447c9 100644 --- a/library/Zend/View/Helper/Navigation/Links.php +++ b/library/Zend/View/Helper/Navigation/Links.php @@ -218,14 +218,14 @@ public function findAllRelations(AbstractPage $page, $flag = null) } $result = array('rel' => array(), 'rev' => array()); - $native = array_values(self::$RELATIONS); + $native = array_values(static::$RELATIONS); foreach (array_keys($result) as $rel) { $meth = 'getDefined' . ucfirst($rel); $types = array_merge($native, array_diff($page->$meth(), $native)); foreach ($types as $type) { - if (!$relFlag = array_search($type, self::$RELATIONS)) { + if (!$relFlag = array_search($type, static::$RELATIONS)) { $relFlag = self::RENDER_CUSTOM; } if (!($flag & $relFlag)) { diff --git a/library/Zend/View/Helper/PaginationControl.php b/library/Zend/View/Helper/PaginationControl.php index ec9c93affed..34ef5c7994f 100644 --- a/library/Zend/View/Helper/PaginationControl.php +++ b/library/Zend/View/Helper/PaginationControl.php @@ -41,7 +41,7 @@ class PaginationControl extends AbstractHelper */ public static function setDefaultViewPartial($partial) { - self::$defaultViewPartial = $partial; + static::$defaultViewPartial = $partial; } /** @@ -51,7 +51,7 @@ public static function setDefaultViewPartial($partial) */ public static function getDefaultViewPartial() { - return self::$defaultViewPartial; + return static::$defaultViewPartial; } /** @@ -61,7 +61,7 @@ public static function getDefaultViewPartial() */ public static function getDefaultScrollingStyle() { - return self::$defaultScrollingStyle; + return static::$defaultScrollingStyle; } /** @@ -71,7 +71,7 @@ public static function getDefaultScrollingStyle() */ public static function setDefaultScrollingStyle($style) { - self::$defaultScrollingStyle = $style; + static::$defaultScrollingStyle = $style; } /** @@ -98,15 +98,15 @@ public function __invoke(Paginator\Paginator $paginator = null, $scrollingStyle } if ($partial === null) { - if (self::$defaultViewPartial === null) { + if (static::$defaultViewPartial === null) { throw new Exception\RuntimeException('No view partial provided and no default set'); } - $partial = self::$defaultViewPartial; + $partial = static::$defaultViewPartial; } if ($scrollingStyle === null) { - $scrollingStyle = self::$defaultScrollingStyle; + $scrollingStyle = static::$defaultScrollingStyle; } $pages = get_object_vars($paginator->getPages($scrollingStyle)); diff --git a/library/Zend/XmlRpc/AbstractValue.php b/library/Zend/XmlRpc/AbstractValue.php index a429058ef1d..36ba7fe3758 100644 --- a/library/Zend/XmlRpc/AbstractValue.php +++ b/library/Zend/XmlRpc/AbstractValue.php @@ -245,7 +245,7 @@ public static function getXmlRpcTypeByValue($value) } elseif ($value instanceof DateTime) { return self::XMLRPC_TYPE_DATETIME; } - return self::getXmlRpcTypeByValue(get_object_vars($value)); + return static::getXmlRpcTypeByValue(get_object_vars($value)); } elseif (is_array($value)) { if (!empty($value) && is_array($value) && (array_keys($value) !== range(0, count($value) - 1))) { return self::XMLRPC_TYPE_STRUCT; diff --git a/library/Zend/XmlRpc/Server.php b/library/Zend/XmlRpc/Server.php index 6a224346624..0beb1a49707 100644 --- a/library/Zend/XmlRpc/Server.php +++ b/library/Zend/XmlRpc/Server.php @@ -439,7 +439,7 @@ public function getResponse() */ public function setResponseClass($class) { - if (!class_exists($class) || !self::isSubclassOf($class, 'Zend\XmlRpc\Response')) { + if (!class_exists($class) || !static::isSubclassOf($class, 'Zend\XmlRpc\Response')) { throw new Server\Exception\InvalidArgumentException('Invalid response class'); } diff --git a/library/Zend/XmlRpc/Server/Fault.php b/library/Zend/XmlRpc/Server/Fault.php index 7ce41210232..5c9b37dc1b9 100644 --- a/library/Zend/XmlRpc/Server/Fault.php +++ b/library/Zend/XmlRpc/Server/Fault.php @@ -58,7 +58,7 @@ public function __construct(\Exception $e) $code = 404; $message = 'Unknown error'; - foreach (array_keys(self::$faultExceptionClasses) as $class) { + foreach (array_keys(static::$faultExceptionClasses) as $class) { if ($e instanceof $class) { $code = $e->getCode(); $message = $e->getMessage(); @@ -69,8 +69,8 @@ public function __construct(\Exception $e) parent::__construct($code, $message); // Notify exception observers, if present - if (!empty(self::$observers)) { - foreach (array_keys(self::$observers) as $observer) { + if (!empty(static::$observers)) { + foreach (array_keys(static::$observers) as $observer) { $observer::observe($this); } } @@ -101,7 +101,7 @@ public static function attachFaultException($classes) foreach ($classes as $class) { if (is_string($class) && class_exists($class)) { - self::$faultExceptionClasses[$class] = true; + static::$faultExceptionClasses[$class] = true; } } } @@ -119,8 +119,8 @@ public static function detachFaultException($classes) } foreach ($classes as $class) { - if (is_string($class) && isset(self::$faultExceptionClasses[$class])) { - unset(self::$faultExceptionClasses[$class]); + if (is_string($class) && isset(static::$faultExceptionClasses[$class])) { + unset(static::$faultExceptionClasses[$class]); } } } @@ -146,8 +146,8 @@ public static function attachObserver($class) return false; } - if (!isset(self::$observers[$class])) { - self::$observers[$class] = true; + if (!isset(static::$observers[$class])) { + static::$observers[$class] = true; } return true; @@ -161,11 +161,11 @@ public static function attachObserver($class) */ public static function detachObserver($class) { - if (!isset(self::$observers[$class])) { + if (!isset(static::$observers[$class])) { return false; } - unset(self::$observers[$class]); + unset(static::$observers[$class]); return true; } diff --git a/library/Zend/XmlRpc/Value/AbstractCollection.php b/library/Zend/XmlRpc/Value/AbstractCollection.php index fcade4c708c..b3140e61beb 100644 --- a/library/Zend/XmlRpc/Value/AbstractCollection.php +++ b/library/Zend/XmlRpc/Value/AbstractCollection.php @@ -32,7 +32,7 @@ public function __construct($value) // If the elements of the given array are not Zend_XmlRpc_Value objects, // we need to convert them as such (using auto-detection from PHP value) if (!$value instanceof parent) { - $value = self::getXmlRpcValue($value, self::AUTO_DETECT_TYPE); + $value = static::getXmlRpcValue($value, self::AUTO_DETECT_TYPE); } $this->value[$key] = $value; }