Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/2878' into develop
Browse files Browse the repository at this point in the history 
Conflicts:
	library/Zend/File/Transfer/Adapter/AbstractAdapter.php
	library/Zend/File/Transfer/Adapter/Http.php
	tests/ZendTest/Log/Writer/AbstractTest.php
	tests/ZendTest/Log/Writer/DbTest.php
  • Loading branch information
@weierophinney
weierophinney committed Nov 16, 2012
133 parents 007ee1a + 379d601 + c8a932b + d08629f + a04474f + 3fef53d + 1f4b9ed + d263f1c + c790aed + 412585a + b5e6b02 + 9ac81f3 + 9f28eab + 2e7e2e2 + 7c64770 + b82fa59 + 4190868 + 3a6b7ad + 8e745f6 + bab7086 + c5a5d19 + b468bc1 + d79794c + 508b344 + d16deed + f38e96a + c4a3687 + 54465f7 + 4ad15e4 + 9aa47da + 619d24d + ddfa8f2 + 8e7172b + e5fc69f + 284a721 + 6d3db4c + b99e8c3 + a52dcef + 1d21066 + cccc24c + 81bd699 + dfb38ed + b796f3d + d49dbc2 + 547433c + 0c9ce04 + a76e26a + 2914396 + 7ca3746 + f1b292d + 406112f + 5a9edd3 + f65c9f6 + c54156c + 5e55e82 + 352e42b + fa459f5 + 3eff137 + 3648ab6 + 4096125 + 0037391 + 9bdfcd9 + 6cd1498 + ecac99d + 199ed75 + b8507f7 + ef400bd + decb6ae + 860b39d + 243eca6 + d56af72 + 1aaf7f9 + 26b27a9 + 40cd50e + 986898b + d2780b7 + 49abb1d + cb5a738 + 21d3bef + 4748875 + 3331086 + bfed36c + b56e9b8 + 765b017 + b2cddce + 1c63803 + dd490e0 + c0425c2 + 128ed7f + 4d88940 + 94b3f1e + 9a0d8cf + 12135ad + 1169a58 + 6cdb5dc + 15950e5 + 7e68fb2 + 4bda4a9 + 537893f + 4cf10f8 + dd5b294 + 3ac5190 + 63d8503 + de5ff9e + f8868a0 + e3f8a27 + 634cf99 + c2cd236 + 189672f + d50054c + 8fb183a + 81a21d6 + ba78039 + 2cc9607 + bbd31f7 + aff5dfd + 3daad46 + a2bd1ba + cddc550 + eadb29a + 339c074 + 543ff20 + 732e048 + 8ec7eaf + 25fde7d + 5215c37 + a31404d + 1328e20 + 33a507b + 012928d + a4c7b54 + ef5460e + 8451886 commit bd800e4
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 72 deletions.
12 changes: 6 additions & 6 deletions src/PubSubHubbub/PubSubHubbub.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public static function detectHubs($source)
*/
public static function setHttpClient(Http\Client $httpClient)
{
self::$httpClient = $httpClient;
static::$httpClient = $httpClient;
}

/**
Expand All @@ -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;
}

/**
Expand All @@ -106,7 +106,7 @@ public static function getHttpClient()
*/
public static function clearHttpClient()
{
self::$httpClient = null;
static::$httpClient = null;
}

/**
Expand Down
84 changes: 42 additions & 42 deletions src/Reader/Reader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class Reader
*/
public static function getCache()
{
return self::$cache;
return static::$cache;
}

/**
Expand All @@ -112,7 +112,7 @@ public static function getCache()
*/
public static function setCache(CacheStorage $cache)
{
self::$cache = $cache;
static::$cache = $cache;
}

/**
Expand All @@ -125,7 +125,7 @@ public static function setCache(CacheStorage $cache)
*/
public static function setHttpClient(Http\Client $httpClient)
{
self::$httpClient = $httpClient;
static::$httpClient = $httpClient;
}


Expand All @@ -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;
}

/**
Expand All @@ -158,7 +158,7 @@ public static function getHttpClient()
*/
public static function setHttpMethodOverride($override = true)
{
self::$httpMethodOverride = $override;
static::$httpMethodOverride = $override;
}

/**
Expand All @@ -168,7 +168,7 @@ public static function setHttpMethodOverride($override = true)
*/
public static function getHttpMethodOverride()
{
return self::$httpMethodOverride;
return static::$httpMethodOverride;
}

/**
Expand All @@ -179,7 +179,7 @@ public static function getHttpMethodOverride()
*/
public static function useHttpConditionalGet($bool = true)
{
self::$httpConditionalGet = $bool;
static::$httpConditionalGet = $bool;
}

/**
Expand All @@ -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) {
Expand Down Expand Up @@ -235,25 +235,25 @@ 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) {
throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
}
$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;
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}

/**
Expand All @@ -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) {
Expand Down Expand Up @@ -501,7 +501,7 @@ public static function detectType($feed, $specOnly = false)
*/
public static function setExtensionManager(ExtensionManager $extensionManager)
{
self::$extensionManager = $extensionManager;
static::$extensionManager = $extensionManager;
}

/**
Expand All @@ -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;
}

/**
Expand All @@ -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;
}
Expand All @@ -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;
}
}

Expand All @@ -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;
}
Expand All @@ -572,7 +572,7 @@ public static function isRegistered($extensionName)
*/
public static function getExtensions()
{
return self::$extensions;
return static::$extensions;
}

/**
Expand All @@ -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'
Expand All @@ -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');
}

/**
Expand Down
48 changes: 24 additions & 24 deletions src/Writer/Writer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class Writer
*/
public static function setExtensionManager(ExtensionManager $extensionManager)
{
self::$extensionManager = $extensionManager;
static::$extensionManager = $extensionManager;
}

/**
Expand All @@ -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;
}

/**
Expand All @@ -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)
Expand All @@ -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;
}
}

Expand All @@ -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;
}
Expand All @@ -159,7 +159,7 @@ public static function isRegistered($extensionName)
*/
public static function getExtensions()
{
return self::$extensions;
return static::$extensions;
}

/**
Expand All @@ -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(),
Expand All @@ -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)
Expand Down

0 comments on commit bd800e4

Please sign in to comment.