MAGETWO-66227: [GitHub][PR] Upgrade PHP CS Fixer to v2 #8822

Author: Oleksii Korshenko

.gitignore

@@ -25,6 +25,8 @@ atlassian*
 /.grunt
 /Gruntfile.js
 /package.json
+/.php_cs
+/.php_cs.cache
 /grunt-config.json
 /dev/tools/grunt/configs/local-themes.js
 

.htaccess

@@ -222,7 +222,7 @@
         order allow,deny
         deny from all
     </Files>
-    <Files .php_cs>
+    <Files .php_cs.dist>
         order allow,deny
         deny from all
     </Files>

.htaccess.sample

@@ -198,7 +198,7 @@
         order allow,deny
         deny from all
     </Files>
-    <Files .php_cs>
+    <Files .php_cs.dist>
         order allow,deny
         deny from all
     </Files>

.php_cs

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Pre-commit hook installation:
+ * vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
+ */
+$finder = PhpCsFixer\Finder::create()
+    ->name('*.phtml')
+    ->exclude('dev/tests/functional/generated')
+    ->exclude('dev/tests/functional/var')
+    ->exclude('dev/tests/functional/vendor')
+    ->exclude('dev/tests/integration/tmp')
+    ->exclude('dev/tests/integration/var')
+    ->exclude('lib/internal/Cm')
+    ->exclude('lib/internal/Credis')
+    ->exclude('lib/internal/Less')
+    ->exclude('lib/internal/LinLibertineFont')
+    ->exclude('pub/media')
+    ->exclude('pub/static')
+    ->exclude('setup/vendor')
+    ->exclude('var');
+
+return PhpCsFixer\Config::create()
+    ->setFinder($finder)
+    ->setRules([
+        '@PSR2' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'concat_space' => ['spacing' => 'one'],
+        'include' => true,
+        'new_with_braces' => true,
+        'no_empty_statement' => true,
+        'no_extra_consecutive_blank_lines' => true,
+        'no_leading_import_slash' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'no_multiline_whitespace_before_semicolons' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_unused_imports' => true,
+        'no_whitespace_in_blank_line' => true,
+        'object_operator_without_whitespace' => true,
+        'ordered_imports' => true,
+        'standardize_not_equals' => true,
+        'ternary_operator_spaces' => true,
+    ]);

.php_cs.dist

@@ -3,21 +3,5 @@
 //  * See COPYING.txt for license details.
 //  */
 
-//
-//  Order Case Info
-//  ---------------------------------------------
-
-.order-case-table {
-  &:extend(.abs-order-tables all);
-  &:extend(.abs-order-tbody-border all);
-}
-
-//
-//  Layout
-//  ---------------------------------------------
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
-  .case-information {
-    float: left;
-    #mix-grid .width(6,12);
-  }
-}
+@import 'module/_order.less';
+@import 'module/_config.less';

app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/_module.less

@@ -0,0 +1,23 @@
+// /**
+//  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+@image-signifyd-logo-path: '../Magento_Signifyd/images/logo.png';
+
+//
+// Outer slider of configuration
+//
+.signifyd-logo-header {
+  > .entry-edit-head {
+    > a:after {content: url(@image-signifyd-logo-path)}
+  }
+
+  ul {
+    margin-left: 5em;
+  }
+
+  .webhook-url {
+    word-break: break-all;
+  }
+}

app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/module/_config.less

@@ -0,0 +1,23 @@
+// /**
+//  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Order Case Info
+//  ---------------------------------------------
+
+.order-case-table {
+  &:extend(.abs-order-tables all);
+  &:extend(.abs-order-tbody-border all);
+}
+
+//
+//  Layout
+//  ---------------------------------------------
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
+  .case-information {
+    float: left;
+    #mix-grid .width(6,12);
+  }
+}

app/design/adminhtml/Magento/backend/Magento_Signifyd/web/css/source/module/_order.less

@@ -76,7 +76,7 @@
         "squizlabs/php_codesniffer": "1.5.3",
         "phpmd/phpmd": "@stable",
         "pdepend/pdepend": "2.4.0",
-        "friendsofphp/php-cs-fixer": "~1.2",
+        "friendsofphp/php-cs-fixer": "~2.1.1",
         "lusitanian/oauth": "~0.3 <=0.7.0",
         "sebastian/phpcpd": "2.0.0"
     },