diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/UserCreate.php similarity index 84% rename from app/Console/Commands/CreateAdmin.php rename to app/Console/Commands/UserCreate.php index 7f38fe1a..752b28cd 100644 --- a/app/Console/Commands/CreateAdmin.php +++ b/app/Console/Commands/UserCreate.php @@ -6,14 +6,14 @@ use App\Models\User; use Illuminate\Console\Command; use Illuminate\Support\Facades\Hash; -class CreateAdmin extends Command +class UserCreate extends Command { /** * The name and signature of the console command. * * @var string */ - protected $signature = 'create:admin'; + protected $signature = 'user:create'; /** * The console command description. @@ -33,15 +33,15 @@ class CreateAdmin extends Command $lastname = $this->ask('What is the lastname?', 'Web'); $email = $this->ask('What is the email?', 'equipe.web@ldc.fr'); $pwd = $this->secret('What is the password?'); + $role = $this->ask('What is the role? (1 = SuperAdmin, 2 = Admin)', 2); $user = new User(); $user->firstname = $firstname; $user->lastname = $lastname; - $user->date_of_birth = now(); $user->email = $email; $user->password = Hash::make($pwd); $user->email_verified_at = now(); - $user->role = 1; + $user->role = $role; $user->save(); $this->info('User created.'); diff --git a/app/Exports/SalariesExport.php b/app/Exports/SalariesExport.php new file mode 100644 index 00000000..1ae0d6b7 --- /dev/null +++ b/app/Exports/SalariesExport.php @@ -0,0 +1,83 @@ +salariesImport = $salariesImport; + } + + /** + * Set the header of the .csv. + * + * @return array + */ + public function headings(): array + { + return [ + 'Matricule', + 'Code', + ]; + } + + /** + * Set data to specific column. + * + * @param \App\Models\Salarie $salaries + * @return array + * @phpcs:disable Squiz.Commenting.FunctionComment.TypeHintMissing + */ + public function map($salaries): array + { + //phpcs:enable + return [ + $salaries->matricule, + $salaries->code, + ]; + } + + /** + * Surchage defaults config of Laravel. + * + * @return array + */ + public function getCsvSettings(): array + { + return [ + 'delimiter' => ';' + ]; + } + + /** + * + * @return \Illuminate\Support\Collection + */ + public function collection() + { + $salaries = Salarie::query(); + foreach ($this->salariesImport as $salarieImport) { + $salaries->orWhere('matricule', $salarieImport); + } + + return $salaries->get(); + } +} diff --git a/app/Http/Controllers/Bo/SalariesController.php b/app/Http/Controllers/Bo/SalariesController.php new file mode 100644 index 00000000..50cf051e --- /dev/null +++ b/app/Http/Controllers/Bo/SalariesController.php @@ -0,0 +1,53 @@ +import, null, \Maatwebsite\Excel\Excel::CSV); + $this->export($salariesImport->salariesImport); + + return redirect()->route('bo.salaries.index')->with('success', 'Import terminé.'); + } + + /** + * Exporter l'ensemble des salariés dans un fichier .csv, + * au format matricule | code. + * + * @param array $salariesImport + * @return \Illuminate\Http\Response|\Illuminate\Contracts\Routing\ResponseFactory + */ + public function export(array $salariesImport) + { + $this->dispatch(new SalariesExportJob($salariesImport)); + return redirect()->route('bo.salaries.index')->with('success', 'Export terminé.'); + } +} diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index ae8c0ad3..4b8847f9 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -2,7 +2,6 @@ namespace App\Http; -use App\Http\Middleware\IsAdmin; use Illuminate\Foundation\Http\Kernel as HttpKernel; class Kernel extends HttpKernel @@ -62,6 +61,7 @@ class Kernel extends HttpKernel 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, - 'is-admin' => IsAdmin::class, + 'is-admin' => \App\Http\Middleware\IsAdmin::class, + 'is-super-admin' => \App\Http\Middleware\IsSuperAdmin::class, ]; } diff --git a/app/Http/Middleware/IsSuperAdmin.php b/app/Http/Middleware/IsSuperAdmin.php new file mode 100644 index 00000000..a523914a --- /dev/null +++ b/app/Http/Middleware/IsSuperAdmin.php @@ -0,0 +1,26 @@ +role; + if ($role === 1) { + return $next($request); + } + abort(404, "Cette page n'existe pas."); + } +} diff --git a/app/Http/Requests/Bo/ImportRequest.php b/app/Http/Requests/Bo/ImportRequest.php new file mode 100644 index 00000000..716e5918 --- /dev/null +++ b/app/Http/Requests/Bo/ImportRequest.php @@ -0,0 +1,46 @@ +role === 1); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'import' => [ + 'required', + 'file', + 'mimes:csv,txt', + // phpcs:ignore Generic.Files.LineLength.TooLong + 'mimetypes:text/csv,text/plain,application/csv,text/comma-separated-values,text/anytext,application/octet-stream,application/txt', + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed + function ($attribute, $value, $fail) { + if ( + $this->import->getClientMimeType() !== 'text/csv' + && $this->import->getClientMimeType() !== 'application/vnd.ms-excel' + ) { + $fail(__('Le fichier doit être d\'un mime type text/csv ou application/vnd.ms-excel')); + } + } + ] + ]; + } +} diff --git a/app/Http/Requests/Bo/ProductRequest.php b/app/Http/Requests/Bo/ProductRequest.php index b578fd85..0017c96c 100644 --- a/app/Http/Requests/Bo/ProductRequest.php +++ b/app/Http/Requests/Bo/ProductRequest.php @@ -4,7 +4,6 @@ namespace App\Http\Requests\Bo; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Str; -use Illuminate\Support\Facades\Auth; class ProductRequest extends FormRequest { diff --git a/app/Http/Requests/Bo/SalariesImportRequest.php b/app/Http/Requests/Bo/SalariesImportRequest.php new file mode 100644 index 00000000..0e88e993 --- /dev/null +++ b/app/Http/Requests/Bo/SalariesImportRequest.php @@ -0,0 +1,46 @@ +role === 1); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'import' => [ + 'required', + 'file', + 'mimes:csv,txt', + // phpcs:ignore Generic.Files.LineLength.TooLong + 'mimetypes:text/csv,text/plain,application/csv,text/comma-separated-values,text/anytext,application/octet-stream,application/txt', + // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed + function ($attribute, $value, $fail) { + if ( + $this->import->getClientMimeType() !== 'text/csv' + && $this->import->getClientMimeType() !== 'application/vnd.ms-excel' + ) { + $fail(__('Le fichier doit être d\'un mime type text/csv ou application/vnd.ms-excel')); + } + } + ] + ]; + } +} diff --git a/app/Imports/SalariesImport.php b/app/Imports/SalariesImport.php new file mode 100644 index 00000000..60c9b4b7 --- /dev/null +++ b/app/Imports/SalariesImport.php @@ -0,0 +1,80 @@ + ";" + ]; + } + + /** + * @param array $line + * + * @return \Illuminate\Database\Eloquent\Model|null + */ + public function model(array $line) + { + if ( + !isset($line[0]) || + !isset($line[1]) || + !isset($line[2]) || + !isset($line[6]) || + !isset($line[7]) || + !isset($line[7]) + ) { + return null; + } + return $this->processFile($line); + } + + /** + * @param array $line + * + * @return \App\Models\Salarie + */ + public function processFile(array $line) + { + /** Check if the first line of the file matches to the data expected or is just a column commentary */ + if (preg_match('/[0-9]{7}/', $line[0])) { + /** @var \App\Models\Salarie */ + $salarie = Salarie::firstOrNew(['matricule' => $line[0]]); + $salarie->customer_id = $salarie->customer_id ?? null; + $salarie->nom = ucfirst(strtolower($line[1])); + $salarie->prenom = ucfirst(strtolower($line[2])); + if (isset($line[3])) { + $salarie->start_date = Carbon::createFromFormat('d/m/Y', $line[3])->format('Y-m-d'); + } + if (isset($line[4])) { + $salarie->end_date = Carbon::createFromFormat('d/m/Y', $line[4])->format('Y-m-d'); + } elseif (isset($line[5])) { + $salarie->end_date = Carbon::createFromFormat('d/m/Y', $line[5])->format('Y-m-d'); + } + $salarie->etablissement = $line[6]; + $salarie->site = $line[7]; + $salarie->service = $line[8]; + $salarie->code = $salarie->code ?? Salarie::generateRandomString(8, Salarie::query()); + Salarie::setSalarieMagasin($salarie); + $salarie->saveOrFail(); + $this->salariesImport = array_merge($this->salariesImport, [$line[0]]); + + return $salarie; + } //end if + } +} diff --git a/app/Jobs/CsvSalariesReader.php b/app/Jobs/CsvSalariesReader.php index e27b4c8a..f7f2748d 100644 --- a/app/Jobs/CsvSalariesReader.php +++ b/app/Jobs/CsvSalariesReader.php @@ -3,14 +3,11 @@ namespace App\Jobs; use App\Enums\LogType; -use App\Enums\SalarieSite; use App\Models\Salarie; use ErrorException; use TypeError; use Illuminate\Database\QueryException; use App\Exceptions\AbortCsvImportException; -use App\Lib\Utils; -use App\Models\Magasin; use Carbon\Carbon; class CsvSalariesReader extends CsvJobs @@ -28,15 +25,6 @@ class CsvSalariesReader extends CsvJobs */ protected $disk = 'salaries'; - /** - * Create a new job instance. - * - * @return void - */ - public function __construct() - { - } - /** * Execute the job. * @@ -117,15 +105,8 @@ class CsvSalariesReader extends CsvJobs // First line is header (mandatory). $header = array_flip(array_shift($data)); foreach ($data as $line) { - $matricule = $line[$header['Matricule']]; - $prenom = $line[$header['Prénom']]; - $nom = $line[$header['Nom']]; - $start_date = Carbon::createFromFormat('d/m/Y', $line[$header['Date début']]); - $end_date = $line[$header['Date fin']] ? + $end_date = $line[$header['Date fin']] ? $line[$header['Date fin']] : $line[$header['Date fin prévue']]; - $etablissement = $line[$header['Etablissement']]; - $site = $line[$header['Site']]; - $service = $line[$header['Service']]; if ($end_date != '') { $end_date = Carbon::createFromFormat('d/m/Y', $end_date); @@ -133,19 +114,18 @@ class CsvSalariesReader extends CsvJobs $end_date = null; } - - $salarie = Salarie::firstOrNew(['matricule' => $matricule]); - $salarie->matricule = $matricule; - $salarie->nom = $nom; - $salarie->prenom = $prenom; - $salarie->start_date = $start_date; + $salarie = Salarie::firstOrNew(['matricule' => $line[$header['Matricule']]]); + $salarie->matricule = $line[$header['Matricule']]; + $salarie->nom = $line[$header['Nom']]; + $salarie->prenom = $line[$header['Prénom']]; + $salarie->start_date = Carbon::createFromFormat('d/m/Y', $line[$header['Date début']]); $salarie->end_date = $end_date; - $salarie->etablissement = $etablissement; - $salarie->site = $site; - $salarie->service = $service; + $salarie->etablissement = $line[$header['Etablissement']]; + $salarie->site = $line[$header['Site']]; + $salarie->service = $line[$header['Service']]; $salarie->code = $salarie->code ?? $this->generateCode(); $salarie->save(); - $this->setMagasin($salarie); + Salarie::setSalarieMagasin($salarie); } //end foreach } @@ -156,46 +136,6 @@ class CsvSalariesReader extends CsvJobs */ protected function generateCode() { - return Utils::generateRandomString(8); - } - - /** - * Sets the fixed collection point for a salarie. - * - * @param \App\Models\Salarie $salarie - * @return void - */ - protected function setMagasin(Salarie $salarie) - { - if ($salarie->site == SalarieSite::ldccav()) { - // CAVOL. - $magasin = Magasin::find(3); - } elseif ($salarie->site == SalarieSite::dde()) { - // Dinde. - $magasin = Magasin::find(8); - } elseif ($salarie->site == SalarieSite::dpe()) { - // DPE. - $magasin = Magasin::find(9); - } elseif ($salarie->site == SalarieSite::cepacpe()) { - if ( - $salarie->service == "CEPACP060" - || $salarie->service == "CEPACP070" - || $salarie->service == "CEPACP072" - ) { - // CPE. - $magasin = Magasin::find(6); - } elseif ($salarie->service == "CEPACP065" || $salarie->service == "CEPACP066") { - // PLB. - $magasin = Magasin::find(10); - } else { - // CEPA. - $magasin = Magasin::find(10); - } - } else { - // Saint Laurent. - $magasin = Magasin::find(1); - } //end if - $salarie->magasin()->associate($magasin); - $salarie->save(); + return Salarie::generateRandomString(8, Salarie::all()); } } diff --git a/app/Jobs/SalariesExportJob.php b/app/Jobs/SalariesExportJob.php new file mode 100644 index 00000000..4568aed4 --- /dev/null +++ b/app/Jobs/SalariesExportJob.php @@ -0,0 +1,53 @@ +salariesImport = $salariesImport; + } + + /** + * Create the export salaries file in the salarie disk. + * + * @return void + */ + public function handle() + { + /** @var \App\Models\User */ + $user = Auth::user(); + $disk = Storage::disk('salaries'); + $csv_file = Carbon::now()->format('d_m_Y-H_i_s') . '-' . $user->id . '-export_salaries.csv'; + + Excel::store(new SalariesExport($this->salariesImport), $csv_file, 'salaries'); + + Mail::to($user->email)->send(new SendSalariesCSVMail($user, $csv_file)); + + if ($disk->exists($csv_file)) { + $disk->delete($csv_file); + } + } +} diff --git a/app/Lib/Utils.php b/app/Lib/Utils.php index 21ec87f2..a9d8302b 100644 --- a/app/Lib/Utils.php +++ b/app/Lib/Utils.php @@ -8,25 +8,6 @@ use Throwable; class Utils { - /** - * Simple Custom Random string generator - * - * @param integer $length - * @param string $characters - * @return string - */ - public static function generateRandomString( - int $length = 10, - string $characters = 'abcdefghjkmnpqrstuwxyzABCDEFGHJKMNPQRSTUWXYZ123456789' - ) { - $charactersLength = strlen($characters); - $randomString = ''; - for ($i = 0; $i < $length; $i++) { - $randomString .= $characters[rand(0, $charactersLength - 1)]; - } - return $randomString; - } - /** * Manually send an exception to team instead of going trough the error handler * (requires package kwaadpepper/exception-handler) diff --git a/app/Mail/SendSalariesCSVMail.php b/app/Mail/SendSalariesCSVMail.php new file mode 100644 index 00000000..77841a10 --- /dev/null +++ b/app/Mail/SendSalariesCSVMail.php @@ -0,0 +1,53 @@ +model = $model; + $this->file = $file; + } + + /** + * Build the message. + * + * @return $this + */ + public function build() + { + return $this->subject("Export salariés - " . config('theme.site_name', 'Boutique')) + ->attach(storage_path('salaries') . "/" . $this->file) + ->markdown('mails.send-csv', ['model' => $this->model]); + } +} diff --git a/app/Models/Product.php b/app/Models/Product.php index 7483fb5a..e8ed80a2 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -215,7 +215,7 @@ class Product extends Model implements Buyable $this->priceHt = $this->attributes['price']; return $this->priceHt; } - }//end if + } //end if } /** @@ -315,7 +315,7 @@ class Product extends Model implements Buyable if (isset($this->priceTtc)) { return $this->priceTtc; } else { - $priceTtc = $this->priceHt * ( 1 + ( $this->tax->rate / 100)); + $priceTtc = $this->priceHt * (1 + ($this->tax->rate / 100)); /** * On travaille avec des centimes puis on redivise par 100 pour avoir des unités monetaires * on augmente la précision à 3 digits, l'affichage formate les prix sur 2 décimales @@ -347,7 +347,7 @@ class Product extends Model implements Buyable if (isset($this->discountedPriceTtc)) { $showPrice = $this->discountedPriceTtc; } else { - $discountedPriceTtc = $this->discountedPriceHt * ( 1 + ( $this->tax->rate / 100)); + $discountedPriceTtc = $this->discountedPriceHt * (1 + ($this->tax->rate / 100)); // On travaille avec des centimes puis on redivise par 100 pour avoir des unités monetaires. $roundingDiscountedPriceTTC = round($discountedPriceTtc * 1000) / 1000; $this->discountedPriceTtc = $roundingDiscountedPriceTTC; @@ -500,7 +500,7 @@ class Product extends Model implements Buyable public function orders() { return $this->belongsToMany('App\Models\Order', 'orders_products', 'product_id', 'order_id') - ->withPivot('quantity'); + ->withPivot('quantity'); } /** @@ -575,8 +575,8 @@ class Product extends Model implements Buyable { $now = Carbon::now(); return $this->belongsToMany(Promotion::class) - ->whereDate('date_start', '<=', $now) - ->whereDate('date_end', '>=', $now); + ->whereDate('date_start', '<=', $now) + ->whereDate('date_end', '>=', $now); } /** diff --git a/app/Models/Salarie.php b/app/Models/Salarie.php index 66193cef..5630c861 100644 --- a/app/Models/Salarie.php +++ b/app/Models/Salarie.php @@ -2,6 +2,7 @@ namespace App\Models; +use App\Enums\SalarieSite; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use App\Models\Customers; @@ -22,6 +23,83 @@ class Salarie extends Model 'start_date', 'end_date', 'etablissement', 'site', 'service' ]; + /** + * Setter magasin for a salarie. + * + * @param \App\Models\Salarie $salarie + * @return void + */ + public static function setSalarieMagasin(Salarie $salarie) + { + Salarie::setMagasin($salarie); + } + + /** + * Sets the fixed collection point for a salarie. + * + * @param \App\Models\Salarie $salarie + * @return void + */ + private function setMagasin(Salarie $salarie) + { + if ($salarie->site == SalarieSite::ldccav()) { + // CAVOL. + $magasin = Magasin::find(3); + } elseif ($salarie->site == SalarieSite::dde()) { + // Dinde. + $magasin = Magasin::find(8); + } elseif ($salarie->site == SalarieSite::dpe()) { + // DPE. + $magasin = Magasin::find(9); + } elseif ($salarie->site == SalarieSite::cepacpe()) { + if ( + $salarie->service == "CEPACP060" + || $salarie->service == "CEPACP070" + || $salarie->service == "CEPACP072" + ) { + // CPE. + $magasin = Magasin::find(6); + } elseif ($salarie->service == "CEPACP065" || $salarie->service == "CEPACP066") { + // PLB. + $magasin = Magasin::find(10); + } else { + // CEPA. + $magasin = Magasin::find(10); + } + } else { + // Saint Laurent. + $magasin = Magasin::find(1); + } //end if + $salarie->magasin()->associate($magasin); + $salarie->save(); + } + + /** + * Simple Custom Random string generator + * + * @param integer $length + * @param object|null $model + * @param string $characters + * @return string + */ + public static function generateRandomString( + int $length = 10, + object $model = null, + string $characters = 'abcdefghjkmnpqrstuwxyzABCDEFGHJKMNPQRSTUWXYZ123456789' + ) { + $charactersLength = strlen($characters); + $randomString = ''; + for ($i = 0; $i < $length; $i++) { + $randomString .= $characters[rand(0, $charactersLength - 1)]; + } + if (isset($model) && $model->where('code', $randomString)->exists()) { + self::generateRandomString(); + } + return $randomString; + } + + // * RELATIONSHIPS + /** * BelongsTo customer relation * diff --git a/composer.json b/composer.json index b1ff82cb..97cebe74 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "laravel/framework": "^8.12", "laravel/tinker": "^2.5", "ldc/ldccrmv2client": "^3.0", + "maatwebsite/excel": "^3.1", "mews/purifier": "^3.3", "spatie/laravel-sitemap": "^5.8" }, diff --git a/composer.lock b/composer.lock index 6fbe47f7..4724bda3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0c1b4e5c0bf2ba4cf1d41edc27cda67c", + "content-hash": "ab5646029cb2c689f152e4a8a2d3b885", "packages": [ { "name": "asm89/stack-cors", @@ -193,6 +193,87 @@ }, "time": "2022-05-15T15:32:38+00:00" }, + { + "name": "composer/semver", + "version": "3.3.2", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.4", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.3.2" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-04-01T19:23:25+00:00" + }, { "name": "diglactic/laravel-breadcrumbs", "version": "v6.1.1", @@ -879,22 +960,22 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.5.0", + "version": "7.7.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" + "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5", + "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.9 || ^2.4", + "guzzlehttp/promises": "^1.5.3 || ^2.0", + "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -905,7 +986,8 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", - "php-http/client-integration-tests": "^3.0", + "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "php-http/message-factory": "^1.1", "phpunit/phpunit": "^8.5.29 || ^9.5.23", "psr/log": "^1.1 || ^2.0 || ^3.0" }, @@ -919,9 +1001,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "7.5-dev" } }, "autoload": { @@ -987,7 +1066,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.5.0" + "source": "https://github.com/guzzle/guzzle/tree/7.7.0" }, "funding": [ { @@ -1003,38 +1082,37 @@ "type": "tidelift" } ], - "time": "2022-08-28T15:39:27+00:00" + "time": "2023-05-21T14:04:53+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.2", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "b94b2807d85443f9719887892882d0329d1e2598" + "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", - "reference": "b94b2807d85443f9719887892882d0329d1e2598", + "url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6", + "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.1", + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.5-dev" + "bamarni-bin": { + "bin-links": true, + "forward-command": false } }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -1071,7 +1149,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.2" + "source": "https://github.com/guzzle/promises/tree/2.0.0" }, "funding": [ { @@ -1087,20 +1165,20 @@ "type": "tidelift" } ], - "time": "2022-08-28T14:55:35+00:00" + "time": "2023-05-21T13:50:22+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318" + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", "shasum": "" }, "require": { @@ -1119,11 +1197,6 @@ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -1181,7 +1254,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.9.0" + "source": "https://github.com/guzzle/psr7/tree/1.9.1" }, "funding": [ { @@ -1197,7 +1270,7 @@ "type": "tidelift" } ], - "time": "2022-06-20T21:43:03+00:00" + "time": "2023-04-17T16:00:37+00:00" }, { "name": "intervention/image", @@ -2134,6 +2207,268 @@ ], "time": "2022-04-17T13:12:02+00:00" }, + { + "name": "maatwebsite/excel", + "version": "3.1.48", + "source": { + "type": "git", + "url": "https://github.com/SpartnerNL/Laravel-Excel.git", + "reference": "6d0fe2a1d195960c7af7bf0de760582da02a34b9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/6d0fe2a1d195960c7af7bf0de760582da02a34b9", + "reference": "6d0fe2a1d195960c7af7bf0de760582da02a34b9", + "shasum": "" + }, + "require": { + "composer/semver": "^3.3", + "ext-json": "*", + "illuminate/support": "5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0", + "php": "^7.0|^8.0", + "phpoffice/phpspreadsheet": "^1.18", + "psr/simple-cache": "^1.0|^2.0|^3.0" + }, + "require-dev": { + "orchestra/testbench": "^6.0|^7.0|^8.0", + "predis/predis": "^1.1" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Maatwebsite\\Excel\\ExcelServiceProvider" + ], + "aliases": { + "Excel": "Maatwebsite\\Excel\\Facades\\Excel" + } + } + }, + "autoload": { + "psr-4": { + "Maatwebsite\\Excel\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Patrick Brouwers", + "email": "patrick@spartner.nl" + } + ], + "description": "Supercharged Excel exports and imports in Laravel", + "keywords": [ + "PHPExcel", + "batch", + "csv", + "excel", + "export", + "import", + "laravel", + "php", + "phpspreadsheet" + ], + "support": { + "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.48" + }, + "funding": [ + { + "url": "https://laravel-excel.com/commercial-support", + "type": "custom" + }, + { + "url": "https://github.com/patrickbrouwers", + "type": "github" + } + ], + "time": "2023-02-22T21:01:38+00:00" + }, + { + "name": "maennchen/zipstream-php", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/maennchen/ZipStream-PHP.git", + "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/c4c5803cc1f93df3d2448478ef79394a5981cc58", + "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58", + "shasum": "" + }, + "require": { + "myclabs/php-enum": "^1.5", + "php": ">= 7.1", + "psr/http-message": "^1.0", + "symfony/polyfill-mbstring": "^1.0" + }, + "require-dev": { + "ext-zip": "*", + "guzzlehttp/guzzle": ">= 6.3", + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": ">= 7.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "ZipStream\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paul Duncan", + "email": "pabs@pablotron.org" + }, + { + "name": "Jonatan Männchen", + "email": "jonatan@maennchen.ch" + }, + { + "name": "Jesse Donat", + "email": "donatj@gmail.com" + }, + { + "name": "András Kolesár", + "email": "kolesar@kolesar.hu" + } + ], + "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.", + "keywords": [ + "stream", + "zip" + ], + "support": { + "issues": "https://github.com/maennchen/ZipStream-PHP/issues", + "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.1.0" + }, + "funding": [ + { + "url": "https://github.com/maennchen", + "type": "github" + }, + { + "url": "https://opencollective.com/zipstream", + "type": "open_collective" + } + ], + "time": "2020-05-30T13:11:16+00:00" + }, + { + "name": "markbaker/complex", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/MarkBaker/PHPComplex.git", + "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9", + "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "phpcompatibility/php-compatibility": "^9.3", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "squizlabs/php_codesniffer": "^3.7" + }, + "type": "library", + "autoload": { + "psr-4": { + "Complex\\": "classes/src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mark Baker", + "email": "mark@lange.demon.co.uk" + } + ], + "description": "PHP Class for working with complex numbers", + "homepage": "https://github.com/MarkBaker/PHPComplex", + "keywords": [ + "complex", + "mathematics" + ], + "support": { + "issues": "https://github.com/MarkBaker/PHPComplex/issues", + "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2" + }, + "time": "2022-12-06T16:21:08+00:00" + }, + { + "name": "markbaker/matrix", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/MarkBaker/PHPMatrix.git", + "reference": "728434227fe21be27ff6d86621a1b13107a2562c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c", + "reference": "728434227fe21be27ff6d86621a1b13107a2562c", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "phpcompatibility/php-compatibility": "^9.3", + "phpdocumentor/phpdocumentor": "2.*", + "phploc/phploc": "^4.0", + "phpmd/phpmd": "2.*", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "sebastian/phpcpd": "^4.0", + "squizlabs/php_codesniffer": "^3.7" + }, + "type": "library", + "autoload": { + "psr-4": { + "Matrix\\": "classes/src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mark Baker", + "email": "mark@demon-angel.eu" + } + ], + "description": "PHP Class for working with matrices", + "homepage": "https://github.com/MarkBaker/PHPMatrix", + "keywords": [ + "mathematics", + "matrix", + "vector" + ], + "support": { + "issues": "https://github.com/MarkBaker/PHPMatrix/issues", + "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1" + }, + "time": "2022-12-02T22:17:43+00:00" + }, { "name": "mews/purifier", "version": "3.4.0", @@ -2315,17 +2650,80 @@ "time": "2023-02-06T13:44:46+00:00" }, { - "name": "nesbot/carbon", - "version": "2.66.0", + "name": "myclabs/php-enum", + "version": "1.8.4", "source": { "type": "git", - "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "496712849902241f04902033b0441b269effe001" + "url": "https://github.com/myclabs/php-enum.git", + "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/496712849902241f04902033b0441b269effe001", - "reference": "496712849902241f04902033b0441b269effe001", + "url": "https://api.github.com/repos/myclabs/php-enum/zipball/a867478eae49c9f59ece437ae7f9506bfaa27483", + "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5", + "squizlabs/php_codesniffer": "1.*", + "vimeo/psalm": "^4.6.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "MyCLabs\\Enum\\": "src/" + }, + "classmap": [ + "stubs/Stringable.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP Enum contributors", + "homepage": "https://github.com/myclabs/php-enum/graphs/contributors" + } + ], + "description": "PHP Enum implementation", + "homepage": "http://github.com/myclabs/php-enum", + "keywords": [ + "enum" + ], + "support": { + "issues": "https://github.com/myclabs/php-enum/issues", + "source": "https://github.com/myclabs/php-enum/tree/1.8.4" + }, + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum", + "type": "tidelift" + } + ], + "time": "2022-08-04T09:53:51+00:00" + }, + { + "name": "nesbot/carbon", + "version": "2.67.0", + "source": { + "type": "git", + "url": "https://github.com/briannesbitt/Carbon.git", + "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/c1001b3bc75039b07f38a79db5237c4c529e04c8", + "reference": "c1001b3bc75039b07f38a79db5237c4c529e04c8", "shasum": "" }, "require": { @@ -2414,7 +2812,7 @@ "type": "tidelift" } ], - "time": "2023-01-29T18:53:47+00:00" + "time": "2023-05-25T22:09:47+00:00" }, { "name": "nicmart/tree", @@ -2464,16 +2862,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.4", + "version": "v4.15.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", "shasum": "" }, "require": { @@ -2514,9 +2912,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" }, - "time": "2023-03-05T19:49:14+00:00" + "time": "2023-05-19T20:20:00+00:00" }, { "name": "opis/closure", @@ -2583,6 +2981,111 @@ }, "time": "2022-01-27T09:35:39+00:00" }, + { + "name": "phpoffice/phpspreadsheet", + "version": "1.25.2", + "source": { + "type": "git", + "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a317a09e7def49852400a4b3eca4a4b0790ceeb5", + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-dom": "*", + "ext-fileinfo": "*", + "ext-gd": "*", + "ext-iconv": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-simplexml": "*", + "ext-xml": "*", + "ext-xmlreader": "*", + "ext-xmlwriter": "*", + "ext-zip": "*", + "ext-zlib": "*", + "ezyang/htmlpurifier": "^4.15", + "maennchen/zipstream-php": "^2.1", + "markbaker/complex": "^3.0", + "markbaker/matrix": "^3.0", + "php": "^7.3 || ^8.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "psr/simple-cache": "^1.0 || ^2.0 || ^3.0" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "dompdf/dompdf": "^1.0 || ^2.0", + "friendsofphp/php-cs-fixer": "^3.2", + "mitoteam/jpgraph": "10.2.4", + "mpdf/mpdf": "8.1.1", + "phpcompatibility/php-compatibility": "^9.3", + "phpstan/phpstan": "^1.1", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^8.5 || ^9.0", + "squizlabs/php_codesniffer": "^3.7", + "tecnickcom/tcpdf": "6.5" + }, + "suggest": { + "dompdf/dompdf": "Option for rendering PDF with PDF Writer", + "ext-intl": "PHP Internationalization Functions", + "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", + "mpdf/mpdf": "Option for rendering PDF with PDF Writer", + "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer" + }, + "type": "library", + "autoload": { + "psr-4": { + "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maarten Balliauw", + "homepage": "https://blog.maartenballiauw.be" + }, + { + "name": "Mark Baker", + "homepage": "https://markbakeruk.net" + }, + { + "name": "Franck Lefevre", + "homepage": "https://rootslabs.net" + }, + { + "name": "Erik Tilt" + }, + { + "name": "Adrien Crivelli" + } + ], + "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine", + "homepage": "https://github.com/PHPOffice/PhpSpreadsheet", + "keywords": [ + "OpenXML", + "excel", + "gnumeric", + "ods", + "php", + "spreadsheet", + "xls", + "xlsx" + ], + "support": { + "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.25.2" + }, + "time": "2022-09-25T17:21:01+00:00" + }, { "name": "phpoption/phpoption", "version": "1.9.1", @@ -2758,21 +3261,21 @@ }, { "name": "psr/http-client", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", "shasum": "" }, "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -2792,7 +3295,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP clients", @@ -2804,26 +3307,27 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/master" + "source": "https://github.com/php-fig/http-client/tree/1.0.2" }, - "time": "2020-06-29T06:28:15+00:00" + "time": "2023-04-10T20:12:12+00:00" }, { - "name": "psr/http-message", - "version": "1.0.1", + "name": "psr/http-factory", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "url": "https://github.com/php-fig/http-factory.git", + "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.0.0", + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -2840,6 +3344,60 @@ "license": [ "MIT" ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-factory/tree/1.0.2" + }, + "time": "2023-04-10T20:10:41+00:00" + }, + { + "name": "psr/http-message", + "version": "1.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], "authors": [ { "name": "PHP-FIG", @@ -2857,9 +3415,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -2964,16 +3522,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.14", + "version": "v0.11.18", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17" + "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/8c2e264def7a8263a68ef6f0b55ce90b77d41e17", - "reference": "8c2e264def7a8263a68ef6f0b55ce90b77d41e17", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", + "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", "shasum": "" }, "require": { @@ -3034,9 +3592,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.14" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.18" }, - "time": "2023-03-28T03:41:01+00:00" + "time": "2023-05-23T02:31:11+00:00" }, { "name": "ralouphie/getallheaders", @@ -3887,16 +4445,16 @@ }, { "name": "symfony/console", - "version": "v5.4.21", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c77433ddc6cdc689caf48065d9ea22ca0853fbd9" + "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c77433ddc6cdc689caf48065d9ea22ca0853fbd9", - "reference": "c77433ddc6cdc689caf48065d9ea22ca0853fbd9", + "url": "https://api.github.com/repos/symfony/console/zipball/560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", + "reference": "560fc3ed7a43e6d30ea94a07d77f9a60b8ed0fb8", "shasum": "" }, "require": { @@ -3961,12 +4519,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.21" + "source": "https://github.com/symfony/console/tree/v5.4.24" }, "funding": [ { @@ -3982,7 +4540,7 @@ "type": "tidelift" } ], - "time": "2023-02-25T16:59:41+00:00" + "time": "2023-05-26T05:13:16+00:00" }, { "name": "symfony/css-selector", @@ -4119,16 +4677,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v5.4.21", + "version": "v5.4.23", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "105a7ac54ecacc1f52a99b9c4963935ca62aac8f" + "reference": "4a286c916b74ecfb6e2caf1aa31d3fe2a34b7e08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/105a7ac54ecacc1f52a99b9c4963935ca62aac8f", - "reference": "105a7ac54ecacc1f52a99b9c4963935ca62aac8f", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4a286c916b74ecfb6e2caf1aa31d3fe2a34b7e08", + "reference": "4a286c916b74ecfb6e2caf1aa31d3fe2a34b7e08", "shasum": "" }, "require": { @@ -4174,7 +4732,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.4.21" + "source": "https://github.com/symfony/dom-crawler/tree/v5.4.23" }, "funding": [ { @@ -4190,20 +4748,20 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-04-08T21:20:19+00:00" }, { "name": "symfony/error-handler", - "version": "v5.4.21", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "56a94aa8cb5a5fbc411551d8d014a296b5456549" + "reference": "c1b9be3b8a6f60f720bec28c4ffb6fb5b00a8946" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/56a94aa8cb5a5fbc411551d8d014a296b5456549", - "reference": "56a94aa8cb5a5fbc411551d8d014a296b5456549", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/c1b9be3b8a6f60f720bec28c4ffb6fb5b00a8946", + "reference": "c1b9be3b8a6f60f720bec28c4ffb6fb5b00a8946", "shasum": "" }, "require": { @@ -4245,7 +4803,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v5.4.21" + "source": "https://github.com/symfony/error-handler/tree/v5.4.24" }, "funding": [ { @@ -4261,20 +4819,20 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-05-02T16:13:31+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.21", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "f0ae1383a8285dfc6752b8d8602790953118ff5a" + "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f0ae1383a8285dfc6752b8d8602790953118ff5a", - "reference": "f0ae1383a8285dfc6752b8d8602790953118ff5a", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1df20e45d56da29a4b1d8259dd6e950acbf1b13f", + "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f", "shasum": "" }, "require": { @@ -4330,7 +4888,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.21" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.22" }, "funding": [ { @@ -4346,7 +4904,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-03-17T11:31:58+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4492,16 +5050,16 @@ }, { "name": "symfony/http-foundation", - "version": "v5.4.21", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "3bb6ee5582366c4176d5ce596b380117c8200bbf" + "reference": "3c59f97f6249ce552a44f01b93bfcbd786a954f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3bb6ee5582366c4176d5ce596b380117c8200bbf", - "reference": "3bb6ee5582366c4176d5ce596b380117c8200bbf", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3c59f97f6249ce552a44f01b93bfcbd786a954f5", + "reference": "3c59f97f6249ce552a44f01b93bfcbd786a954f5", "shasum": "" }, "require": { @@ -4548,7 +5106,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.4.21" + "source": "https://github.com/symfony/http-foundation/tree/v5.4.24" }, "funding": [ { @@ -4564,20 +5122,20 @@ "type": "tidelift" } ], - "time": "2023-02-17T21:35:35+00:00" + "time": "2023-05-19T07:21:23+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.4.21", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "09c19fc7e4218fbcf73fe0330eea38d66064b775" + "reference": "f38b722e1557eb3f487d351b48f5a1279b50e9d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/09c19fc7e4218fbcf73fe0330eea38d66064b775", - "reference": "09c19fc7e4218fbcf73fe0330eea38d66064b775", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f38b722e1557eb3f487d351b48f5a1279b50e9d1", + "reference": "f38b722e1557eb3f487d351b48f5a1279b50e9d1", "shasum": "" }, "require": { @@ -4660,7 +5218,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v5.4.21" + "source": "https://github.com/symfony/http-kernel/tree/v5.4.24" }, "funding": [ { @@ -4676,20 +5234,20 @@ "type": "tidelift" } ], - "time": "2023-02-28T13:19:09+00:00" + "time": "2023-05-27T08:06:30+00:00" }, { "name": "symfony/mime", - "version": "v5.4.21", + "version": "v5.4.23", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd" + "reference": "ae0a1032a450a3abf305ee44fc55ed423fbf16e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd", - "reference": "ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd", + "url": "https://api.github.com/repos/symfony/mime/zipball/ae0a1032a450a3abf305ee44fc55ed423fbf16e3", + "reference": "ae0a1032a450a3abf305ee44fc55ed423fbf16e3", "shasum": "" }, "require": { @@ -4744,7 +5302,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.21" + "source": "https://github.com/symfony/mime/tree/v5.4.23" }, "funding": [ { @@ -4760,7 +5318,7 @@ "type": "tidelift" } ], - "time": "2023-02-21T19:46:44+00:00" + "time": "2023-04-19T09:49:13+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5581,16 +6139,16 @@ }, { "name": "symfony/process", - "version": "v5.4.21", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d4ce417ebcb0b7d090b4c178ed6d3accc518e8bd" + "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d4ce417ebcb0b7d090b4c178ed6d3accc518e8bd", - "reference": "d4ce417ebcb0b7d090b4c178ed6d3accc518e8bd", + "url": "https://api.github.com/repos/symfony/process/zipball/e3c46cc5689c8782944274bb30702106ecbe3b64", + "reference": "e3c46cc5689c8782944274bb30702106ecbe3b64", "shasum": "" }, "require": { @@ -5623,7 +6181,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.21" + "source": "https://github.com/symfony/process/tree/v5.4.24" }, "funding": [ { @@ -5639,20 +6197,20 @@ "type": "tidelift" } ], - "time": "2023-02-21T19:46:44+00:00" + "time": "2023-05-17T11:26:05+00:00" }, { "name": "symfony/routing", - "version": "v5.4.21", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "2ea0f3049076e8ef96eab203a809d6b2332f0361" + "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/2ea0f3049076e8ef96eab203a809d6b2332f0361", - "reference": "2ea0f3049076e8ef96eab203a809d6b2332f0361", + "url": "https://api.github.com/repos/symfony/routing/zipball/c2ac11eb34947999b7c38fb4c835a57306907e6d", + "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d", "shasum": "" }, "require": { @@ -5713,7 +6271,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v5.4.21" + "source": "https://github.com/symfony/routing/tree/v5.4.22" }, "funding": [ { @@ -5729,7 +6287,7 @@ "type": "tidelift" } ], - "time": "2023-02-16T09:33:00+00:00" + "time": "2023-03-14T14:59:20+00:00" }, { "name": "symfony/service-contracts", @@ -5816,16 +6374,16 @@ }, { "name": "symfony/string", - "version": "v5.4.21", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "edac10d167b78b1d90f46a80320d632de0bd9f2f" + "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/edac10d167b78b1d90f46a80320d632de0bd9f2f", - "reference": "edac10d167b78b1d90f46a80320d632de0bd9f2f", + "url": "https://api.github.com/repos/symfony/string/zipball/8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", + "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", "shasum": "" }, "require": { @@ -5882,7 +6440,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.21" + "source": "https://github.com/symfony/string/tree/v5.4.22" }, "funding": [ { @@ -5898,20 +6456,20 @@ "type": "tidelift" } ], - "time": "2023-02-22T08:00:55+00:00" + "time": "2023-03-14T06:11:53+00:00" }, { "name": "symfony/translation", - "version": "v5.4.21", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "6996affeea65705086939894b77110e9a7f80874" + "reference": "de237e59c5833422342be67402d487fbf50334ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/6996affeea65705086939894b77110e9a7f80874", - "reference": "6996affeea65705086939894b77110e9a7f80874", + "url": "https://api.github.com/repos/symfony/translation/zipball/de237e59c5833422342be67402d487fbf50334ff", + "reference": "de237e59c5833422342be67402d487fbf50334ff", "shasum": "" }, "require": { @@ -5979,7 +6537,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v5.4.21" + "source": "https://github.com/symfony/translation/tree/v5.4.24" }, "funding": [ { @@ -5995,7 +6553,7 @@ "type": "tidelift" } ], - "time": "2023-02-21T19:46:44+00:00" + "time": "2023-05-19T12:34:17+00:00" }, { "name": "symfony/translation-contracts", @@ -6077,16 +6635,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.21", + "version": "v5.4.24", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74" + "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6c5ac3a1be8b849d59a1a77877ee110e1b55eb74", - "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8e12706bf9c68a2da633f23bfdc15b4dce5970b3", + "reference": "8e12706bf9c68a2da633f23bfdc15b4dce5970b3", "shasum": "" }, "require": { @@ -6095,7 +6653,6 @@ "symfony/polyfill-php80": "^1.16" }, "conflict": { - "phpunit/phpunit": "<5.4.3", "symfony/console": "<4.4" }, "require-dev": { @@ -6146,7 +6703,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.21" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.24" }, "funding": [ { @@ -6162,7 +6719,7 @@ "type": "tidelift" } ], - "time": "2023-02-23T10:00:28+00:00" + "time": "2023-05-25T13:05:00+00:00" }, { "name": "tightenco/collect", @@ -6770,25 +7327,29 @@ }, { "name": "doctrine/deprecations", - "version": "v1.0.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", - "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { "doctrine/coding-standard": "^9", - "phpunit/phpunit": "^7.5|^8.5|^9.5", - "psr/log": "^1|^2|^3" + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -6807,9 +7368,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" }, - "time": "2022-05-02T15:47:09+00:00" + "time": "2023-06-03T09:27:29+00:00" }, { "name": "doctrine/event-manager", @@ -7185,16 +7746,16 @@ }, { "name": "filp/whoops", - "version": "2.15.1", + "version": "2.15.2", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "e864ac957acd66e1565f25efda61e37791a5db0b" + "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/e864ac957acd66e1565f25efda61e37791a5db0b", - "reference": "e864ac957acd66e1565f25efda61e37791a5db0b", + "url": "https://api.github.com/repos/filp/whoops/zipball/aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", + "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", "shasum": "" }, "require": { @@ -7244,7 +7805,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.15.1" + "source": "https://github.com/filp/whoops/tree/2.15.2" }, "funding": [ { @@ -7252,7 +7813,7 @@ "type": "github" } ], - "time": "2023-03-06T18:09:13+00:00" + "time": "2023-04-12T12:00:00+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -7636,22 +8197,24 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.16.1", + "version": "1.22.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571" + "reference": "ec58baf7b3c7f1c81b3b00617c953249fb8cf30c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e27e92d939e2e3636f0a1f0afaba59692c0bf571", - "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/ec58baf7b3c7f1c81b3b00617c953249fb8cf30c", + "reference": "ec58baf7b3c7f1c81b3b00617c953249fb8cf30c", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { + "doctrine/annotations": "^2.0", + "nikic/php-parser": "^4.15", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.5", @@ -7675,9 +8238,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.16.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.0" }, - "time": "2023-02-07T18:11:17+00:00" + "time": "2023-06-01T12:35:21+00:00" }, { "name": "phpunit/php-code-coverage", @@ -7999,16 +8562,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.6", + "version": "9.6.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115" + "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b65d59a059d3004a040c16a82e07bbdf6cfdd115", - "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", + "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e", "shasum": "" }, "require": { @@ -8082,7 +8645,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.6" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8" }, "funding": [ { @@ -8098,7 +8661,7 @@ "type": "tidelift" } ], - "time": "2023-03-27T11:43:46+00:00" + "time": "2023-05-11T05:14:45+00:00" }, { "name": "psr/cache", @@ -8449,16 +9012,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", "shasum": "" }, "require": { @@ -8503,7 +9066,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" }, "funding": [ { @@ -8511,7 +9074,7 @@ "type": "github" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "sebastian/environment", diff --git a/config/database.php b/config/database.php index ac4559fb..8fcc455c 100644 --- a/config/database.php +++ b/config/database.php @@ -1,6 +1,7 @@ [ + 'types' => [ + 'timestamp' => TimestampType::class, + ], + ], + ]; diff --git a/database/migrations/2023_07_04_151150_alter_code_salaries_table.php b/database/migrations/2023_07_04_151150_alter_code_salaries_table.php new file mode 100644 index 00000000..ec621486 --- /dev/null +++ b/database/migrations/2023_07_04_151150_alter_code_salaries_table.php @@ -0,0 +1,34 @@ +string('code', 50)->unique()->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('salaries', function (Blueprint $table) { + $table->dropUnique('salaries_code_unique'); + }); + DB::statement('ALTER TABLE `salaries` MODIFY `code` VARBINARY(50) AFTER `prenom`'); + } +} diff --git a/database/migrations/2023_07_27_145254_alter_birth_users_table.php b/database/migrations/2023_07_27_145254_alter_birth_users_table.php new file mode 100644 index 00000000..9187fdb4 --- /dev/null +++ b/database/migrations/2023_07_27_145254_alter_birth_users_table.php @@ -0,0 +1,32 @@ +dropColumn('date_of_birth'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('users', function (Blueprint $table) { + $table->date('date_of_birth')->nullable()->after('lastname'); + }); + } +} diff --git a/database/migrations/2023_07_27_150324_alter_role_users_table.php b/database/migrations/2023_07_27_150324_alter_role_users_table.php new file mode 100644 index 00000000..71aae3fb --- /dev/null +++ b/database/migrations/2023_07_27_150324_alter_role_users_table.php @@ -0,0 +1,33 @@ +', 'equipe.web@ldc.fr')->get() as $user) { + $user->role = 2; + $user->saveOrFail(); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + foreach (User::all() as $user) { + $user->role = 1; + $user->saveOrFail(); + } + } +} diff --git a/database/migrations/2023_07_27_153349_alter_clean_salaries_table.php b/database/migrations/2023_07_27_153349_alter_clean_salaries_table.php new file mode 100644 index 00000000..3c243fa7 --- /dev/null +++ b/database/migrations/2023_07_27_153349_alter_clean_salaries_table.php @@ -0,0 +1,49 @@ +date('start_date')->nullable()->change(); + $table->date('end_date')->nullable()->change(); + $table->string('nom')->nullable(false)->change(); + $table->string('prenom')->nullable(false)->change(); + $table->string('code', 10)->nullable(false)->change(); + // FIXME : Pourquoi ca passe pas avec eloquent ???? + DB::statement( + 'ALTER TABLE `salaries` CHANGE COLUMN `magasin_id` `magasin_id` BIGINT(20) UNSIGNED NOT NULL AFTER `service`;' + ); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('salaries', function (Blueprint $table) { + $table->timestamp('start_date')->nullable()->change(); + $table->timestamp('end_date')->nullable()->change(); + $table->string('nom')->nullable()->change(); + $table->string('prenom')->nullable()->change(); + $table->string('code', 50)->nullable()->change(); + // FIXME : Pourquoi ca passe pas avec eloquent ???? + DB::statement( + 'ALTER TABLE `salaries` CHANGE COLUMN `magasin_id` `magasin_id` BIGINT(20) UNSIGNED NULL AFTER `service`;' + ); + }); + } +} diff --git a/resources/views/bo/salaries/index.blade.php b/resources/views/bo/salaries/index.blade.php new file mode 100644 index 00000000..d65b25dd --- /dev/null +++ b/resources/views/bo/salaries/index.blade.php @@ -0,0 +1,29 @@ +@extends('layouts.bo-layout') + +@section('content') +
+

{{ __('Paramètres Site Public') }}

+ @if (session('success')) + {{ session('success') }} + @endif +
+
+
+ {{ __('Importer des salariés') }} +
+ + @csrf + +
+
+
+@endsection diff --git a/resources/views/bo/settings.blade.php b/resources/views/bo/settings.blade.php index 8c8d253b..4d286e91 100644 --- a/resources/views/bo/settings.blade.php +++ b/resources/views/bo/settings.blade.php @@ -1,7 +1,7 @@ @extends('layouts.bo-layout') @section('content') -
+ @method('PUT') @csrf
@@ -22,30 +22,6 @@
@endif - {{--
- -
-
- -
-
- -
-
- -
--}}
@endsection - -{{-- devenu inutile puisque le swicth envoi de commande active en fait le champs order_unit, et rend oligatoire le champ reference - mais le champs sell unit reste un champs d'uvc qui peut prendre d'autres formes. -@section('scripts') - -@endsection ---}} diff --git a/resources/views/front/sable/layouts/footer.blade.php b/resources/views/front/sable/layouts/footer.blade.php index 9102c224..eb53b592 100644 --- a/resources/views/front/sable/layouts/footer.blade.php +++ b/resources/views/front/sable/layouts/footer.blade.php @@ -5,7 +5,7 @@