Removed the setNormalizer in the OptionsResolver to allow usage of this library from Symfony 2.1+.

Author: wtfzdotnet

composer.json

@@ -16,7 +16,7 @@
         "php": ">=5.4.0",
         "ext-curl": "*",
         "symfony/event-dispatcher": "~2.1",
-        "symfony/options-resolver": "~2.6",
+        "symfony/options-resolver": "~2.1",
         "guzzlehttp/guzzle": "~5.0",
         "guzzlehttp/cache-subscriber": "~0.2@dev",
         "guzzlehttp/log-subscriber": "~1.0",

lib/Tmdb/Client.php

@@ -213,14 +213,6 @@ protected function configureOptions(array $options)
             'log'              => [],
         ]);
 
-        $resolver->setNormalizer('base_url', function ($options, $value) {
-            return sprintf(
-                '%s://%s',
-                $options['secure'] ? self::SCHEME_SECURE : self::SCHEME_INSECURE,
-                $options['host']
-            );
-        });
-
         $resolver->setRequired([
             'adapter',
             'host',
@@ -231,23 +223,16 @@ protected function configureOptions(array $options)
             'log'
         ]);
 
-        $resolver->setAllowedTypes('adapter', ['object', 'null']);
-        $resolver->setAllowedTypes('host', 'string');
-        $resolver->setAllowedTypes('secure', 'bool');
-        $resolver->setAllowedTypes('token', 'object');
-        $resolver->setAllowedTypes('session_token', ['object', 'null']);
-        $resolver->setAllowedTypes('event_dispatcher', 'object');
+        $resolver->setAllowedTypes(['adapter' => ['object', 'null']]);
+        $resolver->setAllowedTypes(['host' => 'string']);
+        $resolver->setAllowedTypes(['secure' => 'bool']);
+        $resolver->setAllowedTypes(['token' => 'object']);
+        $resolver->setAllowedTypes(['session_token' => ['object', 'null']]);
+        $resolver->setAllowedTypes(['event_dispatcher' => 'object']);
 
         $this->options = $resolver->resolve($options);
 
-        if (!$this->options['adapter']) {
-            $this->options['adapter'] = new GuzzleAdapter(
-                new \GuzzleHttp\Client(['base_url' => $this->options['base_url']])
-            );
-        }
-
-        $this->options['cache'] = $this->configureCacheOptions($options);
-        $this->options['log']   = $this->configureLogOptions($options);
+        $this->postResolve($options);
 
         return $this->options;
     }
@@ -274,10 +259,10 @@ protected function configureCacheOptions(array $options = [])
             'handler',
         ]);
 
-        $resolver->setAllowedTypes('enabled',    'bool');
-        $resolver->setAllowedTypes('handler',    ['object', 'null']);
-        $resolver->setAllowedTypes('subscriber', ['object', 'null']);
-        $resolver->setAllowedTypes('path',       ['string', 'null']);
+        $resolver->setAllowedTypes(['enabled'    => ['bool']]);
+        $resolver->setAllowedTypes(['handler'    => ['object', 'null']]);
+        $resolver->setAllowedTypes(['subscriber' => ['object', 'null']]);
+        $resolver->setAllowedTypes(['path'       => ['string', 'null']]);
 
         $options = $resolver->resolve(array_key_exists('cache', $options) ? $options['cache'] : []);
 
@@ -314,11 +299,11 @@ protected function configureLogOptions(array $options = [])
             'handler',
         ]);
 
-        $resolver->setAllowedTypes('enabled',    'bool');
-        $resolver->setAllowedTypes('level',      'int');
-        $resolver->setAllowedTypes('handler',    ['object', 'null']);
-        $resolver->setAllowedTypes('path',       ['string', 'null']);
-        $resolver->setAllowedTypes('subscriber', ['object', 'null']);
+        $resolver->setAllowedTypes(['enabled'    => 'bool']);
+        $resolver->setAllowedTypes(['level'      =>'int']);
+        $resolver->setAllowedTypes(['handler'    => ['object', 'null']]);
+        $resolver->setAllowedTypes(['path'       => ['string', 'null']]);
+        $resolver->setAllowedTypes(['subscriber' => ['object', 'null']]);
 
         $options = $resolver->resolve(array_key_exists('log', $options) ? $options['log'] : []);
 
@@ -331,4 +316,27 @@ protected function configureLogOptions(array $options = [])
 
         return $options;
     }
+
+    /**
+     * Post resolve
+     *
+     * @param array $options
+     */
+    protected function postResolve(array $options = [])
+    {
+        $this->options['base_url'] = sprintf(
+            '%s://%s',
+            $this->options['secure'] ? self::SCHEME_SECURE : self::SCHEME_INSECURE,
+            $this->options['host']
+        );
+
+        if (!$this->options['adapter']) {
+            $this->options['adapter'] = new GuzzleAdapter(
+                new \GuzzleHttp\Client(['base_url' => $this->options['base_url']])
+            );
+        }
+
+        $this->options['cache'] = $this->configureCacheOptions($options);
+        $this->options['log']   = $this->configureLogOptions($options);
+    }
 }