Allow multiline in supported_scopes option

Author: jdeniau

DependencyInjection/FOSOAuthServerExtension.php

@@ -51,7 +51,11 @@ public function load(array $configs, ContainerBuilder $container)
             $container->setAlias('fos_oauth_server.user_provider', new Alias($config['service']['user_provider'], false));
         }
 
-        $container->setParameter('fos_oauth_server.server.options', $config['service']['options']);
+        $options = $config['service']['options'];
+        if (!empty($options['supported_scopes'])) {
+            $options['supported_scopes'] = str_replace("\n", ' ', $options['supported_scopes']);
+        }
+        $container->setParameter('fos_oauth_server.server.options', $options);
 
         $this->remapParametersNamespaces($config, $container, [
             '' => [

Tests/DependencyInjection/FOSOAuthServerExtensionTest.php

@@ -13,11 +13,24 @@
 
 namespace FOS\OAuthServerBundle\Tests\DependencyInjection;
 
+use FOS\OAuthServerBundle\DependencyInjection\FOSOAuthServerExtension;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\Routing\Loader\XmlFileLoader;
 
 class FOSOAuthServerExtensionTest extends \PHPUnit\Framework\TestCase
 {
+    private $container;
+
+    public function setUp()
+    {
+        $parameterBag = new ParameterBag();
+        $this->container = new ContainerBuilder($parameterBag);
+
+        parent::setUp();
+    }
+
     public function testLoadAuthorizeRouting()
     {
         $locator = new FileLocator();
@@ -39,4 +52,51 @@ public function testLoadTokenRouting()
         $this->assertSame('/oauth/v2/token', $tokenRoute->getPath());
         $this->assertSame(['GET', 'POST'], $tokenRoute->getMethods());
     }
+
+    public function testWithoutService()
+    {
+        $config = [
+            'db_driver' => 'orm',
+            'client_class' => 'dumb_class',
+            'access_token_class' => 'dumb_access_token_class',
+            'refresh_token_class' => 'dumb_refresh_token_class',
+            'auth_code_class' => 'dumb_auth_code_class',
+        ];
+        $instance = new FOSOAuthServerExtension();
+        $instance->load([$config], $this->container);
+
+        $this->assertSame(
+            $this->container->getParameter('fos_oauth_server.server.options'),
+            []
+        );
+    }
+
+    public function testMultilineScopes()
+    {
+        $scopes = <<<'SCOPES'
+scope1
+scope2
+scope3 scope4
+SCOPES;
+
+        $config = [
+            'db_driver' => 'orm',
+            'client_class' => 'dumb_class',
+            'access_token_class' => 'dumb_access_token_class',
+            'refresh_token_class' => 'dumb_refresh_token_class',
+            'auth_code_class' => 'dumb_auth_code_class',
+            'service' => [
+                'options' => [
+                    'supported_scopes' => $scopes,
+                ],
+            ],
+        ];
+        $instance = new FOSOAuthServerExtension();
+        $instance->load([$config], $this->container);
+
+        $this->assertSame(
+            $this->container->getParameter('fos_oauth_server.server.options'),
+            ['supported_scopes' => 'scope1 scope2 scope3 scope4']
+        );
+    }
 }