Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'hotfix/2872'

Close #2872
  • Loading branch information...
commit 0225df16decb8c88735092394a0f31e3f53854e6 2 parents 3df3cb7 + 03de35f
@weierophinney weierophinney authored
View
8 library/Zend/Dom/Css2Xpath.php
@@ -55,13 +55,13 @@ public static function transform($path)
continue;
}
if (0 === strpos($pathSegment, '[contains(')) {
- foreach ($paths as $key => $xpath) {
- $paths[$key] .= '//*' . ltrim($pathSegment, '*');
+ foreach ($paths as $pathKey => $xpath) {
+ $paths[$pathKey] .= '//*' . ltrim($pathSegment, '*');
$paths[] = $xpath . $pathSegment;
}
} else {
- foreach ($paths as $key => $xpath) {
- $paths[$key] .= '//' . $pathSegment;
+ foreach ($paths as $pathKey => $xpath) {
+ $paths[$pathKey] .= '//' . $pathSegment;
}
}
}
View
8 library/Zend/Loader/AutoloaderFactory.php
@@ -84,7 +84,7 @@ public static function factory($options = null)
);
}
- foreach ($options as $class => $options) {
+ foreach ($options as $class => $autoloaderOptions) {
if (!isset(static::$loaders[$class])) {
$autoloader = static::getStandardAutoloader();
if (!class_exists($class) && !$autoloader->autoload($class)) {
@@ -102,14 +102,14 @@ public static function factory($options = null)
}
if ($class === static::STANDARD_AUTOLOADER) {
- $autoloader->setOptions($options);
+ $autoloader->setOptions($autoloaderOptions);
} else {
- $autoloader = new $class($options);
+ $autoloader = new $class($autoloaderOptions);
}
$autoloader->register();
static::$loaders[$class] = $autoloader;
} else {
- static::$loaders[$class]->setOptions($options);
+ static::$loaders[$class]->setOptions($autoloaderOptions);
}
}
}
View
6 library/Zend/Mvc/Router/Http/TreeRouteStack.php
@@ -152,9 +152,9 @@ public function match(Request $request)
if (($match = $route->match($request, $baseUrlLength)) instanceof RouteMatch && $match->getLength() === $pathLength) {
$match->setMatchedRouteName($name);
- foreach ($this->defaultParams as $name => $value) {
- if ($match->getParam($name) === null) {
- $match->setParam($name, $value);
+ foreach ($this->defaultParams as $paramName => $value) {
+ if ($match->getParam($paramName) === null) {
+ $match->setParam($paramName, $value);
}
}
View
6 library/Zend/Mvc/Router/SimpleRouteStack.php
@@ -257,9 +257,9 @@ public function match(Request $request)
if (($match = $route->match($request)) instanceof RouteMatch) {
$match->setMatchedRouteName($name);
- foreach ($this->defaultParams as $name => $value) {
- if ($match->getParam($name) === null) {
- $match->setParam($name, $value);
+ foreach ($this->defaultParams as $paramName => $value) {
+ if ($match->getParam($paramName) === null) {
+ $match->setParam($paramName, $value);
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.