Upgrade PHPCS

Author: DaneEveritt

.gitignore

@@ -23,3 +23,4 @@ docker-compose.yml
 # for image related files
 misc
 .phpstorm.meta.php
+.php_cs.cache

.php_cs

@@ -1,7 +1,40 @@
 <?php
 
-require_once __DIR__ . '/vendor/sllh/php-cs-fixer-styleci-bridge/autoload.php';
+$finder = PhpCsFixer\Finder::create()
+    ->in([
+        'app',
+        'bootstrap',
+        'config',
+        'database',
+        'resources/lang',
+        'routes',
+        'tests',
+    ]);
 
-use SLLH\StyleCIBridge\ConfigBridge;
-
-return ConfigBridge::create();
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        '@PSR1' => true,
+        '@PSR2' => true,
+        'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
+        'array_syntax' => ['syntax' => 'short'],
+        'blank_line_before_return' => true,
+        'blank_line_before_statement' => false,
+        'combine_consecutive_unsets' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'declare_equal_normalize' => ['space' => 'single'],
+        'heredoc_to_nowdoc' => true,
+        'linebreak_after_opening_tag' => true,
+        'new_with_braces' => false,
+        'no_alias_functions' => true,
+        'no_multiline_whitespace_before_semicolons' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_return' => true,
+        'not_operator_with_successor_space' => true,
+        'phpdoc_separation' => false,
+        'protected_to_private' => false,
+        'psr0' => ['dir' => 'app'],
+        'psr4' => true,
+        'random_api_migration' => true,
+        'standardize_not_equals' => true,
+    ])->setRiskyAllowed(true)->setFinder($finder);

composer.json

@@ -21,6 +21,7 @@
         "doctrine/dbal": "2.5.13",
         "edvinaskrucas/settings": "2.0.0",
         "fideloper/proxy": "3.3.3",
+        "friendsofphp/php-cs-fixer": "2.4.0",
         "guzzlehttp/guzzle": "6.2.3",
         "igaster/laravel-theme": "1.16.0",
         "laracasts/utilities": "2.1.0",
@@ -43,12 +44,10 @@
     },
     "require-dev": {
         "barryvdh/laravel-ide-helper": "2.4.1",
-        "friendsofphp/php-cs-fixer": "1.13.1",
         "fzaninotto/faker": "1.6.0",
         "mockery/mockery": "0.9.9",
         "php-mock/php-mock-phpunit": "1.1.2",
-        "phpunit/phpunit": "5.7.21",
-        "sllh/php-cs-fixer-styleci-bridge": "2.1.1"
+        "phpunit/phpunit": "5.7.21"
     },
     "autoload": {
         "classmap": [