Merge pull request #18 from mpdude/config-env-vars

Make server URL and secret configurable through env vars

DependencyInjection/Configuration.php

@@ -35,10 +35,10 @@ public function getConfigTreeBuilder()
  ->addDefaultsIfNotSet()
  ->children()
  ->scalarNode('url')
- ->defaultValue('http://localhost:8888')
+ ->defaultValue('%env(THUMBOR_URL)%')
  ->end()
  ->scalarNode('secret')
- ->defaultValue('')
+ ->defaultValue('%env(THUMBOR_SECURITY_KEY)%')
  ->end()
  ->end()
  ->end()

DependencyInjection/JbPhumborExtension.php

@@ -34,6 +34,8 @@ public function load(array $configs, ContainerBuilder $container)
  */
  protected function loadConfiguration(ContainerBuilder $container, array $config)
  {
+ $container->setParameter('env(THUMBOR_URL)', 'http://localhost:8888');
+ $container->setParameter('env(THUMBOR_SECURITY_KEY)', '');
  $container->setParameter('phumbor.server.url', $config['server']['url']);
  $container->setParameter('phumbor.secret', $config['server']['secret']);
  $container->setParameter('phumbor.transformations', $config['transformations']);

README.md

@@ -41,6 +41,9 @@ jb_phumbor:
  secret: 123456789
 ```
 
+Alternatively, you can also set the environment variables `THUMBOR_URL` and `THUMBOR_SECURITY_KEY` for these two settings, for example from your `.env`
+file or from inside your webserver configuration.
+
 Quick use case
 --------------
 

Tests/DependencyInjection/ConfigurationTest.php

@@ -174,8 +174,8 @@ protected static function getBundleDefaultConfig()
  {
  return array(
  'server' => array(
- 'url' => 'http://localhost:8888',
- 'secret' => ''
+ 'url' => '%env(THUMBOR_URL)%',
+ 'secret' => '%env(THUMBOR_SECURITY_KEY)%'
  ),
  'transformations' => array()
  );