diff --git a/VERSION.txt b/VERSION.txt index fad8076f307d..3b285e75c90a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.6.5 \ No newline at end of file +5.6.6 \ No newline at end of file diff --git a/app/Models/Client.php b/app/Models/Client.php index 959243ccb768..6365b493ba31 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -91,7 +91,6 @@ use Laracasts\Presenter\PresentableTrait; * @property-read \Illuminate\Database\Eloquent\Collection $gateway_tokens * @property-read int|null $gateway_tokens_count * @property-read mixed $hashed_id - * @property-read \App\Models\GroupSetting|null $group_settings * @property-read \Illuminate\Database\Eloquent\Collection $invoices * @property-read int|null $invoices_count * @property-read \Illuminate\Database\Eloquent\Collection $ledger @@ -112,6 +111,7 @@ use Laracasts\Presenter\PresentableTrait; * @property-read \Illuminate\Database\Eloquent\Collection $system_logs * @property-read int|null $system_logs_count * @property-read \Illuminate\Database\Eloquent\Collection $tasks + * @property-read \Illuminate\Database\Eloquent\Collection $recurring_invoices * @property-read int|null $tasks_count * @property-read \App\Models\User $user * @method static \Illuminate\Database\Eloquent\Builder|BaseModel company() diff --git a/config/ninja.php b/config/ninja.php index 86642783a8a0..2a6da04e0e66 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.6.5', - 'app_tag' => '5.6.5', + 'app_version' => '5.6.6', + 'app_tag' => '5.6.6', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), diff --git a/phpstan.neon b/phpstan.neon index 148ec353ba82..02983dff19a6 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -2,6 +2,8 @@ includes: - ./vendor/nunomaduro/larastan/extension.neon parameters: + parallel: + processTimeout: 300.0 treatPhpDocTypesAsCertain: false ignoreErrors: - '#Call to an undefined method .*badMethod\(\)#' diff --git a/tests/Integration/UpdateCompanyUserTest.php b/tests/Integration/UpdateCompanyUserTest.php index 505dcafc8eb1..0f9abb8cf59c 100644 --- a/tests/Integration/UpdateCompanyUserTest.php +++ b/tests/Integration/UpdateCompanyUserTest.php @@ -56,7 +56,7 @@ class UpdateCompanyUserTest extends TestCase $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, - ])->put('/api/v1/company_users/'.$this->encodePrimaryKey($this->user->id).'/preferences', $settings); + ])->put('/api/v1/company_users/'.$this->encodePrimaryKey($this->user->id).'/preferences?include=company_user', $settings); } catch (ValidationException $e) { $message = json_decode($e->validator->getMessageBag(), 1); $this->assertNotNull($message); @@ -66,9 +66,8 @@ class UpdateCompanyUserTest extends TestCase $arr = $response->json(); - $this->assertTrue($arr['data']['react_settings']['show_pdf_preview']); - $this->assertFalse($arr['data']['react_settings']['react_notification_link']); - + $this->assertTrue($arr['data']['company_user']['react_settings']['show_pdf_preview']); + $this->assertFalse($arr['data']['company_user']['react_settings']['react_notification_link']); $settings = [ 'react_settings' => [ @@ -83,7 +82,7 @@ class UpdateCompanyUserTest extends TestCase $response = $this->withHeaders([ 'X-API-SECRET' => config('ninja.api_secret'), 'X-API-TOKEN' => $this->token, - ])->put('/api/v1/company_users/'.$this->encodePrimaryKey($this->user->id).'/preferences', $settings); + ])->put('/api/v1/company_users/'.$this->encodePrimaryKey($this->user->id).'/preferences?include=company_user', $settings); } catch (ValidationException $e) { $message = json_decode($e->validator->getMessageBag(), 1); $this->assertNotNull($message); @@ -93,9 +92,8 @@ class UpdateCompanyUserTest extends TestCase $arr = $response->json(); - $this->assertFalse($arr['data']['react_settings']['show_pdf_preview']); - $this->assertTrue($arr['data']['react_settings']['react_notification_link']); - + $this->assertFalse($arr['data']['company_user']['react_settings']['show_pdf_preview']); + $this->assertTrue($arr['data']['company_user']['react_settings']['react_notification_link']); }