3.0

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "adminarchitect/core",
+    "name": "donorservices/adminarchitect-core",
     "description": "Active Admin for Laravel.",
     "authors": [
         {
@@ -9,11 +9,11 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.2",
+        "php": ">=7.0",
         "ext-json": "*",
         "ext-dom": "*",
         "laravelcollective/html": "^5.0|^6.0|^7.0|dev-master",
-        "doctrine/dbal": "2.9.*",
+        "doctrine/dbal": "2.13.9",
         "doctrine/annotations": "^1.6",
         "terranet/menus": "^2.2",
         "terranet/presentable": "^1.0",
@@ -24,10 +24,10 @@
         "spatie/once": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.2",
+        "phpunit/phpunit": "^9.0",
         "mockery/mockery": "^1.1",
-        "laravel/framework": "^8.20",
-        "laravel/laravel": "^8.5"
+        "laravel/framework": ">=8.20",
+        "laravel/laravel": "^v9.1.5"
     },
     "autoload": {
         "psr-4": {
@@ -51,5 +51,7 @@
                 "Terranet\\Administrator\\ServiceProvider"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

publishes/mix/package.json

@@ -11,7 +11,7 @@
     },
     "dependencies": {
         "@fancyapps/fancybox": "^3.5.6",
-        "axios": "^0.18",
+        "axios": "^1.4.0",
         "babel-plugin-component": "^1.1.1",
         "babel-preset-env": "^1.7.0",
         "babel-preset-es2015": "^6.24.1",
@@ -23,11 +23,11 @@
         "filepond-plugin-image-preview": "^4.0.8",
         "font-awesome": "^4.7.0",
         "jquery": "^3.3.1",
-        "laravel-mix": "^2.1",
+        "laravel-mix": "^6.0.49",
         "less": "^3.9.0",
         "less-loader": "^4.1.0",
         "lodash": "^4.17.11",
-        "tinymce": "^4.6.4",
+        "tinymce": "^6.4.2",
         "vue": "^2.5.7",
         "vue-clip": "^1.0.0",
         "vue-filepond": "^5.1.0",

tests/Collection/GroupTest.php

@@ -11,7 +11,7 @@ class GroupTest extends TestCase
 {
     use CreatesElement, MocksObjects;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Collection/MutableTest.php

@@ -18,7 +18,7 @@ class MutableTest extends CoreTestCase
      */
     protected $collection;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Columns/ElementTest.php

@@ -20,7 +20,7 @@ class ElementTest extends CoreTestCase
     /** @var MockObject|Scaffolding */
     private $module;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Controllers/AuthControllerTest.php

@@ -25,7 +25,7 @@ class AuthControllerTest extends CoreTestCase
     /** @var MockObject|SessionGuard */
     private $guard;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->controller = $this->getMockBuilder(AuthController::class)
                                  ->disableOriginalConstructor()

tests/Form/Collection/FormCollectionMutableTest.php

@@ -11,7 +11,7 @@ class FormCollectionMutableTest extends \PHPUnit\Framework\TestCase
 {
     use MocksObjects;
 
-    public function setUp()
+    protected function setUp(): void
     {
         parent::setUp();