fix extension, fix resolver

Author: temp

src/Brainbits/TranscoderBundle/DependencyInjection/BrainbitsTranscoderExtension.php

@@ -39,13 +39,7 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $container->setParameter(
-            'brainbits.transcoder.decoder.7z.executable',
-            $config['brainbits_transcoder']['decoder']['7z']
-        );
-        $container->setParameter(
-            'brainbits.transcoder.encoder.7z.executable',
-            $config['brainbits_transcoder']['encoder']['7z']
-        );
+        $container->setParameter('brainbits.transcoder.decoder.7z.executable', $config['decoder']['7z']);
+        $container->setParameter('brainbits.transcoder.encoder.7z.executable', $config['encoder']['7z']);
     }
 }

src/Brainbits/TranscoderBundle/Resources/config/decoders.xml

@@ -11,7 +11,7 @@
         <parameter key="brainbits.transcoder.decoder.deflate.class">Brainbits\Transcoder\Decoder\DeflateDecoder</parameter>
         <parameter key="brainbits.transcoder.decoder.gzip.class">Brainbits\Transcoder\Decoder\GzipDecoder</parameter>
         <parameter key="brainbits.transcoder.decoder.null.class">Brainbits\Transcoder\Decoder\NullDecoder</parameter>
-        <parameter key="brainbits.transcoder.decoder.resolver.class">Brainbits\Transcoder\Decoder\Resolver</parameter>
+        <parameter key="brainbits.transcoder.decoder.resolver.class">Brainbits\Transcoder\Decoder\DecoderResolver</parameter>
     </parameters>
 
     <services>
@@ -38,13 +38,7 @@
         </service>
 
         <service id="brainbits.transcoder.decoder.resolver" class="%brainbits.transcoder.decoder.resolver.class%">
-            <argument type="collection">
-                <service id="brainbits.transcoder.decoder.7z"></service>
-                <service id="brainbits.transcoder.decoder.bzip2"></service>
-                <service id="brainbits.transcoder.decoder.deflate"></service>
-                <service id="brainbits.transcoder.decoder.gzip"></service>
-                <service id="brainbits.transcoder.decoder.null"></service>
-            </argument>
+            <argument type="collection" />
         </service>
     </services>
 

src/Brainbits/TranscoderBundle/Resources/config/encoders.xml

@@ -11,7 +11,7 @@
         <parameter key="brainbits.transcoder.encoder.deflate.class">Brainbits\Transcoder\Encoder\DeflateEncoder</parameter>
         <parameter key="brainbits.transcoder.encoder.gzip.class">Brainbits\Transcoder\Encoder\GzipEncoder</parameter>
         <parameter key="brainbits.transcoder.encoder.null.class">Brainbits\Transcoder\Encoder\NullEncoder</parameter>
-        <parameter key="brainbits.transcoder.encoder.resolver.class">Brainbits\Transcoder\Encoder\Resolver</parameter>
+        <parameter key="brainbits.transcoder.encoder.resolver.class">Brainbits\Transcoder\Encoder\EncoderResolver</parameter>
     </parameters>
 
     <services>
@@ -38,13 +38,7 @@
         </service>
 
         <service id="brainbits.transcoder.encoder.resolver" class="%brainbits.transcoder.encoder.resolver.class%">
-            <argument type="collection">
-                <service id="brainbits.transcoder.encoder.7z"></service>
-                <service id="brainbits.transcoder.encoder.bzip2"></service>
-                <service id="brainbits.transcoder.encoder.deflate"></service>
-                <service id="brainbits.transcoder.encoder.gzip"></service>
-                <service id="brainbits.transcoder.encoder.null"></service>
-            </argument>
+            <argument type="collection" />
         </service>
 
     </services>