diff --git a/Tests/Integration/EntryQueriesGeneratorsTest.php b/Tests/Integration/EntryQueriesGeneratorsTest.php
index 2f7a464e4c23f143b0fc5c2368906bee478f42ca..1fb31c04eaaa75ea19bf28cec1fb67a1d1e32d32 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 50a2f59eb39a6ea0c95a228ba22653d529233b7b..d17ef6ff74ed4b388c7df204084cff6f712096bc 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 2b5ec488f6f3ff3b67d5483a4ca167d02fb0a426..b96643da4fa2c69f874a77f32746bd21eda1f44c 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 7613a946b7cacc3b2fe25d129ce015410f6194eb..3d0a4d7fb545738742035522462c3ce21a486265 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 18cef29724b10b03e33adc63fcef8542ba36eb7e..6abb0d7c597a53472d18adda3ef1da0adf306890 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 378b308d21a3166b936efeddfc633cedcef80733..5a2f7a59d9fb8a31a2b6c9d6538ab3a3273df313 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 0ca9c6f4be05ec61eabe99bde91838e7fabd5175..414619e645d667d138e06d728f57721d720ef354 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 d174e3a844362fe3c3950073793ef214ff4e237f..6f7a68deb5f0fa823075f28d4f14eed83e306d26 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 ba70ef1c15e807546bbe709c52f3753434122a78..bb15193a9cd518358df5403acd793934d8f17016 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 6a6615d0e579c11c7734892962aaf6784eb2f10c..49e01a418d3b7859a2534d47ae75732759d44533 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 cec96b39e86836b7f5cd2087f5b7ac75c3905597..a75cc4d39e7d86d2f36244c213f9562b10b1975f 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 d7f5c4ef6ec60e49a6ea00dbc5403fd4fb2831e3..0a26d997f6e18c04d1b712d7cd152e97a8c88dbf 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 8fee8745c51677ee9bf81d3a29569911707dadea..8a67dd8d2b15b6175bfdc46964c65a23ba7be925 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