Implement new php-cs-fixer into PHPStorm project to improve development

XpelaajaXD · Jun 3, 2017 · 8c6e891 · 8c6e891
1 parent 8b762cb
commit 8c6e891
Show file tree

Hide file tree

Showing 5 changed files with 641 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 .vagrant/*
 .vscode/*
 storage/framework/*
+/.idea
 
 composer.lock
 node_modules

diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,7 @@
+<?php
+
+require_once __DIR__ . '/vendor/sllh/php-cs-fixer-styleci-bridge/autoload.php';
+
+use SLLH\StyleCIBridge\ConfigBridge;
+
+return ConfigBridge::create();
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1,6 @@
+preset: laravel
+risky: false
+disabled:
+  - concat_without_spaces
+enabled:
+  - concat_with_spaces
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "Pterodactyl Panel",
+    "name": "pterodactyl/panel",
     "description": "The free, open-source game management panel. Supporting Minecraft, Spigot, BungeeCord, and SRCDS servers.",
     "license": "MIT",
     "authors": [
@@ -38,10 +38,12 @@
         "webpatser/laravel-uuid": "2.0.1"
     },
     "require-dev": {
+        "barryvdh/laravel-ide-helper": "^2.3",
+        "friendsofphp/php-cs-fixer": "1.*",
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
         "phpunit/phpunit": "~5.7",
-        "barryvdh/laravel-ide-helper": "^2.3"
+        "sllh/php-cs-fixer-styleci-bridge": "^2.1"
     },
     "autoload": {
         "classmap": [