Commit 5a343c5

committed

Merge remote-tracking branch 'origin/1.3.x' into 1.4.x

2 parents 97f8ecc + 078217e commit 5a343c5Copy full SHA for 5a343c5

File tree

+20

-15

lines changed

+20

-15

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`use Cache\Adapter\PHPArray\ArrayCachePool;`
`4`	`4`	`use Doctrine\Common\Annotations\AnnotationReader;`
	`5`	`+use Doctrine\DBAL\DriverManager;`
`5`	`6`	`use Doctrine\ORM\Configuration;`
`6`	`7`	`use Doctrine\ORM\EntityManager;`
`7`	`8`	`use Doctrine\ORM\Mapping\Driver\AnnotationDriver;`
`@@ -18,10 +19,10 @@`
`18`	`19`	`)`
`19`	`20`	`);`
`20`	`21`
`21`		`-return EntityManager::create(`
`22`		`- [`
	`22`	`+return newEntityManager(`
	`23`	`+ DriverManager::getConnection([`
`23`	`24`	`'driver' => 'pdo_sqlite',`
`24`	`25`	`'memory' => true,`
`25`		`- ],`
	`26`	`+ ]),`
`26`	`27`	`$config`
`27`	`28`	`);`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`use Cache\Adapter\PHPArray\ArrayCachePool;`
`4`	`4`	`use Doctrine\Common\Annotations\AnnotationReader;`
	`5`	`+use Doctrine\DBAL\DriverManager;`
`5`	`6`	`use Doctrine\ORM\Configuration;`
`6`	`7`	`use Doctrine\ORM\EntityManager;`
`7`	`8`	`use Doctrine\ORM\Mapping\Driver\AnnotationDriver;`
`@@ -27,10 +28,10 @@`
`27`	`28`
`28`	`29`	`$config->setMetadataDriverImpl($metadataDriver);`
`29`	`30`
`30`		`-return EntityManager::create(`
`31`		`- [`
	`31`	`+return newEntityManager(`
	`32`	`+ DriverManager::getConnection([`
`32`	`33`	`'driver' => 'pdo_sqlite',`
`33`	`34`	`'memory' => true,`
`34`		`- ],`
	`35`	`+ ]),`
`35`	`36`	`$config`
`36`	`37`	`);`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`use Cache\Adapter\PHPArray\ArrayCachePool;`
`4`	`4`	`use Doctrine\Common\Annotations\AnnotationReader;`
	`5`	`+use Doctrine\DBAL\DriverManager;`
`5`	`6`	`use Doctrine\DBAL\Types\DateTimeImmutableType;`
`6`	`7`	`use Doctrine\DBAL\Types\Type;`
`7`	`8`	`use Doctrine\ORM\Configuration;`
`@@ -35,10 +36,10 @@`
`35`	`36`	`DateTimeImmutableType::class`
`36`	`37`	`);`
`37`	`38`
`38`		`-return EntityManager::create(`
`39`		`- [`
	`39`	`+return newEntityManager(`
	`40`	`+ DriverManager::getConnection([`
`40`	`41`	`'driver' => 'pdo_sqlite',`
`41`	`42`	`'memory' => true,`
`42`		`- ],`
	`43`	`+ ]),`
`43`	`44`	`$config`
`44`	`45`	`);`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`use Cache\Adapter\PHPArray\ArrayCachePool;`
`4`	`4`	`use Doctrine\Common\Annotations\AnnotationReader;`
	`5`	`+use Doctrine\DBAL\DriverManager;`
`5`	`6`	`use Doctrine\ORM\Configuration;`
`6`	`7`	`use Doctrine\ORM\EntityManager;`
`7`	`8`	`use Doctrine\ORM\Mapping\Driver\AnnotationDriver;`
`@@ -28,10 +29,10 @@`
`28`	`29`
`29`	`30`	`$config->setMetadataDriverImpl($metadataDriver);`
`30`	`31`
`31`		`-return EntityManager::create(`
`32`		`- [`
	`32`	`+return newEntityManager(`
	`33`	`+ DriverManager::getConnection([`
`33`	`34`	`'driver' => 'pdo_sqlite',`
`34`	`35`	`'memory' => true,`
`35`		`- ],`
	`36`	`+ ]),`
`36`	`37`	`$config`
`37`	`38`	`);`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`use Cache\Adapter\PHPArray\ArrayCachePool;`
`4`	`4`	`use Doctrine\Common\Annotations\AnnotationReader;`
	`5`	`+use Doctrine\DBAL\DriverManager;`
`5`	`6`	`use Doctrine\ORM\Configuration;`
`6`	`7`	`use Doctrine\ORM\EntityManager;`
`7`	`8`	`use Doctrine\ORM\Mapping\Column;`
`@@ -30,10 +31,10 @@`
`30`	`31`
`31`	`32`	`$config->setMetadataDriverImpl($metadataDriver);`
`32`	`33`
`33`		`-return EntityManager::create(`
`34`		`- [`
	`34`	`+return newEntityManager(`
	`35`	`+ DriverManager::getConnection([`
`35`	`36`	`'driver' => 'pdo_sqlite',`
`36`	`37`	`'memory' => true,`
`37`		`- ],`
	`38`	`+ ]),`
`38`	`39`	`$config`
`39`	`40`	`);`

Comments

(0)