Merge pull request #2 from ipublikuj/real-nette3

Feature: Fixing nette 3 support

.travis.composer.php

@@ -0,0 +1,21 @@
+<?php
+
+$version = getenv('NETTE');
+
+if (!$version || $version == 'default') {
+	exit;
+}
+
+echo "Nette version " . $version . PHP_EOL;
+
+$file = __DIR__ . '/composer.json';
+
+$content = file_get_contents($file);
+
+$composer = json_decode($content, TRUE);
+
+$composer['require']['nette/di'] = $version;
+
+$content = json_encode($composer);
+
+file_put_contents($file, $content);

.travis.yml

@@ -11,6 +11,7 @@ before_install:
   - composer self-update
 
 before_script:
+  - php .travis.composer.php
   - composer install --no-interaction --prefer-source --dev
 
 script:

composer.json

@@ -1,7 +1,7 @@
 {
   "name" : "ipub/doctrine-crud",
   "type" : "library",
-  "description" : "Extension of Kdyby/Doctrine with CRUD",
+  "description" : "CRUD methods for Doctrine2 ORM",
   "keywords" : [
     "doctrine2",
     "doctrine",
@@ -11,7 +11,9 @@
     "framework",
     "tools"
   ],
+
   "homepage" : "https://github.com/iPublikuj/doctrine-crud",
+
   "license" : [
     "GPL-2.0",
     "GPL-3.0"
@@ -57,13 +59,11 @@
     "nette/safe-stream" : "~2.3",
     "nette/tester" : "~2.3",
 
-    "nette/http" : "~2.4",
-
     "tracy/tracy" : "~2.4",
 
     "pds/skeleton" : "~1.0",
 
-    "kdyby/doctrine" : "^3.3"
+    "nettrine/orm" : "~0.3"
   },
 
   "autoload" : {

docs/en/index.md

@@ -4,7 +4,7 @@ This Doctrine CRUD extension brings you easier way how to **C**reate, **R**ead,
 
 > NOTE: reading is not implemented, because it depends on project what you are programming.
 
-> WARGING: This extension does not implement Doctrine functions into your project. You have to install some third-party extension like [Kdyby/Doctrine](https://github.com/kdyby/doctrine) or write your own implementation od Doctrine database system
+> WARGING: This extension does not implement Doctrine functions into your project. You have to install some third-party extension or write your own implementation od Doctrine database system
 
 ## Installation
 
@@ -28,7 +28,7 @@ At first you have to create CRUD service for given entity. It can be easily crea
 ```neon
 services:
     yourEntityCrud:
-        factory: @doctrine.crud(Your\Cool\NameSpace\YourEntity)
+        factory: @doctrine.crud::create(Your\Cool\NameSpace\YourEntity)
 ```
 
 Now CRUD service for given entity is created and now you can create a manager for this entity:

readme.md

@@ -1,4 +1,4 @@
-# Doctrine
+# Doctrine CRUD
 
 [![Build Status](https://img.shields.io/travis/iPublikuj/doctrine-crud.svg?style=flat-square)](https://travis-ci.org/iPublikuj/doctrine-crud)
 [![Scrutinizer Code Coverage](https://img.shields.io/scrutinizer/coverage/g/iPublikuj/doctrine-crud.svg?style=flat-square)](https://scrutinizer-ci.com/g/iPublikuj/doctrine-crud/?branch=master)
@@ -7,7 +7,7 @@
 [![Composer Downloads](https://img.shields.io/packagist/dt/ipub/doctrine-crud.svg?style=flat-square)](https://packagist.org/packages/ipub/doctrine-crud)
 [![License](https://img.shields.io/packagist/l/ipub/doctrine-crud.svg?style=flat-square)](https://packagist.org/packages/ipub/doctrine-crud)
 
-Doctrine extension is here to extend [Kdyby/Doctrine](https://github.com/Kdyby/Doctrine) with CRUD system.
+Implementation of CRUD system into [Doctrine3](https://github.com/doctrine/orm) with CRUD system.
 
 ## Installation
 

src/IPub/DoctrineCrud/Crud/EntityCrud.php

@@ -47,26 +47,26 @@ final class EntityCrud implements IEntityCrud
 	private $entityMapper;
 
 	/**
-	 * @var Create\IEntityCreator
+	 * @var Crud\Create\IEntityCreator
 	 */
 	private $entityCreatorFactory;
 
 	/**
-	 * @var Update\IEntityUpdater
+	 * @var Crud\Update\IEntityUpdater
 	 */
 	private $entityUpdaterFactory;
 
 	/**
-	 * @var Delete\IEntityDeleter
+	 * @var Crud\Delete\IEntityDeleter
 	 */
 	private $entityDeleterFactory;
 
 	/**
 	 * @param string $entityName
 	 * @param Mapping\IEntityMapper $entityMapper
-	 * @param Create\IEntityCreator $entityCreatorFactory
-	 * @param Update\IEntityUpdater $entityUpdaterFactory
-	 * @param Delete\IEntityDeleter $entityDeleterFactory
+	 * @param Crud\Create\IEntityCreator $entityCreatorFactory
+	 * @param Crud\Update\IEntityUpdater $entityUpdaterFactory
+	 * @param Crud\Delete\IEntityDeleter $entityDeleterFactory
 	 */
 	public function __construct(
 		string $entityName,

src/IPub/DoctrineCrud/Crud/EntityCrudFactory.php

@@ -79,9 +79,9 @@ public function __construct(
 	/**
 	 * @param string $entityName
 	 *
-	 * @return IEntityCrud
+	 * @return EntityCrud
 	 */
-	public function create(string $entityName) : IEntityCrud
+	public function create(string $entityName) : EntityCrud
 	{
 		return new EntityCrud(
 			$entityName,

src/IPub/DoctrineCrud/DI/DoctrineCrudExtension.php

@@ -75,43 +75,69 @@ public function loadConfiguration() : void
 		 * CRUD factories
 		 */
 
-		$builder->addDefinition($this->prefix('entity.creator'))
-			->setType(Crud\Create\EntityCreator::class)
-			->setImplement(Crud\Create\IEntityCreator::class)
-			->setAutowired(FALSE);
-
-		$builder->addDefinition($this->prefix('entity.updater'))
-			->setType(Crud\Update\EntityUpdater::class)
-			->setImplement(Crud\Update\IEntityUpdater::class)
-			->setAutowired(FALSE);
-
-		$builder->addDefinition($this->prefix('entity.deleter'))
-			->setType(Crud\Delete\EntityDeleter::class)
-			->setImplement(Crud\Delete\IEntityDeleter::class)
-			->setAutowired(FALSE);
-
-		$builder->addDefinition($this->prefix('entity.crudFactory'))
-			->setType(Crud\EntityCrudFactory::class)
-			->setArguments([
-				'@' . $this->prefix('entity.mapper'),
-				'@' . $this->prefix('entity.creator'),
-				'@' . $this->prefix('entity.updater'),
-				'@' . $this->prefix('entity.deleter'),
-			]);
-
-		// Syntax sugar for config
-		$builder->addDefinition($this->prefix('crud'))
-			->setType(Crud\EntityCrud::class)
-			->setFactory('@IPub\DoctrineCrud\Crud\EntityCrudFactory::create', [new PhpGenerator\PhpLiteral('$entityName')])
-			->setParameters(['entityName'])
-			->setAutowired(FALSE);
-
-		/**
-		 *
-		 */
-
-		$configuration = $builder->getDefinition('doctrine.default.ormConfiguration');
-		$configuration->addSetup('addCustomStringFunction', ['DATE_FORMAT', DoctrineCrud\StringFunctions\DateFormat::class]);
+		// NETTE 3.x
+		if (method_exists($builder, 'addFactoryDefinition')) {
+			$builder->addFactoryDefinition($this->prefix('entity.creator'))
+				->setImplement(Crud\Create\IEntityCreator::class)
+				->setAutowired(FALSE)
+				->getResultDefinition()
+					->setType(Crud\Create\EntityCreator::class);
+
+			$builder->addFactoryDefinition($this->prefix('entity.updater'))
+				->setImplement(Crud\Update\IEntityUpdater::class)
+				->setAutowired(FALSE)
+				->getResultDefinition()
+					->setFactory(Crud\Update\EntityUpdater::class);
+
+			$builder->addFactoryDefinition($this->prefix('entity.deleter'))
+				->setImplement(Crud\Delete\IEntityDeleter::class)
+				->setAutowired(FALSE)
+				->getResultDefinition()
+					->setFactory(Crud\Delete\EntityDeleter::class);
+
+			// Syntax sugar for config
+			$builder->addFactoryDefinition($this->prefix('crud'))
+				->setImplement(Crud\IEntityCrudFactory::class)
+				->setParameters(['entityName'])
+				->getResultDefinition()
+					->setType(Crud\EntityCrud::class)
+					->setArguments([
+						new PhpGenerator\PhpLiteral('$entityName'),
+						'@' . $this->prefix('entity.mapper'),
+						'@' . $this->prefix('entity.creator'),
+						'@' . $this->prefix('entity.updater'),
+						'@' . $this->prefix('entity.deleter'),
+					]);
+
+		// NETTE 2.4+
+		} else {
+			$builder->addDefinition($this->prefix('entity.creator'))
+				->setType(Crud\Create\EntityCreator::class)
+				->setImplement(Crud\Create\IEntityCreator::class)
+				->setAutowired(FALSE);
+
+			$builder->addDefinition($this->prefix('entity.updater'))
+				->setType(Crud\Update\EntityUpdater::class)
+				->setImplement(Crud\Update\IEntityUpdater::class)
+				->setAutowired(FALSE);
+
+			$builder->addDefinition($this->prefix('entity.deleter'))
+				->setType(Crud\Delete\EntityDeleter::class)
+				->setImplement(Crud\Delete\IEntityDeleter::class)
+				->setAutowired(FALSE);
+
+			$builder->addDefinition($this->prefix('crud'))
+				->setType(Crud\EntityCrud::class)
+				->setImplement(Crud\IEntityCrudFactory::class)
+				->setParameters(['entityName'])
+				->setArguments([
+					new PhpGenerator\PhpLiteral('$entityName'),
+					'@' . $this->prefix('entity.mapper'),
+					'@' . $this->prefix('entity.creator'),
+					'@' . $this->prefix('entity.updater'),
+					'@' . $this->prefix('entity.deleter'),
+				]);
+		}
 	}
 
 	/**
@@ -131,6 +157,9 @@ public function beforeCompile() : void
 			// Register validator to proxy validator
 			$validator->addSetup('registerValidator', ['@' . $serviceName, $serviceName]);
 		}
+
+		$builder->getDefinition($builder->getByType('Doctrine\ORM\EntityManagerInterface', TRUE))
+			->addSetup('?->getConfiguration()->addCustomStringFunction(?, ?)', ['@self', 'DATE_FORMAT', DoctrineCrud\StringFunctions\DateFormat::class]);
 	}
 
 	/**

tests/IPubTests/DoctrineCrud/CRUDTest.phpt

@@ -20,13 +20,13 @@ namespace IPubTests\DoctrineCrud;
 use Nette;
 use Nette\Utils;
 
-use Kdyby;
+use Doctrine\ORM;
+
+use Nettrine;
 
 use Tester;
 use Tester\Assert;
 
-use Doctrine\ORM;
-
 use IPubTests\DoctrineCrud\Models;
 
 require __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'bootstrap.php';
@@ -51,7 +51,7 @@ class CRUDTest extends Tester\TestCase
 	private $container;
 
 	/**
-	 * @var Kdyby\Doctrine\EntityManager
+	 * @var ORM\EntityManager
 	 */
 	private $em;
 
@@ -68,8 +68,8 @@ class CRUDTest extends Tester\TestCase
 		parent::setUp();
 
 		$this->container = $this->createContainer();
-		$this->em = $this->container->getByType('Kdyby\Doctrine\EntityManager');
-		$this->manager = $this->container->getByType('IPubTests\DoctrineCrud\Models\UsersManager');
+		$this->em = $this->container->getByType(Nettrine\ORM\EntityManagerDecorator::class);
+		$this->manager = $this->container->getByType(Models\UsersManager::class);
 	}
 
 	public function testCreateEntity() : void
@@ -252,7 +252,13 @@ class CRUDTest extends Tester\TestCase
 		$config->addParameters(['appDir' => $rootDir, 'wwwDir' => $rootDir]);
 
 		$config->addConfig(__DIR__ . DS . 'files' . DS . 'config.neon');
-		$config->addConfig(__DIR__ . DS . 'files' . DS . 'entities.neon');
+
+		if (getenv('NETTE') === 'default') {
+			$config->addConfig(__DIR__ . DS . 'files' . DS . 'entities.neon');
+
+		} else {
+			$config->addConfig(__DIR__ . DS . 'files' . DS . 'entities24.neon');
+		}
 
 		return $config->createContainer();
 	}

tests/IPubTests/DoctrineCrud/ExtensionTest.phpt

@@ -40,8 +40,8 @@ class ExtensionTest extends Tester\TestCase
 	{
 		$dic = $this->createContainer();
 
-		$crudFactory = $dic->getByType('IPub\DoctrineCrud\Crud\EntityCrudFactory');
-		Assert::true($crudFactory instanceof DoctrineCrud\Crud\EntityCrudFactory);
+		$crudFactory = $dic->getByType(DoctrineCrud\Crud\IEntityCrudFactory::class);
+		Assert::true($crudFactory instanceof DoctrineCrud\Crud\IEntityCrudFactory);
 	}
 
 	/**

tests/IPubTests/DoctrineCrud/files/config.neon

@@ -2,32 +2,20 @@ php:
 	date.timezone: Europe/Prague
 
 extensions:
-	doctrine: Kdyby\Doctrine\DI\OrmExtension
+	dbal: Nettrine\DBAL\DI\DbalExtension
+	orm: Nettrine\ORM\DI\OrmExtension
+	orm.annotations: Nettrine\ORM\DI\OrmAnnotationsExtension
+	orm.cache: Nettrine\ORM\DI\OrmCacheExtension
 	doctrineCrud: IPub\DoctrineCrud\DI\DoctrineCrudExtension
-	annotations: Kdyby\Annotations\DI\AnnotationsExtension
-	console: Kdyby\Console\DI\ConsoleExtension
-	events: Kdyby\Events\DI\EventsExtension
 
-services:
-	cacheStorage:
-		class: Nette\Caching\Storages\MemoryStorage
+dbal:
+	connection:
+		host: 127.0.0.1
+		driver: pdo_sqlite
+		memory: true
 
-annotations:
-	cache: array
+orm.annotations:
+	defaultCache: array
 
-console:
-	url: http://example.com
-
-doctrine:
-	metadataCache: array
-	queryCache: array
-	resultCache: array
-	hydrationCache: array
-	driver: pdo_sqlite
-	memory: true
-
-http:
-	frames: null
-
-session:
-	autoStart: false
+orm.cache:
+	defaultDriver: array

tests/IPubTests/DoctrineCrud/files/entities.neon

@@ -1,14 +1,16 @@
 services:
 	userCrud:
-		factory: @doctrineCrud.crud(IPubTests\DoctrineCrud\Models\UserEntity)
+		factory: @doctrineCrud.crud::create(IPubTests\DoctrineCrud\Models\UserEntity)
+
 	articleCrud:
-		factory: @doctrineCrud.crud(IPubTests\DoctrineCrud\Models\ArticleEntity)
+		factory: @doctrineCrud.crud::create(IPubTests\DoctrineCrud\Models\ArticleEntity)
 
 	usersManager:
-		class: IPubTests\DoctrineCrud\Models\UsersManager(@userCrud)
+		factory: IPubTests\DoctrineCrud\Models\UsersManager(@userCrud)
+
 	articlesManager:
-		class: IPubTests\DoctrineCrud\Models\ArticlesManager(@articleCrud)
+		factory: IPubTests\DoctrineCrud\Models\ArticlesManager(@articleCrud)
 
-doctrine:
-	metadata:
-		IPubTests\DoctrineCrud: %appDir%IPubTests/DoctrineCrud/models
+orm.annotations:
+	paths:
+		- %appDir%IPubTests/DoctrineCrud/models