Merge remote-tracking branch 'origin/pull/137'

nijel · nijel · commit 14b0a8976124 · 2017-02-14T14:11:33.000+01:00
diff --git a/.php_cs b/.php_cs
@@ -17,6 +17,7 @@ return PhpCsFixer\Config::create()
         'no_trailing_whitespace' => true,
         'no_useless_return' => true,
         'no_useless_else' => true,
+        'phpdoc_add_missing_param_annotation' => true,
         'phpdoc_order' => true,
     ))
     ->setFinder($finder)
diff --git a/tests/Components/ArrayObjTest.php b/tests/Components/ArrayObjTest.php
@@ -38,6 +38,8 @@ public function testParseType()
 
     /**
      * @dataProvider testParseProvider
+     *
+     * @param mixed $test
      */
     public function testParse($test)
     {
diff --git a/tests/Components/ExpressionTest.php b/tests/Components/ExpressionTest.php
@@ -21,6 +21,9 @@ public function testParse2()
 
     /**
      * @dataProvider testParseErrProvider
+     *
+     * @param mixed $expr
+     * @param mixed $error
      */
     public function testParseErr($expr, $error)
     {
diff --git a/tests/Components/LimitTest.php b/tests/Components/LimitTest.php
@@ -22,6 +22,8 @@ public function testBuildWithOffset()
 
     /**
      * @dataProvider testParseProvider
+     *
+     * @param mixed $test
      */
     public function testParse($test)
     {
diff --git a/tests/Lexer/LexerTest.php b/tests/Lexer/LexerTest.php
@@ -48,6 +48,8 @@ public function testErrorStrict()
 
     /**
      * @dataProvider testLexProvider
+     *
+     * @param mixed $test
      */
     public function testLex($test)
     {
diff --git a/tests/Misc/BugsTest.php b/tests/Misc/BugsTest.php
@@ -8,6 +8,8 @@ class BugsTest extends TestCase
 {
     /**
      * @dataProvider testBugProvider
+     *
+     * @param mixed $test
      */
     public function testBug($test)
     {
diff --git a/tests/Parser/AlterStatementTest.php b/tests/Parser/AlterStatementTest.php
@@ -8,6 +8,8 @@ class AlterStatementTest extends TestCase
 {
     /**
      * @dataProvider testAlterProvider
+     *
+     * @param mixed $test
      */
     public function testAlter($test)
     {
diff --git a/tests/Parser/CallStatementTest.php b/tests/Parser/CallStatementTest.php
@@ -8,6 +8,8 @@ class CallStatementTest extends TestCase
 {
     /**
      * @dataProvider testCallProvider
+     *
+     * @param mixed $test
      */
     public function testCall($test)
     {
diff --git a/tests/Parser/CreateStatementTest.php b/tests/Parser/CreateStatementTest.php
@@ -8,6 +8,8 @@ class CreateStatementTest extends TestCase
 {
     /**
      * @dataProvider testCreateProvider
+     *
+     * @param mixed $test
      */
     public function testCreate($test)
     {
diff --git a/tests/Parser/DeleteStatementTest.php b/tests/Parser/DeleteStatementTest.php
@@ -8,6 +8,8 @@ class DeleteStatementTest extends TestCase
 {
     /**
      * @dataProvider testDeleteProvider
+     *
+     * @param mixed $test
      */
     public function testDelete($test)
     {
diff --git a/tests/Parser/ExplainStatement.php b/tests/Parser/ExplainStatement.php
@@ -8,6 +8,8 @@ class ExplainStatementTest extends TestCase
 {
     /**
      * @dataProvider testExplainProvider
+     *
+     * @param mixed $test
      */
     public function testExplain($test)
     {
diff --git a/tests/Parser/InsertStatementTest.php b/tests/Parser/InsertStatementTest.php
@@ -8,6 +8,8 @@ class InsertStatementTest extends TestCase
 {
     /**
      * @dataProvider testInsertProvider
+     *
+     * @param mixed $test
      */
     public function testInsert($test)
     {
diff --git a/tests/Parser/ParserTest.php b/tests/Parser/ParserTest.php
@@ -12,6 +12,8 @@ class ParserTest extends TestCase
 {
     /**
      * @dataProvider testParseProvider
+     *
+     * @param mixed $test
      */
     public function testParse($test)
     {
diff --git a/tests/Parser/RenameStatementTest.php b/tests/Parser/RenameStatementTest.php
@@ -8,6 +8,8 @@ class RenameStatementTest extends TestCase
 {
     /**
      * @dataProvider testRenameProvider
+     *
+     * @param mixed $test
      */
     public function testRename($test)
     {
diff --git a/tests/Parser/ReplaceStatementTest.php b/tests/Parser/ReplaceStatementTest.php
@@ -8,6 +8,8 @@ class ReplaceStatementTest extends TestCase
 {
     /**
      * @dataProvider testReplaceProvider
+     *
+     * @param mixed $test
      */
     public function testReplace($test)
     {
diff --git a/tests/Parser/RestoreStatementTest.php b/tests/Parser/RestoreStatementTest.php
@@ -8,6 +8,8 @@ class RestoreStatementTest extends TestCase
 {
     /**
      * @dataProvider testRestoreProvider
+     *
+     * @param mixed $test
      */
     public function testRestore($test)
     {
diff --git a/tests/Parser/SelectStatementTest.php b/tests/Parser/SelectStatementTest.php
@@ -17,6 +17,8 @@ public function testSelectOptions()
 
     /**
      * @dataProvider testSelectProvider
+     *
+     * @param mixed $test
      */
     public function testSelect($test)
     {
diff --git a/tests/Parser/SetStatementTest.php b/tests/Parser/SetStatementTest.php
@@ -8,6 +8,8 @@ class SetStatementTest extends TestCase
 {
     /**
      * @dataProvider testSetProvider
+     *
+     * @param mixed $test
      */
     public function testSet($test)
     {
diff --git a/tests/Parser/TransactionStatementTest.php b/tests/Parser/TransactionStatementTest.php
@@ -8,6 +8,8 @@ class TransactionStatementTest extends TestCase
 {
     /**
      * @dataProvider testTransactionProvider
+     *
+     * @param mixed $test
      */
     public function testTransaction($test)
     {
diff --git a/tests/Parser/UpdateStatementTest.php b/tests/Parser/UpdateStatementTest.php
@@ -8,6 +8,8 @@ class UpdateStatementTest extends TestCase
 {
     /**
      * @dataProvider testUpdateProvider
+     *
+     * @param mixed $test
      */
     public function testUpdate($test)
     {
diff --git a/tests/Utils/BufferedQueryTest.php b/tests/Utils/BufferedQueryTest.php
@@ -9,6 +9,9 @@ class BufferedQueryTest extends TestCase
 {
     /**
      * @dataProvider testExtractProvider
+     *
+     * @param mixed $query
+     * @param mixed $chunkSize
      */
     public function testExtract(
         $query,
diff --git a/tests/Utils/CLITest.php b/tests/Utils/CLITest.php
@@ -30,6 +30,10 @@ public function testGetopt()
 
     /**
      * @dataProvider highlightParams
+     *
+     * @param mixed $getopt
+     * @param mixed $output
+     * @param mixed $result
      */
     public function testRunHighlight($getopt, $output, $result)
     {
@@ -88,6 +92,10 @@ public function highlightParams()
 
     /**
      * @dataProvider lintParams
+     *
+     * @param mixed $getopt
+     * @param mixed $output
+     * @param mixed $result
      */
     public function testRunLint($getopt, $output, $result)
     {
diff --git a/tests/Utils/FormatterTest.php b/tests/Utils/FormatterTest.php
@@ -9,6 +9,10 @@ class FormatTest extends TestCase
 {
     /**
      * @dataProvider mergeFormats
+     *
+     * @param mixed $default
+     * @param mixed $overriding
+     * @param mixed $expected
      */
     public function testMergeFormats($default, $overriding, $expected)
     {
@@ -231,6 +235,11 @@ public function mergeFormats()
 
     /**
      * @dataProvider formatQueries
+     *
+     * @param mixed $query
+     * @param mixed $text
+     * @param mixed $cli
+     * @param mixed $html
      */
     public function testFormat($query, $text, $cli, $html, array $options = array())
     {
diff --git a/tests/Utils/MiscTest.php b/tests/Utils/MiscTest.php
@@ -10,6 +10,9 @@ class MiscTest extends TestCase
 {
     /**
      * @dataProvider getAliasesProvider
+     *
+     * @param mixed $query
+     * @param mixed $db
      */
     public function testGetAliases($query, $db, array $expected)
     {
diff --git a/tests/Utils/QueryTest.php b/tests/Utils/QueryTest.php
@@ -10,6 +10,9 @@ class QueryTest extends TestCase
 {
     /**
      * @dataProvider testGetFlagsProvider
+     *
+     * @param mixed $query
+     * @param mixed $expected
      */
     public function testGetFlags($query, $expected)
     {
@@ -347,6 +350,9 @@ public function testGetAll()
 
     /**
      * @dataProvider testGetTablesProvider
+     *
+     * @param mixed $query
+     * @param mixed $expected
      */
     public function testGetTables($query, $expected)
     {
diff --git a/tests/Utils/RoutineTest.php b/tests/Utils/RoutineTest.php
@@ -10,6 +10,8 @@ class RoutineTest extends TestCase
 {
     /**
      * @dataProvider getReturnTypeProvider
+     *
+     * @param mixed $def
      */
     public function testGetReturnType($def, array $expected)
     {
@@ -49,6 +51,8 @@ public function getReturnTypeProvider()
 
     /**
      * @dataProvider getParameterProvider
+     *
+     * @param mixed $def
      */
     public function testGetParameter($def, array $expected)
     {
@@ -88,6 +92,8 @@ public function getParameterProvider()
 
     /**
      * @dataProvider getParametersProvider
+     *
+     * @param mixed $query
      */
     public function testGetParameters($query, array $expected)
     {
diff --git a/tests/Utils/TableTest.php b/tests/Utils/TableTest.php
@@ -10,6 +10,8 @@ class TableTest extends TestCase
 {
     /**
      * @dataProvider getForeignKeysProvider
+     *
+     * @param mixed $query
      */
     public function testGetForeignKeys($query, array $expected)
     {
@@ -110,6 +112,8 @@ public function getForeignKeysProvider()
 
     /**
      * @dataProvider getFieldsProvider
+     *
+     * @param mixed $query
      */
     public function testGetFields($query, array $expected)
     {
diff --git a/tests/Utils/TokensTest.php b/tests/Utils/TokensTest.php
@@ -10,6 +10,11 @@ class TokensTest extends TestCase
 {
     /**
      * @dataProvider replaceTokensProvider
+     *
+     * @param mixed $list
+     * @param mixed $find
+     * @param mixed $replace
+     * @param mixed $expected
      */
     public function testReplaceTokens($list, $find, $replace, $expected)
     {
@@ -36,6 +41,10 @@ public function replaceTokensProvider()
 
     /**
      * @dataProvider matchProvider
+     *
+     * @param mixed $token
+     * @param mixed $pattern
+     * @param mixed $expected
      */
     public function testMatch($token, $pattern, $expected)
     {
diff --git a/tools/TestGenerator.php b/tools/TestGenerator.php
@@ -130,8 +130,9 @@ public static function build($type, $input, $output, $debug = null)
     /**
      * Generates recursively all tests preserving the directory structure.
      *
-     * @param string $input  the input directory
-     * @param string $output the output directory
+     * @param string     $input  the input directory
+     * @param string     $output the output directory
+     * @param null|mixed $debug
      */
     public static function buildAll($input, $output, $debug = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ public function testParseType()`
`38`	`38`
`39`	`39`	`/**`
`40`	`40`	`* @dataProvider testParseProvider`
	`41`	`+ *`
	`42`	`+ * @param mixed $test`
`41`	`43`	`*/`
`42`	`44`	`public function testParse($test)`
`43`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ public function testParse2()`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* @dataProvider testParseErrProvider`
	`24`	`+ *`
	`25`	`+ * @param mixed $expr`
	`26`	`+ * @param mixed $error`
`24`	`27`	`*/`
`25`	`28`	`public function testParseErr($expr, $error)`
`26`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@ public function testBuildWithOffset()`
`22`	`22`
`23`	`23`	`/**`
`24`	`24`	`* @dataProvider testParseProvider`
	`25`	`+ *`
	`26`	`+ * @param mixed $test`
`25`	`27`	`*/`
`26`	`28`	`public function testParse($test)`
`27`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@ public function testErrorStrict()`
`48`	`48`
`49`	`49`	`/**`
`50`	`50`	`* @dataProvider testLexProvider`
	`51`	`+ *`
	`52`	`+ * @param mixed $test`
`51`	`53`	`*/`
`52`	`54`	`public function testLex($test)`
`53`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ class BugsTest extends TestCase`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* @dataProvider testBugProvider`
	`11`	`+ *`
	`12`	`+ * @param mixed $test`
`11`	`13`	`*/`
`12`	`14`	`public function testBug($test)`
`13`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ class AlterStatementTest extends TestCase`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* @dataProvider testAlterProvider`
	`11`	`+ *`
	`12`	`+ * @param mixed $test`
`11`	`13`	`*/`
`12`	`14`	`public function testAlter($test)`
`13`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ class CallStatementTest extends TestCase`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* @dataProvider testCallProvider`
	`11`	`+ *`
	`12`	`+ * @param mixed $test`
`11`	`13`	`*/`
`12`	`14`	`public function testCall($test)`
`13`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ class CreateStatementTest extends TestCase`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* @dataProvider testCreateProvider`
	`11`	`+ *`
	`12`	`+ * @param mixed $test`
`11`	`13`	`*/`
`12`	`14`	`public function testCreate($test)`
`13`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ class DeleteStatementTest extends TestCase`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* @dataProvider testDeleteProvider`
	`11`	`+ *`
	`12`	`+ * @param mixed $test`
`11`	`13`	`*/`
`12`	`14`	`public function testDelete($test)`
`13`	`15`	`{`