diff --git a/.gitignore b/.gitignore
index 63e81c5b..a140e92f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,17 @@
.idea
vendor/
composer.phar
-config.php
.DS_Store
.settings/
.project
.buildpath
-.htaccess
-PHPCI/config.yml
+app/config.yml
cache
/loggerconfig.php
/pluginconfig.php
-PHPCI/Model/Migration.php
-PHPCI/Model/Base/MigrationBase.php
-PHPCI/Store/MigrationStore.php
-PHPCI/Store/Base/MigrationStoreBase.php
+src/PHPCI/Model/Migration.php
+src/PHPCI/Model/Base/MigrationBase.php
+src/PHPCI/Store/MigrationStore.php
+src/PHPCI/Store/Base/MigrationStoreBase.php
local_vars.php
-Tests/PHPCI/config.yml
+tests/PHPCI/config.yml
diff --git a/B8Framework/b8/Cache/ApcCache.php b/B8Framework/b8/Cache/ApcCache.php
deleted file mode 100755
index 8dcb91a1..00000000
--- a/B8Framework/b8/Cache/ApcCache.php
+++ /dev/null
@@ -1,115 +0,0 @@
-isEnabled()) {
- return $default;
- }
-
- $success = false;
- $rtn = apc_fetch($key, $success);
-
- if (!$success) {
- $rtn = $default;
- }
-
- return $rtn;
- }
-
- /**
- * Add an item to the cache:
- */
- public function set($key, $value = null, $ttl = 0)
- {
- if (!$this->isEnabled()) {
- return false;
- }
-
- return apc_store($key, $value, $ttl);
- }
-
- /**
- * Remove an item from the cache:
- */
- public function delete($key)
- {
- if (!$this->isEnabled()) {
- return false;
- }
-
- return apc_delete($key);
- }
-
- /**
- * Check if an item is in the cache:
- */
- public function contains($key)
- {
- if (!$this->isEnabled()) {
- return false;
- }
-
- return apc_exists($key);
- }
-
- /**
- * Short-hand syntax for get()
- * @see Config::get()
- */
- public function __get($key)
- {
- return $this->get($key, null);
- }
-
- /**
- * Short-hand syntax for set()
- * @see Config::set()
- */
- public function __set($key, $value = null)
- {
- return $this->set($key, $value);
- }
-
- /**
- * Is set
- */
- public function __isset($key)
- {
- return $this->contains($key);
- }
-
- /**
- * Unset
- */
- public function __unset($key)
- {
- $this->delete($key);
- }
-}
\ No newline at end of file
diff --git a/B8Framework/b8/Registry.php b/B8Framework/b8/Registry.php
deleted file mode 100755
index 812c8eb7..00000000
--- a/B8Framework/b8/Registry.php
+++ /dev/null
@@ -1,87 +0,0 @@
-config = $config;
- $this->request = $request;
-
- self::$instance = $this;
- }
-
- public function get($key, $default = null)
- {
- return $this->config->get($key, $default);
- }
-
- public function set($key, $value)
- {
- return $this->config->set($key, $value);
- }
-
- public function setArray($array)
- {
- return $this->config->set($array);
- }
-
- public function getParams()
- {
- return $this->request->getParams();
- }
-
- public function getParam($key, $default)
- {
- return $this->request->getParam($key, $default);
- }
-
- public function setParam($key, $value)
- {
- return $this->request->setParam($key, $value);
- }
-
- public function unsetParam($key)
- {
- return $this->request->unsetParam($key);
- }
-}
\ No newline at end of file
diff --git a/B8Framework/tests/DatabaseTest.php b/B8Framework/tests/DatabaseTest.php
deleted file mode 100755
index e60e815b..00000000
--- a/B8Framework/tests/DatabaseTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-_name, $this->_user, $this->_pass);
- \b8\Database::setReadServers(array($this->_host));
-
- $connection = \b8\Database::getConnection('read');
-
- $this->assertInstanceOf('\b8\Database', $connection);
- }
-
- public function testGetWriteConnection()
- {
- \b8\Database::setDetails($this->_name, $this->_user, $this->_pass);
- \b8\Database::setWriteServers(array($this->_host));
-
- $connection = \b8\Database::getConnection('write');
-
- $this->assertInstanceOf('\b8\Database', $connection);
- }
-
- public function testGetDetails()
- {
- \b8\Database::setDetails($this->_name, $this->_user, $this->_pass);
- \b8\Database::setReadServers(array('localhost'));
-
- $details = \b8\Database::getConnection('read')->getDetails();
- $this->assertTrue(is_array($details));
- $this->assertTrue(($details['db'] == $this->_name));
- $this->assertTrue(($details['user'] == $this->_user));
- $this->assertTrue(($details['pass'] == $this->_pass));
- }
-
- /**
- * @expectedException \Exception
- */
- public function testConnectionFailure()
- {
- \b8\Database::setDetails('non_existant', 'invalid_user', 'incorrect_password');
- \b8\Database::setReadServers(array('localhost'));
- \b8\Database::getConnection('read');
- }
-}
\ No newline at end of file
diff --git a/B8Framework/tests/RegistryTest.php b/B8Framework/tests/RegistryTest.php
deleted file mode 100755
index 97abecea..00000000
--- a/B8Framework/tests/RegistryTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-set('test', true);
-
- $instance2 = Registry::getInstance();
- $this->assertTrue($instance2->get('test', false));
- }
-
- public function testStoreAndRetrieve()
- {
- Registry::forceReset();
- $r = Registry::getInstance();
- $r->set('test', 'cat');
-
- $this->assertTrue($r->get('test', 'dog') == 'cat');
- }
-
- public function testSetArray()
- {
- Registry::forceReset();
- $r = Registry::getInstance();
- $r->set('one', 'two');
- $r->setArray(array('test' => 'cat'));
-
- $this->assertTrue($r->get('test', 'dog') == 'cat');
- $this->assertTrue($r->get('one', 'three') == 'two');
- }
-
- public function testGetNonExistent()
- {
- Registry::forceReset();
- $r = Registry::getInstance();
- $this->assertTrue(!$r->get('cat', false));
- }
-
- public function testGetParams()
- {
- Registry::forceReset();
-
- $_REQUEST = array();
- $_REQUEST['cat'] = 'dog';
- $_SERVER['REQUEST_METHOD'] = 'GET';
-
- $r = Registry::getInstance();
- $params = $r->getParams();
- $this->assertTrue(is_array($params));
- $this->assertArrayHasKey('cat', $params);
- $this->assertArrayNotHasKey('dog', $params);
- }
-
- public function testEmptyInput()
- {
- Registry::forceReset();
- $r = Registry::getInstance();
- $params = $r->getParams();
-
- $this->assertTrue(is_array($params));
- $this->assertTrue(!count($params));
- }
-
- public function testGetSetUnsetParam()
- {
- Registry::forceReset();
- $r = Registry::getInstance();
- $this->assertTrue($r->getParam('cat', false) == false);
- $r->setParam('cat', 'dog');
-
- $this->assertTrue($r->getParam('cat', false) == 'dog');
-
- $r->unsetParam('cat');
- $this->assertTrue($r->getParam('cat', false) == false);
- }
-}
\ No newline at end of file
diff --git a/Tests/temp/.gitignore b/Tests/temp/.gitignore
deleted file mode 100644
index d6b7ef32..00000000
--- a/Tests/temp/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/B8Framework/tests/data/generation/models/ignore.file b/app/.gitkeep
old mode 100755
new mode 100644
similarity index 100%
rename from B8Framework/tests/data/generation/models/ignore.file
rename to app/.gitkeep
diff --git a/bootstrap.php b/bootstrap.php
index ebecad81..5fe9c8ed 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -15,7 +15,7 @@ if (empty($timezone)) {
date_default_timezone_set('UTC');
}
-$configFile = dirname(__FILE__) . '/PHPCI/config.yml';
+$configFile = dirname(__FILE__) . '/app/config.yml';
$configEnv = getenv('phpci_config_file');
$usingCustomConfigFile = false;
@@ -54,7 +54,7 @@ if (defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) {
$conf = array();
$conf['b8']['app']['namespace'] = 'PHPCI';
$conf['b8']['app']['default_controller'] = 'Home';
-$conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/';
+$conf['b8']['view']['path'] = dirname(__FILE__) . '/src/PHPCI/View/';
$conf['using_custom_file'] = $usingCustomConfigFile;
$config = new b8\Config($conf);
diff --git a/composer.json b/composer.json
index 202d2791..f6a4ec0c 100644
--- a/composer.json
+++ b/composer.json
@@ -21,14 +21,14 @@
},
"autoload": {
"psr-4": {
- "PHPCI\\": "PHPCI/",
- "b8\\": "B8Framework/b8/"
+ "PHPCI\\": "src/PHPCI/",
+ "b8\\": "src/B8Framework/"
}
},
"autoload-dev": {
"psr-4": {
- "Tests\\PHPCI\\": "Tests/PHPCI/",
- "Tests\\b8\\": "B8Framework/tests/"
+ "Tests\\PHPCI\\": "tests/PHPCI/",
+ "Tests\\b8\\": "tests/B8Framework/"
}
},
"require": {
diff --git a/composer.lock b/composer.lock
index bfd54e19..0de2d78d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "8284c7c2c1947ad6dab0eaa67bc2d268",
+ "hash": "1a7e6ffa53784a02d845d40fc34455f1",
"content-hash": "aea45980fd51944fe67aeb4a0677ec88",
"packages": [
{
diff --git a/phpunit.xml b/phpunit.xml
index fdddf34d..2edaadd8 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,33 +1,43 @@
-
./Tests/PHPCI/Command
+
+ ./Tests/PHPCI/Controller
+
./Tests/PHPCI/Helper
./Tests/PHPCI/Logging
-
- ./Tests/PHPCI/Plugin
-
./Tests/PHPCI/Model
+
+ ./Tests/PHPCI/Plugin
+
+
./Tests/PHPCI/Service
+
diff --git a/runtime/builds/.gitkeep b/runtime/builds/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/B8Framework/b8/Application.php b/src/B8Framework/Application.php
similarity index 100%
rename from B8Framework/b8/Application.php
rename to src/B8Framework/Application.php
diff --git a/B8Framework/b8/Cache.php b/src/B8Framework/Cache.php
similarity index 100%
rename from B8Framework/b8/Cache.php
rename to src/B8Framework/Cache.php
diff --git a/src/B8Framework/Cache/ApcCache.php b/src/B8Framework/Cache/ApcCache.php
new file mode 100755
index 00000000..2c175252
--- /dev/null
+++ b/src/B8Framework/Cache/ApcCache.php
@@ -0,0 +1,149 @@
+isEnabled()) {
+ return $default;
+ }
+
+ $success = false;
+ $rtn = apc_fetch($key, $success);
+ if (!$success) {
+ $rtn = $default;
+ }
+
+ return $rtn;
+ }
+
+ /**
+ * Add an item to the cache:
+ *
+ * @param string $key
+ * @param mixed $value
+ * @param integer $ttl
+ *
+ * @return array|bool
+ */
+ public function set($key, $value = null, $ttl = 0)
+ {
+ if (!$this->isEnabled()) {
+ return false;
+ }
+
+ return apc_store($key, $value, $ttl);
+ }
+
+ /**
+ * Remove an item from the cache:
+ *
+ * @param string $key
+ *
+ * @return bool|string[]
+ */
+ public function delete($key)
+ {
+ if (!$this->isEnabled()) {
+ return false;
+ }
+
+ return apc_delete($key);
+ }
+
+ /**
+ * Check if an item is in the cache:
+ *
+ * @param string $key
+ *
+ * @return bool|string[]
+ */
+ public function contains($key)
+ {
+ if (!$this->isEnabled()) {
+ return false;
+ }
+
+ return apc_exists($key);
+ }
+
+ /**
+ * Short-hand syntax for get()
+ *
+ * @see Config::get()
+ *
+ * @param string $key
+ *
+ * @return mixed
+ */
+ public function __get($key)
+ {
+ return $this->get($key, null);
+ }
+
+ /**
+ * Short-hand syntax for set()
+ *
+ * @see Config::set()
+ *
+ * @param string $key
+ * @param mixed $value
+ *
+ * @return array|bool
+ */
+ public function __set($key, $value = null)
+ {
+ return $this->set($key, $value);
+ }
+
+ /**
+ * Is set
+ *
+ * @param string $key
+ *
+ * @return bool|string[]
+ */
+ public function __isset($key)
+ {
+ return $this->contains($key);
+ }
+
+ /**
+ * Unset
+ *
+ * @param string $key
+ */
+ public function __unset($key)
+ {
+ $this->delete($key);
+ }
+}
diff --git a/B8Framework/b8/Cache/RequestCache.php b/src/B8Framework/Cache/RequestCache.php
similarity index 100%
rename from B8Framework/b8/Cache/RequestCache.php
rename to src/B8Framework/Cache/RequestCache.php
diff --git a/B8Framework/b8/Config.php b/src/B8Framework/Config.php
similarity index 100%
rename from B8Framework/b8/Config.php
rename to src/B8Framework/Config.php
diff --git a/B8Framework/b8/Controller.php b/src/B8Framework/Controller.php
similarity index 100%
rename from B8Framework/b8/Controller.php
rename to src/B8Framework/Controller.php
diff --git a/B8Framework/b8/Controller/RestController.php b/src/B8Framework/Controller/RestController.php
similarity index 100%
rename from B8Framework/b8/Controller/RestController.php
rename to src/B8Framework/Controller/RestController.php
diff --git a/B8Framework/b8/Database.php b/src/B8Framework/Database.php
similarity index 100%
rename from B8Framework/b8/Database.php
rename to src/B8Framework/Database.php
diff --git a/B8Framework/b8/Database/CodeGenerator.php b/src/B8Framework/Database/CodeGenerator.php
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator.php
rename to src/B8Framework/Database/CodeGenerator.php
diff --git a/B8Framework/b8/Database/CodeGenerator/BaseControllerTemplate.html b/src/B8Framework/Database/CodeGenerator/BaseControllerTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/BaseControllerTemplate.html
rename to src/B8Framework/Database/CodeGenerator/BaseControllerTemplate.html
diff --git a/B8Framework/b8/Database/CodeGenerator/BaseModelTemplate.html b/src/B8Framework/Database/CodeGenerator/BaseModelTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/BaseModelTemplate.html
rename to src/B8Framework/Database/CodeGenerator/BaseModelTemplate.html
diff --git a/B8Framework/b8/Database/CodeGenerator/BaseStoreTemplate.html b/src/B8Framework/Database/CodeGenerator/BaseStoreTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/BaseStoreTemplate.html
rename to src/B8Framework/Database/CodeGenerator/BaseStoreTemplate.html
diff --git a/B8Framework/b8/Database/CodeGenerator/ControllerTemplate.html b/src/B8Framework/Database/CodeGenerator/ControllerTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/ControllerTemplate.html
rename to src/B8Framework/Database/CodeGenerator/ControllerTemplate.html
diff --git a/B8Framework/b8/Database/CodeGenerator/ModelTemplate.html b/src/B8Framework/Database/CodeGenerator/ModelTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/ModelTemplate.html
rename to src/B8Framework/Database/CodeGenerator/ModelTemplate.html
diff --git a/B8Framework/b8/Database/CodeGenerator/StoreTemplate.html b/src/B8Framework/Database/CodeGenerator/StoreTemplate.html
similarity index 100%
rename from B8Framework/b8/Database/CodeGenerator/StoreTemplate.html
rename to src/B8Framework/Database/CodeGenerator/StoreTemplate.html
diff --git a/B8Framework/b8/Database/Generator.php b/src/B8Framework/Database/Generator.php
similarity index 100%
rename from B8Framework/b8/Database/Generator.php
rename to src/B8Framework/Database/Generator.php
diff --git a/B8Framework/b8/Database/Map.php b/src/B8Framework/Database/Map.php
similarity index 100%
rename from B8Framework/b8/Database/Map.php
rename to src/B8Framework/Database/Map.php
diff --git a/B8Framework/b8/Exception/HttpException.php b/src/B8Framework/Exception/HttpException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException.php
rename to src/B8Framework/Exception/HttpException.php
diff --git a/B8Framework/b8/Exception/HttpException/BadRequestException.php b/src/B8Framework/Exception/HttpException/BadRequestException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/BadRequestException.php
rename to src/B8Framework/Exception/HttpException/BadRequestException.php
diff --git a/B8Framework/b8/Exception/HttpException/ForbiddenException.php b/src/B8Framework/Exception/HttpException/ForbiddenException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/ForbiddenException.php
rename to src/B8Framework/Exception/HttpException/ForbiddenException.php
diff --git a/B8Framework/b8/Exception/HttpException/NotAuthorizedException.php b/src/B8Framework/Exception/HttpException/NotAuthorizedException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/NotAuthorizedException.php
rename to src/B8Framework/Exception/HttpException/NotAuthorizedException.php
diff --git a/B8Framework/b8/Exception/HttpException/NotFoundException.php b/src/B8Framework/Exception/HttpException/NotFoundException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/NotFoundException.php
rename to src/B8Framework/Exception/HttpException/NotFoundException.php
diff --git a/B8Framework/b8/Exception/HttpException/ServerErrorException.php b/src/B8Framework/Exception/HttpException/ServerErrorException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/ServerErrorException.php
rename to src/B8Framework/Exception/HttpException/ServerErrorException.php
diff --git a/B8Framework/b8/Exception/HttpException/ValidationException.php b/src/B8Framework/Exception/HttpException/ValidationException.php
similarity index 100%
rename from B8Framework/b8/Exception/HttpException/ValidationException.php
rename to src/B8Framework/Exception/HttpException/ValidationException.php
diff --git a/B8Framework/b8/Form.php b/src/B8Framework/Form.php
similarity index 100%
rename from B8Framework/b8/Form.php
rename to src/B8Framework/Form.php
diff --git a/B8Framework/b8/Form/ControlGroup.php b/src/B8Framework/Form/ControlGroup.php
similarity index 100%
rename from B8Framework/b8/Form/ControlGroup.php
rename to src/B8Framework/Form/ControlGroup.php
diff --git a/B8Framework/b8/Form/Element.php b/src/B8Framework/Form/Element.php
similarity index 100%
rename from B8Framework/b8/Form/Element.php
rename to src/B8Framework/Form/Element.php
diff --git a/B8Framework/b8/Form/Element/Button.php b/src/B8Framework/Form/Element/Button.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Button.php
rename to src/B8Framework/Form/Element/Button.php
diff --git a/B8Framework/b8/Form/Element/Checkbox.php b/src/B8Framework/Form/Element/Checkbox.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Checkbox.php
rename to src/B8Framework/Form/Element/Checkbox.php
diff --git a/B8Framework/b8/Form/Element/CheckboxGroup.php b/src/B8Framework/Form/Element/CheckboxGroup.php
similarity index 100%
rename from B8Framework/b8/Form/Element/CheckboxGroup.php
rename to src/B8Framework/Form/Element/CheckboxGroup.php
diff --git a/B8Framework/b8/Form/Element/Csrf.php b/src/B8Framework/Form/Element/Csrf.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Csrf.php
rename to src/B8Framework/Form/Element/Csrf.php
diff --git a/B8Framework/b8/Form/Element/Email.php b/src/B8Framework/Form/Element/Email.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Email.php
rename to src/B8Framework/Form/Element/Email.php
diff --git a/B8Framework/b8/Form/Element/Hidden.php b/src/B8Framework/Form/Element/Hidden.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Hidden.php
rename to src/B8Framework/Form/Element/Hidden.php
diff --git a/B8Framework/b8/Form/Element/Password.php b/src/B8Framework/Form/Element/Password.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Password.php
rename to src/B8Framework/Form/Element/Password.php
diff --git a/B8Framework/b8/Form/Element/Radio.php b/src/B8Framework/Form/Element/Radio.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Radio.php
rename to src/B8Framework/Form/Element/Radio.php
diff --git a/B8Framework/b8/Form/Element/Select.php b/src/B8Framework/Form/Element/Select.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Select.php
rename to src/B8Framework/Form/Element/Select.php
diff --git a/B8Framework/b8/Form/Element/Submit.php b/src/B8Framework/Form/Element/Submit.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Submit.php
rename to src/B8Framework/Form/Element/Submit.php
diff --git a/B8Framework/b8/Form/Element/Text.php b/src/B8Framework/Form/Element/Text.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Text.php
rename to src/B8Framework/Form/Element/Text.php
diff --git a/B8Framework/b8/Form/Element/TextArea.php b/src/B8Framework/Form/Element/TextArea.php
similarity index 100%
rename from B8Framework/b8/Form/Element/TextArea.php
rename to src/B8Framework/Form/Element/TextArea.php
diff --git a/B8Framework/b8/Form/Element/Url.php b/src/B8Framework/Form/Element/Url.php
similarity index 100%
rename from B8Framework/b8/Form/Element/Url.php
rename to src/B8Framework/Form/Element/Url.php
diff --git a/B8Framework/b8/Form/FieldSet.php b/src/B8Framework/Form/FieldSet.php
similarity index 100%
rename from B8Framework/b8/Form/FieldSet.php
rename to src/B8Framework/Form/FieldSet.php
diff --git a/B8Framework/b8/Form/Input.php b/src/B8Framework/Form/Input.php
similarity index 100%
rename from B8Framework/b8/Form/Input.php
rename to src/B8Framework/Form/Input.php
diff --git a/B8Framework/b8/Form/View/Button.phtml b/src/B8Framework/Form/View/Button.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Button.phtml
rename to src/B8Framework/Form/View/Button.phtml
diff --git a/B8Framework/b8/Form/View/Checkbox.phtml b/src/B8Framework/Form/View/Checkbox.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Checkbox.phtml
rename to src/B8Framework/Form/View/Checkbox.phtml
diff --git a/B8Framework/b8/Form/View/CheckboxGroup.phtml b/src/B8Framework/Form/View/CheckboxGroup.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/CheckboxGroup.phtml
rename to src/B8Framework/Form/View/CheckboxGroup.phtml
diff --git a/B8Framework/b8/Form/View/ControlGroup.phtml b/src/B8Framework/Form/View/ControlGroup.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/ControlGroup.phtml
rename to src/B8Framework/Form/View/ControlGroup.phtml
diff --git a/B8Framework/b8/Form/View/Csrf.phtml b/src/B8Framework/Form/View/Csrf.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Csrf.phtml
rename to src/B8Framework/Form/View/Csrf.phtml
diff --git a/B8Framework/b8/Form/View/FieldSet.phtml b/src/B8Framework/Form/View/FieldSet.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/FieldSet.phtml
rename to src/B8Framework/Form/View/FieldSet.phtml
diff --git a/B8Framework/b8/Form/View/Form.phtml b/src/B8Framework/Form/View/Form.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Form.phtml
rename to src/B8Framework/Form/View/Form.phtml
diff --git a/B8Framework/b8/Form/View/Hidden.phtml b/src/B8Framework/Form/View/Hidden.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Hidden.phtml
rename to src/B8Framework/Form/View/Hidden.phtml
diff --git a/B8Framework/b8/Form/View/Radio.phtml b/src/B8Framework/Form/View/Radio.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Radio.phtml
rename to src/B8Framework/Form/View/Radio.phtml
diff --git a/B8Framework/b8/Form/View/Select.phtml b/src/B8Framework/Form/View/Select.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Select.phtml
rename to src/B8Framework/Form/View/Select.phtml
diff --git a/B8Framework/b8/Form/View/Text.phtml b/src/B8Framework/Form/View/Text.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/Text.phtml
rename to src/B8Framework/Form/View/Text.phtml
diff --git a/B8Framework/b8/Form/View/TextArea.phtml b/src/B8Framework/Form/View/TextArea.phtml
similarity index 100%
rename from B8Framework/b8/Form/View/TextArea.phtml
rename to src/B8Framework/Form/View/TextArea.phtml
diff --git a/B8Framework/b8/Http/Request.php b/src/B8Framework/Http/Request.php
similarity index 100%
rename from B8Framework/b8/Http/Request.php
rename to src/B8Framework/Http/Request.php
diff --git a/B8Framework/b8/Http/Response.php b/src/B8Framework/Http/Response.php
similarity index 100%
rename from B8Framework/b8/Http/Response.php
rename to src/B8Framework/Http/Response.php
diff --git a/B8Framework/b8/Http/Response/JsonResponse.php b/src/B8Framework/Http/Response/JsonResponse.php
similarity index 100%
rename from B8Framework/b8/Http/Response/JsonResponse.php
rename to src/B8Framework/Http/Response/JsonResponse.php
diff --git a/B8Framework/b8/Http/Response/RedirectResponse.php b/src/B8Framework/Http/Response/RedirectResponse.php
similarity index 100%
rename from B8Framework/b8/Http/Response/RedirectResponse.php
rename to src/B8Framework/Http/Response/RedirectResponse.php
diff --git a/B8Framework/b8/Http/Router.php b/src/B8Framework/Http/Router.php
similarity index 100%
rename from B8Framework/b8/Http/Router.php
rename to src/B8Framework/Http/Router.php
diff --git a/B8Framework/b8/HttpClient.php b/src/B8Framework/HttpClient.php
similarity index 100%
rename from B8Framework/b8/HttpClient.php
rename to src/B8Framework/HttpClient.php
diff --git a/B8Framework/b8/Image.php b/src/B8Framework/Image.php
similarity index 100%
rename from B8Framework/b8/Image.php
rename to src/B8Framework/Image.php
diff --git a/B8Framework/b8/Model.php b/src/B8Framework/Model.php
similarity index 100%
rename from B8Framework/b8/Model.php
rename to src/B8Framework/Model.php
diff --git a/B8Framework/b8/Store.php b/src/B8Framework/Store.php
similarity index 100%
rename from B8Framework/b8/Store.php
rename to src/B8Framework/Store.php
diff --git a/B8Framework/b8/Store/Factory.php b/src/B8Framework/Store/Factory.php
similarity index 100%
rename from B8Framework/b8/Store/Factory.php
rename to src/B8Framework/Store/Factory.php
diff --git a/B8Framework/b8/Type/Cache.php b/src/B8Framework/Type/Cache.php
similarity index 100%
rename from B8Framework/b8/Type/Cache.php
rename to src/B8Framework/Type/Cache.php
diff --git a/B8Framework/b8/Type/RestUser.php b/src/B8Framework/Type/RestUser.php
similarity index 100%
rename from B8Framework/b8/Type/RestUser.php
rename to src/B8Framework/Type/RestUser.php
diff --git a/B8Framework/b8/View.php b/src/B8Framework/View.php
similarity index 100%
rename from B8Framework/b8/View.php
rename to src/B8Framework/View.php
diff --git a/B8Framework/b8/View/Helper/Format.php b/src/B8Framework/View/Helper/Format.php
similarity index 100%
rename from B8Framework/b8/View/Helper/Format.php
rename to src/B8Framework/View/Helper/Format.php
diff --git a/B8Framework/b8/View/Template.php b/src/B8Framework/View/Template.php
similarity index 100%
rename from B8Framework/b8/View/Template.php
rename to src/B8Framework/View/Template.php
diff --git a/B8Framework/b8/View/UserView.php b/src/B8Framework/View/UserView.php
similarity index 100%
rename from B8Framework/b8/View/UserView.php
rename to src/B8Framework/View/UserView.php
diff --git a/PHPCI/Application.php b/src/PHPCI/Application.php
similarity index 100%
rename from PHPCI/Application.php
rename to src/PHPCI/Application.php
diff --git a/PHPCI/BuildFactory.php b/src/PHPCI/BuildFactory.php
similarity index 100%
rename from PHPCI/BuildFactory.php
rename to src/PHPCI/BuildFactory.php
diff --git a/PHPCI/Builder.php b/src/PHPCI/Builder.php
similarity index 100%
rename from PHPCI/Builder.php
rename to src/PHPCI/Builder.php
diff --git a/PHPCI/Command/CreateAdminCommand.php b/src/PHPCI/Command/CreateAdminCommand.php
similarity index 100%
rename from PHPCI/Command/CreateAdminCommand.php
rename to src/PHPCI/Command/CreateAdminCommand.php
diff --git a/PHPCI/Command/CreateBuildCommand.php b/src/PHPCI/Command/CreateBuildCommand.php
similarity index 100%
rename from PHPCI/Command/CreateBuildCommand.php
rename to src/PHPCI/Command/CreateBuildCommand.php
diff --git a/PHPCI/Command/DaemonCommand.php b/src/PHPCI/Command/DaemonCommand.php
similarity index 100%
rename from PHPCI/Command/DaemonCommand.php
rename to src/PHPCI/Command/DaemonCommand.php
diff --git a/PHPCI/Command/DaemoniseCommand.php b/src/PHPCI/Command/DaemoniseCommand.php
similarity index 100%
rename from PHPCI/Command/DaemoniseCommand.php
rename to src/PHPCI/Command/DaemoniseCommand.php
diff --git a/PHPCI/Command/GenerateCommand.php b/src/PHPCI/Command/GenerateCommand.php
similarity index 100%
rename from PHPCI/Command/GenerateCommand.php
rename to src/PHPCI/Command/GenerateCommand.php
diff --git a/PHPCI/Command/InstallCommand.php b/src/PHPCI/Command/InstallCommand.php
similarity index 100%
rename from PHPCI/Command/InstallCommand.php
rename to src/PHPCI/Command/InstallCommand.php
diff --git a/PHPCI/Command/PollCommand.php b/src/PHPCI/Command/PollCommand.php
similarity index 100%
rename from PHPCI/Command/PollCommand.php
rename to src/PHPCI/Command/PollCommand.php
diff --git a/PHPCI/Command/RebuildCommand.php b/src/PHPCI/Command/RebuildCommand.php
similarity index 100%
rename from PHPCI/Command/RebuildCommand.php
rename to src/PHPCI/Command/RebuildCommand.php
diff --git a/PHPCI/Command/RebuildQueueCommand.php b/src/PHPCI/Command/RebuildQueueCommand.php
similarity index 100%
rename from PHPCI/Command/RebuildQueueCommand.php
rename to src/PHPCI/Command/RebuildQueueCommand.php
diff --git a/PHPCI/Command/RunCommand.php b/src/PHPCI/Command/RunCommand.php
similarity index 100%
rename from PHPCI/Command/RunCommand.php
rename to src/PHPCI/Command/RunCommand.php
diff --git a/PHPCI/Command/UpdateCommand.php b/src/PHPCI/Command/UpdateCommand.php
similarity index 100%
rename from PHPCI/Command/UpdateCommand.php
rename to src/PHPCI/Command/UpdateCommand.php
diff --git a/PHPCI/Command/WorkerCommand.php b/src/PHPCI/Command/WorkerCommand.php
similarity index 100%
rename from PHPCI/Command/WorkerCommand.php
rename to src/PHPCI/Command/WorkerCommand.php
diff --git a/PHPCI/Controller.php b/src/PHPCI/Controller.php
similarity index 100%
rename from PHPCI/Controller.php
rename to src/PHPCI/Controller.php
diff --git a/PHPCI/Controller/BuildController.php b/src/PHPCI/Controller/BuildController.php
similarity index 100%
rename from PHPCI/Controller/BuildController.php
rename to src/PHPCI/Controller/BuildController.php
diff --git a/PHPCI/Controller/BuildStatusController.php b/src/PHPCI/Controller/BuildStatusController.php
similarity index 100%
rename from PHPCI/Controller/BuildStatusController.php
rename to src/PHPCI/Controller/BuildStatusController.php
diff --git a/PHPCI/Controller/GroupController.php b/src/PHPCI/Controller/GroupController.php
similarity index 100%
rename from PHPCI/Controller/GroupController.php
rename to src/PHPCI/Controller/GroupController.php
diff --git a/PHPCI/Controller/HomeController.php b/src/PHPCI/Controller/HomeController.php
similarity index 100%
rename from PHPCI/Controller/HomeController.php
rename to src/PHPCI/Controller/HomeController.php
diff --git a/PHPCI/Controller/PluginController.php b/src/PHPCI/Controller/PluginController.php
similarity index 100%
rename from PHPCI/Controller/PluginController.php
rename to src/PHPCI/Controller/PluginController.php
diff --git a/PHPCI/Controller/ProjectController.php b/src/PHPCI/Controller/ProjectController.php
similarity index 100%
rename from PHPCI/Controller/ProjectController.php
rename to src/PHPCI/Controller/ProjectController.php
diff --git a/PHPCI/Controller/SessionController.php b/src/PHPCI/Controller/SessionController.php
similarity index 100%
rename from PHPCI/Controller/SessionController.php
rename to src/PHPCI/Controller/SessionController.php
diff --git a/PHPCI/Controller/SettingsController.php b/src/PHPCI/Controller/SettingsController.php
similarity index 100%
rename from PHPCI/Controller/SettingsController.php
rename to src/PHPCI/Controller/SettingsController.php
diff --git a/PHPCI/Controller/UserController.php b/src/PHPCI/Controller/UserController.php
similarity index 100%
rename from PHPCI/Controller/UserController.php
rename to src/PHPCI/Controller/UserController.php
diff --git a/PHPCI/Controller/WebhookController.php b/src/PHPCI/Controller/WebhookController.php
similarity index 100%
rename from PHPCI/Controller/WebhookController.php
rename to src/PHPCI/Controller/WebhookController.php
diff --git a/PHPCI/ErrorHandler.php b/src/PHPCI/ErrorHandler.php
similarity index 100%
rename from PHPCI/ErrorHandler.php
rename to src/PHPCI/ErrorHandler.php
diff --git a/PHPCI/Helper/AnsiConverter.php b/src/PHPCI/Helper/AnsiConverter.php
similarity index 100%
rename from PHPCI/Helper/AnsiConverter.php
rename to src/PHPCI/Helper/AnsiConverter.php
diff --git a/PHPCI/Helper/BaseCommandExecutor.php b/src/PHPCI/Helper/BaseCommandExecutor.php
similarity index 100%
rename from PHPCI/Helper/BaseCommandExecutor.php
rename to src/PHPCI/Helper/BaseCommandExecutor.php
diff --git a/PHPCI/Helper/Build.php b/src/PHPCI/Helper/Build.php
similarity index 100%
rename from PHPCI/Helper/Build.php
rename to src/PHPCI/Helper/Build.php
diff --git a/PHPCI/Helper/BuildInterpolator.php b/src/PHPCI/Helper/BuildInterpolator.php
similarity index 100%
rename from PHPCI/Helper/BuildInterpolator.php
rename to src/PHPCI/Helper/BuildInterpolator.php
diff --git a/PHPCI/Helper/CommandExecutor.php b/src/PHPCI/Helper/CommandExecutor.php
similarity index 100%
rename from PHPCI/Helper/CommandExecutor.php
rename to src/PHPCI/Helper/CommandExecutor.php
diff --git a/PHPCI/Helper/Diff.php b/src/PHPCI/Helper/Diff.php
similarity index 100%
rename from PHPCI/Helper/Diff.php
rename to src/PHPCI/Helper/Diff.php
diff --git a/PHPCI/Helper/Email.php b/src/PHPCI/Helper/Email.php
similarity index 100%
rename from PHPCI/Helper/Email.php
rename to src/PHPCI/Helper/Email.php
diff --git a/PHPCI/Helper/Github.php b/src/PHPCI/Helper/Github.php
similarity index 100%
rename from PHPCI/Helper/Github.php
rename to src/PHPCI/Helper/Github.php
diff --git a/PHPCI/Helper/Lang.php b/src/PHPCI/Helper/Lang.php
similarity index 95%
rename from PHPCI/Helper/Lang.php
rename to src/PHPCI/Helper/Lang.php
index a998312b..0cc1b5c1 100644
--- a/PHPCI/Helper/Lang.php
+++ b/src/PHPCI/Helper/Lang.php
@@ -106,7 +106,7 @@ class Lang
foreach (self::$languages as $language) {
$strings = array();
- require(PHPCI_DIR . 'PHPCI/Languages/lang.' . $language . '.php');
+ require(PHPCI_DIR . 'src/PHPCI/Languages/lang.' . $language . '.php');
$languages[$language] = $strings['language_name'];
}
@@ -175,7 +175,7 @@ class Lang
$language = $language
? $language
: self::$language;
- $langFile = PHPCI_DIR . 'PHPCI/Languages/lang.' . $language . '.php';
+ $langFile = PHPCI_DIR . 'src/PHPCI/Languages/lang.' . $language . '.php';
if (!file_exists($langFile)) {
return null;
@@ -196,7 +196,7 @@ class Lang
protected static function loadAvailableLanguages()
{
$matches = array();
- foreach (glob(PHPCI_DIR . 'PHPCI/Languages/lang.*.php') as $file) {
+ foreach (glob(PHPCI_DIR . 'src/PHPCI/Languages/lang.*.php') as $file) {
if (preg_match('/lang\.([a-z]{2}\-?[a-z]*)\.php/', $file, $matches)) {
self::$languages[] = $matches[1];
}
diff --git a/PHPCI/Helper/LoginIsDisabled.php b/src/PHPCI/Helper/LoginIsDisabled.php
similarity index 100%
rename from PHPCI/Helper/LoginIsDisabled.php
rename to src/PHPCI/Helper/LoginIsDisabled.php
diff --git a/PHPCI/Helper/MailerFactory.php b/src/PHPCI/Helper/MailerFactory.php
similarity index 100%
rename from PHPCI/Helper/MailerFactory.php
rename to src/PHPCI/Helper/MailerFactory.php
diff --git a/PHPCI/Helper/SshKey.php b/src/PHPCI/Helper/SshKey.php
similarity index 100%
rename from PHPCI/Helper/SshKey.php
rename to src/PHPCI/Helper/SshKey.php
diff --git a/PHPCI/Helper/UnixCommandExecutor.php b/src/PHPCI/Helper/UnixCommandExecutor.php
similarity index 100%
rename from PHPCI/Helper/UnixCommandExecutor.php
rename to src/PHPCI/Helper/UnixCommandExecutor.php
diff --git a/PHPCI/Helper/User.php b/src/PHPCI/Helper/User.php
similarity index 100%
rename from PHPCI/Helper/User.php
rename to src/PHPCI/Helper/User.php
diff --git a/PHPCI/Helper/WindowsCommandExecutor.php b/src/PHPCI/Helper/WindowsCommandExecutor.php
similarity index 100%
rename from PHPCI/Helper/WindowsCommandExecutor.php
rename to src/PHPCI/Helper/WindowsCommandExecutor.php
diff --git a/PHPCI/Languages/lang.da.php b/src/PHPCI/Languages/lang.da.php
similarity index 100%
rename from PHPCI/Languages/lang.da.php
rename to src/PHPCI/Languages/lang.da.php
diff --git a/PHPCI/Languages/lang.de.php b/src/PHPCI/Languages/lang.de.php
similarity index 100%
rename from PHPCI/Languages/lang.de.php
rename to src/PHPCI/Languages/lang.de.php
diff --git a/PHPCI/Languages/lang.el.php b/src/PHPCI/Languages/lang.el.php
similarity index 100%
rename from PHPCI/Languages/lang.el.php
rename to src/PHPCI/Languages/lang.el.php
diff --git a/PHPCI/Languages/lang.en.php b/src/PHPCI/Languages/lang.en.php
similarity index 100%
rename from PHPCI/Languages/lang.en.php
rename to src/PHPCI/Languages/lang.en.php
diff --git a/PHPCI/Languages/lang.es.php b/src/PHPCI/Languages/lang.es.php
similarity index 100%
rename from PHPCI/Languages/lang.es.php
rename to src/PHPCI/Languages/lang.es.php
diff --git a/PHPCI/Languages/lang.fr.php b/src/PHPCI/Languages/lang.fr.php
similarity index 100%
rename from PHPCI/Languages/lang.fr.php
rename to src/PHPCI/Languages/lang.fr.php
diff --git a/PHPCI/Languages/lang.it.php b/src/PHPCI/Languages/lang.it.php
similarity index 100%
rename from PHPCI/Languages/lang.it.php
rename to src/PHPCI/Languages/lang.it.php
diff --git a/PHPCI/Languages/lang.nl.php b/src/PHPCI/Languages/lang.nl.php
similarity index 100%
rename from PHPCI/Languages/lang.nl.php
rename to src/PHPCI/Languages/lang.nl.php
diff --git a/PHPCI/Languages/lang.pl.php b/src/PHPCI/Languages/lang.pl.php
similarity index 100%
rename from PHPCI/Languages/lang.pl.php
rename to src/PHPCI/Languages/lang.pl.php
diff --git a/PHPCI/Languages/lang.ru.php b/src/PHPCI/Languages/lang.ru.php
similarity index 100%
rename from PHPCI/Languages/lang.ru.php
rename to src/PHPCI/Languages/lang.ru.php
diff --git a/PHPCI/Languages/lang.uk.php b/src/PHPCI/Languages/lang.uk.php
similarity index 100%
rename from PHPCI/Languages/lang.uk.php
rename to src/PHPCI/Languages/lang.uk.php
diff --git a/PHPCI/Logging/BuildDBLogHandler.php b/src/PHPCI/Logging/BuildDBLogHandler.php
similarity index 100%
rename from PHPCI/Logging/BuildDBLogHandler.php
rename to src/PHPCI/Logging/BuildDBLogHandler.php
diff --git a/PHPCI/Logging/BuildLogger.php b/src/PHPCI/Logging/BuildLogger.php
similarity index 100%
rename from PHPCI/Logging/BuildLogger.php
rename to src/PHPCI/Logging/BuildLogger.php
diff --git a/PHPCI/Logging/Handler.php b/src/PHPCI/Logging/Handler.php
similarity index 100%
rename from PHPCI/Logging/Handler.php
rename to src/PHPCI/Logging/Handler.php
diff --git a/PHPCI/Logging/LoggedBuildContextTidier.php b/src/PHPCI/Logging/LoggedBuildContextTidier.php
similarity index 100%
rename from PHPCI/Logging/LoggedBuildContextTidier.php
rename to src/PHPCI/Logging/LoggedBuildContextTidier.php
diff --git a/PHPCI/Logging/LoggerConfig.php b/src/PHPCI/Logging/LoggerConfig.php
similarity index 100%
rename from PHPCI/Logging/LoggerConfig.php
rename to src/PHPCI/Logging/LoggerConfig.php
diff --git a/PHPCI/Logging/OutputLogHandler.php b/src/PHPCI/Logging/OutputLogHandler.php
similarity index 100%
rename from PHPCI/Logging/OutputLogHandler.php
rename to src/PHPCI/Logging/OutputLogHandler.php
diff --git a/PHPCI/Migrations/20140513143726_initial_migration.php b/src/PHPCI/Migrations/20140513143726_initial_migration.php
similarity index 100%
rename from PHPCI/Migrations/20140513143726_initial_migration.php
rename to src/PHPCI/Migrations/20140513143726_initial_migration.php
diff --git a/PHPCI/Migrations/20140513153133_change_build_keys_migration.php b/src/PHPCI/Migrations/20140513153133_change_build_keys_migration.php
similarity index 100%
rename from PHPCI/Migrations/20140513153133_change_build_keys_migration.php
rename to src/PHPCI/Migrations/20140513153133_change_build_keys_migration.php
diff --git a/PHPCI/Migrations/20140611170618_choose_branch.php b/src/PHPCI/Migrations/20140611170618_choose_branch.php
similarity index 100%
rename from PHPCI/Migrations/20140611170618_choose_branch.php
rename to src/PHPCI/Migrations/20140611170618_choose_branch.php
diff --git a/PHPCI/Migrations/20140730143702_fix_database_columns.php b/src/PHPCI/Migrations/20140730143702_fix_database_columns.php
similarity index 100%
rename from PHPCI/Migrations/20140730143702_fix_database_columns.php
rename to src/PHPCI/Migrations/20140730143702_fix_database_columns.php
diff --git a/PHPCI/Migrations/20150131075425_archive_project.php b/src/PHPCI/Migrations/20150131075425_archive_project.php
similarity index 100%
rename from PHPCI/Migrations/20150131075425_archive_project.php
rename to src/PHPCI/Migrations/20150131075425_archive_project.php
diff --git a/PHPCI/Migrations/20150203105015_fix_column_types.php b/src/PHPCI/Migrations/20150203105015_fix_column_types.php
similarity index 100%
rename from PHPCI/Migrations/20150203105015_fix_column_types.php
rename to src/PHPCI/Migrations/20150203105015_fix_column_types.php
diff --git a/PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php b/src/PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php
similarity index 100%
rename from PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php
rename to src/PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php
diff --git a/PHPCI/Migrations/20151008140800_add_project_groups.php b/src/PHPCI/Migrations/20151008140800_add_project_groups.php
similarity index 100%
rename from PHPCI/Migrations/20151008140800_add_project_groups.php
rename to src/PHPCI/Migrations/20151008140800_add_project_groups.php
diff --git a/PHPCI/Migrations/20151009100610_remove_unique_name_index.php b/src/PHPCI/Migrations/20151009100610_remove_unique_name_index.php
similarity index 100%
rename from PHPCI/Migrations/20151009100610_remove_unique_name_index.php
rename to src/PHPCI/Migrations/20151009100610_remove_unique_name_index.php
diff --git a/PHPCI/Migrations/20151014091859_errors_table.php b/src/PHPCI/Migrations/20151014091859_errors_table.php
similarity index 100%
rename from PHPCI/Migrations/20151014091859_errors_table.php
rename to src/PHPCI/Migrations/20151014091859_errors_table.php
diff --git a/PHPCI/Migrations/20151015124825_convert_errors.php b/src/PHPCI/Migrations/20151015124825_convert_errors.php
similarity index 100%
rename from PHPCI/Migrations/20151015124825_convert_errors.php
rename to src/PHPCI/Migrations/20151015124825_convert_errors.php
diff --git a/PHPCI/Model.php b/src/PHPCI/Model.php
similarity index 100%
rename from PHPCI/Model.php
rename to src/PHPCI/Model.php
diff --git a/PHPCI/Model/Base/BuildBase.php b/src/PHPCI/Model/Base/BuildBase.php
similarity index 100%
rename from PHPCI/Model/Base/BuildBase.php
rename to src/PHPCI/Model/Base/BuildBase.php
diff --git a/PHPCI/Model/Base/BuildErrorBase.php b/src/PHPCI/Model/Base/BuildErrorBase.php
similarity index 100%
rename from PHPCI/Model/Base/BuildErrorBase.php
rename to src/PHPCI/Model/Base/BuildErrorBase.php
diff --git a/PHPCI/Model/Base/BuildMetaBase.php b/src/PHPCI/Model/Base/BuildMetaBase.php
similarity index 100%
rename from PHPCI/Model/Base/BuildMetaBase.php
rename to src/PHPCI/Model/Base/BuildMetaBase.php
diff --git a/PHPCI/Model/Base/ProjectBase.php b/src/PHPCI/Model/Base/ProjectBase.php
similarity index 100%
rename from PHPCI/Model/Base/ProjectBase.php
rename to src/PHPCI/Model/Base/ProjectBase.php
diff --git a/PHPCI/Model/Base/ProjectGroupBase.php b/src/PHPCI/Model/Base/ProjectGroupBase.php
similarity index 100%
rename from PHPCI/Model/Base/ProjectGroupBase.php
rename to src/PHPCI/Model/Base/ProjectGroupBase.php
diff --git a/PHPCI/Model/Base/UserBase.php b/src/PHPCI/Model/Base/UserBase.php
similarity index 100%
rename from PHPCI/Model/Base/UserBase.php
rename to src/PHPCI/Model/Base/UserBase.php
diff --git a/PHPCI/Model/Build.php b/src/PHPCI/Model/Build.php
similarity index 100%
rename from PHPCI/Model/Build.php
rename to src/PHPCI/Model/Build.php
diff --git a/PHPCI/Model/Build/BitbucketBuild.php b/src/PHPCI/Model/Build/BitbucketBuild.php
similarity index 100%
rename from PHPCI/Model/Build/BitbucketBuild.php
rename to src/PHPCI/Model/Build/BitbucketBuild.php
diff --git a/PHPCI/Model/Build/GithubBuild.php b/src/PHPCI/Model/Build/GithubBuild.php
similarity index 100%
rename from PHPCI/Model/Build/GithubBuild.php
rename to src/PHPCI/Model/Build/GithubBuild.php
diff --git a/PHPCI/Model/Build/GitlabBuild.php b/src/PHPCI/Model/Build/GitlabBuild.php
similarity index 100%
rename from PHPCI/Model/Build/GitlabBuild.php
rename to src/PHPCI/Model/Build/GitlabBuild.php
diff --git a/PHPCI/Model/Build/LocalBuild.php b/src/PHPCI/Model/Build/LocalBuild.php
similarity index 100%
rename from PHPCI/Model/Build/LocalBuild.php
rename to src/PHPCI/Model/Build/LocalBuild.php
diff --git a/PHPCI/Model/Build/MercurialBuild.php b/src/PHPCI/Model/Build/MercurialBuild.php
similarity index 100%
rename from PHPCI/Model/Build/MercurialBuild.php
rename to src/PHPCI/Model/Build/MercurialBuild.php
diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/src/PHPCI/Model/Build/RemoteGitBuild.php
similarity index 100%
rename from PHPCI/Model/Build/RemoteGitBuild.php
rename to src/PHPCI/Model/Build/RemoteGitBuild.php
diff --git a/PHPCI/Model/Build/SubversionBuild.php b/src/PHPCI/Model/Build/SubversionBuild.php
similarity index 100%
rename from PHPCI/Model/Build/SubversionBuild.php
rename to src/PHPCI/Model/Build/SubversionBuild.php
diff --git a/PHPCI/Model/BuildError.php b/src/PHPCI/Model/BuildError.php
similarity index 100%
rename from PHPCI/Model/BuildError.php
rename to src/PHPCI/Model/BuildError.php
diff --git a/PHPCI/Model/BuildMeta.php b/src/PHPCI/Model/BuildMeta.php
similarity index 100%
rename from PHPCI/Model/BuildMeta.php
rename to src/PHPCI/Model/BuildMeta.php
diff --git a/PHPCI/Model/Project.php b/src/PHPCI/Model/Project.php
similarity index 100%
rename from PHPCI/Model/Project.php
rename to src/PHPCI/Model/Project.php
diff --git a/PHPCI/Model/ProjectGroup.php b/src/PHPCI/Model/ProjectGroup.php
similarity index 100%
rename from PHPCI/Model/ProjectGroup.php
rename to src/PHPCI/Model/ProjectGroup.php
diff --git a/PHPCI/Model/User.php b/src/PHPCI/Model/User.php
similarity index 100%
rename from PHPCI/Model/User.php
rename to src/PHPCI/Model/User.php
diff --git a/PHPCI/Plugin.php b/src/PHPCI/Plugin.php
similarity index 100%
rename from PHPCI/Plugin.php
rename to src/PHPCI/Plugin.php
diff --git a/PHPCI/Plugin/Atoum.php b/src/PHPCI/Plugin/Atoum.php
similarity index 100%
rename from PHPCI/Plugin/Atoum.php
rename to src/PHPCI/Plugin/Atoum.php
diff --git a/PHPCI/Plugin/Behat.php b/src/PHPCI/Plugin/Behat.php
similarity index 100%
rename from PHPCI/Plugin/Behat.php
rename to src/PHPCI/Plugin/Behat.php
diff --git a/PHPCI/Plugin/Campfire.php b/src/PHPCI/Plugin/Campfire.php
similarity index 100%
rename from PHPCI/Plugin/Campfire.php
rename to src/PHPCI/Plugin/Campfire.php
diff --git a/PHPCI/Plugin/CleanBuild.php b/src/PHPCI/Plugin/CleanBuild.php
similarity index 100%
rename from PHPCI/Plugin/CleanBuild.php
rename to src/PHPCI/Plugin/CleanBuild.php
diff --git a/PHPCI/Plugin/Codeception.php b/src/PHPCI/Plugin/Codeception.php
similarity index 100%
rename from PHPCI/Plugin/Codeception.php
rename to src/PHPCI/Plugin/Codeception.php
diff --git a/PHPCI/Plugin/Composer.php b/src/PHPCI/Plugin/Composer.php
similarity index 100%
rename from PHPCI/Plugin/Composer.php
rename to src/PHPCI/Plugin/Composer.php
diff --git a/PHPCI/Plugin/CopyBuild.php b/src/PHPCI/Plugin/CopyBuild.php
similarity index 100%
rename from PHPCI/Plugin/CopyBuild.php
rename to src/PHPCI/Plugin/CopyBuild.php
diff --git a/PHPCI/Plugin/Deployer.php b/src/PHPCI/Plugin/Deployer.php
similarity index 100%
rename from PHPCI/Plugin/Deployer.php
rename to src/PHPCI/Plugin/Deployer.php
diff --git a/PHPCI/Plugin/Email.php b/src/PHPCI/Plugin/Email.php
similarity index 100%
rename from PHPCI/Plugin/Email.php
rename to src/PHPCI/Plugin/Email.php
diff --git a/PHPCI/Plugin/Env.php b/src/PHPCI/Plugin/Env.php
similarity index 100%
rename from PHPCI/Plugin/Env.php
rename to src/PHPCI/Plugin/Env.php
diff --git a/PHPCI/Plugin/FlowdockNotify.php b/src/PHPCI/Plugin/FlowdockNotify.php
similarity index 100%
rename from PHPCI/Plugin/FlowdockNotify.php
rename to src/PHPCI/Plugin/FlowdockNotify.php
diff --git a/PHPCI/Plugin/Git.php b/src/PHPCI/Plugin/Git.php
similarity index 100%
rename from PHPCI/Plugin/Git.php
rename to src/PHPCI/Plugin/Git.php
diff --git a/PHPCI/Plugin/Grunt.php b/src/PHPCI/Plugin/Grunt.php
similarity index 100%
rename from PHPCI/Plugin/Grunt.php
rename to src/PHPCI/Plugin/Grunt.php
diff --git a/PHPCI/Plugin/Gulp.php b/src/PHPCI/Plugin/Gulp.php
similarity index 100%
rename from PHPCI/Plugin/Gulp.php
rename to src/PHPCI/Plugin/Gulp.php
diff --git a/PHPCI/Plugin/HipchatNotify.php b/src/PHPCI/Plugin/HipchatNotify.php
similarity index 100%
rename from PHPCI/Plugin/HipchatNotify.php
rename to src/PHPCI/Plugin/HipchatNotify.php
diff --git a/PHPCI/Plugin/Irc.php b/src/PHPCI/Plugin/Irc.php
similarity index 100%
rename from PHPCI/Plugin/Irc.php
rename to src/PHPCI/Plugin/Irc.php
diff --git a/PHPCI/Plugin/Lint.php b/src/PHPCI/Plugin/Lint.php
similarity index 100%
rename from PHPCI/Plugin/Lint.php
rename to src/PHPCI/Plugin/Lint.php
diff --git a/PHPCI/Plugin/Mysql.php b/src/PHPCI/Plugin/Mysql.php
similarity index 100%
rename from PHPCI/Plugin/Mysql.php
rename to src/PHPCI/Plugin/Mysql.php
diff --git a/PHPCI/Plugin/PackageBuild.php b/src/PHPCI/Plugin/PackageBuild.php
similarity index 100%
rename from PHPCI/Plugin/PackageBuild.php
rename to src/PHPCI/Plugin/PackageBuild.php
diff --git a/PHPCI/Plugin/Pdepend.php b/src/PHPCI/Plugin/Pdepend.php
similarity index 100%
rename from PHPCI/Plugin/Pdepend.php
rename to src/PHPCI/Plugin/Pdepend.php
diff --git a/PHPCI/Plugin/Pgsql.php b/src/PHPCI/Plugin/Pgsql.php
similarity index 100%
rename from PHPCI/Plugin/Pgsql.php
rename to src/PHPCI/Plugin/Pgsql.php
diff --git a/PHPCI/Plugin/Phar.php b/src/PHPCI/Plugin/Phar.php
similarity index 100%
rename from PHPCI/Plugin/Phar.php
rename to src/PHPCI/Plugin/Phar.php
diff --git a/PHPCI/Plugin/Phing.php b/src/PHPCI/Plugin/Phing.php
similarity index 100%
rename from PHPCI/Plugin/Phing.php
rename to src/PHPCI/Plugin/Phing.php
diff --git a/PHPCI/Plugin/PhpCodeSniffer.php b/src/PHPCI/Plugin/PhpCodeSniffer.php
similarity index 100%
rename from PHPCI/Plugin/PhpCodeSniffer.php
rename to src/PHPCI/Plugin/PhpCodeSniffer.php
diff --git a/PHPCI/Plugin/PhpCpd.php b/src/PHPCI/Plugin/PhpCpd.php
similarity index 100%
rename from PHPCI/Plugin/PhpCpd.php
rename to src/PHPCI/Plugin/PhpCpd.php
diff --git a/PHPCI/Plugin/PhpCsFixer.php b/src/PHPCI/Plugin/PhpCsFixer.php
similarity index 100%
rename from PHPCI/Plugin/PhpCsFixer.php
rename to src/PHPCI/Plugin/PhpCsFixer.php
diff --git a/PHPCI/Plugin/PhpDocblockChecker.php b/src/PHPCI/Plugin/PhpDocblockChecker.php
similarity index 100%
rename from PHPCI/Plugin/PhpDocblockChecker.php
rename to src/PHPCI/Plugin/PhpDocblockChecker.php
diff --git a/PHPCI/Plugin/PhpLoc.php b/src/PHPCI/Plugin/PhpLoc.php
similarity index 100%
rename from PHPCI/Plugin/PhpLoc.php
rename to src/PHPCI/Plugin/PhpLoc.php
diff --git a/PHPCI/Plugin/PhpMessDetector.php b/src/PHPCI/Plugin/PhpMessDetector.php
similarity index 100%
rename from PHPCI/Plugin/PhpMessDetector.php
rename to src/PHPCI/Plugin/PhpMessDetector.php
diff --git a/PHPCI/Plugin/PhpParallelLint.php b/src/PHPCI/Plugin/PhpParallelLint.php
similarity index 100%
rename from PHPCI/Plugin/PhpParallelLint.php
rename to src/PHPCI/Plugin/PhpParallelLint.php
diff --git a/PHPCI/Plugin/PhpSpec.php b/src/PHPCI/Plugin/PhpSpec.php
similarity index 100%
rename from PHPCI/Plugin/PhpSpec.php
rename to src/PHPCI/Plugin/PhpSpec.php
diff --git a/PHPCI/Plugin/PhpTalLint.php b/src/PHPCI/Plugin/PhpTalLint.php
similarity index 100%
rename from PHPCI/Plugin/PhpTalLint.php
rename to src/PHPCI/Plugin/PhpTalLint.php
diff --git a/PHPCI/Plugin/PhpUnit.php b/src/PHPCI/Plugin/PhpUnit.php
similarity index 100%
rename from PHPCI/Plugin/PhpUnit.php
rename to src/PHPCI/Plugin/PhpUnit.php
diff --git a/PHPCI/Plugin/Shell.php b/src/PHPCI/Plugin/Shell.php
similarity index 100%
rename from PHPCI/Plugin/Shell.php
rename to src/PHPCI/Plugin/Shell.php
diff --git a/PHPCI/Plugin/SlackNotify.php b/src/PHPCI/Plugin/SlackNotify.php
similarity index 100%
rename from PHPCI/Plugin/SlackNotify.php
rename to src/PHPCI/Plugin/SlackNotify.php
diff --git a/PHPCI/Plugin/Sqlite.php b/src/PHPCI/Plugin/Sqlite.php
similarity index 100%
rename from PHPCI/Plugin/Sqlite.php
rename to src/PHPCI/Plugin/Sqlite.php
diff --git a/PHPCI/Plugin/TechnicalDebt.php b/src/PHPCI/Plugin/TechnicalDebt.php
similarity index 100%
rename from PHPCI/Plugin/TechnicalDebt.php
rename to src/PHPCI/Plugin/TechnicalDebt.php
diff --git a/PHPCI/Plugin/Util/ComposerPluginInformation.php b/src/PHPCI/Plugin/Util/ComposerPluginInformation.php
similarity index 100%
rename from PHPCI/Plugin/Util/ComposerPluginInformation.php
rename to src/PHPCI/Plugin/Util/ComposerPluginInformation.php
diff --git a/PHPCI/Plugin/Util/Executor.php b/src/PHPCI/Plugin/Util/Executor.php
similarity index 100%
rename from PHPCI/Plugin/Util/Executor.php
rename to src/PHPCI/Plugin/Util/Executor.php
diff --git a/PHPCI/Plugin/Util/Factory.php b/src/PHPCI/Plugin/Util/Factory.php
similarity index 100%
rename from PHPCI/Plugin/Util/Factory.php
rename to src/PHPCI/Plugin/Util/Factory.php
diff --git a/PHPCI/Plugin/Util/FilesPluginInformation.php b/src/PHPCI/Plugin/Util/FilesPluginInformation.php
similarity index 100%
rename from PHPCI/Plugin/Util/FilesPluginInformation.php
rename to src/PHPCI/Plugin/Util/FilesPluginInformation.php
diff --git a/PHPCI/Plugin/Util/InstalledPluginInformation.php b/src/PHPCI/Plugin/Util/InstalledPluginInformation.php
similarity index 100%
rename from PHPCI/Plugin/Util/InstalledPluginInformation.php
rename to src/PHPCI/Plugin/Util/InstalledPluginInformation.php
diff --git a/PHPCI/Plugin/Util/PluginInformationCollection.php b/src/PHPCI/Plugin/Util/PluginInformationCollection.php
similarity index 100%
rename from PHPCI/Plugin/Util/PluginInformationCollection.php
rename to src/PHPCI/Plugin/Util/PluginInformationCollection.php
diff --git a/PHPCI/Plugin/Util/TapParser.php b/src/PHPCI/Plugin/Util/TapParser.php
similarity index 100%
rename from PHPCI/Plugin/Util/TapParser.php
rename to src/PHPCI/Plugin/Util/TapParser.php
diff --git a/PHPCI/Plugin/Util/TestResultParsers/Codeception.php b/src/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
similarity index 100%
rename from PHPCI/Plugin/Util/TestResultParsers/Codeception.php
rename to src/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
diff --git a/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php b/src/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php
similarity index 100%
rename from PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php
rename to src/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php
diff --git a/PHPCI/Plugin/Wipe.php b/src/PHPCI/Plugin/Wipe.php
similarity index 100%
rename from PHPCI/Plugin/Wipe.php
rename to src/PHPCI/Plugin/Wipe.php
diff --git a/PHPCI/Plugin/Xmpp.php b/src/PHPCI/Plugin/Xmpp.php
similarity index 100%
rename from PHPCI/Plugin/Xmpp.php
rename to src/PHPCI/Plugin/Xmpp.php
diff --git a/PHPCI/ProcessControl/Factory.php b/src/PHPCI/ProcessControl/Factory.php
similarity index 100%
rename from PHPCI/ProcessControl/Factory.php
rename to src/PHPCI/ProcessControl/Factory.php
diff --git a/PHPCI/ProcessControl/PosixProcessControl.php b/src/PHPCI/ProcessControl/PosixProcessControl.php
similarity index 100%
rename from PHPCI/ProcessControl/PosixProcessControl.php
rename to src/PHPCI/ProcessControl/PosixProcessControl.php
diff --git a/PHPCI/ProcessControl/ProcessControlInterface.php b/src/PHPCI/ProcessControl/ProcessControlInterface.php
similarity index 100%
rename from PHPCI/ProcessControl/ProcessControlInterface.php
rename to src/PHPCI/ProcessControl/ProcessControlInterface.php
diff --git a/PHPCI/ProcessControl/UnixProcessControl.php b/src/PHPCI/ProcessControl/UnixProcessControl.php
similarity index 100%
rename from PHPCI/ProcessControl/UnixProcessControl.php
rename to src/PHPCI/ProcessControl/UnixProcessControl.php
diff --git a/PHPCI/ProcessControl/WindowsProcessControl.php b/src/PHPCI/ProcessControl/WindowsProcessControl.php
similarity index 100%
rename from PHPCI/ProcessControl/WindowsProcessControl.php
rename to src/PHPCI/ProcessControl/WindowsProcessControl.php
diff --git a/PHPCI/Service/BuildService.php b/src/PHPCI/Service/BuildService.php
similarity index 100%
rename from PHPCI/Service/BuildService.php
rename to src/PHPCI/Service/BuildService.php
diff --git a/PHPCI/Service/BuildStatusService.php b/src/PHPCI/Service/BuildStatusService.php
similarity index 100%
rename from PHPCI/Service/BuildStatusService.php
rename to src/PHPCI/Service/BuildStatusService.php
diff --git a/PHPCI/Service/ProjectService.php b/src/PHPCI/Service/ProjectService.php
similarity index 100%
rename from PHPCI/Service/ProjectService.php
rename to src/PHPCI/Service/ProjectService.php
diff --git a/PHPCI/Service/UserService.php b/src/PHPCI/Service/UserService.php
similarity index 100%
rename from PHPCI/Service/UserService.php
rename to src/PHPCI/Service/UserService.php
diff --git a/PHPCI/Store.php b/src/PHPCI/Store.php
similarity index 100%
rename from PHPCI/Store.php
rename to src/PHPCI/Store.php
diff --git a/PHPCI/Store/Base/BuildErrorStoreBase.php b/src/PHPCI/Store/Base/BuildErrorStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/BuildErrorStoreBase.php
rename to src/PHPCI/Store/Base/BuildErrorStoreBase.php
diff --git a/PHPCI/Store/Base/BuildMetaStoreBase.php b/src/PHPCI/Store/Base/BuildMetaStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/BuildMetaStoreBase.php
rename to src/PHPCI/Store/Base/BuildMetaStoreBase.php
diff --git a/PHPCI/Store/Base/BuildStoreBase.php b/src/PHPCI/Store/Base/BuildStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/BuildStoreBase.php
rename to src/PHPCI/Store/Base/BuildStoreBase.php
diff --git a/PHPCI/Store/Base/ProjectGroupStoreBase.php b/src/PHPCI/Store/Base/ProjectGroupStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/ProjectGroupStoreBase.php
rename to src/PHPCI/Store/Base/ProjectGroupStoreBase.php
diff --git a/PHPCI/Store/Base/ProjectStoreBase.php b/src/PHPCI/Store/Base/ProjectStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/ProjectStoreBase.php
rename to src/PHPCI/Store/Base/ProjectStoreBase.php
diff --git a/PHPCI/Store/Base/UserStoreBase.php b/src/PHPCI/Store/Base/UserStoreBase.php
similarity index 100%
rename from PHPCI/Store/Base/UserStoreBase.php
rename to src/PHPCI/Store/Base/UserStoreBase.php
diff --git a/PHPCI/Store/BuildErrorStore.php b/src/PHPCI/Store/BuildErrorStore.php
similarity index 100%
rename from PHPCI/Store/BuildErrorStore.php
rename to src/PHPCI/Store/BuildErrorStore.php
diff --git a/PHPCI/Store/BuildMetaStore.php b/src/PHPCI/Store/BuildMetaStore.php
similarity index 100%
rename from PHPCI/Store/BuildMetaStore.php
rename to src/PHPCI/Store/BuildMetaStore.php
diff --git a/PHPCI/Store/BuildStore.php b/src/PHPCI/Store/BuildStore.php
similarity index 100%
rename from PHPCI/Store/BuildStore.php
rename to src/PHPCI/Store/BuildStore.php
diff --git a/PHPCI/Store/ProjectGroupStore.php b/src/PHPCI/Store/ProjectGroupStore.php
similarity index 100%
rename from PHPCI/Store/ProjectGroupStore.php
rename to src/PHPCI/Store/ProjectGroupStore.php
diff --git a/PHPCI/Store/ProjectStore.php b/src/PHPCI/Store/ProjectStore.php
similarity index 100%
rename from PHPCI/Store/ProjectStore.php
rename to src/PHPCI/Store/ProjectStore.php
diff --git a/PHPCI/Store/UserStore.php b/src/PHPCI/Store/UserStore.php
similarity index 100%
rename from PHPCI/Store/UserStore.php
rename to src/PHPCI/Store/UserStore.php
diff --git a/PHPCI/View/Build/errors.phtml b/src/PHPCI/View/Build/errors.phtml
similarity index 100%
rename from PHPCI/View/Build/errors.phtml
rename to src/PHPCI/View/Build/errors.phtml
diff --git a/PHPCI/View/Build/header-row.phtml b/src/PHPCI/View/Build/header-row.phtml
similarity index 100%
rename from PHPCI/View/Build/header-row.phtml
rename to src/PHPCI/View/Build/header-row.phtml
diff --git a/PHPCI/View/Build/view.phtml b/src/PHPCI/View/Build/view.phtml
similarity index 100%
rename from PHPCI/View/Build/view.phtml
rename to src/PHPCI/View/Build/view.phtml
diff --git a/PHPCI/View/BuildStatus/view.phtml b/src/PHPCI/View/BuildStatus/view.phtml
similarity index 100%
rename from PHPCI/View/BuildStatus/view.phtml
rename to src/PHPCI/View/BuildStatus/view.phtml
diff --git a/PHPCI/View/BuildsTable.phtml b/src/PHPCI/View/BuildsTable.phtml
similarity index 100%
rename from PHPCI/View/BuildsTable.phtml
rename to src/PHPCI/View/BuildsTable.phtml
diff --git a/PHPCI/View/Email/layout.phtml b/src/PHPCI/View/Email/layout.phtml
similarity index 100%
rename from PHPCI/View/Email/layout.phtml
rename to src/PHPCI/View/Email/layout.phtml
diff --git a/PHPCI/View/Email/long.phtml b/src/PHPCI/View/Email/long.phtml
similarity index 100%
rename from PHPCI/View/Email/long.phtml
rename to src/PHPCI/View/Email/long.phtml
diff --git a/PHPCI/View/Email/short.phtml b/src/PHPCI/View/Email/short.phtml
similarity index 100%
rename from PHPCI/View/Email/short.phtml
rename to src/PHPCI/View/Email/short.phtml
diff --git a/PHPCI/View/Group/edit.phtml b/src/PHPCI/View/Group/edit.phtml
similarity index 100%
rename from PHPCI/View/Group/edit.phtml
rename to src/PHPCI/View/Group/edit.phtml
diff --git a/PHPCI/View/Group/index.phtml b/src/PHPCI/View/Group/index.phtml
similarity index 100%
rename from PHPCI/View/Group/index.phtml
rename to src/PHPCI/View/Group/index.phtml
diff --git a/PHPCI/View/Home/index.phtml b/src/PHPCI/View/Home/index.phtml
similarity index 100%
rename from PHPCI/View/Home/index.phtml
rename to src/PHPCI/View/Home/index.phtml
diff --git a/PHPCI/View/Plugin/index.phtml b/src/PHPCI/View/Plugin/index.phtml
similarity index 100%
rename from PHPCI/View/Plugin/index.phtml
rename to src/PHPCI/View/Plugin/index.phtml
diff --git a/PHPCI/View/Project/view.phtml b/src/PHPCI/View/Project/view.phtml
similarity index 100%
rename from PHPCI/View/Project/view.phtml
rename to src/PHPCI/View/Project/view.phtml
diff --git a/PHPCI/View/ProjectForm.phtml b/src/PHPCI/View/ProjectForm.phtml
similarity index 100%
rename from PHPCI/View/ProjectForm.phtml
rename to src/PHPCI/View/ProjectForm.phtml
diff --git a/PHPCI/View/Session.phtml b/src/PHPCI/View/Session.phtml
similarity index 100%
rename from PHPCI/View/Session.phtml
rename to src/PHPCI/View/Session.phtml
diff --git a/PHPCI/View/Session/forgotPassword.phtml b/src/PHPCI/View/Session/forgotPassword.phtml
similarity index 100%
rename from PHPCI/View/Session/forgotPassword.phtml
rename to src/PHPCI/View/Session/forgotPassword.phtml
diff --git a/PHPCI/View/Session/login.phtml b/src/PHPCI/View/Session/login.phtml
similarity index 100%
rename from PHPCI/View/Session/login.phtml
rename to src/PHPCI/View/Session/login.phtml
diff --git a/PHPCI/View/Session/resetPassword.phtml b/src/PHPCI/View/Session/resetPassword.phtml
similarity index 100%
rename from PHPCI/View/Session/resetPassword.phtml
rename to src/PHPCI/View/Session/resetPassword.phtml
diff --git a/PHPCI/View/Settings/index.phtml b/src/PHPCI/View/Settings/index.phtml
similarity index 100%
rename from PHPCI/View/Settings/index.phtml
rename to src/PHPCI/View/Settings/index.phtml
diff --git a/PHPCI/View/SummaryTable.phtml b/src/PHPCI/View/SummaryTable.phtml
similarity index 100%
rename from PHPCI/View/SummaryTable.phtml
rename to src/PHPCI/View/SummaryTable.phtml
diff --git a/PHPCI/View/User/index.phtml b/src/PHPCI/View/User/index.phtml
similarity index 100%
rename from PHPCI/View/User/index.phtml
rename to src/PHPCI/View/User/index.phtml
diff --git a/PHPCI/View/User/profile.phtml b/src/PHPCI/View/User/profile.phtml
similarity index 100%
rename from PHPCI/View/User/profile.phtml
rename to src/PHPCI/View/User/profile.phtml
diff --git a/PHPCI/View/UserForm.phtml b/src/PHPCI/View/UserForm.phtml
similarity index 100%
rename from PHPCI/View/UserForm.phtml
rename to src/PHPCI/View/UserForm.phtml
diff --git a/PHPCI/View/exception.phtml b/src/PHPCI/View/exception.phtml
similarity index 100%
rename from PHPCI/View/exception.phtml
rename to src/PHPCI/View/exception.phtml
diff --git a/PHPCI/View/layout.phtml b/src/PHPCI/View/layout.phtml
similarity index 100%
rename from PHPCI/View/layout.phtml
rename to src/PHPCI/View/layout.phtml
diff --git a/PHPCI/Worker/BuildWorker.php b/src/PHPCI/Worker/BuildWorker.php
similarity index 100%
rename from PHPCI/Worker/BuildWorker.php
rename to src/PHPCI/Worker/BuildWorker.php
diff --git a/PHPCI/ZeroConfigPlugin.php b/src/PHPCI/ZeroConfigPlugin.php
similarity index 100%
rename from PHPCI/ZeroConfigPlugin.php
rename to src/PHPCI/ZeroConfigPlugin.php
diff --git a/B8Framework/tests/CacheTest.php b/tests/B8Framework/CacheTest.php
similarity index 74%
rename from B8Framework/tests/CacheTest.php
rename to tests/B8Framework/CacheTest.php
index c9e46836..cffccd50 100755
--- a/B8Framework/tests/CacheTest.php
+++ b/tests/B8Framework/CacheTest.php
@@ -1,9 +1,8 @@
set('DisableCaching', true);
+ $config = new Config();
+ Config::getInstance()->set('DisableCaching', true);
$cache = Cache::getCache(Cache::TYPE_APC);
$this->assertFalse($cache->isEnabled());
$this->assertFalse($cache->set('anything', 10));
$this->assertTrue(is_null($cache->get('anything')));
- Registry::getInstance()->set('DisableCaching', false);
+ Config::getInstance()->set('DisableCaching', false);
}
public function testCaching()
diff --git a/B8Framework/tests/CodeGenerationTest.php b/tests/B8Framework/CodeGenerationTest.php
old mode 100755
new mode 100644
similarity index 93%
rename from B8Framework/tests/CodeGenerationTest.php
rename to tests/B8Framework/CodeGenerationTest.php
index d5121da4..e15afab4
--- a/B8Framework/tests/CodeGenerationTest.php
+++ b/tests/B8Framework/CodeGenerationTest.php
@@ -1,26 +1,11 @@
set('b8.app.namespace', 'Generation');
+ $config = new Config();
+ Config::getInstance()->set('b8.app.namespace', 'Generation');
self::$_db = Database::getConnection('write');
@@ -504,8 +490,9 @@ class CodeGenerationTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($dos instanceof Generation\Controller\Base\DosControllerBase);
$this->assertTrue($tres instanceof Generation\Controller\Base\TresControllerBase);
+ $config = new Config();
+ Config::getInstance()->set('hello', 'world');
- Registry::getInstance()->setParam('hello', 'world');
$this->assertTrue($uno->getParam('hello', 'dave') == 'world');
$uno->setParam('hello', 'dave');
@@ -630,7 +617,6 @@ class CodeGenerationTest extends \PHPUnit_Framework_TestCase
$this->assertTrue(is_array($list));
$this->assertTrue(count($list['items']) != 0);
- Registry::getInstance()->forceReset();
$uno->setParam('where', array('id' => 1000));
$uno->setParam('fuzzy', 'id');
$list = $uno->index();
diff --git a/B8Framework/tests/DatabaseGenerationTest.php b/tests/B8Framework/DatabaseGenerationTest.php
old mode 100755
new mode 100644
similarity index 82%
rename from B8Framework/tests/DatabaseGenerationTest.php
rename to tests/B8Framework/DatabaseGenerationTest.php
index 00674f7e..13865ff2
--- a/B8Framework/tests/DatabaseGenerationTest.php
+++ b/tests/B8Framework/DatabaseGenerationTest.php
@@ -1,13 +1,8 @@
_name, $this->_user, $this->_pass);
- \b8\Database::setWriteServers(array($this->_host));
+ Database::setDetails($this->_name, $this->_user, $this->_pass);
+ Database::setWriteServers(array($this->_host));
- $this->_db = \b8\Database::getConnection('write');
+ $this->_db = Database::getConnection('write');
$this->_db->query('DROP TABLE IF EXISTS tres');
$this->_db->query('DROP TABLE IF EXISTS dos');
diff --git a/tests/B8Framework/DatabaseTest.php b/tests/B8Framework/DatabaseTest.php
new file mode 100755
index 00000000..575b313a
--- /dev/null
+++ b/tests/B8Framework/DatabaseTest.php
@@ -0,0 +1,55 @@
+_name, $this->_user, $this->_pass);
+ Database::setReadServers(array($this->_host));
+
+ $connection = Database::getConnection('read');
+
+ $this->assertInstanceOf('\b8\Database', $connection);
+ }
+
+ public function testGetWriteConnection()
+ {
+ Database::setDetails($this->_name, $this->_user, $this->_pass);
+ Database::setWriteServers(array($this->_host));
+
+ $connection = Database::getConnection('write');
+
+ $this->assertInstanceOf('\b8\Database', $connection);
+ }
+
+ public function testGetDetails()
+ {
+ Database::setDetails($this->_name, $this->_user, $this->_pass);
+ Database::setReadServers(array('localhost'));
+
+ $details = Database::getConnection('read')->getDetails();
+ $this->assertTrue(is_array($details));
+ $this->assertTrue(($details['db'] == $this->_name));
+ $this->assertTrue(($details['user'] == $this->_user));
+ $this->assertTrue(($details['pass'] == $this->_pass));
+ }
+
+ /**
+ * @expectedException \Exception
+ */
+ public function testConnectionFailure()
+ {
+ Database::setDetails('non_existant', 'invalid_user', 'incorrect_password');
+ Database::setReadServers(array('localhost'));
+ Database::getConnection('read');
+ }
+}
\ No newline at end of file
diff --git a/B8Framework/tests/FormTest.php b/tests/B8Framework/FormTest.php
similarity index 77%
rename from B8Framework/tests/FormTest.php
rename to tests/B8Framework/FormTest.php
index e8973d9d..d113cfe7 100755
--- a/B8Framework/tests/FormTest.php
+++ b/tests/B8Framework/FormTest.php
@@ -1,27 +1,8 @@
assertTrue($f->getAction() == '/');
$this->assertTrue($f->getMethod() == 'POST');
- Registry::getInstance()->set('ViewPath', dirname(__FILE__) . '/data/view/');
+ $config = new Config();
+ Config::getInstance()->set('ViewPath', dirname(__FILE__) . '/data/view/');
$this->assertTrue($f->render('form') == '/POST');
- Registry::getInstance()->set('ViewPath', '');
+ Config::getInstance()->set('ViewPath', '');
$this->assertTrue(strpos((string)$f, '