start features

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()

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()
 	{

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()
 	{

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()

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));
 

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()

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()
 	{

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;
 

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

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 */

composer.json

 {
     "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": [
         {

src/QueriesEntries.php → 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

src/EntryQueries.php → 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