Merge pull request #91 from bmeynell/master

added detect_content_type option for AwsS3 adapter
This commit is contained in:
Leszek Prabucki 2014-06-03 10:10:53 +02:00
commit ce0e00c554

View File

@ -20,6 +20,7 @@ class AwsS3AdapterFactory implements AdapterFactoryInterface
->addArgument(new Reference($config['service_id'])) ->addArgument(new Reference($config['service_id']))
->addArgument($config['bucket_name']) ->addArgument($config['bucket_name'])
->addArgument($config['options']) ->addArgument($config['options'])
->addArgument($config['detect_content_type'])
; ;
} }
@ -40,6 +41,7 @@ class AwsS3AdapterFactory implements AdapterFactoryInterface
->children() ->children()
->scalarNode('service_id')->isRequired()->cannotBeEmpty()->end() ->scalarNode('service_id')->isRequired()->cannotBeEmpty()->end()
->scalarNode('bucket_name')->isRequired()->cannotBeEmpty()->end() ->scalarNode('bucket_name')->isRequired()->cannotBeEmpty()->end()
->booleanNode('detect_content_type')->defaultFalse()->end()
->arrayNode('options') ->arrayNode('options')
->addDefaultsIfNotSet() ->addDefaultsIfNotSet()
->children() ->children()