| @@ -205,6 +205,7 @@ discard block | ||
| 205 | 205 | |
| 206 | 206 | /** | 
| 207 | 207 | * @param int $offset | 
| 208 | + * @param integer $limit | |
| 208 | 209 | * | 
| 209 | 210 | * @return \Porpaginas\Page | 
| 210 | 211 | */ | 
| @@ -227,7 +228,7 @@ discard block | ||
| 227 | 228 | /** | 
| 228 | 229 | * Return an iterator over all results of the paginatable. | 
| 229 | 230 | * | 
| 230 | - * @return Iterator | |
| 231 | + * @return \Iterator | |
| 231 | 232 | */ | 
| 232 | 233 | public function getIterator() | 
| 233 | 234 |      { | 
| @@ -1114,7 +1114,7 @@ discard block | ||
| 1114 | 1114 | * @param string $mainTable The name of the table queried | 
| 1115 | 1115 | * @param string|array|null $filter The SQL filters to apply to the query (the WHERE part). Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column) | 
| 1116 | 1116 | * @param array $parameters | 
| 1117 | - * @param string|UncheckedOrderBy|null $orderString The ORDER BY part of the query. Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column) | |
| 1117 | + * @param string|null $orderString The ORDER BY part of the query. Columns from tables different from $mainTable must be prefixed by the table name (in the form: table.column) | |
| 1118 | 1118 | * @param array $additionalTablesFetch | 
| 1119 | 1119 | * @param int $mode | 
| 1120 | 1120 | * @param string $className Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned | 
| @@ -1146,7 +1146,7 @@ discard block | ||
| 1146 | 1146 | * @param string $from The from sql statement | 
| 1147 | 1147 | * @param string|array|null $filter The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column) | 
| 1148 | 1148 | * @param array $parameters | 
| 1149 | - * @param string|UncheckedOrderBy|null $orderString The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column) | |
| 1149 | + * @param null|string $orderString The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column) | |
| 1150 | 1150 | * @param int $mode | 
| 1151 | 1151 | * @param string $className Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned | 
| 1152 | 1152 | * | 
| @@ -1261,7 +1261,7 @@ discard block | ||
| 1261 | 1261 | * | 
| 1262 | 1262 | * @param string $mainTable The name of the table queried | 
| 1263 | 1263 | * @param string $from The from sql statement | 
| 1264 | - * @param string|array|null $filter The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column) | |
| 1264 | + * @param string $filter The SQL filters to apply to the query (the WHERE part). All columns must be prefixed by the table name (in the form: table.column) | |
| 1265 | 1265 | * @param array $parameters | 
| 1266 | 1266 | * @param string $className Optional: The name of the class to instantiate. This class must extend the TDBMObject class. If none is specified, a TDBMObject instance will be returned | 
| 1267 | 1267 | * | 
| @@ -1390,7 +1390,7 @@ discard block | ||
| 1390 | 1390 | * @param $pivotTableName | 
| 1391 | 1391 | * @param AbstractTDBMObject $bean | 
| 1392 | 1392 | * | 
| 1393 | - * @return AbstractTDBMObject[] | |
| 1393 | + * @return ResultIterator | |
| 1394 | 1394 | */ | 
| 1395 | 1395 | public function _getRelatedBeans(string $pivotTableName, AbstractTDBMObject $bean) | 
| 1396 | 1396 |      { | 
| @@ -21,13 +21,10 @@ | ||
| 21 | 21 | namespace TheCodingMachine\TDBM; | 
| 22 | 22 | |
| 23 | 23 | use Doctrine\Common\Cache\Cache; | 
| 24 | -use Doctrine\Common\Cache\VoidCache; | |
| 25 | 24 | use Doctrine\DBAL\Connection; | 
| 26 | 25 | use Doctrine\DBAL\Platforms\AbstractPlatform; | 
| 27 | 26 | use Doctrine\DBAL\Platforms\MySqlPlatform; | 
| 28 | -use Doctrine\DBAL\Schema\Column; | |
| 29 | 27 | use Doctrine\DBAL\Schema\ForeignKeyConstraint; | 
| 30 | -use Doctrine\DBAL\Schema\Schema; | |
| 31 | 28 | use Doctrine\DBAL\Schema\Table; | 
| 32 | 29 | use Doctrine\DBAL\Types\Type; | 
| 33 | 30 | use Mouf\Database\MagicQuery; | 
| @@ -9,7 +9,6 @@ | ||
| 9 | 9 | use TheCodingMachine\TDBM\ConfigurationInterface; | 
| 10 | 10 | use TheCodingMachine\TDBM\TDBMException; | 
| 11 | 11 | use TheCodingMachine\TDBM\TDBMSchemaAnalyzer; | 
| 12 | -use Symfony\Component\EventDispatcher\EventDispatcherInterface; | |
| 13 | 12 | use Symfony\Component\Filesystem\Filesystem; | 
| 14 | 13 | |
| 15 | 14 | /** | 
| @@ -537,7 +537,7 @@ discard block | ||
| 537 | 537 | * Transforms a string to camelCase (except the first letter will be uppercase too). | 
| 538 | 538 | * Underscores and spaces are removed and the first letter after the underscore is uppercased. | 
| 539 | 539 | * | 
| 540 | - * @param $str string | |
| 540 | + * @param string $str string | |
| 541 | 541 | * | 
| 542 | 542 | * @return string | 
| 543 | 543 | */ | 
| @@ -565,7 +565,7 @@ discard block | ||
| 565 | 565 | * Tries to put string to the singular form (if it is plural). | 
| 566 | 566 | * We assume the table names are in english. | 
| 567 | 567 | * | 
| 568 | - * @param $str string | |
| 568 | + * @param string $str string | |
| 569 | 569 | * | 
| 570 | 570 | * @return string | 
| 571 | 571 | */ | 
| @@ -578,7 +578,7 @@ discard block | ||
| 578 | 578 | * Put the first letter of the string in lower case. | 
| 579 | 579 | * Very useful to transform a class name into a variable name. | 
| 580 | 580 | * | 
| 581 | - * @param $str string | |
| 581 | + * @param string $str string | |
| 582 | 582 | * | 
| 583 | 583 | * @return string | 
| 584 | 584 | */ | 
| @@ -4,7 +4,6 @@ | ||
| 4 | 4 | namespace TheCodingMachine\TDBM\Utils; | 
| 5 | 5 | |
| 6 | 6 | use Doctrine\Common\Inflector\Inflector; | 
| 7 | -use Doctrine\DBAL\Schema\Column; | |
| 8 | 7 | use Doctrine\DBAL\Schema\ForeignKeyConstraint; | 
| 9 | 8 | use TheCodingMachine\TDBM\TDBMException; | 
| 10 | 9 | |
| @@ -62,6 +62,9 @@ discard block | ||
| 62 | 62 | |
| 63 | 63 | private $logger; | 
| 64 | 64 | |
| 65 | + /** | |
| 66 | + * @param null|string $className | |
| 67 | + */ | |
| 65 | 68 | public function __construct(QueryFactory $queryFactory, array $parameters, $objectStorage, $className, TDBMService $tdbmService, MagicQuery $magicQuery, $mode, LoggerInterface $logger) | 
| 66 | 69 |      { | 
| 67 | 70 |          if ($mode !== null && $mode !== TDBMService::MODE_CURSOR && $mode !== TDBMService::MODE_ARRAY) { | 
| @@ -300,7 +303,6 @@ discard block | ||
| 300 | 303 | * | 
| 301 | 304 |       *  $resultSet = $resultSet->withParameters('label ASC, status DESC'); | 
| 302 | 305 | * | 
| 303 | - * @param string|UncheckedOrderBy|null $orderBy | |
| 304 | 306 | * | 
| 305 | 307 | * @return ResultIterator | 
| 306 | 308 | */ | 
| @@ -20,8 +20,6 @@ | ||
| 20 | 20 | |
| 21 | 21 | namespace TheCodingMachine\TDBM; | 
| 22 | 22 | |
| 23 | -use Doctrine\DBAL\Platforms\MySqlPlatform; | |
| 24 | -use TheCodingMachine\TDBM\Utils\DefaultNamingStrategy; | |
| 25 | 23 | use Psr\Log\LogLevel; | 
| 26 | 24 | use Wa72\SimpleLogger\ArrayLogger; | 
| 27 | 25 | |