@@ -15,42 +15,54 @@ $finder = PhpCsFixer\Finder::create()

 return PhpCsFixer\Config::create()

     ->setRules([

-        '@Symfony' => true,

-        '@Symfony:risky' => true,

-        '@PHPUnit60Migration:risky' => true,

-        'align_multiline_comment' => true,

-        'array_syntax' => ['syntax' => 'short'],

-        'combine_consecutive_issets' => true,

-        'combine_consecutive_unsets' => true,

-        'compact_nullable_typehint' => true,

-        'general_phpdoc_annotation_remove' => [

-            'expectedException',

-            'expectedExceptionMessage',

-        ],

-        'header_comment' => ['header' => $header],

-        'heredoc_to_nowdoc' => true,

-        'linebreak_after_opening_tag' => true,

-        'no_null_property_initialization' => true,

-        'no_superfluous_elseif' => true,

-        'no_unreachable_default_argument_value' => true,

-        'no_useless_else' => true,

-        'no_useless_return' => true,

-        'ordered_class_elements' => true,

-        'ordered_imports' => true,

-        'php_unit_strict' => true,

-        'phpdoc_add_missing_param_annotation' => true,

-        'phpdoc_order' => true,

-        'phpdoc_types_order' => [

-            'null_adjustment' => 'always_last',

-            'sort_algorithm' => 'none',

-        ],

-        'strict_comparison' => true,

-        'strict_param' => true,

-        // Remove when https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3222 has been merged

-        'LeoFeyer/optimize_native_functions' => true,

-    ])

-    ->registerCustomFixers([

-        new LeoFeyer\PhpCsFixer\OptimizeNativeFunctionsFixer()

+      '@Symfony' => true,

+      '@Symfony:risky' => true,

+      '@PHPUnit60Migration:risky' => true,

+      'align_multiline_comment' => true,

+      'array_indentation' => true,

+      'array_syntax' => ['syntax' => 'short'],

+      'combine_consecutive_issets' => true,

+      'combine_consecutive_unsets' => true,

+      'comment_to_phpdoc' => true,

+      'compact_nullable_typehint' => true,

+      'escape_implicit_backslashes' => true,

+      'fopen_flags' => false,

+      'fully_qualified_strict_types' => true,

+      'general_phpdoc_annotation_remove' => [

+          'expectedException',

+          'expectedExceptionMessage',

+      ],

+      'header_comment' => ['header' => $header],

+      'heredoc_to_nowdoc' => true,

+      'linebreak_after_opening_tag' => true,

+      'multiline_comment_opening_closing' => true,

+      'multiline_whitespace_before_semicolons' => [

+          'strategy' => 'new_line_for_chained_calls',

+      ],

+      'native_function_invocation' => [

+          'include' => ['@compiler_optimized'],

+      ],

+      'no_alternative_syntax' => true,

+      'no_binary_string' => true,

+      'no_null_property_initialization' => true,

+      'no_superfluous_elseif' => true,

+      'no_unreachable_default_argument_value' => true,

+      'no_useless_else' => true,

+      'no_useless_return' => true,

+      'ordered_class_elements' => true,

+      'ordered_imports' => true,

+      'php_unit_strict' => true,

+      'phpdoc_add_missing_param_annotation' => true,

+      'phpdoc_order' => true,

+      'phpdoc_trim_consecutive_blank_line_separation' => true,

+      'phpdoc_types_order' => [

+          'null_adjustment' => 'always_last',

+          'sort_algorithm' => 'none',

+      ],

+      'return_assignment' => true,

+      'strict_comparison' => true,

+      'strict_param' => true,

+      'string_line_ending' => true,

     ])

     ->setFinder($finder)

     ->setRiskyAllowed(true)

new file mode 100644

@@ -0,0 +1,58 @@

+<?php

+

+$header = <<<EOF

+This file is part of eSales Media ContentHelperBundle.

+

+(c) Benjamin Roth

+

+@license proprietary

+EOF;

+

+$finder = PhpCsFixer\Finder::create()

+    ->exclude('Resources')

+    ->in([__DIR__.'/src', __DIR__.'/tests'])

+;

+

+return PhpCsFixer\Config::create()

+    ->setRules([

+        '@Symfony' => true,

+        '@Symfony:risky' => true,

+        '@PHPUnit60Migration:risky' => true,

+        'align_multiline_comment' => true,

+        'array_syntax' => ['syntax' => 'short'],

+        'combine_consecutive_issets' => true,

+        'combine_consecutive_unsets' => true,

+        'compact_nullable_typehint' => true,

+        'general_phpdoc_annotation_remove' => [

+            'expectedException',

+            'expectedExceptionMessage',

+        ],

+        'header_comment' => ['header' => $header],

+        'heredoc_to_nowdoc' => true,

+        'linebreak_after_opening_tag' => true,

+        'no_null_property_initialization' => true,

+        'no_superfluous_elseif' => true,

+        'no_unreachable_default_argument_value' => true,

+        'no_useless_else' => true,

+        'no_useless_return' => true,

+        'ordered_class_elements' => true,

+        'ordered_imports' => true,

+        'php_unit_strict' => true,

+        'phpdoc_add_missing_param_annotation' => true,

+        'phpdoc_order' => true,

+        'phpdoc_types_order' => [

+            'null_adjustment' => 'always_last',

+            'sort_algorithm' => 'none',

+        ],

+        'strict_comparison' => true,

+        'strict_param' => true,

+        // Remove when https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/3222 has been merged

+        'LeoFeyer/optimize_native_functions' => true,

+    ])

+    ->registerCustomFixers([

+        new LeoFeyer\PhpCsFixer\OptimizeNativeFunctionsFixer()

+    ])

+    ->setFinder($finder)

+    ->setRiskyAllowed(true)

+    ->setUsingCache(false)

+;