Updated structure to be more consistent and added vendor namespace.

zumba · Feb 11, 2013 · 4b7409c · 4b7409c
1 parent 890d0e1
commit 4b7409c
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 28 deletions.
diff --git a/Samples/PizzaTest.php → examples/PizzaTest.php b/Samples/PizzaTest.php → examples/PizzaTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class PizzaTest extends \PHPUnit\Extensions\Mongo\TestCase {
+class PizzaTest extends \Zumba\PHPUnit\Extensions\Mongo\TestCase {
 
 	const DEFAULT_DATABASE = 'mongounit_test';
 
@@ -20,15 +20,15 @@ public function setUp() {
 
 	public function getConnection() {
 		if (empty($this->connection)) {
-			$this->connection = new \PHPUnit\Extensions\Mongo\Client\Connector(new \MongoClient());
+			$this->connection = new \Zumba\PHPUnit\Extensions\Mongo\Client\Connector(new \MongoClient());
 			$this->connection->setDb(static::DEFAULT_DATABASE);
 		}
 		return $this->connection;
 	}
 
 	public function getDataSet() {
 		if (empty($this->dataSet)) {
-			$this->dataSet = new PHPUnit\Extensions\Mongo\DataSet\DataSet($this->getConnection());
+			$this->dataSet = new \Zumba\PHPUnit\Extensions\Mongo\DataSet\DataSet($this->getConnection());
 			$this->dataSet->setFixture($this->fixture);
 		}
 		return $this->dataSet;

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <phpunit backupGlobals="false"
 		 backupStaticAttributes="false"
-		 bootstrap="./PHPUnit/Extensions/Mongo/AutoLoader.php"
+		 bootstrap="./src/Zumba/PHPUnit/Extensions/Mongo/AutoLoader.php"
 		 convertErrorsToExceptions="true"
 		 convertNoticesToExceptions="true"
 		 convertWarningsToExceptions="true"
@@ -12,21 +12,21 @@
 		 colors="true">
 	<testsuites>
 		<testsuite name="Core Test Suite">
-			<directory suffix="Test.php">./Tests</directory>
+			<directory suffix="Test.php">./tests</directory>
 		</testsuite>
 		<testsuite name="Sample Test">
-			<directory suffix="Test.php">./Samples</directory>
+			<directory suffix="Test.php">./examples</directory>
 		</testsuite>
 	</testsuites>
 	<filter>
 		<blacklist>
-			<file>./PHPUnit/Extensions\Mongo\AutoLoader.php</file>
-			<directory>./Tests</directory>
+			<file>./src/Zumba/PHPUnit/Extensions/Mongo/AutoLoader.php</file>
+			<directory>./tests</directory>
 		</blacklist>
 		<whitelist addUncoveredFilesFromWhitelist="true">
-			<directory>./PHPUnit</directory>
+			<directory>./src/Zumba/PHPUnit</directory>
 			<exclude>
-				<file>./PHPUnit/Extensions\Mongo\AutoLoader.php</file>
+				<file>./src/Zumba/PHPUnit/Extensions/Mongo/AutoLoader.php</file>
 			</exclude>
 		</whitelist>
 	</filter>

diff --git a/PHPUnit/Extensions/Mongo/AutoLoader.php → ...a/PHPUnit/Extensions/Mongo/AutoLoader.php b/PHPUnit/Extensions/Mongo/AutoLoader.php → ...a/PHPUnit/Extensions/Mongo/AutoLoader.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace PHPUnit\Extensions\Mongo;
+namespace Zumba\PHPUnit\Extensions\Mongo;
 
 spl_autoload_register(function($classname) {
 	$namespaces = array(
-		'PHPUnit' => array(dirname(dirname(dirname(__DIR__))) . '/')
+		'Zumba' => array(dirname(dirname(dirname(dirname(__DIR__)))) . '/')
 	);
 	$classname = ltrim($classname, '\\');
 	foreach ($namespaces as $ns => $paths) {

diff --git a/PHPUnit/Extensions/Mongo/Base/Connector.php → ...PUnit/Extensions/Mongo/Base/Connector.php b/PHPUnit/Extensions/Mongo/Base/Connector.php → ...PUnit/Extensions/Mongo/Base/Connector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPUnit\Extensions\Mongo\Base;
+namespace Zumba\PHPUnit\Extensions\Mongo\Base;
 
 interface Connector {
 

diff --git a/...nit/Extensions/Mongo/Client/Connector.php → ...nit/Extensions/Mongo/Client/Connector.php b/...nit/Extensions/Mongo/Client/Connector.php → ...nit/Extensions/Mongo/Client/Connector.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace PHPUnit\Extensions\Mongo\Client;
-use PHPUnit\Extensions\Mongo\Base\Connector as BaseConnector;
+namespace Zumba\PHPUnit\Extensions\Mongo\Client;
+use Zumba\PHPUnit\Extensions\Mongo\Base\Connector as BaseConnector;
 
 class Connector implements BaseConnector {
 

diff --git a/PHPUnit/Extensions/Mongo/DataSet/DataSet.php → ...Unit/Extensions/Mongo/DataSet/DataSet.php b/PHPUnit/Extensions/Mongo/DataSet/DataSet.php → ...Unit/Extensions/Mongo/DataSet/DataSet.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace PHPUnit\Extensions\Mongo\DataSet;
-use \PHPUnit\Extensions\Mongo\Client\Connector;
+namespace Zumba\PHPUnit\Extensions\Mongo\DataSet;
+use \Zumba\PHPUnit\Extensions\Mongo\Client\Connector;
 
 class DataSet {
 
@@ -17,14 +17,14 @@ class DataSet {
 	/**
 	 * Connection object.
 	 *
-	 * @var PHPUnit\Extensions\Mongo\Client\Connector
+	 * @var Zumba\PHPUnit\Extensions\Mongo\Client\Connector
 	 */
 	protected $connection;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param PHPUnit\Extensions\Mongo\Client\Connector
+	 * @param Zumba\PHPUnit\Extensions\Mongo\Client\Connector
 	 */
 	public function __construct(Connector $connection) {
 		$this->connection = $connection;
@@ -36,7 +36,7 @@ public function __construct(Connector $connection) {
 	 * see $this->fixture
 	 *
 	 * @param array $data
-	 * @return PHPUnit\Extensions\Mongo\DataSet\DataSet
+	 * @return Zumba\PHPUnit\Extensions\Mongo\DataSet\DataSet
 	 */
 	public function setFixture(array $data) {
 		$this->fixture = $data;
@@ -46,7 +46,7 @@ public function setFixture(array $data) {
 	/**
 	 * Drops all collections specified in the fixture keys.
 	 *
-	 * @return PHPUnit\Extensions\Mongo\DataSet\DataSet
+	 * @return Zumba\PHPUnit\Extensions\Mongo\DataSet\DataSet
 	 */
 	public function dropAllCollections() {
 		foreach (array_keys($this->fixture) as $collection) {
@@ -58,7 +58,7 @@ public function dropAllCollections() {
 	/**
 	 * Creates all collections with data from the fixture.
 	 *
-	 * @return PHPUnit\Extensions\Mongo\DataSet\DataSet
+	 * @return Zumba\PHPUnit\Extensions\Mongo\DataSet\DataSet
 	 */
 	public function buildCollections() {
 		foreach ($this->fixture as $collection => $data) {

diff --git a/PHPUnit/Extensions/Mongo/TestCase.php → ...mba/PHPUnit/Extensions/Mongo/TestCase.php b/PHPUnit/Extensions/Mongo/TestCase.php → ...mba/PHPUnit/Extensions/Mongo/TestCase.php
@@ -1,7 +1,7 @@
 <?php
 
-namespace PHPUnit\Extensions\Mongo;
-use PHPUnit\Extensions\Mongo\DataSet\DataSet;
+namespace Zumba\PHPUnit\Extensions\Mongo;
+use \Zumba\PHPUnit\Extensions\Mongo\DataSet\DataSet;
 
 abstract class TestCase extends \PHPUnit_Framework_TestCase {
 
@@ -34,14 +34,14 @@ public function tearDown() {
 	/**
 	 * Retrieve a mongo connection client.
 	 *
-	 * @return PHPUnit\Extensions\Mongo\Client\Connector
+	 * @return Zumba\PHPUnit\Extensions\Mongo\Client\Connector
 	 */
 	protected abstract function getConnection();
 
 	/**
 	 * Retrieve a dataset object.
 	 *
-	 * @return PHPUnit\Extensions\Mongo\DataSet\DataSet
+	 * @return Zumba\PHPUnit\Extensions\Mongo\DataSet\DataSet
 	 */
 	protected abstract function getDataSet();
 

diff --git a/...Extensions/Mongo/Client/ConnectorTest.php → ...Extensions/Mongo/Client/ConnectorTest.php b/...Extensions/Mongo/Client/ConnectorTest.php → ...Extensions/Mongo/Client/ConnectorTest.php
@@ -1,13 +1,13 @@
 <?php
 
-use PHPUnit\Extensions\Mongo\Client\Connector;
+use Zumba\PHPUnit\Extensions\Mongo\Client\Connector;
 
 class ConnectorTest extends \PHPUnit_Framework_TestCase {
 
 	public function testGeneralConnection() {
 		$connection = new Connector(new \MongoClient());
 		$connection->setDb('test');
-		$this->assertInstanceOf('PHPUnit\Extensions\Mongo\Client\Connector', $connection);
+		$this->assertInstanceOf('Zumba\PHPUnit\Extensions\Mongo\Client\Connector', $connection);
 		$connection->collection('test')->insert(array(
 			'document' => 'test document'
 		));