joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' of git://github.com/picklesphp/pickles into 2.0

Browse source
This commit is contained in:
Josh Sherman 2014-10-16 21:12:00 -04:00
commit b5b7cacc28
19 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -33,7 +33,7 @@ before_script:
- phpenv rehash - phpenv rehash
script: script:
- phpunit --coverage-clover /home/travis/build/picklesphp/pickles/build/logs/clover.xml - phpunit --coverage-clover /home/travis/build/joshtronic/pickles/build/logs/clover.xml
after_success: after_success:
- php vendor/bin/coveralls --config ../.coveralls.yml -v - php vendor/bin/coveralls --config ../.coveralls.yml -v

14
README.md
View file

@ -1,9 +1,9 @@
# Pickles # Pickles
[![License](http://img.shields.io/packagist/l/picklesphp/pickles.svg?style=flat)][packagist] [![License](http://img.shields.io/packagist/l/joshtronic/pickles.svg?style=flat)][packagist]
[![Build](http://img.shields.io/travis/picklesphp/pickles.svg?style=flat)][travis] [![Build](http://img.shields.io/travis/joshtronic/pickles.svg?style=flat)][travis]
[![Coverage](http://img.shields.io/coveralls/picklesphp/pickles.svg?style=flat)][coveralls] [![Coverage](http://img.shields.io/coveralls/joshtronic/pickles.svg?style=flat)][coveralls]
[![Downloads](http://img.shields.io/packagist/dt/picklesphp/pickles.svg?style=flat)][packagist] [![Downloads](http://img.shields.io/packagist/dt/joshtronic/pickles.svg?style=flat)][packagist]
Pickles f/k/a PICKLES (PHP Interface Collection of Killer Libraries to Enhance Pickles f/k/a PICKLES (PHP Interface Collection of Killer Libraries to Enhance
Stuff) is an open source framework for the rapid development of RESTful Stuff) is an open source framework for the rapid development of RESTful
@ -20,9 +20,9 @@ contributor, [Justin Davis][JustinDavis] for romanticizing the v2 reimagining
and [Dean Jones][DeanJones] for helping to come up with the original PICKLES v1 and [Dean Jones][DeanJones] for helping to come up with the original PICKLES v1
acronym. acronym.
[coveralls]: https://coveralls.io/r/picklesphp/pickles [coveralls]: https://coveralls.io/r/joshtronic/pickles
[packagist]: https://packagist.org/packages/picklesphp/pickles [packagist]: https://packagist.org/packages/joshtronic/pickles
[travis]: http://travis-ci.org/picklesphp/pickles [travis]: http://travis-ci.org/joshtronic/pickles
[DeanJones]: https://github.com/deanproxy [DeanJones]: https://github.com/deanproxy
[GeoffOliver]: https://github.com/geoffoliver [GeoffOliver]: https://github.com/geoffoliver
[JustinDavis]: http://justindavis.co [JustinDavis]: http://justindavis.co

6
composer.json
View file

@ -1,5 +1,5 @@
{ {
"name": "picklesphp/pickles", "name": "joshtronic/pickles",
"description": "Pickles is a PHP framework for building kick-ass services", "description": "Pickles is a PHP framework for building kick-ass services",
"type": "library", "type": "library",
"keywords": ["framework", "api", "soa", "oauth"], "keywords": ["framework", "api", "soa", "oauth"],
@ -13,8 +13,8 @@
} }
], ],
"support": { "support": {
"issues": "https://github.com/picklesphp/pickles/issues", "issues": "https://github.com/joshtronic/pickles/issues",
"source": "https://github.com/picklesphp/pickles" "source": "https://github.com/joshtronic/pickles"
}, },
"minimum-stability" : "dev", "minimum-stability" : "dev",
"require-dev": { "require-dev": {

2
src/Browser.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Cache.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Config.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Convert.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Database.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
* @todo Drop driver, hardcode drivers based on the type * @todo Drop driver, hardcode drivers based on the type
* @todo More assumptions for the datasource variables * @todo More assumptions for the datasource variables

2
src/Distance.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/File.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Model.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Number.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Object.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Profiler.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Resource.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Router.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Sort.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/String.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */

2
src/Time.php
View file

@ -8,7 +8,7 @@
* *
* @copyright Copyright 2007-2014, Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html * @license http://www.opensource.org/licenses/mit-license.html
* @link http://picklesphp.com * @link https://github.com/joshtronic/pickles
* @package Pickles * @package Pickles
*/ */