Merge pull request #5 from Phauthentic/salts

Improving salting

.editorconfig

@@ -1,18 +1,27 @@
 ; This file is for unifying the coding style for different editors and IDEs.
 ; More information at http://editorconfig.org
-
 root = true
 
 [*]
 indent_style = space
-indent_size = 4
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+charset = utf-8
 
 [*.bat]
+indent_style = space
+indent_size = 4
 end_of_line = crlf
 
 [*.yml]
 indent_style = space
-indent_size = 2
+indent_size = 4
+
+[*.json]
+indent_style = space
+indent_size = 4
+
+[*.yaml]
+indent_style = space
+indent_size = 4

.gitignore

@@ -1,38 +1,8 @@
-# User specific & automatically generated files #
-#################################################
-/composer.lock
-/phpunit.xml
-/phpcs.xml
+/.idea
+/.phpunit.result.cache
 /tmp
-/vendor
-
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-Icon?
-ehthumbs.db
-Thumbs.db
-
-# Tool specific files #
-#######################
-# vim
-*~
-*.swp
-*.swo
-# sublime text & textmate
-*.sublime-*
-*.stTheme.cache
-*.tmlanguage.cache
-*.tmPreferences.cache
-# Eclipse
-.settings/*
-# JetBrains, aka PHPStorm, IntelliJ IDEA
-.idea/*
-# NetBeans
-nbproject/*
-# Visual Studio Code
-.vscode
+/logs
+/vendor/
+/bin
+coverage.xml
+phive*.phar

.scrutinizer.yml

@@ -0,0 +1,76 @@
+filter:
+    excluded_paths:
+    - bin/*
+    - vendor/*
+    - tests/*
+    - config/*
+    - docs/*
+    - public/*
+    - tests/bootstrap.php
+    dependency_paths:
+    - vendor/*
+
+build_failure_conditions:
+- 'patches.label("Spacing").new.count > 1'     # More than 1 new spacing patch
+
+- 'issues.label("coding-style").exists'        # No coding style issues allowed
+- 'issues.label("coding-style").new.exists'    # No new coding style issues allowed
+
+- 'issues.label("coding-style").new.count > 1' # More than 1 new coding style issues.
+- 'issues.severity(>= MAJOR).new.exists'       # New issues of major or higher severity
+
+- 'project.metric("scrutinizer.quality", < 9)' # Code Quality Rating drops below 9
+
+# Code Coverage decreased from previous inspection by more than 1%
+- 'project.metric_change("scrutinizer.test_coverage", < -0.1)'
+
+build:
+    services:
+      #mariadb: 10.1.40
+    environment:
+        hosts:
+            cake3.world-architects.com: '127.0.0.1'
+        redis: true
+        node: 10.16.0
+        php:
+            version: '7.4'
+            ini:
+                phar.readonly: 'Off'
+        #elasticsearch: '6'
+
+    nodes:
+        tests-php73:
+            environment:
+                php:
+                    version: '7.3'
+                    ini:
+                        phar.readonly: 'Off'
+            tests:
+                override:
+                - sh ./config/ci-setup.sh
+                -
+                    command: './bin/phpunit --coverage-clover=coverage.xml --bootstrap ./tests/bootstrap.php'
+                    coverage:
+                        file: 'coverage.xml'
+                        format: 'php-clover'
+
+        tests-php74:
+            environment:
+                php:
+                    version: '7.4'
+                    ini:
+                        phar.readonly: 'Off'
+            tests:
+                override:
+                - sh ./config/ci-setup.sh
+                -
+                    command: './bin/phpunit --coverage-clover=coverage.xml --bootstrap ./tests/bootstrap.php'
+                    coverage:
+                        file: 'coverage.xml'
+                        format: 'php-clover'
+
+        analysis:
+            tests:
+                override:
+                - php-scrutinizer-run --enable-security-analysis
+                - phpcs-run --standard=./phpcs.xml ./src

composer.json

@@ -3,8 +3,6 @@
     "description": "Password Hashing Library",
     "type": "library",
     "require-dev": {
-        "phpunit/phpunit": "^7.3",
-        "squizlabs/php_codesniffer": "^3.3",
         "cakephp/cakephp": "^3.6"
     },
     "license": "MIT",
@@ -26,5 +24,30 @@
         "psr-4": {
             "Phauthentic\\PasswordHasher\\Test\\": "tests/"
         }
+    },
+    "config": {
+        "sort-packages": true,
+        "process-timeout": 0,
+        "bin-dir": "bin"
+    },
+    "scripts": {
+        "post-install-cmd": [
+            "php config/composer_post_install.php"
+        ],
+        "tests": [
+            "./bin/phpunit"
+        ],
+        "cscheck": [
+            "./bin/phpcs ./src ./tests --standard=./phpcs.xml -s"
+        ],
+        "csfix": [
+            "./bin/phpcbf ./src ./tests --standard=./phpcs.xml"
+        ],
+        "analyze": [
+            "./bin/phpstan analyse -l 5 -c phpstan.neon ./src\\"
+        ],
+        "phive": [
+            "php ./config/composer_phive.php"
+        ]
     }
 }