resolved conflicts

Author: helios-ag

.styleci.yml

@@ -3,12 +3,11 @@ preset: symfony
 linting: true
 
 enabled:
-   - psr4
    - align_double_arrow
    - align_equals
 
 disabled:
-   - psr0
    - unalign_double_arrow
    - unalign_equals
-   
+
+

DependencyInjection/Configuration.php

@@ -81,7 +81,7 @@ public function getConfigTreeBuilder()
                             ->booleanNode('strict')->defaultTrue()->end()
                             ->booleanNode('escaping')->defaultTrue()->end()
                             ->booleanNode('line_breaks')->defaultTrue()->end()
-                            ->integerNode('max_newlines')->defaultValue(3)->end()
+                            ->scalarNode('max_newlines')->defaultValue(3)->end()
                             ->arrayNode('filters')
                                 ->useAttributeAsKey('name')
                                 ->prototype('variable')->end()