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

Commit

Permalink
Merge pull request zendframework/zendframework#2369 branch 'hotfix/re…
Browse files Browse the repository at this point in the history
…move-unused-vars'
  • Loading branch information
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 11 deletions.
1 change: 0 additions & 1 deletion src/Storage/Adapter/Apc.php
Expand Up @@ -143,7 +143,6 @@ public function getIterator()
$options = $this->getOptions();
$prefix = $options->getNamespace() . $options->getNamespaceSeparator();
$pattern = '/^' . preg_quote($prefix, '/') . '/';
$format = 0;

$baseIt = new BaseApcIterator('user', $pattern, 0, 1, \APC_LIST_ACTIVE);
return new ApcIterator($this, $baseIt, $prefix);
Expand Down
8 changes: 0 additions & 8 deletions src/Storage/Adapter/Filesystem.php
Expand Up @@ -193,8 +193,6 @@ public function clearByNamespace($namespace)
. str_repeat(\DIRECTORY_SEPARATOR . $nsPrefix . '*', $options->getDirLevel())
. \DIRECTORY_SEPARATOR . $nsPrefix . '*';
$glob = new GlobIterator($path, $flags);
$time = time();
$ttl = $options->getTtl();

ErrorHandler::start();
foreach ($glob as $pathname) {
Expand Down Expand Up @@ -227,8 +225,6 @@ public function clearByPrefix($prefix)
. str_repeat(\DIRECTORY_SEPARATOR . $nsPrefix . '*', $options->getDirLevel())
. \DIRECTORY_SEPARATOR . $nsPrefix . $prefix . '*';
$glob = new GlobIterator($path, $flags);
$time = time();
$ttl = $options->getTtl();

ErrorHandler::start();
foreach ($glob as $pathname) {
Expand Down Expand Up @@ -317,8 +313,6 @@ public function clearByTags(array $tags, $disjunction = false)
. str_repeat(\DIRECTORY_SEPARATOR . $prefix . '*', $options->getDirLevel())
. \DIRECTORY_SEPARATOR . $prefix . '*.tag';
$glob = new GlobIterator($path, $flags);
$time = time();
$ttl = $options->getTtl();

foreach ($glob as $pathname) {
$diff = array_diff($tags, explode("\n", $this->getFileContent($pathname)));
Expand Down Expand Up @@ -884,7 +878,6 @@ public function replaceItems(array $keyValuePairs)
*/
protected function internalSetItem(& $normalizedKey, & $value)
{
$options = $this->getOptions();
$filespec = $this->getFileSpec($normalizedKey);
$this->prepareDirectoryStructure($filespec);

Expand All @@ -903,7 +896,6 @@ protected function internalSetItem(& $normalizedKey, & $value)
*/
protected function internalSetItems(array & $normalizedKeyValuePairs)
{
$baseOptions = $this->getOptions();
$oldUmask = null;

// create an associated array of files and contents to write
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Adapter/Memcached.php
Expand Up @@ -302,7 +302,7 @@ protected function internalGetMetadatas(array & $normalizedKeys)
throw $this->getExceptionByResultCode($this->memcached->getResultCode());
}

foreach ($result as $key => & $value) {
foreach ($result as & $value) {
$value = array();
}

Expand Down
1 change: 0 additions & 1 deletion src/Storage/Plugin/Serializer.php
Expand Up @@ -218,7 +218,6 @@ public function onIncrementItemsPre(Event $event)
}

$failedKeys = $storage->setItems($keyValuePairs);
$result = array();
foreach ($failedKeys as $failedKey) {
unset($keyValuePairs[$failedKey]);
}
Expand Down

0 comments on commit f6c7309

Please sign in to comment.