diff --git a/.travis.yml b/.travis.yml index b89a1e1..281f474 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_script: - phpenv rehash script: - - phpunit --coverage-clover /home/travis/build/joshtronic/pickles/build/logs/clover.xml + - phpunit --coverage-clover /home/travis/build/picklesphp/pickles/build/logs/clover.xml after_success: - php vendor/bin/coveralls --config ../.coveralls.yml -v diff --git a/README.md b/README.md index 3905f55..8d9c0fc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ # Pickles -[![Build Status](https://travis-ci.org/joshtronic/pickles.png?branch=master)](https://travis-ci.org/joshtronic/pickles) [![Coverage Status](https://coveralls.io/repos/joshtronic/pickles/badge.png)](https://coveralls.io/r/joshtronic/pickles) [![Dependency Status](https://www.versioneye.com/user/projects/52d1bc1eec13751bde00002a/badge.png)](https://www.versioneye.com/user/projects/52d1bc1eec13751bde00002a) -[![Stories in Ready](https://badge.waffle.io/joshtronic/pickles.png?label=ready&title=Ready)](https://waffle.io/joshtronic/pickles) +[![Build Status](https://travis-ci.org/picklesphp/pickles.png?branch=master)](https://travis-ci.org/picklesphp/pickles) +[![Coverage Status](https://coveralls.io/repos/picklesphp/pickles/badge.png)](https://coveralls.io/r/picklesphp/pickles) +[![Dependency Status](https://www.versioneye.com/user/projects/52d1bc1eec13751bde00002a/badge.png)](https://www.versioneye.com/user/projects/52d1bc1eec13751bde00002a) +[![Stories in Ready](https://badge.waffle.io/picklesphp/pickles.png?label=ready&title=Ready)](https://waffle.io/picklesphp/pickles) 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 @@ -23,7 +25,6 @@ acronym. [JustinDavis]: http://justindavis.co [HolidayAPI]: https://github.com/gravityblvd/tools.gravityblvd.com -[MasterZip]: https://github.com/joshtronic/pickles/archive/master.zip +[MasterZip]: https://github.com/picklesphp/pickles/archive/master.zip [StackPost]: http://joshtronic.com/2014/01/13/your-stack-is-outdated/#.UuVzI3n0A18 -[UPOZ]: https://github.com/krakjoe/uopz -[v13.12]: https://github.com/joshtronic/pickles/tree/13.12 +[v13.12]: https://github.com/picklesphp/pickles/tree/13.12 diff --git a/composer.json b/composer.json index dfc79fa..31156bc 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,9 @@ { - "name": "joshtronic/pickles", + "name": "picklesphp/pickles", "description": "The Pickles SOA Framework", "type": "library", "keywords": ["framework", "api", "soa", "oauth"], - "homepage": "https://github.com/joshtronic/pickles", + "homepage": "http://picklesphp.com", "license": "MIT", "authors": [ { @@ -13,8 +13,8 @@ } ], "support": { - "issues": "https://github.com/joshtronic/pickles/issues", - "source": "https://github.com/joshtronic/pickles" + "issues": "https://github.com/picklesphp/pickles/issues", + "source": "https://github.com/picklesphp/pickles" }, "minimum-stability" : "dev", "require-dev": { diff --git a/src/Auth.php b/src/Auth.php index 147c0a3..315f62f 100644 --- a/src/Auth.php +++ b/src/Auth.php @@ -1,9 +1,32 @@ * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; diff --git a/src/Cache.php b/src/Cache.php index 28a862b..ecb1fe6 100644 --- a/src/Cache.php +++ b/src/Cache.php @@ -1,18 +1,15 @@ * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; @@ -26,7 +23,7 @@ namespace Pickles; * don't entirely remember specifics, but the reason for not using Memcached() * was due to an unexplainable bug in the version in the repository for Ubuntu * 10.04 LTS. Memcached() does support more of the memcached protocol and will - * eventually be what PICKLES uses. Keys are forced to be uppercase for + * eventually be what Pickles uses. Keys are forced to be uppercase for * consistencies sake as I've been burned by the case sensitivity due to typos * in my code. * diff --git a/src/Config.php b/src/Config.php index 0d3f226..c32d87b 100644 --- a/src/Config.php +++ b/src/Config.php @@ -1,18 +1,15 @@ * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; @@ -23,7 +20,7 @@ namespace Pickles; * Handles loading the site's configuration file (if available). At the moment * this class is a very skewed Singleton. The plan is to eventually extend this * out to support multiple configuration files, and the ability to load in - * custom config files on the fly as well. The core of PICKLES uses the class + * custom config files on the fly as well. The core of Pickles uses the class * as a Singleton so we're not loading the configuration multiple times per * page load. */ diff --git a/src/Convert.php b/src/Convert.php index e46d22a..87e3c81 100644 --- a/src/Convert.php +++ b/src/Convert.php @@ -3,16 +3,13 @@ /** * Converter * - * PHP version 5 - * * Licensed under The MIT License * Redistribution of these files must retain the above copyright notice. * - * @author Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; diff --git a/src/Database.php b/src/Database.php index 9985df4..24f269c 100644 --- a/src/Database.php +++ b/src/Database.php @@ -1,18 +1,15 @@ * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles * @todo Drop driver, hardcode drivers based on the type * @todo More assumptions for the datasource variables */ diff --git a/src/Date.php b/src/Date.php index d38c75a..75af657 100644 --- a/src/Date.php +++ b/src/Date.php @@ -3,16 +3,13 @@ /** * Date Utility Collection * - * PHP version 5 - * * Licensed under The MIT License * Redistribution of these files must retain the above copyright notice. * - * @author Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; diff --git a/src/Distance.php b/src/Distance.php index 3c65b7e..11ff121 100644 --- a/src/Distance.php +++ b/src/Distance.php @@ -3,16 +3,13 @@ /** * Distance * - * PHP version 5 - * * Licensed under The MIT License * Redistribution of these files must retain the above copyright notice. * - * @author Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; diff --git a/src/File.php b/src/File.php index e04c596..4399b19 100644 --- a/src/File.php +++ b/src/File.php @@ -3,16 +3,13 @@ /** * File Utility Collection * - * PHP version 5 - * * Licensed under The MIT License * Redistribution of these files must retain the above copyright notice. * - * @author Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; diff --git a/src/Model.php b/src/Model.php index f001893..83e4adb 100644 --- a/src/Model.php +++ b/src/Model.php @@ -1,18 +1,15 @@ * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; @@ -20,9 +17,9 @@ namespace Pickles; /** * Model Class * - * This is a parent class that all PICKLES data models should be extending. When - * using the class as designed, objects will function as active record pattern - * objects. + * This is a parent class that all Pickles data models should be extending. + * When using the class as designed, objects will function as active record + * pattern objects. */ class Model extends Object { diff --git a/src/Number.php b/src/Number.php index 5b7bc8f..59c9929 100644 --- a/src/Number.php +++ b/src/Number.php @@ -3,16 +3,13 @@ /** * Number Utility Collection * - * PHP version 5 - * * Licensed under The MIT License * Redistribution of these files must retain the above copyright notice. * - * @author Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; diff --git a/src/Object.php b/src/Object.php index e9b9956..2ca484d 100644 --- a/src/Object.php +++ b/src/Object.php @@ -1,18 +1,15 @@ * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; @@ -20,7 +17,7 @@ namespace Pickles; /** * Object Class * - * Every instantiated class in PICKLES should be extending this class. By doing + * Every instantiated class in Pickles should be extending this class. By doing * so the class is automatically hooked into the profiler, and the object will * have access to some common components as well. */ diff --git a/src/Profiler.php b/src/Profiler.php index 3277fe2..184c8d4 100644 --- a/src/Profiler.php +++ b/src/Profiler.php @@ -3,16 +3,13 @@ /** * Profiler * - * PHP version 5 - * * Licensed under The MIT License * Redistribution of these files must retain the above copyright notice. * - * @author Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; diff --git a/src/Resource.php b/src/Resource.php index 91b21e5..a2a3520 100644 --- a/src/Resource.php +++ b/src/Resource.php @@ -1,18 +1,15 @@ * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; @@ -20,7 +17,7 @@ namespace Pickles; /** * Resource Class * - * This is a parent class that all PICKLES modules should be extending. Each + * This is a parent class that all Pickles modules should be extending. Each * module can specify it's own meta data and whether or not a user must be * properly authenticated to view the page. Currently any pages without a * template are treated as pages being requested via AJAX and the return will @@ -362,7 +359,7 @@ class Resource extends Object { http_response_code($this->status); header('Content-Type: application/json'); - header('X-Powered-By: Pickles v2 - https://github.com/joshtronic/pickles'); + header('X-Powered-By: Pickles v2 - https://picklesphp.com'); $meta = [ 'status' => $this->status, diff --git a/src/Router.php b/src/Router.php index 7630857..018e28d 100644 --- a/src/Router.php +++ b/src/Router.php @@ -1,18 +1,15 @@ * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; @@ -20,7 +17,7 @@ namespace Pickles; /** * Router Class * - * The heavy lifter of PICKLES, makes the calls to get the session and + * The heavy lifter of Pickles, makes the calls to get the session and * configuration loaded. Loads modules, serves up user authentication when the * module asks for it, and loads the viewer that the module requested. Default * values are present to make things easier on the user. diff --git a/src/Sort.php b/src/Sort.php index 92b9417..5c2a4d9 100644 --- a/src/Sort.php +++ b/src/Sort.php @@ -3,16 +3,13 @@ /** * Sorting Utility Collection * - * PHP version 5 - * * Licensed under The MIT License * Redistribution of these files must retain the above copyright notice. * - * @author Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; diff --git a/src/String.php b/src/String.php index 62ca630..518b308 100644 --- a/src/String.php +++ b/src/String.php @@ -3,16 +3,13 @@ /** * String Utility Collection * - * PHP version 5 - * * Licensed under The MIT License * Redistribution of these files must retain the above copyright notice. * - * @author Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles; diff --git a/src/Time.php b/src/Time.php index af7e4e7..a1a0bb9 100644 --- a/src/Time.php +++ b/src/Time.php @@ -3,16 +3,13 @@ /** * Time Utility Collection * - * PHP version 5 - * * Licensed under The MIT License * Redistribution of these files must retain the above copyright notice. * - * @author Josh Sherman * @copyright Copyright 2007-2014, Josh Sherman * @license http://www.opensource.org/licenses/mit-license.html - * @package PICKLES - * @link https://github.com/joshtronic/pickles + * @link http://picklesphp.com + * @package Pickles */ namespace Pickles;