Merge portphp/boilerplate

Author: ddeboer

.editorconfig

@@ -8,6 +8,6 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.yml]
+[*.yml*]
 indent_style = space
 indent_size = 2

.gitattributes

@@ -0,0 +1,10 @@
+spec/            export-ignore
+tests/           export-ignore
+.editorconfig    export-ignore
+.gitattributes   export-ignore
+.gitignore       export-ignore
+.scrutinizer.yml export-ignore
+.travis.yml      export-ignore
+CONTRIBUTING.md  export-ignore
+phpspec.yml.dist export-ignore
+phpunit.xml.dist export-ignore

.gitignore

@@ -1,4 +1,5 @@
-build/
 vendor/
+composer.phar
 composer.lock
 phpspec.yml
+phpunit.xml

.scrutinizer.yml

@@ -1,2 +1,2 @@
 tools:
-    external_code_coverage: true
+  external_code_coverage: true

.travis.yml

@@ -1,7 +1,5 @@
 language: php
 
-sudo: false
-
 php:
   - 5.4
   - 5.5
@@ -16,17 +14,15 @@ matrix:
   include:
     - php: 5.4
       env:
-        - COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
-        - PHPUNIT_FLAGS="--coverage-text --coverage-clover=coverage.clover"
+        - COMPOSER_FLAGS="--prefer-lowest --prefer-stable"
         - COVERAGE=true
 
-cache:
-  directories:
-    - $HOME/.composer/cache
+before_script:
+  - if [[ "$COVERAGE" != true ]]; then phpenv config-rm xdebug.ini; fi
 
 install:
   - if [[ "$TRAVIS_PHP_VERSION" == "hhvm" ]]; then composer require mongofill/mongofill=dev-master --no-update; fi
-  - travis_retry composer update --no-progress --no-plugins ${COMPOSER_FLAGS}
+  - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
 
 script: phpunit ${PHPUNIT_FLAGS}
 

CONTRIBUTING.md

@@ -0,0 +1,66 @@
+Contributing
+============
+
+Thank you for contributing to this project!
+
+Bug reports
+-----------
+
+If you find a bug, please submit an issue. Try to be as detailed as possible
+in your problem description to help us fix the bug.
+
+Feature requests
+----------------
+
+If you wish to propose a feature, please submit an issue. Try to explain your
+use case as fully as possible to help us understand why you think the feature
+should be added.
+
+Creating a pull request (PR)
+----------------------------
+
+First [fork the repository](https://help.github.com/articles/fork-a-repo/) on
+GitHub.
+
+Then clone your fork:
+
+```bash
+$ git clone https://github.com/your-name/repo-name.git
+$ git checkout -b bug-or-feature-description
+```
+
+And install the dependencies:
+
+```bash
+$ composer install
+```
+
+Write your code and add tests. Then run the tests:
+
+```bash
+$ vendor/bin/phpunit
+```
+
+Commit your changes and push them to GitHub:
+
+```bash
+$ git commit -m "Fix nasty bug"
+$ git push -u origin bug-or-feature-description
+```
+
+Then [create a pull request](https://help.github.com/articles/creating-a-pull-request/)
+on GitHub.
+
+If you need to make some changes, commit and push them as you like. When asked
+to squash your commits, do so as follows:
+
+```bash
+git rebase -i
+git push origin bug-or-feature-description -f
+```
+
+Coding standard
+---------------
+
+This project follows the [PSR-2](http://www.php-fig.org/psr/psr-2/) coding style.
+Please make sure your pull requests adhere to this standard.

LICENSE

@@ -1,11 +1,13 @@
-Copyright (C) 2012-2014 David de Boer <[email protected]>
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Copyright (c) 2015 PortPHP
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.