Skip to content

Commit

Permalink
service locator variable
Browse files Browse the repository at this point in the history
  • Loading branch information
jmleroux committed Feb 17, 2014
1 parent 3f2453c commit 3c40098
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions library/Zend/Form/FormAbstractServiceFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ class FormAbstractServiceFactory implements AbstractFactoryInterface
/**
* Can we create the requested service?
*
* @param ServiceLocatorInterface $services
* @param ServiceLocatorInterface $serviceLocator
* @param string $name Service name (as resolved by ServiceManager)
* @param string $requestedName Name by which service was requested
* @return bool
*/
public function canCreateServiceWithName(ServiceLocatorInterface $services, $name, $requestedName)
public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
{
$config = $this->getConfig($services);
$config = $this->getConfig($serviceLocator);
if (empty($config)) {
return false;
}
Expand All @@ -51,18 +51,18 @@ public function canCreateServiceWithName(ServiceLocatorInterface $services, $nam
/**
* Create a form
*
* @param ServiceLocatorInterface $services
* @param ServiceLocatorInterface $serviceLocator
* @param string $name Service name (as resolved by ServiceManager)
* @param string $rName Name by which service was requested
* @param string $requestedName Name by which service was requested
* @return Form
*/
public function createServiceWithName(ServiceLocatorInterface $services, $name, $rName)
public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
{
$config = $this->getConfig($services);
$config = $config[$rName];
$factory = $this->getFormFactory($services);
$config = $this->getConfig($serviceLocator);
$config = $config[$requestedName];
$factory = $this->getFormFactory($serviceLocator);

$this->marshalInputFilter($config, $services, $factory);
$this->marshalInputFilter($config, $serviceLocator, $factory);
return $factory->createForm($config);
}

Expand Down

0 comments on commit 3c40098

Please sign in to comment.