chore(deps): updated CS fixer settings

Author: tarlepp

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.php_cs.cache
 /test/temp/
 /vendor/
-/composer.lock
+/composer.lock

.php_cs

@@ -1,9 +1,26 @@
 <?php
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->in('src')
-    ->in('test')
-    ->notPath('temp');
-$config = Symfony\CS\Config\Config::create();
-$config->fixers(['ordered_use']);
-$config->finder($finder);
-return $config;
+// for more info see:
+// https://github.com/FriendsOfPHP/PHP-CS-Fixer#usage
+// https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/UPGRADE.md
+
+if (class_exists('PhpCsFixer\Finder')) {    // PHP-CS-Fixer 2.x
+    $finder = PhpCsFixer\Finder::create()
+        ->in('src')
+        ->in('test')
+        ->notPath('temp')
+    ;
+
+    return PhpCsFixer\Config::create()
+        ->setFinder($finder)
+    ;
+} elseif (class_exists('Symfony\CS\Finder\DefaultFinder')) {  // PHP-CS-Fixer 1.x
+    $finder = Symfony\CS\Finder\DefaultFinder::create()
+        ->in('src')
+        ->in('test')
+        ->notPath('temp')
+    ;
+
+    return Symfony\CS\Config\Config::create()
+        ->finder($finder)
+    ;
+}

composer.json

@@ -35,7 +35,7 @@
         "symfony/framework-bundle": "~2.8|~3.0|~4.0",
         "symfony/validator": "~2.8|~3.0|~4.0",
         "symfony/yaml": "~2.8|~3.0|~4.0",
-        "phpunit/phpunit": "^4.8|^5.8",
+        "phpunit/phpunit": "^4.8|^6.0",
         "symfony/security": "~2.8|~3.0|~4.0"
     }
 }