From adae3ba468afc04d2cbbe54a208b08214c5757ad Mon Sep 17 00:00:00 2001 From: Joshua Sherman Date: Mon, 20 Jan 2014 23:20:43 -0500 Subject: [PATCH] Moved pickles code to src/ --- {classes => src/classes}/API/AYAH.php | 0 {classes => src/classes}/API/Google/Profanity.php | 0 {classes => src/classes}/API/Gravatar.php | 0 {classes => src/classes}/Browser.php | 0 {classes => src/classes}/Cache.php | 0 {classes => src/classes}/Config.php | 0 {classes => src/classes}/Controller.php | 0 {classes => src/classes}/Convert.php | 0 {classes => src/classes}/Database.php | 0 {classes => src/classes}/Date.php | 0 {classes => src/classes}/Display.php | 0 {classes => src/classes}/Distance.php | 0 {classes => src/classes}/Dynamic.php | 0 {classes => src/classes}/File.php | 0 {classes => src/classes}/Form.php | 0 {classes => src/classes}/HTML.php | 0 {classes => src/classes}/Log.php | 0 {classes => src/classes}/Model.php | 0 {classes => src/classes}/Module.php | 0 {classes => src/classes}/Number.php | 0 {classes => src/classes}/Object.php | 0 {classes => src/classes}/Profiler.php | 0 {classes => src/classes}/Security.php | 0 {classes => src/classes}/Session.php | 0 {classes => src/classes}/Sort.php | 0 {classes => src/classes}/String.php | 0 {classes => src/classes}/Time.php | 0 {classes => src/classes}/Validate.php | 0 pickles.php => src/pickles.php | 2 +- tests/bootstrap.php | 2 +- 30 files changed, 2 insertions(+), 2 deletions(-) rename {classes => src/classes}/API/AYAH.php (100%) rename {classes => src/classes}/API/Google/Profanity.php (100%) rename {classes => src/classes}/API/Gravatar.php (100%) rename {classes => src/classes}/Browser.php (100%) rename {classes => src/classes}/Cache.php (100%) rename {classes => src/classes}/Config.php (100%) rename {classes => src/classes}/Controller.php (100%) rename {classes => src/classes}/Convert.php (100%) rename {classes => src/classes}/Database.php (100%) rename {classes => src/classes}/Date.php (100%) rename {classes => src/classes}/Display.php (100%) rename {classes => src/classes}/Distance.php (100%) rename {classes => src/classes}/Dynamic.php (100%) rename {classes => src/classes}/File.php (100%) rename {classes => src/classes}/Form.php (100%) rename {classes => src/classes}/HTML.php (100%) rename {classes => src/classes}/Log.php (100%) rename {classes => src/classes}/Model.php (100%) rename {classes => src/classes}/Module.php (100%) rename {classes => src/classes}/Number.php (100%) rename {classes => src/classes}/Object.php (100%) rename {classes => src/classes}/Profiler.php (100%) rename {classes => src/classes}/Security.php (100%) rename {classes => src/classes}/Session.php (100%) rename {classes => src/classes}/Sort.php (100%) rename {classes => src/classes}/String.php (100%) rename {classes => src/classes}/Time.php (100%) rename {classes => src/classes}/Validate.php (100%) rename pickles.php => src/pickles.php (98%) diff --git a/classes/API/AYAH.php b/src/classes/API/AYAH.php similarity index 100% rename from classes/API/AYAH.php rename to src/classes/API/AYAH.php diff --git a/classes/API/Google/Profanity.php b/src/classes/API/Google/Profanity.php similarity index 100% rename from classes/API/Google/Profanity.php rename to src/classes/API/Google/Profanity.php diff --git a/classes/API/Gravatar.php b/src/classes/API/Gravatar.php similarity index 100% rename from classes/API/Gravatar.php rename to src/classes/API/Gravatar.php diff --git a/classes/Browser.php b/src/classes/Browser.php similarity index 100% rename from classes/Browser.php rename to src/classes/Browser.php diff --git a/classes/Cache.php b/src/classes/Cache.php similarity index 100% rename from classes/Cache.php rename to src/classes/Cache.php diff --git a/classes/Config.php b/src/classes/Config.php similarity index 100% rename from classes/Config.php rename to src/classes/Config.php diff --git a/classes/Controller.php b/src/classes/Controller.php similarity index 100% rename from classes/Controller.php rename to src/classes/Controller.php diff --git a/classes/Convert.php b/src/classes/Convert.php similarity index 100% rename from classes/Convert.php rename to src/classes/Convert.php diff --git a/classes/Database.php b/src/classes/Database.php similarity index 100% rename from classes/Database.php rename to src/classes/Database.php diff --git a/classes/Date.php b/src/classes/Date.php similarity index 100% rename from classes/Date.php rename to src/classes/Date.php diff --git a/classes/Display.php b/src/classes/Display.php similarity index 100% rename from classes/Display.php rename to src/classes/Display.php diff --git a/classes/Distance.php b/src/classes/Distance.php similarity index 100% rename from classes/Distance.php rename to src/classes/Distance.php diff --git a/classes/Dynamic.php b/src/classes/Dynamic.php similarity index 100% rename from classes/Dynamic.php rename to src/classes/Dynamic.php diff --git a/classes/File.php b/src/classes/File.php similarity index 100% rename from classes/File.php rename to src/classes/File.php diff --git a/classes/Form.php b/src/classes/Form.php similarity index 100% rename from classes/Form.php rename to src/classes/Form.php diff --git a/classes/HTML.php b/src/classes/HTML.php similarity index 100% rename from classes/HTML.php rename to src/classes/HTML.php diff --git a/classes/Log.php b/src/classes/Log.php similarity index 100% rename from classes/Log.php rename to src/classes/Log.php diff --git a/classes/Model.php b/src/classes/Model.php similarity index 100% rename from classes/Model.php rename to src/classes/Model.php diff --git a/classes/Module.php b/src/classes/Module.php similarity index 100% rename from classes/Module.php rename to src/classes/Module.php diff --git a/classes/Number.php b/src/classes/Number.php similarity index 100% rename from classes/Number.php rename to src/classes/Number.php diff --git a/classes/Object.php b/src/classes/Object.php similarity index 100% rename from classes/Object.php rename to src/classes/Object.php diff --git a/classes/Profiler.php b/src/classes/Profiler.php similarity index 100% rename from classes/Profiler.php rename to src/classes/Profiler.php diff --git a/classes/Security.php b/src/classes/Security.php similarity index 100% rename from classes/Security.php rename to src/classes/Security.php diff --git a/classes/Session.php b/src/classes/Session.php similarity index 100% rename from classes/Session.php rename to src/classes/Session.php diff --git a/classes/Sort.php b/src/classes/Sort.php similarity index 100% rename from classes/Sort.php rename to src/classes/Sort.php diff --git a/classes/String.php b/src/classes/String.php similarity index 100% rename from classes/String.php rename to src/classes/String.php diff --git a/classes/Time.php b/src/classes/Time.php similarity index 100% rename from classes/Time.php rename to src/classes/Time.php diff --git a/classes/Validate.php b/src/classes/Validate.php similarity index 100% rename from classes/Validate.php rename to src/classes/Validate.php diff --git a/pickles.php b/src/pickles.php similarity index 98% rename from pickles.php rename to src/pickles.php index c1ab13d..56dcc1d 100644 --- a/pickles.php +++ b/src/pickles.php @@ -124,7 +124,7 @@ $config = Config::getInstance(); $config->data['pickles']['path'] = dirname(__FILE__) . '/'; // Requires the Composer autoloader -require_once $config->pickles['path'] . 'vendor/autoload.php'; +require_once $config->pickles['path'] . '../vendor/autoload.php'; // Configures any available PHP configuration options if (is_array($config->php) && count($config->php)) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 882ea32..45244f9 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -24,7 +24,7 @@ if (!defined('SITE_PATH')) define('SITE_PATH', org\bovigo\vfs\vfsStream::url('site/')); } -require_once 'pickles.php'; +require_once 'src/pickles.php'; if (!file_exists(SITE_MODULE_PATH)) {