Merge branch 'master' into 2.0

Conflicts: composer.json
2014-10-16 10:40:52 -04:00 · 2014-10-16 10:40:52 -04:00 · 59af055f7e
commit 59af055f7e
parent ba2729cb7f c824d3d5e6
18 changed files with 20 additions and 20 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -33,7 +33,7 @@ before_script:
  - phpenv rehash

 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:
  - php vendor/bin/coveralls --config ../.coveralls.yml -v
--- a/composer.json
+++ b/composer.json
@ -1,5 +1,5 @@
 {
-    "name": "picklesphp/pickles",
+    "name": "joshtronic/pickles",
    "description": "Pickles is a PHP framework for building kick-ass services",
    "type": "library",
    "keywords": ["framework", "api", "soa", "oauth"],
@ -13,8 +13,8 @@
        }
    ],
    "support": {
-        "issues": "https://github.com/picklesphp/pickles/issues",
-        "source": "https://github.com/picklesphp/pickles"
+        "issues": "https://github.com/joshtronic/pickles/issues",
+        "source": "https://github.com/joshtronic/pickles"
    },
    "minimum-stability" : "dev",
    "require-dev": {
--- a/src/Browser.php
+++ b/src/Browser.php
@ -8,7 +8,7 @@
 *
 * @copyright Copyright 2007-2014, Josh Sherman
 * @license   http://www.opensource.org/licenses/mit-license.html
- * @link      http://picklesphp.com
+ * @link      https://github.com/joshtronic/pickles
 * @package   Pickles
 */

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

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

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

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

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

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

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

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

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

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

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

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

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

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