| @@ -84,7 +84,7 @@ | ||
| 84 | 84 | /** | 
| 85 | 85 | * Return list of data source fields available for the data source | 
| 86 | 86 | * | 
| 87 | - * @return FieldInterface | |
| 87 | + * @return Field[] | |
| 88 | 88 | */ | 
| 89 | 89 | public function getFields() | 
| 90 | 90 |      { | 
| @@ -33,8 +33,8 @@ discard block | ||
| 33 | 33 | private $joinCache = []; | 
| 34 | 34 | |
| 35 | 35 | /** | 
| 36 | - * @param array $queryBuilderDataSourceFields | |
| 37 | - * @param $fromAlias | |
| 36 | + * @param \Netdudes\DataSourceryBundle\DataSource\Configuration\FieldInterface[] $queryBuilderDataSourceFields | |
| 37 | + * @param string $fromAlias | |
| 38 | 38 | * @param RequiredFieldsExtractor $requiredFieldsExtractor | 
| 39 | 39 | */ | 
| 40 | 40 | public function __construct(array $queryBuilderDataSourceFields, $fromAlias, RequiredFieldsExtractor $requiredFieldsExtractor) | 
| @@ -122,7 +122,7 @@ discard block | ||
| 122 | 122 | * Walks a node of the dependency tree, recursively generating an ordered list on Joins | 
| 123 | 123 | * that is stored in the $this->joins cache. | 
| 124 | 124 | * | 
| 125 | - * @param $parentUniqueIdentifier | |
| 125 | + * @param string $parentUniqueIdentifier | |
| 126 | 126 | * @param $node | 
| 127 | 127 | * @param $descendants | 
| 128 | 128 | * @param array $completePath | 
| @@ -32,7 +32,7 @@ | ||
| 32 | 32 | } | 
| 33 | 33 | |
| 34 | 34 | /** | 
| 35 | - * @return \string[] | |
| 35 | + * @return string[] | |
| 36 | 36 | */ | 
| 37 | 37 | public function getExpectedTokenCategories() | 
| 38 | 38 |      { | 
| @@ -47,7 +47,7 @@ discard block | ||
| 47 | 47 | /** | 
| 48 | 48 | * Lex, initialise and return the AST. | 
| 49 | 49 | * | 
| 50 | - * @param $string | |
| 50 | + * @param string $string | |
| 51 | 51 | * | 
| 52 | 52 | * @return bool|ASTAssertion|ASTGroup | 
| 53 | 53 | */ | 
| @@ -178,7 +178,7 @@ discard block | ||
| 178 | 178 | * Tries to match the following tokens to an <assertion>. | 
| 179 | 179 | * | 
| 180 | 180 | * @throws Exception\UQLSyntaxError | 
| 181 | - * @return bool|ASTAssertion | |
| 181 | + * @return boolean | |
| 182 | 182 | */ | 
| 183 | 183 | public function matchAssertion() | 
| 184 | 184 |      { | 
| @@ -224,7 +224,7 @@ discard block | ||
| 224 | 224 | /** | 
| 225 | 225 | * Tries to match the next token to an <operator>. | 
| 226 | 226 | * | 
| 227 | - * @return bool | |
| 227 | + * @return boolean|null | |
| 228 | 228 | */ | 
| 229 | 229 | public function matchOperator() | 
| 230 | 230 |      { | 
| @@ -325,7 +325,7 @@ discard block | ||
| 325 | 325 | } | 
| 326 | 326 | |
| 327 | 327 | /** | 
| 328 | - * @param mixed $tokenIndex | |
| 328 | + * @param integer $tokenIndex | |
| 329 | 329 | */ | 
| 330 | 330 | public function setTokenIndex($tokenIndex) | 
| 331 | 331 |      { | 
| @@ -365,7 +365,7 @@ discard block | ||
| 365 | 365 | /** | 
| 366 | 366 | * Helper method. Throws an Exception representing a Syntax Error. | 
| 367 | 367 | * | 
| 368 | - * @param $message | |
| 368 | + * @param string $message | |
| 369 | 369 | * | 
| 370 | 370 | * @throws \Exception | 
| 371 | 371 | */ | 
| @@ -387,6 +387,9 @@ discard block | ||
| 387 | 387 | ); | 
| 388 | 388 | } | 
| 389 | 389 | |
| 390 | + /** | |
| 391 | + * @param string $message | |
| 392 | + */ | |
| 390 | 393 | private function throwSyntaxError($message) | 
| 391 | 394 |      { | 
| 392 | 395 |          throw new UQLSyntaxError('Syntax error: ' . $message); | 
| @@ -396,7 +399,7 @@ discard block | ||
| 396 | 399 | * Transforms a literal subtype (e.g. T_LITERAL_FALSE) into a plain | 
| 397 | 400 | * literal match. Plain literals are unchanged. | 
| 398 | 401 | * | 
| 399 | - * @param $literal | |
| 402 | + * @param boolean $literal | |
| 400 | 403 | * | 
| 401 | 404 | * @return array | 
| 402 | 405 | */ | 
| @@ -94,6 +94,7 @@ | ||
| 94 | 94 | * This function is cached, and will only be generated once per execution. | 
| 95 | 95 | * | 
| 96 | 96 | * @param Query $query | 
| 97 | + * @param string $entityClass | |
| 97 | 98 | * | 
| 98 | 99 | * @return QueryBuilder | 
| 99 | 100 | */ | 
| @@ -276,7 +276,7 @@ | ||
| 276 | 276 | } | 
| 277 | 277 | |
| 278 | 278 | /** | 
| 279 | - * @param array $extraMethods | |
| 279 | + * @param string[] $extraMethods | |
| 280 | 280 | * | 
| 281 | 281 | * @return \PHPUnit_Framework_MockObject_MockObject | 
| 282 | 282 | */ | 
| @@ -50,7 +50,7 @@ discard block | ||
| 50 | 50 | } | 
| 51 | 51 | |
| 52 | 52 | /** | 
| 53 | - * @return mixed | |
| 53 | + * @return string | |
| 54 | 54 | */ | 
| 55 | 55 | public function getMethod() | 
| 56 | 56 |      { | 
| @@ -58,7 +58,7 @@ discard block | ||
| 58 | 58 | } | 
| 59 | 59 | |
| 60 | 60 | /** | 
| 61 | - * @return mixed | |
| 61 | + * @return string | |
| 62 | 62 | */ | 
| 63 | 63 | public function getName() | 
| 64 | 64 |      { | 
| @@ -255,7 +255,7 @@ discard block | ||
| 255 | 255 | /** | 
| 256 | 256 | * Translate Lexer <logic> tokens into Filter Condition Types. | 
| 257 | 257 | * | 
| 258 | - * @param $token | |
| 258 | + * @param string $token | |
| 259 | 259 | * | 
| 260 | 260 | * @return string | 
| 261 | 261 | * @throws \Exception | 
| @@ -280,7 +280,7 @@ discard block | ||
| 280 | 280 | * | 
| 281 | 281 | * @param mixed $value | 
| 282 | 282 | * | 
| 283 | - * @return mixed | |
| 283 | + * @return string | |
| 284 | 284 | */ | 
| 285 | 285 | private function parseValue($value) | 
| 286 | 286 |      { | 
| @@ -66,7 +66,7 @@ discard block | ||
| 66 | 66 | * @param DataSourceInterface $dataSource | 
| 67 | 67 | * @param QueryInterface $query | 
| 68 | 68 | * | 
| 69 | - * @return \Doctrine\DBAL\Query\QueryBuilder|null | |
| 69 | + * @return QueryBuilder | |
| 70 | 70 | */ | 
| 71 | 71 | public function getQueryBuilder(DataSourceInterface $dataSource, QueryInterface $query) | 
| 72 | 72 |      { | 
| @@ -122,6 +122,7 @@ discard block | ||
| 122 | 122 | * | 
| 123 | 123 | * @param array $dataRow Plain array of data for a single row, from the database | 
| 124 | 124 | * @param Field $dataSourceField | 
| 125 | + * @param \Netdudes\DataSourceryBundle\DataSource\Configuration\FieldInterface[] $fields | |
| 125 | 126 | * | 
| 126 | 127 | * @throws \Exception | 
| 127 | 128 | * |