chore: ⬆️ Bump php8.5 + migrate to mysql
This commit is contained in:
parent
c24d2f7360
commit
a9a4d25525
10 changed files with 1373 additions and 1324 deletions
|
|
@ -30,7 +30,7 @@ RUN npm config set @ldc-web:registry https://lab.s-web.fr/api/v4/packages/npm/
|
|||
RUN npm config set -- '//lab.s-web.fr/api/v4/packages/npm/:_authToken' "${GITLAB_PASSWORD}"
|
||||
RUN npm ci && npm run prod
|
||||
|
||||
FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.3:170625-101047
|
||||
FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/uwil-production-8.5:070426-150359
|
||||
|
||||
ARG USER=www-data
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ use App\Enums\TagTypeEnum;
|
|||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Bo\Advice\StoreAdviceRequest;
|
||||
use App\Http\Requests\Bo\Advice\UpdateAdviceRequest;
|
||||
use App\Http\Requests\Bo\UpdateOrderRequest;
|
||||
use App\Models\Advice;
|
||||
use App\Models\Product;
|
||||
use App\Models\Tag;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ use App\Enums\TagTypeEnum;
|
|||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Bo\Products\StoreProductRequest;
|
||||
use App\Http\Requests\Bo\Products\UpdateProductRequest;
|
||||
use App\Http\Requests\Bo\UpdateOrderRequest;
|
||||
use App\Lib\Helpers\FileStorageHelper;
|
||||
use App\Models\Product;
|
||||
use App\Models\Range;
|
||||
|
|
|
|||
|
|
@ -74,15 +74,16 @@ class ContactController extends Controller
|
|||
Session::forget('saveProductInBasket');
|
||||
|
||||
Session::forget('contact_draft');
|
||||
|
||||
|
||||
Session::flash('matomo_generate_lead');
|
||||
|
||||
return $redirection;
|
||||
}
|
||||
|
||||
/**
|
||||
* Save data form as draft
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* Save data form as draft
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function saveDraft(Request $request): \Illuminate\Http\JsonResponse
|
||||
|
|
|
|||
|
|
@ -50,6 +50,5 @@ trait ManagesOrder
|
|||
|
||||
return redirect()->back()->with('success', trans('crud.messages.order_changed'));
|
||||
});
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
],
|
||||
"license": "MIT",
|
||||
"require": {
|
||||
"php": "^8.3",
|
||||
"php": "^8.5",
|
||||
"24slides/laravel-saml2": "^2.4",
|
||||
"axlon/laravel-postal-code-validation": "^3.4",
|
||||
"carlos-meneses/laravel-mpdf": "^2.1.13",
|
||||
|
|
|
|||
2667
composer.lock
generated
2667
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -51,10 +51,14 @@ return [
|
|||
'missing_routes' => false,
|
||||
],
|
||||
|
||||
// @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#send-default-pii.
|
||||
/**
|
||||
* @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#send-default-pii.
|
||||
*/
|
||||
'send_default_pii' => env('SENTRY_SEND_DEFAULT_PII', false),
|
||||
|
||||
// @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#traces-sample-rate.
|
||||
/**
|
||||
* @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#traces-sample-rate.
|
||||
*/
|
||||
'traces_sample_rate' => env('SENTRY_TRACES_SAMPLE_RATE') === null ? null : (float)env('SENTRY_TRACES_SAMPLE_RATE'),
|
||||
|
||||
'before_send' => [\App\Lib\Helpers\ExceptionsHelper::class, 'sentryEventHandler'],
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ data:
|
|||
APP_DEBUG: "${APP_APP_DEBUG}"
|
||||
APP_URL: "https://${REDIRECT}${APP_DOMAIN}"
|
||||
LOG_CHANNEL: "k8s"
|
||||
DB_HOST: "mariadb.common-services"
|
||||
DB_HOST: "${APP_DB_HOST}"
|
||||
DB_DATABASE: "${APP_DB_DATABASE}"
|
||||
DB_USERNAME: "${APP_DB_USERNAME}"
|
||||
DB_PASSWORD: "${APP_DB_PASSWORD}"
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@
|
|||
<rule ref="Generic.Files.LineLength"/>
|
||||
<rule ref="Generic.Formatting.DisallowMultipleStatements"/>
|
||||
<rule ref="Generic.Formatting.MultipleStatementAlignment"/>
|
||||
<rule ref="Generic.Formatting.NoSpaceAfterCast"/>
|
||||
<rule ref="Generic.Functions.CallTimePassByReference"/>
|
||||
<rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
|
||||
<rule ref="Generic.Metrics.CyclomaticComplexity"/>
|
||||
<rule ref="Generic.Metrics.NestingLevel"/>
|
||||
|
|
@ -44,9 +42,6 @@
|
|||
<rule ref="Generic.Strings.UnnecessaryStringConcat"/>
|
||||
<rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
|
||||
<rule ref="Generic.WhiteSpace.ScopeIndent"/>
|
||||
<rule ref="MySource.PHP.EvalObjectFactory"/>
|
||||
<rule ref="MySource.PHP.GetRequestData"/>
|
||||
<rule ref="MySource.PHP.AjaxNullComparison"/>
|
||||
<rule ref="PEAR.Classes.ClassDeclaration"/>
|
||||
<rule ref="PEAR.Commenting.InlineComment"/>
|
||||
<rule ref="PSR1.Classes.ClassDeclaration"/>
|
||||
|
|
@ -79,7 +74,6 @@
|
|||
<rule ref="Squiz.Scope.MemberVarScope"/>
|
||||
<rule ref="Squiz.Scope.MethodScope"/>
|
||||
<rule ref="Squiz.Scope.StaticThisUsage"/>
|
||||
<rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
|
||||
<rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
|
||||
<rule ref="Squiz.WhiteSpace.MemberVarSpacing">
|
||||
<properties>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue