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

Commit

Permalink
Merge branch 'feature/3876' into develop
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#3876
  • Loading branch information
@weierophinney
weierophinney committed Mar 25, 2013
122 parents 884bade + fae5b14 + 1d8b0d4 + 0885ee4 + 31378a4 + 22dc55a + 4fe9653 + 0835021 + 26ee41a + be4158f + a1e2d7e + 4abdf38 + e59ea5a + fbff658 + 48d0341 + 401d180 + 4e95264 + 5431207 + a7a7974 + 7c3f597 + a50748b + 700cf3a + 1582c31 + 016f50c + 9852497 + 073b126 + bd99c5c + 56451bd + 8fe4cad + 18812d8 + 89590ab + 0f8f25b + c2a03a9 + 4c690cd + 52cb4e6 + f7ed984 + 1d190a2 + 3c5d19b + c3c849d + faa6e57 + ad46181 + 12a401e + 3738445 + 65aacba + bf5f5a3 + c2ac9c0 + 6d7cf99 + 1841b47 + f81171b + 5ffaadf + cd6d5f2 + a512601 + 926e71f + 1f29b3e + a75171a + 9a8e72f + 814716e + 88d9371 + 678232d + a0560e8 + 4ff045c + ac805a6 + 41f360c + 1939a3c + 730da5d + dd0a1b5 + 1bc1ed5 + cea3413 + f2b47df + 2b8aa6a + 42cb3fe + 46afe3b + ef4289e + f40a98a + 8c27e9d + 512d6ca + b1452f8 + 9f6e228 + cf96a5a + aa9ef86 + 04be01e + 93487ba + c640cb5 + ab2b436 + a876e82 + 01f54c9 + f0abecc + 920eae1 + db4f625 + f51678c + 5975f0e + e9d78fe + 03de5ee + d7320d7 + 16ff5c5 + f170b61 + b506606 + f6c7309 + 675c421 + 43220df + c076d41 + e9406c0 + bb1710e + 565433c + be0baa3 + 8d2dae7 + ba17210 + bf83129 + 40926a2 + a7690f0 + 4fbd64e + f1f095f + 5077dc6 + 7d6f60c + a5f3296 + e036825 + 337996c + 285fc46 + 277a8aa + 0103b22 + 6fea0fc + d499b5b commit 078c1c8
Show file tree
Hide file tree
Showing 10 changed files with 87 additions and 377 deletions.
4 changes: 3 additions & 1 deletion src/Storage/Plugin/AbstractPlugin.php
View file
Expand Up @@ -9,7 +9,9 @@

namespace Zend\Cache\Storage\Plugin;

abstract class AbstractPlugin implements PluginInterface
use Zend\EventManager\AbstractListenerAggregate;

abstract class AbstractPlugin extends AbstractListenerAggregate implements PluginInterface
{
/**
* @var PluginOptions
Expand Down
56 changes: 5 additions & 51 deletions src/Storage/Plugin/ClearExpiredByFactor.php
View file
Expand Up @@ -17,62 +17,16 @@
class ClearExpiredByFactor extends AbstractPlugin
{
/**
* Handles
*
* @var array
*/
protected $handles = array();

/**
* Attach
*
* @param EventManagerInterface $events
* @param int $priority
* @return ClearExpiredByFactor
* @throws Exception\LogicException
* {@inheritDoc}
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
$index = spl_object_hash($events);
if (isset($this->handles[$index])) {
throw new Exception\LogicException('Plugin already attached');
}

$handles = array();
$this->handles[$index] = & $handles;

$callback = array($this, 'clearExpiredByFactor');
$handles[] = $events->attach('setItem.post', $callback, $priority);
$handles[] = $events->attach('setItems.post', $callback, $priority);
$handles[] = $events->attach('addItem.post', $callback, $priority);
$handles[] = $events->attach('addItems.post', $callback, $priority);

return $this;
}

/**
* Detach
*
* @param EventManagerInterface $events
* @return ClearExpiredByFactor
* @throws Exception\LogicException
*/
public function detach(EventManagerInterface $events)
{
$index = spl_object_hash($events);
if (!isset($this->handles[$index])) {
throw new Exception\LogicException('Plugin not attached');
}

// detach all handles of this index
foreach ($this->handles[$index] as $handle) {
$events->detach($handle);
}

// remove all detached handles
unset($this->handles[$index]);

return $this;
$this->listeners[] = $events->attach('setItem.post', $callback, $priority);
$this->listeners[] = $events->attach('setItems.post', $callback, $priority);
$this->listeners[] = $events->attach('addItem.post', $callback, $priority);
$this->listeners[] = $events->attach('addItems.post', $callback, $priority);
}

/**
Expand Down
90 changes: 22 additions & 68 deletions src/Storage/Plugin/ExceptionHandler.php
View file
Expand Up @@ -16,92 +16,46 @@
class ExceptionHandler extends AbstractPlugin
{
/**
* Handles
*
* @var array
*/
protected $handles = array();

/**
* Attach
*
* @param EventManagerInterface $events
* @param int $priority
* @return ExceptionHandler
* @throws Exception\LogicException
* {@inheritDoc}
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
$index = spl_object_hash($events);
if (isset($this->handles[$index])) {
throw new Exception\LogicException('Plugin already attached');
}

$callback = array($this, 'onException');
$handles = array();
$this->handles[$index] = & $handles;

// read
$handles[] = $events->attach('getItem.exception', $callback, $priority);
$handles[] = $events->attach('getItems.exception', $callback, $priority);
$this->listeners[] = $events->attach('getItem.exception', $callback, $priority);
$this->listeners[] = $events->attach('getItems.exception', $callback, $priority);

$handles[] = $events->attach('hasItem.exception', $callback, $priority);
$handles[] = $events->attach('hasItems.exception', $callback, $priority);
$this->listeners[] = $events->attach('hasItem.exception', $callback, $priority);
$this->listeners[] = $events->attach('hasItems.exception', $callback, $priority);

$handles[] = $events->attach('getMetadata.exception', $callback, $priority);
$handles[] = $events->attach('getMetadatas.exception', $callback, $priority);
$this->listeners[] = $events->attach('getMetadata.exception', $callback, $priority);
$this->listeners[] = $events->attach('getMetadatas.exception', $callback, $priority);

// write
$handles[] = $events->attach('setItem.exception', $callback, $priority);
$handles[] = $events->attach('setItems.exception', $callback, $priority);
$this->listeners[] = $events->attach('setItem.exception', $callback, $priority);
$this->listeners[] = $events->attach('setItems.exception', $callback, $priority);

$handles[] = $events->attach('addItem.exception', $callback, $priority);
$handles[] = $events->attach('addItems.exception', $callback, $priority);
$this->listeners[] = $events->attach('addItem.exception', $callback, $priority);
$this->listeners[] = $events->attach('addItems.exception', $callback, $priority);

$handles[] = $events->attach('replaceItem.exception', $callback, $priority);
$handles[] = $events->attach('replaceItems.exception', $callback, $priority);
$this->listeners[] = $events->attach('replaceItem.exception', $callback, $priority);
$this->listeners[] = $events->attach('replaceItems.exception', $callback, $priority);

$handles[] = $events->attach('touchItem.exception', $callback, $priority);
$handles[] = $events->attach('touchItems.exception', $callback, $priority);
$this->listeners[] = $events->attach('touchItem.exception', $callback, $priority);
$this->listeners[] = $events->attach('touchItems.exception', $callback, $priority);

$handles[] = $events->attach('removeItem.exception', $callback, $priority);
$handles[] = $events->attach('removeItems.exception', $callback, $priority);
$this->listeners[] = $events->attach('removeItem.exception', $callback, $priority);
$this->listeners[] = $events->attach('removeItems.exception', $callback, $priority);

$handles[] = $events->attach('checkAndSetItem.exception', $callback, $priority);
$this->listeners[] = $events->attach('checkAndSetItem.exception', $callback, $priority);

// increment / decrement item(s)
$handles[] = $events->attach('incrementItem.exception', $callback, $priority);
$handles[] = $events->attach('incrementItems.exception', $callback, $priority);

$handles[] = $events->attach('decrementItem.exception', $callback, $priority);
$handles[] = $events->attach('decrementItems.exception', $callback, $priority);

return $this;
}

/**
* Detach
*
* @param EventManagerInterface $events
* @return ExceptionHandler
* @throws Exception\LogicException
*/
public function detach(EventManagerInterface $events)
{
$index = spl_object_hash($events);
if (!isset($this->handles[$index])) {
throw new Exception\LogicException('Plugin not attached');
}

// detach all handles of this index
foreach ($this->handles[$index] as $handle) {
$events->detach($handle);
}

// remove all detached handles
unset($this->handles[$index]);
$this->listeners[] = $events->attach('incrementItem.exception', $callback, $priority);
$this->listeners[] = $events->attach('incrementItems.exception', $callback, $priority);

return $this;
$this->listeners[] = $events->attach('decrementItem.exception', $callback, $priority);
$this->listeners[] = $events->attach('decrementItems.exception', $callback, $priority);
}

/**
Expand Down
115 changes: 34 additions & 81 deletions src/Storage/Plugin/IgnoreUserAbort.php
View file
Expand Up @@ -15,13 +15,6 @@

class IgnoreUserAbort extends AbstractPlugin
{
/**
* Handles
*
* @var array
*/
protected $handles = array();

/**
* The storage who activated ignore_user_abort.
*
Expand All @@ -30,97 +23,57 @@ class IgnoreUserAbort extends AbstractPlugin
protected $activatedTarget = null;

/**
* Attach
*
* @param EventManagerInterface $events
* @param int $priority
* @return Serializer
* @throws Exception\LogicException
* {@inheritDoc}
*/
public function attach(EventManagerInterface $events, $priority = 1)
{
$index = spl_object_hash($events);
if (isset($this->handles[$index])) {
throw new Exception\LogicException('Plugin already attached');
}

$handles = array();
$this->handles[$index] = & $handles;

$cbOnBefore = array($this, 'onBefore');
$cbOnAfter = array($this, 'onAfter');

$handles[] = $events->attach('setItem.pre', $cbOnBefore, $priority);
$handles[] = $events->attach('setItem.post', $cbOnAfter, $priority);
$handles[] = $events->attach('setItem.exception', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('setItem.pre', $cbOnBefore, $priority);
$this->listeners[] = $events->attach('setItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('setItem.exception', $cbOnAfter, $priority);

$handles[] = $events->attach('setItems.pre', $cbOnBefore, $priority);
$handles[] = $events->attach('setItems.post', $cbOnAfter, $priority);
$handles[] = $events->attach('setItems.exception', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('setItems.pre', $cbOnBefore, $priority);
$this->listeners[] = $events->attach('setItems.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('setItems.exception', $cbOnAfter, $priority);

$handles[] = $events->attach('addItem.pre', $cbOnBefore, $priority);
$handles[] = $events->attach('addItem.post', $cbOnAfter, $priority);
$handles[] = $events->attach('addItem.exception', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('addItem.pre', $cbOnBefore, $priority);
$this->listeners[] = $events->attach('addItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('addItem.exception', $cbOnAfter, $priority);

$handles[] = $events->attach('addItems.pre', $cbOnBefore, $priority);
$handles[] = $events->attach('addItems.post', $cbOnAfter, $priority);
$handles[] = $events->attach('addItems.exception', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('addItems.pre', $cbOnBefore, $priority);
$this->listeners[] = $events->attach('addItems.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('addItems.exception', $cbOnAfter, $priority);

$handles[] = $events->attach('replaceItem.pre', $cbOnBefore, $priority);
$handles[] = $events->attach('replaceItem.post', $cbOnAfter, $priority);
$handles[] = $events->attach('replaceItem.exception', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('replaceItem.pre', $cbOnBefore, $priority);
$this->listeners[] = $events->attach('replaceItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('replaceItem.exception', $cbOnAfter, $priority);

$handles[] = $events->attach('replaceItems.pre', $cbOnBefore, $priority);
$handles[] = $events->attach('replaceItems.post', $cbOnAfter, $priority);
$handles[] = $events->attach('replaceItems.exception', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('replaceItems.pre', $cbOnBefore, $priority);
$this->listeners[] = $events->attach('replaceItems.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('replaceItems.exception', $cbOnAfter, $priority);

$handles[] = $events->attach('checkAndSetItem.pre', $cbOnBefore, $priority);
$handles[] = $events->attach('checkAndSetItem.post', $cbOnAfter, $priority);
$handles[] = $events->attach('checkAndSetItem.exception', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('checkAndSetItem.pre', $cbOnBefore, $priority);
$this->listeners[] = $events->attach('checkAndSetItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('checkAndSetItem.exception', $cbOnAfter, $priority);

// increment / decrement item(s)
$handles[] = $events->attach('incrementItem.pre', $cbOnBefore, $priority);
$handles[] = $events->attach('incrementItem.post', $cbOnAfter, $priority);
$handles[] = $events->attach('incrementItem.exception', $cbOnAfter, $priority);

$handles[] = $events->attach('incrementItems.pre', $cbOnBefore, $priority);
$handles[] = $events->attach('incrementItems.post', $cbOnAfter, $priority);
$handles[] = $events->attach('incrementItems.exception', $cbOnAfter, $priority);

$handles[] = $events->attach('decrementItem.pre', $cbOnBefore, $priority);
$handles[] = $events->attach('decrementItem.post', $cbOnAfter, $priority);
$handles[] = $events->attach('decrementItem.exception', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('incrementItem.pre', $cbOnBefore, $priority);
$this->listeners[] = $events->attach('incrementItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('incrementItem.exception', $cbOnAfter, $priority);

$handles[] = $events->attach('decrementItems.pre', $cbOnBefore, $priority);
$handles[] = $events->attach('decrementItems.post', $cbOnAfter, $priority);
$handles[] = $events->attach('decrementItems.exception', $cbOnAfter, $priority);

return $this;
}

/**
* Detach
*
* @param EventManagerInterface $events
* @return Serializer
* @throws Exception\LogicException
*/
public function detach(EventManagerInterface $events)
{
$index = spl_object_hash($events);
if (!isset($this->handles[$index])) {
throw new Exception\LogicException('Plugin not attached');
}

// detach all handles of this index
foreach ($this->handles[$index] as $handle) {
$events->detach($handle);
}
$this->listeners[] = $events->attach('incrementItems.pre', $cbOnBefore, $priority);
$this->listeners[] = $events->attach('incrementItems.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('incrementItems.exception', $cbOnAfter, $priority);

// remove all detached handles
unset($this->handles[$index]);
$this->listeners[] = $events->attach('decrementItem.pre', $cbOnBefore, $priority);
$this->listeners[] = $events->attach('decrementItem.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('decrementItem.exception', $cbOnAfter, $priority);

return $this;
$this->listeners[] = $events->attach('decrementItems.pre', $cbOnBefore, $priority);
$this->listeners[] = $events->attach('decrementItems.post', $cbOnAfter, $priority);
$this->listeners[] = $events->attach('decrementItems.exception', $cbOnAfter, $priority);
}

/**
Expand Down

0 comments on commit 078c1c8

Please sign in to comment.