[2.x] Uses PHP Native Type Declarations 🐘 (#1175)

* Adds types to contracts and stubs

* Adds remaining types to database folder

* Apply fixes from StyleCI

* Fixes type

* Apply fixes from StyleCI

* Uses fortify `dev-feat/types` branch

* Minor changes on auth service provider

* Improves typing on removes team members

* Adds missing type on update team name

* Apply fixes from StyleCI

* Update composer.json

Co-authored-by: StyleCI Bot <[email protected]>
Co-authored-by: Dries Vints <[email protected]>

Author: 3 people

composer.json

@@ -19,7 +19,7 @@
         "illuminate/console": "^9.21",
         "illuminate/support": "^9.21",
         "jenssegers/agent": "^2.6",
-        "laravel/fortify": "^1.13.3"
+        "laravel/fortify": "^1.15"
     },
     "require-dev": {
         "inertiajs/inertia-laravel": "^0.6.4",

database/factories/TeamFactory.php

@@ -18,9 +18,9 @@ class TeamFactory extends Factory
     /**
      * Define the model's default state.
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    public function definition()
+    public function definition(): array
     {
         return [
             'name' => $this->faker->unique()->company(),

database/factories/UserFactory.php

@@ -20,9 +20,9 @@ class UserFactory extends Factory
     /**
      * Define the model's default state.
      *
-     * @return array
+     * @return array<string, mixed>
      */
-    public function definition()
+    public function definition(): array
     {
         return [
             'name' => $this->faker->name(),
@@ -36,9 +36,9 @@ public function definition()
     /**
      * Indicate that the model's email address should be unverified.
      *
-     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     * @return $this
      */
-    public function unverified()
+    public function unverified(): static
     {
         return $this->state(function (array $attributes) {
             return [
@@ -52,7 +52,7 @@ public function unverified()
      *
      * @return $this
      */
-    public function withPersonalTeam()
+    public function withPersonalTeam(): static
     {
         if (! Features::hasTeamFeatures()) {
             return $this->state([]);

database/migrations/2014_10_12_000000_create_users_table.php

@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('users', function (Blueprint $table) {
             $table->id();
@@ -28,10 +26,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('users');
     }

database/migrations/2020_05_21_100000_create_teams_table.php

@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('teams', function (Blueprint $table) {
             $table->id();
@@ -24,10 +22,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('teams');
     }

database/migrations/2020_05_21_200000_create_team_user_table.php

@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('team_user', function (Blueprint $table) {
             $table->id();
@@ -26,10 +24,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('team_user');
     }

database/migrations/2020_05_21_300000_create_team_invitations_table.php

@@ -8,10 +8,8 @@
 {
     /**
      * Run the migrations.
-     *
-     * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('team_invitations', function (Blueprint $table) {
             $table->id();
@@ -26,10 +24,8 @@ public function up()
 
     /**
      * Reverse the migrations.
-     *
-     * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::dropIfExists('team_invitations');
     }

src/Contracts/AddsTeamMembers.php

@@ -2,15 +2,10 @@
 
 namespace Laravel\Jetstream\Contracts;
 
+/**
+ * @method void add(\Illuminate\Foundation\Auth\User $user, \Illuminate\Database\Eloquent\Model $team, string $email, string $role = null)
+ */
 interface AddsTeamMembers
 {
-    /**
-     * Add a new team member to the given team.
-     *
-     * @param  mixed  $user
-     * @param  mixed  $team
-     * @param  string  $email
-     * @return void
-     */
-    public function add($user, $team, string $email, string $role = null);
+    //
 }

src/Contracts/CreatesTeams.php

@@ -2,14 +2,10 @@
 
 namespace Laravel\Jetstream\Contracts;
 
+/**
+ * @method \Illuminate\Database\Eloquent\Model create(\Illuminate\Foundation\Auth\User $user, array $input)
+ */
 interface CreatesTeams
 {
-    /**
-     * Validate and create a new team for the given user.
-     *
-     * @param  mixed  $user
-     * @param  array  $input
-     * @return mixed
-     */
-    public function create($user, array $input);
+    //
 }

src/Contracts/DeletesTeams.php

@@ -2,13 +2,10 @@
 
 namespace Laravel\Jetstream\Contracts;
 
+/**
+ * @method void delete(\Illuminate\Database\Eloquent\Model $team)
+ */
 interface DeletesTeams
 {
-    /**
-     * Delete the given team.
-     *
-     * @param  mixed  $team
-     * @return void
-     */
-    public function delete($team);
+    //
 }