Skip to content

Commit

Permalink
Changed the parameter names according to suggestion from @lsmith77
Browse files Browse the repository at this point in the history
  • Loading branch information
Henrik Bjørnskov committed Apr 24, 2011
1 parent c2fc69a commit 419a6db
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion DependencyInjection/OrchestraS3StreamExtension.php
Expand Up @@ -26,7 +26,7 @@ public function load(array $configs, ContainerBuilder $container)
$config = $processor->processConfiguration($configuration, $configs);

foreach (array('access_key_id', 'secret_access_key', 'acl') as $field) {
$container->setParameter('orchestra.s3.' . $field, $config[$field]);
$container->setParameter($this->getAlias() . '.' . $field, $config[$field]);
}
}
}
6 changes: 3 additions & 3 deletions OrchestraS3StreamBundle.php
Expand Up @@ -35,9 +35,9 @@ class OrchestraS3StreamBundle extends BaseBundle
public function boot()
{
\Services_Amazon_S3_Stream::register('s3', array(
'access_key_id' => $this->container->getParameter('orchestra.s3.access_key_id'),
'secret_access_key' => $this->container->getParameter('orchestra.s3.secret_access_key'),
'acl' => $this->container->getParameter('orchestra.s3.acl'),
'access_key_id' => $this->container->getParameter('orchestra_s3_stream.access_key_id'),
'secret_access_key' => $this->container->getParameter('orchestra_s3_stream.secret_access_key'),
'acl' => $this->container->getParameter('orchestra_s3_stream.acl'),
));
}
}
Expand Up @@ -25,7 +25,7 @@ public function testLoad()
$extension->load(array($config), $builder);

foreach ($expected as $key => $value) {
$this->assertEquals($value, $builder->getParameter('orchestra.s3.' . $key));
$this->assertEquals($value, $builder->getParameter('orchestra_s3_stream.' . $key));
}
}
}

0 comments on commit 419a6db

Please sign in to comment.