diff options
| author | Damian Dlugosz <bigfootdd@gmail.com> | 2017-01-03 22:06:01 +0100 |
|---|---|---|
| committer | Damian Dlugosz <bigfootdd@gmail.com> | 2017-01-06 00:11:32 +0100 |
| commit | a6e45c5e2e006bbd90306e1e947e25e601965657 (patch) | |
| tree | 07fbbdbe95d08721e97b6683226ad3a26a6e9886 /tests | |
| parent | 082a1fad6c64f455ac42698cb9c7a08f0347a2c0 (diff) | |
| download | sql-parser-a6e45c5e2e006bbd90306e1e947e25e601965657.zip sql-parser-a6e45c5e2e006bbd90306e1e947e25e601965657.tar.gz sql-parser-a6e45c5e2e006bbd90306e1e947e25e601965657.tar.bz2 | |
Apply php-cs-fixer
Diffstat (limited to 'tests')
60 files changed, 200 insertions, 311 deletions
diff --git a/tests/Builder/AlterStatementTest.php b/tests/Builder/AlterStatementTest.php index d080b94..6cd6631 100644 --- a/tests/Builder/AlterStatementTest.php +++ b/tests/Builder/AlterStatementTest.php @@ -3,12 +3,10 @@ namespace SqlParser\Tests\Builder; use SqlParser\Parser; - use SqlParser\Tests\TestCase; class AlterStatementTest extends TestCase { - public function testBuilder() { $query = 'ALTER TABLE `actor` ' . diff --git a/tests/Builder/CreateStatementTest.php b/tests/Builder/CreateStatementTest.php index ae906b3..2e7b611 100644 --- a/tests/Builder/CreateStatementTest.php +++ b/tests/Builder/CreateStatementTest.php @@ -9,12 +9,10 @@ use SqlParser\Components\CreateDefinition; use SqlParser\Components\Key; use SqlParser\Components\OptionsArray; use SqlParser\Statements\CreateStatement; - use SqlParser\Tests\TestCase; class CreateStatementTest extends TestCase { - public function testBuilder() { $parser = new Parser( @@ -45,16 +43,16 @@ class CreateStatementTest extends TestCase public function testBuilderDefaultInt() { $parser = new Parser( - "CREATE TABLE IF NOT EXISTS t1 (" . + 'CREATE TABLE IF NOT EXISTS t1 (' . " c1 int(11) NOT NULL DEFAULT '0' COMMENT 'xxx'" . - ") ENGINE=MyISAM" + ') ENGINE=MyISAM' ); $stmt = $parser->statements[0]; $this->assertEquals( "CREATE TABLE IF NOT EXISTS t1 (\n" . " `c1` int(11) NOT NULL DEFAULT '0' COMMENT 'xxx'\n" . - ") ENGINE=MyISAM", + ') ENGINE=MyISAM', $stmt->build() ); } @@ -62,18 +60,18 @@ class CreateStatementTest extends TestCase public function testBuilderDefaultComment() { $parser = new Parser( - "CREATE TABLE `wp_audio` (" . + 'CREATE TABLE `wp_audio` (' . " `somedata` int(11) DEFAULT NULL COMMENT 'ma data', " . - " `someinfo` int(11) DEFAULT NULL COMMENT 'ma info' ". - " )" + " `someinfo` int(11) DEFAULT NULL COMMENT 'ma info' " . + ' )' ); $stmt = $parser->statements[0]; $this->assertEquals( "CREATE TABLE `wp_audio` (\n" . " `somedata` int(11) DEFAULT NULL COMMENT 'ma data',\n" . - " `someinfo` int(11) DEFAULT NULL COMMENT 'ma info'\n". - ") ", + " `someinfo` int(11) DEFAULT NULL COMMENT 'ma info'\n" . + ') ', $stmt->build() ); } @@ -95,14 +93,14 @@ class CreateStatementTest extends TestCase '', null, new Key('', array(array('name' => 'id')), 'PRIMARY KEY') - ) + ), ); $this->assertEquals( "CREATE TABLE `test` (\n" . " `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,\n" . " PRIMARY KEY (`id`)\n" . - ") ", + ') ', $stmt->build() ); @@ -118,26 +116,24 @@ class CreateStatementTest extends TestCase " PRIMARY KEY (`id`),\n" . " UNIQUE KEY `jos_section_value_value_aro` (`section_value`(100),`value`(15)) USING BTREE,\n" . " KEY `jos_gacl_hidden_aro` (`hidden`)\n" . - ") ENGINE=InnoDB DEFAULT CHARSET=latin1"; + ') ENGINE=InnoDB DEFAULT CHARSET=latin1'; $parser = new Parser($query); $this->assertEquals($query, $parser->statements[0]->build()); /* Assertion 3 */ - $query = "CREATE TABLE `table_copy` LIKE `old_table`"; + $query = 'CREATE TABLE `table_copy` LIKE `old_table`'; $parser = new Parser($query); $this->assertEquals($query, $parser->statements[0]->build()); - /* Assertion 4 */ $query = "CREATE TABLE `aa` (\n" . " `id` int(11) NOT NULL,\n" . " `rTime` timestamp(3) NOT NULL DEFAULT '0000-00-00 00:00:00.000' ON UPDATE CURRENT_TIMESTAMP(3),\n" . " PRIMARY KEY (`id`)\n" . - ") ENGINE=InnoDB DEFAULT CHARSET=latin1"; + ') ENGINE=InnoDB DEFAULT CHARSET=latin1'; $parser = new Parser($query); $this->assertEquals($query, $parser->statements[0]->build()); - } public function testBuilderPartitions() @@ -171,7 +167,7 @@ class CreateStatementTest extends TestCase /* Assertion 2 */ $query = 'CREATE TABLE `pma_test` (' . "\n" . ' `test_id` int(32) NOT NULL,' . "\n" - . ' `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP'. "\n" + . ' `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP' . "\n" . ') ENGINE=InnoDB DEFAULT CHARSET=utf8' . "\n" . 'PARTITION BY RANGE (test_id)' . "\n" . '(' . "\n" diff --git a/tests/Builder/DeleteStatementTest.php b/tests/Builder/DeleteStatementTest.php index a7500f0..ba8ea3a 100644 --- a/tests/Builder/DeleteStatementTest.php +++ b/tests/Builder/DeleteStatementTest.php @@ -3,15 +3,13 @@ namespace SqlParser\Tests\Builder; use SqlParser\Parser; - use SqlParser\Tests\TestCase; class DeleteStatementTest extends TestCase { - public function testBuilderSingleTable() { - /* Assertion 1 */ + /* Assertion 1 */ $query = 'DELETE IGNORE FROM t1'; $parser = new Parser($query); @@ -53,7 +51,7 @@ class DeleteStatementTest extends TestCase /* Assertion 6 */ $query = 'DELETE LOW_PRIORITY FROM `test`.users ' - . 'WHERE `id`<3 AND (username="Dan" OR username="Paul") ORDER BY id ASC'; + . 'WHERE `id`<3 AND (username="Dan" OR username="Paul") ORDER BY id ASC'; $parser = new Parser($query); $stmt = $parser->statements[0]; @@ -63,7 +61,7 @@ class DeleteStatementTest extends TestCase public function testBuilderMultiTable() { - /* Assertion 1 */ + /* Assertion 1 */ $query = 'DELETE QUICK table1, table2.* FROM table1 AS `t1`, table2 AS `t2`'; $parser = new Parser($query); diff --git a/tests/Builder/ExplainStatement.php b/tests/Builder/ExplainStatement.php index 1a44f44..2ff6284 100644 --- a/tests/Builder/ExplainStatement.php +++ b/tests/Builder/ExplainStatement.php @@ -3,12 +3,10 @@ namespace SqlParser\Tests\Builder; use SqlParser\Parser; - use SqlParser\Tests\TestCase; class ExplainStatementTest extends TestCase { - public function testBuilderView() { $query = 'EXPLAIN SELECT * FROM test;'; diff --git a/tests/Builder/InsertStatementTest.php b/tests/Builder/InsertStatementTest.php index d27726a..a212057 100644 --- a/tests/Builder/InsertStatementTest.php +++ b/tests/Builder/InsertStatementTest.php @@ -3,12 +3,10 @@ namespace SqlParser\Tests\Builder; use SqlParser\Parser; - use SqlParser\Tests\TestCase; class InsertStatementTest extends TestCase { - public function testBuilder() { /* Assertion 1 */ diff --git a/tests/Builder/ReplaceStatementTest.php b/tests/Builder/ReplaceStatementTest.php index f25a58a..7a73992 100644 --- a/tests/Builder/ReplaceStatementTest.php +++ b/tests/Builder/ReplaceStatementTest.php @@ -3,12 +3,10 @@ namespace SqlParser\Tests\Builder; use SqlParser\Parser; - use SqlParser\Tests\TestCase; class ReplaceStatementTest extends TestCase { - public function testBuilder() { $parser = new Parser( diff --git a/tests/Builder/SelectStatementTest.php b/tests/Builder/SelectStatementTest.php index 173ff92..8151548 100644 --- a/tests/Builder/SelectStatementTest.php +++ b/tests/Builder/SelectStatementTest.php @@ -3,12 +3,10 @@ namespace SqlParser\Tests\Builder; use SqlParser\Parser; - use SqlParser\Tests\TestCase; class SelectStatementTest extends TestCase { - public function testBuilder() { $query = 'SELECT * FROM t1 LEFT JOIN (t2, t3, t4) ' @@ -77,7 +75,6 @@ class SelectStatementTest extends TestCase ); } - public function testBuilderIntoOptions() { /* Assertion 1 */ diff --git a/tests/Builder/SetStatementTest.php b/tests/Builder/SetStatementTest.php index 2f75c0f..5d2658c 100644 --- a/tests/Builder/SetStatementTest.php +++ b/tests/Builder/SetStatementTest.php @@ -3,12 +3,10 @@ namespace SqlParser\Tests\Builder; use SqlParser\Parser; - use SqlParser\Tests\TestCase; class SetStatementTest extends TestCase { - public function testBuilderView() { /* Assertion 1 */ diff --git a/tests/Builder/StatementTest.php b/tests/Builder/StatementTest.php index 0dff320..1f63029 100644 --- a/tests/Builder/StatementTest.php +++ b/tests/Builder/StatementTest.php @@ -7,12 +7,10 @@ use SqlParser\Components\Expression; use SqlParser\Components\Condition; use SqlParser\Components\Limit; use SqlParser\Statements\SelectStatement; - use SqlParser\Tests\TestCase; class StatementTest extends TestCase { - public function testBuilder() { $stmt = new SelectStatement(); diff --git a/tests/Builder/TransactionStatementTest.php b/tests/Builder/TransactionStatementTest.php index 5b093b2..120ef13 100644 --- a/tests/Builder/TransactionStatementTest.php +++ b/tests/Builder/TransactionStatementTest.php @@ -3,12 +3,10 @@ namespace SqlParser\Tests\Builder; use SqlParser\Parser; - use SqlParser\Tests\TestCase; class TransactionStatementTest extends TestCase { - public function testBuilder() { $query = 'START TRANSACTION;' . diff --git a/tests/Components/Array2dTest.php b/tests/Components/Array2dTest.php index ee9d679..4f3483d 100644 --- a/tests/Components/Array2dTest.php +++ b/tests/Components/Array2dTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\Array2d; - use SqlParser\Tests\TestCase; class Array2dTest extends TestCase { - public function testParse() { $parser = new Parser(); @@ -79,7 +77,7 @@ class Array2dTest extends TestCase count($parser->errors) ); $this->assertEquals( - "An opening bracket followed by a set of values was expected.", + 'An opening bracket followed by a set of values was expected.', $parser->errors[0]->getMessage() ); } @@ -93,7 +91,7 @@ class Array2dTest extends TestCase count($parser->errors) ); $this->assertEquals( - "2 values were expected, but found 1.", + '2 values were expected, but found 1.', $parser->errors[0]->getMessage() ); } diff --git a/tests/Components/ArrayObjTest.php b/tests/Components/ArrayObjTest.php index d62c9d3..d40509f 100644 --- a/tests/Components/ArrayObjTest.php +++ b/tests/Components/ArrayObjTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\ArrayObj; - use SqlParser\Tests\TestCase; class ArrayObjTest extends TestCase { - public function testBuildRaw() { $component = new ArrayObj(array('a', 'b'), array()); diff --git a/tests/Components/CaseExpressionTest.php b/tests/Components/CaseExpressionTest.php index 8746909..082c3aa 100644 --- a/tests/Components/CaseExpressionTest.php +++ b/tests/Components/CaseExpressionTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\CaseExpression; - use SqlParser\Tests\TestCase; class CaseExpressionTest extends TestCase { - public function testParseBuild() { $caseExprQuery = 'case 1 when 1 then "Some" else "Other" end'; diff --git a/tests/Components/ComponentTest.php b/tests/Components/ComponentTest.php index b2388a3..4541602 100644 --- a/tests/Components/ComponentTest.php +++ b/tests/Components/ComponentTest.php @@ -5,12 +5,10 @@ namespace SqlParser\Tests\Parser; use SqlParser\Component; use SqlParser\Parser; use SqlParser\TokensList; - use SqlParser\Tests\TestCase; class ComponentTest extends TestCase { - /** * @expectedException \Exception * @expectedExceptionMessage Not implemented yet. diff --git a/tests/Components/ConditionTest.php b/tests/Components/ConditionTest.php index b3279fe..f06e51d 100644 --- a/tests/Components/ConditionTest.php +++ b/tests/Components/ConditionTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\Condition; - use SqlParser\Tests\TestCase; class ConditionTest extends TestCase { - public function testParse() { $component = Condition::parse(new Parser(), $this->getTokensList('/* id = */ id = 10')); diff --git a/tests/Components/CreateDefinitionTest.php b/tests/Components/CreateDefinitionTest.php index a7b7f86..8f373d6 100644 --- a/tests/Components/CreateDefinitionTest.php +++ b/tests/Components/CreateDefinitionTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\CreateDefinition; - use SqlParser\Tests\TestCase; class CreateDefinitionTest extends TestCase { - public function testParse() { $component = CreateDefinition::parse( diff --git a/tests/Components/ExpressionArrayTest.php b/tests/Components/ExpressionArrayTest.php index 3d8cd77..de80da3 100644 --- a/tests/Components/ExpressionArrayTest.php +++ b/tests/Components/ExpressionArrayTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\ExpressionArray; - use SqlParser\Tests\TestCase; class ExpressionArrayTest extends TestCase { - public function testParse() { $component = ExpressionArray::parse( diff --git a/tests/Components/ExpressionTest.php b/tests/Components/ExpressionTest.php index 9bacf9b..11d10e4 100644 --- a/tests/Components/ExpressionTest.php +++ b/tests/Components/ExpressionTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\Expression; - use SqlParser\Tests\TestCase; class ExpressionTest extends TestCase { - public function testParse() { $component = Expression::parse(new Parser(), $this->getTokensList('IF(film_id > 0, film_id, film_id)')); @@ -64,7 +62,7 @@ class ExpressionTest extends TestCase { $component = array( new Expression('1 + 2', 'three'), - new Expression('1 + 3', 'four') + new Expression('1 + 3', 'four'), ); $this->assertEquals( Expression::build($component), diff --git a/tests/Components/FunctionCallTest.php b/tests/Components/FunctionCallTest.php index b7f71ca..fed3aa8 100644 --- a/tests/Components/FunctionCallTest.php +++ b/tests/Components/FunctionCallTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Components\ArrayObj; use SqlParser\Components\FunctionCall; - use SqlParser\Tests\TestCase; class FunctionCallTest extends TestCase { - public function testBuildArray() { $component = new FunctionCall('func', array('a', 'b')); diff --git a/tests/Components/IntoKeywordTest.php b/tests/Components/IntoKeywordTest.php index 388368c..c6d2b53 100644 --- a/tests/Components/IntoKeywordTest.php +++ b/tests/Components/IntoKeywordTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\IntoKeyword; - use SqlParser\Tests\TestCase; class IntoKeywordTest extends TestCase { - public function testParse() { $component = IntoKeyword::parse(new Parser(), $this->getTokensList('OUTFILE "/tmp/outfile.txt"')); diff --git a/tests/Components/JoinKeywordTest.php b/tests/Components/JoinKeywordTest.php index e14c62c..95d7354 100644 --- a/tests/Components/JoinKeywordTest.php +++ b/tests/Components/JoinKeywordTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\JoinKeyword; - use SqlParser\Tests\TestCase; class JoinKeywordTest extends TestCase { - public function testParseIncomplete() { $component = JoinKeyword::parse(new Parser(), $this->getTokensList('JOIN a')); @@ -33,12 +31,12 @@ class JoinKeywordTest extends TestCase $component = JoinKeyword::parse( new Parser(), $this->getTokensList( - 'LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4) '. + 'LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4) ' . 'ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)' ) ); $this->assertEquals( - 'LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4) '. + 'LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4) ' . 'ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)', JoinKeyword::build($component) ); diff --git a/tests/Components/KeyTest.php b/tests/Components/KeyTest.php index e8a462e..f6fa7b8 100644 --- a/tests/Components/KeyTest.php +++ b/tests/Components/KeyTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\Key; - use SqlParser\Tests\TestCase; class KeyTest extends TestCase { - public function testParse() { $component = Key::parse( diff --git a/tests/Components/LimitTest.php b/tests/Components/LimitTest.php index 15c665a..aacfce7 100644 --- a/tests/Components/LimitTest.php +++ b/tests/Components/LimitTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\Limit; - use SqlParser\Tests\TestCase; class LimitTest extends TestCase { - public function testBuildWithoutOffset() { $component = new Limit(1); diff --git a/tests/Components/OptionsArrayTest.php b/tests/Components/OptionsArrayTest.php index ea521b3..5008e80 100644 --- a/tests/Components/OptionsArrayTest.php +++ b/tests/Components/OptionsArrayTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\OptionsArray; - use SqlParser\Tests\TestCase; class OptionsArrayTest extends TestCase { - public function testParse() { $component = OptionsArray::parse( diff --git a/tests/Components/OrderKeywordTest.php b/tests/Components/OrderKeywordTest.php index df8c95c..a89a365 100644 --- a/tests/Components/OrderKeywordTest.php +++ b/tests/Components/OrderKeywordTest.php @@ -2,22 +2,19 @@ namespace SqlParser\Tests\Components; -use SqlParser\Parser; use SqlParser\Components\Expression; use SqlParser\Components\OrderKeyword; - use SqlParser\Tests\TestCase; class OrderKeywordTest extends TestCase { - public function testBuild() { $this->assertEquals( OrderKeyword::build( array( new OrderKeyword(new Expression('a'), 'ASC'), - new OrderKeyword(new Expression('b'), 'DESC') + new OrderKeyword(new Expression('b'), 'DESC'), ) ), 'a ASC, b DESC' diff --git a/tests/Components/ParameterDefinitionTest.php b/tests/Components/ParameterDefinitionTest.php index d4fe505..1de0de7 100644 --- a/tests/Components/ParameterDefinitionTest.php +++ b/tests/Components/ParameterDefinitionTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\ParameterDefinition; - use SqlParser\Tests\TestCase; class ParameterDefinitionTest extends TestCase { - public function testParse() { $component = ParameterDefinition::parse( diff --git a/tests/Components/PartitionDefinitionTest.php b/tests/Components/PartitionDefinitionTest.php index 9a1819c..4e48183 100644 --- a/tests/Components/PartitionDefinitionTest.php +++ b/tests/Components/PartitionDefinitionTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\PartitionDefinition; - use SqlParser\Tests\TestCase; class PartitionDefinitionTest extends TestCase { - public function testParse() { $component = PartitionDefinition::parse( diff --git a/tests/Components/ReferenceTest.php b/tests/Components/ReferenceTest.php index d017572..2871385 100644 --- a/tests/Components/ReferenceTest.php +++ b/tests/Components/ReferenceTest.php @@ -5,12 +5,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\Expression; use SqlParser\Components\Reference; - use SqlParser\Tests\TestCase; class ReferenceTest extends TestCase { - public function testParse() { $component = Reference::parse(new Parser(), $this->getTokensList('tbl (id)')); diff --git a/tests/Components/RenameOperationTest.php b/tests/Components/RenameOperationTest.php index b6a215c..37d2622 100644 --- a/tests/Components/RenameOperationTest.php +++ b/tests/Components/RenameOperationTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Components; use SqlParser\Parser; use SqlParser\Components\RenameOperation; - use SqlParser\Tests\TestCase; class RenameOperationTest extends TestCase { - public function testBuild() { $component = RenameOperation::parse(new Parser(), $this->getTokensList('a TO b, c TO d')); diff --git a/tests/Lexer/ContextTest.php b/tests/Lexer/ContextTest.php index 6f4e661..bfa1748 100644 --- a/tests/Lexer/ContextTest.php +++ b/tests/Lexer/ContextTest.php @@ -3,12 +3,10 @@ namespace SqlParser\Tests\Lexer; use SqlParser\Context; - use SqlParser\Tests\TestCase; class ContextTest extends TestCase { - public function testLoad() { // Default context is 5.7.0. @@ -34,7 +32,7 @@ class ContextTest extends TestCase } /** - * @expectedException Exception + * @expectedException \Exception * @expectedExceptionMessage Specified context ("\SqlParser\Contexts\ContextFoo") does not exist. */ public function testLoadError() diff --git a/tests/Lexer/IsMethodsTest.php b/tests/Lexer/IsMethodsTest.php index ac6d3ca..44b5a8a 100644 --- a/tests/Lexer/IsMethodsTest.php +++ b/tests/Lexer/IsMethodsTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Lexer; use SqlParser\Context; use SqlParser\Token; - use SqlParser\Tests\TestCase; class IsMethodsTest extends TestCase { - public function testIsKeyword() { $this->assertEquals(1 | Token::FLAG_KEYWORD_RESERVED, Context::isKeyword('SELECT')); @@ -47,12 +45,12 @@ class IsMethodsTest extends TestCase public function testIsWhitespace() { - $this->assertTrue(Context::isWhitespace(" ")); + $this->assertTrue(Context::isWhitespace(' ')); $this->assertTrue(Context::isWhitespace("\r")); $this->assertTrue(Context::isWhitespace("\n")); $this->assertTrue(Context::isWhitespace("\t")); - $this->assertFalse(Context::isWhitespace("a")); + $this->assertFalse(Context::isWhitespace('a')); $this->assertFalse(Context::isWhitespace("\b")); $this->assertFalse(Context::isWhitespace("\u1000")); } diff --git a/tests/Lexer/LexerTest.php b/tests/Lexer/LexerTest.php index 0bcd3f7..8893d7b 100644 --- a/tests/Lexer/LexerTest.php +++ b/tests/Lexer/LexerTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Lexer; use SqlParser\Exceptions\LexerException; use SqlParser\Lexer; - use SqlParser\Tests\TestCase; class LexerTest extends TestCase { - /** * @runInSeparateProcess * @preserveGlobalState disabled @@ -36,7 +34,7 @@ class LexerTest extends TestCase } /** - * @expectedException SqlParser\Exceptions\LexerException + * @expectedException \SqlParser\Exceptions\LexerException * @expectedExceptionMessage strict error * @expectedExceptionCode 4 */ diff --git a/tests/Lexer/TokenTest.php b/tests/Lexer/TokenTest.php index 24e2a4d..bc4f4f0 100644 --- a/tests/Lexer/TokenTest.php +++ b/tests/Lexer/TokenTest.php @@ -3,12 +3,10 @@ namespace SqlParser\Tests\Lexer; use SqlParser\Token; - use SqlParser\Tests\TestCase; class TokenTest extends TestCase { - public function testExtractKeyword() { $tok = new Token('SelecT', Token::TYPE_KEYWORD, Token::FLAG_KEYWORD_RESERVED); diff --git a/tests/Lexer/TokensListTest.php b/tests/Lexer/TokensListTest.php index e3cecff..863a65d 100644 --- a/tests/Lexer/TokensListTest.php +++ b/tests/Lexer/TokensListTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Lexer; use SqlParser\Token; use SqlParser\TokensList; - use SqlParser\Tests\TestCase; class TokensListTest extends TestCase { - /** * ArrayObj of tokens that are used for testing. * diff --git a/tests/Misc/BugsTest.php b/tests/Misc/BugsTest.php index 2680890..b462dba 100644 --- a/tests/Misc/BugsTest.php +++ b/tests/Misc/BugsTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class BugsTest extends TestCase { - /** * @dataProvider testBugProvider */ diff --git a/tests/Misc/UtfStringTest.php b/tests/Misc/UtfStringTest.php index 174b988..4c66654 100644 --- a/tests/Misc/UtfStringTest.php +++ b/tests/Misc/UtfStringTest.php @@ -3,12 +3,10 @@ namespace SqlParser\Tests\Misc; use SqlParser\UtfString; - use SqlParser\Tests\TestCase; class UtfStringTest extends TestCase { - /** * Sample phrase in French. * diff --git a/tests/Parser/AlterStatementTest.php b/tests/Parser/AlterStatementTest.php index 653eae0..f063b6a 100644 --- a/tests/Parser/AlterStatementTest.php +++ b/tests/Parser/AlterStatementTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class AlterStatementTest extends TestCase { - /** * @dataProvider testAlterProvider */ diff --git a/tests/Parser/CallStatementTest.php b/tests/Parser/CallStatementTest.php index 9e6ab2e..706168d 100644 --- a/tests/Parser/CallStatementTest.php +++ b/tests/Parser/CallStatementTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class CallStatementTest extends TestCase { - /** * @dataProvider testCallProvider */ diff --git a/tests/Parser/CreateStatementTest.php b/tests/Parser/CreateStatementTest.php index 6d611af..479482f 100644 --- a/tests/Parser/CreateStatementTest.php +++ b/tests/Parser/CreateStatementTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class CreateStatementTest extends TestCase { - /** * @dataProvider testCreateProvider */ diff --git a/tests/Parser/DeleteStatementTest.php b/tests/Parser/DeleteStatementTest.php index 3b72270..9090253 100644 --- a/tests/Parser/DeleteStatementTest.php +++ b/tests/Parser/DeleteStatementTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class DeleteStatementTest extends TestCase { - /** * @dataProvider testDeleteProvider */ diff --git a/tests/Parser/ExplainStatement.php b/tests/Parser/ExplainStatement.php index 6a1a58e..a8581be 100644 --- a/tests/Parser/ExplainStatement.php +++ b/tests/Parser/ExplainStatement.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class ExplainStatementTest extends TestCase { - /** * @dataProvider testExplainProvider */ diff --git a/tests/Parser/InsertStatementTest.php b/tests/Parser/InsertStatementTest.php index 45923d2..371d3cf 100644 --- a/tests/Parser/InsertStatementTest.php +++ b/tests/Parser/InsertStatementTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class InsertStatementTest extends TestCase { - /** * @dataProvider testInsertProvider */ diff --git a/tests/Parser/ParserTest.php b/tests/Parser/ParserTest.php index 190764e..0d0cd97 100644 --- a/tests/Parser/ParserTest.php +++ b/tests/Parser/ParserTest.php @@ -6,12 +6,10 @@ use SqlParser\Exceptions\ParserException; use SqlParser\Parser; use SqlParser\Token; use SqlParser\TokensList; - use SqlParser\Tests\TestCase; class ParserTest extends TestCase { - /** * @dataProvider testParseProvider */ @@ -68,7 +66,7 @@ class ParserTest extends TestCase } /** - * @expectedException SqlParser\Exceptions\ParserException + * @expectedException \SqlParser\Exceptions\ParserException * @expectedExceptionMessage strict error * @expectedExceptionCode 3 */ diff --git a/tests/Parser/RenameStatementTest.php b/tests/Parser/RenameStatementTest.php index eae70ca..baea94c 100644 --- a/tests/Parser/RenameStatementTest.php +++ b/tests/Parser/RenameStatementTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class RenameStatementTest extends TestCase { - /** * @dataProvider testRenameProvider */ diff --git a/tests/Parser/ReplaceStatementTest.php b/tests/Parser/ReplaceStatementTest.php index 2bc85ec..eb38628 100644 --- a/tests/Parser/ReplaceStatementTest.php +++ b/tests/Parser/ReplaceStatementTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class ReplaceStatementTest extends TestCase { - /** * @dataProvider testReplaceProvider */ diff --git a/tests/Parser/RestoreStatementTest.php b/tests/Parser/RestoreStatementTest.php index 7c41074..cee72e3 100644 --- a/tests/Parser/RestoreStatementTest.php +++ b/tests/Parser/RestoreStatementTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class RestoreStatementTest extends TestCase { - /** * @dataProvider testRestoreProvider */ diff --git a/tests/Parser/SelectStatementTest.php b/tests/Parser/SelectStatementTest.php index 2e3913e..bbfc926 100644 --- a/tests/Parser/SelectStatementTest.php +++ b/tests/Parser/SelectStatementTest.php @@ -3,12 +3,10 @@ namespace SqlParser\Tests\Parser; use SqlParser\Tests\TestCase; - use SqlParser\Parser; class SelectStatementTest extends TestCase { - public function testSelectOptions() { $data = $this->getData('parser/parseSelect'); diff --git a/tests/Parser/SetStatementTest.php b/tests/Parser/SetStatementTest.php index d9df799..20b783c 100644 --- a/tests/Parser/SetStatementTest.php +++ b/tests/Parser/SetStatementTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class SetStatementTest extends TestCase { - /** * @dataProvider testSetProvider */ diff --git a/tests/Parser/TransactionStatementTest.php b/tests/Parser/TransactionStatementTest.php index d0b99cb..c5230f5 100644 --- a/tests/Parser/TransactionStatementTest.php +++ b/tests/Parser/TransactionStatementTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class TransactionStatementTest extends TestCase { - /** * @dataProvider testTransactionProvider */ diff --git a/tests/Parser/UpdateStatementTest.php b/tests/Parser/UpdateStatementTest.php index 2b0c233..bcd39b1 100644 --- a/tests/Parser/UpdateStatementTest.php +++ b/tests/Parser/UpdateStatementTest.php @@ -6,7 +6,6 @@ use SqlParser\Tests\TestCase; class UpdateStatementTest extends TestCase { - /** * @dataProvider testUpdateProvider */ diff --git a/tests/Utils/BufferedQueryTest.php b/tests/Utils/BufferedQueryTest.php index 41e14ff..a3e897b 100644 --- a/tests/Utils/BufferedQueryTest.php +++ b/tests/Utils/BufferedQueryTest.php @@ -3,19 +3,17 @@ namespace SqlParser\Tests\Utils; use SqlParser\Utils\BufferedQuery; - use SqlParser\Tests\TestCase; class BufferedQueryTest extends TestCase { - /** * @dataProvider testExtractProvider */ public function testExtract( $query, $chunkSize, - array $options = array(), + array $options, array $expected ) { $chunks = str_split($query, $chunkSize); @@ -24,14 +22,14 @@ class BufferedQueryTest extends TestCase /** * The array of extracted statements. * - * @var array $statements + * @var array */ $statements = array(); /** * The `BufferedQuery` instance used for extraction. * - * @var BufferedQuery $bq + * @var BufferedQuery */ $bq = new BufferedQuery('', $options); @@ -99,7 +97,6 @@ class BufferedQueryTest extends TestCase '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */'; return array( - array( "SELECT '\'';\nSELECT '\'';", 8, @@ -110,7 +107,7 @@ class BufferedQueryTest extends TestCase array( "SELECT '\'';", "SELECT '\'';", - ) + ), ), array( @@ -128,11 +125,11 @@ class BufferedQueryTest extends TestCase array( "CREATE TABLE `test` (\n" . " `txt` varchar(10)\n" . - ");", + ');', "INSERT INTO `test` (`txt`) VALUES('abc');", "INSERT INTO `test` (`txt`) VALUES('\\\\');", "INSERT INTO `test` (`txt`) VALUES('xyz');", - ) + ), ), array( @@ -145,8 +142,8 @@ class BufferedQueryTest extends TestCase ), array( 'SELECT """""""";', - 'SELECT """\\\\"""' - ) + 'SELECT """\\\\"""', + ), ), array( @@ -161,8 +158,8 @@ class BufferedQueryTest extends TestCase array( 'DELIMITER A_VERY_LONG_DEL', 'SELECT 1 A_VERY_LONG_DEL', - 'DELIMITER ;' - ) + 'DELIMITER ;', + ), ), array( @@ -207,8 +204,8 @@ class BufferedQueryTest extends TestCase '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */', - '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */' - ) + '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */', + ), ), array( @@ -258,7 +255,7 @@ class BufferedQueryTest extends TestCase '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */', '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */', - ) + ), ), array( @@ -303,9 +300,9 @@ class BufferedQueryTest extends TestCase '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;', - '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */' - ) - ) + '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */', + ), + ), ); } } diff --git a/tests/Utils/CLITest.php b/tests/Utils/CLITest.php index 21adde4..3f5796d 100644 --- a/tests/Utils/CLITest.php +++ b/tests/Utils/CLITest.php @@ -10,6 +10,7 @@ class CLITest extends TestCase { $cli = $this->getMockBuilder('SqlParser\Utils\CLI')->setMethods(array('getopt'))->getMock(); $cli->method('getopt')->willReturn($getopt); + return $cli; } diff --git a/tests/Utils/ErrorTest.php b/tests/Utils/ErrorTest.php index 25e65f4..8408194 100644 --- a/tests/Utils/ErrorTest.php +++ b/tests/Utils/ErrorTest.php @@ -5,12 +5,10 @@ namespace SqlParser\Tests\Utils; use SqlParser\Lexer; use SqlParser\Parser; use SqlParser\Utils\Error; - use SqlParser\Tests\TestCase; class ErrorTest extends TestCase { - public function testGet() { $lexer = new Lexer('SELECT * FROM db..tbl $'); diff --git a/tests/Utils/FormatterTest.php b/tests/Utils/FormatterTest.php index f8a911f..1e03d17 100644 --- a/tests/Utils/FormatterTest.php +++ b/tests/Utils/FormatterTest.php @@ -3,7 +3,6 @@ namespace SqlParser\Tests\Utils; use SqlParser\Utils\Formatter; - use SqlParser\Tests\TestCase; class FormatTest extends TestCase @@ -36,13 +35,13 @@ class FormatTest extends TestCase 'line_ending' => '<br>', 'clause_newline' => null, 'parts_newline' => 0, - 'formats' => $expected + 'formats' => $expected, ); $overridingOptions = array( 'type' => 'test-type', 'line_ending' => '<br>', - 'formats' => $overriding + 'formats' => $overriding, ); $reflectionMethod = new \ReflectionMethod($formatter, 'getMergedOptions'); @@ -98,7 +97,7 @@ class FormatTest extends TestCase 'type' => 0, 'html' => 'new html', 'cli' => 'new cli', - ) + ), ), array( // expected array( @@ -246,20 +245,20 @@ class FormatTest extends TestCase 'SELECT 1', '<span class="sql-reserved">SELECT</span>' . '<br/>' . ' <span class="sql-number">1</span>', - array('type' => 'html') + array('type' => 'html'), ), array( 'SELECT 1 # Comment', '<span class="sql-reserved">SELECT</span>' . '<br/>' . ' <span class="sql-number">1</span> <span class="sql-comment"># Comment' . "\n" . '</span>', - array('type' => 'html') + array('type' => 'html'), ), array( 'SELECT HEX("1")', '<span class="sql-reserved">SELECT</span>' . '<br/>' . ' <span class="sql-keyword">HEX</span>(<span class="sql-string">"1"</span>)', - array('type' => 'html') + array('type' => 'html'), ), array( 'SELECT * FROM foo WHERE bar=1', @@ -269,7 +268,7 @@ class FormatTest extends TestCase ' foo' . '<br/>' . '<span class="sql-reserved">WHERE</span>' . '<br/>' . ' bar = <span class="sql-number">1</span>', - array('type' => 'html') + array('type' => 'html'), ), array( 'CREATE PROCEDURE SPTEST() BEGIN FROM a SELECT *; END', @@ -281,7 +280,7 @@ class FormatTest extends TestCase '<span class="sql-reserved">SELECT</span>' . '<br/>' . ' *;' . '<br/>' . '<span class="sql-keyword">END</span>', - array('type' => 'html') + array('type' => 'html'), ), array( 'INSERT INTO foo VALUES (0, 0, 0), (1, 1, 1)', @@ -291,17 +290,17 @@ class FormatTest extends TestCase '<span class="sql-reserved">VALUES</span>' . '(<span class="sql-number">0</span>, <span class="sql-number">0</span>, <span class="sql-number">0</span>),' . '(<span class="sql-number">1</span>, <span class="sql-number">1</span>, <span class="sql-number">1</span>)', - array('type' => 'html') + array('type' => 'html'), ), array( 'SELECT 1', "\x1b[35mSELECT\n \x1b[92m1\x1b[0m", - array('type' => 'cli') + array('type' => 'cli'), ), array( 'SELECT "Text" AS BAR', "\x1b[35mSELECT\n \x1b[91m\"Text\" \x1b[35mAS \x1b[39mBAR\x1b[0m", - array('type' => 'cli') + array('type' => 'cli'), ), array( 'SELECT coditm AS Item, descripcion AS Descripcion, contenedores AS Contenedores, IF(suspendido = 1, Si, NO) AS Suspendido FROM `DW_articulos` WHERE superado = 0', diff --git a/tests/Utils/MiscTest.php b/tests/Utils/MiscTest.php index 854e361..c8b45f2 100644 --- a/tests/Utils/MiscTest.php +++ b/tests/Utils/MiscTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Utils; use SqlParser\Parser; use SqlParser\Utils\Misc; - use SqlParser\Tests\TestCase; class MiscTest extends TestCase { - /** * @dataProvider getAliasesProvider */ @@ -40,12 +38,12 @@ class MiscTest extends TestCase 'alias' => 'i', 'columns' => array( 'name' => 'n', - 'abcdef' => 'gh' - ) - ) - ) - ) - ) + 'abcdef' => 'gh', + ), + ), + ), + ), + ), ), array( 'select film_id id,title from film', @@ -57,12 +55,12 @@ class MiscTest extends TestCase 'film' => array( 'alias' => null, 'columns' => array( - 'film_id' => 'id' - ) - ) - ) - ) - ) + 'film_id' => 'id', + ), + ), + ), + ), + ), ), array( 'select `sakila`.`A`.`actor_id` as aid,`F`.`film_id` `fid`,' @@ -77,34 +75,34 @@ class MiscTest extends TestCase 'alias' => 'F', 'columns' => array( 'film_id' => 'fid', - 'last_update' => 'updated' - ) + 'last_update' => 'updated', + ), ), 'actor' => array( - 'alias'=> 'A', + 'alias' => 'A', 'columns' => array( 'actor_id' => 'aid', - 'last_update' => 'updated' - ) - ) - ) - ) - ) + 'last_update' => 'updated', + ), + ), + ), + ), + ), ), array( 'SELECT film_id FROM (SELECT * FROM film) as f;', 'sakila', - array() + array(), ), array( '', null, - array() + array(), ), array( 'SELECT 1', null, - array() + array(), ), array( 'SELECT * FROM orders AS ord WHERE 1', @@ -116,10 +114,10 @@ class MiscTest extends TestCase 'orders' => array( 'alias' => 'ord', 'columns' => array(), - ) + ), ), ), - ) + ), ), ); } diff --git a/tests/Utils/QueryTest.php b/tests/Utils/QueryTest.php index b5135c0..28b24ad 100644 --- a/tests/Utils/QueryTest.php +++ b/tests/Utils/QueryTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Utils; use SqlParser\Parser; use SqlParser\Utils\Query; - use SqlParser\Tests\TestCase; class QueryTest extends TestCase { - /** * @dataProvider testGetFlagsProvider */ @@ -29,29 +27,29 @@ class QueryTest extends TestCase 'ALTER TABLE DROP col', array( 'reload' => true, - 'querytype' => 'ALTER' - ) + 'querytype' => 'ALTER', + ), ), array( 'CALL test()', array( 'is_procedure' => true, - 'querytype' => 'CALL' - ) + 'querytype' => 'CALL', + ), ), array( 'CREATE TABLE tbl (id INT)', array( 'reload' => true, - 'querytype' => 'CREATE' - ) + 'querytype' => 'CREATE', + ), ), array( 'CHECK TABLE tbl', array( 'is_maint' => true, - 'querytype' => 'CHECK' - ) + 'querytype' => 'CHECK', + ), ), array( 'DELETE FROM tbl', @@ -65,22 +63,22 @@ class QueryTest extends TestCase 'DROP VIEW v', array( 'reload' => true, - 'querytype' => 'DROP' - ) + 'querytype' => 'DROP', + ), ), array( 'DROP DATABASE db', array( 'drop_database' => true, 'reload' => true, - 'querytype' => 'DROP' - ) + 'querytype' => 'DROP', + ), ), array( 'EXPLAIN tbl', array( 'is_explain' => true, - 'querytype' => 'EXPLAIN' + 'querytype' => 'EXPLAIN', ), ), array( @@ -88,8 +86,8 @@ class QueryTest extends TestCase array( 'is_affected' => true, 'is_insert' => true, - 'querytype' => 'INSERT' - ) + 'querytype' => 'INSERT', + ), ), array( 'REPLACE INTO tbl VALUES (2)', @@ -97,23 +95,23 @@ class QueryTest extends TestCase 'is_affected' => true, 'is_replace' => true, 'is_insert' => true, - 'querytype' => 'REPLACE' - ) + 'querytype' => 'REPLACE', + ), ), array( 'SELECT 1', array( 'is_select' => true, - 'querytype' => 'SELECT' - ) + 'querytype' => 'SELECT', + ), ), array( 'SELECT * FROM tbl', array( 'is_select' => true, 'select_from' => true, - 'querytype' => 'SELECT' - ) + 'querytype' => 'SELECT', + ), ), array( 'SELECT DISTINCT * FROM tbl LIMIT 0, 10 ORDER BY id', @@ -123,8 +121,8 @@ class QueryTest extends TestCase 'select_from' => true, 'limit' => true, 'order' => true, - 'querytype' => 'SELECT' - ) + 'querytype' => 'SELECT', + ), ), array( 'SELECT * FROM actor GROUP BY actor_id', @@ -133,8 +131,8 @@ class QueryTest extends TestCase 'is_select' => true, 'select_from' => true, 'group' => true, - 'querytype' => 'SELECT' - ) + 'querytype' => 'SELECT', + ), ), array( 'SELECT col1, col2 FROM table1 PROCEDURE ANALYSE(10, 2000);', @@ -142,8 +140,8 @@ class QueryTest extends TestCase 'is_analyse' => true, 'is_select' => true, 'select_from' => true, - 'querytype' => 'SELECT' - ) + 'querytype' => 'SELECT', + ), ), array( 'SELECT * FROM tbl INTO OUTFILE "/tmp/export.txt"', @@ -151,8 +149,8 @@ class QueryTest extends TestCase 'is_export' => true, 'is_select' => true, 'select_from' => true, - 'querytype' => 'SELECT' - ) + 'querytype' => 'SELECT', + ), ), array( 'SELECT COUNT(id), SUM(id) FROM tbl', @@ -161,16 +159,16 @@ class QueryTest extends TestCase 'is_func' => true, 'is_select' => true, 'select_from' => true, - 'querytype' => 'SELECT' - ) + 'querytype' => 'SELECT', + ), ), array( 'SELECT (SELECT "foo")', array( 'is_select' => true, 'is_subquery' => true, - 'querytype' => 'SELECT' - ) + 'querytype' => 'SELECT', + ), ), array( 'SELECT * FROM customer HAVING store_id = 2;', @@ -179,8 +177,8 @@ class QueryTest extends TestCase 'select_from' => true, 'is_group' => true, 'having' => true, - 'querytype' => 'SELECT' - ) + 'querytype' => 'SELECT', + ), ), array( 'SELECT * FROM table1 INNER JOIN table2 ON table1.id=table2.id;', @@ -188,50 +186,50 @@ class QueryTest extends TestCase 'is_select' => true, 'select_from' => true, 'join' => true, - 'querytype' => 'SELECT' - ) + 'querytype' => 'SELECT', + ), ), array( 'SHOW CREATE TABLE tbl', array( 'is_show' => true, - 'querytype' => 'SHOW' - ) + 'querytype' => 'SHOW', + ), ), array( 'UPDATE tbl SET id = 1', array( 'is_affected' => true, - 'querytype' => 'UPDATE' - ) + 'querytype' => 'UPDATE', + ), ), array( 'ANALYZE TABLE tbl', array( 'is_maint' => true, - 'querytype' => 'ANALYZE' - ) + 'querytype' => 'ANALYZE', + ), ), array( 'CHECKSUM TABLE tbl', array( 'is_maint' => true, - 'querytype' => 'CHECKSUM' - ) + 'querytype' => 'CHECKSUM', + ), ), array( 'OPTIMIZE TABLE tbl', array( 'is_maint' => true, - 'querytype' => 'OPTIMIZE' - ) + 'querytype' => 'OPTIMIZE', + ), ), array( 'REPAIR TABLE tbl', array( 'is_maint' => true, - 'querytype' => 'REPAIR' - ) + 'querytype' => 'REPAIR', + ), ), array( '(SELECT a FROM t1 WHERE a=10 AND B=1 ORDER BY a LIMIT 10) ' . @@ -243,8 +241,8 @@ class QueryTest extends TestCase 'limit' => true, 'order' => true, 'union' => true, - 'querytype' => 'SELECT' - ) + 'querytype' => 'SELECT', + ), ), array( 'SELECT * FROM orders AS ord WHERE 1', @@ -252,7 +250,7 @@ class QueryTest extends TestCase 'querytype' => 'SELECT', 'is_select' => true, 'select_from' => true, - ) + ), ), ); } @@ -305,7 +303,7 @@ class QueryTest extends TestCase 'select_tables' => array( array('actor', null), array('film', 'sakila2'), - ) + ), ) ), Query::getAll($query) @@ -323,7 +321,7 @@ class QueryTest extends TestCase 'select_tables' => array( array('actor', 'sakila'), array('film', null), - ) + ), ) ), Query::getAll($query) @@ -340,7 +338,7 @@ class QueryTest extends TestCase 'select_expr' => array(), 'select_tables' => array( array('actor', 'sakila'), - ) + ), ) ), Query::getAll($query) @@ -510,7 +508,7 @@ class QueryTest extends TestCase $query = 'USE sakila; ' . '/*test comment*/' . - 'SELECT * FROM actor; '. + 'SELECT * FROM actor; ' . 'DELIMITER $$ ' . 'UPDATE actor SET last_name = "abc"$$' . '/*!SELECT * FROM actor WHERE last_name = "abc"*/$$'; diff --git a/tests/Utils/RoutineTest.php b/tests/Utils/RoutineTest.php index 51f558f..2c016e2 100644 --- a/tests/Utils/RoutineTest.php +++ b/tests/Utils/RoutineTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Utils; use SqlParser\Parser; use SqlParser\Utils\Routine; - use SqlParser\Tests\TestCase; class RoutineTest extends TestCase { - /** * @dataProvider getReturnTypeProvider */ @@ -26,26 +24,26 @@ class RoutineTest extends TestCase array('INT(20)', array('', '', 'INT', '20', '')), array( 'INT UNSIGNED', - array('', '', 'INT', '', 'UNSIGNED') + array('', '', 'INT', '', 'UNSIGNED'), ), array( 'VARCHAR(1) CHARSET utf8', - array('', '', 'VARCHAR', '1', 'utf8') + array('', '', 'VARCHAR', '1', 'utf8'), ), array( 'ENUM(\'a\', \'b\') CHARSET latin1', - array('', '', 'ENUM', '\'a\',\'b\'', 'latin1') + array('', '', 'ENUM', '\'a\',\'b\'', 'latin1'), ), array( 'DECIMAL(5,2) UNSIGNED ZEROFILL', - array('', '', 'DECIMAL', '5,2', 'UNSIGNED ZEROFILL') + array('', '', 'DECIMAL', '5,2', 'UNSIGNED ZEROFILL'), ), array( 'SET(\'test\'\'esc"\', \'more\\\'esc\')', array( - '', '', 'SET', '\'test\'\'esc"\',\'more\\\'esc\'', '' - ) - ) + '', '', 'SET', '\'test\'\'esc"\',\'more\\\'esc\'', '', + ), + ), ); } @@ -65,26 +63,26 @@ class RoutineTest extends TestCase array('`foo` INT(20)', array('', 'foo', 'INT', '20', '')), array( 'IN `fo``fo` INT UNSIGNED', - array('IN', 'fo`fo', 'INT', '', 'UNSIGNED') + array('IN', 'fo`fo', 'INT', '', 'UNSIGNED'), ), array( 'OUT bar VARCHAR(1) CHARSET utf8', - array('OUT', 'bar', 'VARCHAR', '1', 'utf8') + array('OUT', 'bar', 'VARCHAR', '1', 'utf8'), ), array( '`"baz\'\'` ENUM(\'a\', \'b\') CHARSET latin1', - array('', '"baz\'\'', 'ENUM', '\'a\',\'b\'', 'latin1') + array('', '"baz\'\'', 'ENUM', '\'a\',\'b\'', 'latin1'), ), array( 'INOUT `foo` DECIMAL(5,2) UNSIGNED ZEROFILL', - array('INOUT', 'foo', 'DECIMAL', '5,2', 'UNSIGNED ZEROFILL') + array('INOUT', 'foo', 'DECIMAL', '5,2', 'UNSIGNED ZEROFILL'), ), array( '`foo``s func` SET(\'test\'\'esc"\', \'more\\\'esc\')', array( - '', 'foo`s func', 'SET', '\'test\'\'esc"\',\'more\\\'esc\'', '' - ) - ) + '', 'foo`s func', 'SET', '\'test\'\'esc"\',\'more\\\'esc\'', '', + ), + ), ); } @@ -109,87 +107,87 @@ class RoutineTest extends TestCase 'type' => array(), 'length' => array(), 'length_arr' => array(), - 'opts' => array() - ) + 'opts' => array(), + ), ), array( 'CREATE DEFINER=`user\\`@`somehost``(` FUNCTION `foo```(`baz` INT) BEGIN SELECT NULL; END', array( 'num' => 1, 'dir' => array( - 0 => '' + 0 => '', ), 'name' => array( - 0 => 'baz' + 0 => 'baz', ), 'type' => array( - 0 => 'INT' + 0 => 'INT', ), 'length' => array( - 0 => '' + 0 => '', ), 'length_arr' => array( 0 => array(), ), 'opts' => array( - 0 => '' - ) - ) + 0 => '', + ), + ), ), array( 'CREATE PROCEDURE `foo`(IN `baz\\)` INT(25) zerofill unsigned) BEGIN SELECT NULL; END', array( 'num' => 1, 'dir' => array( - 0 => 'IN' + 0 => 'IN', ), 'name' => array( - 0 => 'baz\\)' + 0 => 'baz\\)', ), 'type' => array( - 0 => 'INT' + 0 => 'INT', ), 'length' => array( - 0 => '25' + 0 => '25', ), 'length_arr' => array( 0 => array('25'), ), 'opts' => array( - 0 => 'UNSIGNED ZEROFILL' - ) - ) + 0 => 'UNSIGNED ZEROFILL', + ), + ), ), array( - 'CREATE PROCEDURE `foo`(IN `baz\\` INT(001) zerofill, out bazz varchar(15) charset utf8) '. + 'CREATE PROCEDURE `foo`(IN `baz\\` INT(001) zerofill, out bazz varchar(15) charset utf8) ' . 'BEGIN SELECT NULL; END', array( 'num' => 2, 'dir' => array( 0 => 'IN', - 1 => 'OUT' + 1 => 'OUT', ), 'name' => array( 0 => 'baz\\', - 1 => 'bazz' + 1 => 'bazz', ), 'type' => array( 0 => 'INT', - 1 => 'VARCHAR' + 1 => 'VARCHAR', ), 'length' => array( 0 => '1', - 1 => '15' + 1 => '15', ), 'length_arr' => array( 0 => array('1'), - 1 => array('15') + 1 => array('15'), ), 'opts' => array( 0 => 'ZEROFILL', - 1 => 'utf8' - ) - ) + 1 => 'utf8', + ), + ), ), ); } diff --git a/tests/Utils/TableTest.php b/tests/Utils/TableTest.php index 3e577eb..f80b586 100644 --- a/tests/Utils/TableTest.php +++ b/tests/Utils/TableTest.php @@ -4,12 +4,10 @@ namespace SqlParser\Tests\Utils; use SqlParser\Parser; use SqlParser\Utils\Table; - use SqlParser\Tests\TestCase; class TableTest extends TestCase { - /** * @dataProvider getForeignKeysProvider */ @@ -176,9 +174,9 @@ class TableTest extends TestCase 'timestamp_not_null' => true, 'default_value' => 'CURRENT_TIMESTAMP', 'default_current_timestamp' => true, - 'on_update_current_timestamp' => true - ) - ) + 'on_update_current_timestamp' => true, + ), + ), ), array( 'CREATE TABLE table1 ( diff --git a/tests/Utils/TokensTest.php b/tests/Utils/TokensTest.php index 9ddbe5c..6222d5f 100644 --- a/tests/Utils/TokensTest.php +++ b/tests/Utils/TokensTest.php @@ -2,15 +2,12 @@ namespace SqlParser\Tests\Utils; -use SqlParser\Parser; use SqlParser\Token; use SqlParser\Utils\Tokens; - use SqlParser\Tests\TestCase; class TokensTest extends TestCase { - /** * @dataProvider replaceTokensProvider */ @@ -33,7 +30,7 @@ class TokensTest extends TestCase new Token('.'), ), 'SELECT * FROM /*x*/c.b', - ) + ), ); } @@ -53,53 +50,53 @@ class TokensTest extends TestCase array( new Token('"abc"', Token::TYPE_STRING, Token::FLAG_STRING_DOUBLE_QUOTES), array('token' => '"abc"'), - true + true, ), array( new Token('"abc""', Token::TYPE_STRING, Token::FLAG_STRING_DOUBLE_QUOTES), array('value' => 'abc'), - true + true, ), array( new Token('"abc""', Token::TYPE_STRING, Token::FLAG_STRING_DOUBLE_QUOTES), array('value_str' => 'ABC'), - true + true, ), array( new Token('"abc""', Token::TYPE_STRING, Token::FLAG_STRING_DOUBLE_QUOTES), array('type' => Token::TYPE_STRING), - true + true, ), array( new Token('"abc""', Token::TYPE_STRING, Token::FLAG_STRING_DOUBLE_QUOTES), array('flags' => Token::FLAG_STRING_DOUBLE_QUOTES), - true + true, ), array( new Token('"abc"', Token::TYPE_STRING, Token::FLAG_STRING_DOUBLE_QUOTES), array('token' => '"abcd"'), - false + false, ), array( new Token('"abc""', Token::TYPE_STRING, Token::FLAG_STRING_DOUBLE_QUOTES), array('value' => 'abcd'), - false + false, ), array( new Token('"abc""', Token::TYPE_STRING, Token::FLAG_STRING_DOUBLE_QUOTES), array('value_str' => 'ABCd'), - false + false, ), array( new Token('"abc""', Token::TYPE_STRING, Token::FLAG_STRING_DOUBLE_QUOTES), array('type' => Token::TYPE_NUMBER), - false + false, ), array( new Token('"abc""', Token::TYPE_STRING, Token::FLAG_STRING_DOUBLE_QUOTES), array('flags' => Token::FLAG_STRING_SINGLE_QUOTES), - false + false, ), ); } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 89b5980..3c3c446 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -2,9 +2,6 @@ /** * Bootstrap for tests. - * - * @package SqlParser - * @subpackage Tests */ namespace SqlParser\Tests; @@ -18,30 +15,29 @@ require_once 'vendor/autoload.php'; * Implements useful methods for testing. * * @category Tests - * @package SqlParser - * @subpackage Tests + * * @license https://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+ */ abstract class TestCase extends \PHPUnit_Framework_TestCase { - /** * Gets the token list generated by lexing this query. * - * @param string $query The query to be lexed. + * @param string $query the query to be lexed * * @return TokensList */ public function getTokensList($query) { $lexer = new Lexer($query); + return $lexer->list; } /** * Gets the errors as an array. * - * @param Lexer|Parser $obj Object containing the errors. + * @param Lexer|Parser $obj object containing the errors * * @return array */ @@ -53,13 +49,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase ? array($err->getMessage(), $err->ch, $err->pos, $err->getCode()) : array($err->getMessage(), $err->token, $err->getCode()); } + return $ret; } /** * Gets test's input and expected output. * - * @param string $name The name of the test. + * @param string $name the name of the test * * @return array */ @@ -72,22 +69,21 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase */ $data = unserialize(file_get_contents('tests/data/' . $name . '.out')); $data['query'] = file_get_contents('tests/data/' . $name . '.in'); + return $data; } /** * Runs a test. * - * @param string $name The name of the test. - * - * @return void + * @param string $name the name of the test */ public function runParserTest($name) { /** * Test's data. * - * @var array $data + * @var array */ $data = $this->getData($name); |