From 296d461655fa64ed31cd6de255669a0229672c99 Mon Sep 17 00:00:00 2001
From: Elliot Levin <elliot@aanet.com.au>
Date: Mon, 7 Jul 2014 23:37:29 +1000
Subject: [PATCH 01/62] Added Pinq

PHP Integrated query, a real Linq library for PHP.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5bc8640..341312c 100644
--- a/README.md
+++ b/README.md
@@ -483,6 +483,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Serializer](https://github.com/schmittjoh/serializer) - A library for serialising and de-serialising data.
 * [PHP Object Storage](https://github.com/herrera-io/php-object-storage) - A library for object storage.
 * [Fractal](https://github.com/php-loep/fractal) - A library for converting complex data structures to JSON output.
+* [Pinq](https://github.com/TimeToogo/Pinq) - PHP Integrated query, a real Linq library for PHP.
 
 ## Notifications
 *Libraries for working with notification software.*

From c6cbc046a61b76e3f7ca0bac095f8eb6e6a9d272 Mon Sep 17 00:00:00 2001
From: Lee Davis <leedavis81@hotmail.com>
Date: Mon, 7 Jul 2014 16:16:59 +0100
Subject: [PATCH 02/62] Update README.md

Added Drest under the Rest and API section. More details on this tool can be found here: http://leedavis81.github.io/drest/
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5bc8640..264d6a8 100644
--- a/README.md
+++ b/README.md
@@ -467,6 +467,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Hateoas](https://github.com/willdurand/Hateoas) - A HATEOAS REST web service library.
 * [HAL](https://github.com/blongden/hal) - A Hypertext Application Language (HAL) builder library.
 * [Negotiation](https://github.com/willdurand/Negotiation) - A content negotiation library.
+* [Drest](https://github.com/leedavis81/drest) - Quickly and easily expose Doctrine entities as REST resource endpoints.
 
 ## Caching
 *Libraries for caching data.*

From 97bc33bcd9e0932208b06faef0cfb141032784ce Mon Sep 17 00:00:00 2001
From: Paul Dragoonis <dragoonis@gmail.com>
Date: Mon, 7 Jul 2014 22:47:13 +0100
Subject: [PATCH 03/62] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5bc8640..6c76b93 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Zend Framework 2](http://framework.zend.com) - Another framework comprised of individual components.
 * [Laravel 4](http://laravel.com/) - A simple PHP framework.
 * [Aura PHP](http://auraphp.com/) - A framework of independent components.
+* [PPI Framework 2](http://www.ppi.io) - The PHP Interoperability Framework
 * [Phalcon](http://phalconphp.com/en/) - A framework implemented as a C extension.
 
 ## Framework Extras

From ea4c7eac6c0ab41dcc4a35de3205076ae22f2891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Kri=C5=A1ka?= <ujovlado@gmail.com>
Date: Sat, 12 Jul 2014 19:13:04 +0200
Subject: [PATCH 04/62] Added Tracy debugging library

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b63c7d5..4a4742c 100644
--- a/README.md
+++ b/README.md
@@ -285,6 +285,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [PHPLOC](https://github.com/sebastianbergmann/phploc) - A tool for quickly measuring the size of a PHP project.
 * [xDebug](https://github.com/xdebug/xdebug) - A debug and profile tool for PHP.
 * [xHprof](https://github.com/phacility/xhprof) - Another profiling tool for PHP.
+* [Tracy](https://github.com/nette/tracy) - Simple error detection, logging and time measuring library.
 
 ## Build Tools
 *Project build and automation tools.*

From ece7a14108e11f62ae924f223497807e7f39d3dd Mon Sep 17 00:00:00 2001
From: Corpsee <poisoncorpsee@gmail.com>
Date: Sun, 13 Jul 2014 10:37:22 +0700
Subject: [PATCH 05/62] Added Yii2 framework

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b63c7d5..f0a750f 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Zend Framework 2](http://framework.zend.com) - Another framework comprised of individual components.
 * [Laravel 4](http://laravel.com/) - A simple PHP framework.
 * [Aura PHP](http://auraphp.com/) - A framework of independent components.
+* [Yii2](https://github.com/yiisoft/yii2/) - a high-performance framework.
 * [Phalcon](http://phalconphp.com/en/) - A framework implemented as a C extension.
 
 ## Framework Extras

From 5e125b00f1dc0481977ab1c866cfb8469dabdb31 Mon Sep 17 00:00:00 2001
From: Corpsee <poisoncorpsee@gmail.com>
Date: Sun, 13 Jul 2014 10:50:22 +0700
Subject: [PATCH 06/62] Added AspectMock library

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b63c7d5..4e9625d 100644
--- a/README.md
+++ b/README.md
@@ -213,6 +213,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [ParaTest](https://github.com/brianium/paratest) - A parallel testing library for PHPUnit.
 * [PHPSpec](https://github.com/phpspec/phpspec) - A design by specification unit testing library.
 * [Codeception](https://github.com/Codeception/Codeception) - A full stack testing framework.
+* [AspectMock](https://github.com/Codeception/AspectMock) - A mocking framework for PHPUnit/Codeception.
 * [Atoum](https://github.com/atoum/atoum) - A simple testing library.
 * [Mockery](https://github.com/padraic/mockery) - A mock object library for testing.
 * [Phake](https://github.com/mlively/Phake) - Another mock object library for testing.

From a2235bcbc92e008875e849ac99f76953c8175cef Mon Sep 17 00:00:00 2001
From: Ben Peachey <potherca@gmail.com>
Date: Sun, 20 Jul 2014 14:51:46 +0200
Subject: [PATCH 07/62] Adds PHPTAL as templating library.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f9ca83b..0cff813 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Mustache](https://github.com/bobthecow/mustache.php) - A PHP implementation of the Mustache template language.
 * [Phly Mustache](https://github.com/weierophinney/phly_mustache) - Another PHP implementation of the Mustache template language.
 * [MtHaml](https://github.com/arnaud-lb/MtHaml) - A PHP implementation of the HAML template language.
+* [PHPTAL](http://phptal.org/) - A PHP implementation of the TAL templating language, orignating from the Python Zope library.
 * [Plates](http://platesphp.com/) - A native PHP templating library.
 * [Lex](https://github.com/pyrocms/lex) - A lightweight template parser.
 

From 73901bc6d1ae58964b4b4cb38d70764057b2fc35 Mon Sep 17 00:00:00 2001
From: Stephane Corlosquet <scorlosquet@gmail.com>
Date: Wed, 23 Jul 2014 13:13:50 -0400
Subject: [PATCH 08/62] Add Zxcvbn-php

Add @bjeavons' Zxcvbn-php library
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f9ca83b..c9d3317 100644
--- a/README.md
+++ b/README.md
@@ -263,6 +263,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [IniScan](https://github.com/psecio/iniscan) - A tool that scans PHP INI files for security.
 * [SensioLabs Security Check](https://security.sensiolabs.org/) - A web tool to check your Composer dependencies for security advisories.
 * [Zed](https://www.owasp.org/index.php/OWASP_Zed_Attack_Proxy_Project) - An integrated penetration testing tool for web applications.
+* [Zxcvbn PHP](https://github.com/bjeavons/zxcvbn-php) - A realistic PHP password strength estimate library based on Zxcvbn JS.
 
 ## Code Analysis
 *Libraries and tools for analysing, parsing and manipulation codebases.*

From 73eaf7baa6397dc3c62eceab1109b446785e6821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Baptiste=20Clavi=C3=A9?= <clavie.b@gmail.com>
Date: Fri, 25 Jul 2014 16:18:50 +0200
Subject: [PATCH 09/62] Added Totem

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f9ca83b..21e33a0 100644
--- a/README.md
+++ b/README.md
@@ -590,6 +590,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Lambda PHP](https://github.com/igorw/lambda-php) - A Lambda calculus interpreter in PHP.
 * [Country List](https://github.com/umpirsky/country-list) - A list of all countries with names and ISO 3166-1 codes.
 * [PHP-GPIO](https://github.com/ronanguilloux/php-gpio) - A library for playing with the Raspberry PI's GPIO pins.
+* [Totem](http://github.com/Wisembly/Totem) - A library to manage and create changesets for your data
 
 # Software
 *Software for creating a development environment.*

From 4ee88422ce897bd5784aa4ea2ced8e45956b2f64 Mon Sep 17 00:00:00 2001
From: Maxime Veber <nek.dev@gmail.com>
Date: Fri, 25 Jul 2014 16:58:59 +0200
Subject: [PATCH 10/62] Added JoliCi to continuous integration part

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f9ca83b..1be6402 100644
--- a/README.md
+++ b/README.md
@@ -235,6 +235,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Travis CI](https://travis-ci.org/) - A continuous integration platform.
 * [PHPCI](http://www.phptesting.org/) - An open source continuous integration platform for PHP.
 * [Sismo](http://sismo.sensiolabs.org/) - A continuous testing server library.
+* [JoliCi](https://github.com/jolicode/JoliCi) - A Continuous Integration Client written in PHP and powered by Docker.
 
 ## Documentation
 *Libraries for generating project documentation.*

From 7c4e607a29e9655b7a4e891113276e8e1cbe6361 Mon Sep 17 00:00:00 2001
From: euromark <euromark@web.de>
Date: Sat, 26 Jul 2014 12:47:52 +0200
Subject: [PATCH 11/62] Add missing I18n section.

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index f9ca83b..5b87628 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 	- [Data Structure and Storage](#data-structure-and-storage)
 	- [Notifications](#notifications)
 	- [Deployment](#deployment)
+	- [I18n](#i18n)
 	- [Third Party APIs](#third-party-apis)
 	- [Extensions](#extensions)
 	- [Miscellaneous](#miscellaneous)
@@ -521,6 +522,11 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Rocketeer](https://github.com/Anahkiasen/rocketeer) - A fast and easy deployer for the PHP world.
 * [Envoy](https://github.com/laravel/envoy) - A tool to run SSH tasks with PHP.
 
+## I18n
+* Libraries for I18n (Internationalization) and L10n (Localization)*
+
+* [Aura.Intl](https://github.com/auraphp/Aura.Intl)
+
 ## Third Party APIs
 *Libraries for accessing third party APIs.*
 

From 8c28a063f2cd22365679422c2584c3a70168f96e Mon Sep 17 00:00:00 2001
From: Akihito Koriyama <akihito.koriyama@gmail.com>
Date: Tue, 29 Jul 2014 00:53:44 +0900
Subject: [PATCH 12/62] Add print_o

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f9ca83b..3a2e8c3 100644
--- a/README.md
+++ b/README.md
@@ -590,6 +590,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Lambda PHP](https://github.com/igorw/lambda-php) - A Lambda calculus interpreter in PHP.
 * [Country List](https://github.com/umpirsky/country-list) - A list of all countries with names and ISO 3166-1 codes.
 * [PHP-GPIO](https://github.com/ronanguilloux/php-gpio) - A library for playing with the Raspberry PI's GPIO pins.
+* [print_o](https://github.com/koriym/print_o) - An object graph visualizer.
 
 # Software
 *Software for creating a development environment.*

From 3e115e0ea261188c009d47a4480d1e06a11bea07 Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Wed, 20 Aug 2014 09:14:12 +0100
Subject: [PATCH 13/62] Added PHPCheckstyle

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4d23ba3..11e0012 100644
--- a/README.md
+++ b/README.md
@@ -290,6 +290,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [PHPLOC](https://github.com/sebastianbergmann/phploc) - A tool for quickly measuring the size of a PHP project.
 * [xDebug](https://github.com/xdebug/xdebug) - A debug and profile tool for PHP.
 * [xHprof](https://github.com/phacility/xhprof) - Another profiling tool for PHP.
+* [PHPCheckstyle](https://github.com/jbrooksuk/phpcheckstyle) - A tool to help adhere to certain coding conventions.
 
 ## Build Tools
 *Project build and automation tools.*

From 23db4fcbcc95d330d61e0a915d964d811177ef51 Mon Sep 17 00:00:00 2001
From: "Barry vd. Heuvel" <barryvdh@gmail.com>
Date: Sat, 23 Aug 2014 14:10:17 +0200
Subject: [PATCH 14/62] Add CssToInlineStyles to Email section

Added https://github.com/tijsverkoyen/CssToInlineStyles, useful for inlining CSS so it works in more email clients.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4d23ba3..b4d261c 100644
--- a/README.md
+++ b/README.md
@@ -166,6 +166,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Fetch](https://github.com/tedivm/Fetch) - An IMAP library.
 * [Email Reply Parser](https://github.com/willdurand/EmailReplyParser) - An email reply parser library.
 * [Stampie](https://github.com/henrikbjorn/Stampie) - A library for email services such as [SendGrid](http://sendgrid.com), [PostMark](http://postmarkapp.com), [MailGun](http://www.mailgun.com) and [Mandrill](http://www.mandrill.com).
+* [CssToInlineStyles](https://github.com/tijsverkoyen/CssToInlineStyles) - A library to inline CSS in email templates.
 
 ## Files
 *Libraries for file manipulation and MIME type detection.*

From 02077a95950b2bca30cdaa7dbfb6cf9b77a13e34 Mon Sep 17 00:00:00 2001
From: Arul <arul@luracast.com>
Date: Sun, 24 Aug 2014 08:36:28 +0530
Subject: [PATCH 15/62] Added Restler Framework

Restler converts object oriented php code to web api
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 30cab83..4f2d07b 100644
--- a/README.md
+++ b/README.md
@@ -490,6 +490,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Hateoas](https://github.com/willdurand/Hateoas) - A HATEOAS REST web service library.
 * [HAL](https://github.com/blongden/hal) - A Hypertext Application Language (HAL) builder library.
 * [Negotiation](https://github.com/willdurand/Negotiation) - A content negotiation library.
+* [Restler](https://github.com/Luracast/Restler) - A light weight framework to expose PHP methods as Restful/Pragmatic Web API.
 
 ## Caching
 *Libraries for caching data.*

From 97d42673edd005351831f3e4657158d698330fb0 Mon Sep 17 00:00:00 2001
From: "Marc J. Schmidt" <marc@kryn.org>
Date: Mon, 25 Aug 2014 15:30:55 +0200
Subject: [PATCH 16/62] Updated Propel's description.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 30cab83..fc52965 100644
--- a/README.md
+++ b/README.md
@@ -376,7 +376,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Doctrine](http://www.doctrine-project.org/) - A comprehensive DBAL and ORM.
 * [Doctrine Migrations](http://docs.doctrine-project.org/projects/doctrine-migrations/en/latest/toc.html) - A migration library for Doctrine.
 * [Doctrine Extensions](https://github.com/l3pp4rd/DoctrineExtensions) - A collection of Doctrine behavioural extensions.
-* [Propel](http://www.propelorm.org/) - A fast ORM.
+* [Propel](http://www.propelorm.org/) - A fast ORM, migration library and query builder.
 * [Eloquent](https://github.com/illuminate/database) - The Laravel 4 ORM.
 * [Baum](https://github.com/etrepat/baum) - A nested set implementation for Eloquent.
 * [Spot](https://github.com/vlucas/Spot) - A MySQL datamapper ORM.

From 4586b7fbf1c5113d675f9d544417d687504f5121 Mon Sep 17 00:00:00 2001
From: Elliot Levin <elliotlevin@hotmail.com>
Date: Thu, 4 Sep 2014 16:32:38 +1000
Subject: [PATCH 17/62] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 341312c..768887a 100644
--- a/README.md
+++ b/README.md
@@ -483,7 +483,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Serializer](https://github.com/schmittjoh/serializer) - A library for serialising and de-serialising data.
 * [PHP Object Storage](https://github.com/herrera-io/php-object-storage) - A library for object storage.
 * [Fractal](https://github.com/php-loep/fractal) - A library for converting complex data structures to JSON output.
-* [Pinq](https://github.com/TimeToogo/Pinq) - PHP Integrated query, a real Linq library for PHP.
+* [PINQ](https://github.com/TimeToogo/Pinq) - PHP Integrated query, a real Linq library for PHP.
 
 ## Notifications
 *Libraries for working with notification software.*

From 1890744eaf329167000a493df5903f5355bf7f40 Mon Sep 17 00:00:00 2001
From: Speakus <speakus.net@gmail.com>
Date: Fri, 5 Sep 2014 17:18:35 +1100
Subject: [PATCH 18/62] added known list of IDEs

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 30cab83..e386a6b 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 	- [Extensions](#extensions)
 	- [Miscellaneous](#miscellaneous)
 - [Software](#software)
+	- [Integrated Development Environment] (#ide)
 	- [PHP Installation](#php-installation)
 	- [Development Environment](#development-environment)
 	- [Virtual Machines](#virtual-machines)
@@ -595,6 +596,13 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 # Software
 *Software for creating a development environment.*
 
+## Integrated Development Environment
+*List of PHP IDEs.*
+
+* [Netbeans](https://netbeans.org) - IDE for Java, but also with other languagesm support PHP and HTML5.
+* [Eclipse for PHP Developers](https://www.eclipse.org/downloads/) - PHP IDE based on the Eclipse platform.
+* [PhpStorm](http://www.jetbrains.com/phpstorm/) - commercial IDE.
+
 ## PHP Installation
 *Tools to help install and manage PHP on your computer.*
 

From bce234703bdeec1914432ef7c78976694657bb27 Mon Sep 17 00:00:00 2001
From: Speakus <speakus.net@gmail.com>
Date: Fri, 5 Sep 2014 17:20:47 +1100
Subject: [PATCH 19/62] fix typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e386a6b..e0d3aee 100644
--- a/README.md
+++ b/README.md
@@ -599,7 +599,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 ## Integrated Development Environment
 *List of PHP IDEs.*
 
-* [Netbeans](https://netbeans.org) - IDE for Java, but also with other languagesm support PHP and HTML5.
+* [Netbeans](https://netbeans.org) - IDE for Java, but also with other languages, support PHP and HTML5.
 * [Eclipse for PHP Developers](https://www.eclipse.org/downloads/) - PHP IDE based on the Eclipse platform.
 * [PhpStorm](http://www.jetbrains.com/phpstorm/) - commercial IDE.
 

From 1170ff68ad59a88d3409a1b981f131fd9c615221 Mon Sep 17 00:00:00 2001
From: Colin O'Dell <colinodell@gmail.com>
Date: Thu, 11 Sep 2014 11:12:23 -0400
Subject: [PATCH 20/62] Add CommonMark PHP

This is currently the only parser (AFAIK) with full support for the CommonMark spec.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 30cab83..0362676 100644
--- a/README.md
+++ b/README.md
@@ -445,6 +445,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 
 * [Decoda](http://milesj.me/code/php/decoda) - A lightweight markup parser library.
 * [PHP Markdown](https://github.com/michelf/php-markdown) - A Markdown parser.
+* [CommonMark PHP](https://github.com/colinodell/commonmark-php) - A Markdown parser which supports the full [CommonMark spec](https://jgm.github.io/stmd/spec.html).
 * [Dflydev Markdown](https://github.com/dflydev/dflydev-markdown) - Another Markdown parser.
 * [Parsedown](https://github.com/erusev/parsedown) - Another Markdown parser.
 * [Ciconia](https://github.com/kzykhys/Ciconia) - Another Markdown parser that supports Github flavoured Markdown.

From 2b1c9857276438bf0567a18ee740fc0d0b568fe8 Mon Sep 17 00:00:00 2001
From: Ayon Khan <ayonkhan@gmail.com>
Date: Tue, 14 Oct 2014 00:59:41 +0600
Subject: [PATCH 21/62] Change the name to reflect the official style

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 30cab83..48f2d61 100644
--- a/README.md
+++ b/README.md
@@ -252,7 +252,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [True Random](https://github.com/pixeloution/true-random) - A library that generates random numbers using [www.random.org](http://www.random.org/).
 * [SecurityMultiTool](https://github.com/padraic/SecurityMultiTool) - A PHP security library.
 * [Password Compat](https://github.com/ircmaxell/password_compat) - A compatibility library for the new PHP 5.5 password functions.
-* [PHPAss](http://www.openwall.com/phpass/) - A portable password hashing framework.
+* [phpass](http://www.openwall.com/phpass/) - A portable password hashing framework.
 * [PHP Password Lib](https://github.com/ircmaxell/PHP-PasswordLib) - A library for generating and validating passwords.
 * [Password Policy](https://github.com/ircmaxell/password-policy) - A password policy library for PHP and JavaScript.
 * [Password Validator](https://github.com/jeremykendall/password-validator) - A library for validating and upgrading password hashes.

From 8aeccaf9d5af250e5356ceb4173d93a0132f4de1 Mon Sep 17 00:00:00 2001
From: Igor Timoshenkov <igor.timoshenkov@gmail.com>
Date: Tue, 14 Oct 2014 17:56:29 +0200
Subject: [PATCH 22/62] sphinx

Added SphinxQL query builder
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 30cab83..f537359 100644
--- a/README.md
+++ b/README.md
@@ -410,6 +410,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [ElasticSearch PHP](https://github.com/elasticsearch/elasticsearch-php) - The official client library for [ElasticSearch](http://www.elasticsearch.org/).
 * [Elastica](https://github.com/ruflin/Elastica) - A client library for ElasticSearch.
 * [Solarium](http://www.solarium-project.org/) - A client library for [Solr](http://lucene.apache.org/solr/).
+* [SphinxQL query builder](http://foolcode.github.io/SphinxQL-Query-Builder/) - a library to build queries for [Sphinx search](http://sphinxsearch.com/) engine.
 
 ## Command Line
 *Libraries for building command line utilities.*

From 9d87cfd55235dfdf8ccd9feeb1352f3fdc40e9c3 Mon Sep 17 00:00:00 2001
From: ptgn <ptgn@users.noreply.github.com>
Date: Wed, 15 Oct 2014 10:08:53 +1300
Subject: [PATCH 23/62] Update README.md

Peer to peer PHP mentorship organization.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 30cab83..f920a0b 100644
--- a/README.md
+++ b/README.md
@@ -647,6 +647,7 @@ Various resources, such as books, websites and articles, for improving your PHP
 * [PHP UG](http://php.ug) - A website to help people locate their nearest PHP user group (UG).
 * [Seven PHP](http://7php.com/) - A website that interviews members of the PHP community.
 * [Nomad PHP](http://nomadphp.com/) - A online PHP learning resource.
+* [PHP Mentoring](http://phpmentoring.org/) - Peer to peer PHP mentorship organization.
 
 ## Other Websites
 *Useful websites related to web development.*

From 3c5d9051826f8c5581d9badb00187df482272267 Mon Sep 17 00:00:00 2001
From: Jamie York <ziadoz@gmail.com>
Date: Sat, 18 Oct 2014 13:57:14 -0600
Subject: [PATCH 24/62] Added license

---
 LICENSE | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..a68bcd3
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,14 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+  

From ae7876d70d64f9318cef97e8621a89266e73d81b Mon Sep 17 00:00:00 2001
From: Jamie York <ziadoz@gmail.com>
Date: Sat, 18 Oct 2014 13:58:02 -0600
Subject: [PATCH 25/62] Make license file markdown

---
 LICENSE => LICENSE.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename LICENSE => LICENSE.md (100%)

diff --git a/LICENSE b/LICENSE.md
similarity index 100%
rename from LICENSE
rename to LICENSE.md

From cc400a518b04da3191d5ef79da7972075a8862b9 Mon Sep 17 00:00:00 2001
From: Adam <jedroadam@gmail.com>
Date: Mon, 25 Aug 2014 22:18:16 +0200
Subject: [PATCH 26/62] Add Jenkins.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4737365..b1ee00a 100644
--- a/README.md
+++ b/README.md
@@ -237,6 +237,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Travis CI](https://travis-ci.org/) - A continuous integration platform.
 * [PHPCI](http://www.phptesting.org/) - An open source continuous integration platform for PHP.
 * [Sismo](http://sismo.sensiolabs.org/) - A continuous testing server library.
+* [Jenkins](http://jenkins-ci.org/) A continous integration platform with [PHP support](http://jenkins-php.org/index.html).
 
 ## Documentation
 *Libraries for generating project documentation.*

From 63012dbc94e5a57105254c75529fa9928a96f44a Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Sat, 18 Oct 2014 20:18:36 -0600
Subject: [PATCH 27/62] Tweak descriptions.

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index cb0fe54..8d98622 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Zend Framework 2](http://framework.zend.com) - Another framework comprised of individual components.
 * [Laravel 4](http://laravel.com/) - A simple PHP framework.
 * [Aura PHP](http://auraphp.com/) - A framework of independent components.
-* [Yii2](https://github.com/yiisoft/yii2/) - a high-performance framework.
+* [Yii2](https://github.com/yiisoft/yii2/) - A high-performance framework.
 * [Phalcon](http://phalconphp.com/en/) - A framework implemented as a C extension.
 
 ## Framework Extras
@@ -493,7 +493,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Hateoas](https://github.com/willdurand/Hateoas) - A HATEOAS REST web service library.
 * [HAL](https://github.com/blongden/hal) - A Hypertext Application Language (HAL) builder library.
 * [Negotiation](https://github.com/willdurand/Negotiation) - A content negotiation library.
-* [Drest](https://github.com/leedavis81/drest) - Quickly and easily expose Doctrine entities as REST resource endpoints.
+* [Drest](https://github.com/leedavis81/drest) - A library for exposing Doctrine entities as REST resource endpoints.
 
 ## Caching
 *Libraries for caching data.*
@@ -510,7 +510,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Serializer](https://github.com/schmittjoh/serializer) - A library for serialising and de-serialising data.
 * [PHP Object Storage](https://github.com/herrera-io/php-object-storage) - A library for object storage.
 * [Fractal](https://github.com/php-loep/fractal) - A library for converting complex data structures to JSON output.
-* [PINQ](https://github.com/TimeToogo/Pinq) - PHP Integrated query, a real Linq library for PHP.
+* [PINQ](https://github.com/TimeToogo/Pinq) - A real Linq library for PHP.
 
 ## Notifications
 *Libraries for working with notification software.*

From fc91ab2c37a2ba926aa7cdb0c267df7f0bdd1c39 Mon Sep 17 00:00:00 2001
From: euromark <euromark@web.de>
Date: Mon, 20 Oct 2014 02:44:05 +0200
Subject: [PATCH 28/62] fix typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5b87628..29c231b 100644
--- a/README.md
+++ b/README.md
@@ -523,7 +523,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Envoy](https://github.com/laravel/envoy) - A tool to run SSH tasks with PHP.
 
 ## I18n
-* Libraries for I18n (Internationalization) and L10n (Localization)*
+*Libraries for I18n (Internationalization) and L10n (Localization)*
 
 * [Aura.Intl](https://github.com/auraphp/Aura.Intl)
 

From d5e24e92d2735fa86e7f849ee8a3e00d3c46e459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?=
 <a-x-@users.noreply.github.com>
Date: Tue, 21 Oct 2014 22:21:46 +0400
Subject: [PATCH 29/62] Update deprecated repo

DEPRECATION NOTICE by author (vlucas)
==================
WORK ON THIS PROJECT HAS STOPPED. Please use Spot v2 instead - it is actively maintained, and is based on a more solid foundation in the Doctrine DBAL (database abstraction layer, not Doctrine ORM), and had much wider and mroe robust database support (MySQL, SQLite, PostgreSQL, SQLServer, Oracle, etc.).
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7e59614..c848494 100644
--- a/README.md
+++ b/README.md
@@ -383,7 +383,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Propel](http://www.propelorm.org/) - A fast ORM, migration library and query builder.
 * [Eloquent](https://github.com/illuminate/database) - The Laravel 4 ORM.
 * [Baum](https://github.com/etrepat/baum) - A nested set implementation for Eloquent.
-* [Spot](https://github.com/vlucas/Spot) - A MySQL datamapper ORM.
+* [Spot2](https://github.com/vlucas/spot2) - A MySQL datamapper ORM.
 * [RedBean](http://redbeanphp.com/) - A lightweight, configuration-less ORM.
 * [PHP ActiveRecord](https://github.com/kla/php-activerecord) - A PHP Active Record implementation.
 * [Paris and Idiorm](http://j4mie.github.io/idiormandparis/) - A minimalist database library.

From 02b0faaed502a5acaa741889f0fa75263c187782 Mon Sep 17 00:00:00 2001
From: Jamie York <ziadoz@gmail.com>
Date: Wed, 29 Oct 2014 17:21:23 -0600
Subject: [PATCH 30/62] Update contributing notes.

---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6a26898..de65d60 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,6 +4,7 @@ Please ensure your pull request adheres to the following guidelines:
 * 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.
 * Please make an individual commit for each suggestion in a pull request.
+* Put a link to each library in your pull request ticket, so they're easier to look at.
 * 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.

From 78510204cd138ef3a71a97e824944972fb48fda8 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Wed, 29 Oct 2014 17:59:16 -0600
Subject: [PATCH 31/62] Simplify framework descriptions.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 59b3683..58f97e8 100644
--- a/README.md
+++ b/README.md
@@ -88,9 +88,9 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 
 * [Symfony2](http://symfony.com/) - A framework comprised of individual components.
 * [Zend Framework 2](http://framework.zend.com) - Another framework comprised of individual components.
-* [Laravel 4](http://laravel.com/) - A simple PHP framework.
+* [Laravel 4](http://laravel.com/) - Another PHP framework.
 * [Aura PHP](http://auraphp.com/) - A framework of independent components.
-* [Yii2](https://github.com/yiisoft/yii2/) - A high-performance framework.
+* [Yii2](https://github.com/yiisoft/yii2/) - Another PHP framework.
 * [Phalcon](http://phalconphp.com/en/) - A framework implemented as a C extension.
 
 ## Framework Extras

From f8f35d80748da048446e6147300e9d48d73b85d2 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Wed, 29 Oct 2014 18:00:28 -0600
Subject: [PATCH 32/62] Tweak Parody description.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 58f97e8..4204fd8 100644
--- a/README.md
+++ b/README.md
@@ -221,7 +221,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Atoum](https://github.com/atoum/atoum) - A simple testing library.
 * [Mockery](https://github.com/padraic/mockery) - A mock object library for testing.
 * [Phake](https://github.com/mlively/Phake) - Another mock object library for testing.
-* [Parody](https://github.com/dotink/Parody) - Yet another mock object library for testing.
+* [Parody](https://github.com/dotink/Parody) - A library for mimicking classes.
 * [Faker](https://github.com/fzaninotto/Faker) - A fake data generator library.
 * [Samsui](https://github.com/mauris/samsui) - Another fake data generator library.
 * [Alice](https://github.com/nelmio/alice) - An expressive fixture generation library.

From 597a236815c23dbe08674c0326e1ec8b60eedcd8 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Wed, 29 Oct 2014 18:01:33 -0600
Subject: [PATCH 33/62] Cleanup testing libraries.

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 4204fd8..9599d19 100644
--- a/README.md
+++ b/README.md
@@ -221,7 +221,6 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Atoum](https://github.com/atoum/atoum) - A simple testing library.
 * [Mockery](https://github.com/padraic/mockery) - A mock object library for testing.
 * [Phake](https://github.com/mlively/Phake) - Another mock object library for testing.
-* [Parody](https://github.com/dotink/Parody) - A library for mimicking classes.
 * [Faker](https://github.com/fzaninotto/Faker) - A fake data generator library.
 * [Samsui](https://github.com/mauris/samsui) - Another fake data generator library.
 * [Alice](https://github.com/nelmio/alice) - An expressive fixture generation library.

From d3dd33d921aa4c2b8eddd9851f66e2754ad51c18 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Wed, 29 Oct 2014 18:08:41 -0600
Subject: [PATCH 34/62] Cleaned up IDE category.

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 9f7e550..fe7e392 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 	- [Extensions](#extensions)
 	- [Miscellaneous](#miscellaneous)
 - [Software](#software)
-	- [Integrated Development Environment] (#ide)
+	- [Integrated Development Environment](#ide)
 	- [PHP Installation](#php-installation)
 	- [Development Environment](#development-environment)
 	- [Virtual Machines](#virtual-machines)
@@ -606,11 +606,11 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 *Software for creating a development environment.*
 
 ## Integrated Development Environment
-*List of PHP IDEs.*
+*Integrated Development Environments with for support PHP.*
 
-* [Netbeans](https://netbeans.org) - IDE for Java, but also with other languages, support PHP and HTML5.
-* [Eclipse for PHP Developers](https://www.eclipse.org/downloads/) - PHP IDE based on the Eclipse platform.
-* [PhpStorm](http://www.jetbrains.com/phpstorm/) - commercial IDE.
+* [Netbeans](https://netbeans.org) - An IDE with support for PHP and HTML5.
+* [Eclipse for PHP Developers](https://www.eclipse.org/downloads/) - A PHP IDE based on the Eclipse platform.
+* [PhpStorm](http://www.jetbrains.com/phpstorm/) - A commercial PHP IDE.
 
 ## PHP Installation
 *Tools to help install and manage PHP on your computer.*

From fe6eec7a96d91a02a5c69014c1cb95da02242545 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Wed, 29 Oct 2014 18:09:53 -0600
Subject: [PATCH 35/62] Reorder software categories.

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index fe7e392..d9eaf97 100644
--- a/README.md
+++ b/README.md
@@ -51,10 +51,10 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 	- [Extensions](#extensions)
 	- [Miscellaneous](#miscellaneous)
 - [Software](#software)
-	- [Integrated Development Environment](#ide)
 	- [PHP Installation](#php-installation)
 	- [Development Environment](#development-environment)
 	- [Virtual Machines](#virtual-machines)
+	- [Integrated Development Environment](#integrated-development-environment)
 	- [Web Applications](#web-applications)
 - [Resources](#resources)
 	- [PHP Websites](#php-websites)
@@ -605,13 +605,6 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 # Software
 *Software for creating a development environment.*
 
-## Integrated Development Environment
-*Integrated Development Environments with for support PHP.*
-
-* [Netbeans](https://netbeans.org) - An IDE with support for PHP and HTML5.
-* [Eclipse for PHP Developers](https://www.eclipse.org/downloads/) - A PHP IDE based on the Eclipse platform.
-* [PhpStorm](http://www.jetbrains.com/phpstorm/) - A commercial PHP IDE.
-
 ## PHP Installation
 *Tools to help install and manage PHP on your computer.*
 
@@ -641,6 +634,13 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [HippyVM](http://hippyvm.com/) - Another PHP virtual machine.
 * [Hack](http://hacklang.org/) - A programming language for [HHVM](https://github.com/facebook/hiphop-php) that interoperates seamlessly with PHP.
 
+## Integrated Development Environment
+*Integrated Development Environments with for support PHP.*
+
+* [Netbeans](https://netbeans.org) - An IDE with support for PHP and HTML5.
+* [Eclipse for PHP Developers](https://www.eclipse.org/downloads/) - A PHP IDE based on the Eclipse platform.
+* [PhpStorm](http://www.jetbrains.com/phpstorm/) - A commercial PHP IDE.
+
 ## Web Applications
 *Web-based applications and tools.*
 

From 673c889ff08ba4b8ee6f63fc3fe820c54e9b7ac6 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Wed, 29 Oct 2014 18:10:32 -0600
Subject: [PATCH 36/62] Fix typo in category description.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d9eaf97..9beaa86 100644
--- a/README.md
+++ b/README.md
@@ -635,7 +635,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Hack](http://hacklang.org/) - A programming language for [HHVM](https://github.com/facebook/hiphop-php) that interoperates seamlessly with PHP.
 
 ## Integrated Development Environment
-*Integrated Development Environments with for support PHP.*
+*Integrated Development Environments with support for PHP.*
 
 * [Netbeans](https://netbeans.org) - An IDE with support for PHP and HTML5.
 * [Eclipse for PHP Developers](https://www.eclipse.org/downloads/) - A PHP IDE based on the Eclipse platform.

From bd4bc3fa5ba1adafba60f6dd9b0c5f0c9147de44 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Wed, 29 Oct 2014 18:14:24 -0600
Subject: [PATCH 37/62] Cleaned up ORM category and broke out migration
 libraries into a new category.

---
 README.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 9beaa86..7a5337b 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 	- [E-commerce](#e-commerce)
 	- [PDF](#pdf)
 	- [ORM and Datamapping](#orm-and-datamapping)
+	- [Migrations](#migrations)
 	- [NoSQL](#nosql)
 	- [Queue](#queue)
 	- [Search](#search)
@@ -381,20 +382,22 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 *Libraries that implement object-relational mapping or datamapping techniques.*
 
 * [Doctrine](http://www.doctrine-project.org/) - A comprehensive DBAL and ORM.
-* [Doctrine Migrations](http://docs.doctrine-project.org/projects/doctrine-migrations/en/latest/toc.html) - A migration library for Doctrine.
 * [Doctrine Extensions](https://github.com/l3pp4rd/DoctrineExtensions) - A collection of Doctrine behavioural extensions.
 * [Propel](http://www.propelorm.org/) - A fast ORM, migration library and query builder.
 * [Eloquent](https://github.com/illuminate/database) - The Laravel 4 ORM.
 * [Baum](https://github.com/etrepat/baum) - A nested set implementation for Eloquent.
 * [Spot2](https://github.com/vlucas/spot2) - A MySQL datamapper ORM.
 * [RedBean](http://redbeanphp.com/) - A lightweight, configuration-less ORM.
-* [PHP ActiveRecord](https://github.com/kla/php-activerecord) - A PHP Active Record implementation.
-* [Paris and Idiorm](http://j4mie.github.io/idiormandparis/) - A minimalist database library.
 * [Pomm](https://github.com/chanmix51/Pomm) - An Object Model Manager for PostgreSQL.
-* [Migrations](https://github.com/icomefromthenet/Migrations) - A migration management library.
+* [ProxyManager](https://github.com/Ocramius/ProxyManager) - A set of utilities to generate proxy objects for data mappers.
+
+## Migrations
+Libraries to help manage database schemas and migrations.
+
 * [PHPMig](https://github.com/davedevelopment/phpmig) - Another migration management library.
 * [Phinx](https://github.com/robmorgan/phinx) - Another database migration library.
-* [ProxyManager](https://github.com/Ocramius/ProxyManager) - A set of utilities to generate proxy objects for data mappers.
+* [Migrations](https://github.com/icomefromthenet/Migrations) - A migration management library.
+* [Doctrine Migrations](http://docs.doctrine-project.org/projects/doctrine-migrations/en/latest/toc.html) - A migration library for Doctrine.
 
 ## NoSQL
 *Libraries for working with "NoSQL" backends.*

From 561d31e6240d828817150d869a128d22d470af4a Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Wed, 29 Oct 2014 18:15:28 -0600
Subject: [PATCH 38/62] Tweak PHPTal description.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7a5337b..9f0e3ae 100644
--- a/README.md
+++ b/README.md
@@ -136,7 +136,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Mustache](https://github.com/bobthecow/mustache.php) - A PHP implementation of the Mustache template language.
 * [Phly Mustache](https://github.com/weierophinney/phly_mustache) - Another PHP implementation of the Mustache template language.
 * [MtHaml](https://github.com/arnaud-lb/MtHaml) - A PHP implementation of the HAML template language.
-* [PHPTAL](http://phptal.org/) - A PHP implementation of the TAL templating language, orignating from the Python Zope library.
+* [PHPTAL](http://phptal.org/) - A PHP implementation of the [TAL](http://en.wikipedia.org/wiki/Template_Attribute_Language) templating language.
 * [Plates](http://platesphp.com/) - A native PHP templating library.
 * [Lex](https://github.com/pyrocms/lex) - A lightweight template parser.
 

From 420b60f54d0269043ee9b8dbf2e23f6b0be85be1 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Wed, 29 Oct 2014 18:21:50 -0600
Subject: [PATCH 39/62] Change Guzzle link to point to Github repo.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9f0e3ae..c6a5a10 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 ## HTTP
 *Libraries for working with HTTP and scraping websites.*
 
-* [Guzzle](http://guzzlephp.org/) - A comprehensive HTTP client.
+* [Guzzle]( https://github.com/guzzle/guzzle) - A comprehensive HTTP client.
 * [Buzz](https://github.com/kriswallsmith/Buzz) - Another HTTP client.
 * [Requests](https://github.com/rmccue/Requests) - A simple HTTP library.
 * [HTTPFul](https://github.com/nategood/httpful) - A chainable HTTP client.

From dd60284aff6cb0ba5aa24e75bb459010d96aa4fb Mon Sep 17 00:00:00 2001
From: Rotimi Ade <rotexdegba007-github@yahoo.ca>
Date: Thu, 30 Oct 2014 12:00:32 -0600
Subject: [PATCH 40/62] Added Cilex a micro framework for creating PHP CLI

Added Cilex a lightweight framework for creating PHP CLI scripts inspired by Silex.
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c6a5a10..d9ebca9 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 *Micro frameworks and routers.*
 
 * [Silex](http://silex.sensiolabs.org/) - A micro framework built around Symfony2 components.
+* [Cilex](https://github.com/Cilex/Cilex) - A PHP micro-framework for Command line tools based on the Symfony2 Components
 * [Slim](http://www.slimframework.com/) - Another simple micro framework.
 * [Bullet PHP](http://bulletphp.com/) - A micro framework for building REST APIs.
 * [Fast Route](https://github.com/nikic/FastRoute) - A fast routing library.

From 9f85d51a2481dbb879a43922125e8f8455c3c3f2 Mon Sep 17 00:00:00 2001
From: Rotimi Ade <rotexdegba007-github@yahoo.ca>
Date: Fri, 31 Oct 2014 15:14:10 -0600
Subject: [PATCH 41/62] Added Cilex a micro framework for creating PHP CLI

Added Cilex a micro framework for creating PHP CLI to the Command Line Section
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d9ebca9..1a7f08e 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,6 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 *Micro frameworks and routers.*
 
 * [Silex](http://silex.sensiolabs.org/) - A micro framework built around Symfony2 components.
-* [Cilex](https://github.com/Cilex/Cilex) - A PHP micro-framework for Command line tools based on the Symfony2 Components
 * [Slim](http://www.slimframework.com/) - Another simple micro framework.
 * [Bullet PHP](http://bulletphp.com/) - A micro framework for building REST APIs.
 * [Fast Route](https://github.com/nikic/FastRoute) - A fast routing library.
@@ -436,6 +435,7 @@ Libraries to help manage database schemas and migrations.
 * [ShellWrap](https://github.com/MrRio/shellwrap) - A simple command line wrapper library.
 * [Hoa Console](https://github.com/hoaproject/Console) - Another command line library.
 * [Shunt](https://github.com/php-loep/shunt) - A library for running commands in parallel on multiple remote machines.
+* [Cilex](https://github.com/Cilex/Cilex) - A PHP micro-framework for Command line tools based on the Symfony2 Components
 
 ## Authentication
 *Libraries for implementing authentications schemes.*

From 4ce28d0db61ce51fd2a2757074625ab80a3bb6ca Mon Sep 17 00:00:00 2001
From: Benjamin Cremer <bc@benjamin-cremer.de>
Date: Mon, 10 Nov 2014 08:06:02 +0100
Subject: [PATCH 42/62] Added Prophecy

Prophecy is a highly opinionated yet very powerful and flexible PHP object mocking framework.

It's used as mocking framework in [PHPSpec](https://github.com/phpspec/phpspec) and will eventually be supported by [PHPUnit](https://github.com/sebastianbergmann/phpunit) (see: https://github.com/sebastianbergmann/phpunit/commit/6c21c66567031c863f207fb46b3c1c545d5589d1).
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c6a5a10..bcf85fa 100644
--- a/README.md
+++ b/README.md
@@ -223,6 +223,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Atoum](https://github.com/atoum/atoum) - A simple testing library.
 * [Mockery](https://github.com/padraic/mockery) - A mock object library for testing.
 * [Phake](https://github.com/mlively/Phake) - Another mock object library for testing.
+* [Prophecy](https://github.com/phpspec/prophecy) - Highly opinionated mocking framework for PHP 5.3+.
 * [Faker](https://github.com/fzaninotto/Faker) - A fake data generator library.
 * [Samsui](https://github.com/mauris/samsui) - Another fake data generator library.
 * [Alice](https://github.com/nelmio/alice) - An expressive fixture generation library.

From 64083a595dd45889ce95226705c872adb19c5d23 Mon Sep 17 00:00:00 2001
From: Jamie York <ziadoz@gmail.com>
Date: Mon, 10 Nov 2014 10:12:14 -0700
Subject: [PATCH 43/62] Tweak description

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f11cb53..7607614 100644
--- a/README.md
+++ b/README.md
@@ -420,7 +420,7 @@ Libraries to help manage database schemas and migrations.
 * [ElasticSearch PHP](https://github.com/elasticsearch/elasticsearch-php) - The official client library for [ElasticSearch](http://www.elasticsearch.org/).
 * [Elastica](https://github.com/ruflin/Elastica) - A client library for ElasticSearch.
 * [Solarium](http://www.solarium-project.org/) - A client library for [Solr](http://lucene.apache.org/solr/).
-* [SphinxQL query builder](http://foolcode.github.io/SphinxQL-Query-Builder/) - a library to build queries for [Sphinx search](http://sphinxsearch.com/) engine.
+* [SphinxQL query builder](http://foolcode.github.io/SphinxQL-Query-Builder/) - A query library for the [Sphinx](http://sphinxsearch.com/) search engine.
 
 ## Command Line
 *Libraries for building command line utilities.*

From 40610df624738946fb65bfd20331aec8f6e770ae Mon Sep 17 00:00:00 2001
From: Jamie York <ziadoz@gmail.com>
Date: Mon, 10 Nov 2014 10:17:36 -0700
Subject: [PATCH 44/62] Tweak description

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 12eb28f..e08d6c8 100644
--- a/README.md
+++ b/README.md
@@ -223,7 +223,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 * [Atoum](https://github.com/atoum/atoum) - A simple testing library.
 * [Mockery](https://github.com/padraic/mockery) - A mock object library for testing.
 * [Phake](https://github.com/mlively/Phake) - Another mock object library for testing.
-* [Prophecy](https://github.com/phpspec/prophecy) - Highly opinionated mocking framework for PHP 5.3+.
+* [Prophecy](https://github.com/phpspec/prophecy) - A highly opinionated mocking framework.
 * [Faker](https://github.com/fzaninotto/Faker) - A fake data generator library.
 * [Samsui](https://github.com/mauris/samsui) - Another fake data generator library.
 * [Alice](https://github.com/nelmio/alice) - An expressive fixture generation library.

From 592d0f7a2e26ba9d49d7c509620f48052009a605 Mon Sep 17 00:00:00 2001
From: Jamie York <ziadoz@gmail.com>
Date: Mon, 10 Nov 2014 10:32:56 -0700
Subject: [PATCH 45/62] Tweak description

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 991a9ba..e6d2d5f 100644
--- a/README.md
+++ b/README.md
@@ -437,7 +437,7 @@ Libraries to help manage database schemas and migrations.
 * [ShellWrap](https://github.com/MrRio/shellwrap) - A simple command line wrapper library.
 * [Hoa Console](https://github.com/hoaproject/Console) - Another command line library.
 * [Shunt](https://github.com/php-loep/shunt) - A library for running commands in parallel on multiple remote machines.
-* [Cilex](https://github.com/Cilex/Cilex) - A PHP micro-framework for Command line tools based on the Symfony2 Components
+* [Cilex](https://github.com/Cilex/Cilex) - A micro framework for building command line tools.
 
 ## Authentication
 *Libraries for implementing authentications schemes.*

From 95b46bac361132805ddb7d1f3ca20bcd4fca24d5 Mon Sep 17 00:00:00 2001
From: Jamie York <ziadoz@gmail.com>
Date: Mon, 10 Nov 2014 10:36:49 -0700
Subject: [PATCH 46/62] Move contribution guidelines to the top.

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e6d2d5f..4e2fa93 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 # Awesome PHP
 A curated list of amazingly awesome PHP libraries, resources and shiny things.
 
+# Contributing
+Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONTRIBUTING.md) for details.
+
 - [Awesome PHP](#awesome-php)
 	- [Dependency Management](#dependency-management)
 	- [Dependency Management Extras](#dependency-management-extras)
@@ -746,6 +749,3 @@ Various resources, such as books, websites and articles, for improving your PHP
 * [PHP Evaluation Order](https://gist.github.com/nikic/6699370) - An article about evaluation order in PHP.
 * PHP Source Code for Developers: [1](http://blog.ircmaxell.com/2012/03/phps-source-code-for-php-developers.html) [2](http://nikic.github.com/2012/03/16/Understanding-PHPs-internal-function-definitions.html) [3](http://blog.ircmaxell.com/2012/03/phps-source-code-for-php-developers_21.html) [4](http://nikic.github.com/2012/03/28/Understanding-PHPs-internal-array-implementation.html) - A series about the PHP source code.
 * Collecting Garbage: [1](http://www.php.net/manual/en/features.gc.refcounting-basics.php) [2](http://www.php.net/manual/en/features.gc.collecting-cycles.php) [3](http://www.php.net/manual/en/features.gc.performance-considerations.php) - A series about the PHP garbage collection internals.
-
-# Contributing
-Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONTRIBUTING.md) for details.

From d9635b154c5189067aecd0c9f641a6d733c90c7e Mon Sep 17 00:00:00 2001
From: Jamie York <ziadoz@gmail.com>
Date: Mon, 10 Nov 2014 10:37:11 -0700
Subject: [PATCH 47/62] Add heading for TOC/Index

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4e2fa93..3a09ec9 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
 # Contributing
 Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONTRIBUTING.md) for details.
 
+# Table of Contents
 - [Awesome PHP](#awesome-php)
 	- [Dependency Management](#dependency-management)
 	- [Dependency Management Extras](#dependency-management-extras)

From 7253b5bbb82adf9177401caa9481ff3d98919f7e Mon Sep 17 00:00:00 2001
From: Jamie York <ziadoz@gmail.com>
Date: Mon, 10 Nov 2014 10:45:11 -0700
Subject: [PATCH 48/62] Change headings for Contributing and TOC sections.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3a09ec9..99b7d01 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # Awesome PHP
 A curated list of amazingly awesome PHP libraries, resources and shiny things.
 
-# Contributing
+## Contributing
 Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONTRIBUTING.md) for details.
 
-# Table of Contents
+## Table of Contents
 - [Awesome PHP](#awesome-php)
 	- [Dependency Management](#dependency-management)
 	- [Dependency Management Extras](#dependency-management-extras)

From d196cd67655276605a9272ee59c00d9750ada8f2 Mon Sep 17 00:00:00 2001
From: Adam <jedroadam@gmail.com>
Date: Sun, 16 Nov 2014 19:59:50 +0100
Subject: [PATCH 49/62] New: JsonMapper in Data Structure and Storage section.

https://github.com/netresearch/jsonmapper
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 99b7d01..e6d42a0 100644
--- a/README.md
+++ b/README.md
@@ -525,6 +525,7 @@ Libraries to help manage database schemas and migrations.
 * [PHP Object Storage](https://github.com/herrera-io/php-object-storage) - A library for object storage.
 * [Fractal](https://github.com/php-loep/fractal) - A library for converting complex data structures to JSON output.
 * [PINQ](https://github.com/TimeToogo/Pinq) - A real Linq library for PHP.
+* [JsonMapper](https://github.com/netresearch/jsonmapper) - A library that maps nested JSON structures onto PHP classes.
 
 ## Notifications
 *Libraries for working with notification software.*

From 96f24e8c2a07e147195b7dfa8be5bf88db34a896 Mon Sep 17 00:00:00 2001
From: Jamie York <ziadoz@gmail.com>
Date: Wed, 19 Nov 2014 11:31:08 -0700
Subject: [PATCH 50/62] Added new internals article.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 99b7d01..4334f72 100644
--- a/README.md
+++ b/README.md
@@ -747,6 +747,7 @@ Various resources, such as books, websites and articles, for improving your PHP
 * [How Foreach Works](http://stackoverflow.com/questions/10057671/how-foreach-actually-works/14854568#14854568) - A detailed StackOverflow answer about foreach.
 * [When Does Foreach Copy?](http://nikic.github.com/2011/11/11/PHP-Internals-When-does-foreach-copy.html) - An article about the internals of foreach.
 * [How Big Are PHP Arrays (And Values) Really?](http://nikic.github.com/2011/12/12/How-big-are-PHP-arrays-really-Hint-BIG.html) - An article about array internals.
+* [Why Objects (Usually) Use Less Memory Than Arrays](https://gist.github.com/nikic/5015323) - An article about object and array internals.
 * [PHP Evaluation Order](https://gist.github.com/nikic/6699370) - An article about evaluation order in PHP.
 * PHP Source Code for Developers: [1](http://blog.ircmaxell.com/2012/03/phps-source-code-for-php-developers.html) [2](http://nikic.github.com/2012/03/16/Understanding-PHPs-internal-function-definitions.html) [3](http://blog.ircmaxell.com/2012/03/phps-source-code-for-php-developers_21.html) [4](http://nikic.github.com/2012/03/28/Understanding-PHPs-internal-array-implementation.html) - A series about the PHP source code.
 * Collecting Garbage: [1](http://www.php.net/manual/en/features.gc.refcounting-basics.php) [2](http://www.php.net/manual/en/features.gc.collecting-cycles.php) [3](http://www.php.net/manual/en/features.gc.performance-considerations.php) - A series about the PHP garbage collection internals.

From 5d992c7fa929dced0b2b93005780a0db275c9e5c Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Sun, 30 Nov 2014 18:15:33 -0700
Subject: [PATCH 51/62] Added missing library Tracy.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4334f72..47eb04a 100644
--- a/README.md
+++ b/README.md
@@ -303,6 +303,7 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 * [xDebug](https://github.com/xdebug/xdebug) - A debug and profile tool for PHP.
 * [xHprof](https://github.com/phacility/xhprof) - Another profiling tool for PHP.
 * [PHPCheckstyle](https://github.com/jbrooksuk/phpcheckstyle) - A tool to help adhere to certain coding conventions.
+* [Tracy](https://github.com/nette/tracy) - A simple error detection, logging and time measuring library.
 
 ## Build Tools
 *Project build and automation tools.*

From 764dee51fbc8c4adfba8a4730dc7296f2e418645 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Sun, 30 Nov 2014 18:17:22 -0700
Subject: [PATCH 52/62] Added missing library Restler.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 47eb04a..03d32fb 100644
--- a/README.md
+++ b/README.md
@@ -509,6 +509,7 @@ Libraries to help manage database schemas and migrations.
 * [HAL](https://github.com/blongden/hal) - A Hypertext Application Language (HAL) builder library.
 * [Negotiation](https://github.com/willdurand/Negotiation) - A content negotiation library.
 * [Drest](https://github.com/leedavis81/drest) - A library for exposing Doctrine entities as REST resource endpoints.
+* [Restler](https://github.com/Luracast/Restler) - A lightweight framework to expose PHP methods as RESTful web API.
 
 ## Caching
 *Libraries for caching data.*

From 15cd29e1adfc7983563ab2c8a4bd575d0a493c66 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Sun, 30 Nov 2014 18:42:02 -0700
Subject: [PATCH 53/62] Category cleanup.

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index dc8c0cc..039dc70 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 	- [Data Structure and Storage](#data-structure-and-storage)
 	- [Notifications](#notifications)
 	- [Deployment](#deployment)
-	- [I18n](#i18n)
+	- [Internationalisation and Localisation](#internationalisation-and-localisation)
 	- [Third Party APIs](#third-party-apis)
 	- [Extensions](#extensions)
 	- [Miscellaneous](#miscellaneous)
@@ -540,14 +540,15 @@ Libraries to help manage database schemas and migrations.
 * [Notificator](https://github.com/namshi/notificator) - A lightweight notification library.
 
 ## Deployment
+*Libraries for project deployment.*
 
 * [Pomander](https://github.com/tamagokun/pomander) - A deployment tool for PHP applications.
 * [Rocketeer](https://github.com/Anahkiasen/rocketeer) - A fast and easy deployer for the PHP world.
 * [Envoy](https://github.com/laravel/envoy) - A tool to run SSH tasks with PHP.
 * [Plum](https://github.com/aerialls/Plum) - A deployer library.
 
-## I18n
-*Libraries for I18n (Internationalization) and L10n (Localization)*
+## Internationalisation and Localisation
+*Libraries for Internationalization (I18n) and Localization (L10n).
 
 * [Aura.Intl](https://github.com/auraphp/Aura.Intl)
 

From c9c2a2286f8a162090e42b456468dd6662cd6033 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Sun, 30 Nov 2014 20:00:43 -0700
Subject: [PATCH 54/62] Moved Poser to misc and updated repository and name.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 039dc70..f72c762 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,6 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 
 * [Satis](https://github.com/composer/satis) - A static Composer repository generator.
 * [Composition](https://github.com/bamarni/composition) - A library to check your Composer environment at runtime.
-* [Poser](https://github.com/FrenkyNet/Poser) - A Composer class aliasing library.
 * [Version](https://github.com/herrera-io/php-version) - A parsing and comparison library for semantic versioning.
 * [NameSpacer](https://github.com/ralphschindler/Namespacer) - A library to convert from underscores to namespaces.
 * [Patch Installer](https://github.com/goatherd/patch-installer) - A library to install patches using Composer.
@@ -622,6 +621,7 @@ Libraries to help manage database schemas and migrations.
 * [Country List](https://github.com/umpirsky/country-list) - A list of all countries with names and ISO 3166-1 codes.
 * [PHP-GPIO](https://github.com/ronanguilloux/php-gpio) - A library for playing with the Raspberry PI's GPIO pins.
 * [print_o](https://github.com/koriym/print_o) - An object graph visualizer.
+* [Alias](https://github.com/fuelphp/alias) - A class aliasing library.
 
 # Software
 *Software for creating a development environment.*

From a68741665c161b1c7efd6f2f2c082bae1f74ad44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Votruba?= <info@tomasvotruba.cz>
Date: Thu, 10 Jul 2014 20:29:36 +0200
Subject: [PATCH 55/62] Frameworks - Nette added

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 359dc45..cf2c38c 100644
--- a/README.md
+++ b/README.md
@@ -98,6 +98,7 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 * [Aura PHP](http://auraphp.com/) - A framework of independent components.
 * [Yii2](https://github.com/yiisoft/yii2/) - Another PHP framework.
 * [Phalcon](http://phalconphp.com/en/) - A framework implemented as a C extension.
+* [Nette](http://nette.org) - Another framework comprised of individual components.
 
 ## Framework Extras
 *Extras related to web development frameworks.*

From d343388110f4b1be2d6b863370d41f0954ead27a Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Mon, 1 Dec 2014 18:26:03 -0700
Subject: [PATCH 56/62] Fix mistake in category description.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 71ebb54..f352d6a 100644
--- a/README.md
+++ b/README.md
@@ -551,7 +551,7 @@ Libraries to help manage database schemas and migrations.
 * [Plum](https://github.com/aerialls/Plum) - A deployer library.
 
 ## Internationalisation and Localisation
-*Libraries for Internationalization (I18n) and Localization (L10n).
+*Libraries for Internationalization (I18n) and Localization (L10n).*
 
 * [Aura.Intl](https://github.com/auraphp/Aura.Intl)
 

From 3430a1f921cc4cfea49e63f8bae845a1f2b07cd9 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Mon, 1 Dec 2014 19:00:13 -0700
Subject: [PATCH 57/62] Added Pro Git book.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f352d6a..545c370 100644
--- a/README.md
+++ b/README.md
@@ -722,6 +722,7 @@ Various resources, such as books, websites and articles, for improving your PHP
 * [Elasticsearch: The Definitive Guide](http://www.elasticsearch.org/guide/) - A guide to working with Elasticsearch by Clinton Gormley and Zachary Tong.
 * [Eloquent JavaScript](http://eloquentjavascript.net/) - A book about JavaScript programming by Marijn Haverbeke.
 * [Vagrant Cookbook](https://leanpub.com/vagrantcookbook) A book about creating Vagrant environments by Erika Heidi.
+* [Pro Git](http://git-scm.com/book/en/v2) - A book about Git by Scott Chacon and Ben Straub.
 
 ## PHP Videos
 *Fantastic PHP-related videos.*

From 8cf7e6fa0eb03d0ddb805a3c19088ce0ecf51cb8 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Mon, 1 Dec 2014 19:05:10 -0700
Subject: [PATCH 58/62] Split out string and numbers into their own categories.

---
 README.md | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 545c370..1667ee6 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,8 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 	- [Command Line](#command-line)
 	- [Authentication](#authentication)
 	- [Markup](#markup)
-	- [Text and Numbers](#text-and-numbers)
+	- [Strings](#strings)
+	- [Numbers](#numbers)
 	- [Filtering and Validation](#filtering-and-validation)
 	- [REST and API](#rest-and-api)
 	- [Caching](#caching)
@@ -473,25 +474,29 @@ Libraries to help manage database schemas and migrations.
 * [Cebe Markdown](https://github.com/cebe/markdown) - An fast and extensible Markdown parser.
 * [HTML5 PHP](https://github.com/Masterminds/html5-php) - An HTML5 parser and serializer library.
 
-## Text and Numbers
-*Libraries for parsing and manipulating text and numbers.*
+## Strings
+*Libraries for parsing and manipulating strings.*
 
 * [ANSI to HTML5](https://github.com/sensiolabs/ansi-to-html) - An ANSI to HTML5 converter library.
 * [Patchwork UTF-8](https://github.com/nicolas-grekas/Patchwork-UTF8) - A portable library for working with UTF-8 strings.
 * [Hoa String](https://github.com/hoaproject/String) - Another UTF-8 string library.
 * [Stringy](https://github.com/danielstjules/Stringy) - A string manipulation library with multibyte support.
-* [Numbers PHP](https://github.com/powder96/numbers.php) - A library for working with numbers.
-* [Math](https://github.com/moontoast/math) - A library for working with large numbers.
 * [Color Jizz](https://github.com/mikeemoo/ColorJizz-PHP) - A library for manipulating and converting colours.
 * [UUID](https://github.com/ramsey/uuid) - A library for generating UUIDs.
 * [Slugify](https://github.com/cocur/slugify) - A library to convert strings to slugs.
 * [Urlify](https://github.com/jbroadway/urlify) - A PHP port of Django's URLify.js.
 * [Text](https://github.com/kzykhys/Text) - A text manipulation library.
+* [SQL Formatter](https://github.com/jdorn/sql-formatter/) - A library for formatting SQL statements.
+* [UA Parser](https://github.com/tobie/ua-parser/tree/master/php) - A library for parsing user agent strings.
+
+## Numbers
+*Libraries for working with numbers.*
+
+* [Numbers PHP](https://github.com/powder96/numbers.php) - A library for working with numbers.
+* [Math](https://github.com/moontoast/math) - A library for working with large numbers.
+* [ByteUnits](https://github.com/gabrielelana/byte-units) - A library to parse, format and convert byte units in binary and metric systems.
 * [PHP Units of Measure](https://github.com/triplepoint/php-units-of-measure) - A library for converting between units of measure.
 * [PHP Conversion](https://github.com/Crisu83/php-conversion) - Another library for converting between units of measure.
-* [SQL Formatter](https://github.com/jdorn/sql-formatter/) - A library for formatting SQL statements.
-* [ByteUnits](https://github.com/gabrielelana/byte-units) - A library to parse, format and convert byte units in binary and metric systems.
-* [UA Parser](https://github.com/tobie/ua-parser/tree/master/php) - A library for parsing user agent strings.
 * [LibPhoneNumber for PHP](https://github.com/giggsey/libphonenumber-for-php) - A PHP implementation of Google's phone number handling library.
 
 ## Filtering and Validation

From 07ba91bebcbab5f670ca7c390d0da796543acf0d Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Mon, 1 Dec 2014 19:08:44 -0700
Subject: [PATCH 59/62] Split out code analysis into new debugging category.

---
 README.md | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 1667ee6..ea9e423 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 	- [Documentation](#documentation)
 	- [Security](#security)
 	- [Code Analysis](#code-analysis)
+	- [Debugging](#debugging)
 	- [Build Tools](#build-tools)
 	- [Task Runners](#task-runners)
 	- [Navigation](#navigation)
@@ -281,7 +282,7 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 * [Zxcvbn PHP](https://github.com/bjeavons/zxcvbn-php) - A realistic PHP password strength estimate library based on Zxcvbn JS.
 
 ## Code Analysis
-*Libraries and tools for analysing, parsing and manipulation codebases.*
+*Libraries and tools for analysing, parsing and manipulating codebases.*
 
 * [PHP Parser](https://github.com/nikic/PHP-Parser) - A PHP parser written in PHP.
 * [PHPPHP](https://github.com/ircmaxell/PHPPHP) - A PHP VM implementation in PHP.
@@ -298,15 +299,19 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 * [UBench](https://github.com/devster/ubench) - A simple micro benchmark library.
 * [Athletic](https://github.com/polyfractal/athletic) - An annotation based benchmark framework.
 * [Mondrian](https://github.com/Trismegiste/Mondrian) - A code analysis tool using Graph Theory.
+* [Scrutinizer](https://scrutinizer-ci.com/) - A web tool to scrutinise PHP code.
+* [PHPLOC](https://github.com/sebastianbergmann/phploc) - A tool for quickly measuring the size of a PHP project.
+* [xHprof](https://github.com/phacility/xhprof) - Another profiling tool for PHP.
+* [PHPCheckstyle](https://github.com/jbrooksuk/phpcheckstyle) - A tool to help adhere to certain coding conventions.
+
+## Debugging
+*Libraries and tools for debugging code.*
+
+* [xDebug](https://github.com/xdebug/xdebug) - A debug and profile tool for PHP.
 * [PHP Debug Bar](http://phpdebugbar.com/) - A debugging toolbar.
 * [PHP Console](https://github.com/Seldaek/php-console) - A web debugging console.
 * [Barbushin PHP Console](https://github.com/barbushin/php-console) - Another web debugging console using Google Chrome.
 * [PHPDBG](http://phpdbg.com/) - An interactive PHP debugger.
-* [Scrutinizer](https://scrutinizer-ci.com/) - A web tool to scrutinise PHP code.
-* [PHPLOC](https://github.com/sebastianbergmann/phploc) - A tool for quickly measuring the size of a PHP project.
-* [xDebug](https://github.com/xdebug/xdebug) - A debug and profile tool for PHP.
-* [xHprof](https://github.com/phacility/xhprof) - Another profiling tool for PHP.
-* [PHPCheckstyle](https://github.com/jbrooksuk/phpcheckstyle) - A tool to help adhere to certain coding conventions.
 * [Tracy](https://github.com/nette/tracy) - A simple error detection, logging and time measuring library.
 
 ## Build Tools

From 1419f08921ad4ca292fca51f2fda6f8ceaed1023 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Mon, 1 Dec 2014 19:10:34 -0700
Subject: [PATCH 60/62] Renamed ORM and Datamapping category to database.

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ea9e423..cc3d7f0 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 	- [Logging](#logging)
 	- [E-commerce](#e-commerce)
 	- [PDF](#pdf)
-	- [ORM and Datamapping](#orm-and-datamapping)
+	- [Database](#database)
 	- [Migrations](#migrations)
 	- [NoSQL](#nosql)
 	- [Queue](#queue)
@@ -393,8 +393,8 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 * [Snappy](https://github.com/KnpLabs/snappy) - A PDF and image generation library.
 * [WKHTMLToPDF](https://github.com/antialize/wkhtmltopdf) - A tool to convert HTML to PDF.
 
-## ORM and Datamapping
-*Libraries that implement object-relational mapping or datamapping techniques.*
+## Database
+*Libraries for interacting with databases using object-relational mapping (ORM) or datamapping techniques.*
 
 * [Doctrine](http://www.doctrine-project.org/) - A comprehensive DBAL and ORM.
 * [Doctrine Extensions](https://github.com/l3pp4rd/DoctrineExtensions) - A collection of Doctrine behavioural extensions.

From d5103437db6816bdffae89206942d143a9cc2ed4 Mon Sep 17 00:00:00 2001
From: Jamie <ziadoz@gmail.com>
Date: Mon, 1 Dec 2014 19:12:26 -0700
Subject: [PATCH 61/62] Split out password libraries into a new category.

---
 README.md | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index cc3d7f0..194e977 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 	- [Continuous Integration](#continuous-integration)
 	- [Documentation](#documentation)
 	- [Security](#security)
+	- [Passwords](#passwords)
 	- [Code Analysis](#code-analysis)
 	- [Debugging](#debugging)
 	- [Build Tools](#build-tools)
@@ -267,11 +268,6 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 * [RandomLib](https://github.com/ircmaxell/RandomLib) - A library for generating random numbers and strings.
 * [True Random](https://github.com/pixeloution/true-random) - A library that generates random numbers using [www.random.org](http://www.random.org/).
 * [SecurityMultiTool](https://github.com/padraic/SecurityMultiTool) - A PHP security library.
-* [Password Compat](https://github.com/ircmaxell/password_compat) - A compatibility library for the new PHP 5.5 password functions.
-* [phpass](http://www.openwall.com/phpass/) - A portable password hashing framework.
-* [PHP Password Lib](https://github.com/ircmaxell/PHP-PasswordLib) - A library for generating and validating passwords.
-* [Password Policy](https://github.com/ircmaxell/password-policy) - A password policy library for PHP and JavaScript.
-* [Password Validator](https://github.com/jeremykendall/password-validator) - A library for validating and upgrading password hashes.
 * [PHPSecLib](http://phpseclib.sourceforge.net/) - A pure PHP secure communications library.
 * [TCrypto](https://github.com/timoh6/TCrypto) - A simple encrypted key-value storage library.
 * [PHP IDS](https://github.com/PHPIDS/PHPIDS) - A structured PHP security layer.
@@ -279,6 +275,15 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
 * [IniScan](https://github.com/psecio/iniscan) - A tool that scans PHP INI files for security.
 * [SensioLabs Security Check](https://security.sensiolabs.org/) - A web tool to check your Composer dependencies for security advisories.
 * [Zed](https://www.owasp.org/index.php/OWASP_Zed_Attack_Proxy_Project) - An integrated penetration testing tool for web applications.
+
+## Passwords
+*Libraries and tools for working with and storing passwords.*
+
+* [Password Compat](https://github.com/ircmaxell/password_compat) - A compatibility library for the new PHP 5.5 password functions.
+* [phpass](http://www.openwall.com/phpass/) - A portable password hashing framework.
+* [PHP Password Lib](https://github.com/ircmaxell/PHP-PasswordLib) - A library for generating and validating passwords.
+* [Password Policy](https://github.com/ircmaxell/password-policy) - A password policy library for PHP and JavaScript.
+* [Password Validator](https://github.com/jeremykendall/password-validator) - A library for validating and upgrading password hashes.
 * [Zxcvbn PHP](https://github.com/bjeavons/zxcvbn-php) - A realistic PHP password strength estimate library based on Zxcvbn JS.
 
 ## Code Analysis

From 0e7ac95aa9c4e167c0e4ca495a881f4752192711 Mon Sep 17 00:00:00 2001
From: Colin O'Dell <colinodell@gmail.com>
Date: Wed, 10 Dec 2014 21:38:27 -0500
Subject: [PATCH 62/62] Update link to CommonMark library

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 194e977..3af3ea3 100644
--- a/README.md
+++ b/README.md
@@ -477,7 +477,7 @@ Libraries to help manage database schemas and migrations.
 
 * [Decoda](http://milesj.me/code/php/decoda) - A lightweight markup parser library.
 * [PHP Markdown](https://github.com/michelf/php-markdown) - A Markdown parser.
-* [CommonMark PHP](https://github.com/colinodell/commonmark-php) - A Markdown parser which supports the full [CommonMark spec](https://jgm.github.io/stmd/spec.html).
+* [CommonMark PHP](https://github.com/thephpleague/commonmark) - A Markdown parser which supports the full [CommonMark spec](https://jgm.github.io/stmd/spec.html).
 * [Dflydev Markdown](https://github.com/dflydev/dflydev-markdown) - Another Markdown parser.
 * [Parsedown](https://github.com/erusev/parsedown) - Another Markdown parser.
 * [Ciconia](https://github.com/kzykhys/Ciconia) - Another Markdown parser that supports Github flavoured Markdown.