chore: fix code style and phpstan errors

swisnl · Jul 2, 2024 · ff373e1 · ff373e1
1 parent bb1927d
commit ff373e1
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 64 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -7,4 +7,3 @@ parameters:
         - tests
         - workbench
     tmpDir: build/phpstan
-    checkMissingIterableValueType: false
diff --git a/src/ModelDataConnector.php b/src/ModelDataConnector.php
@@ -133,7 +133,7 @@ public function savePlatform(CelticPlatform $platform): bool
             return false;
         }
 
-        $platform->updated = $clientModel->updated_at->getTimestamp();
+        $platform->updated = $clientModel->getAttribute($clientModel->getUpdatedAtColumn())->getTimestamp();
 
         return true;
     }

diff --git a/src/Models/AccessToken.php b/src/Models/AccessToken.php
@@ -11,10 +11,10 @@
 use Swis\Laravel\LtiProvider\Models\Traits\HasLtiEnvironment;
 
 /**
- * @property string                          $id
- * @property string                          $access_token
- * @property array                           $scopes
- * @property \Illuminate\Support\Carbon      $expires_at
+ * @property string $id
+ * @property string $access_token
+ * @property array $scopes
+ * @property \Illuminate\Support\Carbon $expires_at
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  *

diff --git a/src/Models/Context.php b/src/Models/Context.php
@@ -13,14 +13,14 @@
 use Swis\Laravel\LtiProvider\Models\Traits\HasLtiEnvironment;
 
 /**
- * @property int                                                                                             $id
- * @property string|null                                                                                     $title
- * @property string                                                                                          $external_context_id
- * @property \Illuminate\Database\Eloquent\Casts\ArrayObject                                                 $settings
- * @property \Illuminate\Support\Carbon|null                                                                 $created_at
- * @property \Illuminate\Support\Carbon|null                                                                 $updated_at
+ * @property int $id
+ * @property string|null $title
+ * @property string $external_context_id
+ * @property \Illuminate\Database\Eloquent\Casts\ArrayObject $settings
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Database\Eloquent\Collection<int, \Swis\Laravel\LtiProvider\Models\ResourceLink> $resourceLinks
- * @property int|null                                                                                        $resource_links_count
+ * @property int|null $resource_links_count
  *
  * @method static \Illuminate\Database\Eloquent\Builder|Context newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Context newQuery()

diff --git a/src/Models/Contracts/Client.php b/src/Models/Contracts/Client.php
@@ -8,8 +8,8 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 /**
- * @property int       $nr
- * @property string    $name
+ * @property int $nr
+ * @property string $name
  * @property \DateTime $updated_at
  */
 interface Client

diff --git a/src/Models/Nonce.php b/src/Models/Nonce.php
@@ -11,9 +11,9 @@
 use Swis\Laravel\LtiProvider\Models\Traits\HasLtiEnvironment;
 
 /**
- * @property string                          $id
- * @property string                          $nonce
- * @property \Illuminate\Support\Carbon      $expires_at
+ * @property string $id
+ * @property string $nonce
+ * @property \Illuminate\Support\Carbon $expires_at
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  *

diff --git a/src/Models/ResourceLink.php b/src/Models/ResourceLink.php
@@ -14,15 +14,15 @@
 use Swis\Laravel\LtiProvider\Models\Traits\HasLtiEnvironment;
 
 /**
- * @property int                                              $id
- * @property int|null                                         $lti_context_id
- * @property string|null                                      $title
- * @property string                                           $external_resource_link_id
- * @property \Illuminate\Database\Eloquent\Casts\ArrayObject  $settings
- * @property \Illuminate\Support\Carbon|null                  $created_at
- * @property \Illuminate\Support\Carbon|null                  $updated_at
+ * @property int $id
+ * @property int|null $lti_context_id
+ * @property string|null $title
+ * @property string $external_resource_link_id
+ * @property \Illuminate\Database\Eloquent\Casts\ArrayObject $settings
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Swis\Laravel\LtiProvider\Models\Context|null $context
- * @property int|null                                         $user_results_count
+ * @property int|null $user_results_count
  *
  * @method static \Illuminate\Database\Eloquent\Builder|ResourceLink newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ResourceLink newQuery()

diff --git a/src/Models/SimpleClient.php b/src/Models/SimpleClient.php
@@ -11,20 +11,20 @@
 use Swis\Laravel\LtiProvider\Models\Traits\HasClientCapabilities;
 
 /**
- * @property int                                             $id
- * @property string                                          $name
- * @property string                                          $key
- * @property string|null                                     $secret
- * @property string|null                                     $public_key
- * @property string|null                                     $lti_platform_id
- * @property string|null                                     $lti_client_id
- * @property string|null                                     $lti_deployment_id
- * @property string|null                                     $lti_version
- * @property string                                          $lti_signature_method
+ * @property int $id
+ * @property string $name
+ * @property string $key
+ * @property string|null $secret
+ * @property string|null $public_key
+ * @property string|null $lti_platform_id
+ * @property string|null $lti_client_id
+ * @property string|null $lti_deployment_id
+ * @property string|null $lti_version
+ * @property string $lti_signature_method
  * @property \Illuminate\Database\Eloquent\Casts\ArrayObject $lti_profile
  * @property \Illuminate\Database\Eloquent\Casts\ArrayObject $lti_settings
- * @property \Illuminate\Support\Carbon|null                 $created_at
- * @property \Illuminate\Support\Carbon|null                 $updated_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
  *
  * @method static \Illuminate\Database\Eloquent\Builder|SimpleClient newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|SimpleClient newQuery()

diff --git a/src/Models/Traits/HasClient.php b/src/Models/Traits/HasClient.php
@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 /**
- * @property string|int                                                                               $client_id
+ * @property string|int $client_id
  * @property \Illuminate\Database\Eloquent\Model&\Swis\Laravel\LtiProvider\Models\Contracts\Client $client
  *
  * @method static \Illuminate\Database\Eloquent\Builder|static whereClientId($value)

diff --git a/src/Models/Traits/HasLtiEnvironment.php b/src/Models/Traits/HasLtiEnvironment.php
@@ -7,8 +7,8 @@
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
- * @property string                                                                                        $lti_environment_type
- * @property string                                                                                        $lti_environment_id
+ * @property string $lti_environment_type
+ * @property string $lti_environment_id
  * @property \Illuminate\Database\Eloquent\Model&\Swis\Laravel\LtiProvider\Models\Contracts\LtiEnvironment $ltiEnvironment
  *
  * @method static \Illuminate\Database\Eloquent\Builder|static whereLtiEnvironmentId($value)

diff --git a/src/Models/UserResult.php b/src/Models/UserResult.php
@@ -11,12 +11,12 @@
 use Swis\Laravel\LtiProvider\Models\Traits\HasLtiEnvironment;
 
 /**
- * @property int                                              $id
- * @property int                                              $lti_resource_link_id
- * @property string                                           $external_user_id
- * @property string                                           $external_user_result_id
- * @property \Illuminate\Support\Carbon|null                  $created_at
- * @property \Illuminate\Support\Carbon|null                  $updated_at
+ * @property int $id
+ * @property int $lti_resource_link_id
+ * @property string $external_user_id
+ * @property string $external_user_result_id
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Swis\Laravel\LtiProvider\Models\ResourceLink $resourceLink
  *
  * @method static \Illuminate\Database\Eloquent\Builder|UserResult newModelQuery()

diff --git a/tests/ModelDataConnector/ModelDataConnectorTests.php b/tests/ModelDataConnector/ModelDataConnectorTests.php
@@ -40,7 +40,7 @@ public function it_should_load_platform(): void
         $platform = Platform::fromRecordId($client->getLtiRecordId(), $this->connector);
 
         // Assert
-        $this->assertEquals($client->name, $platform->name);
+        $this->assertEquals($client->getAttribute('name'), $platform->name);
     }
 
     /** @test */

diff --git a/workbench/app/Models/SimpleLtiEnvironment.php b/workbench/app/Models/SimpleLtiEnvironment.php
@@ -8,8 +8,8 @@
 use Swis\Laravel\LtiProvider\Models\Traits\IsLtiEnvironment;
 
 /**
- * @property int                             $id
- * @property string                          $name
+ * @property int $id
+ * @property string $name
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  *

diff --git a/workbench/app/OverrideModels/Client.php b/workbench/app/OverrideModels/Client.php
@@ -12,20 +12,20 @@
 use Swis\Laravel\LtiProvider\Models\Traits\HasClientCapabilities;
 
 /**
- * @property string                                          $id
- * @property int                                             $nr
- * @property string                                          $name
- * @property string|null                                     $secret
- * @property string|null                                     $public_key
- * @property string|null                                     $lti_platform_id
- * @property string|null                                     $lti_client_id
- * @property string|null                                     $lti_deployment_id
- * @property string|null                                     $lti_version
- * @property string                                          $lti_signature_method
+ * @property string $id
+ * @property int $nr
+ * @property string $name
+ * @property string|null $secret
+ * @property string|null $public_key
+ * @property string|null $lti_platform_id
+ * @property string|null $lti_client_id
+ * @property string|null $lti_deployment_id
+ * @property string|null $lti_version
+ * @property string $lti_signature_method
  * @property \Illuminate\Database\Eloquent\Casts\ArrayObject $lti_profile
  * @property \Illuminate\Database\Eloquent\Casts\ArrayObject $lti_settings
- * @property \Illuminate\Support\Carbon|null                 $created_at
- * @property \Illuminate\Support\Carbon|null                 $updated_at
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
  *
  * @method static \Illuminate\Database\Eloquent\Builder|Client newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Client newQuery()

diff --git a/workbench/app/OverrideModels/SimpleLtiEnvironment.php b/workbench/app/OverrideModels/SimpleLtiEnvironment.php
@@ -10,8 +10,8 @@
 use Swis\Laravel\LtiProvider\Models\Traits\IsLtiEnvironment;
 
 /**
- * @property string                          $id
- * @property string                          $name
+ * @property string $id
+ * @property string $name
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  *