@@ -17,7 +17,6 @@ |
||
| 17 | 17 | use Kdyby; |
| 18 | 18 | use Kdyby\Doctrine\Tools\RobotLoader; |
| 19 | 19 | use Kdyby\DoctrineCache\ReversedStorageDecorator; |
| 20 | -use Nette; |
|
| 21 | 20 | use Nette\Caching\Storages\MemoryStorage; |
| 22 | 21 | |
| 23 | 22 | |
@@ -372,7 +372,7 @@ |
||
| 372 | 372 | /** |
| 373 | 373 | * @deprecated |
| 374 | 374 | * @internal |
| 375 | - * @param \Exception|\Throwable $e |
|
| 375 | + * @param \Exception $e |
|
| 376 | 376 | * @param string $query |
| 377 | 377 | * @param array $params |
| 378 | 378 | * @return \Kdyby\Doctrine\DBALException|\Exception|\Throwable |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | use Doctrine\DBAL\Types\Type; |
| 16 | 16 | use Doctrine\DBAL\Driver; |
| 17 | 17 | use Kdyby; |
| 18 | -use Nette; |
|
| 19 | 18 | use PDO; |
| 20 | 19 | use Tracy; |
| 21 | 20 | |
@@ -41,6 +41,9 @@ |
||
| 41 | 41 | */ |
| 42 | 42 | private $unitOfWorkSnapshot; |
| 43 | 43 | |
| 44 | + /** |
|
| 45 | + * @param \Exception $exception |
|
| 46 | + */ |
|
| 44 | 47 | public function markExceptionOwner(Doctrine\ORM\EntityManager $em, $exception) |
| 45 | 48 | { |
| 46 | 49 | if ($this->em !== $em) { |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | |
| 631 | 631 | /** |
| 632 | 632 | * @param \Doctrine\Common\Annotations\AnnotationException $e |
| 633 | - * @return string|bool |
|
| 633 | + * @return false|string |
|
| 634 | 634 | */ |
| 635 | 635 | public static function highlightAnnotationLine(AnnotationException $e) |
| 636 | 636 | { |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | |
| 674 | 674 | /** |
| 675 | 675 | * @param \Reflector|\Nette\Reflection\ClassType|\Nette\Reflection\Method|\Nette\Reflection\Property $refl |
| 676 | - * @param \Exception|\Throwable $e |
|
| 676 | + * @param AnnotationException $e |
|
| 677 | 677 | * @param int|NULL $startLine |
| 678 | 678 | * @return int|NULL |
| 679 | 679 | */ |
@@ -732,6 +732,7 @@ discard block |
||
| 732 | 732 | /** |
| 733 | 733 | * @param \Reflector|Nette\Reflection\ClassType|Nette\Reflection\Method $refl |
| 734 | 734 | * @param $annotation |
| 735 | + * @return string |
|
| 735 | 736 | */ |
| 736 | 737 | private static function findRenamed(\Reflector $refl, $annotation) |
| 737 | 738 | { |
@@ -20,7 +20,6 @@ |
||
| 20 | 20 | use Kdyby\Doctrine\QueryObject; |
| 21 | 21 | use Kdyby\Doctrine\Tools\NonLockingUniqueInserter; |
| 22 | 22 | use Kdyby\Persistence; |
| 23 | -use Nette; |
|
| 24 | 23 | |
| 25 | 24 | |
| 26 | 25 | |
@@ -16,7 +16,6 @@ |
||
| 16 | 16 | use Doctrine\ORM\NonUniqueResultException; |
| 17 | 17 | use Kdyby; |
| 18 | 18 | use Kdyby\Persistence; |
| 19 | -use Nette; |
|
| 20 | 19 | |
| 21 | 20 | |
| 22 | 21 | |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | /** |
| 139 | 139 | * This is just a paranoia, hopes no one actually serializes exceptions. |
| 140 | 140 | * |
| 141 | - * @return array |
|
| 141 | + * @return string[] |
|
| 142 | 142 | */ |
| 143 | 143 | public function __sleep() |
| 144 | 144 | { |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | |
| 165 | 165 | |
| 166 | 166 | /** |
| 167 | - * @param \Exception|\Throwable $previous |
|
| 167 | + * @param \Exception $previous |
|
| 168 | 168 | * @param array $columns |
| 169 | 169 | * @param string $query |
| 170 | 170 | * @param array $params |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | |
| 180 | 180 | |
| 181 | 181 | /** |
| 182 | - * @return array |
|
| 182 | + * @return string[] |
|
| 183 | 183 | */ |
| 184 | 184 | public function __sleep() |
| 185 | 185 | { |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | |
| 222 | 222 | /** |
| 223 | - * @return array |
|
| 223 | + * @return string[] |
|
| 224 | 224 | */ |
| 225 | 225 | public function __sleep() |
| 226 | 226 | { |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | |
| 246 | 246 | |
| 247 | 247 | /** |
| 248 | - * @param \Exception|\Throwable $previous |
|
| 248 | + * @param \Exception $previous |
|
| 249 | 249 | * @param \Doctrine\ORM\AbstractQuery|NULL $query |
| 250 | 250 | * @param string|NULL $message |
| 251 | 251 | */ |
@@ -11,7 +11,6 @@ |
||
| 11 | 11 | namespace Kdyby\Doctrine; |
| 12 | 12 | |
| 13 | 13 | use Kdyby; |
| 14 | -use Nette; |
|
| 15 | 14 | use Doctrine\DBAL\Types\Type; |
| 16 | 15 | |
| 17 | 16 | |
@@ -12,7 +12,6 @@ |
||
| 12 | 12 | |
| 13 | 13 | use Doctrine; |
| 14 | 14 | use Kdyby; |
| 15 | -use Nette; |
|
| 16 | 15 | |
| 17 | 16 | |
| 18 | 17 | |