Skip to content
Snippets Groups Projects
Commit 1d129def authored by Josh Pollock's avatar Josh Pollock
Browse files

format code

parent a37e480e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 98 additions and 123 deletions
Tests/Unit/EntryQueriesTest.php
+ 9
− 12
View file @ 1d129def
......@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery\Tests\Unit;
use calderawp\CalderaFormsQuery\EntryQueries;
use calderawp\CalderaFormsQuery\Select\Entry;
use calderawp\CalderaFormsQuery\Select\EntryValues;
......@@ -21,7 +20,7 @@ class EntryQueriesTest extends TestCase
public function testGetEntryGenerator()
{
$queries = $this->entryQueriesFactory();
$this->assertTrue( is_a( $queries->getEntryGenerator(), Entry::class) );
$this->assertTrue(is_a($queries->getEntryGenerator(), Entry::class));
}
/**
......@@ -32,19 +31,17 @@ class EntryQueriesTest extends TestCase
*/public function testGetEntryValueGenerator()
{
$queries = $this->entryQueriesFactory();
$this->assertTrue( is_a( $queries->getEntryValueGenerator(), EntryValues::class) );
}
$this->assertTrue(is_a($queries->getEntryValueGenerator(), EntryValues::class));
}
/**
* Test that getResults method returns an array
*
* @covers EntryQueries::getResults()
*/
public function testGetResults()
{
$queries = $this->entryQueriesFactory();
$this->assertTrue( is_array( $queries->getResults( "SELECT `roy` FROM sivan WHERE mike = 'roy'")));
}
}
\ No newline at end of file
public function testGetResults()
{
$queries = $this->entryQueriesFactory();
$this->assertTrue(is_array($queries->getResults("SELECT `roy` FROM sivan WHERE mike = 'roy'")));
}
}
Tests/Unit/MySqlBuilderTest.php
+ 5
− 7
View file @ 1d129def
......@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery\Tests\Unit;
use calderawp\CalderaFormsQuery\MySqlBuilder;
class MySqlBuilderTest extends TestCase
......@@ -24,13 +23,12 @@ class MySqlBuilderTest extends TestCase
$query
->where()
->equals( 'mike', 'roy')
->equals('mike', 'roy')
;
$builder->write( $query );
$builder->write($query);
$values = $builder->getValues();
$this->assertTrue(is_array( $values ) );
$this->assertArrayHasKey( '%1s', $values );
$this->assertTrue(is_array($values));
$this->assertArrayHasKey('%1s', $values);
}
}
\ No newline at end of file
}
Tests/Unit/Select/EntryTest.php
+ 10
− 12
View file @ 1d129def
......@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery\Tests\Unit\Select;
use calderawp\CalderaFormsQuery\Select\Entry;
use calderawp\CalderaFormsQuery\Tests\Unit\TestCase;
......@@ -19,12 +18,11 @@ class EntryTest extends TestCase
{
$expectedSql = "SELECT `wp_cf_form_entries`.* FROM `wp_cf_form_entries` WHERE (`wp_cf_form_entries`.`form_id` = 'cf12345')";
$entryGenerator = $this->entryGeneratorFactory();
$generator = $entryGenerator->queryByFormsId( 'cf12345');
$this->assertTrue( $this->isAEntry($generator) );
$generator = $entryGenerator->queryByFormsId('cf12345');
$this->assertTrue($this->isAEntry($generator));
$actualSql = $entryGenerator->getPreparedSql();
$this->assertEquals( $expectedSql, $actualSql );
$this->assertEquals($expectedSql, $actualSql);
}
/**
......@@ -36,11 +34,11 @@ class EntryTest extends TestCase
{
$expectedSql = "SELECT `wp_cf_form_entries`.* FROM `wp_cf_form_entries` WHERE (`wp_cf_form_entries`.`id` = '42')";
$entryGenerator = $this->entryGeneratorFactory();
$generator = $entryGenerator->queryByEntryId( 42);
$this->assertTrue( $this->isAEntry($generator) );
$generator = $entryGenerator->queryByEntryId(42);
$this->assertTrue($this->isAEntry($generator));
$actualSql = $entryGenerator->getPreparedSql();
$this->assertEquals( $expectedSql, $actualSql );
$this->assertEquals($expectedSql, $actualSql);
}
/**
......@@ -52,11 +50,11 @@ class EntryTest extends TestCase
{
$expectedSql = "SELECT `wp_cf_form_entries`.* FROM `wp_cf_form_entries` WHERE (`wp_cf_form_entries`.`user_id` = '42')";
$entryGenerator = $this->entryGeneratorFactory();
$generator = $entryGenerator->queryByUserId( 42);
$this->assertTrue( $this->isAEntry($generator) );
$generator = $entryGenerator->queryByUserId(42);
$this->assertTrue($this->isAEntry($generator));
$actualSql = $entryGenerator->getPreparedSql();
$this->assertEquals( $expectedSql, $actualSql );
$this->assertEquals($expectedSql, $actualSql);
}
/**
......@@ -67,4 +65,4 @@ class EntryTest extends TestCase
{
return is_a($generator, '\calderawp\CalderaFormsQuery\Select\Entry');
}
}
\ No newline at end of file
}
Tests/Unit/Select/EntryValuesTest.php
+ 9
− 10
View file @ 1d129def
......@@ -18,11 +18,11 @@ class EntryValuesTest extends TestCase
$expectedSql = "SELECT `cf_form_entry_values`.* FROM `cf_form_entry_values` WHERE (`cf_form_entry_values`.`value` = 'josh@calderawp.com') AND (`cf_form_entry_values`.`slug` = 'email_address')";
$entryValues = $this->entryValuesGeneratorFactory();
$generator = $entryValues->queryByFieldValue( 'email_address', 'josh@calderawp.com' );
$generator = $entryValues->queryByFieldValue('email_address', 'josh@calderawp.com');
$this->assertTrue($this->isAEntryValues($generator));
$actualSql = $entryValues->getPreparedSql();
$this->assertEquals( $expectedSql, $actualSql );
$this->assertEquals($expectedSql, $actualSql);
}
/**
......@@ -34,11 +34,11 @@ class EntryValuesTest extends TestCase
{
$expectedSql = "SELECT `cf_form_entry_values`.* FROM `cf_form_entry_values` WHERE (`cf_form_entry_values`.`value` <> 'josh@calderawp.com') AND (`cf_form_entry_values`.`slug` = 'email_address')";
$entryValues = $this->entryValuesGeneratorFactory();
$generator =$entryValues->queryByFieldValue( 'email_address', 'josh@calderawp.com','notEquals' );
$generator =$entryValues->queryByFieldValue('email_address', 'josh@calderawp.com', 'notEquals');
$this->assertTrue($this->isAEntryValues($generator));
$actualSql = $entryValues->getPreparedSql();
$this->assertEquals( $expectedSql, $actualSql );
$this->assertEquals($expectedSql, $actualSql);
}
/**
......@@ -52,11 +52,11 @@ class EntryValuesTest extends TestCase
$expectedSql = "SELECT `cf_form_entry_values`.* FROM `cf_form_entry_values` WHERE (`cf_form_entry_values`.`value` LIKE %josh@calderawp.com%)";
$entryValues = $this->entryValuesGeneratorFactory();
$generator = $entryValues->queryByFieldValue( 'email_address', 'josh@calderawp.com','like' );
$generator = $entryValues->queryByFieldValue('email_address', 'josh@calderawp.com', 'like');
$this->assertTrue($this->isAEntryValues($generator));
$actualSql = $entryValues->getPreparedSql();
$this->assertEquals( $expectedSql, $actualSql );
$this->assertEquals($expectedSql, $actualSql);
}
/**
......@@ -68,11 +68,11 @@ class EntryValuesTest extends TestCase
{
$expectedSql = "SELECT `cf_form_entry_values`.* FROM `cf_form_entry_values` WHERE (`cf_form_entry_values`.`entry_id` = '42')";
$entryValues = $this->entryValuesGeneratorFactory();
$generator = $entryValues->queryByEntryId( 42 );
$generator = $entryValues->queryByEntryId(42);
$this->assertTrue($this->isAEntryValues($generator));
$actualSql = $entryValues->getPreparedSql();
$this->assertEquals( $expectedSql, $actualSql );
$this->assertEquals($expectedSql, $actualSql);
}
/**
......@@ -83,5 +83,4 @@ class EntryValuesTest extends TestCase
{
return is_a($generator, '\calderawp\CalderaFormsQuery\Select\EntryValues');
}
}
\ No newline at end of file
}
Tests/Unit/Select/SelectQueryBuilderTest.php
+ 17
− 18
View file @ 1d129def
......@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery\Tests\Unit\Select;
use calderawp\CalderaFormsQuery\MySqlBuilder;
use calderawp\CalderaFormsQuery\Select\Entry;
use calderawp\CalderaFormsQuery\Select\EntryValues;
......@@ -23,10 +22,10 @@ class SelectQueryBuilderTest extends TestCase
public function testGetTableName()
{
$entry = $this->entryGeneratorFactory();
$this->assertEquals( 'wp_cf_form_entries', $entry->getTableName() );
$this->assertEquals('wp_cf_form_entries', $entry->getTableName());
$entryValues = $this->entryValuesGeneratorFactory();
$this->assertSame( 'cf_form_entry_values', $entryValues->getTableName() );
$this->assertSame('cf_form_entry_values', $entryValues->getTableName());
}
/**
......@@ -38,10 +37,10 @@ class SelectQueryBuilderTest extends TestCase
public function testGetBuilder()
{
$entry = $this->entryGeneratorFactory();
$this->assertTrue( is_a( $entry->getBuilder(), MySqlBuilder::class ) );
$this->assertTrue(is_a($entry->getBuilder(), MySqlBuilder::class));
$entryValues = $this->entryValuesGeneratorFactory();
$this->assertTrue( is_a( $entryValues->getBuilder(), MySqlBuilder::class ) );
$this->assertTrue(is_a($entryValues->getBuilder(), MySqlBuilder::class));
}
/**
......@@ -53,10 +52,10 @@ class SelectQueryBuilderTest extends TestCase
public function testGetSelectQuery()
{
$entry = $this->entryGeneratorFactory();
$this->assertTrue( is_a( $entry->getSelectQuery(), Select::class ) );
$this->assertTrue(is_a($entry->getSelectQuery(), Select::class));
$entryValues = $this->entryValuesGeneratorFactory();
$this->assertTrue( is_a( $entryValues->getSelectQuery(), Select::class ) );
$this->assertTrue(is_a($entryValues->getSelectQuery(), Select::class));
}
/**
......@@ -68,10 +67,10 @@ class SelectQueryBuilderTest extends TestCase
{
$entry = $this->entryGeneratorFactory();
$expectedSql = "SELECT `wp_cf_form_entries`.* FROM `wp_cf_form_entries` WHERE (`wp_cf_form_entries`.`form_id` = 'cf12345') ORDER BY `wp_cf_form_entries`.`form_id` DESC";
$entry->queryByFormsId( 'cf12345' );
$entry->addOrderBy( 'form_id', false );
$entry->queryByFormsId('cf12345');
$entry->addOrderBy('form_id', false);
$actualSql = $entry->getPreparedSql();
$this->assertEquals( $expectedSql, $actualSql );
$this->assertEquals($expectedSql, $actualSql);
}
/**
......@@ -83,10 +82,10 @@ class SelectQueryBuilderTest extends TestCase
{
$entry = $this->entryGeneratorFactory();
$expectedSql = "SELECT `wp_cf_form_entries`.* FROM `wp_cf_form_entries` WHERE (`wp_cf_form_entries`.`form_id` = 'cf12345') ORDER BY `wp_cf_form_entries`.`form_id` ASC";
$entry->queryByFormsId( 'cf12345' );
$entry->addOrderBy( 'form_id' );
$entry->queryByFormsId('cf12345');
$entry->addOrderBy('form_id');
$actualSql = $entry->getPreparedSql();
$this->assertEquals( $expectedSql, $actualSql );
$this->assertEquals($expectedSql, $actualSql);
}
/**
......@@ -96,8 +95,8 @@ class SelectQueryBuilderTest extends TestCase
*/
public function testAscConstant()
{
$this->assertEquals( Entry::ASC, 'ASC' );
$this->assertEquals( EntryValues::ASC, 'ASC' );
$this->assertEquals(Entry::ASC, 'ASC');
$this->assertEquals(EntryValues::ASC, 'ASC');
}
/**
......@@ -107,7 +106,7 @@ class SelectQueryBuilderTest extends TestCase
*/
public function testDescConstant()
{
$this->assertEquals( Entry::DESC, 'DESC' );
$this->assertEquals( EntryValues::DESC, 'DESC' );
$this->assertEquals(Entry::DESC, 'DESC');
$this->assertEquals(EntryValues::DESC, 'DESC');
}
}
\ No newline at end of file
}
src/DoesQueries.php
+ 1
− 3
View file @ 1d129def
......@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery;
interface DoesQueries
{
......@@ -27,5 +26,4 @@ interface DoesQueries
* @return MySqlBuilder
*/
public function getBuilder();
}
\ No newline at end of file
}
src/EntryQueries.php
+ 5
− 9
View file @ 1d129def
......@@ -3,9 +3,6 @@
namespace calderawp\CalderaFormsQuery;
use calderawp\CalderaFormsQuery\Select\Entry;
use calderawp\CalderaFormsQuery\Select\EntryValues;
......@@ -31,7 +28,7 @@ class EntryQueries implements QueriesEntries
*/
protected $wpdb;
public function __construct( Entry $entryGenerator, EntryValues $entryValueGenerator, \wpdb $wpdb )
public function __construct(Entry $entryGenerator, EntryValues $entryValueGenerator, \wpdb $wpdb)
{
$this->entryGenerator = $entryGenerator;
$this->entryValueGenerator = $entryValueGenerator;
......@@ -39,10 +36,10 @@ class EntryQueries implements QueriesEntries
}
/** @inheritdoc */
public function getResults( $sql )
public function getResults($sql)
{
$results = $this->wpdb->get_results( $sql );
if( empty( $results ) ){
$results = $this->wpdb->get_results($sql);
if (empty($results)) {
return [];
}
return $results;
......@@ -59,5 +56,4 @@ class EntryQueries implements QueriesEntries
{
return $this->entryGenerator;
}
}
\ No newline at end of file
}
src/MySqlBuilder.php
+ 3
− 6
View file @ 1d129def
......@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery;
use NilPortugues\Sql\QueryBuilder\Builder\Syntax\PlaceholderWriter;
class MySqlBuilder extends \NilPortugues\Sql\QueryBuilder\Builder\MySqlBuilder
......@@ -20,13 +19,11 @@ class MySqlBuilder extends \NilPortugues\Sql\QueryBuilder\Builder\MySqlBuilder
*
* @param PlaceholderWriter|null $writer
*/
public function setPlaceHolderWriter( PlaceholderWriter $writer = null )
public function setPlaceHolderWriter(PlaceholderWriter $writer = null)
{
if( $writer ){
if ($writer) {
$this->placeholderWriter = $writer;
}
$this->placeholderWriter = new SprintfPlaceHolderWriter();
}
}
\ No newline at end of file
}
src/QueriesEntries.php
+ 2
− 4
View file @ 1d129def
......@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery;
use calderawp\CalderaFormsQuery\Select\Entry;
use calderawp\CalderaFormsQuery\Select\EntryValues;
......@@ -26,6 +25,5 @@ interface QueriesEntries
* @param $sql
* @return \stdClass[]
*/
public function getResults( $sql );
}
\ No newline at end of file
public function getResults($sql);
}
src/Select/DoesSelectQuery.php
+ 1
− 2
View file @ 1d129def
......@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery\Select;
use NilPortugues\Sql\QueryBuilder\Manipulation\Select;
interface DoesSelectQuery
......@@ -15,4 +14,4 @@ interface DoesSelectQuery
* @return Select
*/
public function getSelectQuery();
}
\ No newline at end of file
}
src/Select/Entry.php
+ 4
− 5
View file @ 1d129def
......@@ -25,17 +25,16 @@ class Entry extends SelectQueryBuilder
*/
public function queryByFormsId($formId)
{
return $this->is( 'form_id', $formId );
return $this->is('form_id', $formId);
}
public function queryByEntryId($entryId)
{
return $this->is( 'id', $entryId );
return $this->is('id', $entryId);
}
public function queryByUserId($userId)
{
return $this->is( 'user_id', $userId );
return $this->is('user_id', $userId);
}
}
\ No newline at end of file
}
src/Select/EntryValues.php
+ 11
− 14
View file @ 1d129def
......@@ -3,7 +3,6 @@
namespace calderawp\CalderaFormsQuery\Select;
class EntryValues extends SelectQueryBuilder
{
......@@ -14,12 +13,12 @@ class EntryValues extends SelectQueryBuilder
* @param $entryId
* @return $this
*/
public function queryByEntryId( $entryId )
public function queryByEntryId($entryId)
{
$this
->getSelectQuery()
->where()
->equals('entry_id', $entryId )
->equals('entry_id', $entryId)
;
return $this;
}
......@@ -33,29 +32,28 @@ class EntryValues extends SelectQueryBuilder
* @param string $whereOperator Optional. Type of where. Default is 'AND'. Any valid MySQL where operator is accepted
* @return $this
*/
public function queryByFieldValue( $fieldSlug, $fieldValue, $type = 'equals', $whereOperator = 'AND' )
public function queryByFieldValue($fieldSlug, $fieldValue, $type = 'equals', $whereOperator = 'AND')
{
switch ( $type ){
switch ($type) {
case 'equals':
$this
->getSelectQuery()
->where($whereOperator )
->equals('value', $fieldValue )
->where($whereOperator)
->equals('value', $fieldValue)
;
break;
case 'notEquals':
$this->
getSelectQuery()
->where( $whereOperator )
->notEquals( 'value', $fieldValue );
->where($whereOperator)
->notEquals('value', $fieldValue);
break;
case 'like':
$this->
getSelectQuery()
->where( $whereOperator )
->like( 'value', $fieldValue );
->where($whereOperator)
->like('value', $fieldValue);
break;
}
$this->isLike = 'like' === $type ? true : false;
......@@ -66,5 +64,4 @@ class EntryValues extends SelectQueryBuilder
return $this;
}
}
\ No newline at end of file
}
src/Select/SelectQueryBuilder.php
+ 20
− 20
View file @ 1d129def
......@@ -2,6 +2,7 @@
namespace calderawp\CalderaFormsQuery\Select;
use calderawp\CalderaFormsQuery\DoesQueries;
use calderawp\CalderaFormsQuery\MySqlBuilder;
use NilPortugues\Sql\QueryBuilder\Manipulation\Select;
......@@ -29,7 +30,7 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
/**
* @var string
*/
private $tableName;
private $tableName;
/**
......@@ -37,7 +38,7 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
* @param MySqlBuilder $builder Query builder
* @param string $tableName Name of table
*/
public function __construct( MySqlBuilder $builder, $tableName )
public function __construct(MySqlBuilder $builder, $tableName)
{
$this->builder = $builder;
$this->tableName = $tableName;
......@@ -57,18 +58,19 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
/** @inheritdoc */
public function getSelectQuery(){
public function getSelectQuery()
{
if (empty($this->query)) {
$this->query = new \NilPortugues\Sql\QueryBuilder\Manipulation\Select($this->getTableName());
}
return $this->query;
}
/** @inheritdoc */
public function getPreparedSql(){
return $this->substituteValues( $this->getBuilder()->write( $this->getSelectQuery() ));
public function getPreparedSql()
{
return $this->substituteValues($this->getBuilder()->write($this->getSelectQuery()));
}
/**
......@@ -76,9 +78,10 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
* @param bool $ascending Optional. To use ascending order? If false, descending is used. True is the default.
* @return $this
*/
public function addOrderBy( $column, $ascending = true ){
public function addOrderBy($column, $ascending = true)
{
$order = $ascending ? self::ASC : self::DESC;
$this->getSelectQuery()->orderBy( $column, $order );
$this->getSelectQuery()->orderBy($column, $order);
return $this;
}
......@@ -89,11 +92,11 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
* @param string $value
* @return $this
*/
protected function is($column, $value )
protected function is($column, $value)
{
$this->getSelectQuery()
->where()
->equals( $column, $value );
->equals($column, $value);
return $this;
}
......@@ -104,13 +107,13 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
* @param string $sql SQL query with substitutions
* @return string
*/
protected function substituteValues( $sql )
protected function substituteValues($sql)
{
$values = $this->builder->getValues();
foreach ( $values as $identifier => $value ) {
$values[ $identifier ] = $this->surroundValue( $value );
foreach ($values as $identifier => $value) {
$values[$identifier] = $this->surroundValue($value);
}
return str_replace( array_keys( $values ), array_values( $values ), $sql ) ;
return str_replace(array_keys($values), array_values($values), $sql);
}
/**
......@@ -127,11 +130,8 @@ abstract class SelectQueryBuilder implements DoesQueries, DoesSelectQuery
* @param string $value Value to surround
* @return string
*/
protected function surroundValue( $value ){
protected function surroundValue($value)
{
return "{$this->getDeliminator()}$value{$this->getDeliminator()}";
}
}
\ No newline at end of file
}
src/SprintfPlaceHolderWriter.php
+ 1
− 1
View file @ 1d129def
......@@ -18,4 +18,4 @@ class SprintfPlaceHolderWriter extends PlaceholderWriter
return $placeholderKey;
}
}
\ No newline at end of file
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment