Merge pull request #1 from ipublikuj/drop-kdyby

Feature: Dropping kdyby/doctrine

.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

@@ -10,7 +10,9 @@
     "ipub",
     "ipublikuj"
   ],
+
   "homepage" : "https://github.com/iPublikuj/doctrine-timestampable",
+
   "license" : [
     "GPL-2.0",
     "GPL-3.0"
@@ -56,13 +58,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" : {

src/IPub/DoctrineTimestampable/DI/DoctrineTimestampableExtension.php

@@ -52,19 +52,25 @@ final class DoctrineTimestampableExtension extends DI\CompilerExtension
 	 */
 	public function loadConfiguration() : void
 	{
-		$config = $this->getConfig($this->defaults);
+		// Get container builder
 		$builder = $this->getContainerBuilder();
 
-		Utils\Validators::assert($config['lazyAssociation'], 'bool', 'lazyAssociation');
-		Utils\Validators::assert($config['autoMapField'], 'bool', 'autoMapField');
-		Utils\Validators::assert($config['dbFieldType'], 'string', 'dbFieldType');
+		// Merge extension default config
+		$this->setConfig(DI\Config\Helpers::merge($this->config, DI\Helpers::expand($this->defaults, $builder->parameters)));
+
+		// Get extension configuration
+		$configuration = $this->getConfig();
+
+		Utils\Validators::assert($configuration['lazyAssociation'], 'bool', 'lazyAssociation');
+		Utils\Validators::assert($configuration['autoMapField'], 'bool', 'autoMapField');
+		Utils\Validators::assert($configuration['dbFieldType'], 'string', 'dbFieldType');
 
 		$builder->addDefinition($this->prefix('configuration'))
 			->setType(DoctrineTimestampable\Configuration::class)
 			->setArguments([
-				$config['lazyAssociation'],
-				$config['autoMapField'],
-				$config['dbFieldType'],
+				$configuration['lazyAssociation'],
+				$configuration['autoMapField'],
+				$configuration['dbFieldType'],
 			]);
 
 		$builder->addDefinition($this->prefix('driver'))
@@ -83,7 +89,7 @@ public function beforeCompile() : void
 
 		$builder = $this->getContainerBuilder();
 
-		$builder->getDefinition($builder->getByType('Doctrine\ORM\EntityManagerInterface') ?: 'doctrine.default.entityManager')
+		$builder->getDefinition($builder->getByType('Doctrine\ORM\EntityManagerInterface', TRUE))
 			->addSetup('?->getEventManager()->addEventSubscriber(?)', ['@self', $builder->getDefinition($this->prefix('subscriber'))]);
 	}
 

tests/IPubTests/DoctrineTimestampable/TimestampableTest.phpt

@@ -24,6 +24,8 @@ use Tester\Assert;
 
 use Doctrine\ORM;
 
+use Nettrine;
+
 use IPub\DoctrineTimestampable;
 use IPub\DoctrineTimestampable\Mapping;
 
@@ -60,7 +62,7 @@ class TimestampableTest extends Tester\TestCase
 		parent::setUp();
 
 		$this->container = $this->createContainer();
-		$this->em = $this->container->getByType('Kdyby\Doctrine\EntityManager');
+		$this->em = $this->container->getByType(Nettrine\ORM\EntityManagerDecorator::class);
 	}
 
 	public function testCreate() : void

tests/IPubTests/DoctrineTimestampable/files/config.neon

@@ -2,25 +2,19 @@ php:
 	date.timezone: Europe/Prague
 
 extensions:
-	annotations: Kdyby\Annotations\DI\AnnotationsExtension
-	doctrine: Kdyby\Doctrine\DI\OrmExtension
-	console: Kdyby\Console\DI\ConsoleExtension
-	events: Kdyby\Events\DI\EventsExtension
+	dbal: Nettrine\DBAL\DI\DbalExtension
+	orm: Nettrine\ORM\DI\OrmExtension
+	orm.annotations: Nettrine\ORM\DI\OrmAnnotationsExtension
+	orm.cache: Nettrine\ORM\DI\OrmCacheExtension
 
-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
+orm.cache:
+	defaultDriver: array

tests/IPubTests/DoctrineTimestampable/files/entities.neon

@@ -1,3 +1,3 @@
-doctrine:
-	metadata:
-		IPubTests\DoctrineTimestampable: %appDir%IPubTests/DoctrineTimestampable/models
+orm.annotations:
+	paths:
+		- %appDir%IPubTests/DoctrineTimestampable/models