[FEATURE] Laravel 6.0

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
+  - 7.2
+  - 7.3
 
 before_script:
   - travis_retry composer self-update

README.md

@@ -51,11 +51,12 @@ Version | Supported Laravel Versions | Support
 1.2.x | 5.2.x, 5.3.x | Security releases
 1.3.x | 5.4.x | Bugfix and security releases
 1.4.x | 5.5.x | New features
+1.5.x | 6.x | Laravel 6
 
 Require this package  
 
 ```bash
-composer require "laravel-doctrine/orm:1.4.*"
+composer require "laravel-doctrine/orm:1.5.*"
 ```
 
 Because of the auto package discovery feature Laravel 5.5 has, the ServiceProvider and Facades are automatically registered.

composer.json

@@ -17,26 +17,26 @@
     ],
     "require": {
         "php": ">=7.0",
-        "doctrine/orm": "2.5.*|2.6.*",
-        "illuminate/auth": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/console": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/container": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/pagination": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/routing": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/validation": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/view": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "symfony/serializer": "^2.7|~3.0|~4.0"
+        "doctrine/orm": "^2.6|^2.7",
+        "illuminate/auth": "^6.0",
+        "illuminate/console": "^6.0",
+        "illuminate/container": "^6.0",
+        "illuminate/contracts": "^6.0",
+        "illuminate/pagination": "^6.0",
+        "illuminate/routing": "^6.0",
+        "illuminate/support": "^6.0",
+        "illuminate/validation": "^6.0",
+        "illuminate/view": "^6.0",
+        "symfony/serializer": "^2.7|^3.0|^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.0",
+        "phpunit/phpunit": "^7.0",
         "mockery/mockery": "^1.0",
-        "barryvdh/laravel-debugbar": "~2.0|~3.0",
+        "barryvdh/laravel-debugbar": "~3.0",
         "itsgoingd/clockwork": "~1.9",
-        "illuminate/log": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/notifications": "5.5.*|5.6.*|5.7.*|5.8.*",
-        "illuminate/queue": "5.5.*|5.6.*|5.7.*|5.8.*"
+        "illuminate/log": "^6.0",
+        "illuminate/notifications": "^6.0",
+        "illuminate/queue": "^6.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -8,8 +8,7 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
-        >
+    >
     <testsuites>
         <testsuite name="Package Test Suite">
             <directory suffix="Test.php">./tests/</directory>

src/Configuration/Manager.php

@@ -3,6 +3,7 @@
 namespace LaravelDoctrine\ORM\Configuration;
 
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Support\Str;
 use LaravelDoctrine\ORM\Exceptions\DriverNotFound;
 
 abstract class Manager
@@ -78,7 +79,7 @@ public function driver($driver = null, array $settings = [], $resolve = true)
      */
     protected function createDriver($driver, array $settings = [], $resolve = true)
     {
-        $class = $this->getNamespace() . '\\' . studly_case($driver) . $this->getClassSuffix();
+        $class = $this->getNamespace() . '\\' . Str::studly($driver) . $this->getClassSuffix();
 
         // We'll check to see if a creator method exists for the given driver. If not we
         // will check for a custom driver creator, which allows developers to create

src/Extensions/TablePrefix/TablePrefixListener.php

@@ -41,7 +41,7 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
         $classMetadata = $eventArgs->getClassMetadata();
 
         if (!$classMetadata->isInheritanceTypeSingleTable() || $classMetadata->getName() === $classMetadata->rootEntityName) {
-            $classMetadata->setTableName($this->prefix . $classMetadata->getTableName());
+            $classMetadata->setPrimaryTable(['name' => $this->prefix . $classMetadata->getTableName()]);
         }
 
         foreach ($classMetadata->getAssociationMappings() as $fieldName => $mapping) {

tests/Auth/DoctrineUserProviderTest.php

@@ -8,8 +8,9 @@
 use LaravelDoctrine\ORM\Auth\DoctrineUserProvider;
 use Mockery as m;
 use Mockery\Mock;
+use PHPUnit\Framework\TestCase;
 
-class DoctrineUserProviderTest extends PHPUnit_Framework_TestCase
+class DoctrineUserProviderTest extends TestCase
 {
     /**
      * @var Mock

tests/Auth/Passwords/DoctrineTokenRepositoryTest.php

@@ -8,8 +8,9 @@
 use LaravelDoctrine\ORM\Auth\Passwords\DoctrineTokenRepository;
 use Mockery as m;
 use Mockery\Mock;
+use PHPUnit\Framework\TestCase;
 
-class DoctrineTokenRepositoryTest extends PHPUnit_Framework_TestCase
+class DoctrineTokenRepositoryTest extends TestCase
 {
     /**
      * @var Mock
@@ -178,6 +179,8 @@ public function test_can_delete()
                       ->andReturn(true);
 
         $this->repository->delete(new UserMock);
+
+        $this->assertTrue(true);
     }
 
     public function test_can_delete_expired()
@@ -204,6 +207,8 @@ public function test_can_delete_expired()
                       ->once();
 
         $this->repository->deleteExpired();
+
+        $this->assertTrue(true);
     }
 
     protected function tearDown()

tests/Configuration/Cache/AbstractCacheProviderTest.php

@@ -1,6 +1,8 @@
 <?php
 
-abstract class AbstractCacheProviderTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+abstract class AbstractCacheProviderTest extends TestCase
 {
     abstract public function getProvider();
 

tests/Configuration/Cache/CacheManagerTest.php

@@ -8,8 +8,9 @@
 use LaravelDoctrine\ORM\Configuration\Cache\FileCacheProvider;
 use LaravelDoctrine\ORM\Exceptions\DriverNotFound;
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class CacheManagerTest extends PHPUnit_Framework_TestCase
+class CacheManagerTest extends TestCase
 {
     /**
      * @var CacheManager
@@ -58,7 +59,7 @@ public function test_driver_can_return_a_given_driver()
 
     public function test_cant_resolve_unsupported_drivers()
     {
-        $this->setExpectedException(DriverNotFound::class);
+        $this->expectException(DriverNotFound::class);
         $this->manager->driver('non-existing');
     }
 
@@ -76,6 +77,8 @@ public function test_can_use_application_when_extending()
         $this->manager->extend('new', function ($app) {
             $this->assertInstanceOf(Container::class, $app);
         });
+
+        $this->assertTrue(true);
     }
 
     public function test_can_replace_an_existing_driver()

tests/Configuration/Cache/IlluminateCacheAdapterTest.php

@@ -3,8 +3,9 @@
 use Illuminate\Contracts\Cache\Repository;
 use LaravelDoctrine\ORM\Configuration\Cache\IlluminateCacheAdapter;
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class IlluminateCacheAdapterTest extends PHPUnit_Framework_TestCase
+class IlluminateCacheAdapterTest extends TestCase
 {
     /**
      * @var IlluminateCacheAdapter

tests/Configuration/Connections/ConnectionManagerTest.php

@@ -7,8 +7,9 @@
 use LaravelDoctrine\ORM\Configuration\Connections\SqliteConnection;
 use LaravelDoctrine\ORM\Exceptions\DriverNotFound;
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class ConnectionManagerTest extends PHPUnit_Framework_TestCase
+class ConnectionManagerTest extends TestCase
 {
     /**
      * @var ConnectionManager
@@ -60,7 +61,7 @@ public function test_driver_can_return_a_given_driver()
 
     public function test_cant_resolve_unsupported_drivers()
     {
-        $this->setExpectedException(DriverNotFound::class);
+        $this->expectException(DriverNotFound::class);
         $this->manager->driver('non-existing');
     }
 
@@ -78,6 +79,8 @@ public function test_can_use_application_when_extending()
         $this->manager->extend('new', function ($app) {
             $this->assertInstanceOf(Container::class, $app);
         });
+
+        $this->assertTrue(true);
     }
 
     public function test_can_replace_an_existing_driver()

tests/Configuration/Connections/MasterSlaveConnectionTest.php

@@ -4,11 +4,12 @@
 use Illuminate\Contracts\Config\Repository;
 use LaravelDoctrine\ORM\Configuration\Connections\MasterSlaveConnection;
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Basic unit tests for master slave connection.
  */
-class MasterSlaveConnectionTest extends PHPUnit_Framework_TestCase
+class MasterSlaveConnectionTest extends TestCase
 {
     /**
      * Data provider for testMasterSlaveConnection.

tests/Configuration/Connections/MysqlConnectionTest.php

@@ -4,8 +4,9 @@
 use LaravelDoctrine\ORM\Configuration\Connections\MysqlConnection;
 use Mockery as m;
 use Mockery\Mock;
+use PHPUnit\Framework\TestCase;
 
-class MysqlConnectionTest extends PHPUnit_Framework_TestCase
+class MysqlConnectionTest extends TestCase
 {
     /**
      * @var Mock

tests/Configuration/Connections/OracleConnectionTest.php

@@ -4,8 +4,9 @@
 use LaravelDoctrine\ORM\Configuration\Connections\OracleConnection;
 use Mockery as m;
 use Mockery\Mock;
+use PHPUnit\Framework\TestCase;
 
-class OracleConnectionTest extends PHPUnit_Framework_TestCase
+class OracleConnectionTest extends TestCase
 {
     /**
      * @var Mock

tests/Configuration/Connections/PgsqlConnectionTest.php

@@ -4,8 +4,9 @@
 use LaravelDoctrine\ORM\Configuration\Connections\PgsqlConnection;
 use Mockery as m;
 use Mockery\Mock;
+use PHPUnit\Framework\TestCase;
 
-class PgsqlConnectionTest extends PHPUnit_Framework_TestCase
+class PgsqlConnectionTest extends TestCase
 {
     /**
      * @var Mock

tests/Configuration/Connections/SqliteConnectionTest.php

@@ -4,8 +4,9 @@
 use LaravelDoctrine\ORM\Configuration\Connections\SqliteConnection;
 use Mockery as m;
 use Mockery\Mock;
+use PHPUnit\Framework\TestCase;
 
-class SqliteConnectionTest extends PHPUnit_Framework_TestCase
+class SqliteConnectionTest extends TestCase
 {
     /**
      * @var Mock

tests/Configuration/Connections/SqlsrvConnectionTest.php

@@ -4,8 +4,9 @@
 use LaravelDoctrine\ORM\Configuration\Connections\SqlsrvConnection;
 use Mockery as m;
 use Mockery\Mock;
+use PHPUnit\Framework\TestCase;
 
-class SqlsrvConnectionTest extends PHPUnit_Framework_TestCase
+class SqlsrvConnectionTest extends TestCase
 {
     /**
      * @var Mock

tests/Configuration/CustomTypeManagerTest.php

@@ -2,8 +2,9 @@
 
 use Doctrine\DBAL\DBALException;
 use LaravelDoctrine\ORM\Configuration\CustomTypeManager;
+use PHPUnit\Framework\TestCase;
 
-class CustomTypeManagerTest extends PHPUnit_Framework_TestCase
+class CustomTypeManagerTest extends TestCase
 {
     public function test_can_add_type()
     {
@@ -40,7 +41,7 @@ public function test_can_add_multiple_types()
 
     public function test_cannot_get_non_existing_type()
     {
-        $this->setExpectedException(DBALException::class);
+        $this->expectException(DBALException::class);
 
         $manager = new CustomTypeManager;
         $manager->getType('non_existing');

tests/Configuration/LaravelNamingStategyTest.php

@@ -2,8 +2,9 @@
 
 use Illuminate\Support\Str;
 use LaravelDoctrine\ORM\Configuration\LaravelNamingStrategy;
+use PHPUnit\Framework\TestCase;
 
-class LaravelNamingStrategyTest extends PHPUnit_Framework_TestCase
+class LaravelNamingStrategyTest extends TestCase
 {
     /**
      * @type LaravelNamingStrategy

tests/Configuration/MetaData/AnnotationsTest.php

@@ -4,8 +4,9 @@
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use LaravelDoctrine\ORM\Configuration\MetaData\Annotations;
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class AnnotationsTest extends PHPUnit_Framework_TestCase
+class AnnotationsTest extends TestCase
 {
     /**
      * @var Annotations

tests/Configuration/MetaData/Config/ConfigTest.php

@@ -6,8 +6,9 @@
 use LaravelDoctrine\ORM\Configuration\MetaData\Config;
 use Mockery as m;
 use Mockery\Mock;
+use PHPUnit\Framework\TestCase;
 
-class ConfigTest extends PHPUnit_Framework_TestCase
+class ConfigTest extends TestCase
 {
     /**
      * @var Mock

tests/Configuration/MetaData/ConfigDriverTest.php

@@ -1,8 +1,9 @@
 <?php
 
 use LaravelDoctrine\ORM\Configuration\MetaData\Config\ConfigDriver;
+use PHPUnit\Framework\TestCase;
 
-class ConfigDriverTest extends PHPUnit_Framework_TestCase
+class ConfigDriverTest extends TestCase
 {
     /**
      * @var ConfigDriver

tests/Configuration/MetaData/MetaDataManagerTest.php

@@ -6,8 +6,9 @@
 use LaravelDoctrine\ORM\Configuration\MetaData\Yaml;
 use LaravelDoctrine\ORM\Exceptions\DriverNotFound;
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class MetaDataManagerTest extends PHPUnit_Framework_TestCase
+class MetaDataManagerTest extends TestCase
 {
     /**
      * @var MetaDataManager
@@ -45,7 +46,7 @@ public function test_driver_can_return_a_given_driver()
 
     public function test_cant_resolve_unsupported_drivers()
     {
-        $this->setExpectedException(DriverNotFound::class);
+        $this->expectException(DriverNotFound::class);
         $this->manager->driver('non-existing');
     }
 
@@ -63,6 +64,8 @@ public function test_can_use_application_when_extending()
         $this->manager->extend('new', function ($app) {
             $this->assertInstanceOf(Container::class, $app);
         });
+
+        $this->assertTrue(true);
     }
 
     public function test_can_replace_an_existing_driver()

tests/Configuration/MetaData/PhpTest.php

@@ -4,8 +4,9 @@
 use Doctrine\Common\Persistence\Mapping\Driver\PHPDriver;
 use LaravelDoctrine\ORM\Configuration\MetaData\Php;
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class PhpTest extends PHPUnit_Framework_TestCase
+class PhpTest extends TestCase
 {
     /**
      * @var Php