From 3ab7b84a51a98b439111874482e91fdeff6626cf Mon Sep 17 00:00:00 2001 From: PJ Dietz Date: Thu, 10 Jan 2013 20:28:57 -0500 Subject: [PATCH] Remove ".inc" from filenames. --- Handler.inc.php => Handler.php | 4 ++-- Message.inc.php => Message.php | 0 Request.inc.php => Request.php | 6 +++--- Response.inc.php => Response.php | 2 +- Route.inc.php => Route.php | 0 Router.inc.php => Router.php | 6 +++--- composer.json | 2 +- exceptions/{CurlException.inc.php => CurlException.php} | 2 +- ...{WellrestedException.inc.php => WellrestedException.php} | 0 .../{ApiSampleRouter.inc.php => ApiSampleRouter.php} | 4 ++-- .../{ArticlesController.inc.php => ArticlesController.php} | 0 ...llectionHandler.inc.php => ArticleCollectionHandler.php} | 4 ++-- samples/apisample/handlers/ArticleItemHandler.inc.php | 4 ++-- samples/apisample/index.php | 2 +- samples/client-side-request-and-response.php | 4 ++-- samples/client-side-request.php | 2 +- samples/server-side-request-and-response.php | 4 ++-- samples/server-side-response.php | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) rename Handler.inc.php => Handler.php (97%) rename Message.inc.php => Message.php (100%) rename Request.inc.php => Request.php (98%) rename Response.inc.php => Response.php (99%) rename Route.inc.php => Route.php (100%) rename Router.inc.php => Router.php (91%) rename exceptions/{CurlException.inc.php => CurlException.php} (79%) rename exceptions/{WellrestedException.inc.php => WellrestedException.php} (100%) rename samples/apisample/{ApiSampleRouter.inc.php => ApiSampleRouter.php} (91%) rename samples/apisample/{ArticlesController.inc.php => ArticlesController.php} (100%) rename samples/apisample/handlers/{ArticleCollectionHandler.inc.php => ArticleCollectionHandler.php} (96%) diff --git a/Handler.inc.php b/Handler.php similarity index 97% rename from Handler.inc.php rename to Handler.php index 92830af..c31969b 100644 --- a/Handler.inc.php +++ b/Handler.php @@ -2,8 +2,8 @@ namespace pjdietz\WellRESTed; -require_once(dirname(__FILE__) . '/Request.inc.php'); -require_once(dirname(__FILE__) . '/Response.inc.php'); +require_once(dirname(__FILE__) . '/Request.php'); +require_once(dirname(__FILE__) . '/Response.php'); /******************************************************************************* * Handler diff --git a/Message.inc.php b/Message.php similarity index 100% rename from Message.inc.php rename to Message.php diff --git a/Request.inc.php b/Request.php similarity index 98% rename from Request.inc.php rename to Request.php index eb3b219..b136228 100644 --- a/Request.inc.php +++ b/Request.php @@ -2,9 +2,9 @@ namespace pjdietz\WellRESTed; -require_once(dirname(__FILE__) . '/Message.inc.php'); -require_once(dirname(__FILE__) . '/Response.inc.php'); -require_once(dirname(__FILE__) . '/exceptions/CurlException.inc.php'); +require_once(dirname(__FILE__) . '/Message.php'); +require_once(dirname(__FILE__) . '/Response.php'); +require_once(dirname(__FILE__) . '/exceptions/CurlException.php'); // TODO: Include port in the URI diff --git a/Response.inc.php b/Response.php similarity index 99% rename from Response.inc.php rename to Response.php index 90de57e..74ac244 100644 --- a/Response.inc.php +++ b/Response.php @@ -2,7 +2,7 @@ namespace pjdietz\WellRESTed; -require_once(dirname(__FILE__) . '/Message.inc.php'); +require_once(dirname(__FILE__) . '/Message.php'); /******************************************************************************* * Response diff --git a/Route.inc.php b/Route.php similarity index 100% rename from Route.inc.php rename to Route.php diff --git a/Router.inc.php b/Router.php similarity index 91% rename from Router.inc.php rename to Router.php index a1686de..4304737 100644 --- a/Router.inc.php +++ b/Router.php @@ -2,9 +2,9 @@ namespace pjdietz\WellRESTed; -require_once(dirname(__FILE__) . '/Request.inc.php'); -require_once(dirname(__FILE__) . '/Response.inc.php'); -require_once(dirname(__FILE__) . '/Route.inc.php'); +require_once(dirname(__FILE__) . '/Request.php'); +require_once(dirname(__FILE__) . '/Response.php'); +require_once(dirname(__FILE__) . '/Route.php'); /******************************************************************************* * Router diff --git a/composer.json b/composer.json index 382d909..bd9cb41 100644 --- a/composer.json +++ b/composer.json @@ -14,6 +14,6 @@ "php": ">=5.3.0" }, "autoload": { - "psr-0": { "pjdietz/WellRESTed": "" } + "psr-0": { "pjdietz\\WellRESTed": "./" } } } diff --git a/exceptions/CurlException.inc.php b/exceptions/CurlException.php similarity index 79% rename from exceptions/CurlException.inc.php rename to exceptions/CurlException.php index 7a06590..3413e34 100644 --- a/exceptions/CurlException.inc.php +++ b/exceptions/CurlException.php @@ -2,7 +2,7 @@ namespace pjdietz\WellRESTed\exceptions; -require_once(dirname(__FILE__) . '/WellrestedException.inc.php'); +require_once(dirname(__FILE__) . '/WellrestedException.php'); /** * Exception related to a cURL operation. The message and code should correspond diff --git a/exceptions/WellrestedException.inc.php b/exceptions/WellrestedException.php similarity index 100% rename from exceptions/WellrestedException.inc.php rename to exceptions/WellrestedException.php diff --git a/samples/apisample/ApiSampleRouter.inc.php b/samples/apisample/ApiSampleRouter.php similarity index 91% rename from samples/apisample/ApiSampleRouter.inc.php rename to samples/apisample/ApiSampleRouter.php index 0a0caee..c4abc93 100644 --- a/samples/apisample/ApiSampleRouter.inc.php +++ b/samples/apisample/ApiSampleRouter.php @@ -6,7 +6,7 @@ use pjdietz\WellRESTed\Router; use pjdietz\WellRESTed\Route; -require_once(dirname(__FILE__) . '/../../Router.inc.php'); +require_once(dirname(__FILE__) . '/../../Router.php'); /** * Loads and instantiates handlers based on URI. @@ -19,7 +19,7 @@ class ApiSampleRouter extends Router { $this->addTemplate('/articles/', 'ArticleCollectionHandler', - 'ArticleCollectionHandler.inc.php'); + 'ArticleCollectionHandler.php'); $this->addTemplate('/articles/{id}', 'ArticleItemHandler', diff --git a/samples/apisample/ArticlesController.inc.php b/samples/apisample/ArticlesController.php similarity index 100% rename from samples/apisample/ArticlesController.inc.php rename to samples/apisample/ArticlesController.php diff --git a/samples/apisample/handlers/ArticleCollectionHandler.inc.php b/samples/apisample/handlers/ArticleCollectionHandler.php similarity index 96% rename from samples/apisample/handlers/ArticleCollectionHandler.inc.php rename to samples/apisample/handlers/ArticleCollectionHandler.php index f005545..b0c0597 100644 --- a/samples/apisample/handlers/ArticleCollectionHandler.inc.php +++ b/samples/apisample/handlers/ArticleCollectionHandler.php @@ -2,8 +2,8 @@ namespace apisample\handlers; -require_once(dirname(__FILE__) . '/../../../Handler.inc.php'); -require_once(dirname(__FILE__) . '/../ArticlesController.inc.php'); +require_once(dirname(__FILE__) . '/../../../Handler.php'); +require_once(dirname(__FILE__) . '/../ArticlesController.php'); /** * Handler class for a list of articles. diff --git a/samples/apisample/handlers/ArticleItemHandler.inc.php b/samples/apisample/handlers/ArticleItemHandler.inc.php index 85bcce2..3bb5300 100644 --- a/samples/apisample/handlers/ArticleItemHandler.inc.php +++ b/samples/apisample/handlers/ArticleItemHandler.inc.php @@ -2,8 +2,8 @@ namespace apisample\handlers; -require_once(dirname(__FILE__) . '/../../../Handler.inc.php'); -require_once(dirname(__FILE__) . '/../ArticlesController.inc.php'); +require_once(dirname(__FILE__) . '/../../../Handler.php'); +require_once(dirname(__FILE__) . '/../ArticlesController.php'); /** * Handler class for one specific article. diff --git a/samples/apisample/index.php b/samples/apisample/index.php index 0ea501f..d8d6239 100644 --- a/samples/apisample/index.php +++ b/samples/apisample/index.php @@ -1,6 +1,6 @@ getResponse(); diff --git a/samples/client-side-request-and-response.php b/samples/client-side-request-and-response.php index 294e203..4acc3ff 100644 --- a/samples/client-side-request-and-response.php +++ b/samples/client-side-request-and-response.php @@ -10,8 +10,8 @@ */ // Include the Well RESTed Request and Response class files. -require_once('../Request.inc.php'); -require_once('../Response.inc.php'); +require_once('../Request.php'); +require_once('../Response.php'); // Make a custom request to talk to the server. $rqst = new \pjdietz\WellRESTed\Request(); diff --git a/samples/client-side-request.php b/samples/client-side-request.php index 822d15a..ed566f1 100644 --- a/samples/client-side-request.php +++ b/samples/client-side-request.php @@ -5,7 +5,7 @@ */ // Include the Well RESTed Request and Response class files. -require_once('../Request.inc.php'); +require_once('../Request.php'); // Make a requst to Google in one line: $rqst = new \pjdietz\WellRESTed\Request(); diff --git a/samples/server-side-request-and-response.php b/samples/server-side-request-and-response.php index 6c90013..418a924 100644 --- a/samples/server-side-request-and-response.php +++ b/samples/server-side-request-and-response.php @@ -8,8 +8,8 @@ */ // Include the Well RESTed Request and Response class files. -require_once('../Request.inc.php'); -require_once('../Response.inc.php'); +require_once('../Request.php'); +require_once('../Response.php'); // Read the request sent to the server as the singleton instance. $rqst = \pjdietz\WellRESTed\Request::getRequest(); diff --git a/samples/server-side-response.php b/samples/server-side-response.php index 446bbd5..e9fe389 100644 --- a/samples/server-side-response.php +++ b/samples/server-side-response.php @@ -4,7 +4,7 @@ * Create and output a response from the server. */ -require_once('../Response.inc.php'); +require_once('../Response.php'); // Create a new Response instance. $resp = new \pjdietz\WellRESTed\Response();