Working but failing tests due to PDO

Author: kontoulis

.gitignore

@@ -1,4 +1,4 @@
 .idea*
 vendor/*
 composer.lock
-composer.lock
+.phpunit.result.cache

composer.json

@@ -7,16 +7,22 @@
 			"email": "[email protected]"
 		}
 	],
+	"repositories": [
+		{
+			"type": "path",
+			"url": "../localisation"
+		}
+	],
 	"require": {
-		"php": ">=7.0.0",
-		"illuminate/support": "5.*",
-		"illuminate/database": "5.*",
-		"tectonic/localisation": "^2.0.3"
+		"php": ">=7.2",
+		"illuminate/support": "^6.1",
+		"illuminate/database": "^6.1",
+		"tectonic/localisation": "dev-feature/laravel-lts-6"
 	},
 	"require-dev": {
-		"mockery/mockery": "dev-master@dev",
+		"mockery/mockery": "^1.4",
 		"orchestra/testbench": "3.*",
-		"phpunit/phpunit": "~5.7"
+		"phpunit/phpunit": "^8.0"
 	},
 	"autoload": {
 		"psr-4": {

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="all">

src/Database/TranslationService.php

@@ -158,7 +158,7 @@ public function findForUpdate(Translatable $model, $language, $field)
             'field' => $field
         ]);
 
-        if (count($translations)) {
+        if (!empty($translations)) {
             return $translations[0];
         }
 

src/Translator/Transformers/PaginationTransformer.php

@@ -24,10 +24,11 @@ public function isAppropriateFor($object)
     /**
      * Once a transformer for an object has been found, it then must do whatever work is necessary on that object.
      *
-     * @param object $paginator
+     * @param  object  $paginator
+     * @param  null  $language
      * @return mixed
      */
-    public function transform($paginator)
+    public function transform($paginator, $language = null)
     {
         $transformer = App::make(CollectionTransformer::class);
 
@@ -40,12 +41,14 @@ public function transform($paginator)
     /**
      * Same as transform but should only translate objects one-level deep.
      *
-     * @param object $paginator
+     * @param  object  $paginator
+     * @param  null  $language
+     * @param  array  $fields
      * @return mixed
      */
-    public function shallow($paginator)
+    public function shallow($paginator, $language = null, $fields = [])
     {
-        return $this->transform($paginator);
+        return $this->transform($paginator, $language);
     }
 
     /**

tests/AcceptanceTestCase.php

@@ -9,7 +9,7 @@ class AcceptanceTestCase extends TestCase
 {
     use Testable;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Database/TranslationServiceTest.php

@@ -11,6 +11,7 @@ class TranslationServiceTest extends TestCase
 {
     public function testFind()
     {
+        self::expectNotToPerformAssertions();
         $repository = m::spy(TranslationRepository::class);
         $service = new TranslationService($repository);
 
@@ -21,6 +22,7 @@ public function testFind()
 
     public function testFindAll()
     {
+        self::expectNotToPerformAssertions();
         $repository = m::spy(TranslationRepository::class);
         $service = new TranslationService($repository);
 

tests/TestCase.php

@@ -3,11 +3,11 @@
 
 use Mockery as m;
 
-class TestCase extends \PHPUnit_Framework_TestCase
+class TestCase extends \PHPUnit\Framework\TestCase
 {
     use Testable;
 
-	public function setUp()
+	public function setUp(): void
     {
         m::close();