Merge branch 'master' into php-unit

.github/workflows/php-cs-fixer.yaml

@@ -0,0 +1,12 @@
+on: [push, pull_request]
+name: Main
+jobs:
+  php-cs-fixer:
+    name: PHP-CS-Fixer
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: PHP-CS-Fixer
+      uses: docker://oskarstark/php-cs-fixer-ga
+      with:
+        args: magmi --diff --dry-run

.gitignore

@@ -2,3 +2,5 @@
 /magmi/state/*
 !/magmi/state/dummy.txt
 /vendor
+.php-cs-fixer.cache
+.php_cs.cache

.php-cs-fixer.dist.php

@@ -0,0 +1,17 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in('magmi');
+
+
+$config = new PhpCsFixer\Config();
+return $config->setRules([
+    '@PSR12' => true,
+    'binary_operator_spaces' => [
+        'operators' => [
+            '=' => 'single_space',
+            '=>' => 'single_space',
+        ],
+    ],
+])
+    ->setFinder($finder);

magmi/.htaccess

@@ -0,0 +1,14 @@
+<FilesMatch "\.(ini)$">
+Order allow,deny
+Deny from all
+</FilesMatch>
+
+<FilesMatch "^\.">
+Order allow,deny
+Deny from all
+</FilesMatch>
+
+<FilesMatch "ReleaseNotes.txt">
+Order allow,deny
+Deny from all
+</FilesMatch>

magmi/cli/.htaccess

@@ -0,0 +1 @@
+Deny from all

magmi/cli/magmi.cli.php

@@ -87,10 +87,10 @@ function getEngineInstance($options)
 // Getting engine
 $importer = getEngineInstance($options);
 if (isset($importer)) {
-    $inifile=isset($options['config'])? $options['config']:null;
+    $inifile = isset($options['config']) ? $options['config'] : null;
     if (isset($inifile)) {
         require_once('magmi_config.php');
-        $conf=Magmi_Config::getInstance();
+        $conf = Magmi_Config::getInstance();
         $conf->load($options['config']);
     }
     // if logger set, use it or use FileLogger by default