Merge branch 'master' of git://github.com/Pawka/awesome-php into Pawka-master

Conflicts:
	README.md
This commit is contained in:
Jamie 2013-12-30 16:46:37 -07:00
commit 43a8fcaa32

View File

@ -9,6 +9,7 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
- [Micro Frameworks](#micro-frameworks) - [Micro Frameworks](#micro-frameworks)
- [Content Management Systems](#content-management-systems) - [Content Management Systems](#content-management-systems)
- [Templating](#templating) - [Templating](#templating)
- [Static Site Generators](#static-site-generators)
- [HTTP](#http) - [HTTP](#http)
- [URL](#url) - [URL](#url)
- [Email](#email) - [Email](#email)
@ -117,7 +118,12 @@ A curated list of amazingly awesome PHP libraries, resources and shiny things.
* [MtHaml](https://github.com/arnaud-lb/MtHaml) - A PHP implementation of the HAML template language. * [MtHaml](https://github.com/arnaud-lb/MtHaml) - A PHP implementation of the HAML template language.
* [Plates](http://platesphp.com/) - A native PHP templating library. * [Plates](http://platesphp.com/) - A native PHP templating library.
* [Lex](https://github.com/pyrocms/lex) - A lightweight template parser. * [Lex](https://github.com/pyrocms/lex) - A lightweight template parser.
* [Sculpin](http://symfony.com/projects/sculpin) - A library that converts Markdown and Twig into static HTML.
## Static Site Generators
*Tools for pre-processing content to generate web pages.*
* [Sculpin](http://sculpin.io) - A tool that converts Markdown and Twig into static HTML.
* [Phrozn](http://phrozn.info) - Another tool that converts Textile, Markdown and Twig into HTML.
## HTTP ## HTTP
*Libraries for working with HTTP and scraping websites.* *Libraries for working with HTTP and scraping websites.*
@ -616,4 +622,4 @@ Various resources, such as books, websites and articles, for improving your PHP
* 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. * 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 # Contributing
Please see [CONTRIBUTING](https://github.com/php-loep/Plates/blob/master/CONTRIBUTING.md) for details. Please see [CONTRIBUTING](https://github.com/php-loep/Plates/blob/master/CONTRIBUTING.md) for details.