Update compatibility

composer.json

@@ -10,15 +10,22 @@
 			"homepage": "http://www.matej21.cz"
 		}
 	],
+	"repositories": [
+		{
+			"type": "git",
+			"url": "https://github.com/paveljurasek/events"
+		}
+	],
 	"require": {
-		"nette/utils": "~2.4",
-		"nette/di": "~2.4",
-		"kdyby/doctrine": "@dev",
-		"kdyby/events": "@dev"
+		"php": "^7.1",
+		"nette/utils": "^3.0",
+		"nette/di": "^3.0-RC3",
+		"doctrine/orm": "^2.6",
+		"kdyby/events": "^4.0"
 	},
 	"require-dev": {
-		"nette/tester": "@dev",
-		"tracy/tracy": "@dev"
+		"nette/tester": "^2.2",
+		"tracy/tracy": "^2.6"
 	},
 	"autoload": {
 		"psr-4": {

src/DI/SortableExtension.php

@@ -2,6 +2,7 @@
 namespace Librette\Doctrine\Sortable\DI;
 
 use Kdyby\Events\DI\EventsExtension;
+use Librette\Doctrine\Sortable\SortableListener;
 use Nette\DI\CompilerExtension;
 
 /**
@@ -14,8 +15,8 @@ public function loadConfiguration()
 	{
 		$builder = $this->getContainerBuilder();
 		$builder->addDefinition($this->prefix('sortableListener'))
-		        ->setClass('Librette\Doctrine\Sortable\SortableListener')
-		        ->addTag(EventsExtension::TAG_SUBSCRIBER);
+			->setType(SortableListener::class)
+			->addTag(EventsExtension::TAG_SUBSCRIBER);
 	}
 
 }

src/SortableListener.php

@@ -5,8 +5,8 @@
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 use Doctrine\ORM\Events;
 use Doctrine\ORM\NoResultException;
-use Kdyby\Doctrine\EntityManager;
-use Kdyby\Doctrine\QueryBuilder;
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\QueryBuilder;
 use Kdyby\Events\Subscriber;
 use Nette\SmartObject;
 
@@ -124,7 +124,7 @@ public function postPersist(LifecycleEventArgs $args)
 				->andWhere('e.position >= :from')
 				->setParameter('from', $pos)
 				->andWhere('e.id <> :id')
-				->setParameter('id', $entity->id)
+				->setParameter('id', $entity->getId())
 				->set('e.position', 'e.position + 1')
 				->getQuery()->getResult();
 		}

tests/bootstrap.php

@@ -19,5 +19,9 @@
 
 function run(Tester\TestCase $testCase)
 {
-	$testCase->run(isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : NULL);
+	if (isset($_SERVER['argv'][2])) {
+		$testCase->runTest($_SERVER['argv'][2]);
+	} else {
+		$testCase->run();
+	}
 }

tests/src/EMTest.php

@@ -2,7 +2,10 @@
 namespace LibretteTests\Doctrine\Sortable;
 
 use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\PDOSqlite\Driver;
+use Doctrine\ORM\Configuration;
+use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\SchemaTool;
 use Kdyby;
 use Librette\Doctrine\Sortable\SortableListener;
@@ -15,25 +18,21 @@
 trait EMTest
 {
 
-	/**
-	 * @return Kdyby\Doctrine\EntityManager
-	 */
-	protected function createMemoryManager($classNames = NULL, $createSchema = TRUE)
+	protected function createMemoryManager($classNames = NULL, $createSchema = TRUE): EntityManager
 	{
 		$conf = [
 			'driver' => 'pdo_sqlite',
 			'memory' => TRUE,
 		];
-		$connection = new Kdyby\Doctrine\Connection($conf, new Driver());
-		$config = new Kdyby\Doctrine\Configuration();
+		$connection = new Connection($conf, new Driver());
+		$config = new Configuration();
 		$cache = new ArrayCache();
 		$config->setMetadataCacheImpl($cache);
 		$config->setQueryCacheImpl($cache);
 		$config->setProxyDir(TEMP_DIR);
 		$config->setProxyNamespace('TestProxy');
-		$config->setDefaultRepositoryClassName('Kdyby\Doctrine\EntityRepository');
 		$config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([__DIR__ . '/Model/', VENDOR_DIR], FALSE));
-		$em = Kdyby\Doctrine\EntityManager::create($connection, $config);
+		$em = EntityManager::create($connection, $config);
 		$em->getEventManager()->addEventSubscriber(new SortableListener());
 		if ($createSchema === FALSE) {
 			return $em;

tests/src/Model/Category.php

@@ -2,8 +2,6 @@
 namespace LibretteTests\Doctrine\Sortable\Model;
 
 use Doctrine\ORM\Mapping as ORM;
-use Kdyby\Doctrine\Entities\Attributes\Identifier;
-use Kdyby\Doctrine\Entities\BaseEntity;
 use Librette\Doctrine\Sortable\ISortable;
 use Librette\Doctrine\Sortable\ISortableScope;
 use Librette\Doctrine\Sortable\TSortable;
@@ -14,12 +12,18 @@
  * @ORM\DiscriminatorMap({"category": "Category", "described": "DescribedCategory"})
  * @ORM\DiscriminatorColumn(name="type")
  */
-class Category extends BaseEntity implements ISortable, ISortableScope
+class Category implements ISortable, ISortableScope
 {
 
-	use Identifier;
 	use TSortable;
 
+	/**
+	 * @ORM\Id()
+	 * @ORM\GeneratedValue()
+	 * @ORM\Column(type="integer")
+	 * @var int
+	 */
+	protected $id;
 
 	/**
 	 * @var string
@@ -35,6 +39,13 @@ public function __construct($name)
 		$this->name = $name;
 	}
 
+	/**
+	 * @return int
+	 */
+	public function getId()
+	{
+		return $this->id;
+	}
 
 	/**
 	 * @return array

tests/src/Model/DescribedCategory.php

@@ -2,15 +2,20 @@
 namespace LibretteTests\Doctrine\Sortable\Model;
 
 use Doctrine\ORM\Mapping as ORM;
-use Kdyby\Doctrine\Entities\Attributes\Identifier;
-use Kdyby\Doctrine\Entities\BaseEntity;
 
 /**
  * @ORM\Entity
  */
 class DescribedCategory extends Category
 {
-	use Identifier;
+
+	/**
+	 * @ORM\Id()
+	 * @ORM\GeneratedValue()
+	 * @ORM\Column(type="integer")
+	 * @var int
+	 */
+	protected $id;
 
 	/**
 	 * @var string

tests/src/SortableTestCase.phpt

@@ -1,7 +1,7 @@
 <?php
 namespace LibretteTests\Doctrine\Sortable;
 
-use Kdyby\Doctrine\EntityManager;
+use Doctrine\ORM\EntityManager;
 use LibretteTests\Doctrine\Sortable\Model\Category;
 use LibretteTests\Doctrine\Sortable\Model\DescribedCategory;
 use Tester\Assert;