[FEATURE] Update for Laravel 7

Also I have updated all tests to work with PHPUnit 8.5.

All tests pass (with laravel-doctrine/orm 1.6 per PR laravel-doctrine/orm#438).

Should be merged into a new branch: 1.2.

Author: barryo

.gitignore

@@ -3,6 +3,6 @@ composer.phar
 composer.lock
 .DS_Store
 .php_cs.cache
-
+.phpunit.result.cache
 .idea
 laravel-doctrine-orm.iml

composer.json

@@ -18,21 +18,21 @@
     }
   ],
   "require": {
-    "php": ">=7.2",
-    "illuminate/auth": "^6.0",
-    "illuminate/config": "^6.0",
-    "illuminate/contracts": "^6.0",
-    "illuminate/support": "^6.0",
-    "illuminate/http": "^6.0",
-    "laravel-doctrine/orm": "1.5.*"
+    "php": ">=7.2.5",
+    "illuminate/auth": "^7.0",
+    "illuminate/config": "^7.0",
+    "illuminate/contracts": "^7.0",
+    "illuminate/support": "^7.0",
+    "illuminate/http": "^7.0",
+    "laravel-doctrine/orm": "1.6.*"
   },
   "suggest": {
     "gedmo/doctrine-extensions": "Behavioral Doctrine2 extensions (^2.4)",
     "beberlei/DoctrineExtensions": "Query/Type Doctrine2 extensions (^1.0)"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.0",
-    "mockery/mockery": "~0.9",
+    "phpunit/phpunit": "^8.5",
+    "mockery/mockery": "~1.3.1",
     "gedmo/doctrine-extensions": "^2.4",
     "beberlei/DoctrineExtensions": "^1.0"
   },

tests/BeberleiExtensionsServiceProviderTest.php

@@ -1,11 +1,12 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Illuminate\Contracts\Foundation\Application;
 use LaravelDoctrine\Extensions\BeberleiExtensionsServiceProvider;
 use LaravelDoctrine\ORM\DoctrineManager;
 use Mockery as m;
 
-class BeberleiExtensionsServiceProviderTest extends PHPUnit_Framework_TestCase
+class BeberleiExtensionsServiceProviderTest extends TestCase
 {
     /**
      * @var \Mockery\MockInterface|Application
@@ -22,12 +23,15 @@ class BeberleiExtensionsServiceProviderTest extends PHPUnit_Framework_TestCase
      */
     protected $manager;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->app     = m::mock(Application::class);
         $this->manager = m::mock(DoctrineManager::class);
 
         $this->provider = new BeberleiExtensionsServiceProvider($this->app);
+
+        // silence the 'This test did not perform any assertions' warning
+        $this->assertTrue(true);
     }
 
     public function test_custom_functions_can_be_registered()
@@ -37,7 +41,7 @@ public function test_custom_functions_can_be_registered()
         $this->provider->boot($this->manager);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         m::close();
     }

tests/ExtensionTestCase.php

@@ -1,11 +1,12 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\Common\EventManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Mockery as m;
 
-abstract class ExtensionTestCase extends PHPUnit_Framework_TestCase
+abstract class ExtensionTestCase extends TestCase
 {
     /**
      * @var \Mockery\MockInterface|EventManager
@@ -22,15 +23,15 @@ abstract class ExtensionTestCase extends PHPUnit_Framework_TestCase
      */
     protected $reader;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->evm = m::mock(EventManager::class);
         $this->evm->shouldReceive('addEventSubscriber')->once();
 
         $this->em     = m::mock(EntityManagerInterface::class);
         $this->reader = m::mock(Reader::class);
     }
-    public function tearDown()
+    public function tearDown(): void
     {
         m::close();
     }

tests/IpTraceable/IpTraceableTest.php

@@ -1,15 +1,16 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use LaravelDoctrine\Extensions\IpTraceable\IpTraceable;
 
-class IpTraceableTest extends PHPUnit_Framework_TestCase
+class IpTraceableTest extends TestCase
 {
     /**
      * @var IpTraceableEntity
      */
     protected $entity;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->entity = new IpTraceableEntity();
     }

tests/SoftDeletes/SoftDeletesTest.php

@@ -1,15 +1,16 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use LaravelDoctrine\Extensions\SoftDeletes\SoftDeletes;
 
-class SoftDeletesTest extends PHPUnit_Framework_TestCase
+class SoftDeletesTest extends TestCase
 {
     /**
      * @var SoftDeletesEntity
      */
     protected $entity;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->entity = new SoftDeletesEntity();
     }

tests/Timestamps/TimestampsTest.php

@@ -1,15 +1,16 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use LaravelDoctrine\Extensions\Timestamps\Timestamps;
 
-class TimestampsTest extends PHPUnit_Framework_TestCase
+class TimestampsTest extends TestCase
 {
     /**
      * @var TimestampsEntity
      */
     protected $entity;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->entity = new TimestampsEntity();
     }

tests/Tree/NestedSetTest.php

@@ -1,15 +1,16 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use LaravelDoctrine\Extensions\Tree\NestedSet;
 
-class NestedSetTest extends PHPUnit_Framework_TestCase
+class NestedSetTest extends TestCase
 {
     /**
      * @var NestedSetEntity
      */
     protected $entity;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->entity = new NestedSetEntity();
     }

tests/Uploadable/UploadableExtensionServiceProviderTest.php

@@ -1,11 +1,12 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
 use Gedmo\Uploadable\UploadableListener;
 use Illuminate\Contracts\Foundation\Application;
 use LaravelDoctrine\Extensions\Uploadable\UploadableExtensionServiceProvider;
 use Mockery as m;
 
-class UploadableExtensionServiceProviderTest extends PHPUnit_Framework_TestCase
+class UploadableExtensionServiceProviderTest extends TestCase
 {
     /**
      * @var \Mockery\MockInterface|Application
@@ -17,7 +18,7 @@ class UploadableExtensionServiceProviderTest extends PHPUnit_Framework_TestCase
      */
     protected $provider;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->app = m::mock(Application::class);
 
@@ -31,9 +32,12 @@ public function test_listener_gets_bound_as_singleton()
                   ->with(UploadableListener::class);
 
         $this->provider->register();
+
+        // silence the 'This test did not perform any assertions' warning
+        $this->assertTrue(true);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         m::close();
     }