From 00b5dac278b10a267df92e0a9ac92a707800408e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 19 Mar 2024 19:48:26 +1100 Subject: [PATCH] Add upload extensions to account transformer --- app/Transformers/AccountTransformer.php | 3 +- composer.lock | 46 ++++++------ config/open-telemetry.php | 98 ------------------------- 3 files changed, 25 insertions(+), 122 deletions(-) delete mode 100644 config/open-telemetry.php diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php index 4e38ee26a385..30023ce9623b 100644 --- a/app/Transformers/AccountTransformer.php +++ b/app/Transformers/AccountTransformer.php @@ -92,7 +92,8 @@ class AccountTransformer extends EntityTransformer 'account_sms_verified' => (bool) $account->account_sms_verified, 'has_iap_plan' => (bool)$account->inapp_transaction_id, 'tax_api_enabled' => (bool) config('services.tax.zip_tax.key') ? true : false, - 'nordigen_enabled' => (bool) (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key')) ? true : false + 'nordigen_enabled' => (bool) (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key')) ? true : false, + 'upload_extensions' => (string) config('ninja.upload_extensions'), ]; } diff --git a/composer.lock b/composer.lock index f5797d572c29..9dec41427fb6 100644 --- a/composer.lock +++ b/composer.lock @@ -1343,16 +1343,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.301.1", + "version": "3.301.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "0a910d2b35e7087337cdf3569dc9b6ce232aafba" + "reference": "7f8180275e624cb566d8af77d2f1c958bf5be35b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0a910d2b35e7087337cdf3569dc9b6ce232aafba", - "reference": "0a910d2b35e7087337cdf3569dc9b6ce232aafba", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7f8180275e624cb566d8af77d2f1c958bf5be35b", + "reference": "7f8180275e624cb566d8af77d2f1c958bf5be35b", "shasum": "" }, "require": { @@ -1432,9 +1432,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.301.1" + "source": "https://github.com/aws/aws-sdk-php/tree/3.301.2" }, - "time": "2024-03-15T18:14:42+00:00" + "time": "2024-03-18T18:06:18+00:00" }, { "name": "bacon/bacon-qr-code", @@ -3442,16 +3442,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.339.0", + "version": "v0.340.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "5662d2ab3da41ac0e0e99db221a8c22c511c8f9c" + "reference": "c89999ea477da2b0803b2b4f14c9e7fc23b6344a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/5662d2ab3da41ac0e0e99db221a8c22c511c8f9c", - "reference": "5662d2ab3da41ac0e0e99db221a8c22c511c8f9c", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/c89999ea477da2b0803b2b4f14c9e7fc23b6344a", + "reference": "c89999ea477da2b0803b2b4f14c9e7fc23b6344a", "shasum": "" }, "require": { @@ -3480,9 +3480,9 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.339.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.340.0" }, - "time": "2024-03-10T01:06:17+00:00" + "time": "2024-03-17T00:56:17+00:00" }, { "name": "google/auth", @@ -16748,16 +16748,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.51.0", + "version": "v3.52.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "127fa74f010da99053e3f5b62672615b72dd6efd" + "reference": "a3564bd66f4bce9bc871ef18b690e2dc67a7f969" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/127fa74f010da99053e3f5b62672615b72dd6efd", - "reference": "127fa74f010da99053e3f5b62672615b72dd6efd", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a3564bd66f4bce9bc871ef18b690e2dc67a7f969", + "reference": "a3564bd66f4bce9bc871ef18b690e2dc67a7f969", "shasum": "" }, "require": { @@ -16828,7 +16828,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.51.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.0" }, "funding": [ { @@ -16836,7 +16836,7 @@ "type": "github" } ], - "time": "2024-02-28T19:50:06+00:00" + "time": "2024-03-18T18:40:11+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -17562,16 +17562,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.62", + "version": "1.10.63", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9" + "reference": "ad12836d9ca227301f5fb9960979574ed8628339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ad12836d9ca227301f5fb9960979574ed8628339", + "reference": "ad12836d9ca227301f5fb9960979574ed8628339", "shasum": "" }, "require": { @@ -17620,7 +17620,7 @@ "type": "tidelift" } ], - "time": "2024-03-13T12:27:20+00:00" + "time": "2024-03-18T16:53:53+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/config/open-telemetry.php b/config/open-telemetry.php deleted file mode 100644 index 355c0118e819..000000000000 --- a/config/open-telemetry.php +++ /dev/null @@ -1,98 +0,0 @@ - null, - - /* - * A driver is responsible for transmitting any measurements. - */ - 'drivers' => [ - Spatie\OpenTelemetry\Drivers\HttpDriver::class => [ - 'url' => 'http://localhost:9411/api/v2/spans', - // 'url' => 'http://localhost:4318/v1/traces' - ], - ], - - /* - * This class determines if your measurements should actually be sent - * to the reporting drivers. - */ - 'sampler' => Spatie\OpenTelemetry\Support\Samplers\AlwaysSampler::class, - - /* - * Tags can be added to any measurement. These classes will determine the - * values of the tags when a new trace starts. - */ - 'trace_tag_providers' => [ - \Spatie\OpenTelemetry\Support\TagProviders\DefaultTagsProvider::class, - ], - - /* - * Tags can be added to any measurement. These classes will determine the - * values of the tags when a new span starts. - */ - 'span_tag_providers' => [ - - ], - - 'queue' => [ - /* - * When enabled, any measurements (spans) you make in a queued job that implements - * `TraceAware` will automatically belong to the same trace that was - * started in the process that dispatched the job. - */ - 'make_queue_trace_aware' => true, - - /* - * When this is set to `false`, only jobs the implement - * `TraceAware` will be trace aware. - */ - 'all_jobs_are_trace_aware_by_default' => true, - - /* - * When set to `true` all jobs will - * automatically start a span. - */ - 'all_jobs_auto_start_a_span' => true, - - /* - * These jobs will be trace aware even if they don't - * implement the `TraceAware` interface. - */ - 'trace_aware_jobs' => [ - - ], - - /* - * These jobs will never trace aware, regardless of `all_jobs_are_trace_aware_by_default`. - */ - 'not_trace_aware_jobs' => [ - - ], - ], - - /* - * These actions can be overridden to have fine-grained control over how - * the package performs certain tasks. - * - * In most cases, you should use the default values. - */ - 'actions' => [ - 'make_queue_trace_aware' => Spatie\OpenTelemetry\Actions\MakeQueueTraceAwareAction::class, - ], - - /* - * This class determines how the package measures time. - */ - 'stopwatch' => Spatie\OpenTelemetry\Support\Stopwatch::class, - - /* - * This class generates IDs for traces and spans. - */ - 'id_generator' => Spatie\OpenTelemetry\Support\IdGenerator::class, -];