mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-11-04 03:29:03 -05:00
Laravel 9
This commit is contained in:
David Bomba
parent
6020927645
commit
2e29bbce3c
@ -103,13 +103,16 @@ class StoreClientRequest extends Request
|
|||||||
/* Merge default into base settings */
|
/* Merge default into base settings */
|
||||||
$input['settings'] = array_merge($input['settings'], $settings);
|
$input['settings'] = array_merge($input['settings'], $settings);
|
||||||
|
|
||||||
/* Type enforcement */
|
/* Type and property enforcement */
|
||||||
foreach ($input['settings'] as $key => $value)
|
foreach ($input['settings'] as $key => $value)
|
||||||
{
|
{
|
||||||
if ($key == 'default_task_rate') {
|
if ($key == 'default_task_rate') {
|
||||||
$value = floatval($value);
|
$value = floatval($value);
|
||||||
$input['settings'][$key] = $value;
|
$input['settings'][$key] = $value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if($key == 'translations')
|
||||||
|
unset($input['settings']['translations']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Convert hashed IDs to IDs*/
|
/* Convert hashed IDs to IDs*/
|
||||||
|
|||||||
@ -56,15 +56,12 @@ class UpdateCompanyRequest extends Request
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if($this->company->account->isPaidHostedClient()) {
|
|
||||||
// return $settings;
|
|
||||||
// }
|
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function prepareForValidation()
|
protected function prepareForValidation()
|
||||||
{
|
{
|
||||||
|
|
||||||
$input = $this->all();
|
$input = $this->all();
|
||||||
|
|
||||||
if (Ninja::isHosted() && array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1) {
|
if (Ninja::isHosted() && array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1) {
|
||||||
@ -73,7 +70,7 @@ class UpdateCompanyRequest extends Request
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (array_key_exists('settings', $input)) {
|
if (array_key_exists('settings', $input)) {
|
||||||
$input['settings'] = $this->filterSaveableSettings($input['settings']);
|
$input['settings'] = (array)$this->filterSaveableSettings($input['settings']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->replace($input);
|
$this->replace($input);
|
||||||
|
|||||||
@ -101,8 +101,7 @@
|
|||||||
"laravel/dusk": "^6.15",
|
"laravel/dusk": "^6.15",
|
||||||
"mockery/mockery": "^1.4.4",
|
"mockery/mockery": "^1.4.4",
|
||||||
"nunomaduro/collision": "^6.1",
|
"nunomaduro/collision": "^6.1",
|
||||||
"phpunit/phpunit": "^9.5.10",
|
"phpunit/phpunit": "^9.5.10"
|
||||||
"spatie/laravel-ignition": "^1.0"
|
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
|
|||||||
298
composer.lock
generated
298
composer.lock
generated
@ -4,7 +4,7 @@
|
|||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "d0d010798ad474d7d212a31f78c90029",
|
"content-hash": "6876460f0cb90da2bc3e8b03d6c270b9",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "afosto/yaac",
|
"name": "afosto/yaac",
|
||||||
@ -14296,302 +14296,6 @@
|
|||||||
],
|
],
|
||||||
"time": "2020-09-28T06:39:44+00:00"
|
"time": "2020-09-28T06:39:44+00:00"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "spatie/backtrace",
|
|
||||||
"version": "1.2.1",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/spatie/backtrace.git",
|
|
||||||
"reference": "4ee7d41aa5268107906ea8a4d9ceccde136dbd5b"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/spatie/backtrace/zipball/4ee7d41aa5268107906ea8a4d9ceccde136dbd5b",
|
|
||||||
"reference": "4ee7d41aa5268107906ea8a4d9ceccde136dbd5b",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"php": "^7.3|^8.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"ext-json": "*",
|
|
||||||
"phpunit/phpunit": "^9.3",
|
|
||||||
"symfony/var-dumper": "^5.1"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Spatie\\Backtrace\\": "src"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Freek Van de Herten",
|
|
||||||
"email": "freek@spatie.be",
|
|
||||||
"homepage": "https://spatie.be",
|
|
||||||
"role": "Developer"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "A better backtrace",
|
|
||||||
"homepage": "https://github.com/spatie/backtrace",
|
|
||||||
"keywords": [
|
|
||||||
"Backtrace",
|
|
||||||
"spatie"
|
|
||||||
],
|
|
||||||
"support": {
|
|
||||||
"issues": "https://github.com/spatie/backtrace/issues",
|
|
||||||
"source": "https://github.com/spatie/backtrace/tree/1.2.1"
|
|
||||||
},
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"url": "https://github.com/sponsors/spatie",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"url": "https://spatie.be/open-source/support-us",
|
|
||||||
"type": "other"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"time": "2021-11-09T10:57:15+00:00"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "spatie/flare-client-php",
|
|
||||||
"version": "1.2.0",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/spatie/flare-client-php.git",
|
|
||||||
"reference": "86a380f5b1ce839af04a08f1c8f2697184cdf23f"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/spatie/flare-client-php/zipball/86a380f5b1ce839af04a08f1c8f2697184cdf23f",
|
|
||||||
"reference": "86a380f5b1ce839af04a08f1c8f2697184cdf23f",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"illuminate/pipeline": "^8.0|^9.0",
|
|
||||||
"php": "^8.0",
|
|
||||||
"spatie/backtrace": "^1.2",
|
|
||||||
"symfony/http-foundation": "^5.0|^6.0",
|
|
||||||
"symfony/mime": "^5.2|^6.0",
|
|
||||||
"symfony/process": "^5.2|^6.0",
|
|
||||||
"symfony/var-dumper": "^5.2|^6.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"dms/phpunit-arraysubset-asserts": "^0.3.0",
|
|
||||||
"pestphp/pest": "^1.20",
|
|
||||||
"phpstan/extension-installer": "^1.1",
|
|
||||||
"phpstan/phpstan-deprecation-rules": "^1.0",
|
|
||||||
"phpstan/phpstan-phpunit": "^1.0",
|
|
||||||
"spatie/phpunit-snapshot-assertions": "^4.0"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-main": "1.1.x-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"files": [
|
|
||||||
"src/helpers.php"
|
|
||||||
],
|
|
||||||
"psr-4": {
|
|
||||||
"Spatie\\FlareClient\\": "src"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"description": "Send PHP errors to Flare",
|
|
||||||
"homepage": "https://github.com/spatie/flare-client-php",
|
|
||||||
"keywords": [
|
|
||||||
"exception",
|
|
||||||
"flare",
|
|
||||||
"reporting",
|
|
||||||
"spatie"
|
|
||||||
],
|
|
||||||
"support": {
|
|
||||||
"issues": "https://github.com/spatie/flare-client-php/issues",
|
|
||||||
"source": "https://github.com/spatie/flare-client-php/tree/1.2.0"
|
|
||||||
},
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"url": "https://github.com/spatie",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"time": "2022-05-16T12:13:39+00:00"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "spatie/ignition",
|
|
||||||
"version": "1.3.1",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/spatie/ignition.git",
|
|
||||||
"reference": "997363fbcce809b1e55f571997d49017f9c623d9"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/spatie/ignition/zipball/997363fbcce809b1e55f571997d49017f9c623d9",
|
|
||||||
"reference": "997363fbcce809b1e55f571997d49017f9c623d9",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"ext-json": "*",
|
|
||||||
"ext-mbstring": "*",
|
|
||||||
"monolog/monolog": "^2.0",
|
|
||||||
"php": "^8.0",
|
|
||||||
"spatie/flare-client-php": "^1.1",
|
|
||||||
"symfony/console": "^5.4|^6.0",
|
|
||||||
"symfony/var-dumper": "^5.4|^6.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"mockery/mockery": "^1.4",
|
|
||||||
"pestphp/pest": "^1.20",
|
|
||||||
"phpstan/extension-installer": "^1.1",
|
|
||||||
"phpstan/phpstan-deprecation-rules": "^1.0",
|
|
||||||
"phpstan/phpstan-phpunit": "^1.0",
|
|
||||||
"symfony/process": "^5.4|^6.0"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-main": "1.2.x-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Spatie\\Ignition\\": "src"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Spatie",
|
|
||||||
"email": "info@spatie.be",
|
|
||||||
"role": "Developer"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "A beautiful error page for PHP applications.",
|
|
||||||
"homepage": "https://flareapp.io/ignition",
|
|
||||||
"keywords": [
|
|
||||||
"error",
|
|
||||||
"flare",
|
|
||||||
"laravel",
|
|
||||||
"page"
|
|
||||||
],
|
|
||||||
"support": {
|
|
||||||
"docs": "https://flareapp.io/docs/ignition-for-laravel/introduction",
|
|
||||||
"forum": "https://twitter.com/flareappio",
|
|
||||||
"issues": "https://github.com/spatie/ignition/issues",
|
|
||||||
"source": "https://github.com/spatie/ignition"
|
|
||||||
},
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"url": "https://github.com/spatie",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"time": "2022-05-16T13:16:07+00:00"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "spatie/laravel-ignition",
|
|
||||||
"version": "1.3.1",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/spatie/laravel-ignition.git",
|
|
||||||
"reference": "fe37a0eafe6ea040804255c70e9808af13314f87"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/fe37a0eafe6ea040804255c70e9808af13314f87",
|
|
||||||
"reference": "fe37a0eafe6ea040804255c70e9808af13314f87",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"ext-curl": "*",
|
|
||||||
"ext-json": "*",
|
|
||||||
"ext-mbstring": "*",
|
|
||||||
"illuminate/support": "^8.77|^9.0",
|
|
||||||
"monolog/monolog": "^2.3",
|
|
||||||
"php": "^8.0",
|
|
||||||
"spatie/flare-client-php": "^1.0.1",
|
|
||||||
"spatie/ignition": "^1.2.4",
|
|
||||||
"symfony/console": "^5.0|^6.0",
|
|
||||||
"symfony/var-dumper": "^5.0|^6.0"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"filp/whoops": "^2.14",
|
|
||||||
"livewire/livewire": "^2.8|dev-develop",
|
|
||||||
"mockery/mockery": "^1.4",
|
|
||||||
"nunomaduro/larastan": "^1.0",
|
|
||||||
"orchestra/testbench": "^6.23|^7.0",
|
|
||||||
"pestphp/pest": "^1.20",
|
|
||||||
"phpstan/extension-installer": "^1.1",
|
|
||||||
"phpstan/phpstan-deprecation-rules": "^1.0",
|
|
||||||
"phpstan/phpstan-phpunit": "^1.0",
|
|
||||||
"spatie/laravel-ray": "^1.27"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"extra": {
|
|
||||||
"laravel": {
|
|
||||||
"providers": [
|
|
||||||
"Spatie\\LaravelIgnition\\IgnitionServiceProvider"
|
|
||||||
],
|
|
||||||
"aliases": {
|
|
||||||
"Flare": "Spatie\\LaravelIgnition\\Facades\\Flare"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"files": [
|
|
||||||
"src/helpers.php"
|
|
||||||
],
|
|
||||||
"psr-4": {
|
|
||||||
"Spatie\\LaravelIgnition\\": "src"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Spatie",
|
|
||||||
"email": "info@spatie.be",
|
|
||||||
"role": "Developer"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "A beautiful error page for Laravel applications.",
|
|
||||||
"homepage": "https://flareapp.io/ignition",
|
|
||||||
"keywords": [
|
|
||||||
"error",
|
|
||||||
"flare",
|
|
||||||
"laravel",
|
|
||||||
"page"
|
|
||||||
],
|
|
||||||
"support": {
|
|
||||||
"docs": "https://flareapp.io/docs/ignition-for-laravel/introduction",
|
|
||||||
"forum": "https://twitter.com/flareappio",
|
|
||||||
"issues": "https://github.com/spatie/laravel-ignition/issues",
|
|
||||||
"source": "https://github.com/spatie/laravel-ignition"
|
|
||||||
},
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"url": "https://github.com/spatie",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"time": "2022-06-17T06:28:57+00:00"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "swagger-api/swagger-ui",
|
"name": "swagger-api/swagger-ui",
|
||||||
"version": "v3.52.5",
|
"version": "v3.52.5",
|
||||||
|
|||||||
@ -170,7 +170,6 @@ return [
|
|||||||
Illuminate\Foundation\Providers\FoundationServiceProvider::class,
|
Illuminate\Foundation\Providers\FoundationServiceProvider::class,
|
||||||
Illuminate\Hashing\HashServiceProvider::class,
|
Illuminate\Hashing\HashServiceProvider::class,
|
||||||
App\Providers\MailServiceProvider::class,
|
App\Providers\MailServiceProvider::class,
|
||||||
//Illuminate\Mail\MailServiceProvider::class,
|
|
||||||
Illuminate\Notifications\NotificationServiceProvider::class,
|
Illuminate\Notifications\NotificationServiceProvider::class,
|
||||||
Illuminate\Pagination\PaginationServiceProvider::class,
|
Illuminate\Pagination\PaginationServiceProvider::class,
|
||||||
Illuminate\Pipeline\PipelineServiceProvider::class,
|
Illuminate\Pipeline\PipelineServiceProvider::class,
|
||||||
|
|||||||
@ -13,7 +13,7 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'default' => env('FILESYSTEM_DISK', 'local'),
|
'default' => env('FILESYSTEM_DISK', 'public'),
|
||||||
|
|
||||||
'cloud' => env('FILESYSTEM_CLOUD', 's3'),
|
'cloud' => env('FILESYSTEM_CLOUD', 's3'),
|
||||||
|
|
||||||
|
|||||||
@ -69,10 +69,9 @@ class ClientApiTest extends TestCase
|
|||||||
nlog($message);
|
nlog($message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
$arr = $response->json();
|
$arr = $response->json();
|
||||||
nlog($arr);
|
|
||||||
$this->assertFalse(array_key_exists('translations', $arr['data']['settings']));
|
$this->assertFalse(array_key_exists('translations', $arr['data']['settings']));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -100,8 +99,6 @@ nlog($arr);
|
|||||||
|
|
||||||
$arr = $response->json();
|
$arr = $response->json();
|
||||||
|
|
||||||
nlog($arr);
|
|
||||||
|
|
||||||
$this->assertFalse(array_key_exists('language_id', $arr['data']['settings']));
|
$this->assertFalse(array_key_exists('language_id', $arr['data']['settings']));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -53,6 +53,9 @@ class CompanySettingsTest extends TestCase
|
|||||||
|
|
||||||
$response = false;
|
$response = false;
|
||||||
|
|
||||||
|
nlog($this->company->toJson());
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$response = $this->withHeaders([
|
$response = $this->withHeaders([
|
||||||
'X-API-SECRET' => config('ninja.api_secret'),
|
'X-API-SECRET' => config('ninja.api_secret'),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user