Merge pull request #6 from atk4/csfixer

Code fixer and linter
atk4 · Sep 21, 2021 · 682a75f · 682a75f
2 parents b73a4f5 + bf0654d
commit 682a75f
Show file tree

Hide file tree

Showing 16 changed files with 3,596 additions and 459 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -0,0 +1,70 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+                           ->in([__DIR__])
+                           ->exclude([
+                                         'cache',
+                                         'build',
+                                         'vendor',
+                                     ]);
+
+return (new PhpCsFixer\Config())
+    ->setRiskyAllowed(true)
+    ->setRules([
+                   '@PhpCsFixer' => true,
+                   '@PhpCsFixer:risky' => true,
+                   '@PHP74Migration:risky' => true,
+                   '@PHP74Migration' => true,
+
+                   // required by PSR-12
+                   'concat_space' => [
+                       'spacing' => 'one',
+                   ],
+
+                   // disable some too strict rules
+                   'phpdoc_types' => [
+                       // keep enabled, but without "alias" group to not fix
+                       // "Callback" to "callback" in phpdoc
+                       'groups' => ['simple', 'meta']
+                   ],
+                   'phpdoc_types_order' => [
+                       'null_adjustment' => 'always_last',
+                       'sort_algorithm' => 'none',
+                   ],
+                   'single_line_throw' => false,
+                   'yoda_style' => [
+                       'equal' => false,
+                       'identical' => false,
+                   ],
+                   'native_constant_invocation' => true,
+                   'native_function_invocation' => false,
+                   'void_return' => false,
+                   'blank_line_before_statement' => [
+                       'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'exit'],
+                   ],
+                   'combine_consecutive_issets' => false,
+                   'combine_consecutive_unsets' => false,
+                   'multiline_whitespace_before_semicolons' => false,
+                   'no_superfluous_elseif' => false,
+                   'ordered_class_elements' => false,
+                   'php_unit_internal_class' => false,
+                   'php_unit_test_case_static_method_calls' => [
+                       'call_type' => 'this',
+                   ],
+                   'php_unit_test_class_requires_covers' => false,
+                   'phpdoc_add_missing_param_annotation' => false,
+                   'return_assignment' => false,
+                   'comment_to_phpdoc' => false,
+                   'general_phpdoc_annotation_remove' => [
+                       'annotations' => ['author', 'copyright', 'throws'],
+                   ],
+                   'nullable_type_declaration_for_default_null_value' => [
+                       'use_nullable_type_declaration' => false,
+                   ],
+
+                   // fn => without curly brackets is less readable,
+                   // also prevent bounding of unwanted variables for GC
+                   'use_arrow_functions' => false,
+               ])
+    ->setFinder($finder)
+    ->setCacheFile(sys_get_temp_dir() . '/php-cs-fixer.' . md5(__DIR__) . '.cache');
diff --git a/demos/google-address-componnent.php b/demos/google-address-componnent.php
@@ -3,11 +3,11 @@
 declare(strict_types=1);
 
 use Atk4\GoogleAddress\Form\Control\AddressLookup;
-use Atk4\GoogleAddress\Utils\Type;
 use Atk4\GoogleAddress\Utils\JsLoader;
+use Atk4\GoogleAddress\Utils\Type;
 use Atk4\Ui\Form;
 
-/** @var \Atk4\Ui\App $app */
+// @var \Atk4\Ui\App $app
 
 // Set Google developer key.
 JsLoader::setGoogleApiKey('');

diff --git a/demos/google-address-mapped.php b/demos/google-address-mapped.php
@@ -5,10 +5,10 @@
 /** @var \Atk4\Ui\App $app */
 
 use Atk4\GoogleAddress\Form\Control\AddressLookup;
-use Atk4\GoogleAddress\Utils\Value;
-use Atk4\GoogleAddress\Utils\Type;
 use Atk4\GoogleAddress\Utils\Build;
 use Atk4\GoogleAddress\Utils\JsLoader;
+use Atk4\GoogleAddress\Utils\Type;
+use Atk4\GoogleAddress\Utils\Value;
 use Atk4\Ui\Form;
 
 // Set Google developer key.
@@ -20,7 +20,6 @@
 
 $latLngValue = Build::with(Value::of(Type::LAT))->concat(Value::of(Type::LNG))->glueWith(':');
 
-
 $form = Form::addTo($app);
 
 /** @var AddressLookup $ga */

diff --git a/js/.eslintrc.js b/js/.eslintrc.js
@@ -0,0 +1,20 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true,
+    node: true
+  },
+  extends: 'standard',
+  parserOptions: {
+    ecmaVersion: '2020',
+    sourceType: 'module'
+  },
+  globals: {
+    atk: true,
+    $: true,
+    google: true
+  },
+  rules: {
+    semi: ['error', 'always']
+  }
+};
diff --git a/js/babel.config.js b/js/babel.config.js
@@ -10,12 +10,12 @@ const presets = [
     {
       targets: '> 1% , not dead',
       corejs: { version: '3.6', proposals: true },
-      useBuiltIns: 'usage',
-    },
+      useBuiltIns: 'usage'
+    }
   ],
   {
-    plugins: ['@babel/plugin-transform-runtime'],
-  },
+    plugins: ['@babel/plugin-transform-runtime']
+  }
 ];
 
 module.exports = { presets: presets };