Merge branch 'master' into feature/rtf_to_pdf

ncjoes · May 11, 2020 · ef2e10f · ef2e10f
2 parents 58b013b + a163442
commit ef2e10f
Show file tree

Hide file tree

Showing 5 changed files with 1,609 additions and 226 deletions.
diff --git a/.php_cs b/.php_cs
@@ -0,0 +1,12 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'ordered_imports' => [
+            'imports_order' => ['class', 'const', 'function'],
+            'sort_algorithm' => 'alpha',
+        ],
+    ])
+;
diff --git a/composer.json b/composer.json
@@ -13,7 +13,9 @@
         "php" : ">=5.4.4"
     },
     "require-dev" : {
-        "phpunit/phpunit": "7.*"
+        "phpunit/phpunit": "7.*",
+        "phpstan/phpstan": "^0.12.11",
+        "friendsofphp/php-cs-fixer": "^2.16"
     },
     "autoload" : {
         "psr-4" : {