Merge branch 'master' into patch-7

Conflicts:
	README.md

.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.2
+before_script:
+  - gem install awesome_bot
+script:
+  - awesome_bot README.md --white-list igor.io,blackfire.io,toranproxy.com
+notifications:
+  email: false

CODE-OF-CONDUCT.md

@@ -0,0 +1,50 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer at [INSERT EMAIL ADDRESS]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

COLLABORATING.md

@@ -0,0 +1,26 @@
+# Collaboration Guidelines
+As a collaborator you are representing the Awesome PHP project to the community. Please adhere to the following guidelines to give everyone the best experience possible: 
+
+## Etiquette
+Please adhere to the [CODE-OF-CONDUCT](https://github.com/ziadoz/awesome-php/blob/master/CODE-OF-CONDUCT.md) when reviewing suggestions and participating in discussions on the project's Github account.
+
+Always be polite and thank people, even if you don’t accept their suggestions.
+
+You are welcome to suggest projects that you are personally involved with, or those of friends, family or colleagues, but you are not allowed to review or merge them yourself, nor should you request that others do so for you. They must be reviewed by a neutral collaborator in their own time.
+
+If you provide feedback on a suggested project please be friendly and constructive.
+
+## Reviewing
+Please work through the following checklist when reviewing a project: 
+
+- Tag pull requests with the most relevant label(s).
+- Validate URLs work correctly and don't point to anything malicious.
+- Ensure suggestions adhere to [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONTRIBUTING.md).
+
+## Enhancements
+If you have an idea on how to improve the project, please open a ticket for discussion using the `Enhancement` label. Please don’t make any broad or sweeping changes without consulting other collaborators first and reaching a consensus.
+
+## Join
+If you want to help out please send an email to my Github username [at] gmail [dot] com with the subject “Awesome PHP Collaborator and a link to your Github account and I’ll get back to you as soon as I can (I'm notoriously slow, sorry).
+
+Thank you for taking the time to help out with Awesome PHP, your help is appreciated!

CONTRIBUTING.md

@@ -1,14 +1,24 @@
 # Contribution Guidelines
-Please ensure your pull request adheres to the following guidelines:
+Unfortunately, not every library, tool or framework can be considered for inclusion. The aim of Awesome PHP is to be a concise list of noteworthy and interesting software written in modern PHP. Therefore, suggested software should: 
 
+a) Be widely recommended regardless of personal opinion  
+b) Well known or discussed within the PHP community  
+c) Be unique in its approach or function  
+d) Fill a niche gap in the market  
+
+Self-promotion is frowned upon, so please consider seriously whether your project meets the criteria before opening a pull request, otherwise it may be closed without being reviewed.
+
+Also, please ensure your pull request adheres to the following guidelines:
+
+* Software that is PHP 5.5+, Composer-installable, PSR compliant, semantically versioned, united tested and well documented in English is preferred.
 * Please search previous suggestions before making a new one, as yours may be a duplicate.
-* Libraries that are PHP 5.3+, Composer-installable, PSR compliant, tested and documented are preferred.
+* Enter a meaningful pull request description.
-* Please make an individual commit for each suggestion in a pull request.
+* Please make an individual commit for each suggestion in a separate pull request.
-* Put a link to each library in your pull request ticket, so they're easier to look at.
+* Put a link to each library in your pull request ticket so it's easier to review.
 * Use the following format for libraries: \[LIBRARY\]\(LINK\) - DESCRIPTION.
 * Prefix duplicate library names with their vendor or namespace followed by a space: Foo\Bar would be Foo Bar.
-* New categories, or improvements to the existing categorisation are welcome.
+* New categories, or improvements to the existing categorisation, are always welcome.
-* Keep descriptions short and simple. 
+* Please keep descriptions short, simple and unbiased. No buzzwords or marketing jargon. 
 * End all descriptions with a full stop/period.
 * Check your spelling and grammar.
 * Make sure your text editor is set to remove trailing whitespace.