From 6d27b30fe1bc05b111b66963194447cc8c00e3e9 Mon Sep 17 00:00:00 2001
From: Josh Pollock <josh@calderawp.com>
Date: Thu, 5 Apr 2018 14:15:43 -0400
Subject: [PATCH] start features

---
 Tests/Integration/EntryQueriesGeneratorsTest.php     |  6 +++---
 Tests/Integration/EntryQueriesTest.php               |  6 +++---
 Tests/Integration/Features/QueryByUserIdTest.php     |  4 ++--
 Tests/Integration/IntegrationTestCase.php            |  6 +++---
 Tests/Integration/TestsTest.php                      |  4 ++--
 Tests/Traits/HasFactories.php                        |  6 +++---
 Tests/Unit/EntryQueriesTest.php                      | 12 ++++++------
 Tests/Unit/TestCase.php                              |  2 +-
 Tests/bootstrap-integration.php                      |  5 +++--
 Tests/bootstrap.php                                  |  4 ++--
 composer.json                                        |  3 +--
 src/{QueriesEntries.php => CreatesSelectQueries.php} |  2 +-
 src/{EntryQueries.php => SelectsCreatesSelect.php}   |  2 +-
 13 files changed, 31 insertions(+), 31 deletions(-)
 rename src/{QueriesEntries.php => CreatesSelectQueries.php} (94%)
 rename src/{EntryQueries.php => SelectsCreatesSelect.php} (97%)

diff --git a/Tests/Integration/EntryQueriesGeneratorsTest.php b/Tests/Integration/EntryQueriesGeneratorsTest.php
index 2f7a464..1fb31c0 100644
--- a/Tests/Integration/EntryQueriesGeneratorsTest.php
+++ b/Tests/Integration/EntryQueriesGeneratorsTest.php
@@ -4,8 +4,8 @@
 namespace calderawp\CalderaFormsQuery\Tests\Integration;
 
 
-use calderawp\CalderaFormsQuery\EntryQueries;
-use calderawp\CalderaFormsQuery\QueriesEntries;
+use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
+use calderawp\CalderaFormsQuery\CreatesSelectQueries;
 use calderawp\CalderaFormsQuery\Select\EntryValues;
 use calderawp\CalderaFormsQuery\Tests\Traits\CanCreateEntryWithEmailField;
 use calderawp\CalderaFormsQuery\Tests\Traits\HasFactories;
@@ -18,7 +18,7 @@ class EntryQueriesGeneratorsTest extends IntegrationTestCase
 	/**
 	 * Test reset builder allows us to create new queries on generator
 	 *
-	 * @covers QueriesEntries::getEntryValueGenerator()
+	 * @covers CreatesSelectQueries::getEntryValueGenerator()
 	 * @covers EntryValues::resetQuery()
 	 */
 	public function testReset()
diff --git a/Tests/Integration/EntryQueriesTest.php b/Tests/Integration/EntryQueriesTest.php
index 50a2f59..d17ef6f 100644
--- a/Tests/Integration/EntryQueriesTest.php
+++ b/Tests/Integration/EntryQueriesTest.php
@@ -4,7 +4,7 @@
 namespace calderawp\CalderaFormsQuery\Tests\Integration;
 
 
-use calderawp\CalderaFormsQuery\EntryQueries;
+use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
 use calderawp\CalderaFormsQuery\Tests\Traits\CanCreateEntryWithEmailField;
 use calderawp\CalderaFormsQuery\Tests\Traits\HasFactories;
 use calderawp\CalderaFormsQuery\Tests\Traits\UsersMockFormAsDBForm;
@@ -26,7 +26,7 @@ class EntryQueriesTest extends IntegrationTestCase
 	/**
 	 * Test that getResults method runs queries against WordPress correctly
 	 *
-	 * @covers EntryQueries::getResults()
+	 * @covers SelectsCreatesSelect::getResults()
 	 */
 	public function testGetResultsCanDoSQL(){
 		$details = $this->create_entry( $this->mock_form );
@@ -44,7 +44,7 @@ class EntryQueriesTest extends IntegrationTestCase
 	/**
 	 * Test that we can run queries and the environment can update DB
 	 *
-	 * @covers EntryQueries::getResults()
+	 * @covers SelectsCreatesSelect::getResults()
 	 */
 	public function testCanQuery()
 	{
diff --git a/Tests/Integration/Features/QueryByUserIdTest.php b/Tests/Integration/Features/QueryByUserIdTest.php
index 2b5ec48..b96643d 100644
--- a/Tests/Integration/Features/QueryByUserIdTest.php
+++ b/Tests/Integration/Features/QueryByUserIdTest.php
@@ -2,7 +2,7 @@
 namespace calderawp\CalderaFormsQuery\Tests\Integration\Features;
 
 
-use calderawp\CalderaFormsQuery\QueriesEntries;
+use calderawp\CalderaFormsQuery\CreatesSelectQueries;
 use calderawp\CalderaFormsQuery\Tests\Integration\IntegrationTestCase;
 use calderawp\CalderaFormsQuery\Tests\Traits\CanCreateEntryWithEmailField;
 
@@ -14,7 +14,7 @@ class QueryByUserIdTest extends IntegrationTestCase
 	/**
 	 * Test selecting by entry ID
 	 *
-	 * @covers QueriesEntries::selectByUserId()
+	 * @covers CreatesSelectQueries::selectByUserId()
 	 */
 	public function testByUserId()
 	{
diff --git a/Tests/Integration/IntegrationTestCase.php b/Tests/Integration/IntegrationTestCase.php
index 7613a94..3d0a4d7 100755
--- a/Tests/Integration/IntegrationTestCase.php
+++ b/Tests/Integration/IntegrationTestCase.php
@@ -3,7 +3,7 @@
 
 namespace calderawp\CalderaFormsQuery\Tests\Integration;
 
-use calderawp\CalderaFormsQuery\EntryQueries;
+use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
 use calderawp\CalderaFormsQuery\Tests\Traits\HasFactories;
 use calderawp\CalderaFormsQuery\Tests\Traits\UsersMockFormAsDBForm;
 
@@ -57,12 +57,12 @@ abstract class IntegrationTestCase extends \WP_UnitTestCase
 	}
 
 	/**
-	 * @return EntryQueries
+	 * @return SelectsCreatesSelect
 	 */
 	protected function entryQueriesFactory()
 	{
 
-		return new EntryQueries(
+		return new SelectsCreatesSelect(
 			$this->entryGeneratorFactory(),
 			$this->entryValuesGeneratorFactory(),
 			$this->getWPDB()
diff --git a/Tests/Integration/TestsTest.php b/Tests/Integration/TestsTest.php
index 18cef29..6abb0d7 100644
--- a/Tests/Integration/TestsTest.php
+++ b/Tests/Integration/TestsTest.php
@@ -3,7 +3,7 @@
 
 namespace calderawp\CalderaFormsQuery\Tests\Integration;
 
-use calderawp\CalderaFormsQuery\EntryQueries;
+use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
 use calderawp\CalderaFormsQuery\Select\Entry;
 use calderawp\CalderaFormsQuery\Select\EntryValues;
 
@@ -45,7 +45,7 @@ class TestsTest extends IntegrationTestCase
 	 */
 	public function testFactory()
 	{
-		$this->assertTrue(is_a($this->entryQueriesFactory(), EntryQueries::class));
+		$this->assertTrue(is_a($this->entryQueriesFactory(), SelectsCreatesSelect::class));
 		$this->assertTrue(is_a($this->entryValuesGeneratorFactory(), EntryValues::class));
 		$this->assertTrue(is_a($this->entryGeneratorFactory(), Entry::class));
 
diff --git a/Tests/Traits/HasFactories.php b/Tests/Traits/HasFactories.php
index 378b308..5a2f7a5 100644
--- a/Tests/Traits/HasFactories.php
+++ b/Tests/Traits/HasFactories.php
@@ -3,7 +3,7 @@
 
 namespace calderawp\CalderaFormsQuery\Tests\Traits;
 
-use calderawp\CalderaFormsQuery\EntryQueries;
+use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
 
 trait HasFactories
 {
@@ -64,12 +64,12 @@ trait HasFactories
 
 
 	/**
-	 * @return EntryQueries
+	 * @return SelectsCreatesSelect
 	 */
 	protected function entryQueriesFactory()
 	{
 
-		return new EntryQueries(
+		return new SelectsCreatesSelect(
 			$this->entryGeneratorFactory(),
 			$this->entryValuesGeneratorFactory(),
 			$this->getWPDB()
diff --git a/Tests/Unit/EntryQueriesTest.php b/Tests/Unit/EntryQueriesTest.php
index 0ca9c6f..414619e 100644
--- a/Tests/Unit/EntryQueriesTest.php
+++ b/Tests/Unit/EntryQueriesTest.php
@@ -3,7 +3,7 @@
 
 namespace calderawp\CalderaFormsQuery\Tests\Unit;
 
-use calderawp\CalderaFormsQuery\EntryQueries;
+use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
 use calderawp\CalderaFormsQuery\Select\Entry;
 use calderawp\CalderaFormsQuery\Select\EntryValues;
 use calderawp\CalderaFormsQuery\Select\SelectQueryBuilder;
@@ -14,8 +14,8 @@ class EntryQueriesTest extends TestCase
 	/**
 	 * Test getting entry SQL generator
 	 *
-	 * @covers EntryQueries::getEntryGenerator()
-	 * @covers EntryQueries::$entryGenerator
+	 * @covers SelectsCreatesSelect::getEntryGenerator()
+	 * @covers SelectsCreatesSelect::$entryGenerator
 	 */
 	public function testGetEntryGenerator()
 	{
@@ -26,8 +26,8 @@ class EntryQueriesTest extends TestCase
 	/**
 	 * Test getting entry values SQL generator
 	 *
-	 * @covers EntryQueries::getEntryValueGenerator()
-	 * @covers EntryQueries::$entryValueGenerator
+	 * @covers SelectsCreatesSelect::getEntryValueGenerator()
+	 * @covers SelectsCreatesSelect::$entryValueGenerator
 	 */
 	public function testGetEntryValueGenerator()
 	{
@@ -38,7 +38,7 @@ class EntryQueriesTest extends TestCase
 	/**
 	 * Test that getResults method returns an array
 	 *
-	 * @covers EntryQueries::getResults()
+	 * @covers SelectsCreatesSelect::getResults()
 	 */
 	public function testGetResults()
 	{
diff --git a/Tests/Unit/TestCase.php b/Tests/Unit/TestCase.php
index d174e3a..6f7a68d 100755
--- a/Tests/Unit/TestCase.php
+++ b/Tests/Unit/TestCase.php
@@ -5,7 +5,7 @@ namespace calderawp\CalderaFormsQuery\Tests\Unit;
 
 //Import PHP unit test case.
 //Must be aliased to avoid having two classes of same name in scope.
-use calderawp\CalderaFormsQuery\EntryQueries;
+use calderawp\CalderaFormsQuery\SelectsCreatesSelect;
 use calderawp\CalderaFormsQuery\Tests\Traits\HasFactories;
 use PHPUnit\Framework\TestCase as FrameworkTestCase;
 
diff --git a/Tests/bootstrap-integration.php b/Tests/bootstrap-integration.php
index ba70ef1..bb15193 100755
--- a/Tests/bootstrap-integration.php
+++ b/Tests/bootstrap-integration.php
@@ -13,11 +13,12 @@ if (! $_tests_dir) {
 require_once $_tests_dir . '/includes/functions.php';
 
 /**
- * Manually load the plugin being tested and plugins it depends on
+ * Manually load the LIBRARY being tested and plugins it depends on
  */
 function _manually_load_plugin()
 {
-	require dirname(dirname(__FILE__)) . '/caldera-forms-query.php';
+	//Include autoloader
+	require dirname(dirname(__FILE__)) . '/vendor/autoload.php';
 	//Add Caldera Forms
 	require __DIR__ . '/plugins/caldera-forms/caldera-core.php';
 	//Add some Caldera Forms testing tools
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
index 6a6615d..49e01a4 100755
--- a/Tests/bootstrap.php
+++ b/Tests/bootstrap.php
@@ -4,8 +4,8 @@
  * This is the bootstrap file for Unit Tests -- run using composer unit-tests
  */
 
-//Manually include plugin
-include_once dirname(__FILE__, 2) . '/caldera-forms-query.php';
+//Autoloader
+require dirname(dirname(__FILE__)) . '/vendor/autoload.php';
 
 
 /** Translation compatibility */
diff --git a/composer.json b/composer.json
index cec96b3..a75cc4d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "calderawp/caldera-forms-query",
-    "description": "Example code for a plugin that modifies default post routes to improve search",
-    "type": "wordpress-plugin",
+    "description": "Caldera Forms Query Library",
     "license": "GPL-2.0",
     "authors": [
         {
diff --git a/src/QueriesEntries.php b/src/CreatesSelectQueries.php
similarity index 94%
rename from src/QueriesEntries.php
rename to src/CreatesSelectQueries.php
index d7f5c4e..0a26d99 100644
--- a/src/QueriesEntries.php
+++ b/src/CreatesSelectQueries.php
@@ -11,7 +11,7 @@ use calderawp\CalderaFormsQuery\Select\EntryValues;
  *
  * Interface that all classes that query for entries MUST impliment
  */
-interface QueriesEntries
+interface CreatesSelectQueries
 {
 	/**
 	 * Get generator for entry values SQL
diff --git a/src/EntryQueries.php b/src/SelectsCreatesSelect.php
similarity index 97%
rename from src/EntryQueries.php
rename to src/SelectsCreatesSelect.php
index 8fee874..8a67dd8 100644
--- a/src/EntryQueries.php
+++ b/src/SelectsCreatesSelect.php
@@ -11,7 +11,7 @@ use calderawp\CalderaFormsQuery\Select\EntryValues;
  *
  * Used to query entry data, using SQL created by genrators
  */
-class EntryQueries implements QueriesEntries
+class SelectsCreatesSelect implements CreatesSelectQueries
 {
 	/**
 	 * SQL generator for entry table
-- 
GitLab