Merge d5ebb26 into 3d581d1

.coveralls.yml

@@ -1,3 +1,2 @@
 service_name: travis-ci
-src_dir: src
 coverage_clover: build/logs/clover.xml

.gitignore

@@ -1,3 +1,5 @@
 vendor/
 build/
 phpunit.xml
+.idea/
+composer.lock

.travis.yml

@@ -8,13 +8,16 @@ php:
   - hhvm
 
 matrix:
-    fast_finish: true
-    allow_failures:
-        - php: 5.6
-        - php: hhvm
+  fast_finish: true
+  allow_failures:
+    - php: hhvm
 
 before_script:
   - composer update --prefer-dist
 
+script:
+  - ./vendor/bin/phpcs .
+  - ./vendor/bin/phpunit
+
 after_script:
-  - php vendor/bin/coveralls -v
+  - php vendor/bin/php-coveralls -v

README.md

@@ -2,9 +2,10 @@ Zxcvbn-PHP is a password strength estimator using pattern matching and minimum e
 
 >zxcvbn attempts to give sound password advice through pattern matching and conservative entropy calculations. It finds 10k common passwords, common American names and surnames, common English words, and common patterns like dates, repeats (aaa), sequences (abcd), and QWERTY patterns.
 
-[![Build Status](https://travis-ci.org/bjeavons/zxcvbn-php.png?branch=master)](https://travis-ci.org/bjeavons/zxcvbn-php)
-[![Coverage Status](https://coveralls.io/repos/bjeavons/zxcvbn-php/badge.png?branch=master)](https://coveralls.io/r/bjeavons/zxcvbn-php?branch=master)
-[![Latest Stable Version](https://poser.pugx.org/bjeavons/zxcvbn-php/v/stable.png)](https://packagist.org/packages/bjeavons/zxcvbn-php)
+[![Build Status](https://travis-ci.org/mkopinsky/zxcvbn-php.png?branch=master)](https://travis-ci.org/mkopinsky/zxcvbn-php)
+[![Coverage Status](https://coveralls.io/repos/github/mkopinsky/zxcvbn-php/badge.svg?branch=master)](https://coveralls.io/github/mkopinsky/zxcvbn-php?branch=master)
+[![Latest Stable Version](https://poser.pugx.org/mkopinsky/zxcvbn-php/v/stable)](https://packagist.org/packages/mkopinsky/zxcvbn-php)
+[![License](https://poser.pugx.org/mkopinsky/zxcvbn-php/license)](https://packagist.org/packages/mkopinsky/zxcvbn-php)
 
 ## Installation
 
@@ -13,7 +14,7 @@ The library can be installed with [Composer](http://getcomposer.org) by adding i
 ```json
 {
     "require": {
-        "bjeavons/zxcvbn-php": "^0.4"
+        "mkopinsky/zxcvbn-php": "^4.4.2"
     }
 }
 ```
@@ -46,5 +47,9 @@ echo $strength['score'];
 ```
 
 ### Acknowledgements
-Thanks to @lowe for the original [Javascript Zxcvbn](https://github.com/lowe/zxcvbn)
-and [@Dreyer's port](https://github.com/Dreyer/php-zxcvbn) for reference.
+Thanks to:
+* @lowe for the original [Javascript Zxcvbn](https://github.com/lowe/zxcvbn)
+* [@Dreyer's port](https://github.com/Dreyer/php-zxcvbn) for reference for initial implementation
+* [bjeavon's implementation](https://github.com/bjeavons/zxcvbn-php) for building out zxcvbn-php as a solid initial port of the Dropbox library with composer support and unit tests
+
+

composer.json

@@ -1,22 +1,24 @@
 {
-    "name": "bjeavons/zxcvbn-php",
+    "name": "mkopinsky/zxcvbn-php",
     "type": "library",
     "description": "Realistic password strength estimation PHP library based on Zxcvbn JS",
     "keywords": ["zxcvbn","password"],
-    "homepage": "https://github.com/bjeavons/zxcvbn-php",
+    "homepage": "https://github.com/mkopinsky/zxcvbn-php",
     "license": "MIT",
     "authors": [
         {
             "name": "See contributors",
-            "homepage": "https://github.com/bjeavons/zxcvbn-php"
+            "homepage": "https://github.com/mkopinsky/zxcvbn-php"
         }
     ],
     "require": {
-        "php": "^5.6 || ^7.0"
+        "php": "^5.6 || ^7.0",
+        "symfony/polyfill-mbstring": ">=1.3.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "*",
-        "satooshi/php-coveralls": "*"
+        "phpunit/phpunit": "< 6.0",
+        "php-coveralls/php-coveralls": "*",
+        "squizlabs/php_codesniffer": "3.*"
     },
     "autoload": {
         "psr-4": { "ZxcvbnPhp\\": "src/" }