Update dependency versions to support Laravel 11

osenco · Oct 13, 2024 · c86b2f7 · c86b2f7
1 parent c89e848
commit c86b2f7
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 81 deletions.
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
@@ -0,0 +1 @@
+{"version":1,"defects":{"AuthTest::testLoginPage":5,"AuthTest::testVisitWithoutLogin":5,"AuthTest::testLogin":5,"AuthTest::testLogout":5,"FileUploadTest::testFileUploadPage":5,"FileUploadTest::testUploadFile":5,"FileUploadTest::testUpdateFile":5,"FileUploadTest::testDeleteFiles":5,"FileUploadTest::testBatchDelete":5,"ImageUploadTest::testDisableFilter":5,"ImageUploadTest::testImageUploadPage":5,"ImageUploadTest::testUploadImage":5,"ImageUploadTest::testRemoveImage":5,"ImageUploadTest::testUpdateImage":5,"ImageUploadTest::testDeleteImages":5,"ImageUploadTest::testBatchDelete":5,"ImageUploadTest::testUploadMultipleImage":5,"ImageUploadTest::testRemoveMultipleFiles":5,"IndexTest::testIndex":5,"IndexTest::testClickMenu":5,"InstallTest::testInstalledDirectories":5,"LaravelTest::testLaravel":5,"MenuTest::testMenuIndex":5,"MenuTest::testAddMenu":5,"MenuTest::testDeleteMenu":5,"MenuTest::testEditMenu":5,"MenuTest::testShowPage":5,"MenuTest::testEditMenuParent":5,"ModelTreeTest::testSelectOptions":5,"OperationLogTest::testOperationLogIndex":5,"OperationLogTest::testGenerateLogs":5,"OperationLogTest::testDeleteLogs":5,"OperationLogTest::testDeleteMultipleLogs":5,"PermissionsTest::testPermissionsIndex":5,"PermissionsTest::testAddAndDeletePermissions":5,"PermissionsTest::testAddPermissionToRole":5,"PermissionsTest::testAddPermissionToUser":5,"PermissionsTest::testAddUserAndAssignPermission":5,"PermissionsTest::testPermissionThroughRole":5,"PermissionsTest::testEditPermission":5,"RolesTest::testRolesIndex":5,"RolesTest::testAddRole":5,"RolesTest::testAddRoleToUser":5,"RolesTest::testDeleteRole":5,"RolesTest::testEditRole":5,"UserFormTest::testCreatePage":5,"UserFormTest::testSubmitForm":5,"UserFormTest::testEditForm":5,"UserFormTest::testUpdateForm":5,"UserFormTest::testUpdateFormWithRule":5,"UserFormTest::testFormHeader":5,"UserFormTest::testFormFooter":5,"UserGridTest::testIndexPage":5,"UserGridTest::testGridWithData":5,"UserGridTest::testGridPagination":5,"UserGridTest::testOrderByJson":5,"UserGridTest::testEqualFilter":5,"UserGridTest::testLikeFilter":5,"UserGridTest::testFilterRelation":5,"UserGridTest::testDisplayCallback":5,"UserGridTest::testHasManyRelation":5,"UserGridTest::testGridActions":5,"UserGridTest::testGridRows":5,"UserGridTest::testGridPerPage":5,"UserSettingTest::testVisitSettingPage":5,"UserSettingTest::testUpdateName":5,"UserSettingTest::testUpdateAvatar":5,"UserSettingTest::testUpdatePasswordConfirmation":5,"UserSettingTest::testUpdatePassword":5,"UsersTest::testUsersIndexPage":5,"UsersTest::testCreateUser":5,"UsersTest::testUpdateUser":5,"UsersTest::testResetPassword":5},"times":[]}
diff --git a/composer.json b/composer.json
@@ -1,61 +1,70 @@
 {
-    "name": "encore/laravel-admin",
-    "description": "laravel admin",
-    "type": "library",
-    "keywords": ["laravel", "admin", "grid", "form"],
-    "homepage": "https://github.com/z-song/laravel-admin",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "zsong",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-        "php": ">=8.0.0",
-        "symfony/dom-crawler": "^6.4|^7.0",
-        "laravel/framework": ">=11.0",
-        "doctrine/dbal": "4.*"
-    },
-    "require-dev": {
-        "laravel/laravel": ">=5.5",
-        "fzaninotto/faker": "~1.4",
-        "intervention/image": "~2.3",
-        "laravel/browser-kit-testing": "^6.0",
-        "spatie/phpunit-watcher": "^1.22.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Encore\\Admin\\": "src/"
-        },
-        "files": [
-            "src/helpers.php"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\Models\\": "tests/models",
-            "Tests\\Controllers\\": "tests/controllers"
-        },
-        "classmap": [
-            "tests/TestCase.php"
-        ]
-    },
-    "scripts": {
-        "test": "./vendor/bin/phpunit"
-    },
-    "suggest": {
-        "intervention/image": "Required to handling and manipulation upload images (~2.3).",
-        "spatie/eloquent-sortable": "Required to built orderable gird."
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "Encore\\Admin\\AdminServiceProvider"
-            ],
-            "aliases": {
-                "Admin": "Encore\\Admin\\Facades\\Admin"
-            }
-        }
-    }
+	"name": "encore/laravel-admin",
+	"description": "laravel admin",
+	"type": "library",
+	"keywords": [
+		"laravel",
+		"admin",
+		"grid",
+		"form"
+	],
+	"homepage": "https://github.com/osenco/laravel-admin",
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "osenco",
+			"email": "[email protected]"
+		},
+		{
+			"name": "zsong",
+			"email": "[email protected]"
+		}
+	],
+	"require": {
+		"php": ">=8.0.0",
+		"symfony/dom-crawler": "^6.4|^7.0",
+		"laravel/framework": "^11.0",
+		"doctrine/dbal": "^4.0"
+	},
+	"require-dev": {
+		"laravel/laravel": "^11.2.1",
+		"intervention/image": "^3.8.0",
+		"laravel/browser-kit-testing": "^7.2.0",
+		"spatie/phpunit-watcher": "^1.8.3",
+		"fakerphp/faker": "^1.23"
+	},
+	"autoload": {
+		"psr-4": {
+			"Encore\\Admin\\": "src/"
+		},
+		"files": [
+			"src/helpers.php"
+		]
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"Tests\\Models\\": "tests/models",
+			"Tests\\Controllers\\": "tests/controllers"
+		},
+		"classmap": [
+			"tests/TestCase.php"
+		]
+	},
+	"scripts": {
+		"test": "./vendor/bin/phpunit"
+	},
+	"suggest": {
+		"intervention/image": "Required to handling and manipulation upload images (~2.3).",
+		"spatie/eloquent-sortable": "Required to built orderable gird."
+	},
+	"extra": {
+		"laravel": {
+			"providers": [
+				"Encore\\Admin\\AdminServiceProvider"
+			],
+			"aliases": {
+				"Admin": "Encore\\Admin\\Facades\\Admin"
+			}
+		}
+	}
 }
diff --git a/tests/seeds/factory.php b/tests/seeds/factory.php
@@ -1,36 +1,31 @@
 <?php
 
-use Faker\Generator as Faker;
-use Illuminate\Database\Eloquent\Factory;
-
-$factory = app(Factory::class);
-
-$factory->define(Tests\Models\User::class, function (Faker $faker) {
+$factory->define(Tests\Models\User::class, function () {
     return [
-        'username' => $faker->userName,
-        'email'    => $faker->email,
-        'mobile'   => $faker->phoneNumber,
-        'avatar'   => $faker->imageUrl(),
+        'username' => fake()->userName(),
+        'email'    => fake()->email(),
+        'mobile'   => fake()->phoneNumber(),
+        'avatar'   => fake()->imageUrl(),
         'password' => '$2y$10$U2WSLymU6eKJclK06glaF.Gj3Sw/ieDE3n7mJYjKEgDh4nzUiSESO', // bcrypt(123456)
     ];
 });
 
-$factory->define(Tests\Models\Profile::class, function (Faker $faker) {
+$factory->define(Tests\Models\Profile::class, function () {
     return [
-        'first_name' => $faker->firstName,
-        'last_name'  => $faker->lastName,
-        'postcode'   => $faker->postcode,
-        'address'    => $faker->address,
-        'latitude'   => $faker->latitude,
-        'longitude'  => $faker->longitude,
-        'color'      => $faker->hexColor,
-        'start_at'   => $faker->dateTime,
-        'end_at'     => $faker->dateTime,
+        'first_name' => fake()->firstName(),
+        'last_name'  => fake()->lastName(),
+        'postcode'   => fake()->postcode(),
+        'address'    => fake()->address(),
+        'latitude'   => fake()->latitude(),
+        'longitude'  => fake()->longitude(),
+        'color'      => fake()->hexColor(),
+        'start_at'   => fake()->dateTime(),
+        'end_at'     => fake()->dateTime(),
     ];
 });
 
-$factory->define(Tests\Models\Tag::class, function (Faker $faker) {
+$factory->define(Tests\Models\Tag::class, function () {
     return [
-        'name' => $faker->word,
+        'name' => fake()->word,
     ];
 });