Remove usage of OptionsResolverInterface to fix compatibility with Sy…

…mfony 3 Remove `setScope()` call Remove `firewall_name` configuration in favor of `firewall_names`
naroga · Mar 8, 2016 · 8d6785c · 8d6785c
1 parent 484fb50
commit 8d6785c
Show file tree

Hide file tree

Showing 74 changed files with 240 additions and 247 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,10 +24,13 @@ matrix:
       env: SYMFONY_VERSION=2.7.*
     - php: 5.6
       env: SYMFONY_VERSION=2.8.*
+    - php: 5.6
+      env: SYMFONY_VERSION=3.0.*
     - php: 5.6
       env: FOSUSERBUNDLE_VERSION=1.3.*
     - php: 5.6
       env: FOSUSERBUNDLE_VERSION=2.0.*@dev
+    - php: hhvm
 
 cache:
   directories:

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -137,9 +137,9 @@ public function getConfigTreeBuilder()
         $rootNode = $builder->root('hwi_oauth');
         $rootNode
             ->children()
-                // TODO: firewall_names should replace firewall_name in next major version, and should be ->isRequired()->cannotBeEmpty()
-                ->scalarNode('firewall_name')->end()
                 ->arrayNode('firewall_names')
+                    ->isRequired()
+                    ->cannotBeEmpty()
                     ->prototype('scalar')->end()
                 ->end()
                 ->scalarNode('target_path_parameter')->defaultNull()->end()

diff --git a/DependencyInjection/HWIOAuthExtension.php b/DependencyInjection/HWIOAuthExtension.php
@@ -21,8 +21,6 @@
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- * HWIOAuthExtension
- *
  * @author Geoffrey Bachelet <[email protected]>
  * @author Alexander <[email protected]>
  */
@@ -53,13 +51,8 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         // set current firewall
-        if (empty($config['firewall_names']) && !isset($config['firewall_name'])) {
-            throw new InvalidConfigurationException('The child node "firewall_name" or "firewall_names" at path "hwi_oauth" must be configured.');
-        } elseif (!empty($config['firewall_names']) && isset($config['firewall_name'])) {
-            $config['firewall_names'] = array_merge(array($config['firewall_name']), $config['firewall_names']);
-        } elseif (empty($config['firewall_names']) && isset($config['firewall_name'])) {
-            @trigger_error('The child node "firewall_name" at path "hwi_oauth" is deprecated since version 0.4.0 and will be removed in version 0.5.0. Use "firewall_names" instead.', E_USER_DEPRECATED);
-            $config['firewall_names'] = array($config['firewall_name']);
+        if (empty($config['firewall_names'])) {
+            throw new InvalidConfigurationException('The child node "firewall_names" at path "hwi_oauth" must be configured.');
         }
         $container->setParameter('hwi_oauth.firewall_names', $config['firewall_names']);
 
@@ -111,7 +104,6 @@ public function load(array $configs, ContainerBuilder $container)
                 $container
                     ->setDefinition('hwi_oauth.registration.form.handler.fosub_bridge', new DefinitionDecorator('hwi_oauth.registration.form.handler.fosub_bridge.def'))
                     ->addArgument($config['fosub']['username_iterations'])
-                    ->setScope('request')
                 ;
 
                 $container->setAlias('hwi_oauth.registration.form.handler', 'hwi_oauth.registration.form.handler.fosub_bridge');

diff --git a/OAuth/ResourceOwner/AbstractResourceOwner.php b/OAuth/ResourceOwner/AbstractResourceOwner.php
@@ -23,7 +23,6 @@
 use HWI\Bundle\OAuthBundle\OAuth\Response\PathUserResponse;
 use HWI\Bundle\OAuthBundle\OAuth\Response\UserResponseInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Http\HttpUtils;
 
@@ -312,9 +311,9 @@ abstract protected function doGetUserInformationRequest($url, array $parameters
     /**
      * Configure the option resolver
      *
-     * @param OptionsResolverInterface $resolver
+     * @param OptionsResolver $resolver
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setRequired(array(
             'client_id',

diff --git a/OAuth/ResourceOwner/AmazonResourceOwner.php b/OAuth/ResourceOwner/AmazonResourceOwner.php
@@ -11,7 +11,7 @@
 
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * AmazonResourceOwner
@@ -33,7 +33,7 @@ class AmazonResourceOwner extends GenericOAuth2ResourceOwner
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/Auth0ResourceOwner.php b/OAuth/ResourceOwner/Auth0ResourceOwner.php
@@ -13,7 +13,7 @@
 
 use Buzz\Message\RequestInterface as HttpRequestInterface;
 use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Auth0ResourceOwner
@@ -38,21 +38,20 @@ class Auth0ResourceOwner extends GenericOAuth2ResourceOwner
      */
     protected function doGetTokenRequest($url, array $parameters = array())
     {
-
         $headers = array(
             'Content-Type' => 'application/x-www-form-urlencoded'
         );
 
         return $this->httpRequest($url, http_build_query($parameters, '', '&'), $headers, HttpRequestInterface::METHOD_POST);
     }
 
-
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
+
         $resolver->setDefaults(array(
             'authorization_url'   => '{base_url}/authorize',
             'access_token_url'    => '{base_url}/oauth/token',

diff --git a/OAuth/ResourceOwner/AzureResourceOwner.php b/OAuth/ResourceOwner/AzureResourceOwner.php
@@ -11,7 +11,7 @@
 
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 use HWI\Bundle\OAuthBundle\Security\Core\Authentication\Token\OAuthToken;
 
@@ -98,7 +98,7 @@ public function getUserInformation(array $accessToken, array $extraParameters =
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/BitbucketResourceOwner.php b/OAuth/ResourceOwner/BitbucketResourceOwner.php
@@ -11,7 +11,7 @@
 
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * BitbucketResourceOwner
@@ -33,7 +33,7 @@ class BitbucketResourceOwner extends GenericOAuth1ResourceOwner
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/BitlyResourceOwner.php b/OAuth/ResourceOwner/BitlyResourceOwner.php
@@ -11,7 +11,7 @@
 
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * BitlyResourceOwner
@@ -33,7 +33,7 @@ class BitlyResourceOwner extends GenericOAuth2ResourceOwner
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/BoxResourceOwner.php b/OAuth/ResourceOwner/BoxResourceOwner.php
@@ -12,7 +12,7 @@
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
 use Buzz\Message\RequestInterface as HttpRequestInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * BoxResourceOwner
@@ -51,7 +51,7 @@ public function revokeToken($token)
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/BufferAppResourceOwner.php b/OAuth/ResourceOwner/BufferAppResourceOwner.php
@@ -11,7 +11,7 @@
 
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * BufferAppResourceOwner
@@ -32,7 +32,7 @@ class BufferAppResourceOwner extends GenericOAuth2ResourceOwner
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/DailymotionResourceOwner.php b/OAuth/ResourceOwner/DailymotionResourceOwner.php
@@ -11,7 +11,7 @@
 
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * DailymotionResourceOwner
@@ -42,7 +42,7 @@ public function getAuthorizationUrl($redirectUri, array $extraParameters = array
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/DeezerResourceOwner.php b/OAuth/ResourceOwner/DeezerResourceOwner.php
@@ -12,7 +12,7 @@
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
 use HWI\Bundle\OAuthBundle\Security\Core\Authentication\Token\OAuthToken;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * @author Kieu Anh Tuan <[email protected]>
@@ -36,7 +36,7 @@ class DeezerResourceOwner extends GenericOAuth2ResourceOwner
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/DeviantartResourceOwner.php b/OAuth/ResourceOwner/DeviantartResourceOwner.php
@@ -11,7 +11,7 @@
 
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * DeviantartResourceOwner
@@ -32,7 +32,7 @@ class DeviantartResourceOwner extends GenericOAuth2ResourceOwner
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/DiscogsResourceOwner.php b/OAuth/ResourceOwner/DiscogsResourceOwner.php
@@ -2,7 +2,7 @@
 
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class DiscogsResourceOwner extends GenericOAuth1ResourceOwner
 {
@@ -17,7 +17,7 @@ class DiscogsResourceOwner extends GenericOAuth1ResourceOwner
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/DisqusResourceOwner.php b/OAuth/ResourceOwner/DisqusResourceOwner.php
@@ -11,7 +11,7 @@
 
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * DisqusResourceOwner
@@ -46,7 +46,7 @@ protected function doGetUserInformationRequest($url, array $parameters = array()
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/DropboxResourceOwner.php b/OAuth/ResourceOwner/DropboxResourceOwner.php
@@ -11,7 +11,7 @@
 
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * DropboxResourceOwner
@@ -33,7 +33,7 @@ class DropboxResourceOwner extends GenericOAuth2ResourceOwner
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/EveOnlineResourceOwner.php b/OAuth/ResourceOwner/EveOnlineResourceOwner.php
@@ -11,7 +11,7 @@
 
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * EveOnlineResourceOwner
@@ -32,7 +32,7 @@ class EveOnlineResourceOwner extends GenericOAuth2ResourceOwner
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/EventbriteResourceOwner.php b/OAuth/ResourceOwner/EventbriteResourceOwner.php
@@ -12,7 +12,7 @@
 namespace HWI\Bundle\OAuthBundle\OAuth\ResourceOwner;
 
 use Buzz\Message\RequestInterface as HttpRequestInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * EventbriteResourceOwner
@@ -44,7 +44,7 @@ protected function doGetTokenRequest($url, array $parameters = array())
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/FacebookResourceOwner.php b/OAuth/ResourceOwner/FacebookResourceOwner.php
@@ -13,7 +13,7 @@
 
 use Buzz\Message\RequestInterface as HttpRequestInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * FacebookResourceOwner
@@ -98,7 +98,7 @@ public function revokeToken($token)
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
 

diff --git a/OAuth/ResourceOwner/FiwareResourceOwner.php b/OAuth/ResourceOwner/FiwareResourceOwner.php
@@ -14,7 +14,7 @@
 use HWI\Bundle\OAuthBundle\Security\Core\Authentication\Token\OAuthToken;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\OptionsResolver\Options;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Buzz\Message\RequestInterface as HttpRequestInterface;
 
 /**
@@ -85,7 +85,7 @@ public function getUserInformation(array $accessToken, array $extraParameters =
     /**
      * {@inheritDoc}
      */
-    protected function configureOptions(OptionsResolverInterface $resolver)
+    protected function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);