Merge 1205c39 into b98933b

arbory · Nov 1, 2020 · f8db431 · f8db431
2 parents b98933b + 1205c39
commit f8db431
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@
 /node_modules
 .DS_Store
 /tests/coverage
+/composer.lock
+/.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -32,9 +32,9 @@
     },
     "require-dev" : {
         "satooshi/php-coveralls": "^1.0",
-        "phpunit/phpunit" : "^6",
-        "mockery/mockery": "dev-master",
-        "diablomedia/phpunit-pretty-printer": "^2"
+        "phpunit/phpunit" : "~8.0",
+        "mockery/mockery": "1.3.*",
+        "diablomedia/phpunit-pretty-printer": "~4.0"
     },
     "autoload": {
         "psr-4": { "Arbory\\Base\\": "src" },

diff --git a/phpunit.xml b/phpunit.xml
@@ -4,7 +4,6 @@
     bootstrap="tests/bootstrap.php"
     colors="true"
     printerClass="DiabloMedia\PHPUnit\Printer\PrettyPrinter"
-    mapTestClassNameToCoveredClassName="true"
 >
     <logging>
         <log type="coverage-html" target="tests/coverage/html" />

diff --git a/tests/Admin/Form/Fields/Renderer/FileSizeTest.php b/tests/Admin/Form/Fields/Renderer/FileSizeTest.php
@@ -25,19 +25,13 @@ final class FileSizeTest extends TestCase
      */
     private $fileSize;
 
-    /**
-     * @return void
-     */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->file = Mockery::mock(ArboryFile::class);
         $this->fileSize = new FileSize($this->file);
     }
 
-    /**
-     * @return void
-     */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         Mockery::close();
     }

diff --git a/tests/Html/Elements/ElementTest.php b/tests/Html/Elements/ElementTest.php
@@ -17,10 +17,7 @@ final class ElementTest extends TestCase
      */
     private $attributes;
 
-    /**
-     * @return void
-     */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->name = 'test';
         $this->attributes = [

diff --git a/tests/Services/FieldSetFieldFinderTest.php b/tests/Services/FieldSetFieldFinderTest.php
@@ -26,10 +26,7 @@ final class FieldSetFieldFinderTest extends TestCase
      */
     private $model;
 
-    /**
-     * @return void
-     */
-    protected function setUp()
+    protected function setUp(): void
     {
         app()->singleton(StyleManager::class, static function () {
             $styles = [
@@ -50,10 +47,7 @@ protected function setUp()
         $this->model->shouldReceive('toArray')->andReturn([]);
     }
 
-    /**
-     * @return void
-     */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         Mockery::close();
     }