Add captcha, facebook, map and multi format

[packbundle] / DependencyInjection / Configuration.php

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 8f3beb23ff5f3f9cfad02b678bb80785838b023a..2f292095b8bbbc76efa7377dcab18eb8e6345e47 100644 (file)
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -44,16 +44,25 @@ class Configuration implements ConfigurationInterface {
                        'captcha' => [
                                'background' => 'white',
                                'fill' => '#cff',
+                               'format' => 'jpeg',
                                'height' => 52,
                                'size' => 45,
                                'border' => '#00c3f9',
                                'thickness' => 2,
                                'width' => 192
                        ],
+                       'context' => [
+                               'http' => [
+                                       'max_redirects' => $_ENV['RAPSYSPACK_REDIRECT'] ?? 20,
+                                       'timeout' => $_ENV['RAPSYSPACK_TIMEOUT'] ?? (($timeout = ini_get('default_socket_timeout')) !== false && $timeout !== '' ? (float)$timeout : 60),
+                                       'user_agent' => $_ENV['RAPSYSPACK_AGENT'] ?? (($agent = ini_get('user_agent')) !== false && $agent !== '' ? (string)$agent : $alias.'/'.($version = RapsysPackBundle::getVersion()))
+                               ]
+                       ],
                        'facebook' => [
                                'align' => 'center',
                                'fill' => 'white',
                                'font' => 'default',
+                               'format' => 'jpeg',
                                'height' => 630,
                                'size' => 60,
                                'source' => dirname(__DIR__).'/public/facebook/source.png',
@@ -104,6 +113,7 @@ class Configuration implements ConfigurationInterface {
                        'map' => [
                                'border' => '#00c3f9',
                                'fill' => '#cff',
+                               'format' => 'jpeg',
                                'height' => 640,
                                'quality' => 70,
                                'radius' => 5,
@@ -116,6 +126,7 @@ class Configuration implements ConfigurationInterface {
                        'multi' => [
                                'border' => '#00c3f9',
                                'fill' => '#cff',
+                               'format' => 'jpeg',
                                'height' => 640,
                                'highborder' => '#3333c3',
                                'highfill' => '#c3c3f9',
@@ -186,6 +197,7 @@ class Configuration implements ConfigurationInterface {
                                                ->children()
                                                        ->scalarNode('background')->cannotBeEmpty()->defaultValue($defaults['captcha']['background'])->end()
                                                        ->scalarNode('fill')->cannotBeEmpty()->defaultValue($defaults['captcha']['fill'])->end()
+                                                       ->scalarNode('format')->cannotBeEmpty()->defaultValue($defaults['captcha']['format'])->end()
                                                        ->scalarNode('height')->cannotBeEmpty()->defaultValue($defaults['captcha']['height'])->end()
                                                        ->scalarNode('size')->cannotBeEmpty()->defaultValue($defaults['captcha']['size'])->end()
                                                        ->scalarNode('border')->cannotBeEmpty()->defaultValue($defaults['captcha']['border'])->end()
@@ -193,12 +205,26 @@ class Configuration implements ConfigurationInterface {
                                                        ->scalarNode('width')->cannotBeEmpty()->defaultValue($defaults['captcha']['width'])->end()
                                                ->end()
                                        ->end()
+                                       ->arrayNode('context')
+                                               ->addDefaultsIfNotSet()
+                                               ->children()
+                                                       ->arrayNode('http')
+                                                               ->addDefaultsIfNotSet()
+                                                               ->children()
+                                                                       ->scalarNode('max_redirects')->defaultValue($defaults['context']['http']['max_redirects'])->end()
+                                                                       ->scalarNode('timeout')->defaultValue($defaults['context']['http']['timeout'])->end()
+                                                                       ->scalarNode('user_agent')->cannotBeEmpty()->defaultValue($defaults['context']['http']['user_agent'])->end()
+                                                               ->end()
+                                                       ->end()
+                                               ->end()
+                                       ->end()
                                        ->arrayNode('facebook')
                                                ->addDefaultsIfNotSet()
                                                ->children()
                                                        ->scalarNode('align')->cannotBeEmpty()->defaultValue($defaults['facebook']['align'])->end()
                                                        ->scalarNode('fill')->cannotBeEmpty()->defaultValue($defaults['facebook']['fill'])->end()
                                                        ->scalarNode('font')->cannotBeEmpty()->defaultValue($defaults['facebook']['font'])->end()
+                                                       ->scalarNode('format')->cannotBeEmpty()->defaultValue($defaults['facebook']['format'])->end()
                                                        ->scalarNode('height')->cannotBeEmpty()->defaultValue($defaults['facebook']['height'])->end()
                                                        ->scalarNode('size')->cannotBeEmpty()->defaultValue($defaults['facebook']['size'])->end()
                                                        ->scalarNode('source')->cannotBeEmpty()->defaultValue($defaults['facebook']['source'])->end()
@@ -289,6 +315,7 @@ class Configuration implements ConfigurationInterface {
                                                ->children()
                                                        ->scalarNode('border')->cannotBeEmpty()->defaultValue($defaults['map']['border'])->end()
                                                        ->scalarNode('fill')->cannotBeEmpty()->defaultValue($defaults['map']['fill'])->end()
+                                                       ->scalarNode('format')->cannotBeEmpty()->defaultValue($defaults['facebook']['format'])->end()
                                                        ->scalarNode('height')->cannotBeEmpty()->defaultValue($defaults['map']['height'])->end()
                                                        ->scalarNode('quality')->cannotBeEmpty()->defaultValue($defaults['map']['quality'])->end()
                                                        ->scalarNode('radius')->cannotBeEmpty()->defaultValue($defaults['map']['radius'])->end()
@@ -304,6 +331,7 @@ class Configuration implements ConfigurationInterface {
                                                ->children()
                                                        ->scalarNode('border')->cannotBeEmpty()->defaultValue($defaults['multi']['border'])->end()
                                                        ->scalarNode('fill')->cannotBeEmpty()->defaultValue($defaults['multi']['fill'])->end()
+                                                       ->scalarNode('format')->cannotBeEmpty()->defaultValue($defaults['facebook']['format'])->end()
                                                        ->scalarNode('height')->cannotBeEmpty()->defaultValue($defaults['multi']['height'])->end()
                                                        ->scalarNode('highborder')->cannotBeEmpty()->defaultValue($defaults['multi']['highborder'])->end()
                                                        ->scalarNode('highfill')->cannotBeEmpty()->defaultValue($defaults['multi']['highfill'])->end()