From c0688d208f5770c4b85391db5faf6e2d5e36daa8 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 16 Mar 2018 13:52:24 +0100
Subject: [PATCH] Update composer and phpcs

---
 .php_cs.dist  | 31 ++++++++++++++++++-------------
 composer.json | 11 +----------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.php_cs.dist b/.php_cs.dist
index d1030fa1e7..88c458e3a3 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -4,23 +4,31 @@ $header = '/* For licensing terms, see /license.txt */';
 
 $rules = [
     '@Symfony' => true,
-    '@Symfony:risky' => true,
+    //'@Symfony:risky' => true,
     'array_syntax' => [
         'syntax' => 'short',
     ],
-    'header_comment' => [
+    /*'header_comment' => [
         'header' => $header,
-    ],
+    ],*/
+    'blank_line_after_opening_tag' => false,
     'no_extra_consecutive_blank_lines' => true,
-    'no_php4_constructor' => true,
-    'no_useless_else' => true,
+    'multiline_comment_opening_closing' => true,
+    'yoda_style' => false,
+    'phpdoc_to_comment' => false,
+    'phpdoc_no_package' => false,
+    'increment_style' => false,
+    'no_useless_else' => false,
+    //'no_php4_constructor' => true,
+    'single_quote' => false,
     'no_useless_return' => true,
     'ordered_class_elements' => true,
     'ordered_imports' => true,
     'phpdoc_order' => true,
-    '@PHP56Migration' => true,
-    '@PHP56Migration:risky' => true,
-    '@PHPUnit57Migration:risky' => true,
+    'no_break_comment' => true,
+    //'@PHP56Migration' => true,
+    //'@PHP56Migration:risky' => true,
+    //'@PHPUnit57Migration:risky' => true,
     // To be tested before insertion:
 //    'strict_comparison' => true,
 //    'strict_param' => true,
@@ -67,6 +75,7 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude('plugin/bbb/lib')
     ->exclude('plugin/ims_lti')
     ->exclude('plugin/sepe/src/wsse')
+    ->exclude('plugin/test2pdf/class')
     ->exclude('tests')
     ->exclude('var')
     ->exclude('vendor')
@@ -80,10 +89,6 @@ $finder = PhpCsFixer\Finder::create()
 
 return PhpCsFixer\Config::create()
     ->setRules(
-        [
-            '@PSR2' => true,
-            //'strict_param' => true,
-            'array_syntax' => ['syntax' => 'short'],
-        ]
+        $rules
     )
     ->setFinder($finder);
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 2d2cf882c2..bd13921404 100755
--- a/composer.json
+++ b/composer.json
@@ -33,14 +33,6 @@
         ]
     },
     "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/ywarnier/iCalcreator"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/jmontoyaa/PHPWord"
-        },
         {
           "type": "vcs",
           "url": "https://github.com/chamilo/SyliusSettingsBundle.git"
@@ -116,7 +108,6 @@
         "sylius/resource-bundle": "1.0.4",
         "sylius/resource": "~1.0",
 
-
         "friendsofsymfony/jsrouting-bundle": "~2.0",
         "gedmo/doctrine-extensions": "~2.4",
         "gregwar/captcha-bundle": "^2.0",
@@ -159,7 +150,7 @@
         "jeroendesloovere/vcard": "~1.5",
         "jimmiw/php-time-ago": "2.0.*",
         "phpoffice/phpword": "^0.14.0",
-        "kigkonsult/icalcreator": "2.*",
+        "kigkonsult/icalcreator": "2.24",
         "essence/essence": "~3.0",
         "paragonie/random-lib": "2.0.0",
         "lunetics/locale-bundle": "2.5.*",