Merge branch 'dev-master' of git.076.ne.jp:TechnicalSuwako/076server into mail

composer.json

@@ -2,10 +2,7 @@
     "name": "laravel/laravel",
     "type": "project",
     "description": "The Laravel Framework.",
-    "keywords": [
-        "framework",
-        "laravel"
-    ],
+    "keywords": ["framework", "laravel"],
     "license": "MIT",
     "require": {
         "php": "^8.0",
@@ -14,26 +11,15 @@
         "guzzlehttp/guzzle": "^7.4.0",
         "laravel/framework": "^8.74.0",
         "laravel/tinker": "^2.6.2",
-        "phpmailer/phpmailer": "^6.5.3",
         "predis/predis": "^1.1.9"
     },
     "require-dev": {
-        "facade/ignition": "^2.17.2",
-        "fzaninotto/faker": "^1.9.2",
-        "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^5.10.0",
+        "facade/ignition": "^2.5",
+        "fakerphp/faker": "^1.16.0",
+        "mockery/mockery": "^1.4.2",
+        "nunomaduro/collision": "^5.0",
         "phpunit/phpunit": "^9.5.10"
     },
-    "config": {
-        "optimize-autoloader": true,
-        "preferred-install": "dist",
-        "sort-packages": true
-    },
-    "extra": {
-        "laravel": {
-            "dont-discover": []
-        }
-    },
     "autoload": {
         "psr-4": {
             "App\\": "app/"
@@ -51,8 +37,6 @@
             "Tests\\": "tests/"
         }
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "scripts": {
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
@@ -64,5 +48,17 @@
         "post-create-project-cmd": [
             "@php artisan key:generate --ansi"
         ]
-    }
+    },
+    "extra": {
+        "laravel": {
+            "dont-discover": []
+        }
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }