Simplified stubs thanks to improvements in PHPStan 0.12.4

This reverts commit af14feb.

Author: ondrejmirtes

composer.json

@@ -7,7 +7,7 @@
 	],
 	"require": {
 		"php": "~7.1",
-		"phpstan/phpstan": "^0.12.3"
+		"phpstan/phpstan": "^0.12.4"
 	},
 	"conflict": {
 		"doctrine/collections": "<1.0",

stubs/DocumentManager.stub

@@ -18,13 +18,6 @@ class DocumentManager implements ObjectManager
 	 */
 	public function find($documentName, $identifier, $lockMode = null, $lockVersion = null);
 
-	/**
-	 * @template T
-	 * @phpstan-param T $document
-	 * @phpstan-return T
-	 */
-	public function merge($document);
-
 	/**
 	 * @template T
 	 * @phpstan-param class-string<T> $documentName

stubs/DocumentRepository.stub

@@ -19,6 +19,8 @@ class DocumentRepository implements ObjectRepository
 	 */
 	public function find($id, $lockMode = null, $lockVersion = null);
 
+	// following methods could be removed if we only supported doctrine/persistence ^1.3 because of different implemented ObjectRepository namespace
+
 	/**
 	 * @phpstan-return TDocumentClass[]
 	 */

stubs/EntityManager.stub

@@ -15,43 +15,4 @@ class EntityManager implements EntityManagerInterface
 	 */
 	public function find($entityName, $id, $lockMode = null, $lockVersion = null);
 
-	/**
-	 * @template T
-	 * @phpstan-param T $entity
-	 * @phpstan-return T
-	 */
-	public function merge($entity);
-
-	/**
-	 * @template T
-	 * @phpstan-param class-string<T> $entityName
-	 * @phpstan-return EntityRepository<T>
-	 */
-	public function getRepository($entityName);
-
-	/**
-	 * @template T
-	 * @phpstan-param class-string<T> $entityName
-	 * @phpstan-param mixed $id
-	 * @phpstan-return T|null
-	 */
-	public function getReference($entityName, $id);
-
-	/**
-	 * @template T
-	 * @phpstan-param class-string<T> $entityName
-	 * @phpstan-param mixed $identifier
-	 *
-	 * @phpstan-return T|null
-	 */
-	public function getPartialReference($entityName, $identifier);
-
-	/**
-	 * @template T
-	 * @phpstan-param T $entity
-	 * @phpstan-param bool $deep
-	 * @phpstan-return T
-	 */
-	public function copy($entity, $deep = false);
-
 }

stubs/EntityManagerDecorator.stub

@@ -18,43 +18,11 @@ class EntityManagerDecorator implements EntityManagerInterface
 	 */
 	public function find($entityName, $id, $lockMode = null, $lockVersion = null);
 
-	/**
-	 * @template T
-	 * @phpstan-param T $entity
-	 * @phpstan-return T
-	 */
-	public function merge($entity);
-
 	/**
 	 * @template T
 	 * @phpstan-param class-string<T> $entityName
 	 * @phpstan-return EntityRepository<T>
 	 */
 	public function getRepository($entityName);
 
-	/**
-	 * @template T
-	 * @phpstan-param class-string<T> $entityName
-	 * @phpstan-param mixed $id
-	 * @phpstan-return T|null
-	 */
-	public function getReference($entityName, $id);
-
-	/**
-	 * @template T
-	 * @phpstan-param class-string<T> $entityName
-	 * @phpstan-param mixed $identifier
-	 *
-	 * @phpstan-return T|null
-	 */
-	public function getPartialReference($entityName, $identifier);
-
-	/**
-	 * @template T
-	 * @phpstan-param T $entity
-	 * @phpstan-param bool $deep
-	 * @phpstan-return T
-	 */
-	public function copy($entity, $deep = false);
-
 }

stubs/EntityManagerInterface.stub

@@ -8,28 +8,6 @@ use Doctrine\Common\Persistence\ObjectRepository;
 interface EntityManagerInterface extends ObjectManager
 {
 
-	/**
-	 * @template T
-	 * @phpstan-param class-string<T> $className
-	 * @phpstan-param mixed  $id
-	 * @phpstan-return T|null
-	 */
-	public function find($className, $id);
-
-	/**
-	 * @template T
-	 * @phpstan-param T $object
-	 * @phpstan-return T
-	 */
-	public function merge($object);
-
-	/**
-	 * @template T
-	 * @phpstan-param class-string<T> $className
-	 * @phpstan-return ObjectRepository<T>
-	 */
-	public function getRepository($className);
-
 	/**
 	 * @template T
 	 * @phpstan-param class-string<T> $entityName

stubs/EntityRepository.stub

@@ -11,6 +11,13 @@ use Doctrine\Common\Persistence\ObjectRepository;
 class EntityRepository implements ObjectRepository
 {
 
+	/**
+	 * @phpstan-return class-string<TEntityClass>
+	 */
+	protected function getEntityName();
+
+	// following methods could be removed if we only supported doctrine/persistence ^1.3 because of different implemented ObjectRepository namespace
+
 	/**
 	 * @phpstan-param mixed $id
 	 * @phpstan-param int|null $lockMode
@@ -45,9 +52,4 @@ class EntityRepository implements ObjectRepository
 	 */
 	public function getClassName();
 
-	/**
-	 * @phpstan-return class-string<TEntityClass>
-	 */
-	protected function getEntityName();
-
 }