Merge branch 'master' into fix/refactor-text-tests

Author: stevegrunwell

.gitattributes

@@ -0,0 +1,7 @@
+/test/              export-ignore
+/.gitattributes     export-ignore
+/.gitignore         export-ignore
+/.travis.yml        export-ignore
+/CONTRIBUTING.md    export-ignore
+/Makefile           export-ignore
+/phpunit.xml.dist   export-ignore

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### Summary
+
+<!-- provide a summary here -->
+
+### Versions
+
+<!-- Please provide the versions of PHP as well as `fzaninotto/faker` on which the issue has been observed -->
+
+|                     | Version |
+|:--------------------|:--------|
+| PHP                 | x.y.z   |
+| `fzaninotto/faker`  | x.y.z   |
+
+### Self-enclosed code snippet for reproduction
+
+```php
+<!-- please replace this with a self-enclosed usage example -->
+```
+
+### Expected output
+
+```txt
+<!-- please replace this with the expected output of your self-enclosed example --> 
+```
+
+### Actual output
+
+```txt
+<!-- please replace this with the actual output of your self-enclosed example --> 
+```

.travis.yml

@@ -10,16 +10,21 @@ php:
     - 7.0
     - 7.1
     - 7.2
+    - 7.3
     - nightly
 
-sudo: false
+matrix:
+    allow_failures:
+        - nightly
 
 cache:
   directories:
     - $HOME/.composer/cache
 
+before_install:
+  - phpenv config-rm xdebug.ini || true
+
 before_script:
-    - travis_retry composer self-update
     - travis_retry composer install --no-interaction --prefer-dist
 
 script: make sniff test

CONTRIBUTING.md

@@ -5,7 +5,7 @@ If you've written a new formatter, adapted Faker to a new locale, or fixed a bug
 
 Before proposing a pull request, check the following:
 
-* Your code should follow the [PSR-2 coding standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md). Run `make sniff` to check that the coding standards are followed, and use [php-cs-fixer](https://github.com/fabpot/PHP-CS-Fixer) to fix inconsistencies.
+* Your code should follow the [PSR-2 coding standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md). Run `make sniff` to check that the coding standards are followed, and run `make fix` to fix inconsistencies.
 * Unit tests should still pass after your patch. Run the tests on your dev server (with `make test`) or check the continuous integration status for your pull request.
 * As much as possible, add unit tests for your code
 * Never use `rand()` in your providers. Faker uses the Mersenne Twister Randomizer, so use `mt_rand()` or any of the base generators (`randomNumber`, `randomElement`, etc.) instead.

Makefile

@@ -1,10 +1,18 @@
-vendor/autoload.php:
-	composer install --no-interaction --prefer-dist
+.PHONY: build fix help sniff test
+
+help:
+	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+build: fix test ## Runs fix and test targets
 
-.PHONY: sniff
-sniff: vendor/autoload.php
+fix: vendor/autoload.php ## Fixes code style issues with phpcbf
+	vendor/bin/phpcbf --standard=PSR2 src
+
+sniff: vendor/autoload.php ## Detects code style issues with phpcs
 	vendor/bin/phpcs --standard=PSR2 src -n
 
-.PHONY: test
-test: vendor/autoload.php
+test: vendor/autoload.php ## Runs tests with phpunit
 	vendor/bin/phpunit --verbose
+
+vendor/autoload.php:
+	composer install --no-interaction --prefer-dist

composer.json

@@ -13,9 +13,9 @@
         "php": "^5.3.3 || ^7.0"
     },
     "require-dev": {
+        "ext-intl": "*",
         "phpunit/phpunit": "^4.8.35 || ^5.7",
-        "squizlabs/php_codesniffer": "^1.5",
-        "ext-intl": "*"
+        "squizlabs/php_codesniffer": "^2.9.2"
     },
     "autoload": {
         "psr-4": {
@@ -31,5 +31,8 @@
         "branch-alias": {
             "dev-master": "1.9-dev"
         }
+    },
+    "config": {
+        "sort-packages": true
     }
 }

phpunit.xml.dist

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     bootstrap="vendor/autoload.php"
     colors="true"
 >