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

Merge branch 'master' into 2.0

Browse source 
Conflicts:
	composer.json
This commit is contained in:
Josh Sherman 2014-10-16 10:40:52 -04:00
commit 59af055f7e
18 changed files with 20 additions and 20 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

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
*/ */