diff --git a/.github/ISSUE_TEMPLATE/bugs.md b/.github/ISSUE_TEMPLATE/bugs.md
index 4eacf5a90a..fb6ac6a092 100644
--- a/.github/ISSUE_TEMPLATE/bugs.md
+++ b/.github/ISSUE_TEMPLATE/bugs.md
@@ -8,7 +8,7 @@ assignees: ''
---
Olá e obrigado por nos ajudar a tornar o i-Educar um projeto mais estável. Não esqueça de revisar o nosso
-[guia de contribuição](https://github.com/portabilis/i-educar/blob/master/contributing.md) para saber melhor como colaborar com a nossa comunidade. Para reportar seu bug use o template abaixo:
+[guia de contribuição](https://github.com/portabilis/i-educar/blob/master/CONTRIBUTING.md) para saber melhor como colaborar com a nossa comunidade. Para reportar seu bug use o template abaixo:
**MENU:**
diff --git a/.github/ISSUE_TEMPLATE/outros.md b/.github/ISSUE_TEMPLATE/outros.md
index 0fffd4a0ca..fbe6a53a9d 100644
--- a/.github/ISSUE_TEMPLATE/outros.md
+++ b/.github/ISSUE_TEMPLATE/outros.md
@@ -8,7 +8,7 @@ assignees: ''
---
Olá e obrigado por nos ajudar a tornar o i-Educar um projeto melhor. Não esqueça de revisar o nosso
-[guia de contribuição](https://github.com/portabilis/i-educar/blob/master/contributing.md) para saber melhor como colaborar com a nossa comunidade. Você também pode usar o template abaixo para preencher sua issue:
+[guia de contribuição](https://github.com/portabilis/i-educar/blob/master/CONTRIBUTING.md) para saber melhor como colaborar com a nossa comunidade. Você também pode usar o template abaixo para preencher sua issue:
**CONTEXTO:**
diff --git a/.github/workflows/fixer.yml b/.github/workflows/fixer.yml
new file mode 100644
index 0000000000..52ffb14a5a
--- /dev/null
+++ b/.github/workflows/fixer.yml
@@ -0,0 +1,32 @@
+name: Fixer
+
+on:
+ push:
+ branches:
+ - main
+
+jobs:
+ build:
+ name: Style code fixer
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ token: ${{ secrets.ACTIONS_TOKEN }}
+
+ - uses: shivammathur/setup-php@v2
+ with:
+ php-version: '7.4'
+
+ - name: Composer
+ run: composer install
+
+ - name: Style code fixer
+ run: composer fix-style
+
+ - name: Commit
+ uses: stefanzweifel/git-auto-commit-action@v4
+ with:
+ commit_message: Style code
diff --git a/.gitignore b/.gitignore
index dd0517388f..ed088e2eaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ ieducar-*.tar.gz
.env
.env.host
.env.testing
-.php_cs.cache
+.php-cs-fixer.cache
docker-compose.override.yml
/node_modules
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
new file mode 100644
index 0000000000..4a0a373aa7
--- /dev/null
+++ b/.php-cs-fixer.php
@@ -0,0 +1,31 @@
+in([
+ 'app',
+ 'config',
+ 'database',
+ 'routes',
+ 'src',
+ 'tests',
+ ]);
+
+$config = new PhpCsFixer\Config();
+
+return $config->setRules([
+ '@PSR12' => true,
+ 'phpdoc_align' => [
+ 'align' => 'vertical'
+ ],
+ 'single_quote' => [
+ 'strings_containing_single_quote_chars' => true
+ ],
+ 'phpdoc_separation' => true,
+ 'blank_line_before_statement' => true,
+ 'array_syntax' => ['syntax' => 'short'],
+ 'no_extra_blank_lines' => true,
+ 'no_unused_imports' => true,
+ 'ordered_imports' => [
+ 'sort_algorithm' => 'alpha'
+ ]
+])->setFinder($finder);
diff --git a/.php_cs b/.php_cs
deleted file mode 100644
index 7598528953..0000000000
--- a/.php_cs
+++ /dev/null
@@ -1,38 +0,0 @@
-files()
- ->name('*.php')
- ->name('*.phpt')
- ->in('ieducar');
-
-return PhpCsFixer\Config::create()
- ->setRules([
- '@PSR2' => true,
- // All items of the @param, @throws, @return, @var, and @type phpdoc
- // tags must be aligned vertically.
- 'phpdoc_align' => [
- 'align' => 'vertical'
- ],
- // Convert double quotes to single quotes for simple strings.
- 'single_quote' => [
- 'strings_containing_single_quote_chars' => true
- ],
- // Group and seperate @phpdocs with empty lines.
- 'phpdoc_separation' => true,
- // An empty line feed should precede a return statement.
- 'blank_line_before_return' => true,
- // PHP arrays should use the PHP 5.4 short-syntax.
- 'array_syntax' => ['syntax' => 'short'],
- // Remove trailing whitespace at the end of blank lines.
- 'no_whitespace_in_blank_line' => true,
- // Removes extra empty lines.
- 'no_extra_consecutive_blank_lines' => true,
- // Unused use statements must be removed.
- 'no_unused_imports' => true,
- // Ordering use statements.
- 'ordered_imports' => [
- 'sort_algorithm' => 'alpha'
- ]
- ])
- ->setFinder($finder);
diff --git a/code-of-conduct.md b/CODE-OF-CONDUCT.md
similarity index 100%
rename from code-of-conduct.md
rename to CODE-OF-CONDUCT.md
diff --git a/contributing.md b/CONTRIBUTING.md
similarity index 100%
rename from contributing.md
rename to CONTRIBUTING.md
diff --git a/license b/LICENSE
similarity index 100%
rename from license
rename to LICENSE
diff --git a/readme.md b/README.md
similarity index 98%
rename from readme.md
rename to README.md
index 04f3d9665a..e47a6d75c0 100644
--- a/readme.md
+++ b/README.md
@@ -36,7 +36,7 @@ Acreditamos que o sucesso do projeto depende diretamente da interação clara e
objetiva entre os membros da Comunidade. Por isso, estamos definindo algumas
políticas para que estas interações nos ajudem a crescer juntos! Você pode
consultar algumas destas boas práticas em nosso [código de
-conduta](https://github.com/portabilis/i-educar/blob/master/code-of-conduct.md).
+conduta](https://github.com/portabilis/i-educar/blob/master/CODE-OF-CONDUCT.md).
Além disso, gostamos de meios de comunicação assíncrona, onde não há necessidade de
respostas em tempo real. Isso facilita a produtividade individual dos
@@ -53,8 +53,8 @@ comunidade i-Educar e não terá suporte da Portabilis - mantenedora do projeto.
## Como contribuir
-Contribuições são **super bem vindas**! Se você tem vontade de construir o
-i-Educar junto conosco, veja o nosso [guia de contribuição](./contributing.md)
+Contribuições são **super bem-vindas**! Se você tem vontade de construir o
+i-Educar junto conosco, veja o nosso [guia de contribuição](./CONTRIBUTING.md)
onde explicamos detalhadamente como trabalhamos e de que formas você pode nos
ajudar a alcançar nossos objetivos.
diff --git a/SECURITY.md b/SECURITY.md
index 106c091478..1ee0e6728c 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,4 +2,4 @@
## Reporting a Vulnerability
-Please report security issues to `eder@portabilis.com.br`
+Please report security issues to `security@portabilis.com.br`
diff --git a/app/Console/Commands/DisableUsersWithAccessExpired.php b/app/Console/Commands/DisableUsersWithAccessExpired.php
index 7d16734dd3..2f5c682591 100644
--- a/app/Console/Commands/DisableUsersWithAccessExpired.php
+++ b/app/Console/Commands/DisableUsersWithAccessExpired.php
@@ -42,6 +42,7 @@ public function handle()
{
$job = new BatchDisableUsersWithDaysGoneSinceLastAccess(DB::getDefaultConnection());
app(Dispatcher::class)->dispatch($job);
+
return 0;
}
}
diff --git a/app/Console/Commands/LegacyCreateTestsCommand.php b/app/Console/Commands/LegacyCreateTestsCommand.php
index 520adb2497..1e9814bacc 100644
--- a/app/Console/Commands/LegacyCreateTestsCommand.php
+++ b/app/Console/Commands/LegacyCreateTestsCommand.php
@@ -74,6 +74,7 @@ public function handle()
$this->warn(
"Teste {$router['className']} criado para a rota {$router['route']} já criado ou houve falha"
);
+
continue;
}
diff --git a/app/Console/Commands/UpdateDisciplinesCommand.php b/app/Console/Commands/UpdateDisciplinesCommand.php
index 4369cfcddd..62bbca6445 100644
--- a/app/Console/Commands/UpdateDisciplinesCommand.php
+++ b/app/Console/Commands/UpdateDisciplinesCommand.php
@@ -55,7 +55,7 @@ private function setCopiers(MoveDisciplineDataService $service)
}
foreach ($copiers as $copier) {
- $service->setMoveDataService(new $copier);
+ $service->setMoveDataService(new $copier());
}
}
}
diff --git a/app/Contracts/AssetServiceContract.php b/app/Contracts/AssetServiceContract.php
index 3b00872236..75175b62fa 100644
--- a/app/Contracts/AssetServiceContract.php
+++ b/app/Contracts/AssetServiceContract.php
@@ -7,9 +7,9 @@ interface AssetServiceContract
/**
* AssetServiceContract constructor.
*
- * @param string $version
+ * @param string $version
* @param bool|null $secure
- * @param bool $automatic_versioning
+ * @param bool $automatic_versioning
*/
public function __construct(string $version, ?bool $secure = null, bool $automatic_versioning = false);
@@ -18,14 +18,14 @@ public function __construct(string $version, ?bool $secure = null, bool $automat
*
* @return ?string
*/
- public function getVersion() : ?string;
+ public function getVersion(): ?string;
/**
* Get assets version number.
*
* @return bool
*/
- public function isAutomaticVersioning() : bool;
+ public function isAutomaticVersioning(): bool;
/**
* Get secure option.
@@ -37,9 +37,10 @@ public function getSecure(): ?bool;
/**
* Generate an asset path with version parameter for the application.
*
- * @param string $path
+ * @param string $path
* @param bool|null $secure
+ *
* @return string
*/
- public function get(string $path, bool $secure = null) : string;
+ public function get(string $path, bool $secure = null): string;
}
diff --git a/app/Events/NotificationEvent.php b/app/Events/NotificationEvent.php
index d81f2ddb23..edd6edf79d 100644
--- a/app/Events/NotificationEvent.php
+++ b/app/Events/NotificationEvent.php
@@ -11,7 +11,9 @@
class NotificationEvent implements ShouldBroadcast
{
- use Dispatchable, InteractsWithSockets, SerializesModels;
+ use Dispatchable;
+ use InteractsWithSockets;
+ use SerializesModels;
/**
* @var Notification
diff --git a/app/Events/RegistrationEvent.php b/app/Events/RegistrationEvent.php
index 830631131e..323f30fafe 100755
--- a/app/Events/RegistrationEvent.php
+++ b/app/Events/RegistrationEvent.php
@@ -8,7 +8,9 @@
class RegistrationEvent
{
- use Dispatchable, InteractsWithSockets, SerializesModels;
+ use Dispatchable;
+ use InteractsWithSockets;
+ use SerializesModels;
public $registration;
diff --git a/app/Events/TransferEvent.php b/app/Events/TransferEvent.php
index 87b1910265..0f6e4cb806 100644
--- a/app/Events/TransferEvent.php
+++ b/app/Events/TransferEvent.php
@@ -9,7 +9,9 @@
class TransferEvent
{
- use Dispatchable, InteractsWithSockets, SerializesModels;
+ use Dispatchable;
+ use InteractsWithSockets;
+ use SerializesModels;
/**
* @var LegacyTransferRequest
diff --git a/app/Exports/StudentsExport.php b/app/Exports/StudentsExport.php
index 812f330733..2cbf15c5e9 100644
--- a/app/Exports/StudentsExport.php
+++ b/app/Exports/StudentsExport.php
@@ -40,11 +40,13 @@ public function map($student): array
case GuardianType::FATHER:
$guardianName = $fatherName;
$guardianDocument = $fatherDocument;
+
break;
case GuardianType::MOTHER:
$guardianName = $motherName;
$guardianDocument = $motherDocument;
+
break;
case GuardianType::BOTH:
@@ -69,6 +71,7 @@ public function map($student): array
$guardianName = join(', ', $names);
$guardianDocument = join(', ', $documents);
+
break;
}
diff --git a/app/Facades/Asset.php b/app/Facades/Asset.php
index abd293ec02..fbff9ea109 100644
--- a/app/Facades/Asset.php
+++ b/app/Facades/Asset.php
@@ -2,8 +2,8 @@
namespace App\Facades;
-use Illuminate\Support\Facades\Facade;
use App\Contracts\AssetServiceContract;
+use Illuminate\Support\Facades\Facade;
class Asset extends Facade
{
diff --git a/app/Http/Controllers/AccessLevelController.php b/app/Http/Controllers/AccessLevelController.php
index 6d0bfc37e2..4713752efa 100644
--- a/app/Http/Controllers/AccessLevelController.php
+++ b/app/Http/Controllers/AccessLevelController.php
@@ -4,7 +4,6 @@
use App\Menu;
use App\Models\LegacyUserType;
-use App\Services\CacheManager;
use App\Services\MenuCacheService;
use App\User;
use Exception;
@@ -12,7 +11,6 @@
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Cache;
use Illuminate\View\View;
use Throwable;
@@ -61,6 +59,7 @@ private function store(Request $request, LegacyUserType $userType)
app(MenuCacheService::class)->flushMenuTag($userType->cod_tipo_usuario);
}
+
/**
* @param Request $request
*
diff --git a/app/Http/Controllers/Api/EmployeeWithdrawalController.php b/app/Http/Controllers/Api/EmployeeWithdrawalController.php
index df940d965c..0aefeac9b9 100644
--- a/app/Http/Controllers/Api/EmployeeWithdrawalController.php
+++ b/app/Http/Controllers/Api/EmployeeWithdrawalController.php
@@ -1,4 +1,6 @@
-findOrFail($id);
- $employeeWithdrawal->update(['data_exclusao' => now(),'ativo' => 0]);
+ $employeeWithdrawal->update(['data_exclusao' => now(), 'ativo' => 0]);
} catch (Exception $exception) {
return response()->json(
[
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 470b47ba7d..c00fe5c086 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -9,9 +9,6 @@
class LoginController extends Controller
{
- protected int $maxAttempts = 2;
- protected int $decayMinutes = 1;
-
/*
|--------------------------------------------------------------------------
| Login Controller
@@ -25,6 +22,9 @@ class LoginController extends Controller
use AuthenticatesUsers;
+ protected int $maxAttempts = 2;
+ protected int $decayMinutes = 1;
+
/**
* Where to redirect users after login.
*
@@ -70,7 +70,7 @@ public function validateLogin(Request $request)
$request->validate([
$this->username() => 'required|string',
'password' => 'required|string',
- 'grecaptcha' => [new ReCaptchaV3],
+ 'grecaptcha' => [new ReCaptchaV3()],
]);
}
}
diff --git a/app/Http/Controllers/BatchEnrollmentController.php b/app/Http/Controllers/BatchEnrollmentController.php
index 68a7f63962..0326079503 100644
--- a/app/Http/Controllers/BatchEnrollmentController.php
+++ b/app/Http/Controllers/BatchEnrollmentController.php
@@ -200,8 +200,8 @@ protected function setMessages(
?MessageBag $success,
string $type = 'enroll'
) {
- $fail = $fail ?? new MessageBag;
- $success = $success ?? new MessageBag;
+ $fail = $fail ?? new MessageBag();
+ $success = $success ?? new MessageBag();
switch ($type) {
case 'enroll':
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index e8baa730c6..9c331a974d 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -14,7 +14,9 @@
class Controller extends BaseController
{
- use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+ use AuthorizesRequests;
+ use DispatchesJobs;
+ use ValidatesRequests;
protected $beta = false;
diff --git a/app/Http/Controllers/Educacenso/ValidatorController.php b/app/Http/Controllers/Educacenso/ValidatorController.php
index 45f4f8213d..4798304437 100644
--- a/app/Http/Controllers/Educacenso/ValidatorController.php
+++ b/app/Http/Controllers/Educacenso/ValidatorController.php
@@ -7,7 +7,7 @@
class ValidatorController extends Controller
{
- const VALIDATORS = [
+ public const VALIDATORS = [
'nome' => 'iEducar\Modules\Educacenso\Validator\NameValidator',
'data-nascimento' => 'iEducar\Modules\Educacenso\Validator\BirthDateValidator',
'certidao-nascimento' => 'iEducar\Modules\Educacenso\Validator\BirthCertificateValidator',
diff --git a/app/Http/Controllers/FileController.php b/app/Http/Controllers/FileController.php
index 457b9b7493..9a7e915977 100644
--- a/app/Http/Controllers/FileController.php
+++ b/app/Http/Controllers/FileController.php
@@ -11,6 +11,7 @@ class FileController extends Controller
public function upload(FileRequest $request, FileService $fileService)
{
$file = $request->file('file');
+
try {
$url = $fileService->upload($file);
} catch (Throwable $e) {
diff --git a/app/Http/Controllers/ReleasePeriodController.php b/app/Http/Controllers/ReleasePeriodController.php
index 11c27fdc58..34ba85de39 100644
--- a/app/Http/Controllers/ReleasePeriodController.php
+++ b/app/Http/Controllers/ReleasePeriodController.php
@@ -18,7 +18,7 @@
class ReleasePeriodController extends Controller
{
- const INFO_MESSAGE = 'Atenção! Este recurso foi atualizado e agora funciona diferente!
+ public const INFO_MESSAGE = 'Atenção! Este recurso foi atualizado e agora funciona diferente!
Cadastre os períodos que deseja liberar o lançamento de notas e faltas por etapa, podendo criar mais de 1 período de lançamento em todas as etapas';
public function __construct()
diff --git a/app/Jobs/BatchExemptionJob.php b/app/Jobs/BatchExemptionJob.php
index 24188e2e7d..4789ced37f 100644
--- a/app/Jobs/BatchExemptionJob.php
+++ b/app/Jobs/BatchExemptionJob.php
@@ -15,7 +15,11 @@
class BatchExemptionJob implements ShouldQueue
{
- use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, ShouldNotificate;
+ use Dispatchable;
+ use InteractsWithQueue;
+ use Queueable;
+ use SerializesModels;
+ use ShouldNotificate;
/**
* @var array
@@ -67,6 +71,7 @@ public function handle()
DB::rollBack();
$this->notificateError();
+
throw $exception;
}
diff --git a/app/Jobs/CheckInstitutionConfigurationsJob.php b/app/Jobs/CheckInstitutionConfigurationsJob.php
index 5101c00f02..ceb1d517e3 100644
--- a/app/Jobs/CheckInstitutionConfigurationsJob.php
+++ b/app/Jobs/CheckInstitutionConfigurationsJob.php
@@ -16,7 +16,10 @@
class CheckInstitutionConfigurationsJob implements ShouldQueue
{
- use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+ use Dispatchable;
+ use InteractsWithQueue;
+ use Queueable;
+ use SerializesModels;
/**
* @var string
diff --git a/app/Jobs/DatabaseToCsvExporter.php b/app/Jobs/DatabaseToCsvExporter.php
index 4bdac2f5fa..74c41bc5d6 100644
--- a/app/Jobs/DatabaseToCsvExporter.php
+++ b/app/Jobs/DatabaseToCsvExporter.php
@@ -17,7 +17,10 @@
class DatabaseToCsvExporter implements ShouldQueue
{
- use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+ use Dispatchable;
+ use InteractsWithQueue;
+ use Queueable;
+ use SerializesModels;
/**
* @var int
diff --git a/app/Jobs/EducacensoImportJob.php b/app/Jobs/EducacensoImportJob.php
index 79c8404758..30c97602ef 100644
--- a/app/Jobs/EducacensoImportJob.php
+++ b/app/Jobs/EducacensoImportJob.php
@@ -15,7 +15,10 @@
class EducacensoImportJob implements ShouldQueue
{
- use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+ use Dispatchable;
+ use InteractsWithQueue;
+ use Queueable;
+ use SerializesModels;
/**
* @var EducacensoImportModel
@@ -73,6 +76,7 @@ public function handle()
$importService->adaptData();
} catch (Throwable $e) {
DB::rollBack();
+
throw $e;
}
diff --git a/app/Jobs/TenantsJob.php b/app/Jobs/TenantsJob.php
index 54a477a28f..c658f9b134 100644
--- a/app/Jobs/TenantsJob.php
+++ b/app/Jobs/TenantsJob.php
@@ -11,7 +11,11 @@
class TenantsJob implements ShouldQueue
{
- use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, Connections;
+ use Dispatchable;
+ use InteractsWithQueue;
+ use Queueable;
+ use SerializesModels;
+ use Connections;
/**
* @var int
diff --git a/app/Mail/ErrorTrackerMail.php b/app/Mail/ErrorTrackerMail.php
index 6a1632460b..934bc0416b 100644
--- a/app/Mail/ErrorTrackerMail.php
+++ b/app/Mail/ErrorTrackerMail.php
@@ -10,7 +10,8 @@
class ErrorTrackerMail extends Mailable implements ShouldQueue
{
- use Queueable, SerializesModels;
+ use Queueable;
+ use SerializesModels;
/**
* @var Throwable
diff --git a/app/Menu.php b/app/Menu.php
index 9fd9e4a56b..fe5a5777d6 100644
--- a/app/Menu.php
+++ b/app/Menu.php
@@ -2,7 +2,6 @@
namespace App;
-use App\Services\MenuCacheService;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/City.php b/app/Models/City.php
index 784dc8cc71..38d80e749b 100644
--- a/app/Models/City.php
+++ b/app/Models/City.php
@@ -12,7 +12,8 @@
class City extends Model
{
- use DateSerializer, HasIbgeCode;
+ use DateSerializer;
+ use HasIbgeCode;
/**
* @var array
diff --git a/app/Models/Country.php b/app/Models/Country.php
index 3ee619e710..acca712e1d 100644
--- a/app/Models/Country.php
+++ b/app/Models/Country.php
@@ -9,9 +9,10 @@
class Country extends Model
{
- use DateSerializer, HasIbgeCode;
+ use DateSerializer;
+ use HasIbgeCode;
- const BRASIL = 45;
+ public const BRASIL = 45;
/**
* @var array
diff --git a/app/Models/District.php b/app/Models/District.php
index bc4e8455cd..ac758754da 100644
--- a/app/Models/District.php
+++ b/app/Models/District.php
@@ -9,7 +9,8 @@
class District extends Model
{
- use DateSerializer, HasIbgeCode;
+ use DateSerializer;
+ use HasIbgeCode;
/**
* @var array
diff --git a/app/Models/Educacenso/Registro20.php b/app/Models/Educacenso/Registro20.php
index 8f2eab4441..062c19edd8 100644
--- a/app/Models/Educacenso/Registro20.php
+++ b/app/Models/Educacenso/Registro20.php
@@ -289,15 +289,19 @@ public function getTipoMediacaoValidaParaModalidadeCurso()
switch ($this->modalidadeCurso) {
case ModalidadeCurso::ENSINO_REGULAR:
return "{$tiposMediacao[App_Model_TipoMediacaoDidaticoPedagogico::PRESENCIAL]} ou {$tiposMediacao[App_Model_TipoMediacaoDidaticoPedagogico::EDUCACAO_A_DISTANCIA]}";
+
break;
case ModalidadeCurso::EDUCACAO_ESPECIAL:
return "{$tiposMediacao[App_Model_TipoMediacaoDidaticoPedagogico::PRESENCIAL]} ou {$tiposMediacao[App_Model_TipoMediacaoDidaticoPedagogico::SEMIPRESENCIAL]}";
+
break;
case ModalidadeCurso::EJA:
return "{$tiposMediacao[App_Model_TipoMediacaoDidaticoPedagogico::PRESENCIAL]}, {$tiposMediacao[App_Model_TipoMediacaoDidaticoPedagogico::SEMIPRESENCIAL]} ou {$tiposMediacao[App_Model_TipoMediacaoDidaticoPedagogico::EDUCACAO_A_DISTANCIA]}";
+
break;
case ModalidadeCurso::EDUCACAO_PROFISSIONAL:
return "{$tiposMediacao[App_Model_TipoMediacaoDidaticoPedagogico::PRESENCIAL]} ou {$tiposMediacao[App_Model_TipoMediacaoDidaticoPedagogico::EDUCACAO_A_DISTANCIA]}";
+
break;
}
}
@@ -312,6 +316,7 @@ public function getForbiddenDisciplines()
case 18:
case 69:
return [1, 2, 4, 17, 25, 29];
+
break;
case 19:
case 20:
@@ -319,15 +324,18 @@ public function getForbiddenDisciplines()
case 41:
case 70:
return [17, 25, 28];
+
break;
case 23:
case 22:
case 56:
case 72:
return [17, 25];
+
break;
case 73:
return [25];
+
break;
case 25:
case 26:
@@ -336,6 +344,7 @@ public function getForbiddenDisciplines()
case 29:
case 71:
return [5, 17, 25, 28];
+
break;
case 30:
case 31:
@@ -345,21 +354,25 @@ public function getForbiddenDisciplines()
case 74:
case 67:
return [5, 25, 28];
+
break;
case 35:
case 36:
case 37:
case 38:
return [17, 28];
+
break;
case 39:
case 40:
case 64:
case 68:
return [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 23, 25, 26, 27, 28, 29, 30, 31, 99];
+
break;
default:
return [];
+
break;
}
}
diff --git a/app/Models/Educacenso/Registro30.php b/app/Models/Educacenso/Registro30.php
index 039d9cdc6d..eb5d485617 100644
--- a/app/Models/Educacenso/Registro30.php
+++ b/app/Models/Educacenso/Registro30.php
@@ -6,9 +6,9 @@
class Registro30 implements RegistroEducacenso
{
- const TIPO_MANAGER = 'manager';
- const TIPO_TEACHER = 'teacher';
- const TIPO_STUDENT = 'student';
+ public const TIPO_MANAGER = 'manager';
+ public const TIPO_TEACHER = 'teacher';
+ public const TIPO_STUDENT = 'student';
public $tipos = [];
diff --git a/app/Models/EducacensoDegree.php b/app/Models/EducacensoDegree.php
index f2c5c6e36f..0f021ef5c3 100644
--- a/app/Models/EducacensoDegree.php
+++ b/app/Models/EducacensoDegree.php
@@ -16,10 +16,10 @@ class EducacensoDegree extends Model
*/
protected $primaryKey = 'id';
- const GRAU_TECNOLOGICO = 1;
- const GRAU_LICENCIATURA = 2;
- const GRAU_BACHARELADO = 3;
- const GRAU_SEQUENCIAL = 4;
+ public const GRAU_TECNOLOGICO = 1;
+ public const GRAU_LICENCIATURA = 2;
+ public const GRAU_BACHARELADO = 3;
+ public const GRAU_SEQUENCIAL = 4;
protected $fillable = [
'curso_id',
diff --git a/app/Models/Exporter/Export.php b/app/Models/Exporter/Export.php
index b6a397563c..3b922549b2 100644
--- a/app/Models/Exporter/Export.php
+++ b/app/Models/Exporter/Export.php
@@ -128,11 +128,13 @@ public function applyFilters(Builder $query)
switch ($operator) {
case '=':
$query->whereRaw("{$column} {$operator} {$value}");
+
break;
case 'in':
$value = implode(', ', $value);
$query->whereRaw("{$column} {$operator} ({$value})");
+
break;
}
}
diff --git a/app/Models/Gender.php b/app/Models/Gender.php
index 1887f791bb..41ac1c4650 100644
--- a/app/Models/Gender.php
+++ b/app/Models/Gender.php
@@ -6,8 +6,8 @@
class Gender implements Enum
{
- const MALE = 1;
- const FEMALE = 2;
+ public const MALE = 1;
+ public const FEMALE = 2;
public function getDescriptiveValues(): array
{
diff --git a/app/Models/GuardianType.php b/app/Models/GuardianType.php
index b4b2b342c9..579bbe43d1 100644
--- a/app/Models/GuardianType.php
+++ b/app/Models/GuardianType.php
@@ -6,10 +6,10 @@
class GuardianType implements Enum
{
- const FATHER = 1;
- const MOTHER = 2;
- const BOTH = 3;
- const OTHER = 4;
+ public const FATHER = 1;
+ public const MOTHER = 2;
+ public const BOTH = 3;
+ public const OTHER = 4;
public function getDescriptiveValues(): array
{
diff --git a/app/Models/IeducarStudent.php b/app/Models/IeducarStudent.php
index 5a48e57bb7..e736ddd4a1 100644
--- a/app/Models/IeducarStudent.php
+++ b/app/Models/IeducarStudent.php
@@ -8,5 +8,6 @@
class IeducarStudent extends Model
{
use HasFactory;
+
protected $table = 'pmieducar.aluno';
}
diff --git a/app/Models/Individual.php b/app/Models/Individual.php
index 4a926d5a7a..dc77c99056 100644
--- a/app/Models/Individual.php
+++ b/app/Models/Individual.php
@@ -35,7 +35,7 @@ class Individual extends Model
*/
public function getGenderDescriptionAttribute()
{
- return (new Gender)->getDescriptiveValues()[$this->gender];
+ return (new Gender())->getDescriptiveValues()[$this->gender];
}
/**
@@ -43,7 +43,7 @@ public function getGenderDescriptionAttribute()
*/
public function getNationalityDescriptionAttribute()
{
- return (new Nationality)->getDescriptiveValues()[$this->nationality];
+ return (new Nationality())->getDescriptiveValues()[$this->nationality];
}
/**
@@ -51,7 +51,7 @@ public function getNationalityDescriptionAttribute()
*/
public function getRegistryOriginDescriptionAttribute()
{
- return (new RegistryOrigin)->getDescriptiveValues()[$this->registry_origin];
+ return (new RegistryOrigin())->getDescriptiveValues()[$this->registry_origin];
}
/**
@@ -59,7 +59,7 @@ public function getRegistryOriginDescriptionAttribute()
*/
public function getLocalizationZoneDescriptionAttribute()
{
- return (new LocalizationZone)->getDescriptiveValues()[$this->localization_zone];
+ return (new LocalizationZone())->getDescriptiveValues()[$this->localization_zone];
}
/**
diff --git a/app/Models/LegacyActiveLooking.php b/app/Models/LegacyActiveLooking.php
index 338f9d0514..ddcb236f84 100644
--- a/app/Models/LegacyActiveLooking.php
+++ b/app/Models/LegacyActiveLooking.php
@@ -10,7 +10,7 @@
* Class LegacyActiveLooking
*
* @property LegacyRegistration $registration
- * @property int id
+ * @property int id
*/
class LegacyActiveLooking extends Model
{
diff --git a/app/Models/LegacyCourse.php b/app/Models/LegacyCourse.php
index 040bfe0904..528aa6f196 100644
--- a/app/Models/LegacyCourse.php
+++ b/app/Models/LegacyCourse.php
@@ -10,8 +10,8 @@
/**
* LegacyCourse
*
- * @property string $name Nome do curso
- * @property LegacyGrade[] grades
+ * @property string $name
+ * @property LegacyGrade[] $grades
*/
class LegacyCourse extends Model
{
diff --git a/app/Models/LegacyEvaluationRule.php b/app/Models/LegacyEvaluationRule.php
index 1d2efc53dc..c3142b2043 100644
--- a/app/Models/LegacyEvaluationRule.php
+++ b/app/Models/LegacyEvaluationRule.php
@@ -8,13 +8,13 @@
class LegacyEvaluationRule extends Model
{
- const PARALLEL_REMEDIAL_NONE = 0;
- const PARALLEL_REMEDIAL_PER_STAGE = 1;
- const PARALLEL_REMEDIAL_PER_SPECIFIC_STAGE = 2;
+ public const PARALLEL_REMEDIAL_NONE = 0;
+ public const PARALLEL_REMEDIAL_PER_STAGE = 1;
+ public const PARALLEL_REMEDIAL_PER_SPECIFIC_STAGE = 2;
- const PARALLEL_REMEDIAL_REPLACE_SCORE = 1;
- const PARALLEL_REMEDIAL_AVERAGE_SCORE = 2;
- const PARALLEL_REMEDIAL_SUM_SCORE = 3;
+ public const PARALLEL_REMEDIAL_REPLACE_SCORE = 1;
+ public const PARALLEL_REMEDIAL_AVERAGE_SCORE = 2;
+ public const PARALLEL_REMEDIAL_SUM_SCORE = 3;
/**
* @var string
diff --git a/app/Models/LegacyLevel.php b/app/Models/LegacyLevel.php
index e5fb33c810..3d355e76c3 100644
--- a/app/Models/LegacyLevel.php
+++ b/app/Models/LegacyLevel.php
@@ -8,7 +8,6 @@
*/
class LegacyLevel extends LegacyGrade
{
-
/**
* @var string
*/
diff --git a/app/Models/LegacyPersonAddress.php b/app/Models/LegacyPersonAddress.php
index 5a995946b3..bc44a93cf0 100644
--- a/app/Models/LegacyPersonAddress.php
+++ b/app/Models/LegacyPersonAddress.php
@@ -12,7 +12,6 @@
*/
class LegacyPersonAddress extends Model
{
-
/**
* @var string
*/
diff --git a/app/Models/LegacyRegistration.php b/app/Models/LegacyRegistration.php
index c63c635481..f4e8c235de 100644
--- a/app/Models/LegacyRegistration.php
+++ b/app/Models/LegacyRegistration.php
@@ -12,15 +12,14 @@
/**
* LegacyRegistration
*
- * @property int $id
- * @property boolean isTransferred
- * @property boolean isAbandoned
- * @property boolean isCanceled
- * @property LegacyStudentAbsence studentAbsence
- * @property LegacyStudentScore studentScore
- * @property LegacyStudentDescriptive studentDescriptive
- * @property LegacyCourse course
- *
+ * @property integer $id
+ * @property boolean $isTransferred
+ * @property boolean $isAbandoned
+ * @property boolean $isCanceled
+ * @property LegacyStudentAbsence $studentAbsence
+ * @property LegacyStudentScore $studentScore
+ * @property LegacyStudentDescriptive $studentDescriptive
+ * @property LegacyCourse $course
*/
class LegacyRegistration extends Model
{
@@ -255,6 +254,6 @@ public function getEvaluationRule()
*/
public function getStatusDescriptionAttribute()
{
- return (new RegistrationStatus)->getDescriptiveValues()[(int) $this->aprovado];
+ return (new RegistrationStatus())->getDescriptiveValues()[(int) $this->aprovado];
}
}
diff --git a/app/Models/LegacySchoolClass.php b/app/Models/LegacySchoolClass.php
index 1288e69a06..e5efb03f9c 100644
--- a/app/Models/LegacySchoolClass.php
+++ b/app/Models/LegacySchoolClass.php
@@ -314,7 +314,7 @@ public function denyEnrollmentsWhenNoVacancy()
return true;
}
- return (boolean) $schoolGrade->bloquear_enturmacao_sem_vagas;
+ return (bool) $schoolGrade->bloquear_enturmacao_sem_vagas;
}
/**
diff --git a/app/Models/LegacyUserType.php b/app/Models/LegacyUserType.php
index e210cbd5a1..3dbb3f31d3 100644
--- a/app/Models/LegacyUserType.php
+++ b/app/Models/LegacyUserType.php
@@ -21,14 +21,14 @@
*/
class LegacyUserType extends Model
{
- const LEVEL_ADMIN = 1;
- const LEVEL_INSTITUTIONAL = 2;
- const LEVEL_SCHOOLING = 4;
- const LEVEL_LIBRARY = 8;
-
- const CAN_VIEW = 1;
- const CAN_MODIFY = 2;
- const CAN_REMOVE = 3;
+ public const LEVEL_ADMIN = 1;
+ public const LEVEL_INSTITUTIONAL = 2;
+ public const LEVEL_SCHOOLING = 4;
+ public const LEVEL_LIBRARY = 8;
+
+ public const CAN_VIEW = 1;
+ public const CAN_MODIFY = 2;
+ public const CAN_REMOVE = 3;
/**
* @var string
diff --git a/app/Models/LocalizationZone.php b/app/Models/LocalizationZone.php
index 63911ea86b..5d09312f6e 100644
--- a/app/Models/LocalizationZone.php
+++ b/app/Models/LocalizationZone.php
@@ -6,8 +6,8 @@
class LocalizationZone implements Enum
{
- const URBAN = 1;
- const RURAL = 2;
+ public const URBAN = 1;
+ public const RURAL = 2;
public function getDescriptiveValues(): array
{
diff --git a/app/Models/Nationality.php b/app/Models/Nationality.php
index 5f42e03e83..0a05ce3fd7 100644
--- a/app/Models/Nationality.php
+++ b/app/Models/Nationality.php
@@ -6,9 +6,9 @@
class Nationality implements Enum
{
- const BRAZILIAN = 1;
- const NATURALIZED_BRAZILIAN = 2;
- const FOREIGN = 3;
+ public const BRAZILIAN = 1;
+ public const NATURALIZED_BRAZILIAN = 2;
+ public const FOREIGN = 3;
public function getDescriptiveValues(): array
{
diff --git a/app/Models/NotificationType.php b/app/Models/NotificationType.php
index ec597ae660..94738e314f 100644
--- a/app/Models/NotificationType.php
+++ b/app/Models/NotificationType.php
@@ -6,10 +6,10 @@
class NotificationType extends Model
{
- const TRANSFER = 1;
- const OTHER = 2;
- const EXPORT_STUDENT = 3;
- const EXPORT_TEACHER = 4;
+ public const TRANSFER = 1;
+ public const OTHER = 2;
+ public const EXPORT_STUDENT = 3;
+ public const EXPORT_TEACHER = 4;
/**
* @var string
diff --git a/app/Models/Person.php b/app/Models/Person.php
index b59cff9015..320026fcd2 100644
--- a/app/Models/Person.php
+++ b/app/Models/Person.php
@@ -26,12 +26,12 @@ public function updatedBy()
public function getTypeDescriptionAttribute()
{
- return (new PersonType)->getDescriptiveValues()[(int) $this->type];
+ return (new PersonType())->getDescriptiveValues()[(int) $this->type];
}
public function getRegistryOriginDescriptionAttribute()
{
- return (new RegistryOrigin)->getDescriptiveValues()[(int) $this->registry_origin];
+ return (new RegistryOrigin())->getDescriptiveValues()[(int) $this->registry_origin];
}
/**
diff --git a/app/Models/PersonType.php b/app/Models/PersonType.php
index 1eb2361d31..e136ef8a8f 100644
--- a/app/Models/PersonType.php
+++ b/app/Models/PersonType.php
@@ -6,8 +6,8 @@
class PersonType implements Enum
{
- const INDIVIDUAL = 1;
- const ORGANIZATION = 2;
+ public const INDIVIDUAL = 1;
+ public const ORGANIZATION = 2;
public function getDescriptiveValues(): array
{
diff --git a/app/Models/Registration.php b/app/Models/Registration.php
index bb7984f641..a00ad344a0 100644
--- a/app/Models/Registration.php
+++ b/app/Models/Registration.php
@@ -16,7 +16,8 @@
*/
class Registration extends Model
{
- use RegistrationScopes, SoftDeletes;
+ use RegistrationScopes;
+ use SoftDeletes;
/**
* @param Builder $query
@@ -41,6 +42,6 @@ public function student()
*/
public function getStatusDescriptionAttribute()
{
- return (new RegistrationStatus)->getDescriptiveValues()[(int) $this->status];
+ return (new RegistrationStatus())->getDescriptiveValues()[(int) $this->status];
}
}
diff --git a/app/Models/RegistrationStatus.php b/app/Models/RegistrationStatus.php
index 77d39e240c..db2d701ff7 100644
--- a/app/Models/RegistrationStatus.php
+++ b/app/Models/RegistrationStatus.php
@@ -6,20 +6,20 @@
class RegistrationStatus implements Enum
{
- const APPROVED = 1;
- const REPROVED = 2;
- const ONGOING = 3;
- const TRANSFERRED = 4;
- const RECLASSIFIED = 5;
- const ABANDONED = 6;
- const IN_EXAM = 7;
- const APPROVED_PAST_EXAM = 8;
- const APPROVED_WITHOUT_EXAM = 10;
- const PRE_REGISTRATION = 11;
- const APPROVED_WITH_DEPENDENCY = 12;
- const APPROVED_BY_BOARD = 13;
- const REPROVED_BY_ABSENCE = 14;
- const DECEASED = 15;
+ public const APPROVED = 1;
+ public const REPROVED = 2;
+ public const ONGOING = 3;
+ public const TRANSFERRED = 4;
+ public const RECLASSIFIED = 5;
+ public const ABANDONED = 6;
+ public const IN_EXAM = 7;
+ public const APPROVED_PAST_EXAM = 8;
+ public const APPROVED_WITHOUT_EXAM = 10;
+ public const PRE_REGISTRATION = 11;
+ public const APPROVED_WITH_DEPENDENCY = 12;
+ public const APPROVED_BY_BOARD = 13;
+ public const REPROVED_BY_ABSENCE = 14;
+ public const DECEASED = 15;
public function getDescriptiveValues(): array
{
diff --git a/app/Models/RegistryOrigin.php b/app/Models/RegistryOrigin.php
index 4b46bf6c31..e10c3caa78 100644
--- a/app/Models/RegistryOrigin.php
+++ b/app/Models/RegistryOrigin.php
@@ -6,10 +6,10 @@
class RegistryOrigin implements Enum
{
- const MIGRATION = 1;
- const REGISTRATION = 2;
- const UNIFICATION = 3;
- const OTHER = 4;
+ public const MIGRATION = 1;
+ public const REGISTRATION = 2;
+ public const UNIFICATION = 3;
+ public const OTHER = 4;
public function getDescriptiveValues(): array
{
diff --git a/app/Models/SchoolHistoryStatus.php b/app/Models/SchoolHistoryStatus.php
index a60155888c..50dfe6b8a6 100644
--- a/app/Models/SchoolHistoryStatus.php
+++ b/app/Models/SchoolHistoryStatus.php
@@ -6,15 +6,15 @@
class SchoolHistoryStatus implements Enum
{
- const APPROVED = 1;
- const REPROVED = 2;
- const ONGOING = 3;
- const TRANSFERRED = 4;
- const RECLASSIFIED = 5;
- const ABANDONED = 6;
- const APPROVED_WITH_DEPENDENCY = 12;
- const APPROVED_BY_BOARD = 13;
- const REPROVED_BY_ABSENCE = 14;
+ public const APPROVED = 1;
+ public const REPROVED = 2;
+ public const ONGOING = 3;
+ public const TRANSFERRED = 4;
+ public const RECLASSIFIED = 5;
+ public const ABANDONED = 6;
+ public const APPROVED_WITH_DEPENDENCY = 12;
+ public const APPROVED_BY_BOARD = 13;
+ public const REPROVED_BY_ABSENCE = 14;
public function getDescriptiveValues(): array
{
diff --git a/app/Models/State.php b/app/Models/State.php
index 34fcfda534..ff1831950a 100644
--- a/app/Models/State.php
+++ b/app/Models/State.php
@@ -11,7 +11,8 @@
class State extends Model
{
- use DateSerializer, HasIbgeCode;
+ use DateSerializer;
+ use HasIbgeCode;
/**
* @var array
diff --git a/app/Models/Student.php b/app/Models/Student.php
index e12f070e5b..55d7e1e3c7 100644
--- a/app/Models/Student.php
+++ b/app/Models/Student.php
@@ -64,17 +64,17 @@ public function getGuardianTypeAttribute($value)
public function getGuardianTypeDescriptionAttribute()
{
- return (new GuardianType)->getDescriptiveValues()[(int) $this->guardian_type];
+ return (new GuardianType())->getDescriptiveValues()[(int) $this->guardian_type];
}
public function getTransportationProviderDescriptionAttribute()
{
- return (new TransportationProvider)->getDescriptiveValues()[(int) $this->transportation_provider];
+ return (new TransportationProvider())->getDescriptiveValues()[(int) $this->transportation_provider];
}
public function getTransportationVehicleTypeDescriptionAttribute()
{
- return (new TransportationVehicleType)->getDescriptiveValues()[(int) $this->transportation_vehicle_type];
+ return (new TransportationVehicleType())->getDescriptiveValues()[(int) $this->transportation_vehicle_type];
}
/**
diff --git a/app/Models/TransportationProvider.php b/app/Models/TransportationProvider.php
index 7616d4a8fa..6304641fa9 100644
--- a/app/Models/TransportationProvider.php
+++ b/app/Models/TransportationProvider.php
@@ -6,9 +6,9 @@
class TransportationProvider implements Enum
{
- const NONE = 0;
- const STATE = 1;
- const CITY = 2;
+ public const NONE = 0;
+ public const STATE = 1;
+ public const CITY = 2;
public function getDescriptiveValues(): array
{
diff --git a/app/Models/TransportationVehicleType.php b/app/Models/TransportationVehicleType.php
index fb9ca162ee..3010f53c4a 100644
--- a/app/Models/TransportationVehicleType.php
+++ b/app/Models/TransportationVehicleType.php
@@ -6,17 +6,17 @@
class TransportationVehicleType implements Enum
{
- const VAN = 1;
- const MICROBUS = 2;
- const BUS = 3;
- const BIKE = 4;
- const ANIMAL_TRACTION = 5;
- const OTHER = 6;
- const BOAT_5 = 7;
- const BOAT_5_15 = 8;
- const BOAT_15_35 = 9;
- const BOAT_35 = 10;
- const TRAIN = 11;
+ public const VAN = 1;
+ public const MICROBUS = 2;
+ public const BUS = 3;
+ public const BIKE = 4;
+ public const ANIMAL_TRACTION = 5;
+ public const OTHER = 6;
+ public const BOAT_5 = 7;
+ public const BOAT_5_15 = 8;
+ public const BOAT_15_35 = 9;
+ public const BOAT_35 = 10;
+ public const TRAIN = 11;
public function getDescriptiveValues(): array
{
diff --git a/app/Notifications/ResetPasswordNotification.php b/app/Notifications/ResetPasswordNotification.php
index cdcec2dd37..94d12b9c6c 100644
--- a/app/Notifications/ResetPasswordNotification.php
+++ b/app/Notifications/ResetPasswordNotification.php
@@ -31,7 +31,7 @@ public function via($notifiable)
*/
public function toMail($notifiable)
{
- return (new MailMessage)
+ return (new MailMessage())
->subject('Sua senha foi alterada')
->line('A sua senha foi alterada recentemente.')
->line('Caso você não tenha feito esta alteração, por favor, altere a sua senha ou entre em contato com o administrador do sistema (solicitando mudança da sua senha), pois sua conta pode estar sendo usada por alguma pessoa não autorizada.')
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 2892bc1f52..2014d0b755 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -17,6 +17,7 @@
use Illuminate\Pagination\Paginator;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\URL;
use Illuminate\Support\ServiceProvider;
use Illuminate\Support\Str;
use Laravel\Telescope\TelescopeServiceProvider;
@@ -63,6 +64,10 @@ public function boot()
$this->loadLegacyMigrations();
}
+ if (env('ASSETS_SECURE')) {
+ URL::forceScheme('https');
+ }
+
$this->loadLegacyBootstrap();
Collection::macro('getKeyValueArray', function ($valueField) {
diff --git a/app/Providers/AssetServiceProvider.php b/app/Providers/AssetServiceProvider.php
index f04ad71791..ccc7f47de1 100644
--- a/app/Providers/AssetServiceProvider.php
+++ b/app/Providers/AssetServiceProvider.php
@@ -2,9 +2,9 @@
namespace App\Providers;
-use Illuminate\Support\ServiceProvider;
use App\Contracts\AssetServiceContract;
use App\Services\AssetService;
+use Illuminate\Support\ServiceProvider;
class AssetServiceProvider extends ServiceProvider
{
diff --git a/app/Rules/CanStoreActiveLooking.php b/app/Rules/CanStoreActiveLooking.php
index f8af9ee0e7..d339e6c013 100644
--- a/app/Rules/CanStoreActiveLooking.php
+++ b/app/Rules/CanStoreActiveLooking.php
@@ -17,16 +17,19 @@ public function passes($attribute, $value)
if ($legacyActiveLooking->data_inicio->lt($registrationDate)) {
$this->msg = 'Data de início não pode ser menor que a data matrícula.';
+
return false;
}
if ($legacyActiveLooking->data_fim) {
if ($legacyActiveLooking->data_fim->lt($legacyActiveLooking->data_inicio)) {
$this->msg = 'Data de retorno não pode ser menor que a data de início';
+
return false;
}
if ($legacyActiveLooking->data_fim->lt($registrationDate)) {
$this->msg = 'Data de retorno não pode ser menor que a data da matrícula';
+
return false;
}
}
@@ -40,12 +43,13 @@ public function passes($attribute, $value)
")
->where('ref_cod_matricula', $legacyRegistration->cod_matricula);
- if ($legacyActiveLooking->id){
+ if ($legacyActiveLooking->id) {
$activeLookingInSameDate->where('id', '<>', $legacyActiveLooking->id);
}
- if ($activeLookingInSameDate->exists()){
+ if ($activeLookingInSameDate->exists()) {
$this->msg = 'Já existe uma busca ativa lançada para o período selecionado.';
+
return false;
}
diff --git a/app/Services/AssetService.php b/app/Services/AssetService.php
index bea83e28db..d621f57b76 100644
--- a/app/Services/AssetService.php
+++ b/app/Services/AssetService.php
@@ -17,22 +17,22 @@ public function __construct(?string $version, ?bool $secure = null, bool $automa
$this->automaticVersioning = $automaticVersioning;
}
- public function getVersion() : ?string
+ public function getVersion(): ?string
{
return $this->version;
}
- public function isAutomaticVersioning() : bool
+ public function isAutomaticVersioning(): bool
{
return $this->automaticVersioning;
}
- public function getSecure() : ?bool
+ public function getSecure(): ?bool
{
return $this->secure;
}
- public function get(string $path, bool $secure = null) : string
+ public function get(string $path, bool $secure = null): string
{
if ($secure === null) {
$secure = $this->getSecure();
@@ -43,9 +43,10 @@ public function get(string $path, bool $secure = null) : string
/**
* @param string $path
+ *
* @return string
*/
- protected function appendVersionToPath(string $path) : string
+ protected function appendVersionToPath(string $path): string
{
if (!$this->automaticVersioning) {
return ($this->version) ? ($path . '?v=' . $this->version) : ($path);
@@ -65,7 +66,7 @@ protected function appendVersionToPath(string $path) : string
return $path;
}
- protected function getFileVersion(string $path, array $pathUrl) : string
+ protected function getFileVersion(string $path, array $pathUrl): string
{
if (preg_match('#^(//|http)#i', $path)) {
return ($this->version ?: '');
@@ -91,6 +92,7 @@ protected function getFileVersion(string $path, array $pathUrl) : string
/**
* @param string $path
+ *
* @return null|string
*/
public function findRealPath(string $path): ?string
diff --git a/app/Services/DisableUsersWithDaysGoneSinceLastAccessService.php b/app/Services/DisableUsersWithDaysGoneSinceLastAccessService.php
index e38775d0d1..e4d62c6e09 100644
--- a/app/Services/DisableUsersWithDaysGoneSinceLastAccessService.php
+++ b/app/Services/DisableUsersWithDaysGoneSinceLastAccessService.php
@@ -7,14 +7,15 @@
class DisableUsersWithDaysGoneSinceLastAccessService
{
-
public $config;
public function __construct(Repository $config)
{
$this->config = $config;
}
- public function execute(Authenticatable $user){
+
+ public function execute(Authenticatable $user)
+ {
$expirationPeriod = $this->config->get('legacy.app.user_accounts.max_days_without_login_to_disable_user');
if (empty($expirationPeriod) === false && $user->isAdmin() === false) {
diff --git a/app/Services/Educacenso/ImportService.php b/app/Services/Educacenso/ImportService.php
index b0b717f5e4..e772428ba6 100644
--- a/app/Services/Educacenso/ImportService.php
+++ b/app/Services/Educacenso/ImportService.php
@@ -6,7 +6,7 @@
abstract class ImportService
{
- const DELIMITER = '|';
+ public const DELIMITER = '|';
/**
* @var DateTime
diff --git a/app/Services/Educacenso/Version2019/ImportService.php b/app/Services/Educacenso/Version2019/ImportService.php
index 73c9bd8830..c6588e5729 100644
--- a/app/Services/Educacenso/Version2019/ImportService.php
+++ b/app/Services/Educacenso/Version2019/ImportService.php
@@ -56,7 +56,7 @@ public function getRegistroById($lineId)
return;
}
- return new $arrayRegistros[$lineId];
+ return new $arrayRegistros[$lineId]();
}
public function adaptData()
diff --git a/app/Services/Educacenso/Version2020/ImportService.php b/app/Services/Educacenso/Version2020/ImportService.php
index 2b74f69caa..9247dea704 100644
--- a/app/Services/Educacenso/Version2020/ImportService.php
+++ b/app/Services/Educacenso/Version2020/ImportService.php
@@ -58,7 +58,7 @@ public function getRegistroById($lineId)
return;
}
- return new $arrayRegistros[$lineId];
+ return new $arrayRegistros[$lineId]();
}
public function adaptData()
diff --git a/app/Services/Educacenso/Version2021/ImportService.php b/app/Services/Educacenso/Version2021/ImportService.php
index ffc471a46b..7bb82dd8cc 100644
--- a/app/Services/Educacenso/Version2021/ImportService.php
+++ b/app/Services/Educacenso/Version2021/ImportService.php
@@ -1,9 +1,7 @@
$url,
@@ -69,6 +70,7 @@ public function deleteFiles($deletedFiles)
{
foreach ($deletedFiles as $deletedFile) {
DB::beginTransaction();
+
try {
$this->deleteFilesFromStorage($deletedFile);
$filesRelation = FileRelation::query()
@@ -94,9 +96,11 @@ public function deleteFilesFromStorage($deletedFile)
switch (config('filesystems.default')) {
case 'local':
$url = config('legacy.app.database.dbname') . '/' . implode('/', array_slice(explode('/', $url), 5));
+
break;
case 's3':
$url = implode('/', array_slice(explode('/', $url), 3));
+
break;
}
diff --git a/app/Services/ImportUsersService.php b/app/Services/ImportUsersService.php
index cde8899a42..051a3424e6 100644
--- a/app/Services/ImportUsersService.php
+++ b/app/Services/ImportUsersService.php
@@ -77,7 +77,7 @@ public function collection(Collection $rows)
* Cria um usuário a partir do nome, matrícula e senha informados
*
* @param string $name
- * @param string $user Matrícula
+ * @param string $user
* @param string $password
* @param string $email
* @param bool $forceResetPassword
diff --git a/app/Services/MenuCacheService.php b/app/Services/MenuCacheService.php
index ee1223355d..e35e920dbf 100644
--- a/app/Services/MenuCacheService.php
+++ b/app/Services/MenuCacheService.php
@@ -8,7 +8,6 @@
use Illuminate\Contracts\Config\Repository as ConfigContract;
use Illuminate\Database\Eloquent\Collection;
-
class MenuCacheService
{
private ConfigContract $config;
@@ -22,6 +21,7 @@ public function __construct(ConfigContract $config, CacheContract $cache)
/**
* @param User $user
+ *
* @return array|mixed|null
*/
public function getMenuByUser(User $user)
@@ -32,7 +32,7 @@ public function getMenuByUser(User $user)
$cacheMenus = $this->cache->tags(['menus', $client, $key])->get($key);
if ($cacheMenus !== null) {
- return $cacheMenus;
+ return $cacheMenus;
}
$menus = Menu::user($user);
@@ -43,14 +43,14 @@ public function getMenuByUser(User $user)
/**
* @param Collection $adminMenus
- * @param User $user
+ * @param User $user
*/
public function putMenuCache(Collection $adminMenus, User $user)
{
$key = $this->getUserKey($user);
$client = $this->config->get('legacy.app.database.dbname');
- $this->cache->tags(['menus', $client, $key])->put($key, $adminMenus, env('CACHE_TTL',60));
+ $this->cache->tags(['menus', $client, $key])->put($key, $adminMenus, env('CACHE_TTL', 60));
}
/**
diff --git a/app/Services/SchoolHistory/Objects/SchoolHistory.php b/app/Services/SchoolHistory/Objects/SchoolHistory.php
index 4938fde238..9ea34a1af6 100644
--- a/app/Services/SchoolHistory/Objects/SchoolHistory.php
+++ b/app/Services/SchoolHistory/Objects/SchoolHistory.php
@@ -15,9 +15,9 @@ class SchoolHistory
private $formatScoresGreaterThanTen;
public $disciplines;
- const GRADE_SERIE = 1;
- const GRADE_ANO = 2;
- const GRADE_EJA = 3;
+ public const GRADE_SERIE = 1;
+ public const GRADE_ANO = 2;
+ public const GRADE_EJA = 3;
public function __construct(SchoolHistoryService $service, $seriesYearsModel)
{
@@ -86,7 +86,7 @@ public function addDataGroupByDiscipline($data)
public function getDiscipline($studentId, $disciplineName)
{
if (!$this->disciplines[$studentId][$disciplineName]) {
- $this->disciplines[$studentId][$disciplineName] = new DisciplineGroup;
+ $this->disciplines[$studentId][$disciplineName] = new DisciplineGroup();
}
return $this->disciplines[$studentId][$disciplineName];
@@ -186,7 +186,7 @@ public function makeTextoCertificacao($data)
public function getStatus($status)
{
- $allStatus = (new SchoolHistoryStatus)->getDescriptiveValues();
+ $allStatus = (new SchoolHistoryStatus())->getDescriptiveValues();
return $allStatus[$status];
}
diff --git a/app/Services/StudentService.php b/app/Services/StudentService.php
index f6439dd31d..752a9192cf 100644
--- a/app/Services/StudentService.php
+++ b/app/Services/StudentService.php
@@ -24,8 +24,7 @@ public function hasInProgressRegistration($studentId, $levelId = null)
$query = $student->registrations()
->where('status', 3)
- ->where('is_last_registration', 1)
- ;
+ ->where('is_last_registration', 1);
if ($levelId) {
$query->where('level_id', $levelId);
diff --git a/app/Services/ValidateUserPasswordService.php b/app/Services/ValidateUserPasswordService.php
index 552e25dca4..9987acccf1 100644
--- a/app/Services/ValidateUserPasswordService.php
+++ b/app/Services/ValidateUserPasswordService.php
@@ -21,7 +21,7 @@ public function execute(string $newPassword, string $oldPassword = null)
{
try {
$this->validate($newPassword, $oldPassword);
- } catch (ValidationException $ex){
+ } catch (ValidationException $ex) {
throw ValidationException::withMessages([
'password' => [
'A senha deve conter pelo menos ' .
@@ -29,7 +29,7 @@ public function execute(string $newPassword, string $oldPassword = null)
' caracteres e uma combinação de letras maiúsculas e minúsculas, números e símbolos (!@#$%*).'
]
]);
- } catch (\Exception $ex){
+ } catch (\Exception $ex) {
throw ValidationException::withMessages([
'password' => $ex->getMessage()
]);
@@ -38,7 +38,7 @@ public function execute(string $newPassword, string $oldPassword = null)
public function validate(string $newPassword, $oldPassword = null)
{
- if ($this->hash->check($newPassword, $oldPassword)){
+ if ($this->hash->check($newPassword, $oldPassword)) {
throw new \Exception('A senha informada foi usada recentemente. Por favor, escolha outra.');
}
diff --git a/app/Services/ValidationDataService.php b/app/Services/ValidationDataService.php
index 2feb89c24f..3869710398 100644
--- a/app/Services/ValidationDataService.php
+++ b/app/Services/ValidationDataService.php
@@ -6,14 +6,14 @@ class ValidationDataService
{
public function verifyQuantityByKey($data, $key, $quantity): bool
{
- $dataFilter = array_filter($data, fn($item) => $item[$key] === true);
+ $dataFilter = array_filter($data, fn ($item) => $item[$key] === true);
return count($dataFilter) > $quantity;
}
public function verifyDataContainsDuplicatesByKey($data, $key): bool
{
- $ids = array_map(fn($item) => $item[$key], $data);
+ $ids = array_map(fn ($item) => $item[$key], $data);
$ids = array_unique($ids);
return count($data) === count($ids);
diff --git a/app/Services/iDiarioService.php b/app/Services/iDiarioService.php
index 9f73abda6c..94333ba5d7 100644
--- a/app/Services/iDiarioService.php
+++ b/app/Services/iDiarioService.php
@@ -123,6 +123,7 @@ public function getClassroomsActivityByDiscipline(array $classroomId, int $disci
'classrooms' => implode(',', $classroomId),
'discipline' => $disciplineId
];
+
try {
$response = $this->get('/api/v2/discipline_activity', $data);
$body = trim((string) $response->getBody());
diff --git a/app/Setting.php b/app/Setting.php
index d011c077e7..4dda7694be 100644
--- a/app/Setting.php
+++ b/app/Setting.php
@@ -9,10 +9,10 @@ class Setting extends Model
{
use DateSerializer;
- const TYPE_STRING = 'string';
- const TYPE_FLOAT = 'float';
- const TYPE_INTEGER = 'integer';
- const TYPE_BOOLEAN = 'boolean';
+ public const TYPE_STRING = 'string';
+ public const TYPE_FLOAT = 'float';
+ public const TYPE_INTEGER = 'integer';
+ public const TYPE_BOOLEAN = 'boolean';
/**
* @var array
@@ -43,7 +43,7 @@ public function getValueAttribute($value)
return false;
}
- return (boolean) $value;
+ return (bool) $value;
}
return $value;
diff --git a/app/Support/Database/CsvSeeder.php b/app/Support/Database/CsvSeeder.php
index 8bce962639..b07b4c3a9b 100644
--- a/app/Support/Database/CsvSeeder.php
+++ b/app/Support/Database/CsvSeeder.php
@@ -87,7 +87,7 @@ public function read()
public function run()
{
$model = $this->getModelName();
- $model = new $model;
+ $model = new $model();
foreach ($this->read() as $data) {
$model->newQuery()->updateOrCreate($data);
diff --git a/app/Support/Database/IncrementSequence.php b/app/Support/Database/IncrementSequence.php
index 1729e73c86..44702b693e 100644
--- a/app/Support/Database/IncrementSequence.php
+++ b/app/Support/Database/IncrementSequence.php
@@ -15,7 +15,7 @@ trait IncrementSequence
public function incrementSequence($table, $column = 'id')
{
if (class_exists($table)) {
- $class = new $table;
+ $class = new $table();
$table = $class->getTable();
$column = $class->getKeyName();
diff --git a/app/Support/View/Employee/EmployeeReturn.php b/app/Support/View/Employee/EmployeeReturn.php
index 96c4ddf152..a3cb646940 100644
--- a/app/Support/View/Employee/EmployeeReturn.php
+++ b/app/Support/View/Employee/EmployeeReturn.php
@@ -4,6 +4,6 @@
class EmployeeReturn
{
- const SIM = 'S';
- const NAO = 'N';
+ public const SIM = 'S';
+ public const NAO = 'N';
}
diff --git a/app/Support/View/SettingView.php b/app/Support/View/SettingView.php
index fa22492081..013aeae747 100644
--- a/app/Support/View/SettingView.php
+++ b/app/Support/View/SettingView.php
@@ -18,12 +18,12 @@ public function makeInput($id, $description, $type, $key, $value, $enabled, $hin
private function getInput($type)
{
$types = [
- Setting::TYPE_STRING => (new StringInput),
- Setting::TYPE_INTEGER => (new IntegerInput),
- Setting::TYPE_FLOAT => (new FloatInput),
- Setting::TYPE_BOOLEAN => (new BooleanInput),
+ Setting::TYPE_STRING => (new StringInput()),
+ Setting::TYPE_INTEGER => (new IntegerInput()),
+ Setting::TYPE_FLOAT => (new FloatInput()),
+ Setting::TYPE_BOOLEAN => (new BooleanInput()),
];
- return $types[$type] ?? (new StringInput);
+ return $types[$type] ?? (new StringInput());
}
}
diff --git a/app/User.php b/app/User.php
index 70947a772e..e7d950f08d 100644
--- a/app/User.php
+++ b/app/User.php
@@ -7,8 +7,6 @@
use App\Models\LegacyPerson;
use App\Models\LegacyUserType;
use App\Models\School;
-use App\Services\DisableUsersWithDaysGoneSinceLastAccessService;
-use Illuminate\Contracts\Config\Repository;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -292,13 +290,16 @@ public function getEnabledUserDate(): ?Carbon
if ($this->employee) {
return $this->employee->getEnabledUserDate();
}
+
return null;
}
+
public function getPasswordUpdatedDate(): ?Carbon
{
if ($this->employee) {
return $this->employee->getPasswordUpdatedDate();
}
+
return null;
}
@@ -326,9 +327,10 @@ public function getDaysSinceLastAccessOrEnabledUserDate(): int
}
$currentDate = Carbon::now();
- if ($currentDate->gt($lastAccessDate)){
+ if ($currentDate->gt($lastAccessDate)) {
$daysGone = $currentDate->diffInDays($lastAccessDate);
}
+
return $daysGone;
}
@@ -338,9 +340,10 @@ public function getDaysSinceLastPasswordUpdated(): int
$lastPasswordUpdatedDate = $this->getPasswordUpdatedDate();
$currentDate = Carbon::now();
- if ($currentDate->gt($lastPasswordUpdatedDate)){
+ if ($currentDate->gt($lastPasswordUpdatedDate)) {
$daysGone = $currentDate->diffInDays($lastPasswordUpdatedDate);
}
+
return $daysGone;
}
diff --git a/composer.json b/composer.json
index 421116f944..50b7de5abb 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
"description": "Software livre de gestão escolar",
"type": "project",
"license": "GPL-2.0-or-later",
- "version": "2.6.6",
+ "version": "2.6.7",
"keywords": [
"Portabilis",
"i-Educar"
@@ -16,7 +16,7 @@
"ext-pdo": "*",
"ext-pgsql": "*",
"aws/aws-sdk-php-laravel": "^3.6",
- "composer/semver": "^1.7",
+ "composer/semver": "^3.2",
"cossou/jasperphp": "^2.8",
"dex/composer-plug-and-play": "^0.5.0",
"doctrine/dbal": "^2.13",
@@ -28,7 +28,6 @@
"intervention/image": "^2.6",
"laravel/framework": "^8.51",
"laravel/horizon": "^v5.7.9",
- "laravel/legacy-factories": "^1.1",
"laravel/tinker": "^2.6",
"laravel/ui": "^3.3",
"league/csv": "^9.7",
@@ -47,7 +46,7 @@
"facade/ignition": "^2.11",
"fakerphp/faker": "^1.15",
"filp/whoops": "^2.14",
- "friendsofphp/php-cs-fixer": "^2.19",
+ "friendsofphp/php-cs-fixer": "^3.2",
"laravel/sail": "^0.0.5",
"laravel/telescope": "^4.6",
"mockery/mockery": "^1.4.3",
@@ -57,7 +56,6 @@
},
"autoload": {
"classmap": [
- "database/factories",
"ieducar/intranet/include",
"ieducar/lib",
"ieducar/modules/*/Model",
@@ -71,6 +69,7 @@
],
"psr-4": {
"App\\": "app/",
+ "Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/",
"iEducar\\": "src"
}
@@ -127,7 +126,7 @@
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
- ]
+ ]
},
"config": {
"preferred-install": "dist",
diff --git a/composer.lock b/composer.lock
index 8dceea65ea..47e685cb0e 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": "b59ecf6b2ea9a27d3bebfd4de1d4d9a4",
+ "content-hash": "e9b9d20fe1e6413f2021a0b324a452d4",
"packages": [
{
"name": "asm89/stack-cors",
@@ -114,16 +114,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.198.1",
+ "version": "3.198.5",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "79bf3298bd2893eb0b4614c2463e9f675d07118b"
+ "reference": "ec63e1ad1b30689e530089e4c9cb18f2ef5c290b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/79bf3298bd2893eb0b4614c2463e9f675d07118b",
- "reference": "79bf3298bd2893eb0b4614c2463e9f675d07118b",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ec63e1ad1b30689e530089e4c9cb18f2ef5c290b",
+ "reference": "ec63e1ad1b30689e530089e4c9cb18f2ef5c290b",
"shasum": ""
},
"require": {
@@ -199,9 +199,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.198.1"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.198.5"
},
- "time": "2021-10-08T18:28:30+00:00"
+ "time": "2021-10-14T18:15:37+00:00"
},
{
"name": "aws/aws-sdk-php-laravel",
@@ -339,28 +339,29 @@
},
{
"name": "composer/semver",
- "version": "1.7.2",
+ "version": "3.2.5",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "647490bbcaf7fc4891c58f47b825eb99d19c377a"
+ "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/647490bbcaf7fc4891c58f47b825eb99d19c377a",
- "reference": "647490bbcaf7fc4891c58f47b825eb99d19c377a",
+ "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9",
+ "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.5 || ^5.0.5"
+ "phpstan/phpstan": "^0.12.54",
+ "symfony/phpunit-bridge": "^4.2 || ^5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.x-dev"
+ "dev-main": "3.x-dev"
}
},
"autoload": {
@@ -399,7 +400,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/semver/issues",
- "source": "https://github.com/composer/semver/tree/1.7.2"
+ "source": "https://github.com/composer/semver/tree/3.2.5"
},
"funding": [
{
@@ -415,7 +416,7 @@
"type": "tidelift"
}
],
- "time": "2020-12-03T15:47:16+00:00"
+ "time": "2021-05-24T12:41:47+00:00"
},
{
"name": "cossou/jasperphp",
@@ -2062,16 +2063,16 @@
},
{
"name": "laravel/framework",
- "version": "v8.63.0",
+ "version": "v8.64.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "8f3d280f36a427730c8c8fa34316c79eed38781e"
+ "reference": "3337c029e1bb31d9712d27437cc27010ba302c9e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/8f3d280f36a427730c8c8fa34316c79eed38781e",
- "reference": "8f3d280f36a427730c8c8fa34316c79eed38781e",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/3337c029e1bb31d9712d27437cc27010ba302c9e",
+ "reference": "3337c029e1bb31d9712d27437cc27010ba302c9e",
"shasum": ""
},
"require": {
@@ -2229,20 +2230,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2021-10-05T14:04:25+00:00"
+ "time": "2021-10-12T13:43:13+00:00"
},
{
"name": "laravel/horizon",
- "version": "v5.7.13",
+ "version": "v5.7.14",
"source": {
"type": "git",
"url": "https://github.com/laravel/horizon.git",
- "reference": "367c48b57af776a3e195a16989655fa89fa052e3"
+ "reference": "640df7c65c464f83cda66781636d816a0992b0b1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/horizon/zipball/367c48b57af776a3e195a16989655fa89fa052e3",
- "reference": "367c48b57af776a3e195a16989655fa89fa052e3",
+ "url": "https://api.github.com/repos/laravel/horizon/zipball/640df7c65c464f83cda66781636d816a0992b0b1",
+ "reference": "640df7c65c464f83cda66781636d816a0992b0b1",
"shasum": ""
},
"require": {
@@ -2304,65 +2305,9 @@
],
"support": {
"issues": "https://github.com/laravel/horizon/issues",
- "source": "https://github.com/laravel/horizon/tree/v5.7.13"
- },
- "time": "2021-09-14T16:01:18+00:00"
- },
- {
- "name": "laravel/legacy-factories",
- "version": "v1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/laravel/legacy-factories.git",
- "reference": "5e3fe2fd5fda64e20ea5c74c831a7346294e902a"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/laravel/legacy-factories/zipball/5e3fe2fd5fda64e20ea5c74c831a7346294e902a",
- "reference": "5e3fe2fd5fda64e20ea5c74c831a7346294e902a",
- "shasum": ""
- },
- "require": {
- "illuminate/macroable": "^8.0",
- "php": "^7.3|^8.0",
- "symfony/finder": "^3.4|^4.0|^5.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- },
- "laravel": {
- "providers": [
- "Illuminate\\Database\\Eloquent\\LegacyFactoryServiceProvider"
- ]
- }
- },
- "autoload": {
- "files": [
- "helpers.php"
- ],
- "psr-4": {
- "Illuminate\\Database\\Eloquent\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Taylor Otwell",
- "email": "taylor@laravel.com"
- }
- ],
- "description": "The legacy version of the Laravel Eloquent factories.",
- "homepage": "http://laravel.com",
- "support": {
- "issues": "https://github.com/laravel/framework/issues",
- "source": "https://github.com/laravel/framework"
+ "source": "https://github.com/laravel/horizon/tree/v5.7.14"
},
- "time": "2020-10-27T14:25:32+00:00"
+ "time": "2021-10-12T15:20:07+00:00"
},
{
"name": "laravel/serializable-closure",
@@ -3812,21 +3757,21 @@
},
{
"name": "nette/schema",
- "version": "v1.2.1",
+ "version": "v1.2.2",
"source": {
"type": "git",
"url": "https://github.com/nette/schema.git",
- "reference": "f5ed39fc96358f922cedfd1e516f0dadf5d2be0d"
+ "reference": "9a39cef03a5b34c7de64f551538cbba05c2be5df"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nette/schema/zipball/f5ed39fc96358f922cedfd1e516f0dadf5d2be0d",
- "reference": "f5ed39fc96358f922cedfd1e516f0dadf5d2be0d",
+ "url": "https://api.github.com/repos/nette/schema/zipball/9a39cef03a5b34c7de64f551538cbba05c2be5df",
+ "reference": "9a39cef03a5b34c7de64f551538cbba05c2be5df",
"shasum": ""
},
"require": {
- "nette/utils": "^3.1.4 || ^4.0",
- "php": ">=7.1 <8.1"
+ "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0",
+ "php": ">=7.1 <8.2"
},
"require-dev": {
"nette/tester": "^2.3 || ^2.4",
@@ -3868,9 +3813,9 @@
],
"support": {
"issues": "https://github.com/nette/schema/issues",
- "source": "https://github.com/nette/schema/tree/v1.2.1"
+ "source": "https://github.com/nette/schema/tree/v1.2.2"
},
- "time": "2021-03-04T17:51:11+00:00"
+ "time": "2021-10-15T11:40:02+00:00"
},
{
"name": "nette/utils",
@@ -4953,16 +4898,16 @@
},
{
"name": "psy/psysh",
- "version": "v0.10.8",
+ "version": "v0.10.9",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3"
+ "reference": "01281336c4ae557fe4a994544f30d3a1bc204375"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3",
- "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/01281336c4ae557fe4a994544f30d3a1bc204375",
+ "reference": "01281336c4ae557fe4a994544f30d3a1bc204375",
"shasum": ""
},
"require": {
@@ -5022,9 +4967,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
- "source": "https://github.com/bobthecow/psysh/tree/v0.10.8"
+ "source": "https://github.com/bobthecow/psysh/tree/v0.10.9"
},
- "time": "2021-04-10T16:23:39+00:00"
+ "time": "2021-10-10T13:37:39+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -5072,16 +5017,16 @@
},
{
"name": "ramsey/collection",
- "version": "1.2.1",
+ "version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/ramsey/collection.git",
- "reference": "eaca1dc1054ddd10cbd83c1461907bee6fb528fa"
+ "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ramsey/collection/zipball/eaca1dc1054ddd10cbd83c1461907bee6fb528fa",
- "reference": "eaca1dc1054ddd10cbd83c1461907bee6fb528fa",
+ "url": "https://api.github.com/repos/ramsey/collection/zipball/cccc74ee5e328031b15640b51056ee8d3bb66c0a",
+ "reference": "cccc74ee5e328031b15640b51056ee8d3bb66c0a",
"shasum": ""
},
"require": {
@@ -5135,7 +5080,7 @@
],
"support": {
"issues": "https://github.com/ramsey/collection/issues",
- "source": "https://github.com/ramsey/collection/tree/1.2.1"
+ "source": "https://github.com/ramsey/collection/tree/1.2.2"
},
"funding": [
{
@@ -5147,7 +5092,7 @@
"type": "tidelift"
}
],
- "time": "2021-08-06T03:41:06+00:00"
+ "time": "2021-10-10T03:01:02+00:00"
},
{
"name": "ramsey/uuid",
@@ -8589,19 +8534,20 @@
},
{
"name": "facade/ignition",
- "version": "2.14.1",
+ "version": "2.15.0",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
- "reference": "6d89c4c99537f487ad29f646d57ebf107ef714ed"
+ "reference": "3ee6e94815462bcf09bca0efc1c9069685df8da3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/facade/ignition/zipball/6d89c4c99537f487ad29f646d57ebf107ef714ed",
- "reference": "6d89c4c99537f487ad29f646d57ebf107ef714ed",
+ "url": "https://api.github.com/repos/facade/ignition/zipball/3ee6e94815462bcf09bca0efc1c9069685df8da3",
+ "reference": "3ee6e94815462bcf09bca0efc1c9069685df8da3",
"shasum": ""
},
"require": {
+ "ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"facade/flare-client-php": "^1.9.1",
@@ -8661,7 +8607,7 @@
"issues": "https://github.com/facade/ignition/issues",
"source": "https://github.com/facade/ignition"
},
- "time": "2021-10-08T12:34:52+00:00"
+ "time": "2021-10-11T15:24:06+00:00"
},
{
"name": "facade/ignition-contracts",
@@ -8854,85 +8800,66 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.19.2",
+ "version": "v3.2.1",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "d5c737c2e18ba502b75b44832b31fe627f82e307"
+ "reference": "13ae36a76b6e329e44ca3cafaa784ea02db9ff14"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d5c737c2e18ba502b75b44832b31fe627f82e307",
- "reference": "d5c737c2e18ba502b75b44832b31fe627f82e307",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/13ae36a76b6e329e44ca3cafaa784ea02db9ff14",
+ "reference": "13ae36a76b6e329e44ca3cafaa784ea02db9ff14",
"shasum": ""
},
"require": {
- "composer/semver": "^1.4 || ^2.0 || ^3.0",
- "composer/xdebug-handler": "^1.2 || ^2.0",
- "doctrine/annotations": "^1.2",
+ "composer/semver": "^3.2",
+ "composer/xdebug-handler": "^2.0",
+ "doctrine/annotations": "^1.12",
"ext-json": "*",
"ext-tokenizer": "*",
- "php": "^5.6 || ^7.0 || ^8.0",
- "php-cs-fixer/diff": "^1.3",
- "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0",
- "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
- "symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
- "symfony/finder": "^3.0 || ^4.0 || ^5.0",
- "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0",
- "symfony/polyfill-php70": "^1.0",
- "symfony/polyfill-php72": "^1.4",
- "symfony/process": "^3.0 || ^4.0 || ^5.0",
- "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
+ "php": "^7.2 || ^8.0",
+ "php-cs-fixer/diff": "^2.0",
+ "symfony/console": "^4.4.20 || ^5.1.3",
+ "symfony/event-dispatcher": "^4.4.20 || ^5.0",
+ "symfony/filesystem": "^4.4.20 || ^5.0",
+ "symfony/finder": "^4.4.20 || ^5.0",
+ "symfony/options-resolver": "^4.4.20 || ^5.0",
+ "symfony/polyfill-php72": "^1.23",
+ "symfony/polyfill-php80": "^1.23",
+ "symfony/polyfill-php81": "^1.23",
+ "symfony/process": "^4.4.20 || ^5.0",
+ "symfony/stopwatch": "^4.4.20 || ^5.0"
},
"require-dev": {
- "justinrainbow/json-schema": "^5.0",
- "keradus/cli-executor": "^1.4",
- "mikey179/vfsstream": "^1.6",
- "php-coveralls/php-coveralls": "^2.4.2",
- "php-cs-fixer/accessible-object": "^1.0",
+ "justinrainbow/json-schema": "^5.2",
+ "keradus/cli-executor": "^1.5",
+ "mikey179/vfsstream": "^1.6.8",
+ "php-coveralls/php-coveralls": "^2.4.3",
+ "php-cs-fixer/accessible-object": "^1.1",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
+ "phpspec/prophecy": "^1.10.3",
"phpspec/prophecy-phpunit": "^1.1 || ^2.0",
- "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5",
+ "phpunit/phpunit": "^7.5.20 || ^8.5.14 || ^9.5",
"phpunitgoodpractices/polyfill": "^1.5",
"phpunitgoodpractices/traits": "^1.9.1",
- "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1",
- "symfony/phpunit-bridge": "^5.2.1",
- "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
+ "symfony/phpunit-bridge": "^5.2.4",
+ "symfony/yaml": "^4.4.20 || ^5.0"
},
"suggest": {
"ext-dom": "For handling output formats in XML",
"ext-mbstring": "For handling non-UTF8 characters.",
- "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
- "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
"symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
},
"bin": [
"php-cs-fixer"
],
"type": "application",
- "extra": {
- "branch-alias": {
- "dev-master": "2.19-dev"
- }
- },
"autoload": {
"psr-4": {
"PhpCsFixer\\": "src/"
- },
- "classmap": [
- "tests/Test/AbstractFixerTestCase.php",
- "tests/Test/AbstractIntegrationCaseFactory.php",
- "tests/Test/AbstractIntegrationTestCase.php",
- "tests/Test/Assert/AssertTokensTrait.php",
- "tests/Test/IntegrationCase.php",
- "tests/Test/IntegrationCaseFactory.php",
- "tests/Test/IntegrationCaseFactoryInterface.php",
- "tests/Test/InternalIntegrationCaseFactory.php",
- "tests/Test/IsIdenticalConstraint.php",
- "tests/Test/TokensWithObservedTransformers.php",
- "tests/TestCase.php"
- ]
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -8951,7 +8878,7 @@
"description": "A tool to automatically fix PHP code style",
"support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
- "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.2"
+ "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.2.1"
},
"funding": [
{
@@ -8959,7 +8886,7 @@
"type": "github"
}
],
- "time": "2021-08-18T19:55:46+00:00"
+ "time": "2021-10-05T08:12:17+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -9465,16 +9392,16 @@
},
{
"name": "php-cs-fixer/diff",
- "version": "v1.3.1",
+ "version": "v2.0.2",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/diff.git",
- "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759"
+ "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759",
- "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3",
+ "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3",
"shasum": ""
},
"require": {
@@ -9502,21 +9429,18 @@
{
"name": "Kore Nordmann",
"email": "mail@kore-nordmann.de"
- },
- {
- "name": "SpacePossum"
}
],
- "description": "sebastian/diff v2 backport support for PHP5.6",
+ "description": "sebastian/diff v3 backport support for PHP 5.6+",
"homepage": "https://github.com/PHP-CS-Fixer",
"keywords": [
"diff"
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/diff/issues",
- "source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1"
+ "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2"
},
- "time": "2020-10-14T08:39:05+00:00"
+ "time": "2020-10-14T08:32:19+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -11261,74 +11185,6 @@
],
"time": "2021-08-04T21:20:46+00:00"
},
- {
- "name": "symfony/polyfill-php70",
- "version": "v1.20.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
- "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "type": "metapackage",
- "extra": {
- "branch-alias": {
- "dev-main": "1.20-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0"
- },
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
- "time": "2020-10-23T14:02:19+00:00"
- },
{
"name": "symfony/stopwatch",
"version": "v5.3.4",
diff --git a/config/cache.php b/config/cache.php
index 43d77858fc..06a71e77d9 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -99,6 +99,6 @@
|
*/
- 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
+ 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache'),
];
diff --git a/config/excel.php b/config/excel.php
index 37695184f1..19bab95086 100644
--- a/config/excel.php
+++ b/config/excel.php
@@ -15,7 +15,7 @@
| Here you can specify how big the chunk should be.
|
*/
- 'chunk_size' => 1000,
+ 'chunk_size' => 1000,
/*
|--------------------------------------------------------------------------
@@ -32,17 +32,17 @@
| Configure e.g. delimiter, enclosure and line ending for CSV exports.
|
*/
- 'csv' => [
- 'delimiter' => ',',
- 'enclosure' => '"',
- 'line_ending' => PHP_EOL,
- 'use_bom' => false,
+ 'csv' => [
+ 'delimiter' => ',',
+ 'enclosure' => '"',
+ 'line_ending' => PHP_EOL,
+ 'use_bom' => false,
'include_separator_line' => false,
- 'excel_compatibility' => false,
+ 'excel_compatibility' => false,
],
],
- 'imports' => [
+ 'imports' => [
'read_only' => true,
@@ -68,13 +68,13 @@
| Configure e.g. delimiter, enclosure and line ending for CSV imports.
|
*/
- 'csv' => [
- 'delimiter' => ',',
- 'enclosure' => '"',
- 'line_ending' => PHP_EOL,
- 'use_bom' => false,
+ 'csv' => [
+ 'delimiter' => ',',
+ 'enclosure' => '"',
+ 'line_ending' => PHP_EOL,
+ 'use_bom' => false,
'include_separator_line' => false,
- 'excel_compatibility' => false,
+ 'excel_compatibility' => false,
],
],
@@ -89,21 +89,21 @@
|
*/
'extension_detector' => [
- 'xlsx' => Excel::XLSX,
- 'xlsm' => Excel::XLSX,
- 'xltx' => Excel::XLSX,
- 'xltm' => Excel::XLSX,
- 'xls' => Excel::XLS,
- 'xlt' => Excel::XLS,
- 'ods' => Excel::ODS,
- 'ots' => Excel::ODS,
- 'slk' => Excel::SLK,
- 'xml' => Excel::XML,
+ 'xlsx' => Excel::XLSX,
+ 'xlsm' => Excel::XLSX,
+ 'xltx' => Excel::XLSX,
+ 'xltm' => Excel::XLSX,
+ 'xls' => Excel::XLS,
+ 'xlt' => Excel::XLS,
+ 'ods' => Excel::ODS,
+ 'ots' => Excel::ODS,
+ 'slk' => Excel::SLK,
+ 'xml' => Excel::XML,
'gnumeric' => Excel::GNUMERIC,
- 'htm' => Excel::HTML,
- 'html' => Excel::HTML,
- 'csv' => Excel::CSV,
- 'tsv' => Excel::TSV,
+ 'htm' => Excel::HTML,
+ 'html' => Excel::HTML,
+ 'csv' => Excel::CSV,
+ 'tsv' => Excel::TSV,
/*
|--------------------------------------------------------------------------
@@ -114,7 +114,7 @@
| Available options: Excel::MPDF | Excel::TCPDF | Excel::DOMPDF
|
*/
- 'pdf' => Excel::DOMPDF,
+ 'pdf' => Excel::DOMPDF,
],
'value_binder' => [
@@ -164,7 +164,7 @@
| storing reading or downloading. Here you can customize that path.
|
*/
- 'local_path' => sys_get_temp_dir(),
+ 'local_path' => sys_get_temp_dir(),
/*
|--------------------------------------------------------------------------
diff --git a/config/filesystems.php b/config/filesystems.php
index 528e661233..8af3983117 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -33,14 +33,14 @@
'local' => [
'driver' => 'local',
'root' => storage_path('app/public'),
- 'url' => env('APP_URL').'/storage',
+ 'url' => env('APP_URL') . '/storage',
'visibility' => 'public',
],
'public' => [
'driver' => 'local',
'root' => storage_path('app/public'),
- 'url' => env('APP_URL').'/storage',
+ 'url' => env('APP_URL') . '/storage',
'visibility' => 'public',
],
diff --git a/config/lighthouse.php b/config/lighthouse.php
index fb4a3010ae..28da4113a0 100755
--- a/config/lighthouse.php
+++ b/config/lighthouse.php
@@ -341,7 +341,7 @@
],
'pusher' => [
'driver' => 'pusher',
- 'routes' => \Nuwave\Lighthouse\Subscriptions\SubscriptionRouter::class.'@pusher',
+ 'routes' => \Nuwave\Lighthouse\Subscriptions\SubscriptionRouter::class . '@pusher',
'connection' => 'pusher',
],
],
diff --git a/config/session.php b/config/session.php
index 4e0f66cda6..c0e798bf54 100644
--- a/config/session.php
+++ b/config/session.php
@@ -128,7 +128,7 @@
'cookie' => env(
'SESSION_COOKIE',
- Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
+ Str::slug(env('APP_NAME', 'laravel'), '_') . '_session'
),
/*
diff --git a/database/factories/CityFactory.php b/database/factories/CityFactory.php
index 6d86cd5135..4c50988481 100644
--- a/database/factories/CityFactory.php
+++ b/database/factories/CityFactory.php
@@ -1,16 +1,30 @@
define(City::class, function (Faker $faker) {
- return [
- 'state_id' => factory(State::class)->create(),
- 'name' => $faker->city,
- 'ibge_code' => $faker->numerify('########'),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'state_id' => StateFactory::new()->create(),
+ 'name' => $this->faker->city(),
+ 'ibge_code' => $this->faker->numerify('########'),
+ ];
+ }
+}
diff --git a/database/factories/CountryFactory.php b/database/factories/CountryFactory.php
index 4f00578926..a979a62ef9 100644
--- a/database/factories/CountryFactory.php
+++ b/database/factories/CountryFactory.php
@@ -1,14 +1,29 @@
define(Country::class, function (Faker $faker) {
- return [
- 'name' => $faker->country,
- 'ibge_code' => $faker->numerify('########'),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'name' => $this->faker->country(),
+ 'ibge_code' => $this->faker->numerify('########'),
+ ];
+ }
+}
diff --git a/database/factories/DistrictFactory.php b/database/factories/DistrictFactory.php
index 62fd5066ad..b9487cd72f 100644
--- a/database/factories/DistrictFactory.php
+++ b/database/factories/DistrictFactory.php
@@ -1,16 +1,30 @@
define(District::class, function (Faker $faker) {
- return [
- 'city_id' => factory(City::class)->create(),
- 'name' => $faker->dayOfWeek . ' District',
- 'ibge_code' => $faker->numerify('########'),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'city_id' => CityFactory::new()->create(),
+ 'name' => $this->faker->dayOfWeek() . ' District',
+ 'ibge_code' => $this->faker->numerify('########'),
+ ];
+ }
+}
diff --git a/database/factories/Enrollment.php b/database/factories/Enrollment.php
deleted file mode 100644
index 4272b94306..0000000000
--- a/database/factories/Enrollment.php
+++ /dev/null
@@ -1,21 +0,0 @@
-define(Enrollment::class, function (Faker $faker) {
- return [
- 'ref_cod_matricula' => factory(Registration::class)->create(),
- 'ref_cod_turma' => factory(LegacySchoolClass::class)->create(),
- 'sequencial' => 0,
- 'ref_usuario_cad' => 1,
- 'data_cadastro' => now(),
- 'data_enturmacao' => now(),
- 'ativo' => 1
- ];
-});
diff --git a/database/factories/LegacyAcademicYearStageFactory.php b/database/factories/LegacyAcademicYearStageFactory.php
index c73639cdd5..091f374be4 100644
--- a/database/factories/LegacyAcademicYearStageFactory.php
+++ b/database/factories/LegacyAcademicYearStageFactory.php
@@ -1,23 +1,36 @@
define(LegacyAcademicYearStage::class, function (Faker $faker) {
- $schooAcademicYear = factory(LegacySchoolAcademicYear::class)->create();
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ $schooAcademicYear = LegacySchoolAcademicYearFactory::new()->create();
- return [
- 'ref_ano' => $schooAcademicYear->ano,
- 'ref_ref_cod_escola' => $schooAcademicYear->ref_cod_escola,
- 'sequencial' => 1,
- 'ref_cod_modulo' => factory(LegacyStageType::class)->states('unique')->make(),
- 'data_inicio' => now()->subMonths(3),
- 'data_fim' => now()->addMonths(3),
- 'dias_letivos' => $faker->numberBetween(150, 200),
- ];
-});
+ return [
+ 'ref_ano' => $schooAcademicYear->ano,
+ 'ref_ref_cod_escola' => $schooAcademicYear->ref_cod_escola,
+ 'sequencial' => 1,
+ 'ref_cod_modulo' => LegacyStageTypeFactory::new()->unique()->make(),
+ 'data_inicio' => now()->subMonths(3),
+ 'data_fim' => now()->addMonths(3),
+ 'dias_letivos' => $this->faker->numberBetween(150, 200),
+ ];
+ }
+}
diff --git a/database/factories/LegacyAverageFormulaFactory.php b/database/factories/LegacyAverageFormulaFactory.php
index 46b85fd72b..f66d7ca09b 100644
--- a/database/factories/LegacyAverageFormulaFactory.php
+++ b/database/factories/LegacyAverageFormulaFactory.php
@@ -1,40 +1,58 @@
define(LegacyAverageFormula::class, function (Faker $faker) {
- return [
- 'instituicao_id' => factory(LegacyInstitution::class)->states('unique')->make(),
- 'nome' => $faker->words(3, true),
- 'formula_media' => 'Se / Et',
- ];
-});
-
-$factory->state(LegacyAverageFormula::class, 'calculo-media-ponderada', function (Faker $faker) use ($factory) {
- $averageFormula = $factory->raw(LegacyAverageFormula::class);
+namespace Database\Factories;
- return array_merge($averageFormula, [
- 'formula_media' => $faker->randomElement(['((((Se / Et) * 7) + (Rc * 3)) / 10)', '(((((Se / Et) * 3) + (Rc * 2)) / 5))', '((Rc * 0.4) + (Se / Et * 0.6))']),
- 'tipo_formula' => 2,
- ]);
-});
-
-$factory->state(LegacyEvaluationRule::class, 'media-presenca-sem-recuperacao', function (Faker $faker) use ($factory) {
- $evaluationRule = $factory->raw(LegacyEvaluationRule::class);
-
- return array_merge($evaluationRule, [
- 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::NUMERICA,
- 'tipo_progressao' => RegraAvaliacao_Model_TipoProgressao::NAO_CONTINUADA_MEDIA_PRESENCA,
- 'tipo_presenca' => RegraAvaliacao_Model_TipoPresenca::GERAL,
- 'media' => 7,
- 'porcentagem_presenca' => 75,
- 'nota_maxima_geral' => 10,
- 'nota_minima_geral' => 0,
-
- ]);
-});
+use App\Models\LegacyAverageFormula;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use RegraAvaliacao_Model_Nota_TipoValor;
+use RegraAvaliacao_Model_TipoPresenca;
+use RegraAvaliacao_Model_TipoProgressao;
+
+class LegacyAverageFormulaFactory extends Factory
+{
+ /**
+ * The name of the factory's corresponding model.
+ *
+ * @var string
+ */
+ protected $model = LegacyAverageFormula::class;
+
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'instituicao_id' => LegacyInstitutionFactory::new()->unique()->make(),
+ 'nome' => $this->faker->words(3, true),
+ 'formula_media' => 'Se / Et',
+ ];
+ }
+
+ public function weightedAverageCalculation(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'formula_media' => $this->faker->randomElement(['((((Se / Et) * 7) + (Rc * 3)) / 10)', '(((((Se / Et) * 3) + (Rc * 2)) / 5))', '((Rc * 0.4) + (Se / Et * 0.6))']),
+ 'tipo_formula' => 2,
+ ]);
+ });
+ }
+
+ public function averageWithoutRemedial(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::NUMERICA,
+ 'tipo_progressao' => RegraAvaliacao_Model_TipoProgressao::NAO_CONTINUADA_MEDIA_PRESENCA,
+ 'tipo_presenca' => RegraAvaliacao_Model_TipoPresenca::GERAL,
+ 'media' => 7,
+ 'porcentagem_presenca' => 75,
+ 'nota_maxima_geral' => 10,
+ 'nota_minima_geral' => 0,
+ ]);
+ });
+ }
+}
diff --git a/database/factories/LegacyCourseFactory.php b/database/factories/LegacyCourseFactory.php
index 5630d04840..4248c0c184 100644
--- a/database/factories/LegacyCourseFactory.php
+++ b/database/factories/LegacyCourseFactory.php
@@ -1,35 +1,47 @@
define(LegacyCourse::class, function (Faker $faker) {
- return [
- 'ref_usuario_cad' => 1,
- 'ref_cod_tipo_regime' => factory(LegacyRegimeType::class)->create(),
- 'ref_cod_nivel_ensino' => factory(LegacyEducationLevel::class)->create(),
- 'ref_cod_tipo_ensino' => factory(LegacyEducationType::class)->create(),
- 'nm_curso' => $faker->words(3, true),
- 'sgl_curso' => $faker->word,
- 'qtd_etapas' => $faker->randomElement([2, 3, 4]),
- 'carga_horaria' => 800,
- 'data_cadastro' => now(),
- 'ref_cod_instituicao' => factory(LegacyInstitution::class)->states('unique')->make(),
- 'hora_falta' => 0.75,
- ];
-});
+class LegacyCourseFactory extends Factory
+{
+ /**
+ * The name of the factory's corresponding model.
+ *
+ * @var string
+ */
+ protected $model = LegacyCourse::class;
-$factory->state(LegacyCourse::class, 'padrao-ano-escolar', function (Faker $faker) use ($factory) {
- $course = $factory->raw(LegacyCourse::class);
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_usuario_cad' => 1,
+ 'ref_cod_tipo_regime' => LegacyRegimeTypeFactory::new()->create(),
+ 'ref_cod_nivel_ensino' => LegacyEducationLevelFactory::new()->create(),
+ 'ref_cod_tipo_ensino' => LegacyEducationTypeFactory::new()->create(),
+ 'nm_curso' => $this->faker->words(3, true),
+ 'sgl_curso' => $this->faker->word,
+ 'qtd_etapas' => $this->faker->randomElement([2, 3, 4]),
+ 'carga_horaria' => 800,
+ 'data_cadastro' => now(),
+ 'ref_cod_instituicao' => LegacyInstitutionFactory::new()->unique()->make(),
+ 'hora_falta' => 0.75,
+ ];
+ }
- return array_merge($course, [
- 'padrao_ano_escolar' => 1,
- ]);
-});
+ public function standardAcademicYear(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'padrao_ano_escolar' => 1,
+ ]);
+ });
+ }
+}
diff --git a/database/factories/LegacyDisciplineAcademicYearFactory.php b/database/factories/LegacyDisciplineAcademicYearFactory.php
index 59155bd0e2..41aa698199 100644
--- a/database/factories/LegacyDisciplineAcademicYearFactory.php
+++ b/database/factories/LegacyDisciplineAcademicYearFactory.php
@@ -1,19 +1,32 @@
define(LegacyDisciplineAcademicYear::class, function (Faker $faker) {
- return [
- 'componente_curricular_id' => factory(LegacyDiscipline::class)->create(),
- 'ano_escolar_id' => factory(LegacySchool::class)->create(),
- 'carga_horaria' => 100,
- 'tipo_nota' => $faker->randomElement([1, 2]),
- 'anos_letivos' => '{' . now()->year . '}',
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'componente_curricular_id' => LegacyDisciplineFactory::new()->create(),
+ 'ano_escolar_id' => LegacySchoolFactory::new()->create(),
+ 'carga_horaria' => 100,
+ 'tipo_nota' => $this->faker->randomElement([1, 2]),
+ 'anos_letivos' => '{' . now()->year . '}',
+ ];
+ }
+}
diff --git a/database/factories/LegacyDisciplineExemptionFactory.php b/database/factories/LegacyDisciplineExemptionFactory.php
index adf8465688..53bd7512c8 100644
--- a/database/factories/LegacyDisciplineExemptionFactory.php
+++ b/database/factories/LegacyDisciplineExemptionFactory.php
@@ -1,26 +1,35 @@
define(LegacyDisciplineExemption::class, function (Faker $faker) {
- return [
- 'ref_cod_matricula' => factory(LegacyRegistration::class)->create(),
- 'ref_cod_disciplina' => factory(LegacyDiscipline::class)->create(),
- 'ref_cod_escola' => factory(LegacySchool::class)->create(),
- 'ref_cod_serie' => factory(LegacyLevel::class)->create(),
- 'ref_cod_tipo_dispensa' => factory(LegacyExemptionType::class)->create(),
- 'ref_usuario_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'data_cadastro' => now(),
- 'ativo' => 1,
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_cod_matricula' => LegacyRegistrationFactory::new()->create(),
+ 'ref_cod_disciplina' => LegacyDisciplineFactory::new()->create(),
+ 'ref_cod_escola' => LegacySchoolFactory::new()->create(),
+ 'ref_cod_serie' => LegacyLevelFactory::new()->create(),
+ 'ref_cod_tipo_dispensa' => LegacyExemptionTypeFactory::new()->create(),
+ 'ref_usuario_cad' => LegacyUserFactory::new()->unique()->make(),
+ 'data_cadastro' => now(),
+ 'ativo' => 1,
+ ];
+ }
+}
diff --git a/database/factories/LegacyDisciplineFactory.php b/database/factories/LegacyDisciplineFactory.php
index ba02475bfe..ed08d38f6f 100644
--- a/database/factories/LegacyDisciplineFactory.php
+++ b/database/factories/LegacyDisciplineFactory.php
@@ -1,19 +1,32 @@
define(LegacyDiscipline::class, function (Faker $faker) {
- return [
- 'instituicao_id' => factory(LegacyInstitution::class)->state('unique')->make(),
- 'area_conhecimento_id' => factory(LegacyKnowledgeArea::class)->state('unique')->make(),
- 'nome' => $faker->colorName,
- 'abreviatura' => $faker->hexColor,
- 'tipo_base' => 0,
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'instituicao_id' => LegacyInstitutionFactory::new()->unique()->make(),
+ 'area_conhecimento_id' => LegacyKnowledgeAreaFactory::new()->unique()->make(),
+ 'nome' => $this->faker->colorName,
+ 'abreviatura' => $this->faker->hexColor,
+ 'tipo_base' => 0,
+ ];
+ }
+}
diff --git a/database/factories/LegacyDisciplineScoreFactory.php b/database/factories/LegacyDisciplineScoreFactory.php
index e0f61b90d4..19051d7cd3 100644
--- a/database/factories/LegacyDisciplineScoreFactory.php
+++ b/database/factories/LegacyDisciplineScoreFactory.php
@@ -1,17 +1,30 @@
define(LegacyDisciplineScore::class, function (Faker $faker) {
- return [
- 'nota_aluno_id' => factory(LegacyRegistrationScore::class)->create(),
- 'componente_curricular_id' => factory(LegacyDiscipline::class)->create(),
- 'etapa' => $faker->randomElement([2, 3, 4]),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'nota_aluno_id' => LegacyRegistrationScoreFactory::new()->create(),
+ 'componente_curricular_id' => LegacyDisciplineFactory::new()->create(),
+ 'etapa' => $this->faker->randomElement([2, 3, 4]),
+ ];
+ }
+}
diff --git a/database/factories/LegacyEducationLevelFactory.php b/database/factories/LegacyEducationLevelFactory.php
index 036e967f24..ccb7dab08e 100644
--- a/database/factories/LegacyEducationLevelFactory.php
+++ b/database/factories/LegacyEducationLevelFactory.php
@@ -1,17 +1,31 @@
define(LegacyEducationLevel::class, function (Faker $faker) {
- return [
- 'ref_usuario_cad' => 1,
- 'nm_nivel' => $faker->word,
- 'data_cadastro' => now(),
- 'ref_cod_instituicao' => factory(LegacyInstitution::class)->states('unique')->make(),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_usuario_cad' => 1,
+ 'nm_nivel' => $this->faker->word,
+ 'data_cadastro' => now(),
+ 'ref_cod_instituicao' => LegacyInstitutionFactory::new()->unique()->make(),
+ ];
+ }
+}
diff --git a/database/factories/LegacyEducationNetworkFactory.php b/database/factories/LegacyEducationNetworkFactory.php
index c566ed93ea..28a53f4219 100644
--- a/database/factories/LegacyEducationNetworkFactory.php
+++ b/database/factories/LegacyEducationNetworkFactory.php
@@ -1,18 +1,31 @@
define(LegacyEducationNetwork::class, function (Faker $faker) {
- return [
- 'ref_usuario_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'nm_rede' => $faker->company,
- 'data_cadastro' => now(),
- 'ref_cod_instituicao' => factory(LegacyInstitution::class)->state('unique')->make(),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_usuario_cad' => LegacyUserFactory::new()->unique()->make(),
+ 'nm_rede' => $this->faker->company,
+ 'data_cadastro' => now(),
+ 'ref_cod_instituicao' => LegacyInstitutionFactory::new()->unique()->make(),
+ ];
+ }
+}
diff --git a/database/factories/LegacyEducationTypeFactory.php b/database/factories/LegacyEducationTypeFactory.php
index 5bf4cbd61f..4114ba7e6d 100644
--- a/database/factories/LegacyEducationTypeFactory.php
+++ b/database/factories/LegacyEducationTypeFactory.php
@@ -1,17 +1,31 @@
define(LegacyEducationType::class, function (Faker $faker) {
- return [
- 'ref_usuario_cad' => 1,
- 'nm_tipo' => $faker->word,
- 'data_cadastro' => now(),
- 'ref_cod_instituicao' => factory(LegacyInstitution::class)->states('unique')->make(),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_usuario_cad' => 1,
+ 'nm_tipo' => $this->faker->word,
+ 'data_cadastro' => now(),
+ 'ref_cod_instituicao' => LegacyInstitutionFactory::new()->unique()->make(),
+ ];
+ }
+}
diff --git a/database/factories/LegacyEmployeeFactory.php b/database/factories/LegacyEmployeeFactory.php
index 2de2b65c27..245b65193d 100644
--- a/database/factories/LegacyEmployeeFactory.php
+++ b/database/factories/LegacyEmployeeFactory.php
@@ -1,19 +1,33 @@
define(LegacyEmployee::class, function (Faker $faker) {
- return [
- 'ref_cod_pessoa_fj' => function () {
- return factory(LegacyIndividual::class)->create()->idpes;
- },
- 'matricula' => $faker->randomDigitNotNull,
- 'senha' => $faker->randomDigitNotNull,
- 'ativo' => 1
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_cod_pessoa_fj' => function () {
+ return LegacyIndividualFactory::new()->create()->idpes;
+ },
+ 'matricula' => $this->faker->randomDigitNotNull(),
+ 'senha' => $this->faker->randomDigitNotNull(),
+ 'ativo' => 1
+ ];
+ }
+}
diff --git a/database/factories/LegacyEnrollmentFactory.php b/database/factories/LegacyEnrollmentFactory.php
index 8c828af74a..af8da2f033 100644
--- a/database/factories/LegacyEnrollmentFactory.php
+++ b/database/factories/LegacyEnrollmentFactory.php
@@ -1,37 +1,51 @@
define(LegacyEnrollment::class, function (Faker $faker) {
- return [
- 'ref_cod_matricula' => factory(LegacyRegistration::class)->create(),
- 'ref_cod_turma' => factory(LegacySchoolClass::class)->create(),
- 'sequencial' => 1,
- 'ref_usuario_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'data_cadastro' => now(),
- 'data_enturmacao' => now(),
- ];
-});
+use App\Models\LegacyEnrollment;
+use Illuminate\Database\Eloquent\Factories\Factory;
-$factory->state(LegacyEnrollment::class, 'active', function (Faker $faker) use ($factory) {
- $enrollment = $factory->raw(LegacyEnrollment::class);
+class LegacyEnrollmentFactory extends Factory
+{
+ /**
+ * The name of the factory's corresponding model.
+ *
+ * @var string
+ */
+ protected $model = LegacyEnrollment::class;
- return array_merge($enrollment, [
- 'ativo' => 1
- ]);
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_cod_matricula' => LegacyRegistrationFactory::new()->create(),
+ 'ref_cod_turma' => LegacySchoolClassFactory::new()->create(),
+ 'sequencial' => 1,
+ 'ref_usuario_cad' => LegacyUserFactory::new()->unique()->make(),
+ 'data_cadastro' => now(),
+ 'data_enturmacao' => now(),
+ ];
+ }
-$factory->state(LegacyEnrollment::class, 'inactive', function (Faker $faker) use ($factory) {
- $enrollment = $factory->raw(LegacyEnrollment::class);
+ public function active(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'ativo' => 1
+ ]);
+ });
+ }
- return array_merge($enrollment, [
- 'ativo' => 0
- ]);
-});
+ public function inactive(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'ativo' => 0
+ ]);
+ });
+ }
+}
diff --git a/database/factories/LegacyEvaluationRuleFactory.php b/database/factories/LegacyEvaluationRuleFactory.php
index 6862af4224..6226c0af81 100644
--- a/database/factories/LegacyEvaluationRuleFactory.php
+++ b/database/factories/LegacyEvaluationRuleFactory.php
@@ -1,75 +1,93 @@
define(LegacyEvaluationRule::class, function (Faker $faker) {
- return [
- 'formula_media_id' => factory(LegacyAverageFormula::class)->create(),
- 'instituicao_id' => factory(LegacyInstitution::class)->states('unique')->make(),
- 'nome' => $faker->words(3, true),
- 'tipo_nota' => $faker->randomElement([1, 2, 3, 4]),
- 'tipo_progressao' => $faker->randomElement([1, 2, 3, 4]),
- 'tipo_presenca' => $faker->randomElement([1, 2]),
- ];
-});
-
-$factory->state(LegacyEvaluationRule::class, 'without-score', function (Faker $faker) use ($factory) {
- $evaluationRule = $factory->raw(LegacyEvaluationRule::class);
+namespace Database\Factories;
- return array_merge($evaluationRule, [
- 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::NENHUM,
- 'tipo_progressao' => RegraAvaliacao_Model_TipoProgressao::CONTINUADA,
- 'tipo_presenca' => RegraAvaliacao_Model_TipoPresenca::POR_COMPONENTE,
- ]);
-});
-
-$factory->state(LegacyEvaluationRule::class, 'media-presenca-sem-recuperacao', function (Faker $faker) use ($factory) {
- $evaluationRule = $factory->raw(LegacyEvaluationRule::class);
-
- return array_merge($evaluationRule, [
- 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::NUMERICA,
- 'tipo_progressao' => RegraAvaliacao_Model_TipoProgressao::NAO_CONTINUADA_MEDIA_PRESENCA,
- 'tipo_presenca' => RegraAvaliacao_Model_TipoPresenca::GERAL,
- 'media' => 7,
- 'porcentagem_presenca' => 75,
- 'nota_maxima_geral' => 10,
- 'nota_minima_geral' => 0,
+use App\Models\LegacyEvaluationRule;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use RegraAvaliacao_Model_Nota_TipoValor;
+use RegraAvaliacao_Model_TipoPresenca;
+use RegraAvaliacao_Model_TipoProgressao;
- ]);
-});
+class LegacyEvaluationRuleFactory extends Factory
+{
+ /**
+ * The name of the factory's corresponding model.
+ *
+ * @var string
+ */
+ protected $model = LegacyEvaluationRule::class;
-$factory->state(LegacyEvaluationRule::class, 'progressao-continuada-nota-conceitual', function () use ($factory) {
- $evaluationRule = $factory->raw(LegacyEvaluationRule::class);
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'formula_media_id' => LegacyAverageFormulaFactory::new()->create(),
+ 'instituicao_id' => LegacyInstitutionFactory::new()->unique()->make(),
+ 'nome' => $this->faker->words(3, true),
+ 'tipo_nota' => $this->faker->randomElement([1, 2, 3, 4]),
+ 'tipo_progressao' => $this->faker->randomElement([1, 2, 3, 4]),
+ 'tipo_presenca' => $this->faker->randomElement([1, 2]),
+ ];
+ }
- return array_merge($evaluationRule, [
- 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::CONCEITUAL,
- 'tipo_progressao' => RegraAvaliacao_Model_TipoProgressao::CONTINUADA,
- 'tipo_presenca' => RegraAvaliacao_Model_TipoPresenca::GERAL,
- 'porcentagem_presenca' => 75,
- 'nota_maxima_geral' => 10,
- 'nota_minima_geral' => 0,
+ public function withoutScore(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::NENHUM,
+ 'tipo_progressao' => RegraAvaliacao_Model_TipoProgressao::CONTINUADA,
+ 'tipo_presenca' => RegraAvaliacao_Model_TipoPresenca::POR_COMPONENTE,
+ ]);
+ });
+ }
- ]);
-});
+ public function mediaPresencaSemRecuperacao(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::NUMERICA,
+ 'tipo_progressao' => RegraAvaliacao_Model_TipoProgressao::NAO_CONTINUADA_MEDIA_PRESENCA,
+ 'tipo_presenca' => RegraAvaliacao_Model_TipoPresenca::GERAL,
+ 'media' => 7,
+ 'porcentagem_presenca' => 75,
+ 'nota_maxima_geral' => 10,
+ 'nota_minima_geral' => 0,
+ ]);
+ });
+ }
-$factory->state(LegacyEvaluationRule::class, 'progressao-calculo-media-recuperacao-ponderada', function () use ($factory) {
- $evaluationRule = $factory->raw(LegacyEvaluationRule::class);
+ public function progressaoContinuadaNotaConceitual(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::CONCEITUAL,
+ 'tipo_progressao' => RegraAvaliacao_Model_TipoProgressao::CONTINUADA,
+ 'tipo_presenca' => RegraAvaliacao_Model_TipoPresenca::GERAL,
+ 'porcentagem_presenca' => 75,
+ 'nota_maxima_geral' => 10,
+ 'nota_minima_geral' => 0,
+ ]);
+ });
+ }
- return array_merge($evaluationRule, [
- 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::NUMERICA,
- 'formula_recuperacao_id' => factory(LegacyAverageFormula::class)->state('calculo-media-ponderada')->create(),
- 'tipo_progressao' => RegraAvaliacao_Model_TipoProgressao::NAO_CONTINUADA_MEDIA_PRESENCA,
- 'tipo_presenca' => RegraAvaliacao_Model_TipoPresenca::POR_COMPONENTE,
- 'porcentagem_presenca' => 75,
- 'media' => 7,
- 'media_recuperacao' => 6,
- 'nota_maxima_geral' => 10,
- 'nota_minima_geral' => 0,
- ]);
-});
+ public function progressaoCalculoMediaRecuperacaoPonderada(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::NUMERICA,
+ 'formula_recuperacao_id' => LegacyAverageFormulaFactory::new()->weightedAverageCalculation()->create(),
+ 'tipo_progressao' => RegraAvaliacao_Model_TipoProgressao::NAO_CONTINUADA_MEDIA_PRESENCA,
+ 'tipo_presenca' => RegraAvaliacao_Model_TipoPresenca::POR_COMPONENTE,
+ 'porcentagem_presenca' => 75,
+ 'media' => 7,
+ 'media_recuperacao' => 6,
+ 'nota_maxima_geral' => 10,
+ 'nota_minima_geral' => 0,
+ ]);
+ });
+ }
+}
diff --git a/database/factories/LegacyEvaluationRuleGradeYearFactory.php b/database/factories/LegacyEvaluationRuleGradeYearFactory.php
index 2e4562bfb3..9b385acb45 100644
--- a/database/factories/LegacyEvaluationRuleGradeYearFactory.php
+++ b/database/factories/LegacyEvaluationRuleGradeYearFactory.php
@@ -1,17 +1,31 @@
define(App\Models\LegacyEvaluationRuleGradeYear::class, function (Faker $faker) {
- return [
- 'serie_id' => factory(LegacyLevel::class)->create(),
- 'regra_avaliacao_id' => factory(LegacyEvaluationRule::class)->create(),
- 'regra_avaliacao_diferenciada_id' => null,
- 'ano_letivo' => '{' . now()->year . '}',
- ];
-});
+class LegacyEvaluationRuleGradeYearFactory extends Factory
+{
+ /**
+ * The name of the factory's corresponding model.
+ *
+ * @var string
+ */
+ protected $model = LegacyEvaluationRuleGradeYear::class;
+
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'serie_id' => LegacyLevelFactory::new()->create(),
+ 'regra_avaliacao_id' => LegacyEvaluationRuleFactory::new()->create(),
+ 'regra_avaliacao_diferenciada_id' => null,
+ 'ano_letivo' => '{' . now()->year . '}',
+ ];
+ }
+}
diff --git a/database/factories/LegacyExemptionStageFactory.php b/database/factories/LegacyExemptionStageFactory.php
index 07e2a9f455..ae6e1f74ff 100644
--- a/database/factories/LegacyExemptionStageFactory.php
+++ b/database/factories/LegacyExemptionStageFactory.php
@@ -1,17 +1,31 @@
define(LegacyExemptionStage::class, function (Faker $faker) {
- $exemption = factory(LegacyDisciplineExemption::class)->create();
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ $exemption = LegacyDisciplineExemptionFactory::new()->create();
- return [
- 'ref_cod_dispensa' => $exemption->cod_dispensa,
- 'etapa' => 1,
- ];
-});
+ return [
+ 'ref_cod_dispensa' => $exemption->cod_dispensa,
+ 'etapa' => 1,
+ ];
+ }
+}
diff --git a/database/factories/LegacyExemptionTypeFactory.php b/database/factories/LegacyExemptionTypeFactory.php
index 4f1a8610de..5677d859e6 100644
--- a/database/factories/LegacyExemptionTypeFactory.php
+++ b/database/factories/LegacyExemptionTypeFactory.php
@@ -1,20 +1,33 @@
define(LegacyExemptionType::class, function (Faker $faker) {
- return [
- 'nm_tipo' => $faker->words(2, true),
- 'descricao' => $faker->words(5, true),
- 'ativo' => 1,
- 'ref_usuario_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'data_cadastro' => now(),
- 'ref_cod_instituicao' => factory(LegacyInstitution::class)->state('unique')->make(),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'nm_tipo' => $this->faker->words(2, true),
+ 'descricao' => $this->faker->words(5, true),
+ 'ativo' => 1,
+ 'ref_usuario_cad' => LegacyUserFactory::new()->unique()->make(),
+ 'data_cadastro' => now(),
+ 'ref_cod_instituicao' => LegacyInstitutionFactory::new()->unique()->make(),
+ ];
+ }
+}
diff --git a/database/factories/LegacyIndividual.php b/database/factories/LegacyIndividual.php
deleted file mode 100644
index abd18750e5..0000000000
--- a/database/factories/LegacyIndividual.php
+++ /dev/null
@@ -1,19 +0,0 @@
-define(LegacyIndividual::class, function (Faker $faker) {
- return [
- 'idpes' => function () {
- return factory(LegacyPerson::class)->create()->idpes;
- },
- 'origem_gravacao' => 'U',
- 'data_cad' => $faker->dateTime,
- 'operacao' => 'I',
- ];
-});
diff --git a/database/factories/LegacyIndividualFactory.php b/database/factories/LegacyIndividualFactory.php
index 5e15530750..c563b5249e 100644
--- a/database/factories/LegacyIndividualFactory.php
+++ b/database/factories/LegacyIndividualFactory.php
@@ -1,17 +1,31 @@
define(LegacyIndividual::class, function (Faker $faker) {
- return [
- 'idpes' => factory(LegacyPerson::class)->create(),
- 'data_cad' => now(),
- 'operacao' => $faker->randomElement(['I', 'A', 'E']),
- 'origem_gravacao' => $faker->randomElement(['M', 'U', 'C', 'O']),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'idpes' => LegacyPersonFactory::new()->create(),
+ 'data_cad' => now(),
+ 'operacao' => $this->faker->randomElement(['I', 'A', 'E']),
+ 'origem_gravacao' => $this->faker->randomElement(['M', 'U', 'C', 'O']),
+ ];
+ }
+}
diff --git a/database/factories/LegacyInstitutionFactory.php b/database/factories/LegacyInstitutionFactory.php
index f29a0dd837..06cfc0c406 100644
--- a/database/factories/LegacyInstitutionFactory.php
+++ b/database/factories/LegacyInstitutionFactory.php
@@ -1,34 +1,52 @@
1,
+ 'ref_idtlog' => 'AV',
+ 'ref_sigla_uf' => 'SC',
+ 'cep' => $this->faker->numerify('########'),
+ 'cidade' => $this->faker->city,
+ 'bairro' => $this->faker->lastName,
+ 'logradouro' => $this->faker->address,
+ 'nm_responsavel' => $this->faker->name,
+ 'data_cadastro' => now(),
+ 'nm_instituicao' => $this->faker->company,
+ ];
+ }
-$factory->define(LegacyInstitution::class, function (Faker $faker) {
- return [
- 'ref_usuario_cad' => 1,
- 'ref_idtlog' => 'AV',
- 'ref_sigla_uf' => 'SC',
- 'cep' => $faker->numerify('########'),
- 'cidade' => $faker->city,
- 'bairro' => $faker->lastName,
- 'logradouro' => $faker->address,
- 'nm_responsavel' => $faker->name,
- 'data_cadastro' => now(),
- 'nm_instituicao' => $faker->company,
- ];
-});
+ public function unique(): self
+ {
+ return $this->state(function () {
+ $institution = LegacyInstitution::query()->first();
-$factory->state(LegacyInstitution::class, 'unique', function () {
- $institution = LegacyInstitution::query()->first();
+ if (empty($institution)) {
+ $institution = LegacyInstitutionFactory::new()->create();
+ }
- if (empty($institution)) {
- $institution = factory(LegacyInstitution::class)->create();
+ return [
+ 'cod_instituicao' => $institution->getKey()
+ ];
+ });
}
-
- return [
- 'cod_instituicao' => $institution->getKey()
- ];
-});
+}
diff --git a/database/factories/LegacyKnowledgeAreaFactory.php b/database/factories/LegacyKnowledgeAreaFactory.php
index a6e67ec8ba..83f60e3ed8 100644
--- a/database/factories/LegacyKnowledgeAreaFactory.php
+++ b/database/factories/LegacyKnowledgeAreaFactory.php
@@ -1,27 +1,44 @@
LegacyInstitutionFactory::new()->unique()->make(),
+ 'nome' => $this->faker->words(3, true),
+ ];
+ }
-$factory->define(LegacyKnowledgeArea::class, function (Faker $faker) {
- return [
- 'instituicao_id' => factory(LegacyInstitution::class)->state('unique')->make(),
- 'nome' => $faker->words(3, true),
- ];
-});
+ public function unique(): self
+ {
+ return $this->state(function () {
+ $knowledgeArea = LegacyKnowledgeArea::query()->first();
-$factory->state(LegacyKnowledgeArea::class, 'unique', function () {
- $knowledgeArea = LegacyKnowledgeArea::query()->first();
+ if (empty($knowledgeArea)) {
+ $knowledgeArea = LegacyKnowledgeAreaFactory::new()->create();
+ }
- if (empty($knowledgeArea)) {
- $knowledgeArea = factory(LegacyKnowledgeArea::class)->create();
+ return [
+ 'id' => $knowledgeArea->getKey()
+ ];
+ });
}
-
- return [
- 'id' => $knowledgeArea->getKey()
- ];
-});
+}
diff --git a/database/factories/LegacyLevelFactory.php b/database/factories/LegacyLevelFactory.php
index a846be056a..34ad818efe 100644
--- a/database/factories/LegacyLevelFactory.php
+++ b/database/factories/LegacyLevelFactory.php
@@ -1,19 +1,33 @@
define(LegacyLevel::class, function (Faker $faker) {
- return [
- 'nm_serie' => $faker->words(3, true),
- 'ref_usuario_cad' => 1,
- 'ref_cod_curso' => factory(LegacyCourse::class)->create(),
- 'etapa_curso' => $faker->randomElement([1, 2, 3, 4]),
- 'carga_horaria' => 800,
- 'data_cadastro' => $faker->dateTime(),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'nm_serie' => $this->faker->words(3, true),
+ 'ref_usuario_cad' => 1,
+ 'ref_cod_curso' => LegacyCourseFactory::new()->create(),
+ 'etapa_curso' => $this->faker->randomElement([1, 2, 3, 4]),
+ 'carga_horaria' => 800,
+ 'data_cadastro' => $this->faker->dateTime(),
+ ];
+ }
+}
diff --git a/database/factories/LegacyOrganizationFactory.php b/database/factories/LegacyOrganizationFactory.php
index c50b26e8ec..2c52df5a31 100644
--- a/database/factories/LegacyOrganizationFactory.php
+++ b/database/factories/LegacyOrganizationFactory.php
@@ -1,26 +1,39 @@
define(LegacyOrganization::class, function (Faker $faker) {
- $person = factory(LegacyPerson::class)->create([
- 'nome' => $faker->company,
- ]);
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ $person = LegacyPersonFactory::new()->create([
+ 'nome' => $this->faker->company,
+ ]);
- return [
- 'idpes' => $person,
- 'cnpj' => $faker->numerify('##############'),
- 'insc_estadual' => $faker->numerify('########'),
- 'origem_gravacao' => $faker->randomElement(['M', 'U', 'C', 'O']),
- 'idpes_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'data_cad' => now(),
- 'operacao' => $faker->randomElement(['I', 'A', 'E']),
- 'fantasia' => $person->name,
- ];
-});
+ return [
+ 'idpes' => $person,
+ 'cnpj' => $this->faker->numerify('##############'),
+ 'insc_estadual' => $this->faker->numerify('########'),
+ 'origem_gravacao' => $this->faker->randomElement(['M', 'U', 'C', 'O']),
+ 'idpes_cad' => LegacyUserFactory::new()->unique()->make(),
+ 'data_cad' => now(),
+ 'operacao' => $this->faker->randomElement(['I', 'A', 'E']),
+ 'fantasia' => $person->name,
+ ];
+ }
+}
diff --git a/database/factories/LegacyPersonFactory.php b/database/factories/LegacyPersonFactory.php
index 03edd1052b..77f6d4cc69 100644
--- a/database/factories/LegacyPersonFactory.php
+++ b/database/factories/LegacyPersonFactory.php
@@ -1,18 +1,33 @@
define(LegacyPerson::class, function (Faker $faker) {
- return [
- 'nome' => $faker->name,
- 'data_cad' => now(),
- 'tipo' => $faker->randomElement(['F', 'J']),
- 'situacao' => $faker->randomElement(['A', 'I', 'P']),
- 'origem_gravacao' => $faker->randomElement(['M', 'U', 'C', 'O']),
- 'operacao' => $faker->randomElement(['I', 'A', 'E']),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'nome' => $this->faker->name,
+ 'data_cad' => now(),
+ 'tipo' => $this->faker->randomElement(['F', 'J']),
+ 'situacao' => $this->faker->randomElement(['A', 'I', 'P']),
+ 'origem_gravacao' => $this->faker->randomElement(['M', 'U', 'C', 'O']),
+ 'operacao' => $this->faker->randomElement(['I', 'A', 'E']),
+ ];
+ }
+}
diff --git a/database/factories/LegacyRegimeTypeFactory.php b/database/factories/LegacyRegimeTypeFactory.php
index d49d0e29b6..cd80a75af9 100644
--- a/database/factories/LegacyRegimeTypeFactory.php
+++ b/database/factories/LegacyRegimeTypeFactory.php
@@ -1,18 +1,32 @@
define(LegacyRegimeType::class, function (Faker $faker) {
- return [
- 'ref_usuario_cad' => 1,
- 'nm_tipo' => $faker->words(3, true),
- 'data_cadastro' => now(),
- 'ativo' => 1,
- 'ref_cod_instituicao' => factory(LegacyInstitution::class)->states('unique')->make(),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_usuario_cad' => 1,
+ 'nm_tipo' => $this->faker->words(3, true),
+ 'data_cadastro' => now(),
+ 'ativo' => 1,
+ 'ref_cod_instituicao' => LegacyInstitutionFactory::new()->unique()->make(),
+ ];
+ }
+}
diff --git a/database/factories/LegacyRegistrationFactory.php b/database/factories/LegacyRegistrationFactory.php
index c2c6808f67..7b8a526720 100644
--- a/database/factories/LegacyRegistrationFactory.php
+++ b/database/factories/LegacyRegistrationFactory.php
@@ -1,17 +1,31 @@
define(LegacyRegistration::class, function (Faker $faker) {
- return [
- 'ref_cod_aluno' => factory(LegacyStudent::class)->create(),
- 'data_cadastro' => now(),
- 'ano' => now()->year,
- 'ref_usuario_cad' => 1,
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_cod_aluno' => LegacyStudentFactory::new()->create(),
+ 'data_cadastro' => now(),
+ 'ano' => now()->year,
+ 'ref_usuario_cad' => 1,
+ ];
+ }
+}
diff --git a/database/factories/LegacyRegistrationScoreFactory.php b/database/factories/LegacyRegistrationScoreFactory.php
index 282b84b966..e1171e31c0 100644
--- a/database/factories/LegacyRegistrationScoreFactory.php
+++ b/database/factories/LegacyRegistrationScoreFactory.php
@@ -1,14 +1,28 @@
define(LegacyRegistrationScore::class, function (Faker $faker) {
- return [
- 'matricula_id' => factory(LegacyRegistration::class)->create(),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'matricula_id' => LegacyRegistrationFactory::new()->create(),
+ ];
+ }
+}
diff --git a/database/factories/LegacyRoundingTableFactory.php b/database/factories/LegacyRoundingTableFactory.php
index 120c83969f..ad69ee07be 100644
--- a/database/factories/LegacyRoundingTableFactory.php
+++ b/database/factories/LegacyRoundingTableFactory.php
@@ -1,32 +1,49 @@
define(LegacyRoundingTable::class, function (Faker $faker) {
- return [
- 'instituicao_id' => factory(LegacyInstitution::class)->state('unique')->make(),
- 'nome' => $faker->words(3, true),
- 'tipo_nota' => $faker->randomElement([1, 2]),
- ];
-});
+use App\Models\LegacyRoundingTable;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use RegraAvaliacao_Model_Nota_TipoValor;
-$factory->state(LegacyRoundingTable::class, 'numeric', function (Faker $faker) use ($factory) {
- $roundingTable = $factory->raw(LegacyRoundingTable::class);
+class LegacyRoundingTableFactory extends Factory
+{
+ /**
+ * The name of the factory's corresponding model.
+ *
+ * @var string
+ */
+ protected $model = LegacyRoundingTable::class;
- return array_merge($roundingTable, [
- 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::NUMERICA,
- ]);
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'instituicao_id' => LegacyInstitutionFactory::new()->unique()->make(),
+ 'nome' => $this->faker->words(3, true),
+ 'tipo_nota' => $this->faker->randomElement([1, 2]),
+ ];
+ }
-$factory->state(LegacyRoundingTable::class, 'conceitual', function () use ($factory) {
- $roundingTable = $factory->raw(LegacyRoundingTable::class);
+ public function numeric(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::NUMERICA,
+ ]);
+ });
+ }
- return array_merge($roundingTable, [
- 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::CONCEITUAL,
- ]);
-});
+ public function conceitual(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'tipo_nota' => RegraAvaliacao_Model_Nota_TipoValor::CONCEITUAL,
+ ]);
+ });
+ }
+}
diff --git a/database/factories/LegacySchoolAcademicYearFactory.php b/database/factories/LegacySchoolAcademicYearFactory.php
index 07787a7629..3d66cc3ada 100644
--- a/database/factories/LegacySchoolAcademicYearFactory.php
+++ b/database/factories/LegacySchoolAcademicYearFactory.php
@@ -1,18 +1,32 @@
define(LegacySchoolAcademicYear::class, function () {
- return [
- 'ref_cod_escola' => factory(LegacySchool::class)->create(),
- 'ano' => now()->year,
- 'ref_usuario_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'andamento' => 1,
- 'data_cadastro' => now(),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_cod_escola' => LegacySchoolFactory::new()->create(),
+ 'ano' => now()->year,
+ 'ref_usuario_cad' => LegacyUserFactory::new()->unique()->make(),
+ 'andamento' => 1,
+ 'data_cadastro' => now(),
+ ];
+ }
+}
diff --git a/database/factories/LegacySchoolClassFactory.php b/database/factories/LegacySchoolClassFactory.php
index fca02e62b1..594364a410 100644
--- a/database/factories/LegacySchoolClassFactory.php
+++ b/database/factories/LegacySchoolClassFactory.php
@@ -1,55 +1,67 @@
define(LegacySchoolClass::class, function (Faker $faker) {
- $schoolGrade = factory(LegacySchoolGrade::class)->create();
-
- factory(LegacyEvaluationRuleGradeYear::class)->create([
- 'serie_id' => $schoolGrade->grade,
- 'ano_letivo' => now()->year,
- ]);
-
- return [
- 'ref_usuario_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'nm_turma' => $name = $faker->colorName,
- 'sgl_turma' => mb_substr($name, 0, 3),
- 'max_aluno' => $faker->numberBetween(10, 25),
- 'data_cadastro' => now(),
- 'ref_cod_turma_tipo' => factory(LegacySchoolClassType::class)->state('unique')->make(),
- 'ref_ref_cod_escola' => $schoolGrade->school_id,
- 'ref_ref_cod_serie' => $schoolGrade->grade_id,
- 'ref_cod_curso' => $schoolGrade->grade->course_id,
- 'ref_cod_instituicao' => factory(LegacyInstitution::class)->state('unique')->make(),
- 'dias_semana' => [2, 3, 4, 5, 6],
- 'ano' => now()->year,
- 'visivel' => true,
- ];
-});
-
-$factory->state(LegacySchoolClass::class, 'morning', function (Faker $faker) use ($factory) {
- $schollClass = $factory->raw(LegacySchoolClass::class);
-
- return array_merge($schollClass, [
- 'hora_inicial' => '07:45',
- 'hora_final' => '11:45',
- ]);
-});
-
-$factory->state(LegacySchoolClass::class, 'afternoon', function (Faker $faker) use ($factory) {
- $schollClass = $factory->raw(LegacySchoolClass::class);
-
- return array_merge($schollClass, [
- 'hora_inicial' => '13:15',
- 'hora_final' => '17:15',
- ]);
-});
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class LegacySchoolClassFactory extends Factory
+{
+ /**
+ * The name of the factory's corresponding model.
+ *
+ * @var string
+ */
+ protected $model = LegacySchoolClass::class;
+
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ $schoolGrade = LegacySchoolGradeFactory::new()->create();
+
+ LegacyEvaluationRuleGradeYearFactory::new()->create([
+ 'serie_id' => $schoolGrade->grade,
+ 'ano_letivo' => now()->year,
+ ]);
+
+ return [
+ 'ref_usuario_cad' => LegacyUserFactory::new()->unique()->make(),
+ 'nm_turma' => $name = $this->faker->colorName,
+ 'sgl_turma' => mb_substr($name, 0, 3),
+ 'max_aluno' => $this->faker->numberBetween(10, 25),
+ 'data_cadastro' => now(),
+ 'ref_cod_turma_tipo' => LegacySchoolClassTypeFactory::new()->unique()->make(),
+ 'ref_ref_cod_escola' => $schoolGrade->school_id,
+ 'ref_ref_cod_serie' => $schoolGrade->grade_id,
+ 'ref_cod_curso' => $schoolGrade->grade->course_id,
+ 'ref_cod_instituicao' => LegacyInstitutionFactory::new()->unique()->make(),
+ 'dias_semana' => [2, 3, 4, 5, 6],
+ 'ano' => now()->year,
+ 'visivel' => true,
+ ];
+ }
+
+ public function morning(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'hora_inicial' => '07:45',
+ 'hora_final' => '11:45',
+ ]);
+ });
+ }
+
+ public function afternoon(): self
+ {
+ return $this->state(function (array $attributes) {
+ return array_merge($attributes, [
+ 'hora_inicial' => '13:15',
+ 'hora_final' => '17:15',
+ ]);
+ });
+ }
+}
diff --git a/database/factories/LegacySchoolClassStageFactory.php b/database/factories/LegacySchoolClassStageFactory.php
index 43bdada399..a8da3e65fb 100644
--- a/database/factories/LegacySchoolClassStageFactory.php
+++ b/database/factories/LegacySchoolClassStageFactory.php
@@ -1,20 +1,33 @@
define(LegacySchoolClassStage::class, function (Faker $faker) {
- return [
- 'ref_cod_turma' => factory(LegacySchoolClass::class)->create(),
- 'ref_cod_modulo' => factory(LegacyStageType::class)->state('unique')->make(),
- 'sequencial' => $faker->numberBetween(1, 9),
- 'data_inicio' => now()->subMonths(3),
- 'data_fim' => now()->addMonths(3),
- 'dias_letivos' => $faker->numberBetween(150, 200),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_cod_turma' => LegacySchoolClassFactory::new()->create(),
+ 'ref_cod_modulo' => LegacyStageTypeFactory::new()->unique()->make(),
+ 'sequencial' => $this->faker->numberBetween(1, 9),
+ 'data_inicio' => now()->subMonths(3),
+ 'data_fim' => now()->addMonths(3),
+ 'dias_letivos' => $this->faker->numberBetween(150, 200),
+ ];
+ }
+}
diff --git a/database/factories/LegacySchoolClassTypeFactory.php b/database/factories/LegacySchoolClassTypeFactory.php
index 66c2465af2..fc8cbc892c 100644
--- a/database/factories/LegacySchoolClassTypeFactory.php
+++ b/database/factories/LegacySchoolClassTypeFactory.php
@@ -1,34 +1,50 @@
define(LegacySchoolClassType::class, function (Faker $faker) {
- $name = $faker->colorName;
- $abbreviation = mb_substr($faker->colorName, 0, 5);
-
- return [
- 'ref_usuario_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'nm_tipo' => 'Tipo ' . $name,
- 'sgl_tipo' => $abbreviation,
- 'data_cadastro' => now(),
- 'ref_cod_instituicao' => factory(LegacyInstitution::class)->state('unique')->make(),
- ];
-});
-
-$factory->state(LegacySchoolClassType::class, 'unique', function () {
- $schoolClassType = LegacySchoolClassType::query()->first();
-
- if (empty($schoolClassType)) {
- $schoolClassType = factory(LegacySchoolClassType::class)->create();
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class LegacySchoolClassTypeFactory extends Factory
+{
+ /**
+ * The name of the factory's corresponding model.
+ *
+ * @var string
+ */
+ protected $model = LegacySchoolClassType::class;
+
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ $name = $this->faker->colorName;
+ $abbreviation = mb_substr($this->faker->colorName, 0, 5);
+
+ return [
+ 'ref_usuario_cad' => LegacyUserFactory::new()->unique()->make(),
+ 'nm_tipo' => 'Tipo ' . $name,
+ 'sgl_tipo' => $abbreviation,
+ 'data_cadastro' => now(),
+ 'ref_cod_instituicao' => LegacyInstitutionFactory::new()->unique()->make(),
+ ];
}
- return [
- 'cod_turma_tipo' => $schoolClassType->getKey()
- ];
-});
+ public function unique(): self
+ {
+ return $this->state(function () {
+ $schoolClassType = LegacySchoolClassType::query()->first();
+
+ if (empty($schoolClassType)) {
+ $schoolClassType = LegacySchoolClassTypeFactory::new()->create();
+ }
+
+ return [
+ 'cod_turma_tipo' => $schoolClassType->getKey()
+ ];
+ });
+ }
+}
diff --git a/database/factories/LegacySchoolCourseFactory.php b/database/factories/LegacySchoolCourseFactory.php
index 8d2d72e8f7..03e3051941 100644
--- a/database/factories/LegacySchoolCourseFactory.php
+++ b/database/factories/LegacySchoolCourseFactory.php
@@ -1,22 +1,34 @@
define(LegacySchoolCourse::class, function (Faker $faker) {
- return [
- 'ref_cod_escola' => factory(LegacySchool::class)->create(),
- 'ref_cod_curso' => factory(LegacyCourse::class)->create(),
- 'ref_usuario_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'data_cadastro' => now(),
- 'ativo' => 1,
- 'autorizacao' => $faker->sentence,
- 'anos_letivos' => '{' . now()->format('Y') . '}',
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_cod_escola' => LegacySchoolFactory::new()->create(),
+ 'ref_cod_curso' => LegacyCourseFactory::new()->create(),
+ 'ref_usuario_cad' => LegacyUserFactory::new()->unique()->make(),
+ 'data_cadastro' => now(),
+ 'ativo' => 1,
+ 'autorizacao' => $this->faker->sentence,
+ 'anos_letivos' => '{' . now()->format('Y') . '}',
+ ];
+ }
+}
diff --git a/database/factories/LegacySchoolFactory.php b/database/factories/LegacySchoolFactory.php
index adbd7d31c9..98a91d8df0 100644
--- a/database/factories/LegacySchoolFactory.php
+++ b/database/factories/LegacySchoolFactory.php
@@ -1,22 +1,33 @@
define(LegacySchool::class, function (Faker $faker) {
- return [
- 'ref_usuario_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'ref_cod_instituicao' => factory(LegacyInstitution::class)->state('unique')->make(),
- 'ref_cod_escola_rede_ensino' => factory(LegacyEducationNetwork::class)->create(),
- 'sigla' => $faker->asciify(),
- 'data_cadastro' => now(),
- 'ref_idpes' => factory(LegacyOrganization::class)->create(),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_usuario_cad' => LegacyUserFactory::new()->unique()->make(),
+ 'ref_cod_instituicao' => LegacyInstitutionFactory::new()->unique()->make(),
+ 'ref_cod_escola_rede_ensino' => LegacyEducationNetworkFactory::new()->create(),
+ 'sigla' => $this->faker->asciify(),
+ 'data_cadastro' => now(),
+ 'ref_idpes' => LegacyOrganizationFactory::new()->create(),
+ ];
+ }
+}
diff --git a/database/factories/LegacySchoolGradeDisciplineFactory.php b/database/factories/LegacySchoolGradeDisciplineFactory.php
index 060f44dd0e..d549b39a96 100644
--- a/database/factories/LegacySchoolGradeDisciplineFactory.php
+++ b/database/factories/LegacySchoolGradeDisciplineFactory.php
@@ -1,19 +1,32 @@
define(LegacySchoolGradeDiscipline::class, function () {
- return [
- 'ref_ref_cod_escola' => factory(LegacySchool::class)->create(),
- 'ref_ref_cod_serie' => factory(LegacyLevel::class)->create(),
- 'ref_cod_disciplina' => factory(LegacyDiscipline::class)->create(),
- 'ativo' => 1,
- 'anos_letivos' => '{' . now()->year . '}',
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_ref_cod_escola' => LegacySchoolFactory::new()->create(),
+ 'ref_ref_cod_serie' => LegacyLevelFactory::new()->create(),
+ 'ref_cod_disciplina' => LegacyDisciplineFactory::new()->create(),
+ 'ativo' => 1,
+ 'anos_letivos' => '{' . now()->year . '}',
+ ];
+ }
+}
diff --git a/database/factories/LegacySchoolGradeFactory.php b/database/factories/LegacySchoolGradeFactory.php
index c4b03a5ad4..bb8e6bb1da 100644
--- a/database/factories/LegacySchoolGradeFactory.php
+++ b/database/factories/LegacySchoolGradeFactory.php
@@ -1,25 +1,37 @@
define(LegacySchoolGrade::class, function (Faker $faker) {
- $schoolCourse = factory(LegacySchoolCourse::class)->create();
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ $schoolCourse = LegacySchoolCourseFactory::new()->create();
- return [
- 'ref_cod_escola' => $schoolCourse->school,
- 'ref_cod_serie' => factory(LegacyLevel::class)->create([
- 'ref_cod_curso' => $schoolCourse->course,
- ]),
- 'ref_usuario_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'data_cadastro' => now(),
- 'ativo' => 1,
- 'anos_letivos' => $schoolCourse->anos_letivos,
- ];
-});
+ return [
+ 'ref_cod_escola' => $schoolCourse->school,
+ 'ref_cod_serie' => LegacyLevelFactory::new()->create([
+ 'ref_cod_curso' => $schoolCourse->course,
+ ]),
+ 'ref_usuario_cad' => LegacyUserFactory::new()->unique()->make(),
+ 'data_cadastro' => now(),
+ 'ativo' => 1,
+ 'anos_letivos' => $schoolCourse->anos_letivos,
+ ];
+ }
+}
diff --git a/database/factories/LegacySchoolStageFactory.php b/database/factories/LegacySchoolStageFactory.php
index ce9db2906a..9d92891053 100644
--- a/database/factories/LegacySchoolStageFactory.php
+++ b/database/factories/LegacySchoolStageFactory.php
@@ -1,24 +1,37 @@
define(LegacySchoolStage::class, function (Faker $faker) {
- $schoolAcademicYear = factory(LegacySchoolAcademicYear::class)->create();
- $stageType = factory(LegacyStageType::class)->state('unique')->make();
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ $schoolAcademicYear = LegacySchoolAcademicYearFactory::new()->create();
+ $stageType = LegacyStageTypeFactory::new()->unique()->make();
- return [
- 'ref_ano' => now()->year,
- 'ref_ref_cod_escola' => $schoolAcademicYear->ref_cod_escola,
- 'sequencial' => $faker->unique()->numberBetween(1, 9),
- 'ref_cod_modulo' => $stageType->getKey(),
- 'data_inicio' => now()->setDate(2019, 2, 1),
- 'data_fim' => now()->setDate(2019, 11, 30),
- 'dias_letivos' => $faker->numberBetween(150, 200),
- ];
-});
+ return [
+ 'ref_ano' => now()->year,
+ 'ref_ref_cod_escola' => $schoolAcademicYear->ref_cod_escola,
+ 'sequencial' => $this->faker->unique()->numberBetween(1, 9),
+ 'ref_cod_modulo' => $stageType->getKey(),
+ 'data_inicio' => now()->setDate(2019, 2, 1),
+ 'data_fim' => now()->setDate(2019, 11, 30),
+ 'dias_letivos' => $this->faker->numberBetween(150, 200),
+ ];
+ }
+}
diff --git a/database/factories/LegacyStageTypeFactory.php b/database/factories/LegacyStageTypeFactory.php
index dedd26a41e..74df1e8f15 100644
--- a/database/factories/LegacyStageTypeFactory.php
+++ b/database/factories/LegacyStageTypeFactory.php
@@ -1,29 +1,45 @@
LegacyUserFactory::new()->unique()->make(),
+ 'nm_tipo' => $this->faker->word,
+ 'data_cadastro' => now(),
+ 'ref_cod_instituicao' => LegacyInstitutionFactory::new()->unique()->make(),
+ 'num_etapas' => $this->faker->numberBetween(1, 4),
+ ];
+ }
-$factory->define(LegacyStageType::class, function (Faker $faker) {
- return [
- 'ref_usuario_cad' => factory(LegacyUser::class)->state('unique')->make(),
- 'nm_tipo' => $faker->word,
- 'data_cadastro' => now(),
- 'ref_cod_instituicao' => factory(LegacyInstitution::class)->state('unique')->make(),
- 'num_etapas' => $faker->numberBetween(1, 4),
- ];
-});
+ public function unique()
+ {
+ return $this->state(function () {
+ $stageType = LegacyStageType::query()->first();
-$factory->state(LegacyStageType::class, 'unique', function () {
- $stageType = LegacyStageType::query()->first();
+ if (empty($stageType)) {
+ $stageType = LegacyStageTypeFactory::new()->create();
+ }
- if (empty($stageType)) {
- $stageType = factory(LegacyStageType::class)->create();
+ return $stageType->toArray();
+ });
}
-
- return $stageType->toArray();
-});
+}
diff --git a/database/factories/LegacyStudentFactory.php b/database/factories/LegacyStudentFactory.php
index 1c6e0e9d1d..8ca55e8d70 100644
--- a/database/factories/LegacyStudentFactory.php
+++ b/database/factories/LegacyStudentFactory.php
@@ -1,14 +1,29 @@
define(LegacyStudent::class, function () {
- return [
- 'ref_idpes' => factory(LegacyIndividual::class)->create(),
- 'data_cadastro' => now(),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_idpes' => LegacyIndividualFactory::new()->create(),
+ 'data_cadastro' => now(),
+ ];
+ }
+}
diff --git a/database/factories/LegacyTransferRequestFactory.php b/database/factories/LegacyTransferRequestFactory.php
index 5b5201ac2b..ddd4fadd70 100644
--- a/database/factories/LegacyTransferRequestFactory.php
+++ b/database/factories/LegacyTransferRequestFactory.php
@@ -1,21 +1,33 @@
define(LegacyTransferRequest::class, function (Faker $faker) {
- return [
- 'ref_usuario_cad' => 1,
- // 'ref_cod_matricula_saida' => factory(LegacyEnrollment::class)->create(),
- 'observacao' => $faker->words(3, true),
- 'ref_cod_escola_destino' => factory(LegacySchool::class)->create(),
- 'data_cadastro' => now(),
- 'ativo' => 1,
- 'ref_cod_transferencia_tipo' => factory(LegacyTransferType::class)->create()
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'ref_usuario_cad' => 1,
+ 'observacao' => $this->faker->words(3, true),
+ 'ref_cod_escola_destino' => LegacySchoolFactory::new()->create(),
+ 'data_cadastro' => now(),
+ 'ativo' => 1,
+ 'ref_cod_transferencia_tipo' => LegacyTransferTypeFactory::new()->create()
+ ];
+ }
+}
diff --git a/database/factories/LegacyUserFactory.php b/database/factories/LegacyUserFactory.php
index 4c1bf66a71..8f06217a1a 100644
--- a/database/factories/LegacyUserFactory.php
+++ b/database/factories/LegacyUserFactory.php
@@ -1,40 +1,56 @@
function () {
+ return LegacyEmployeeFactory::new()->create()->ref_cod_pessoa_fj;
+ },
+ 'ref_cod_instituicao' => 1,
+ 'ref_funcionario_cad' => function () {
+ return LegacyEmployeeFactory::new()->create()->ref_cod_pessoa_fj;
+ },
+ 'ref_cod_tipo_usuario' => function () {
+ return LegacyUserTypeFactory::new()->create()->cod_tipo_usuario;
+ },
+ 'data_cadastro' => $this->faker->dateTime,
+ 'ativo' => 1,
+ ];
+ }
-$factory->define(LegacyUser::class, function (Faker $faker) {
- return [
- 'cod_usuario' => function () {
- return factory(LegacyEmployee::class)->create()->ref_cod_pessoa_fj;
- },
- 'ref_cod_instituicao' => 1,
- 'ref_funcionario_cad' => function () {
- return factory(LegacyEmployee::class)->create()->ref_cod_pessoa_fj;
- },
- 'ref_cod_tipo_usuario' => function () {
- return factory(LegacyUserType::class)->create()->cod_tipo_usuario;
- },
- 'data_cadastro' => $faker->dateTime,
- 'ativo' => 1,
- ];
-});
+ public function unique()
+ {
+ return $this->state(function () {
+ $user = LegacyUser::query()->first();
-$factory->state(LegacyUser::class, 'unique', function () {
- $user = LegacyUser::query()->first();
+ if (empty($user)) {
+ $user = LegacyUserFactory::new()->create();
+ }
- if (empty($user)) {
- $user = factory(LegacyUser::class)->create();
+ return [
+ 'cod_usuario' => $user->getKey(),
+ 'ref_funcionario_cad' => $user->ref_funcionario_cad,
+ 'ref_cod_tipo_usuario' => $user->cod_tipo_usuario,
+ ];
+ });
}
-
- return [
- 'cod_usuario' => $user->getKey(),
- 'ref_funcionario_cad' => $user->ref_funcionario_cad,
- 'ref_cod_tipo_usuario' => $user->cod_tipo_usuario,
- ];
-});
+}
diff --git a/database/factories/LegacyUserTypeFactory.php b/database/factories/LegacyUserTypeFactory.php
index 30f457ac2c..24647425dc 100644
--- a/database/factories/LegacyUserTypeFactory.php
+++ b/database/factories/LegacyUserTypeFactory.php
@@ -1,19 +1,33 @@
define(LegacyUserType::class, function (Faker $faker) {
- return [
- 'nm_tipo' => $faker->firstName,
- 'nivel' => $faker->randomElement([1, 2, 3, 4]),
- 'ref_funcionario_cad' => function () {
- return factory(LegacyEmployee::class)->create()->ref_cod_pessoa_fj;
- },
- 'data_cadastro' => $faker->dateTime,
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'nm_tipo' => $this->faker->firstName,
+ 'nivel' => $this->faker->randomElement([1, 2, 3, 4]),
+ 'ref_funcionario_cad' => function () {
+ return LegacyEmployeeFactory::new()->create()->ref_cod_pessoa_fj;
+ },
+ 'data_cadastro' => $this->faker->dateTime,
+ ];
+ }
+}
diff --git a/database/factories/LegacyValueRoundingTableFactory.php b/database/factories/LegacyValueRoundingTableFactory.php
index 5ac34dbebd..f9db28772f 100644
--- a/database/factories/LegacyValueRoundingTableFactory.php
+++ b/database/factories/LegacyValueRoundingTableFactory.php
@@ -1,15 +1,29 @@
define(LegacyValueRoundingTable::class, function (Faker $faker) {
- return [
- 'tabela_arredondamento_id' => factory(LegacyRoundingTable::class)->make(),
- 'nome' => $faker->randomNumber(1),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'tabela_arredondamento_id' => LegacyRoundingTableFactory::new()->make(),
+ 'nome' => $this->faker->randomNumber(1),
+ ];
+ }
+}
diff --git a/database/factories/PersonHasPlaceFactory.php b/database/factories/PersonHasPlaceFactory.php
index ce306e5069..d13ec67632 100644
--- a/database/factories/PersonHasPlaceFactory.php
+++ b/database/factories/PersonHasPlaceFactory.php
@@ -1,17 +1,30 @@
define(PersonHasPlace::class, function (Faker $faker) {
- return [
- 'person_id' => factory(LegacyPerson::class)->create(),
- 'place_id' => factory(Place::class)->create(),
- 'type' => 1,
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'person_id' => LegacyPersonFactory::new()->create(),
+ 'place_id' => PlaceFactory::new()->create(),
+ 'type' => 1,
+ ];
+ }
+}
diff --git a/database/factories/PlaceFactory.php b/database/factories/PlaceFactory.php
index 6b6e987cc1..53ec45ba78 100644
--- a/database/factories/PlaceFactory.php
+++ b/database/factories/PlaceFactory.php
@@ -1,19 +1,33 @@
define(Place::class, function (Faker $faker) {
- return [
- 'city_id' => factory(City::class)->create(),
- 'address' => $faker->streetName,
- 'number' => $faker->numberBetween(1, 9999),
- 'complement' => $faker->boolean ? 'Apto' : null,
- 'neighborhood' => $faker->month . ' Neighborhood',
- 'postal_code' => $faker->numerify('########'),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'city_id' => CityFactory::new()->create(),
+ 'address' => $this->faker->streetName,
+ 'number' => $this->faker->numberBetween(1, 9999),
+ 'complement' => $this->faker->boolean ? 'Apto' : null,
+ 'neighborhood' => $this->faker->month . ' Neighborhood',
+ 'postal_code' => $this->faker->numerify('########'),
+ ];
+ }
+}
diff --git a/database/factories/SchoolInep.php b/database/factories/SchoolInep.php
deleted file mode 100644
index eee296016f..0000000000
--- a/database/factories/SchoolInep.php
+++ /dev/null
@@ -1,15 +0,0 @@
-define(SchoolInep::class, function (Faker $faker) {
- return [
- 'cod_escola' => factory(LegacySchool::class)->create(),
- 'cod_escola_inep' => $faker->numerify('########'),
- ];
-});
diff --git a/database/factories/SchoolInepFactory.php b/database/factories/SchoolInepFactory.php
new file mode 100644
index 0000000000..decb385310
--- /dev/null
+++ b/database/factories/SchoolInepFactory.php
@@ -0,0 +1,29 @@
+ LegacySchoolFactory::new()->create(),
+ 'cod_escola_inep' => $this->faker->numerify('########'),
+ ];
+ }
+}
diff --git a/database/factories/SettingFactory.php b/database/factories/SettingFactory.php
index 26bcc0e578..d629596f54 100644
--- a/database/factories/SettingFactory.php
+++ b/database/factories/SettingFactory.php
@@ -1,33 +1,48 @@
define(Setting::class, function (Faker $faker) {
- $type = $faker->randomElement([
- Setting::TYPE_STRING,
- Setting::TYPE_INTEGER,
- Setting::TYPE_FLOAT,
- Setting::TYPE_BOOLEAN,
- ]);
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ $type = $this->faker->randomElement([
+ Setting::TYPE_STRING,
+ Setting::TYPE_INTEGER,
+ Setting::TYPE_FLOAT,
+ Setting::TYPE_BOOLEAN,
+ ]);
- if ($type === Setting::TYPE_STRING) {
- $value = $faker->words(3, true);
- } elseif ($type === Setting::TYPE_INTEGER) {
- $value = $faker->numberBetween(0, 1000000);
- } elseif ($type === Setting::TYPE_FLOAT) {
- $value = $faker->randomFloat(2, 10, 100);
- } elseif ($type === Setting::TYPE_BOOLEAN) {
- $value = $faker->boolean;
- }
+ if ($type === Setting::TYPE_STRING) {
+ $value = $this->faker->words(3, true);
+ } elseif ($type === Setting::TYPE_INTEGER) {
+ $value = $this->faker->numberBetween(0, 1000000);
+ } elseif ($type === Setting::TYPE_FLOAT) {
+ $value = $this->faker->randomFloat(2, 10, 100);
+ } elseif ($type === Setting::TYPE_BOOLEAN) {
+ $value = $this->faker->boolean;
+ }
- return [
- 'key' => $faker->unique()->word,
- 'value' => $value,
- 'type' => $faker->randomElement(['string', 'integer', 'float', 'boolean']),
- 'description' => $faker->words(3, true),
- ];
-});
+ return [
+ 'key' => $this->faker->unique()->word,
+ 'value' => $value,
+ 'type' => $this->faker->randomElement(['string', 'integer', 'float', 'boolean']),
+ 'description' => $this->faker->words(3, true),
+ ];
+ }
+}
diff --git a/database/factories/StateFactory.php b/database/factories/StateFactory.php
index 5cd50abb1c..3c2c68a85f 100644
--- a/database/factories/StateFactory.php
+++ b/database/factories/StateFactory.php
@@ -1,18 +1,32 @@
define(State::class, function (Faker $faker) {
- return [
- 'country_id' => factory(Country::class)->create(),
- 'name' => Str::ucfirst($month = $faker->monthName) . ' ' . Str::ucfirst($color = $faker->colorName),
- 'abbreviation' => Str::substr($month, 0, 1) . ' ' . Str::substr($color, 0, 1),
- 'ibge_code' => $faker->numerify('########'),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'country_id' => CountryFactory::new()->create(),
+ 'name' => Str::ucfirst($month = $this->faker->monthName()) . ' ' . Str::ucfirst($color = $this->faker->colorName()),
+ 'abbreviation' => Str::substr($month, 0, 1) . ' ' . Str::substr($color, 0, 1),
+ 'ibge_code' => $this->faker->numerify('########'),
+ ];
+ }
+}
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 1b7c40c60a..ead4b0f938 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -1,24 +1,41 @@
define(User::class, function (Faker $faker) {
- return [
- 'cod_usuario' => factory(LegacyEmployee::class)->create(),
- 'name' => $faker->name,
- 'email' => $faker->unique()->safeEmail,
- 'email_verified_at' => now(),
- 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
- 'remember_token' => Str::random(10),
- ];
-});
+ /**
+ * Define the model's default state.
+ *
+ * @return array
+ */
+ public function definition(): array
+ {
+ return [
+ 'cod_usuario' => LegacyEmployeeFactory::new()->create(),
+ 'name' => $this->faker->name,
+ 'email' => $this->faker->unique()->safeEmail,
+ 'email_verified_at' => now(),
+ 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
+ 'remember_token' => Str::random(10),
+ ];
+ }
-$factory->state(User::class, 'admin', function () {
- return User::query()->find(1)->toArray();
-});
+ public function admin(): self
+ {
+ return $this->state(function () {
+ return User::query()->find(1)->toArray();
+ });
+ }
+}
diff --git a/database/migrations/2020_01_09_100000_drop_some_foreign_keys_in_cadastro_documento_table.php b/database/migrations/2020_01_09_100000_drop_some_foreign_keys_in_cadastro_documento_table.php
index e2748b5e0f..b649765451 100644
--- a/database/migrations/2020_01_09_100000_drop_some_foreign_keys_in_cadastro_documento_table.php
+++ b/database/migrations/2020_01_09_100000_drop_some_foreign_keys_in_cadastro_documento_table.php
@@ -8,7 +8,8 @@
class DropSomeForeignKeysInCadastroDocumentoTable extends Migration
{
- use DropForeignKey, EnableDisableForeignKeys;
+ use DropForeignKey;
+ use EnableDisableForeignKeys;
/**
* @var bool
diff --git a/database/migrations/2020_04_06_163416_cria_view_situacao_relatorios.php b/database/migrations/2020_04_06_163416_cria_view_situacao_relatorios.php
index 89c8e444a6..1d5b72b14a 100644
--- a/database/migrations/2020_04_06_163416_cria_view_situacao_relatorios.php
+++ b/database/migrations/2020_04_06_163416_cria_view_situacao_relatorios.php
@@ -1,12 +1,12 @@
getSettingCategoryIdByName('Sem categoria');
Schema::table('settings', function (Blueprint $table) use ($settingCategoryIdDefault) {
-
$table->integer('setting_category_id')->default($settingCategoryIdDefault);
$table->foreign('setting_category_id')->on('settings_categories')->references('id');
});
diff --git a/database/migrations/2020_08_20_135110_alter_trigger_deleted_at_in_modules_area_conhecimento_excluidos_table.php b/database/migrations/2020_08_20_135110_alter_trigger_deleted_at_in_modules_area_conhecimento_excluidos_table.php
index cff0aff777..c82970cb7f 100755
--- a/database/migrations/2020_08_20_135110_alter_trigger_deleted_at_in_modules_area_conhecimento_excluidos_table.php
+++ b/database/migrations/2020_08_20_135110_alter_trigger_deleted_at_in_modules_area_conhecimento_excluidos_table.php
@@ -6,6 +6,7 @@
class AlterTriggerDeletedAtInModulesAreaConhecimentoExcluidosTable extends Migration
{
use WhenDeleted;
+
/**
* Run the migrations.
*
diff --git a/database/migrations/2021_03_10_171217_add_columns_enrollment_info.php b/database/migrations/2021_03_10_171217_add_columns_enrollment_info.php
index 87d00d4535..33618ff6da 100644
--- a/database/migrations/2021_03_10_171217_add_columns_enrollment_info.php
+++ b/database/migrations/2021_03_10_171217_add_columns_enrollment_info.php
@@ -5,6 +5,7 @@
class AddColumnsEnrollmentInfo extends Migration
{
use \App\Support\Database\AsView;
+
/**
* Run the migrations.
*
diff --git a/database/migrations/2021_04_13_181109_add_default_value_in_field.php b/database/migrations/2021_04_13_181109_add_default_value_in_field.php
index f5e0f4bca0..41ce60d6a4 100644
--- a/database/migrations/2021_04_13_181109_add_default_value_in_field.php
+++ b/database/migrations/2021_04_13_181109_add_default_value_in_field.php
@@ -3,10 +3,8 @@
use App\Support\Database\AsView;
use Illuminate\Database\Migrations\Migration;
-
class AddDefaultValueInField extends Migration
{
-
use AsView;
public function up()
diff --git a/database/migrations/2021_04_15_113428_add_modalidade_ensino_in_matricula.php b/database/migrations/2021_04_15_113428_add_modalidade_ensino_in_matricula.php
index 922508b034..df988be109 100644
--- a/database/migrations/2021_04_15_113428_add_modalidade_ensino_in_matricula.php
+++ b/database/migrations/2021_04_15_113428_add_modalidade_ensino_in_matricula.php
@@ -2,7 +2,6 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
class AddModalidadeEnsinoInMatricula extends Migration
diff --git a/database/migrations/2021_05_11_113201_remove_required_cnpj_for_juridica.php b/database/migrations/2021_05_11_113201_remove_required_cnpj_for_juridica.php
index 6c32bcc2b3..b7a6c14159 100644
--- a/database/migrations/2021_05_11_113201_remove_required_cnpj_for_juridica.php
+++ b/database/migrations/2021_05_11_113201_remove_required_cnpj_for_juridica.php
@@ -1,9 +1,7 @@
where('old', 55)->firstOrFail()->id;
Menu::query()->create([
diff --git a/database/migrations/2021_06_23_171544_add_setting_max_days_without_login_to_disable_user.php b/database/migrations/2021_06_23_171544_add_setting_max_days_without_login_to_disable_user.php
index 825a1037a6..c77e7cf2b8 100644
--- a/database/migrations/2021_06_23_171544_add_setting_max_days_without_login_to_disable_user.php
+++ b/database/migrations/2021_06_23_171544_add_setting_max_days_without_login_to_disable_user.php
@@ -7,6 +7,7 @@
class AddSettingMaxDaysWithoutLoginToDisableUser extends Migration
{
use SettingCategoryTrait;
+
/**
* Run the migrations.
*
diff --git a/database/migrations/2021_06_29_104528_corrige_funcao_do_servidor_disciplinas.php b/database/migrations/2021_06_29_104528_corrige_funcao_do_servidor_disciplinas.php
index 5aa5b6c542..4c106d7fa0 100755
--- a/database/migrations/2021_06_29_104528_corrige_funcao_do_servidor_disciplinas.php
+++ b/database/migrations/2021_06_29_104528_corrige_funcao_do_servidor_disciplinas.php
@@ -12,7 +12,7 @@ class CorrigeFuncaoDoServidorDisciplinas extends Migration
*/
public function up()
{
- DB::statement("
+ DB::statement('
UPDATE pmieducar.servidor_disciplina
SET ref_cod_funcao = (
SELECT cod_servidor_funcao
@@ -27,7 +27,7 @@ public function up()
WHERE servidor_funcao.cod_servidor_funcao = servidor_disciplina.ref_cod_funcao
AND servidor_funcao.ref_cod_servidor = servidor_disciplina.ref_cod_servidor
);
- ");
+ ');
}
/**
diff --git a/database/migrations/2021_07_19_105119_add_data_cancel_in_view_exporter_student.php b/database/migrations/2021_07_19_105119_add_data_cancel_in_view_exporter_student.php
index 7371289de5..7c9195c934 100644
--- a/database/migrations/2021_07_19_105119_add_data_cancel_in_view_exporter_student.php
+++ b/database/migrations/2021_07_19_105119_add_data_cancel_in_view_exporter_student.php
@@ -2,8 +2,6 @@
use App\Support\Database\MigrationUtils;
use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
class AddDataCancelInViewExporterStudent extends Migration
{
diff --git a/database/migrations/2021_08_23_101322_atualiza_nomenclatura_de_configuracoes.php b/database/migrations/2021_08_23_101322_atualiza_nomenclatura_de_configuracoes.php
index e300316db0..8bd259707a 100644
--- a/database/migrations/2021_08_23_101322_atualiza_nomenclatura_de_configuracoes.php
+++ b/database/migrations/2021_08_23_101322_atualiza_nomenclatura_de_configuracoes.php
@@ -1,9 +1,7 @@
foreign('ref_idpes')
- ->references('idpes')
- ->on('cadastro.fisica')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('idpes')
+ ->on('cadastro.fisica')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_deficiencia')
- ->references('cod_deficiencia')
- ->on('cadastro.deficiencia')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_deficiencia')
+ ->on('cadastro.deficiencia')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_calendario_turma_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_calendario_turma_table.php
index 25280293bb..8b8820ec0f 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_calendario_turma_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_calendario_turma_table.php
@@ -15,9 +15,9 @@ public function up()
{
Schema::table('modules.calendario_turma', function (Blueprint $table) {
$table->foreign(['calendario_ano_letivo_id', 'mes', 'dia'])
- ->references(['ref_cod_calendario_ano_letivo', 'mes', 'dia'])
- ->on('pmieducar.calendario_dia')
- ->onDelete('cascade');
+ ->references(['ref_cod_calendario_ano_letivo', 'mes', 'dia'])
+ ->on('pmieducar.calendario_dia')
+ ->onDelete('cascade');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_ano_escolar_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_ano_escolar_table.php
index 81d1da9c20..1ff95e307c 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_ano_escolar_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_ano_escolar_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('modules.componente_curricular_ano_escolar', function (Blueprint $table) {
$table->foreign('componente_curricular_id')
- ->references('id')
- ->on('modules.componente_curricular')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('modules.componente_curricular')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_table.php
index 070068b682..b3706917ff 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('modules.componente_curricular', function (Blueprint $table) {
$table->foreign(['area_conhecimento_id', 'instituicao_id'])
- ->references(['id', 'instituicao_id'])
- ->on('modules.area_conhecimento')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['id', 'instituicao_id'])
+ ->on('modules.area_conhecimento')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_turma_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_turma_table.php
index 7c6f8d7b32..6f0bfca32c 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_turma_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_componente_curricular_turma_table.php
@@ -15,14 +15,14 @@ public function up()
{
Schema::table('modules.componente_curricular_turma', function (Blueprint $table) {
$table->foreign('turma_id')
- ->references('cod_turma')
- ->on('pmieducar.turma')
- ->onDelete('cascade');
+ ->references('cod_turma')
+ ->on('pmieducar.turma')
+ ->onDelete('cascade');
$table->foreign('componente_curricular_id')
- ->references('id')
- ->on('modules.componente_curricular')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('modules.componente_curricular')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_config_movimento_geral_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_config_movimento_geral_table.php
index 294fb28ca5..99fda632ba 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_config_movimento_geral_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_config_movimento_geral_table.php
@@ -15,8 +15,8 @@ public function up()
{
Schema::table('modules.config_movimento_geral', function (Blueprint $table) {
$table->foreign('ref_cod_serie')
- ->references('cod_serie')
- ->on('pmieducar.serie');
+ ->references('cod_serie')
+ ->on('pmieducar.serie');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_docente_licenciatura_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_docente_licenciatura_table.php
index bfd483fdba..2d9690faf5 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_docente_licenciatura_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_docente_licenciatura_table.php
@@ -15,9 +15,9 @@ public function up()
{
Schema::table('modules.docente_licenciatura', function (Blueprint $table) {
$table->foreign('ies_id')
- ->references('id')
- ->on('modules.educacenso_ies')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('modules.educacenso_ies')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_aluno_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_aluno_table.php
index 0e931871dd..e42c6d405b 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_aluno_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_aluno_table.php
@@ -15,9 +15,9 @@ public function up()
{
Schema::table('modules.educacenso_cod_aluno', function (Blueprint $table) {
$table->foreign('cod_aluno')
- ->references('cod_aluno')
- ->on('pmieducar.aluno')
- ->onDelete('cascade');
+ ->references('cod_aluno')
+ ->on('pmieducar.aluno')
+ ->onDelete('cascade');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_escola_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_escola_table.php
index 5e0529ac35..d6629a5cda 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_escola_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_escola_table.php
@@ -15,9 +15,9 @@ public function up()
{
Schema::table('modules.educacenso_cod_escola', function (Blueprint $table) {
$table->foreign('cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola')
- ->onDelete('cascade');
+ ->references('cod_escola')
+ ->on('pmieducar.escola')
+ ->onDelete('cascade');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_turma_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_turma_table.php
index 719c9d06e8..76777a9955 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_turma_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_educacenso_cod_turma_table.php
@@ -15,9 +15,9 @@ public function up()
{
Schema::table('modules.educacenso_cod_turma', function (Blueprint $table) {
$table->foreign('cod_turma')
- ->references('cod_turma')
- ->on('pmieducar.turma')
- ->onDelete('cascade');
+ ->references('cod_turma')
+ ->on('pmieducar.turma')
+ ->onDelete('cascade');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_empresa_transporte_escolar_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_empresa_transporte_escolar_table.php
index acb9441a91..4e8e20a3de 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_empresa_transporte_escolar_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_empresa_transporte_escolar_table.php
@@ -15,14 +15,14 @@ public function up()
{
Schema::table('modules.empresa_transporte_escolar', function (Blueprint $table) {
$table->foreign('ref_resp_idpes')
- ->references('idpes')
- ->on('cadastro.fisica')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('idpes')
+ ->on('cadastro.fisica')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_idpes')
- ->references('idpes')
- ->on('cadastro.juridica');
+ ->references('idpes')
+ ->on('cadastro.juridica');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_etapas_curso_educacenso_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_etapas_curso_educacenso_table.php
index 41aed893bb..8f9b906f23 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_etapas_curso_educacenso_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_etapas_curso_educacenso_table.php
@@ -15,12 +15,12 @@ public function up()
{
Schema::table('modules.etapas_curso_educacenso', function (Blueprint $table) {
$table->foreign('etapa_id')
- ->references('id')
- ->on('modules.etapas_educacenso');
+ ->references('id')
+ ->on('modules.etapas_educacenso');
$table->foreign('curso_id')
- ->references('cod_curso')
- ->on('pmieducar.curso');
+ ->references('cod_curso')
+ ->on('pmieducar.curso');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_falta_componente_curricular_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_falta_componente_curricular_table.php
index bf58a4877f..7ab20abf86 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_falta_componente_curricular_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_falta_componente_curricular_table.php
@@ -15,9 +15,9 @@ public function up()
{
Schema::table('modules.falta_componente_curricular', function (Blueprint $table) {
$table->foreign('falta_aluno_id')
- ->references('id')
- ->on('modules.falta_aluno')
- ->onDelete('cascade');
+ ->references('id')
+ ->on('modules.falta_aluno')
+ ->onDelete('cascade');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_ficha_medica_aluno_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_ficha_medica_aluno_table.php
index 68a1299168..94aa94a5cb 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_ficha_medica_aluno_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_ficha_medica_aluno_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('modules.ficha_medica_aluno', function (Blueprint $table) {
$table->foreign('ref_cod_aluno')
- ->references('cod_aluno')
- ->on('pmieducar.aluno')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_aluno')
+ ->on('pmieducar.aluno')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_itinerario_transporte_escolar_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_itinerario_transporte_escolar_table.php
index be3ca58aba..c40ee32ac5 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_itinerario_transporte_escolar_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_itinerario_transporte_escolar_table.php
@@ -15,14 +15,14 @@ public function up()
{
Schema::table('modules.itinerario_transporte_escolar', function (Blueprint $table) {
$table->foreign('ref_cod_veiculo')
- ->references('cod_veiculo')
- ->on('modules.veiculo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_veiculo')
+ ->on('modules.veiculo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_rota_transporte_escolar')
- ->references('cod_rota_transporte_escolar')
- ->on('modules.rota_transporte_escolar');
+ ->references('cod_rota_transporte_escolar')
+ ->on('modules.rota_transporte_escolar');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_nota_componente_curricular_media_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_nota_componente_curricular_media_table.php
index 2bc772177b..295fa24ff5 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_nota_componente_curricular_media_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_nota_componente_curricular_media_table.php
@@ -15,9 +15,9 @@ public function up()
{
Schema::table('modules.nota_componente_curricular_media', function (Blueprint $table) {
$table->foreign('nota_aluno_id')
- ->references('id')
- ->on('modules.nota_aluno')
- ->onDelete('cascade');
+ ->references('id')
+ ->on('modules.nota_aluno')
+ ->onDelete('cascade');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_nota_componente_curricular_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_nota_componente_curricular_table.php
index 86d951ce75..2e36ef1add 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_nota_componente_curricular_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_nota_componente_curricular_table.php
@@ -15,9 +15,9 @@ public function up()
{
Schema::table('modules.nota_componente_curricular', function (Blueprint $table) {
$table->foreign('nota_aluno_id')
- ->references('id')
- ->on('modules.nota_aluno')
- ->onDelete('cascade');
+ ->references('id')
+ ->on('modules.nota_aluno')
+ ->onDelete('cascade');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_parecer_componente_curricular_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_parecer_componente_curricular_table.php
index 3892abc737..43d6a76cf5 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_parecer_componente_curricular_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_parecer_componente_curricular_table.php
@@ -15,9 +15,9 @@ public function up()
{
Schema::table('modules.parecer_componente_curricular', function (Blueprint $table) {
$table->foreign('parecer_aluno_id')
- ->references('id')
- ->on('modules.parecer_aluno')
- ->onDelete('cascade');
+ ->references('id')
+ ->on('modules.parecer_aluno')
+ ->onDelete('cascade');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_pessoa_transporte_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_pessoa_transporte_table.php
index ed0904fa2c..a872651190 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_pessoa_transporte_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_pessoa_transporte_table.php
@@ -15,22 +15,22 @@ public function up()
{
Schema::table('modules.pessoa_transporte', function (Blueprint $table) {
$table->foreign('ref_idpes')
- ->references('idpes')
- ->on('cadastro.fisica')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('idpes')
+ ->on('cadastro.fisica')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_idpes_destino')
- ->references('idpes')
- ->on('cadastro.juridica');
+ ->references('idpes')
+ ->on('cadastro.juridica');
$table->foreign('ref_cod_rota_transporte_escolar')
- ->references('cod_rota_transporte_escolar')
- ->on('modules.rota_transporte_escolar');
+ ->references('cod_rota_transporte_escolar')
+ ->on('modules.rota_transporte_escolar');
$table->foreign('ref_cod_ponto_transporte_escolar')
- ->references('cod_ponto_transporte_escolar')
- ->on('modules.ponto_transporte_escolar');
+ ->references('cod_ponto_transporte_escolar')
+ ->on('modules.ponto_transporte_escolar');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_professor_turma_disciplina_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_professor_turma_disciplina_table.php
index 27576e517c..2be3026a9f 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_professor_turma_disciplina_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_professor_turma_disciplina_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('modules.professor_turma_disciplina', function (Blueprint $table) {
$table->foreign('professor_turma_id')
- ->references('id')
- ->on('modules.professor_turma')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('modules.professor_turma')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('componente_curricular_id')
- ->references('id')
- ->on('modules.componente_curricular')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('modules.componente_curricular')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_professor_turma_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_professor_turma_table.php
index 9cbe733a26..be2f91ebb9 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_professor_turma_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_professor_turma_table.php
@@ -15,22 +15,22 @@ public function up()
{
Schema::table('modules.professor_turma', function (Blueprint $table) {
$table->foreign('turno_id')
- ->references('id')
- ->on('pmieducar.turma_turno')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('pmieducar.turma_turno')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('turma_id')
- ->references('cod_turma')
- ->on('pmieducar.turma')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_turma')
+ ->on('pmieducar.turma')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign(['servidor_id', 'instituicao_id'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_recuperacao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_recuperacao_table.php
index d032ca392e..2485376828 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_recuperacao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_recuperacao_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('modules.regra_avaliacao_recuperacao', function (Blueprint $table) {
$table->foreign('regra_avaliacao_id')
- ->references('id')
- ->on('modules.regra_avaliacao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('modules.regra_avaliacao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_serie_ano_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_serie_ano_table.php
index 9f54a669dc..f1e49834b9 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_serie_ano_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_serie_ano_table.php
@@ -15,22 +15,22 @@ public function up()
{
Schema::table('modules.regra_avaliacao_serie_ano', function (Blueprint $table) {
$table->foreign('serie_id')
- ->references('cod_serie')
- ->on('pmieducar.serie')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_serie')
+ ->on('pmieducar.serie')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('regra_avaliacao_id')
- ->references('id')
- ->on('modules.regra_avaliacao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('modules.regra_avaliacao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('regra_avaliacao_diferenciada_id')
- ->references('id')
- ->on('modules.regra_avaliacao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('modules.regra_avaliacao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_table.php
index ed2402d55f..8a770d2f21 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_regra_avaliacao_table.php
@@ -15,26 +15,26 @@ public function up()
{
Schema::table('modules.regra_avaliacao', function (Blueprint $table) {
$table->foreign('regra_diferenciada_id')
- ->references('id')
- ->on('modules.regra_avaliacao');
+ ->references('id')
+ ->on('modules.regra_avaliacao');
$table->foreign(['tabela_arredondamento_id', 'instituicao_id'])
- ->references(['id', 'instituicao_id'])
- ->on('modules.tabela_arredondamento')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['id', 'instituicao_id'])
+ ->on('modules.tabela_arredondamento')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign(['formula_recuperacao_id', 'instituicao_id'])
- ->references(['id', 'instituicao_id'])
- ->on('modules.formula_media')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['id', 'instituicao_id'])
+ ->on('modules.formula_media')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign(['formula_media_id', 'instituicao_id'])
- ->references(['id', 'instituicao_id'])
- ->on('modules.formula_media')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['id', 'instituicao_id'])
+ ->on('modules.formula_media')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_rota_transporte_escolar_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_rota_transporte_escolar_table.php
index 65a91f5794..1b411f850c 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_rota_transporte_escolar_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_rota_transporte_escolar_table.php
@@ -15,14 +15,14 @@ public function up()
{
Schema::table('modules.rota_transporte_escolar', function (Blueprint $table) {
$table->foreign('ref_idpes_destino')
- ->references('idpes')
- ->on('cadastro.juridica');
+ ->references('idpes')
+ ->on('cadastro.juridica');
$table->foreign('ref_cod_empresa_transporte_escolar')
- ->references('cod_empresa_transporte_escolar')
- ->on('modules.empresa_transporte_escolar')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_empresa_transporte_escolar')
+ ->on('modules.empresa_transporte_escolar')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_tabela_arredondamento_valor_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_tabela_arredondamento_valor_table.php
index 1596bb4892..380b72ada8 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_tabela_arredondamento_valor_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_tabela_arredondamento_valor_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('modules.tabela_arredondamento_valor', function (Blueprint $table) {
$table->foreign('tabela_arredondamento_id')
- ->references('id')
- ->on('modules.tabela_arredondamento')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('modules.tabela_arredondamento')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_transporte_aluno_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_transporte_aluno_table.php
index 8847977e30..e114f2aaec 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_transporte_aluno_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_modules_transporte_aluno_table.php
@@ -15,9 +15,9 @@ public function up()
{
Schema::table('modules.transporte_aluno', function (Blueprint $table) {
$table->foreign('aluno_id')
- ->references('cod_aluno')
- ->on('pmieducar.aluno')
- ->onDelete('cascade');
+ ->references('cod_aluno')
+ ->on('pmieducar.aluno')
+ ->onDelete('cascade');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_abandono_tipo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_abandono_tipo_table.php
index 4e16cd07c7..7e6209c254 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_abandono_tipo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_abandono_tipo_table.php
@@ -15,8 +15,8 @@ public function up()
{
Schema::table('pmieducar.abandono_tipo', function (Blueprint $table) {
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_acervo_assunto_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_acervo_assunto_table.php
index d971908d53..c6fb751575 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_acervo_assunto_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_acervo_assunto_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.acervo_acervo_assunto', function (Blueprint $table) {
$table->foreign('ref_cod_acervo')
- ->references('cod_acervo')
- ->on('pmieducar.acervo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_acervo')
+ ->on('pmieducar.acervo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_acervo_assunto')
- ->references('cod_acervo_assunto')
- ->on('pmieducar.acervo_assunto')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_acervo_assunto')
+ ->on('pmieducar.acervo_assunto')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_acervo_autor_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_acervo_autor_table.php
index 72988e0aee..d404c603c5 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_acervo_autor_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_acervo_autor_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.acervo_acervo_autor', function (Blueprint $table) {
$table->foreign('ref_cod_acervo')
- ->references('cod_acervo')
- ->on('pmieducar.acervo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_acervo')
+ ->on('pmieducar.acervo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_acervo_autor')
- ->references('cod_acervo_autor')
- ->on('pmieducar.acervo_autor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_acervo_autor')
+ ->on('pmieducar.acervo_autor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_assunto_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_assunto_table.php
index ae1aaefb3e..45b39dede1 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_assunto_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_assunto_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.acervo_assunto', function (Blueprint $table) {
$table->foreign('ref_cod_biblioteca')
- ->references('cod_biblioteca')
- ->on('pmieducar.biblioteca')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_biblioteca')
+ ->on('pmieducar.biblioteca')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_colecao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_colecao_table.php
index 26aa89c2a7..56e0e17adc 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_colecao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_colecao_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.acervo_colecao', function (Blueprint $table) {
$table->foreign('ref_cod_biblioteca')
- ->references('cod_biblioteca')
- ->on('pmieducar.biblioteca')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_biblioteca')
+ ->on('pmieducar.biblioteca')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_idioma_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_idioma_table.php
index bf008caa53..b9ae0767db 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_idioma_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_acervo_idioma_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.acervo_idioma', function (Blueprint $table) {
$table->foreign('ref_cod_biblioteca')
- ->references('cod_biblioteca')
- ->on('pmieducar.biblioteca')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_biblioteca')
+ ->on('pmieducar.biblioteca')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_aluno_aluno_beneficio_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_aluno_aluno_beneficio_table.php
index 9b6987d3a0..3978f9b2f0 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_aluno_aluno_beneficio_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_aluno_aluno_beneficio_table.php
@@ -15,12 +15,12 @@ public function up()
{
Schema::table('pmieducar.aluno_aluno_beneficio', function (Blueprint $table) {
$table->foreign('aluno_id')
- ->references('cod_aluno')
- ->on('pmieducar.aluno');
+ ->references('cod_aluno')
+ ->on('pmieducar.aluno');
$table->foreign('aluno_beneficio_id')
- ->references('cod_aluno_beneficio')
- ->on('pmieducar.aluno_beneficio');
+ ->references('cod_aluno_beneficio')
+ ->on('pmieducar.aluno_beneficio');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_aluno_historico_altura_peso_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_aluno_historico_altura_peso_table.php
index 1f4d132192..e7cdf80be1 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_aluno_historico_altura_peso_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_aluno_historico_altura_peso_table.php
@@ -15,8 +15,8 @@ public function up()
{
Schema::table('pmieducar.aluno_historico_altura_peso', function (Blueprint $table) {
$table->foreign('ref_cod_aluno')
- ->references('cod_aluno')
- ->on('pmieducar.aluno');
+ ->references('cod_aluno')
+ ->on('pmieducar.aluno');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_ano_letivo_modulo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_ano_letivo_modulo_table.php
index 3ae67be4d9..d40dca5bf9 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_ano_letivo_modulo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_ano_letivo_modulo_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.ano_letivo_modulo', function (Blueprint $table) {
$table->foreign(['ref_ref_cod_escola', 'ref_ano'])
- ->references(['ref_cod_escola', 'ano'])
- ->on('pmieducar.escola_ano_letivo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['ref_cod_escola', 'ano'])
+ ->on('pmieducar.escola_ano_letivo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_modulo')
- ->references('cod_modulo')
- ->on('pmieducar.modulo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_modulo')
+ ->on('pmieducar.modulo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_avaliacao_desempenho_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_avaliacao_desempenho_table.php
index d4c2698106..5e7e5b38a6 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_avaliacao_desempenho_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_avaliacao_desempenho_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.avaliacao_desempenho', function (Blueprint $table) {
$table->foreign(['ref_cod_servidor', 'ref_ref_cod_instituicao'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_dia_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_dia_table.php
index c0575902f7..2a21eb46e6 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_dia_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_dia_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.biblioteca_dia', function (Blueprint $table) {
$table->foreign('ref_cod_biblioteca')
- ->references('cod_biblioteca')
- ->on('pmieducar.biblioteca')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_biblioteca')
+ ->on('pmieducar.biblioteca')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_feriados_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_feriados_table.php
index 26ea92fb52..8538b0f6dc 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_feriados_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_feriados_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.biblioteca_feriados', function (Blueprint $table) {
$table->foreign('ref_cod_biblioteca')
- ->references('cod_biblioteca')
- ->on('pmieducar.biblioteca')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_biblioteca')
+ ->on('pmieducar.biblioteca')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_usuario_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_usuario_table.php
index 475f257aa4..e970907f01 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_usuario_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_biblioteca_usuario_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.biblioteca_usuario', function (Blueprint $table) {
$table->foreign('ref_cod_biblioteca')
- ->references('cod_biblioteca')
- ->on('pmieducar.biblioteca')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_biblioteca')
+ ->on('pmieducar.biblioteca')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_bloqueio_ano_letivo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_bloqueio_ano_letivo_table.php
index baf42535d1..64e7fe0e5f 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_bloqueio_ano_letivo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_bloqueio_ano_letivo_table.php
@@ -15,8 +15,8 @@ public function up()
{
Schema::table('pmieducar.bloqueio_ano_letivo', function (Blueprint $table) {
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_bloqueio_lancamento_faltas_notas_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_bloqueio_lancamento_faltas_notas_table.php
index f43a6bde76..fb54dc72bb 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_bloqueio_lancamento_faltas_notas_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_bloqueio_lancamento_faltas_notas_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.bloqueio_lancamento_faltas_notas', function (Blueprint $table) {
$table->foreign('ref_cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_escola')
+ ->on('pmieducar.escola')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_ano_letivo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_ano_letivo_table.php
index fe1c13f3ef..c767dd0130 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_ano_letivo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_ano_letivo_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.calendario_ano_letivo', function (Blueprint $table) {
$table->foreign('ref_cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_escola')
+ ->on('pmieducar.escola')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_anotacao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_anotacao_table.php
index d477ecba6c..006c3c0482 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_anotacao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_anotacao_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.calendario_dia_anotacao', function (Blueprint $table) {
$table->foreign(['ref_ref_cod_calendario_ano_letivo', 'ref_mes', 'ref_dia'])
- ->references(['ref_cod_calendario_ano_letivo', 'mes', 'dia'])
- ->on('pmieducar.calendario_dia')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['ref_cod_calendario_ano_letivo', 'mes', 'dia'])
+ ->on('pmieducar.calendario_dia')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_calendario_anotacao')
- ->references('cod_calendario_anotacao')
- ->on('pmieducar.calendario_anotacao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_calendario_anotacao')
+ ->on('pmieducar.calendario_anotacao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_motivo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_motivo_table.php
index 7fe298bb4e..dfd2267f05 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_motivo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_motivo_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.calendario_dia_motivo', function (Blueprint $table) {
$table->foreign('ref_cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_escola')
+ ->on('pmieducar.escola')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_table.php
index 6a21961015..028389a5ba 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_calendario_dia_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.calendario_dia', function (Blueprint $table) {
$table->foreign('ref_cod_calendario_dia_motivo')
- ->references('cod_calendario_dia_motivo')
- ->on('pmieducar.calendario_dia_motivo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_calendario_dia_motivo')
+ ->on('pmieducar.calendario_dia_motivo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_calendario_ano_letivo')
- ->references('cod_calendario_ano_letivo')
- ->on('pmieducar.calendario_ano_letivo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_calendario_ano_letivo')
+ ->on('pmieducar.calendario_ano_letivo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_candidato_reserva_vaga_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_candidato_reserva_vaga_table.php
index 787c225776..a8d7d5d4f4 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_candidato_reserva_vaga_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_candidato_reserva_vaga_table.php
@@ -15,24 +15,24 @@ public function up()
{
Schema::table('pmieducar.candidato_reserva_vaga', function (Blueprint $table) {
$table->foreign('ref_cod_turno')
- ->references('id')
- ->on('pmieducar.turma_turno');
+ ->references('id')
+ ->on('pmieducar.turma_turno');
$table->foreign('ref_cod_serie')
- ->references('cod_serie')
- ->on('pmieducar.serie');
+ ->references('cod_serie')
+ ->on('pmieducar.serie');
$table->foreign('ref_cod_pessoa_cad')
- ->references('idpes')
- ->on('cadastro.pessoa');
+ ->references('idpes')
+ ->on('cadastro.pessoa');
$table->foreign('ref_cod_aluno')
- ->references('cod_aluno')
- ->on('pmieducar.aluno');
+ ->references('cod_aluno')
+ ->on('pmieducar.aluno');
$table->foreign('ref_cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola');
+ ->references('cod_escola')
+ ->on('pmieducar.escola');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_suspensao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_suspensao_table.php
index 90a472795c..0d46794fa3 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_suspensao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_suspensao_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.cliente_suspensao', function (Blueprint $table) {
$table->foreign('ref_cod_motivo_suspensao')
- ->references('cod_motivo_suspensao')
- ->on('pmieducar.motivo_suspensao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_motivo_suspensao')
+ ->on('pmieducar.motivo_suspensao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_cliente')
- ->references('cod_cliente')
- ->on('pmieducar.cliente')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_cliente')
+ ->on('pmieducar.cliente')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_tipo_cliente_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_tipo_cliente_table.php
index bdb325cf80..13346d6d9b 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_tipo_cliente_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_tipo_cliente_table.php
@@ -15,22 +15,22 @@ public function up()
{
Schema::table('pmieducar.cliente_tipo_cliente', function (Blueprint $table) {
$table->foreign('ref_cod_biblioteca')
- ->references('cod_biblioteca')
- ->on('pmieducar.biblioteca')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_biblioteca')
+ ->on('pmieducar.biblioteca')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_cliente_tipo')
- ->references('cod_cliente_tipo')
- ->on('pmieducar.cliente_tipo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_cliente_tipo')
+ ->on('pmieducar.cliente_tipo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_cliente')
- ->references('cod_cliente')
- ->on('pmieducar.cliente')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_cliente')
+ ->on('pmieducar.cliente')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_tipo_exemplar_tipo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_tipo_exemplar_tipo_table.php
index 41f262613a..dac08f6abc 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_tipo_exemplar_tipo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_cliente_tipo_exemplar_tipo_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.cliente_tipo_exemplar_tipo', function (Blueprint $table) {
$table->foreign('ref_cod_exemplar_tipo')
- ->references('cod_exemplar_tipo')
- ->on('pmieducar.exemplar_tipo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_exemplar_tipo')
+ ->on('pmieducar.exemplar_tipo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_cliente_tipo')
- ->references('cod_cliente_tipo')
- ->on('pmieducar.cliente_tipo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_cliente_tipo')
+ ->on('pmieducar.cliente_tipo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_disciplina_dependencia_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_disciplina_dependencia_table.php
index c245c47a61..db045f7f6f 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_disciplina_dependencia_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_disciplina_dependencia_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.disciplina_dependencia', function (Blueprint $table) {
$table->foreign(['ref_cod_serie', 'ref_cod_escola', 'ref_cod_disciplina'])
- ->references(['ref_ref_cod_serie', 'ref_ref_cod_escola', 'ref_cod_disciplina'])
- ->on('pmieducar.escola_serie_disciplina')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['ref_ref_cod_serie', 'ref_ref_cod_escola', 'ref_cod_disciplina'])
+ ->on('pmieducar.escola_serie_disciplina')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_matricula')
- ->references('cod_matricula')
- ->on('pmieducar.matricula')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_matricula')
+ ->on('pmieducar.matricula')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_disciplina_serie_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_disciplina_serie_table.php
index 6ae6a6d225..1f1d9a9dc7 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_disciplina_serie_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_disciplina_serie_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.disciplina_serie', function (Blueprint $table) {
$table->foreign('ref_cod_serie')
- ->references('cod_serie')
- ->on('pmieducar.serie')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_serie')
+ ->on('pmieducar.serie')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_dispensa_disciplina_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_dispensa_disciplina_table.php
index 9785d9d204..c61f73469a 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_dispensa_disciplina_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_dispensa_disciplina_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.dispensa_disciplina', function (Blueprint $table) {
$table->foreign('ref_cod_tipo_dispensa')
- ->references('cod_tipo_dispensa')
- ->on('pmieducar.tipo_dispensa')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_tipo_dispensa')
+ ->on('pmieducar.tipo_dispensa')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_matricula')
- ->references('cod_matricula')
- ->on('pmieducar.matricula')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_matricula')
+ ->on('pmieducar.matricula')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_dispensa_etapa_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_dispensa_etapa_table.php
index ff78a5a1e7..3cad9c72c8 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_dispensa_etapa_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_dispensa_etapa_table.php
@@ -15,8 +15,8 @@ public function up()
{
Schema::table('pmieducar.dispensa_etapa', function (Blueprint $table) {
$table->foreign('ref_cod_dispensa')
- ->references('cod_dispensa')
- ->on('pmieducar.dispensa_disciplina');
+ ->references('cod_dispensa')
+ ->on('pmieducar.dispensa_disciplina');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_distribuicao_uniforme_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_distribuicao_uniforme_table.php
index 2bd380f171..c5f0283e10 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_distribuicao_uniforme_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_distribuicao_uniforme_table.php
@@ -15,14 +15,14 @@ public function up()
{
Schema::table('pmieducar.distribuicao_uniforme', function (Blueprint $table) {
$table->foreign('ref_cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola');
+ ->references('cod_escola')
+ ->on('pmieducar.escola');
$table->foreign('ref_cod_aluno')
- ->references('cod_aluno')
- ->on('pmieducar.aluno')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_aluno')
+ ->on('pmieducar.aluno')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_ano_letivo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_ano_letivo_table.php
index bd2da28b23..b6ef8345ee 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_ano_letivo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_ano_letivo_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.escola_ano_letivo', function (Blueprint $table) {
$table->foreign('ref_cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_escola')
+ ->on('pmieducar.escola')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_localizacao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_localizacao_table.php
index d2dcad6322..bd3b03b3e0 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_localizacao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_localizacao_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.escola_localizacao', function (Blueprint $table) {
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_rede_ensino_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_rede_ensino_table.php
index 7341d85f73..d6b3cc536d 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_rede_ensino_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_rede_ensino_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.escola_rede_ensino', function (Blueprint $table) {
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_serie_disciplina_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_serie_disciplina_table.php
index 2654033af8..8ac22e91d7 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_serie_disciplina_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_serie_disciplina_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.escola_serie_disciplina', function (Blueprint $table) {
$table->foreign(['ref_ref_cod_escola', 'ref_ref_cod_serie'])
- ->references(['ref_cod_escola', 'ref_cod_serie'])
- ->on('pmieducar.escola_serie')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['ref_cod_escola', 'ref_cod_serie'])
+ ->on('pmieducar.escola_serie')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_disciplina')
- ->references('id')
- ->on('modules.componente_curricular')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('modules.componente_curricular')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_usuario_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_usuario_table.php
index 3a61fef8da..1ac54959ff 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_usuario_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_usuario_table.php
@@ -15,12 +15,12 @@ public function up()
{
Schema::table('pmieducar.escola_usuario', function (Blueprint $table) {
$table->foreign('ref_cod_usuario')
- ->references('cod_usuario')
- ->on('pmieducar.usuario');
+ ->references('cod_usuario')
+ ->on('pmieducar.usuario');
$table->foreign('ref_cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola');
+ ->references('cod_escola')
+ ->on('pmieducar.escola');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_exemplar_emprestimo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_exemplar_emprestimo_table.php
index ead724d692..d0a9cc79ab 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_exemplar_emprestimo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_exemplar_emprestimo_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.exemplar_emprestimo', function (Blueprint $table) {
$table->foreign('ref_cod_exemplar')
- ->references('cod_exemplar')
- ->on('pmieducar.exemplar')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_exemplar')
+ ->on('pmieducar.exemplar')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_cliente')
- ->references('cod_cliente')
- ->on('pmieducar.cliente')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_cliente')
+ ->on('pmieducar.cliente')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_exemplar_tipo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_exemplar_tipo_table.php
index 1d79b9a0ea..20724434b2 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_exemplar_tipo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_exemplar_tipo_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.exemplar_tipo', function (Blueprint $table) {
$table->foreign('ref_cod_biblioteca')
- ->references('cod_biblioteca')
- ->on('pmieducar.biblioteca')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_biblioteca')
+ ->on('pmieducar.biblioteca')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_falta_atraso_compensado_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_falta_atraso_compensado_table.php
index 25a9b5cdc5..c08d63d485 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_falta_atraso_compensado_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_falta_atraso_compensado_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.falta_atraso_compensado', function (Blueprint $table) {
$table->foreign(['ref_cod_servidor', 'ref_ref_cod_instituicao'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_escola')
+ ->on('pmieducar.escola')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_habilitacao_curso_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_habilitacao_curso_table.php
index 8a29bd4c13..b145d93ef5 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_habilitacao_curso_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_habilitacao_curso_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.habilitacao_curso', function (Blueprint $table) {
$table->foreign('ref_cod_habilitacao')
- ->references('cod_habilitacao')
- ->on('pmieducar.habilitacao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_habilitacao')
+ ->on('pmieducar.habilitacao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_curso')
- ->references('cod_curso')
- ->on('pmieducar.curso')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_curso')
+ ->on('pmieducar.curso')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_historico_disciplinas_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_historico_disciplinas_table.php
index 9c8bcf866f..34a7f33209 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_historico_disciplinas_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_historico_disciplinas_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.historico_disciplinas', function (Blueprint $table) {
$table->foreign(['ref_ref_cod_aluno', 'ref_sequencial'])
- ->references(['ref_cod_aluno', 'sequencial'])
- ->on('pmieducar.historico_escolar')
- ->onUpdate('cascade')
- ->onDelete('cascade');
+ ->references(['ref_cod_aluno', 'sequencial'])
+ ->on('pmieducar.historico_escolar')
+ ->onUpdate('cascade')
+ ->onDelete('cascade');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_historico_escolar_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_historico_escolar_table.php
index b3330d4613..f8b96d8d29 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_historico_escolar_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_historico_escolar_table.php
@@ -15,20 +15,20 @@ public function up()
{
Schema::table('pmieducar.historico_escolar', function (Blueprint $table) {
$table->foreign('historico_grade_curso_id')
- ->references('id')
- ->on('pmieducar.historico_grade_curso')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('pmieducar.historico_grade_curso')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola');
+ ->references('cod_escola')
+ ->on('pmieducar.escola');
$table->foreign('ref_cod_aluno')
- ->references('cod_aluno')
- ->on('pmieducar.aluno')
- ->onUpdate('cascade')
- ->onDelete('cascade');
+ ->references('cod_aluno')
+ ->on('pmieducar.aluno')
+ ->onUpdate('cascade')
+ ->onDelete('cascade');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_comodo_funcao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_comodo_funcao_table.php
index e8881a7dff..8aa4d096c3 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_comodo_funcao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_comodo_funcao_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.infra_comodo_funcao', function (Blueprint $table) {
$table->foreign('ref_cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_escola')
+ ->on('pmieducar.escola')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_predio_comodo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_predio_comodo_table.php
index e4a022d52a..47c39905f7 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_predio_comodo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_predio_comodo_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.infra_predio_comodo', function (Blueprint $table) {
$table->foreign('ref_cod_infra_predio')
- ->references('cod_infra_predio')
- ->on('pmieducar.infra_predio')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_infra_predio')
+ ->on('pmieducar.infra_predio')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_infra_comodo_funcao')
- ->references('cod_infra_comodo_funcao')
- ->on('pmieducar.infra_comodo_funcao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_infra_comodo_funcao')
+ ->on('pmieducar.infra_comodo_funcao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_instituicao_documentacao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_instituicao_documentacao_table.php
index cd5692dfe2..6f20583c75 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_instituicao_documentacao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_instituicao_documentacao_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.instituicao_documentacao', function (Blueprint $table) {
$table->foreign('instituicao_id')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_material_didatico_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_material_didatico_table.php
index 7712b9890e..470c6305f4 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_material_didatico_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_material_didatico_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.material_didatico', function (Blueprint $table) {
$table->foreign('ref_cod_material_tipo')
- ->references('cod_material_tipo')
- ->on('pmieducar.material_tipo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_material_tipo')
+ ->on('pmieducar.material_tipo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_material_tipo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_material_tipo_table.php
index eb95e9d467..d9906a92c4 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_material_tipo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_material_tipo_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.material_tipo', function (Blueprint $table) {
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_excessao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_excessao_table.php
index 60ed955b39..0fcf5097c0 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_excessao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_excessao_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.matricula_excessao', function (Blueprint $table) {
$table->foreign(['ref_cod_serie', 'ref_cod_escola', 'ref_cod_disciplina'])
- ->references(['ref_ref_cod_serie', 'ref_ref_cod_escola', 'ref_cod_disciplina'])
- ->on('pmieducar.escola_serie_disciplina')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['ref_ref_cod_serie', 'ref_ref_cod_escola', 'ref_cod_disciplina'])
+ ->on('pmieducar.escola_serie_disciplina')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_ocorrencia_disciplinar_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_ocorrencia_disciplinar_table.php
index d440ff205b..6e68211734 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_ocorrencia_disciplinar_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_ocorrencia_disciplinar_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.matricula_ocorrencia_disciplinar', function (Blueprint $table) {
$table->foreign('ref_cod_matricula')
- ->references('cod_matricula')
- ->on('pmieducar.matricula')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_matricula')
+ ->on('pmieducar.matricula')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_tipo_ocorrencia_disciplinar')
- ->references('cod_tipo_ocorrencia_disciplinar')
- ->on('pmieducar.tipo_ocorrencia_disciplinar')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_tipo_ocorrencia_disciplinar')
+ ->on('pmieducar.tipo_ocorrencia_disciplinar')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_turma_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_turma_table.php
index af75fbfe5f..0bf0c9d4e0 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_turma_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_matricula_turma_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.matricula_turma', function (Blueprint $table) {
$table->foreign('ref_cod_turma')
- ->references('cod_turma')
- ->on('pmieducar.turma')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_turma')
+ ->on('pmieducar.turma')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_matricula')
- ->references('cod_matricula')
- ->on('pmieducar.matricula')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_matricula')
+ ->on('pmieducar.matricula')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_menu_tipo_usuario_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_menu_tipo_usuario_table.php
index b041091544..22608a063f 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_menu_tipo_usuario_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_menu_tipo_usuario_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.menu_tipo_usuario', function (Blueprint $table) {
$table->foreign('ref_cod_tipo_usuario')
- ->references('cod_tipo_usuario')
- ->on('pmieducar.tipo_usuario')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_tipo_usuario')
+ ->on('pmieducar.tipo_usuario')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('menu_id')->on('menus')->references('id');
});
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_afastamento_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_afastamento_table.php
index 5635acf10b..21f56be4d1 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_afastamento_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_afastamento_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.motivo_afastamento', function (Blueprint $table) {
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_baixa_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_baixa_table.php
index 95bb716a74..1a72fd74f8 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_baixa_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_baixa_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.motivo_baixa', function (Blueprint $table) {
$table->foreign('ref_cod_biblioteca')
- ->references('cod_biblioteca')
- ->on('pmieducar.biblioteca')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_biblioteca')
+ ->on('pmieducar.biblioteca')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_suspensao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_suspensao_table.php
index 769137e5e4..e99b2d5a28 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_suspensao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_motivo_suspensao_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.motivo_suspensao', function (Blueprint $table) {
$table->foreign('ref_cod_biblioteca')
- ->references('cod_biblioteca')
- ->on('pmieducar.biblioteca')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_biblioteca')
+ ->on('pmieducar.biblioteca')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_nivel_ensino_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_nivel_ensino_table.php
index 080ec348ed..2091cab8c5 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_nivel_ensino_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_nivel_ensino_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.nivel_ensino', function (Blueprint $table) {
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_pagamento_multa_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_pagamento_multa_table.php
index af060f53eb..4ad9e3ee43 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_pagamento_multa_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_pagamento_multa_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.pagamento_multa', function (Blueprint $table) {
$table->foreign('ref_cod_cliente')
- ->references('cod_cliente')
- ->on('pmieducar.cliente')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_cliente')
+ ->on('pmieducar.cliente')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_biblioteca')
- ->references('cod_biblioteca')
- ->on('pmieducar.biblioteca')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_biblioteca')
+ ->on('pmieducar.biblioteca')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_projeto_aluno_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_projeto_aluno_table.php
index f28aa864d1..2c146410ee 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_projeto_aluno_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_projeto_aluno_table.php
@@ -15,12 +15,12 @@ public function up()
{
Schema::table('pmieducar.projeto_aluno', function (Blueprint $table) {
$table->foreign('ref_cod_projeto')
- ->references('cod_projeto')
- ->on('pmieducar.projeto');
+ ->references('cod_projeto')
+ ->on('pmieducar.projeto');
$table->foreign('ref_cod_aluno')
- ->references('cod_aluno')
- ->on('pmieducar.aluno');
+ ->references('cod_aluno')
+ ->on('pmieducar.aluno');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_horarios_aux_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_horarios_aux_table.php
index 365398e0f5..b0f46bd9a6 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_horarios_aux_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_horarios_aux_table.php
@@ -15,22 +15,22 @@ public function up()
{
Schema::table('pmieducar.quadro_horario_horarios_aux', function (Blueprint $table) {
$table->foreign(['ref_servidor', 'ref_cod_instituicao_servidor'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign(['ref_cod_serie', 'ref_cod_escola', 'ref_cod_disciplina'])
- ->references(['ref_ref_cod_serie', 'ref_ref_cod_escola', 'ref_cod_disciplina'])
- ->on('pmieducar.escola_serie_disciplina')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['ref_ref_cod_serie', 'ref_ref_cod_escola', 'ref_cod_disciplina'])
+ ->on('pmieducar.escola_serie_disciplina')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_quadro_horario')
- ->references('cod_quadro_horario')
- ->on('pmieducar.quadro_horario')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_quadro_horario')
+ ->on('pmieducar.quadro_horario')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_horarios_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_horarios_table.php
index 5fb60251e9..c0cf35301e 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_horarios_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_horarios_table.php
@@ -15,22 +15,22 @@ public function up()
{
Schema::table('pmieducar.quadro_horario_horarios', function (Blueprint $table) {
$table->foreign(['ref_servidor_substituto', 'ref_cod_instituicao_substituto'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign(['ref_servidor', 'ref_cod_instituicao_servidor'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_quadro_horario')
- ->references('cod_quadro_horario')
- ->on('pmieducar.quadro_horario')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_quadro_horario')
+ ->on('pmieducar.quadro_horario')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_table.php
index 62560e237d..2f91dc4ed1 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_quadro_horario_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.quadro_horario', function (Blueprint $table) {
$table->foreign('ref_cod_turma')
- ->references('cod_turma')
- ->on('pmieducar.turma')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_turma')
+ ->on('pmieducar.turma')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_relacao_categoria_acervo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_relacao_categoria_acervo_table.php
index 8d6f0413af..271731a131 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_relacao_categoria_acervo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_relacao_categoria_acervo_table.php
@@ -15,12 +15,12 @@ public function up()
{
Schema::table('pmieducar.relacao_categoria_acervo', function (Blueprint $table) {
$table->foreign('ref_cod_acervo')
- ->references('cod_acervo')
- ->on('pmieducar.acervo');
+ ->references('cod_acervo')
+ ->on('pmieducar.acervo');
$table->foreign('categoria_id')
- ->references('id')
- ->on('pmieducar.categoria_obra');
+ ->references('id')
+ ->on('pmieducar.categoria_obra');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_reserva_vaga_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_reserva_vaga_table.php
index 569b0bd81e..2eeec951f6 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_reserva_vaga_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_reserva_vaga_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.reserva_vaga', function (Blueprint $table) {
$table->foreign(['ref_ref_cod_serie', 'ref_ref_cod_escola'])
- ->references(['ref_cod_serie', 'ref_cod_escola'])
- ->on('pmieducar.escola_serie')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['ref_cod_serie', 'ref_cod_escola'])
+ ->on('pmieducar.escola_serie')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_aluno')
- ->references('cod_aluno')
- ->on('pmieducar.aluno')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_aluno')
+ ->on('pmieducar.aluno')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_sequencia_serie_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_sequencia_serie_table.php
index 62e7cbbdc9..faa0dc7777 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_sequencia_serie_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_sequencia_serie_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.sequencia_serie', function (Blueprint $table) {
$table->foreign('ref_serie_origem')
- ->references('cod_serie')
- ->on('pmieducar.serie')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_serie')
+ ->on('pmieducar.serie')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_serie_destino')
- ->references('cod_serie')
- ->on('pmieducar.serie')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_serie')
+ ->on('pmieducar.serie')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_serie_pre_requisito_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_serie_pre_requisito_table.php
index b165806be1..e9cac576e2 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_serie_pre_requisito_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_serie_pre_requisito_table.php
@@ -15,22 +15,22 @@ public function up()
{
Schema::table('pmieducar.serie_pre_requisito', function (Blueprint $table) {
$table->foreign('ref_cod_serie')
- ->references('cod_serie')
- ->on('pmieducar.serie')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_serie')
+ ->on('pmieducar.serie')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_pre_requisito')
- ->references('cod_pre_requisito')
- ->on('pmieducar.pre_requisito')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_pre_requisito')
+ ->on('pmieducar.pre_requisito')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_operador')
- ->references('cod_operador')
- ->on('pmieducar.operador')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_operador')
+ ->on('pmieducar.operador')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_afastamento_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_afastamento_table.php
index 29249ad9ba..21a8bcfcd6 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_afastamento_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_afastamento_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.servidor_afastamento', function (Blueprint $table) {
$table->foreign(['ref_cod_servidor', 'ref_ref_cod_instituicao'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_motivo_afastamento')
- ->references('cod_motivo_afastamento')
- ->on('pmieducar.motivo_afastamento')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_motivo_afastamento')
+ ->on('pmieducar.motivo_afastamento')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_alocacao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_alocacao_table.php
index dd51656603..9f71fde63b 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_alocacao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_alocacao_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.servidor_alocacao', function (Blueprint $table) {
$table->foreign(['ref_cod_servidor', 'ref_ref_cod_instituicao'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_escola')
- ->references('cod_escola')
- ->on('pmieducar.escola')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_escola')
+ ->on('pmieducar.escola')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_ministra_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_ministra_table.php
index fdca869cae..dc2a860cfd 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_ministra_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_ministra_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.servidor_curso_ministra', function (Blueprint $table) {
$table->foreign(['ref_cod_servidor', 'ref_ref_cod_instituicao'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_curso')
- ->references('cod_curso')
- ->on('pmieducar.curso')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_curso')
+ ->on('pmieducar.curso')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_table.php
index 63d1623e37..9e754318ef 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.servidor_curso', function (Blueprint $table) {
$table->foreign('ref_cod_formacao')
- ->references('cod_formacao')
- ->on('pmieducar.servidor_formacao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_formacao')
+ ->on('pmieducar.servidor_formacao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_disciplina_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_disciplina_table.php
index 945bee4258..bdb11785a9 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_disciplina_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_disciplina_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.servidor_disciplina', function (Blueprint $table) {
$table->foreign(['ref_cod_servidor', 'ref_ref_cod_instituicao'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_disciplina')
- ->references('id')
- ->on('modules.componente_curricular')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('id')
+ ->on('modules.componente_curricular')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_formacao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_formacao_table.php
index 8cbf21b97c..3e167672ca 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_formacao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_formacao_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.servidor_formacao', function (Blueprint $table) {
$table->foreign(['ref_cod_servidor', 'ref_ref_cod_instituicao'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_funcao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_funcao_table.php
index 1bbf21acec..e0d08e25b2 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_funcao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_funcao_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.servidor_funcao', function (Blueprint $table) {
$table->foreign(['ref_cod_servidor', 'ref_ref_cod_instituicao'])
- ->references(['cod_servidor', 'ref_cod_instituicao'])
- ->on('pmieducar.servidor')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references(['cod_servidor', 'ref_cod_instituicao'])
+ ->on('pmieducar.servidor')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_funcao')
- ->references('cod_funcao')
- ->on('pmieducar.funcao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_funcao')
+ ->on('pmieducar.funcao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_titulo_concurso_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_titulo_concurso_table.php
index 2d1a3dbdd4..79532fc150 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_titulo_concurso_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_titulo_concurso_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.servidor_titulo_concurso', function (Blueprint $table) {
$table->foreign('ref_cod_formacao')
- ->references('cod_formacao')
- ->on('pmieducar.servidor_formacao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_formacao')
+ ->on('pmieducar.servidor_formacao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_avaliacao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_avaliacao_table.php
index 77023d735a..a7e7142031 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_avaliacao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_avaliacao_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.tipo_avaliacao', function (Blueprint $table) {
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_avaliacao_valores_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_avaliacao_valores_table.php
index 259b26b77a..5b9edf03a3 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_avaliacao_valores_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_avaliacao_valores_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.tipo_avaliacao_valores', function (Blueprint $table) {
$table->foreign('ref_cod_tipo_avaliacao')
- ->references('cod_tipo_avaliacao')
- ->on('pmieducar.tipo_avaliacao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_tipo_avaliacao')
+ ->on('pmieducar.tipo_avaliacao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_dispensa_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_dispensa_table.php
index 626f9e01c2..676bd93dc6 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_dispensa_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_dispensa_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.tipo_dispensa', function (Blueprint $table) {
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_ocorrencia_disciplinar_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_ocorrencia_disciplinar_table.php
index fbbb07d133..dc933b96af 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_ocorrencia_disciplinar_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_ocorrencia_disciplinar_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.tipo_ocorrencia_disciplinar', function (Blueprint $table) {
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_usuario_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_usuario_table.php
index 47e1ed925c..a659c43ade 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_usuario_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_tipo_usuario_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.tipo_usuario', function (Blueprint $table) {
$table->foreign('ref_funcionario_exc')
- ->references('ref_cod_pessoa_fj')
- ->on('portal.funcionario')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('ref_cod_pessoa_fj')
+ ->on('portal.funcionario')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_funcionario_cad')
- ->references('ref_cod_pessoa_fj')
- ->on('portal.funcionario')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('ref_cod_pessoa_fj')
+ ->on('portal.funcionario')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_transferencia_solicitacao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_transferencia_solicitacao_table.php
index 912b9ee893..31a469b66f 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_transferencia_solicitacao_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_transferencia_solicitacao_table.php
@@ -15,22 +15,22 @@ public function up()
{
Schema::table('pmieducar.transferencia_solicitacao', function (Blueprint $table) {
$table->foreign('ref_cod_transferencia_tipo')
- ->references('cod_transferencia_tipo')
- ->on('pmieducar.transferencia_tipo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_transferencia_tipo')
+ ->on('pmieducar.transferencia_tipo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_matricula_saida')
- ->references('cod_matricula')
- ->on('pmieducar.matricula')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_matricula')
+ ->on('pmieducar.matricula')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_matricula_entrada')
- ->references('cod_matricula')
- ->on('pmieducar.matricula')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_matricula')
+ ->on('pmieducar.matricula')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_transferencia_tipo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_transferencia_tipo_table.php
index 758e7a8d2a..f53ea1b1f1 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_transferencia_tipo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_transferencia_tipo_table.php
@@ -15,10 +15,10 @@ public function up()
{
Schema::table('pmieducar.transferencia_tipo', function (Blueprint $table) {
$table->foreign('ref_cod_instituicao')
- ->references('cod_instituicao')
- ->on('pmieducar.instituicao')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_instituicao')
+ ->on('pmieducar.instituicao')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_turma_modulo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_turma_modulo_table.php
index 671e486bea..f5f04e4798 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_turma_modulo_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_turma_modulo_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('pmieducar.turma_modulo', function (Blueprint $table) {
$table->foreign('ref_cod_turma')
- ->references('cod_turma')
- ->on('pmieducar.turma')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_turma')
+ ->on('pmieducar.turma')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_modulo')
- ->references('cod_modulo')
- ->on('pmieducar.modulo')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_modulo')
+ ->on('pmieducar.modulo')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_portal_agenda_compromisso_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_portal_agenda_compromisso_table.php
index 24a4199763..ff3b30bf80 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_portal_agenda_compromisso_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_portal_agenda_compromisso_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('portal.agenda_compromisso', function (Blueprint $table) {
$table->foreign('ref_ref_cod_pessoa_cad')
- ->references('ref_cod_pessoa_fj')
- ->on('portal.funcionario')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('ref_cod_pessoa_fj')
+ ->on('portal.funcionario')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_agenda')
- ->references('cod_agenda')
- ->on('portal.agenda')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_agenda')
+ ->on('portal.agenda')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_portal_agenda_responsavel_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_portal_agenda_responsavel_table.php
index d1f26691c8..05dea743e1 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_portal_agenda_responsavel_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_portal_agenda_responsavel_table.php
@@ -15,16 +15,16 @@ public function up()
{
Schema::table('portal.agenda_responsavel', function (Blueprint $table) {
$table->foreign('ref_ref_cod_pessoa_fj')
- ->references('ref_cod_pessoa_fj')
- ->on('portal.funcionario')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('ref_cod_pessoa_fj')
+ ->on('portal.funcionario')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
$table->foreign('ref_cod_agenda')
- ->references('cod_agenda')
- ->on('portal.agenda')
- ->onUpdate('restrict')
- ->onDelete('restrict');
+ ->references('cod_agenda')
+ ->on('portal.agenda')
+ ->onUpdate('restrict')
+ ->onDelete('restrict');
});
}
diff --git a/ieducar/intranet/educar_exemplar_devolucao_det.php b/ieducar/intranet/educar_exemplar_devolucao_det.php
index dc18f85bbc..0bde781662 100644
--- a/ieducar/intranet/educar_exemplar_devolucao_det.php
+++ b/ieducar/intranet/educar_exemplar_devolucao_det.php
@@ -111,9 +111,9 @@ public function Gerar()
$this->array_botao_url_script = [];
$this->array_botao[] = 'Devolução';
- $this->array_botao_url_script[] = "go(\"educar_exemplar_devolucao_cad.php?cod_emprestimo={$registro[cod_emprestimo]}\");";
+ $this->array_botao_url_script[] = "go(\"educar_exemplar_devolucao_cad.php?cod_emprestimo={$registro['cod_emprestimo']}\");";
$this->array_botao[] = 'Renovação';
- $this->array_botao_url_script[] = "go(\"educar_exemplar_renovacao_cad.php?cod_emprestimo={$registro[cod_emprestimo]}\");";
+ $this->array_botao_url_script[] = "go(\"educar_exemplar_renovacao_cad.php?cod_emprestimo={$registro['cod_emprestimo']}\");";
}
$this->url_cancelar = 'educar_exemplar_devolucao_lst.php';
diff --git a/ieducar/intranet/educar_servidor_cad.php b/ieducar/intranet/educar_servidor_cad.php
index d4c17170a6..151dedb0d8 100644
--- a/ieducar/intranet/educar_servidor_cad.php
+++ b/ieducar/intranet/educar_servidor_cad.php
@@ -726,6 +726,7 @@ public function Excluir()
$this->excluiDisciplinas(null);
$this->excluiFuncoes();
+ $this->excluiFaltaAtraso();
DB::commit();
$this->mensagem = 'Exclusão efetuada com sucesso.
';
@@ -841,6 +842,11 @@ public function excluiFuncoes()
$obj_servidor_funcao->excluirTodos();
}
+ public function excluiFaltaAtraso()
+ {
+ (new clsPmieducarFaltaAtraso())->excluiTodosPorServidor($this->cod_servidor);
+ }
+
public function excluiFuncoesRemovidas($funcoes)
{
$obj_servidor_funcao = new clsPmieducarServidorFuncao($this->ref_cod_instituicao, $this->cod_servidor);
diff --git a/ieducar/intranet/educar_situacao_cad.php b/ieducar/intranet/educar_situacao_cad.php
index 2fe2a634bf..c311a6cd4a 100644
--- a/ieducar/intranet/educar_situacao_cad.php
+++ b/ieducar/intranet/educar_situacao_cad.php
@@ -74,71 +74,47 @@ public function Gerar()
// primary keys
$this->campoOculto('cod_situacao', $this->cod_situacao);
- // foreign keys
- $get_escola = 1;
- $escola_obrigatorio = false;
- $get_biblioteca = 1;
- $instituicao_obrigatorio = true;
- $biblioteca_obrigatorio = true;
- include('include/pmieducar/educar_campo_lista.php');
-
- //-------------- JS para os Check --------------//
- //if (!$this->cod_situacao)
- // {
- /*$todas_situacoes = "situacao = new Array();\n";
- $obj_biblioteca = new clsPmieducarSituacao();
- $lista = $obj_biblioteca->lista(null,null,null,null,null,null,null,null,null,null,null,null,1);
- if ( is_array( $lista ) && count( $lista ) )
- {
- foreach ( $lista as $registro )
- {
- $todas_situacoes .= "situacao[situacao.length] = new Array( {$registro["cod_situacao"]}, {$registro['situacao_padrao']}, {$registro['situacao_emprestada']}, {$registro['ref_cod_biblioteca']});\n";
- }
+ try {
+ $get_escola = 1;
+ $escola_obrigatorio = false;
+ $get_biblioteca = 1;
+ $instituicao_obrigatorio = true;
+ $biblioteca_obrigatorio = true;
+ include('include/pmieducar/educar_campo_lista.php');
+ } catch (Exception $exception) {
+ $this->mensagem = $exception->getMessage();
+ $this->simpleRedirect('educar_situacao_lst.php');
+ return false;
}
- echo "";*/
- // }
- // text
- $this->campoTexto('nm_situacao', 'Situação', $this->nm_situacao, 30, 255, true);
+ $this->campoTexto('nm_situacao', 'Situação', $this->nm_situacao, 30, 255, true);
- $opcoes = ['' => 'Selecione', 1 => 'não', 2 => 'sim' ];
- $this->campoLista('permite_emprestimo', 'Permite Empréstimo', $opcoes, $this->permite_emprestimo);
- $this->campoMemo('descricao', 'Descrição', $this->descricao, 60, 5, false);
+ $opcoes = ['' => 'Selecione', 1 => 'não', 2 => 'sim' ];
+ $this->campoLista('permite_emprestimo', 'Permite Empréstimo', $opcoes, $this->permite_emprestimo);
+ $this->campoMemo('descricao', 'Descrição', $this->descricao, 60, 5);
$obj_situacao = new clsPmieducarSituacao();
+ $lst_situacao = false;
if ($this->ref_cod_biblioteca_) {
$lst_situacao = $obj_situacao->lista(null, null, null, null, null, null, 1, null, null, null, null, null, 1, $this->ref_cod_biblioteca_, null, null);
}
- if ($lst_situacao) { //echo "";
+ $script = '';
+ if ($lst_situacao) {
$achou = false;
- //print_r($lst_situacao);die;
+ $script = '';
foreach ($lst_situacao as $situacao) {
if ($situacao['cod_situacao'] == $this->cod_situacao) {
$achou = true;
}
}
+
if (!$achou) {
- $script .="setVisibility('tr_situacao_padrao',false);\n";
+ $script .= "setVisibility('tr_situacao_padrao',false);\n";
}
- //$lista = array_shift($lst_situacao);
- //$situacao = $lista["cod_situacao"];
- //$biblioteca = $lista["ref_cod_biblioteca"];
}
- $this->campoCheck('situacao_padrao', 'Situação Padrão', $this->situacao_padrao);
- //if (!isset($lst_situacao) || $this->cod_situacao == $situacao || $this->ref_cod_biblioteca != $biblioteca)
- //if (!$this->cod_situacao)
- //$this->campoCheck( "situacao_padrao", "Situação Padrão", $this->situacao_padrao );
-
- //$lst_situacao = $obj_situacao->lista(null,null,null,null,null,null,null,1,null,null,null,null,1,$this->ref_cod_biblioteca,$this->ref_cod_instituicao,$this->ref_cod_escola);
- /* if ($lst_situacao)
- {
- $lista = array_shift($lst_situacao);
- $situacao = $lista["cod_situacao"];
- $biblioteca = $lista["ref_cod_biblioteca"];
- }*/
- //if (!isset($lst_situacao) || $this->cod_situacao == $situacao || $this->ref_cod_biblioteca != $biblioteca)
+ $this->campoCheck('situacao_padrao', 'Situação Padrão', $this->situacao_padrao);
$obj_situacao = new clsPmieducarSituacao();
if ($this->ref_cod_biblioteca_) {
@@ -152,21 +128,15 @@ public function Gerar()
$achou = true;
}
}
- //$lista = array_shift($lst_situacao);
- //$situacao = $lista["cod_situacao"];
- //$biblioteca = $lista["ref_cod_biblioteca"];
if (!$achou) {
$script .="setVisibility('tr_situacao_emprestada',false);\n";
}
}
- if ($script) {
+ if (! empty($script)) {
echo "";
}
$this->campoCheck('situacao_emprestada', 'Situação Emprestada', $this->situacao_emprestada);
- //if ($this->situacao_emprestada)
- //$this->campoCheck( "situacao_emprestada", "Situação Emprestada", $this->situacao_emprestada );
-
$this->acao_enviar = 'valida()';
}
@@ -235,7 +205,7 @@ public function makeExtra()
public function Formular()
{
- $this->title = 'i-Educar - Situação';
+ $this->title = 'i-Educar - Situação';
$this->processoAp = '602';
}
};
diff --git a/ieducar/intranet/include/pmieducar/clsPmieducarFaltaAtraso.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarFaltaAtraso.inc.php
index aa08f168ef..d150ac1637 100644
--- a/ieducar/intranet/include/pmieducar/clsPmieducarFaltaAtraso.inc.php
+++ b/ieducar/intranet/include/pmieducar/clsPmieducarFaltaAtraso.inc.php
@@ -562,4 +562,10 @@ public function listaHorasEscola(
return false;
}
+
+ public function excluiTodosPorServidor($codServidor): void
+ {
+ $db = new clsBanco();
+ $db->Consulta("DELETE FROM {$this->_tabela} WHERE ref_cod_servidor = '{$codServidor}'");
+ }
}
diff --git a/ieducar/lib/Portabilis/Report/ReportFactoryRemote.php b/ieducar/lib/Portabilis/Report/ReportFactoryRemote.php
deleted file mode 100644
index 6a20f9de3d..0000000000
--- a/ieducar/lib/Portabilis/Report/ReportFactoryRemote.php
+++ /dev/null
@@ -1,70 +0,0 @@
-settings['url'] = $config->report->remote_factory->url;
- $this->settings['app_name'] = $config->report->remote_factory->this_app_name;
- $this->settings['username'] = $config->report->remote_factory->username;
- $this->settings['password'] = $config->report->remote_factory->password;
- $this->settings['logo_name'] = $config->report->remote_factory->logo_name;
- }
-
- /**
- * Renderiza o relatório.
- *
- * @param Portabilis_Report_ReportCore $report
- * @param array $options
- *
- * @return mixed
- *
- * @throws Exception
- */
- public function dumps($report, $options = [])
- {
- $options = self::mergeOptions($options, [
- 'add_logo_name_arg' => true,
- 'encoding' => 'uncoded'
- ]);
-
- if ($options['add_logo_name_arg'] and !$this->settings['logo_name']) {
- throw new Exception('The option \'add_logo_name_arg\' is true, but no logo_name defined in configurations!');
- } elseif ($options['add_logo_name_arg']) {
- $report->addArg('logo_name', $this->settings['logo_name']);
- }
-
- $client = XML_RPC2_Client::create($this->settings['url']);
-
- $result = $client->build_report_jasper(
- $app_name = $this->settings['app_name'],
- $template_name = $report->templateName(),
- $username = $this->settings['username'],
- $password = $this->settings['password'],
- $args = $report->args
- );
-
- // Esta fábrica retorna o relatório encodado em base64.
-
- if ($options['encoding'] == 'base64') {
- $report = $result['report'];
- } elseif ($options['encoding'] == 'uncoded') {
- $report = base64_decode($result['report']);
- } else {
- throw new Exception("Encoding {$options['encoding']} not supported!");
- }
-
- header('Content-Type: application/pdf;');
-
- return $report;
- }
-}
diff --git a/ieducar/modules/Cadastro/Assets/Javascripts/Servidor.js b/ieducar/modules/Cadastro/Assets/Javascripts/Servidor.js
index 38019b7eff..15cd35a336 100644
--- a/ieducar/modules/Cadastro/Assets/Javascripts/Servidor.js
+++ b/ieducar/modules/Cadastro/Assets/Javascripts/Servidor.js
@@ -106,8 +106,8 @@ function validaServidor() {
function validaPosGraduacao() {
posGraduacao = $j('#pos_graduacao').val() || [];
- possuiOpcaoNenhuma = $j.inArray('4', posGraduacao) != -1;
- possuiMaisDeUmaOpcao = posGraduacao.length > 1;
+ possuiOpcaoNenhuma = $j.inArray('4', posGraduacao) !== -1;
+ possuiMaisDeUmaOpcao = posGraduacao.filter(Boolean).length > 1;
if (possuiOpcaoNenhuma && possuiMaisDeUmaOpcao) {
messageUtils.error('Não é possível informar mais de uma opção no campo: Pós-Graduações concluídas, quando a opção: Não tem pós-graduação concluída estiver selecionada.');
diff --git a/src/Modules/AuditoriaGeral/Model/Operacoes.php b/src/Modules/AuditoriaGeral/Model/Operacoes.php
index dcffb95f90..9aa5344c4e 100644
--- a/src/Modules/AuditoriaGeral/Model/Operacoes.php
+++ b/src/Modules/AuditoriaGeral/Model/Operacoes.php
@@ -4,9 +4,9 @@
class Operacoes
{
- const NOVO = 1;
- const EDICAO = 2;
- const EXCLUSAO = 3;
+ public const NOVO = 1;
+ public const EDICAO = 2;
+ public const EXCLUSAO = 3;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/AbastecimentoAgua.php b/src/Modules/Educacenso/Model/AbastecimentoAgua.php
index 3fc2d3b584..5ea1124f2b 100644
--- a/src/Modules/Educacenso/Model/AbastecimentoAgua.php
+++ b/src/Modules/Educacenso/Model/AbastecimentoAgua.php
@@ -4,11 +4,11 @@
class AbastecimentoAgua
{
- const REDE_PUBLICA = 1;
- const POCO_ARTESIANO = 2;
- const CACIMBA_CISTERNA_POCO = 3;
- const FONTE = 4;
- const INEXISTENTE = 5;
+ public const REDE_PUBLICA = 1;
+ public const POCO_ARTESIANO = 2;
+ public const CACIMBA_CISTERNA_POCO = 3;
+ public const FONTE = 4;
+ public const INEXISTENTE = 5;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/AreasExternas.php b/src/Modules/Educacenso/Model/AreasExternas.php
index 16f9e33c1f..1aada95544 100644
--- a/src/Modules/Educacenso/Model/AreasExternas.php
+++ b/src/Modules/Educacenso/Model/AreasExternas.php
@@ -4,15 +4,15 @@
class AreasExternas
{
- const QUADRA_COBERTA = 1;
- const QUADRA_DESCOBERTA = 2;
- const PATIO_COBERTO = 3;
- const PATIO_DESCOBERTO = 4;
- const PARQUE_INFANTIL = 5;
- const PISCINA = 6;
- const AREA_VERDE = 7;
- const TERREIRAO = 8;
- const VIVEIRO = 9;
+ public const QUADRA_COBERTA = 1;
+ public const QUADRA_DESCOBERTA = 2;
+ public const PATIO_COBERTO = 3;
+ public const PATIO_DESCOBERTO = 4;
+ public const PARQUE_INFANTIL = 5;
+ public const PISCINA = 6;
+ public const AREA_VERDE = 7;
+ public const TERREIRAO = 8;
+ public const VIVEIRO = 9;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/Banheiros.php b/src/Modules/Educacenso/Model/Banheiros.php
index 341e3f2ccd..d3d2c6f8a0 100644
--- a/src/Modules/Educacenso/Model/Banheiros.php
+++ b/src/Modules/Educacenso/Model/Banheiros.php
@@ -4,11 +4,11 @@
class Banheiros
{
- const BANHEIRO = 1;
- const BANHEIRO_FUNCIONARIOS = 2;
- const BANHEIRO_CHUVEIRO = 3;
- const BANHEIRO_EDUCACAO_INFANTIL = 4;
- const BANHEIRO_ACESSIVEL = 5;
+ public const BANHEIRO = 1;
+ public const BANHEIRO_FUNCIONARIOS = 2;
+ public const BANHEIRO_CHUVEIRO = 3;
+ public const BANHEIRO_EDUCACAO_INFANTIL = 4;
+ public const BANHEIRO_ACESSIVEL = 5;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/Deficiencias.php b/src/Modules/Educacenso/Model/Deficiencias.php
index b260bdcbaf..bfebccda68 100644
--- a/src/Modules/Educacenso/Model/Deficiencias.php
+++ b/src/Modules/Educacenso/Model/Deficiencias.php
@@ -4,16 +4,16 @@
class Deficiencias
{
- const CEGUEIRA = 1;
- const BAIXA_VISAO = 2;
- const SURDEZ = 3;
- const DEFICIENCIA_AUDITIVA = 4;
- const SURDOCEGUEIRA = 5;
- const DEFICIENCIA_FISICA = 6;
- const DEFICIENCIA_INTELECTUAL = 7;
- const TRANSTORNO_ESPECTRO_AUTISTA = 25;
- const ALTAS_HABILIDADES_SUPERDOTACAO = 13;
- const OUTRAS = 999;
+ public const CEGUEIRA = 1;
+ public const BAIXA_VISAO = 2;
+ public const SURDEZ = 3;
+ public const DEFICIENCIA_AUDITIVA = 4;
+ public const SURDOCEGUEIRA = 5;
+ public const DEFICIENCIA_FISICA = 6;
+ public const DEFICIENCIA_INTELECTUAL = 7;
+ public const TRANSTORNO_ESPECTRO_AUTISTA = 25;
+ public const ALTAS_HABILIDADES_SUPERDOTACAO = 13;
+ public const OUTRAS = 999;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/DependenciaAdministrativaEscola.php b/src/Modules/Educacenso/Model/DependenciaAdministrativaEscola.php
index 1dd0540811..3386e2dab9 100644
--- a/src/Modules/Educacenso/Model/DependenciaAdministrativaEscola.php
+++ b/src/Modules/Educacenso/Model/DependenciaAdministrativaEscola.php
@@ -4,10 +4,10 @@
class DependenciaAdministrativaEscola
{
- const FEDERAL = 1;
- const ESTADUAL = 2;
- const MUNICIPAL = 3;
- const PRIVADA = 4;
+ public const FEDERAL = 1;
+ public const ESTADUAL = 2;
+ public const MUNICIPAL = 3;
+ public const PRIVADA = 4;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/DestinacaoLixo.php b/src/Modules/Educacenso/Model/DestinacaoLixo.php
index 0ce5105709..200fec1582 100644
--- a/src/Modules/Educacenso/Model/DestinacaoLixo.php
+++ b/src/Modules/Educacenso/Model/DestinacaoLixo.php
@@ -4,11 +4,11 @@
class DestinacaoLixo
{
- const SERVICO_COLETA = 1;
- const QUEIMA = 2;
- const DESCARTA_OUTRA_AREA = 3;
- const DESTINACAO_LICENCIADA = 5;
- const ENTERRA = 7;
+ public const SERVICO_COLETA = 1;
+ public const QUEIMA = 2;
+ public const DESCARTA_OUTRA_AREA = 3;
+ public const DESTINACAO_LICENCIADA = 5;
+ public const ENTERRA = 7;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/Dormitorios.php b/src/Modules/Educacenso/Model/Dormitorios.php
index b5fbb1e4f1..d2a29f8664 100644
--- a/src/Modules/Educacenso/Model/Dormitorios.php
+++ b/src/Modules/Educacenso/Model/Dormitorios.php
@@ -4,8 +4,8 @@
class Dormitorios
{
- const ALUNO = 1;
- const PROFESSOR = 2;
+ public const ALUNO = 1;
+ public const PROFESSOR = 2;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/Equipamentos.php b/src/Modules/Educacenso/Model/Equipamentos.php
index db45d1a0ba..0e0a8b1b48 100644
--- a/src/Modules/Educacenso/Model/Equipamentos.php
+++ b/src/Modules/Educacenso/Model/Equipamentos.php
@@ -4,12 +4,12 @@
class Equipamentos
{
- const COMPUTADORES = 1;
- const IMPRESSORAS = 2;
- const IMPRESSORAS_MULTIFUNCIONAIS = 3;
- const COPIADORA = 4;
- const SCANNER = 5;
- const ANTENA_PARABOLICA = 6;
+ public const COMPUTADORES = 1;
+ public const IMPRESSORAS = 2;
+ public const IMPRESSORAS_MULTIFUNCIONAIS = 3;
+ public const COPIADORA = 4;
+ public const SCANNER = 5;
+ public const ANTENA_PARABOLICA = 6;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/EquipamentosAcessoInternet.php b/src/Modules/Educacenso/Model/EquipamentosAcessoInternet.php
index f050fd4106..d5ddbb41f4 100644
--- a/src/Modules/Educacenso/Model/EquipamentosAcessoInternet.php
+++ b/src/Modules/Educacenso/Model/EquipamentosAcessoInternet.php
@@ -4,8 +4,8 @@
class EquipamentosAcessoInternet
{
- const COMPUTADOR_MESA = 1;
- const DISPOSITIVOS_PESSOAIS = 2;
+ public const COMPUTADOR_MESA = 1;
+ public const DISPOSITIVOS_PESSOAIS = 2;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/Escolaridade.php b/src/Modules/Educacenso/Model/Escolaridade.php
index 542bf49a0f..74b2acae28 100644
--- a/src/Modules/Educacenso/Model/Escolaridade.php
+++ b/src/Modules/Educacenso/Model/Escolaridade.php
@@ -4,10 +4,10 @@
class Escolaridade
{
- const NAO_CONCLUIU_ENSINO_FUNDAMENTAL = 1;
- const ENSINO_FUNDAMENTAL = 2;
- const ENSINO_MEDIO = 7;
- const EDUCACAO_SUPERIOR = 6;
+ public const NAO_CONCLUIU_ENSINO_FUNDAMENTAL = 1;
+ public const ENSINO_FUNDAMENTAL = 2;
+ public const ENSINO_MEDIO = 7;
+ public const EDUCACAO_SUPERIOR = 6;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/EsferaAdministrativa.php b/src/Modules/Educacenso/Model/EsferaAdministrativa.php
index fabef6a6f7..279bcf38fa 100644
--- a/src/Modules/Educacenso/Model/EsferaAdministrativa.php
+++ b/src/Modules/Educacenso/Model/EsferaAdministrativa.php
@@ -4,9 +4,9 @@
class EsferaAdministrativa
{
- const FEDERAL = 1;
- const ESTADUAL = 2;
- const MUNICIPAL = 3;
+ public const FEDERAL = 1;
+ public const ESTADUAL = 2;
+ public const MUNICIPAL = 3;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/EsgotamentoSanitario.php b/src/Modules/Educacenso/Model/EsgotamentoSanitario.php
index 60cf568dcf..9db8c64e00 100644
--- a/src/Modules/Educacenso/Model/EsgotamentoSanitario.php
+++ b/src/Modules/Educacenso/Model/EsgotamentoSanitario.php
@@ -4,10 +4,10 @@
class EsgotamentoSanitario
{
- const REDE_PUBLICA = 1;
- const FOSSA_SEPTICA = 2;
- const INEXISTENTE = 3;
- const FOSSA_RUDIMENTAR = 4;
+ public const REDE_PUBLICA = 1;
+ public const FOSSA_SEPTICA = 2;
+ public const INEXISTENTE = 3;
+ public const FOSSA_RUDIMENTAR = 4;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/FonteEnergia.php b/src/Modules/Educacenso/Model/FonteEnergia.php
index d69db5a170..ebd8ba8f93 100644
--- a/src/Modules/Educacenso/Model/FonteEnergia.php
+++ b/src/Modules/Educacenso/Model/FonteEnergia.php
@@ -4,10 +4,10 @@
class FonteEnergia
{
- const REDE_PUBLICA = 1;
- const GERADOR_COMBUSTIVEL_FOSSIL = 2;
- const FONTES_RENOVAVEIS = 3;
- const INEXISTENTE = 4;
+ public const REDE_PUBLICA = 1;
+ public const GERADOR_COMBUSTIVEL_FOSSIL = 2;
+ public const FONTES_RENOVAVEIS = 3;
+ public const INEXISTENTE = 4;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/FormacaoContinuada.php b/src/Modules/Educacenso/Model/FormacaoContinuada.php
index a15f535a1d..f224bc3a22 100644
--- a/src/Modules/Educacenso/Model/FormacaoContinuada.php
+++ b/src/Modules/Educacenso/Model/FormacaoContinuada.php
@@ -4,23 +4,23 @@
class FormacaoContinuada
{
- const CRECHE = 1;
- const PRE_ESCOLA = 2;
- const ANOS_INICIAIS = 3;
- const ANOS_FINAIS = 4;
- const ENSINO_MEDIO = 5;
- const EJA = 6;
- const EDUCACAO_ESPECIAL = 7;
- const EDUCACAO_INDIGENA = 8;
- const EDUCACAO_DO_CAMPO = 9;
- const EDUCACAO_AMBIENTAL = 10;
- const EDUCACAO_DIREITOS_HUMANOS = 11;
- const GENERO_DIVERSIDADE_SEXUAL = 12;
- const DIREITOS_CRIANCA_ADOLESCENTE = 13;
- const RELACOES_ETNICO_RACIAIS = 14;
- const OUTROS = 15;
- const NENHUM = 16;
- const GESTAO_ESCOLAR = 17;
+ public const CRECHE = 1;
+ public const PRE_ESCOLA = 2;
+ public const ANOS_INICIAIS = 3;
+ public const ANOS_FINAIS = 4;
+ public const ENSINO_MEDIO = 5;
+ public const EJA = 6;
+ public const EDUCACAO_ESPECIAL = 7;
+ public const EDUCACAO_INDIGENA = 8;
+ public const EDUCACAO_DO_CAMPO = 9;
+ public const EDUCACAO_AMBIENTAL = 10;
+ public const EDUCACAO_DIREITOS_HUMANOS = 11;
+ public const GENERO_DIVERSIDADE_SEXUAL = 12;
+ public const DIREITOS_CRIANCA_ADOLESCENTE = 13;
+ public const RELACOES_ETNICO_RACIAIS = 14;
+ public const OUTROS = 15;
+ public const NENHUM = 16;
+ public const GESTAO_ESCOLAR = 17;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/InstrumentosPedagogicos.php b/src/Modules/Educacenso/Model/InstrumentosPedagogicos.php
index 6fb408f64f..92664de952 100644
--- a/src/Modules/Educacenso/Model/InstrumentosPedagogicos.php
+++ b/src/Modules/Educacenso/Model/InstrumentosPedagogicos.php
@@ -4,17 +4,17 @@
class InstrumentosPedagogicos
{
- const ACERVO_MULTIMIDIA = 1;
- const BRINQUEDROS_EDUCACAO_INFANTIL = 2;
- const MATERIAIS_CIENTIFICOS = 3;
- const AMPLIFICACAO_DIFUSAO_SOM = 4;
- const INSTRUMENTOS_MUSICAIS = 5;
- const JOGOS_EDUCATIVOS = 6;
- const MATERIAIS_ATIVIDADES_CULTURAIS = 7;
- const MATERIAIS_PRATICA_DESPORTIVA = 8;
- const MATERIAIS_EDUCACAO_INDIGENA = 9;
- const MATERIAIS_RELACOES_ETNICOS_RACIAIS = 10;
- const MATERIAIS_EDUCACAO_CAMPO = 11;
+ public const ACERVO_MULTIMIDIA = 1;
+ public const BRINQUEDROS_EDUCACAO_INFANTIL = 2;
+ public const MATERIAIS_CIENTIFICOS = 3;
+ public const AMPLIFICACAO_DIFUSAO_SOM = 4;
+ public const INSTRUMENTOS_MUSICAIS = 5;
+ public const JOGOS_EDUCATIVOS = 6;
+ public const MATERIAIS_ATIVIDADES_CULTURAIS = 7;
+ public const MATERIAIS_PRATICA_DESPORTIVA = 8;
+ public const MATERIAIS_EDUCACAO_INDIGENA = 9;
+ public const MATERIAIS_RELACOES_ETNICOS_RACIAIS = 10;
+ public const MATERIAIS_EDUCACAO_CAMPO = 11;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/Laboratorios.php b/src/Modules/Educacenso/Model/Laboratorios.php
index 44a7f50967..70eb12656f 100644
--- a/src/Modules/Educacenso/Model/Laboratorios.php
+++ b/src/Modules/Educacenso/Model/Laboratorios.php
@@ -4,8 +4,8 @@
class Laboratorios
{
- const INFORMATICA = 1;
- const CIENCIAS = 2;
+ public const INFORMATICA = 1;
+ public const CIENCIAS = 2;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/LinguaMinistrada.php b/src/Modules/Educacenso/Model/LinguaMinistrada.php
index 2d3a529460..7c883985fc 100644
--- a/src/Modules/Educacenso/Model/LinguaMinistrada.php
+++ b/src/Modules/Educacenso/Model/LinguaMinistrada.php
@@ -4,8 +4,8 @@
class LinguaMinistrada
{
- const PORTUGUESA = 1;
- const INDIGENA = 2;
+ public const PORTUGUESA = 1;
+ public const INDIGENA = 2;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/LocalFuncionamento.php b/src/Modules/Educacenso/Model/LocalFuncionamento.php
index e02b8ab9ad..be401d5ff0 100644
--- a/src/Modules/Educacenso/Model/LocalFuncionamento.php
+++ b/src/Modules/Educacenso/Model/LocalFuncionamento.php
@@ -4,12 +4,12 @@
class LocalFuncionamento
{
- const PREDIO_ESCOLAR = 3;
- const SALAS_OUTRA_ESCOLA = 7;
- const GALPAO = 8;
- const UNIDADE_ATENDIMENTO_SOCIOEDUCATIVA = 9;
- const UNIDADE_PRISIONAL = 10;
- const OUTROS = 11;
+ public const PREDIO_ESCOLAR = 3;
+ public const SALAS_OUTRA_ESCOLA = 7;
+ public const GALPAO = 8;
+ public const UNIDADE_ATENDIMENTO_SOCIOEDUCATIVA = 9;
+ public const UNIDADE_PRISIONAL = 10;
+ public const OUTROS = 11;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/LocalizacaoDiferenciadaEscola.php b/src/Modules/Educacenso/Model/LocalizacaoDiferenciadaEscola.php
index 1336b681eb..698a5b4e61 100644
--- a/src/Modules/Educacenso/Model/LocalizacaoDiferenciadaEscola.php
+++ b/src/Modules/Educacenso/Model/LocalizacaoDiferenciadaEscola.php
@@ -4,10 +4,10 @@
class LocalizacaoDiferenciadaEscola
{
- const AREA_ASSENTAMENTO = 1;
- const TERRA_INDIGENA = 2;
- const COMUNIDADES_REMANESCENTES_QUILOMBOS = 3;
- const NAO_SE_APLICA = 7;
+ public const AREA_ASSENTAMENTO = 1;
+ public const TERRA_INDIGENA = 2;
+ public const COMUNIDADES_REMANESCENTES_QUILOMBOS = 3;
+ public const NAO_SE_APLICA = 7;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/LocalizacaoDiferenciadaPessoa.php b/src/Modules/Educacenso/Model/LocalizacaoDiferenciadaPessoa.php
index ec2023f268..6079d74959 100644
--- a/src/Modules/Educacenso/Model/LocalizacaoDiferenciadaPessoa.php
+++ b/src/Modules/Educacenso/Model/LocalizacaoDiferenciadaPessoa.php
@@ -4,10 +4,10 @@
class LocalizacaoDiferenciadaPessoa
{
- const AREA_ASSENTAMENTO = 1;
- const TERRA_INDIGENA = 2;
- const COMUNIDADES_REMANESCENTES_QUILOMBOS = 3;
- const NAO_SE_APLICA = 7;
+ public const AREA_ASSENTAMENTO = 1;
+ public const TERRA_INDIGENA = 2;
+ public const COMUNIDADES_REMANESCENTES_QUILOMBOS = 3;
+ public const NAO_SE_APLICA = 7;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/MantenedoraDaEscolaPrivada.php b/src/Modules/Educacenso/Model/MantenedoraDaEscolaPrivada.php
index 5f2529fa12..769bc966d4 100644
--- a/src/Modules/Educacenso/Model/MantenedoraDaEscolaPrivada.php
+++ b/src/Modules/Educacenso/Model/MantenedoraDaEscolaPrivada.php
@@ -4,12 +4,12 @@
class MantenedoraDaEscolaPrivada
{
- const GRUPOS_EMPRESARIAIS = 1;
- const SINDICATOS_TRABALHISTAS = 2;
- const ORGANIZACOES_NAO_GOVERNAMENTAIS = 3;
- const INSTITUICOES_SIM_FINS_LUCRATIVOS = 4;
- const SISTEMA_S = 5;
- const OSCIP = 6;
+ public const GRUPOS_EMPRESARIAIS = 1;
+ public const SINDICATOS_TRABALHISTAS = 2;
+ public const ORGANIZACOES_NAO_GOVERNAMENTAIS = 3;
+ public const INSTITUICOES_SIM_FINS_LUCRATIVOS = 4;
+ public const SISTEMA_S = 5;
+ public const OSCIP = 6;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/ModalidadeCurso.php b/src/Modules/Educacenso/Model/ModalidadeCurso.php
index 141755eb5b..41caf60e0b 100644
--- a/src/Modules/Educacenso/Model/ModalidadeCurso.php
+++ b/src/Modules/Educacenso/Model/ModalidadeCurso.php
@@ -4,10 +4,10 @@
class ModalidadeCurso
{
- const ENSINO_REGULAR = 1;
- const EDUCACAO_ESPECIAL = 2;
- const EJA = 3;
- const EDUCACAO_PROFISSIONAL = 4;
+ public const ENSINO_REGULAR = 1;
+ public const EDUCACAO_ESPECIAL = 2;
+ public const EJA = 3;
+ public const EDUCACAO_PROFISSIONAL = 4;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/Nacionalidade.php b/src/Modules/Educacenso/Model/Nacionalidade.php
index 896d4399f8..1fbb211716 100644
--- a/src/Modules/Educacenso/Model/Nacionalidade.php
+++ b/src/Modules/Educacenso/Model/Nacionalidade.php
@@ -4,7 +4,7 @@
class Nacionalidade
{
- const BRASILEIRA = 1;
- const NATURALIZADO_BRASILEIRO = 2;
- const ESTRANGEIRA = 3;
+ public const BRASILEIRA = 1;
+ public const NATURALIZADO_BRASILEIRO = 2;
+ public const ESTRANGEIRA = 3;
}
diff --git a/src/Modules/Educacenso/Model/OrganizacaoEnsino.php b/src/Modules/Educacenso/Model/OrganizacaoEnsino.php
index 43371c455d..a8d4b4e9f0 100644
--- a/src/Modules/Educacenso/Model/OrganizacaoEnsino.php
+++ b/src/Modules/Educacenso/Model/OrganizacaoEnsino.php
@@ -4,12 +4,12 @@
class OrganizacaoEnsino
{
- const SERIE_ANO = 1;
- const PERIODOS_SEMESTRAIS = 2;
- const CLICLOS_ENSINO_FUNDAMENTAL = 3;
- const GRUPOS_NAO_SERIADOS = 4;
- const MODULOS = 5;
- const ALTERNANCIA_REGULAR = 6;
+ public const SERIE_ANO = 1;
+ public const PERIODOS_SEMESTRAIS = 2;
+ public const CLICLOS_ENSINO_FUNDAMENTAL = 3;
+ public const GRUPOS_NAO_SERIADOS = 4;
+ public const MODULOS = 5;
+ public const ALTERNANCIA_REGULAR = 6;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/OrgaoVinculadoEscola.php b/src/Modules/Educacenso/Model/OrgaoVinculadoEscola.php
index fc525a7298..c4f8857788 100644
--- a/src/Modules/Educacenso/Model/OrgaoVinculadoEscola.php
+++ b/src/Modules/Educacenso/Model/OrgaoVinculadoEscola.php
@@ -4,10 +4,10 @@
class OrgaoVinculadoEscola
{
- const OUTRO = 1;
- const EDUCACAO = 2;
- const SEGURANCA = 3;
- const SAUDE = 4;
+ public const OUTRO = 1;
+ public const EDUCACAO = 2;
+ public const SEGURANCA = 3;
+ public const SAUDE = 4;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/OrgaosColegiados.php b/src/Modules/Educacenso/Model/OrgaosColegiados.php
index 3401b42cc9..391ab6f2a6 100644
--- a/src/Modules/Educacenso/Model/OrgaosColegiados.php
+++ b/src/Modules/Educacenso/Model/OrgaosColegiados.php
@@ -4,12 +4,12 @@
class OrgaosColegiados
{
- const OUTROS = 1;
- const ASSOCIACAO_PAIS = 2;
- const ASSOCIACAO_PAIS_E_MESTRES = 3;
- const CONSELHO_ESCOLAR = 4;
- const GREMIO_ESTUDANTIL = 5;
- const NENHUM = 6;
+ public const OUTROS = 1;
+ public const ASSOCIACAO_PAIS = 2;
+ public const ASSOCIACAO_PAIS_E_MESTRES = 3;
+ public const CONSELHO_ESCOLAR = 4;
+ public const GREMIO_ESTUDANTIL = 5;
+ public const NENHUM = 6;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/PaisResidencia.php b/src/Modules/Educacenso/Model/PaisResidencia.php
index 5345552472..a48301a2d6 100644
--- a/src/Modules/Educacenso/Model/PaisResidencia.php
+++ b/src/Modules/Educacenso/Model/PaisResidencia.php
@@ -4,17 +4,17 @@
class PaisResidencia
{
- const ARGENTINA = 32;
- const BOLIVIA = 68;
- const BRASIL = 76;
- const COLOMBIA = 170;
- const GUIANA = 328;
- const GUIANA_FRANCESA = 254;
- const PARAGUAI = 600;
- const PERU = 604;
- const SURINAME = 740;
- const URUGUAI = 858;
- const VENEZUELA = 862;
+ public const ARGENTINA = 32;
+ public const BOLIVIA = 68;
+ public const BRASIL = 76;
+ public const COLOMBIA = 170;
+ public const GUIANA = 328;
+ public const GUIANA_FRANCESA = 254;
+ public const PARAGUAI = 600;
+ public const PERU = 604;
+ public const SURINAME = 740;
+ public const URUGUAI = 858;
+ public const VENEZUELA = 862;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/PosGraduacao.php b/src/Modules/Educacenso/Model/PosGraduacao.php
index 8c36f1daa4..5b3880b0da 100644
--- a/src/Modules/Educacenso/Model/PosGraduacao.php
+++ b/src/Modules/Educacenso/Model/PosGraduacao.php
@@ -4,10 +4,10 @@
class PosGraduacao
{
- const ESPECIALIZACAO = 1;
- const MESTRADO = 2;
- const DOUTORADO = 3;
- const NAO_POSSUI = 4;
+ public const ESPECIALIZACAO = 1;
+ public const MESTRADO = 2;
+ public const DOUTORADO = 3;
+ public const NAO_POSSUI = 4;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/RecursosAcessibilidade.php b/src/Modules/Educacenso/Model/RecursosAcessibilidade.php
index 46c5f78f4e..7bd6538b34 100644
--- a/src/Modules/Educacenso/Model/RecursosAcessibilidade.php
+++ b/src/Modules/Educacenso/Model/RecursosAcessibilidade.php
@@ -4,15 +4,15 @@
class RecursosAcessibilidade
{
- const NENHUM = 1;
- const CORRIMAO = 2;
- const ELEVADOR = 3;
- const PISOS_TATEIS = 4;
- const PORTAS_VAO_LIVRE = 5;
- const RAMPAS = 6;
- const SINALIZACAO_SONORA = 7;
- const SINALIZACAO_TATIL = 8;
- const SINALIZACAO_VISUAL = 9;
+ public const NENHUM = 1;
+ public const CORRIMAO = 2;
+ public const ELEVADOR = 3;
+ public const PISOS_TATEIS = 4;
+ public const PORTAS_VAO_LIVRE = 5;
+ public const RAMPAS = 6;
+ public const SINALIZACAO_SONORA = 7;
+ public const SINALIZACAO_TATIL = 8;
+ public const SINALIZACAO_VISUAL = 9;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/RecursosRealizacaoProvas.php b/src/Modules/Educacenso/Model/RecursosRealizacaoProvas.php
index 8b7bee5ad0..ca5e37029f 100644
--- a/src/Modules/Educacenso/Model/RecursosRealizacaoProvas.php
+++ b/src/Modules/Educacenso/Model/RecursosRealizacaoProvas.php
@@ -4,18 +4,18 @@
class RecursosRealizacaoProvas
{
- const NENHUM = 14;
- const AUXILIO_LEDOR = 1;
- const AUXILIO_TRANSCRICAO = 2;
- const GUIA_INTERPRETE = 3;
- const TRADUTOR_INTERPRETE_DE_LIBRAS = 4;
- const LEITURA_LABIAL = 5;
- const PROVA_AMPLIADA_FONTE_18 = 10;
- const PROVA_SUPERAMPLIADA_FONTE_24 = 8;
- const MATERIAL_DIDATICO_E_PROVA_EM_BRAILLE = 9;
- const CD_COM_AUDIO_PARA_DEFICIENTE_VISUAL = 11;
- const PROVA_LINGUA_PORTUGUESA_SEGUNDA_LINGUA_SURDOS = 12;
- const PROVA_EM_VIDEO_EM_LIBRAS = 13;
+ public const NENHUM = 14;
+ public const AUXILIO_LEDOR = 1;
+ public const AUXILIO_TRANSCRICAO = 2;
+ public const GUIA_INTERPRETE = 3;
+ public const TRADUTOR_INTERPRETE_DE_LIBRAS = 4;
+ public const LEITURA_LABIAL = 5;
+ public const PROVA_AMPLIADA_FONTE_18 = 10;
+ public const PROVA_SUPERAMPLIADA_FONTE_24 = 8;
+ public const MATERIAL_DIDATICO_E_PROVA_EM_BRAILLE = 9;
+ public const CD_COM_AUDIO_PARA_DEFICIENTE_VISUAL = 11;
+ public const PROVA_LINGUA_PORTUGUESA_SEGUNDA_LINGUA_SURDOS = 12;
+ public const PROVA_EM_VIDEO_EM_LIBRAS = 13;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/RedeLocal.php b/src/Modules/Educacenso/Model/RedeLocal.php
index d3a3662b23..b08d85fb93 100644
--- a/src/Modules/Educacenso/Model/RedeLocal.php
+++ b/src/Modules/Educacenso/Model/RedeLocal.php
@@ -4,9 +4,9 @@
class RedeLocal
{
- const NENHUMA = 1;
- const A_CABO = 2;
- const WIRELESS = 3;
+ public const NENHUMA = 1;
+ public const A_CABO = 2;
+ public const WIRELESS = 3;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/Regulamentacao.php b/src/Modules/Educacenso/Model/Regulamentacao.php
index cace776d2c..2eecb99853 100644
--- a/src/Modules/Educacenso/Model/Regulamentacao.php
+++ b/src/Modules/Educacenso/Model/Regulamentacao.php
@@ -4,7 +4,7 @@
class Regulamentacao
{
- const NAO = 0;
- const SIM = 1;
- const EM_TRAMITACAO = 2;
+ public const NAO = 0;
+ public const SIM = 1;
+ public const EM_TRAMITACAO = 2;
}
diff --git a/src/Modules/Educacenso/Model/ReservaVagasCotas.php b/src/Modules/Educacenso/Model/ReservaVagasCotas.php
index 89eda3ba93..e82885afe6 100644
--- a/src/Modules/Educacenso/Model/ReservaVagasCotas.php
+++ b/src/Modules/Educacenso/Model/ReservaVagasCotas.php
@@ -4,12 +4,12 @@
class ReservaVagasCotas
{
- const NAO_POSSUI = 1;
- const AUTODECLARACAO_PPI = 2;
- const CONDICAO_RENDA = 3;
- const ESCOLA_PUBLICA = 4;
- const PCD = 5;
- const OUTROS = 6;
+ public const NAO_POSSUI = 1;
+ public const AUTODECLARACAO_PPI = 2;
+ public const CONDICAO_RENDA = 3;
+ public const ESCOLA_PUBLICA = 4;
+ public const PCD = 5;
+ public const OUTROS = 6;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/SalasAtividades.php b/src/Modules/Educacenso/Model/SalasAtividades.php
index d22569c3c5..2492cac5b3 100644
--- a/src/Modules/Educacenso/Model/SalasAtividades.php
+++ b/src/Modules/Educacenso/Model/SalasAtividades.php
@@ -4,13 +4,13 @@
class SalasAtividades
{
- const LEITURA = 1;
- const ATELIE = 2;
- const MUSICA = 3;
- const ESTUDIO_DANCA = 4;
- const MULTIUSO = 5;
- const RECURSOS_AEE = 6;
- const REPOUSO_ALUNO = 7;
+ public const LEITURA = 1;
+ public const ATELIE = 2;
+ public const MUSICA = 3;
+ public const ESTUDIO_DANCA = 4;
+ public const MULTIUSO = 5;
+ public const RECURSOS_AEE = 6;
+ public const REPOUSO_ALUNO = 7;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/SalasFuncionais.php b/src/Modules/Educacenso/Model/SalasFuncionais.php
index d64838f0d9..30437810e8 100644
--- a/src/Modules/Educacenso/Model/SalasFuncionais.php
+++ b/src/Modules/Educacenso/Model/SalasFuncionais.php
@@ -4,10 +4,10 @@
class SalasFuncionais
{
- const COZINHA = 1;
- const REFEITORIO = 2;
- const DESPENSA = 3;
- const ALMOXARIFADO = 4;
+ public const COZINHA = 1;
+ public const REFEITORIO = 2;
+ public const DESPENSA = 3;
+ public const ALMOXARIFADO = 4;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/SalasGerais.php b/src/Modules/Educacenso/Model/SalasGerais.php
index ef71c2c790..441ad7c5e0 100644
--- a/src/Modules/Educacenso/Model/SalasGerais.php
+++ b/src/Modules/Educacenso/Model/SalasGerais.php
@@ -4,11 +4,11 @@
class SalasGerais
{
- const SALA_DIRETORIA = 1;
- const SALA_SECRETARIA = 2;
- const SALA_PROFESSORES = 3;
- const BIBLIOTECA = 4;
- const AUDITORIO = 5;
+ public const SALA_DIRETORIA = 1;
+ public const SALA_SECRETARIA = 2;
+ public const SALA_PROFESSORES = 3;
+ public const BIBLIOTECA = 4;
+ public const AUDITORIO = 5;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/SchoolManagerAccessCriteria.php b/src/Modules/Educacenso/Model/SchoolManagerAccessCriteria.php
index ca208482e1..c7d639ceb4 100644
--- a/src/Modules/Educacenso/Model/SchoolManagerAccessCriteria.php
+++ b/src/Modules/Educacenso/Model/SchoolManagerAccessCriteria.php
@@ -6,11 +6,11 @@
class SchoolManagerAccessCriteria
{
- const PROPRIETARIO = 1;
- const CONCURSO = 4;
- const PROCESSO_ELEITORAL_COMUNIDADE = 5;
- const PROCESSO_SELETIVO_COMUNIDADE = 6;
- const OUTRO = 7;
+ public const PROPRIETARIO = 1;
+ public const CONCURSO = 4;
+ public const PROCESSO_ELEITORAL_COMUNIDADE = 5;
+ public const PROCESSO_SELETIVO_COMUNIDADE = 6;
+ public const OUTRO = 7;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/SchoolManagerRole.php b/src/Modules/Educacenso/Model/SchoolManagerRole.php
index 23fcdcff84..216f16fcd5 100644
--- a/src/Modules/Educacenso/Model/SchoolManagerRole.php
+++ b/src/Modules/Educacenso/Model/SchoolManagerRole.php
@@ -8,8 +8,8 @@ class SchoolManagerRole
{
use DescriptionValue;
- const DIRETOR = 1;
- const OUTRO = 2;
+ public const DIRETOR = 1;
+ public const OUTRO = 2;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/SituacaoFuncionamento.php b/src/Modules/Educacenso/Model/SituacaoFuncionamento.php
index 20759113e0..cbe70ca21f 100644
--- a/src/Modules/Educacenso/Model/SituacaoFuncionamento.php
+++ b/src/Modules/Educacenso/Model/SituacaoFuncionamento.php
@@ -4,9 +4,9 @@
class SituacaoFuncionamento
{
- const EM_ATIVIDADE = 1;
- const PARALISADA = 2;
- const EXTINTA = 3;
+ public const EM_ATIVIDADE = 1;
+ public const PARALISADA = 2;
+ public const EXTINTA = 3;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/TipoAtendimentoAluno.php b/src/Modules/Educacenso/Model/TipoAtendimentoAluno.php
index 8de9e23719..a92eb59bdd 100644
--- a/src/Modules/Educacenso/Model/TipoAtendimentoAluno.php
+++ b/src/Modules/Educacenso/Model/TipoAtendimentoAluno.php
@@ -4,17 +4,17 @@
class TipoAtendimentoAluno
{
- const DESENVOLVIMENTO_FUNCOES_COGNITIVAS = 1;
- const DESENVOLVIMENTO_VIDA_AUTONOMA = 2;
- const ENRIQUECIMENTO_CURRICULAR = 3;
- const ENSINO_INFORMATICA_ACESSIVEL = 4;
- const ENSINO_LIBRAS = 5;
- const ENSINO_LINGUA_PORTUGUESA = 6;
- const ENSINO_SOROBAN = 7;
- const ENSINO_BRAILE = 8;
- const ENSINO_ORIENTACAO_MOBILIDADE = 9;
- const ENSINO_CAA = 10;
- const ENSINO_RECURSOS_OPTICOS_E_NAO_OPTICOS = 11;
+ public const DESENVOLVIMENTO_FUNCOES_COGNITIVAS = 1;
+ public const DESENVOLVIMENTO_VIDA_AUTONOMA = 2;
+ public const ENRIQUECIMENTO_CURRICULAR = 3;
+ public const ENSINO_INFORMATICA_ACESSIVEL = 4;
+ public const ENSINO_LIBRAS = 5;
+ public const ENSINO_LINGUA_PORTUGUESA = 6;
+ public const ENSINO_SOROBAN = 7;
+ public const ENSINO_BRAILE = 8;
+ public const ENSINO_ORIENTACAO_MOBILIDADE = 9;
+ public const ENSINO_CAA = 10;
+ public const ENSINO_RECURSOS_OPTICOS_E_NAO_OPTICOS = 11;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/TipoAtendimentoTurma.php b/src/Modules/Educacenso/Model/TipoAtendimentoTurma.php
index 5feb12d40c..c2c6f45a7d 100644
--- a/src/Modules/Educacenso/Model/TipoAtendimentoTurma.php
+++ b/src/Modules/Educacenso/Model/TipoAtendimentoTurma.php
@@ -8,10 +8,10 @@ class TipoAtendimentoTurma
{
use DescriptionValue;
- const ESCOLARIZACAO = 0;
- const CLASSE_HOSPITALAR = 1;
- const ATIVIDADE_COMPLEMENTAR = 4;
- const AEE = 5;
+ public const ESCOLARIZACAO = 0;
+ public const CLASSE_HOSPITALAR = 1;
+ public const ATIVIDADE_COMPLEMENTAR = 4;
+ public const AEE = 5;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/TipoEnsinoMedioCursado.php b/src/Modules/Educacenso/Model/TipoEnsinoMedioCursado.php
index 54227bcb5a..2762656fda 100644
--- a/src/Modules/Educacenso/Model/TipoEnsinoMedioCursado.php
+++ b/src/Modules/Educacenso/Model/TipoEnsinoMedioCursado.php
@@ -4,10 +4,10 @@
class TipoEnsinoMedioCursado
{
- const FORMACAO_GERAL = 1;
- const MODALIDADE_NORMAL = 2;
- const CURSO_TECNICO = 3;
- const MAGISTERIO_INDIGENA = 4;
+ public const FORMACAO_GERAL = 1;
+ public const MODALIDADE_NORMAL = 2;
+ public const CURSO_TECNICO = 3;
+ public const MAGISTERIO_INDIGENA = 4;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/TipoMediacaoDidaticoPedagogico.php b/src/Modules/Educacenso/Model/TipoMediacaoDidaticoPedagogico.php
index 59a4b9b355..5924886a53 100644
--- a/src/Modules/Educacenso/Model/TipoMediacaoDidaticoPedagogico.php
+++ b/src/Modules/Educacenso/Model/TipoMediacaoDidaticoPedagogico.php
@@ -4,7 +4,7 @@
class TipoMediacaoDidaticoPedagogico
{
- const PRESENCIAL = 1;
- const SEMIPRESENCIAL = 2;
- const EDUCACAO_A_DISTANCIA = 3;
+ public const PRESENCIAL = 1;
+ public const SEMIPRESENCIAL = 2;
+ public const EDUCACAO_A_DISTANCIA = 3;
}
diff --git a/src/Modules/Educacenso/Model/TratamentoLixo.php b/src/Modules/Educacenso/Model/TratamentoLixo.php
index 598b70ce44..e579c363a2 100644
--- a/src/Modules/Educacenso/Model/TratamentoLixo.php
+++ b/src/Modules/Educacenso/Model/TratamentoLixo.php
@@ -4,10 +4,10 @@
class TratamentoLixo
{
- const NAO_FAZ = 1;
- const SEPARACAO = 2;
- const REAPROVEITAMENTO = 3;
- const RECICLAGEM = 4;
+ public const NAO_FAZ = 1;
+ public const SEPARACAO = 2;
+ public const REAPROVEITAMENTO = 3;
+ public const RECICLAGEM = 4;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/UnidadeVinculadaComOutraInstituicao.php b/src/Modules/Educacenso/Model/UnidadeVinculadaComOutraInstituicao.php
index 0d42717e83..f1d7a8c3fc 100644
--- a/src/Modules/Educacenso/Model/UnidadeVinculadaComOutraInstituicao.php
+++ b/src/Modules/Educacenso/Model/UnidadeVinculadaComOutraInstituicao.php
@@ -4,9 +4,9 @@
class UnidadeVinculadaComOutraInstituicao
{
- const SEM_VINCULO = 0;
- const EDUCACAO_BASICA = 1;
- const ENSINO_SUPERIOR = 2;
+ public const SEM_VINCULO = 0;
+ public const EDUCACAO_BASICA = 1;
+ public const ENSINO_SUPERIOR = 2;
/**
* @return array
diff --git a/src/Modules/Educacenso/Model/UsoInternet.php b/src/Modules/Educacenso/Model/UsoInternet.php
index 58989622be..a5050cb3bc 100644
--- a/src/Modules/Educacenso/Model/UsoInternet.php
+++ b/src/Modules/Educacenso/Model/UsoInternet.php
@@ -4,11 +4,11 @@
class UsoInternet
{
- const NAO_POSSUI = 1;
- const ADMINISTRATIVO = 2;
- const PROCESSOS_ENSINO = 3;
- const ALUNOS = 4;
- const COMUNIDADE = 5;
+ public const NAO_POSSUI = 1;
+ public const ADMINISTRATIVO = 2;
+ public const PROCESSOS_ENSINO = 3;
+ public const ALUNOS = 4;
+ public const COMUNIDADE = 5;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Educacenso/Model/VeiculoTransporteEscolar.php b/src/Modules/Educacenso/Model/VeiculoTransporteEscolar.php
index 31ef8b0845..daf235c3ab 100644
--- a/src/Modules/Educacenso/Model/VeiculoTransporteEscolar.php
+++ b/src/Modules/Educacenso/Model/VeiculoTransporteEscolar.php
@@ -4,17 +4,17 @@
class VeiculoTransporteEscolar
{
- const VAN_KOMBI = 1;
- const MICROONIBUS = 2;
- const ONIBUS = 3;
- const BICICLETA = 4;
- const TRACAO_ANIMAL = 5;
- const OUTRO = 6;
- const CAPACIDADE_5 = 7;
- const CAPACIDADE_5_15 = 8;
- const CAPACIDADE_15_35 = 9;
- const CAPACIDADE_35 = 10;
- const TREM_METRO = 11;
+ public const VAN_KOMBI = 1;
+ public const MICROONIBUS = 2;
+ public const ONIBUS = 3;
+ public const BICICLETA = 4;
+ public const TRACAO_ANIMAL = 5;
+ public const OUTRO = 6;
+ public const CAPACIDADE_5 = 7;
+ public const CAPACIDADE_5_15 = 8;
+ public const CAPACIDADE_15_35 = 9;
+ public const CAPACIDADE_35 = 10;
+ public const TREM_METRO = 11;
/**
* @return array
diff --git a/src/Modules/Educacenso/Validator/AdministrativeDomainValidator.php b/src/Modules/Educacenso/Validator/AdministrativeDomainValidator.php
index dd94056e9d..40a391ca91 100644
--- a/src/Modules/Educacenso/Validator/AdministrativeDomainValidator.php
+++ b/src/Modules/Educacenso/Validator/AdministrativeDomainValidator.php
@@ -2,9 +2,9 @@
namespace iEducar\Modules\Educacenso\Validator;
-use iEducar\Modules\Educacenso\Model\Regulamentacao;
use iEducar\Modules\Educacenso\Model\DependenciaAdministrativaEscola;
use iEducar\Modules\Educacenso\Model\EsferaAdministrativa;
+use iEducar\Modules\Educacenso\Model\Regulamentacao;
class AdministrativeDomainValidator implements EducacensoValidator
{
@@ -18,8 +18,8 @@ public function __construct(
$administrativeDomain,
$regulations,
$administrativeDependence,
- $cityIbgeCode)
- {
+ $cityIbgeCode
+ ) {
$this->administrativeDomain = $administrativeDomain;
$this->regulations = $regulations;
$this->administrativeDependence = $administrativeDependence;
diff --git a/src/Modules/EvaluationRules/Models/ParallelRemedialCalculationType.php b/src/Modules/EvaluationRules/Models/ParallelRemedialCalculationType.php
index 7cce951493..1eff2ca13b 100644
--- a/src/Modules/EvaluationRules/Models/ParallelRemedialCalculationType.php
+++ b/src/Modules/EvaluationRules/Models/ParallelRemedialCalculationType.php
@@ -4,9 +4,9 @@
class ParallelRemedialCalculationType
{
- const REPLACE_SCORE = 1;
- const AVERAGE_SCORE = 2;
- const SUM_SCORE = 3;
+ public const REPLACE_SCORE = 1;
+ public const AVERAGE_SCORE = 2;
+ public const SUM_SCORE = 3;
/**
* @return array
diff --git a/src/Modules/Notifications/Status.php b/src/Modules/Notifications/Status.php
index a171880d4c..f6c76f620f 100644
--- a/src/Modules/Notifications/Status.php
+++ b/src/Modules/Notifications/Status.php
@@ -4,6 +4,6 @@
class Status
{
- const READ = 1;
- const UNREAD = 2;
+ public const READ = 1;
+ public const UNREAD = 2;
}
diff --git a/src/Modules/People/CertificateType.php b/src/Modules/People/CertificateType.php
index 0b469c5b6b..41c8504358 100644
--- a/src/Modules/People/CertificateType.php
+++ b/src/Modules/People/CertificateType.php
@@ -4,8 +4,8 @@
class CertificateType
{
- const BIRTH_NEW_FORMAT = 'certidao_nascimento_novo_formato';
- const BIRTH_OLD_FORMAT = 91;
- const MARRIAGE_NEW_FORMAT = 'certidao_casamento_novo_formato';
- const MARRIAGE_OLD_FORMAT = 92;
+ public const BIRTH_NEW_FORMAT = 'certidao_nascimento_novo_formato';
+ public const BIRTH_OLD_FORMAT = 91;
+ public const MARRIAGE_NEW_FORMAT = 'certidao_casamento_novo_formato';
+ public const MARRIAGE_OLD_FORMAT = 92;
}
diff --git a/src/Modules/People/Gender.php b/src/Modules/People/Gender.php
index deb0588692..4c79b5c564 100644
--- a/src/Modules/People/Gender.php
+++ b/src/Modules/People/Gender.php
@@ -4,6 +4,6 @@
class Gender
{
- const MALE = 'M';
- const FEMALE = 'F';
+ public const MALE = 'M';
+ public const FEMALE = 'F';
}
diff --git a/src/Modules/People/MaritalStatus.php b/src/Modules/People/MaritalStatus.php
index 263615b804..714aea04d5 100644
--- a/src/Modules/People/MaritalStatus.php
+++ b/src/Modules/People/MaritalStatus.php
@@ -4,11 +4,11 @@
class MaritalStatus
{
- const MARRIED = 2;
- const COMPANION = 6;
- const DIVORCED = 3;
- const SEPARATED = 4;
- const SINGLE = 1;
- const WIDOWER = 5;
- const UNINFORMED = 7;
+ public const MARRIED = 2;
+ public const COMPANION = 6;
+ public const DIVORCED = 3;
+ public const SEPARATED = 4;
+ public const SINGLE = 1;
+ public const WIDOWER = 5;
+ public const UNINFORMED = 7;
}
diff --git a/src/Modules/SchoolClass/Period.php b/src/Modules/SchoolClass/Period.php
index 92743629f7..b8976d416f 100644
--- a/src/Modules/SchoolClass/Period.php
+++ b/src/Modules/SchoolClass/Period.php
@@ -6,10 +6,10 @@
class Period implements Enum
{
- const MORNING = 1;
- const AFTERNOON = 2;
- const NIGTH = 3;
- const FULLTIME = 4;
+ public const MORNING = 1;
+ public const AFTERNOON = 2;
+ public const NIGTH = 3;
+ public const FULLTIME = 4;
public function getDescriptiveValues(): array
{
diff --git a/src/Modules/Servidores/Model/FuncaoExercida.php b/src/Modules/Servidores/Model/FuncaoExercida.php
index 90c1b65c71..b491376b20 100644
--- a/src/Modules/Servidores/Model/FuncaoExercida.php
+++ b/src/Modules/Servidores/Model/FuncaoExercida.php
@@ -8,14 +8,14 @@ class FuncaoExercida
{
use DescriptionValue;
- const DOCENTE = 1;
- const AUXILIAR_EDUCACIONAL = 2;
- const MONITOR_ATIVIDADE_COMPLEMENTAR = 3;
- const INTERPRETE_LIBRAS = 4;
- const DOCENTE_TITULAR_EAD = 5;
- const DOCENTE_TUTOR_EAD = 6;
- const GUIA_INTERPRETE_LIBRAS = 7;
- const APOIO_ALUNOS_DEFICIENCIA = 8;
+ public const DOCENTE = 1;
+ public const AUXILIAR_EDUCACIONAL = 2;
+ public const MONITOR_ATIVIDADE_COMPLEMENTAR = 3;
+ public const INTERPRETE_LIBRAS = 4;
+ public const DOCENTE_TITULAR_EAD = 5;
+ public const DOCENTE_TUTOR_EAD = 6;
+ public const GUIA_INTERPRETE_LIBRAS = 7;
+ public const APOIO_ALUNOS_DEFICIENCIA = 8;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Servidores/Model/TipoVinculo.php b/src/Modules/Servidores/Model/TipoVinculo.php
index 492225d9f0..c04ab01685 100644
--- a/src/Modules/Servidores/Model/TipoVinculo.php
+++ b/src/Modules/Servidores/Model/TipoVinculo.php
@@ -8,10 +8,10 @@ class TipoVinculo
{
use DescriptionValue;
- const EFETIVO = 1;
- const TEMPORARIO = 2;
- const TERCEIRIZADO = 3;
- const CLT = 4;
+ public const EFETIVO = 1;
+ public const TEMPORARIO = 2;
+ public const TERCEIRIZADO = 3;
+ public const CLT = 4;
public static function getDescriptiveValues()
{
diff --git a/src/Modules/Stages/Exceptions/MissingStagesException.php b/src/Modules/Stages/Exceptions/MissingStagesException.php
index c2a742d4ec..37c242294c 100644
--- a/src/Modules/Stages/Exceptions/MissingStagesException.php
+++ b/src/Modules/Stages/Exceptions/MissingStagesException.php
@@ -7,9 +7,9 @@
class MissingStagesException extends Exception
{
- const DEFAULT_ERROR = Error::MISSING_STAGE_DEFAULT_ERROR;
- const TEACHER_ERROR = Error::MISSING_STAGE_TEACHER_ERROR;
- const COORDINATOR_ERROR = Error::MISSING_STAGE_COORDINATOR_ERROR;
+ public const DEFAULT_ERROR = Error::MISSING_STAGE_DEFAULT_ERROR;
+ public const TEACHER_ERROR = Error::MISSING_STAGE_TEACHER_ERROR;
+ public const COORDINATOR_ERROR = Error::MISSING_STAGE_COORDINATOR_ERROR;
/**
* @var array
diff --git a/src/Modules/Transport/Period.php b/src/Modules/Transport/Period.php
index 3b4611add9..f167615115 100644
--- a/src/Modules/Transport/Period.php
+++ b/src/Modules/Transport/Period.php
@@ -4,13 +4,13 @@
class Period
{
- const MORNING = 1;
- const AFTERNOON = 2;
- const NIGHT = 3;
- const FULL_TIME = 4;
- const MORNING_AND_AFTERNOON = 5;
- const MORNING_AND_NIGHT = 6;
- const AFTERNOON_NIGHT = 7;
+ public const MORNING = 1;
+ public const AFTERNOON = 2;
+ public const NIGHT = 3;
+ public const FULL_TIME = 4;
+ public const MORNING_AND_AFTERNOON = 5;
+ public const MORNING_AND_NIGHT = 6;
+ public const AFTERNOON_NIGHT = 7;
/**
* @return array
diff --git a/src/Reports/Contracts/TeacherReportCard.php b/src/Reports/Contracts/TeacherReportCard.php
index 18dfed8e84..9de72a4c86 100644
--- a/src/Reports/Contracts/TeacherReportCard.php
+++ b/src/Reports/Contracts/TeacherReportCard.php
@@ -4,5 +4,4 @@
interface TeacherReportCard
{
-
}
diff --git a/src/Support/Exceptions/Error.php b/src/Support/Exceptions/Error.php
index 3a4c2178d8..f108b1c9b9 100644
--- a/src/Support/Exceptions/Error.php
+++ b/src/Support/Exceptions/Error.php
@@ -4,16 +4,16 @@
class Error
{
- const MISSING_STAGE_DEFAULT_ERROR = 1000;
- const MISSING_STAGE_TEACHER_ERROR = 1001;
- const MISSING_STAGE_COORDINATOR_ERROR = 1002;
- const SCORE_GREATER_THAN_MAX_ALLOWED = 1003;
- const SCORE_LESSER_THAN_MIN_ALLOWED = 1004;
- const EXAM_SCORE_GREATER_THAN_MAX_ALLOWED = 1005;
- const STUDENT_NOT_ENROLLED_IN_SCHOOL_CLASS = 1006;
- const EVALUATION_RULE_NOT_DEFINED_IN_LEVEL = 1007;
- const EVALUATION_RULE_NOT_ALLOW_GENERAL_ABSENCE = 1008;
- const DISCIPLINE_NOT_ENROLLED_IN_SCHOOL_LEVELS = 1009;
- const DISCIPLINE_NOT_EXISTS_FOR_SCHOOL_CLASS = 1010;
- const SCHOOL_CLASS_DOESNT_ALOW_FREQUENCY_BY_DISCIPLINE = 1011;
+ public const MISSING_STAGE_DEFAULT_ERROR = 1000;
+ public const MISSING_STAGE_TEACHER_ERROR = 1001;
+ public const MISSING_STAGE_COORDINATOR_ERROR = 1002;
+ public const SCORE_GREATER_THAN_MAX_ALLOWED = 1003;
+ public const SCORE_LESSER_THAN_MIN_ALLOWED = 1004;
+ public const EXAM_SCORE_GREATER_THAN_MAX_ALLOWED = 1005;
+ public const STUDENT_NOT_ENROLLED_IN_SCHOOL_CLASS = 1006;
+ public const EVALUATION_RULE_NOT_DEFINED_IN_LEVEL = 1007;
+ public const EVALUATION_RULE_NOT_ALLOW_GENERAL_ABSENCE = 1008;
+ public const DISCIPLINE_NOT_ENROLLED_IN_SCHOOL_LEVELS = 1009;
+ public const DISCIPLINE_NOT_EXISTS_FOR_SCHOOL_CLASS = 1010;
+ public const SCHOOL_CLASS_DOESNT_ALOW_FREQUENCY_BY_DISCIPLINE = 1011;
}
diff --git a/src/Support/View/SelectOptions.php b/src/Support/View/SelectOptions.php
index d8b66794d7..1b31724e14 100644
--- a/src/Support/View/SelectOptions.php
+++ b/src/Support/View/SelectOptions.php
@@ -18,7 +18,6 @@
use iEducar\Modules\Educacenso\Model\TipoEnsinoMedioCursado;
use iEducar\Modules\Educacenso\Model\UnidadeVinculadaComOutraInstituicao;
use iEducar\Modules\School\Model\ActiveLooking;
-use iEducar\Modules\School\Model\ExemptionType;
use iEducar\Modules\Servidores\Model\FuncaoExercida;
use iEducar\Modules\Servidores\Model\TipoVinculo;
use iEducar\Modules\Transport\Period;
@@ -204,12 +203,14 @@ public static function employeeGraduationDisciplines()
/**
* Retorna as opções disponíveis para os tipos de dispensa
+ *
* @return string[]
*/
public static function activeSearchResultOptions()
{
$options = ActiveLooking::getDescriptiveValues();
unset($options[ActiveLooking::ACTIVE_LOOKING_IN_PROGRESS_RESULT]);
+
return $options;
}
}
diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php
index 547152f6a9..ab92402550 100644
--- a/tests/CreatesApplication.php
+++ b/tests/CreatesApplication.php
@@ -13,7 +13,7 @@ trait CreatesApplication
*/
public function createApplication()
{
- $app = require __DIR__.'/../bootstrap/app.php';
+ $app = require __DIR__ . '/../bootstrap/app.php';
$app->make(Kernel::class)->bootstrap();
diff --git a/tests/EloquentTestCase.php b/tests/EloquentTestCase.php
index 1ef56b590f..2ba50814d0 100644
--- a/tests/EloquentTestCase.php
+++ b/tests/EloquentTestCase.php
@@ -3,6 +3,7 @@
namespace Tests;
use Exception;
+use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -29,7 +30,11 @@ abstract protected function getEloquentModelName();
*/
protected function getAttributesForCreate()
{
- return factory($this->getEloquentModelName())->make()->toArray();
+ $factory = Factory::factoryForModel(
+ $this->getEloquentModelName()
+ );
+
+ return $factory->make()->toArray();
}
/**
@@ -39,7 +44,11 @@ protected function getAttributesForCreate()
*/
protected function getAttributesForUpdate()
{
- return factory($this->getEloquentModelName())->make()->toArray();
+ $factory = Factory::factoryForModel(
+ $this->getEloquentModelName()
+ );
+
+ return $factory->make()->toArray();
}
/**
@@ -51,7 +60,7 @@ protected function instanceNewEloquentModel()
{
$model = $this->getEloquentModelName();
- return new $model;
+ return new $model();
}
/**
@@ -104,9 +113,9 @@ public function testUpdateUsingEloquent()
/**
* Delete a Eloquent model.
*
- * @return void
- *
* @throws Exception
+ *
+ * @return void
*/
public function testDeleteUsingEloquent()
{
@@ -147,7 +156,11 @@ public function testFindUsingEloquent()
*/
public function testRelationships()
{
- $model = factory($this->getEloquentModelName())->create();
+ $factory = Factory::factoryForModel(
+ $this->getEloquentModelName()
+ );
+
+ $model = $factory->create();
foreach ($this->relations as $relation => $class) {
$this->assertInstanceOf($class, $model->{$relation});
diff --git a/tests/Feature/Api/StudentControllerTest.php b/tests/Feature/Api/StudentControllerTest.php
index 1812ebab1c..78437ddbfc 100644
--- a/tests/Feature/Api/StudentControllerTest.php
+++ b/tests/Feature/Api/StudentControllerTest.php
@@ -3,6 +3,7 @@
namespace Tests\Feature\Api;
use App\Models\LegacyStudent;
+use Database\Factories\LegacyStudentFactory;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Validation\ValidationException;
use Tests\TestCase;
@@ -14,7 +15,7 @@ class StudentControllerTest extends TestCase
public function testUpdateStateRegistration()
{
/** @var LegacyStudent $student */
- $student = factory(LegacyStudent::class)->create();
+ $student = LegacyStudentFactory::new()->create();
$stateRegistration = '000.000.000';
@@ -37,7 +38,7 @@ public function testUpdateStateRegistration()
public function testUpdateStateRegistrationWithDigit()
{
/** @var LegacyStudent $student */
- $student = factory(LegacyStudent::class)->create();
+ $student = LegacyStudentFactory::new()->create();
$stateRegistration = '000.000.000-1';
@@ -64,9 +65,9 @@ public function testUpdateStateRegistrationDuplicated()
$stateRegistration = '000.000.000';
/** @var LegacyStudent $student */
- $student = factory(LegacyStudent::class)->create();
+ $student = LegacyStudentFactory::new()->create();
- factory(LegacyStudent::class)->create([
+ LegacyStudentFactory::new()->create([
'aluno_estado_id' => $stateRegistration,
]);
@@ -82,7 +83,7 @@ public function testUpdateStateRegistrationInvalid()
$this->expectException(ValidationException::class);
/** @var LegacyStudent $student */
- $student = factory(LegacyStudent::class)->create();
+ $student = LegacyStudentFactory::new()->create();
$stateRegistration = 1234;
diff --git a/tests/Feature/DiarioApi/ContinuingProgressionWithConceptualScoreTest.php b/tests/Feature/DiarioApi/ContinuingProgressionWithConceptualScoreTest.php
index 055a67d3bd..f1d9a27411 100644
--- a/tests/Feature/DiarioApi/ContinuingProgressionWithConceptualScoreTest.php
+++ b/tests/Feature/DiarioApi/ContinuingProgressionWithConceptualScoreTest.php
@@ -3,15 +3,17 @@
namespace Tests\Feature\DiarioApi;
use App\Models\LegacyEnrollment;
-use App\Models\LegacyEvaluationRule;
-use App\Models\LegacyRoundingTable;
-use App\Models\LegacyValueRoundingTable;
+use Database\Factories\LegacyEvaluationRuleFactory;
+use Database\Factories\LegacyRoundingTableFactory;
+use Database\Factories\LegacyValueRoundingTableFactory;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Tests\TestCase;
class ContinuingProgressionWithConceptualScoreTest extends TestCase
{
- use DiarioApiFakeDataTestTrait, DiarioApiRequestTestTrait, DatabaseTransactions;
+ use DiarioApiFakeDataTestTrait;
+ use DiarioApiRequestTestTrait;
+ use DatabaseTransactions;
/**
* @var LegacyEnrollment
@@ -31,7 +33,7 @@ public function setUp(): void
*/
public function getContinuingProgressionWithConceptualScoreTest()
{
- $roundingTable = factory(LegacyRoundingTable::class)->state('conceitual')->create();
+ $roundingTable = LegacyRoundingTableFactory::new()->conceitual()->create();
$valuesRoundingTable = [
[
@@ -67,7 +69,7 @@ public function getContinuingProgressionWithConceptualScoreTest()
];
foreach ($valuesRoundingTable as $value) {
- factory(LegacyValueRoundingTable::class)->create([
+ LegacyValueRoundingTableFactory::new()->create([
'tabela_arredondamento_id' => $roundingTable->id,
'nome' => $value['nome'],
'descricao' => $value['descricao'],
@@ -76,7 +78,7 @@ public function getContinuingProgressionWithConceptualScoreTest()
]);
}
- $evaluationRule = factory(LegacyEvaluationRule::class)->state('progressao-continuada-nota-conceitual')->create([
+ $evaluationRule = LegacyEvaluationRuleFactory::new()->progressaoContinuadaNotaConceitual()->create([
'tabela_arredondamento_id' => $roundingTable->id,
]);
diff --git a/tests/Feature/DiarioApi/DependencyTest.php b/tests/Feature/DiarioApi/DependencyTest.php
index a88224e989..ed7e025f16 100644
--- a/tests/Feature/DiarioApi/DependencyTest.php
+++ b/tests/Feature/DiarioApi/DependencyTest.php
@@ -9,7 +9,9 @@
class DependencyTest extends TestCase
{
- use DiarioApiFakeDataTestTrait, DiarioApiRequestTestTrait, DatabaseTransactions;
+ use DiarioApiFakeDataTestTrait;
+ use DiarioApiRequestTestTrait;
+ use DatabaseTransactions;
/** @var LegacyEnrollment */
private $enrollment;
diff --git a/tests/Feature/DiarioApi/DiarioApiFakeDataTestTrait.php b/tests/Feature/DiarioApi/DiarioApiFakeDataTestTrait.php
index 3cf8bc274b..5d44fa3e57 100644
--- a/tests/Feature/DiarioApi/DiarioApiFakeDataTestTrait.php
+++ b/tests/Feature/DiarioApi/DiarioApiFakeDataTestTrait.php
@@ -2,22 +2,25 @@
namespace Tests\Feature\DiarioApi;
-use App\Models\LegacyAcademicYearStage;
-use App\Models\LegacyCourse;
-use App\Models\LegacyDiscipline;
-use App\Models\LegacyDisciplineAcademicYear;
use App\Models\LegacyEnrollment;
use App\Models\LegacyEvaluationRule;
-use App\Models\LegacyLevel;
-use App\Models\LegacyRegistration;
-use App\Models\LegacyRoundingTable;
use App\Models\LegacySchool;
-use App\Models\LegacySchoolAcademicYear;
use App\Models\LegacySchoolClass;
-use App\Models\LegacySchoolGrade;
-use App\Models\LegacySchoolGradeDiscipline;
-use App\Models\LegacyValueRoundingTable;
-use App\User;
+use Database\Factories\LegacyAcademicYearStageFactory;
+use Database\Factories\LegacyCourseFactory;
+use Database\Factories\LegacyDisciplineAcademicYearFactory;
+use Database\Factories\LegacyDisciplineFactory;
+use Database\Factories\LegacyEnrollmentFactory;
+use Database\Factories\LegacyEvaluationRuleFactory;
+use Database\Factories\LegacyLevelFactory;
+use Database\Factories\LegacyRegistrationFactory;
+use Database\Factories\LegacyRoundingTableFactory;
+use Database\Factories\LegacySchoolAcademicYearFactory;
+use Database\Factories\LegacySchoolClassFactory;
+use Database\Factories\LegacySchoolGradeDisciplineFactory;
+use Database\Factories\LegacySchoolGradeFactory;
+use Database\Factories\LegacyValueRoundingTableFactory;
+use Database\Factories\UserFactory;
trait DiarioApiFakeDataTestTrait
{
@@ -30,19 +33,19 @@ trait DiarioApiFakeDataTestTrait
*/
public function getCommonFakeData($evaluationRule)
{
- $course = factory(LegacyCourse::class)->state('padrao-ano-escolar')->create();
+ $course = LegacyCourseFactory::new()->standardAcademicYear()->create();
- $level = factory(LegacyLevel::class)->create([
+ $level = LegacyLevelFactory::new()->create([
'ref_cod_curso' => $course,
'dias_letivos' => '200'
]);
- $schoolGrade = factory(LegacySchoolGrade::class)->create([
+ $schoolGrade = LegacySchoolGradeFactory::new()->create([
'ref_cod_serie' => $level,
]);
/** @var LegacySchoolClass $schoolClass */
- $schoolClass = factory(LegacySchoolClass::class)->create([
+ $schoolClass = LegacySchoolClassFactory::new()->create([
'ref_ref_cod_escola' => $schoolGrade->school_id,
'ref_ref_cod_serie' => $schoolGrade->grade_id,
'ref_cod_curso' => $schoolGrade->grade->course_id,
@@ -55,21 +58,21 @@ public function getCommonFakeData($evaluationRule)
$school->courses()->attach($schoolClass->course_id, [
'ativo' => 1,
- 'anos_letivos' => '{'.now()->year.'}',
- 'ref_usuario_cad' => factory(User::class)->state('admin')->make()->id,
+ 'anos_letivos' => '{' . now()->year . '}',
+ 'ref_usuario_cad' => UserFactory::new()->admin()->make()->id,
'data_cadastro' => now(),
]);
- $enrollment = factory(LegacyEnrollment::class)->create([
+ $enrollment = LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $schoolClass,
- 'ref_cod_matricula' => factory(LegacyRegistration::class)->create([
+ 'ref_cod_matricula' => LegacyRegistrationFactory::new()->create([
'ref_ref_cod_escola' => $schoolClass->school_id,
'ref_ref_cod_serie' => $schoolClass->grade_id,
'ref_cod_curso' => $schoolClass->course_id,
]),
]);
- factory(LegacySchoolAcademicYear::class)->create([
+ LegacySchoolAcademicYearFactory::new()->create([
'ref_cod_escola' => $school->id,
]);
@@ -80,8 +83,8 @@ public function getCommonFakeData($evaluationRule)
* Adiciona uma etapa ao ano letivo (pmieducar.ano_letivo_modulo)
*
* @param LegacySchool $school
- * @param $number
- * @param null $year
+ * @param $number
+ * @param null $year
*/
public function addAcademicYearStage($school, $number, $year = null)
{
@@ -89,7 +92,7 @@ public function addAcademicYearStage($school, $number, $year = null)
$year = now()->year;
}
- factory(LegacyAcademicYearStage::class)->create([
+ LegacyAcademicYearStageFactory::new()->create([
'ref_ano' => $year,
'ref_ref_cod_escola' => $school->id,
'sequencial' => $number,
@@ -103,12 +106,12 @@ public function addAcademicYearStage($school, $number, $year = null)
*/
public function getPromotionFromAverageAndAttendanceWithoutRetake()
{
- $roundingTable = factory(LegacyRoundingTable::class)->state('numeric')->create();
- factory(LegacyValueRoundingTable::class, 10)->create([
+ $roundingTable = LegacyRoundingTableFactory::new()->numeric()->create();
+ LegacyValueRoundingTableFactory::new()->count(10)->create([
'tabela_arredondamento_id' => $roundingTable->id,
]);
- $evaluationRule = factory(LegacyEvaluationRule::class)->state('media-presenca-sem-recuperacao')->create([
+ $evaluationRule = LegacyEvaluationRuleFactory::new()->mediaPresencaSemRecuperacao()->create([
'tabela_arredondamento_id' => $roundingTable->id,
]);
@@ -119,12 +122,12 @@ public function getPromotionFromAverageAndAttendanceWithoutRetake()
public function getProgressionWithAverageCalculationWeightedRecovery()
{
- $roundingTable = factory(LegacyRoundingTable::class)->state('numeric')->create();
- factory(LegacyValueRoundingTable::class, 10)->create([
+ $roundingTable = LegacyRoundingTableFactory::new()->numeric()->create();
+ LegacyValueRoundingTableFactory::new()->count(10)->create([
'tabela_arredondamento_id' => $roundingTable->id,
]);
- $evaluationRule = factory(LegacyEvaluationRule::class)->state('progressao-calculo-media-recuperacao-ponderada')->create([
+ $evaluationRule = LegacyEvaluationRuleFactory::new()->progressaoCalculoMediaRecuperacaoPonderada()->create([
'tabela_arredondamento_id' => $roundingTable->id,
]);
@@ -150,18 +153,18 @@ public function createDisciplines($schoolClass, $disciplines)
$school = $schoolClass->school;
$grade = $schoolClass->grade;
- $discipline = factory(LegacyDiscipline::class)->create();
+ $discipline = LegacyDisciplineFactory::new()->create();
$schoolClass->disciplines()->attach($discipline->id, [
'ano_escolar_id' => $grade->cod_serie,
'escola_id' => $school->id
]);
- factory(LegacyDisciplineAcademicYear::class)->create([
+ LegacyDisciplineAcademicYearFactory::new()->create([
'componente_curricular_id' => $discipline->id,
'ano_escolar_id' => $schoolClass->grade_id,
]);
- factory(LegacySchoolGradeDiscipline::class)->create([
+ LegacySchoolGradeDisciplineFactory::new()->create([
'ref_ref_cod_escola' => $school->id,
'ref_ref_cod_serie' => $grade->cod_serie,
'ref_cod_disciplina' => $discipline->id
diff --git a/tests/Feature/DiarioApi/DiarioApiRequestTestTrait.php b/tests/Feature/DiarioApi/DiarioApiRequestTestTrait.php
index d661743b90..87c834937b 100644
--- a/tests/Feature/DiarioApi/DiarioApiRequestTestTrait.php
+++ b/tests/Feature/DiarioApi/DiarioApiRequestTestTrait.php
@@ -4,16 +4,16 @@
use App\Models\LegacyDiscipline;
use App\Models\LegacyEnrollment;
-use App\User;
+use Database\Factories\UserFactory;
use Illuminate\Foundation\Testing\TestResponse;
trait DiarioApiRequestTestTrait
{
/**
* @param LegacyEnrollment $enrollment
- * @param $disciplineId
- * @param $stage
- * @param $score
+ * @param $disciplineId
+ * @param $stage
+ * @param $score
*
* @return array
*/
@@ -42,7 +42,7 @@ public function postAbsence($enrollment, $disciplineId, $stage, $score)
$_GET = $data;
- $user = factory(User::class)->state('admin')->make();
+ $user = UserFactory::new()->admin()->make();
/** @var TestResponse $response */
$response = $this->actingAs($user)->get('/module/Avaliacao/diarioApi?' . http_build_query($data));
@@ -80,7 +80,7 @@ public function postScore($enrollment, $disciplineId, $stage, $score, $resource
$_GET = $data;
- $user = factory(User::class)->state('admin')->make();
+ $user = UserFactory::new()->admin()->make();
/** @var TestResponse $response */
$response = $this->actingAs($user)->get('/module/Avaliacao/diarioApi?' . http_build_query($data));
@@ -112,7 +112,7 @@ public function deleteScore($enrollment, $disciplineId, $stage)
$_GET = $data;
- $user = factory(User::class)->state('admin')->make();
+ $user = UserFactory::new()->admin()->make();
/** @var TestResponse $response */
$response = $this->actingAs($user)->get('/module/Avaliacao/diarioApi?' . http_build_query($data));
@@ -144,7 +144,7 @@ public function deleteAbsence($enrollment, $disciplineId, $stage)
$_GET = $data;
- $user = factory(User::class)->state('admin')->make();
+ $user = UserFactory::new()->admin()->make();
/** @var TestResponse $response */
$response = $this->actingAs($user)->get('/module/Avaliacao/diarioApi?' . http_build_query($data));
diff --git a/tests/Feature/DiarioApi/ExemptionTest.php b/tests/Feature/DiarioApi/ExemptionTest.php
index d832bfec7b..eb3150f603 100644
--- a/tests/Feature/DiarioApi/ExemptionTest.php
+++ b/tests/Feature/DiarioApi/ExemptionTest.php
@@ -5,14 +5,17 @@
use App\Models\LegacyDiscipline;
use App\Models\LegacyDisciplineExemption;
use App\Models\LegacyEnrollment;
-use App\Models\LegacyExemptionStage;
use App_Model_MatriculaSituacao;
+use Database\Factories\LegacyDisciplineExemptionFactory;
+use Database\Factories\LegacyExemptionStageFactory;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Tests\TestCase;
class ExemptionTest extends TestCase
{
- use DiarioApiFakeDataTestTrait, DiarioApiRequestTestTrait, DatabaseTransactions;
+ use DiarioApiFakeDataTestTrait;
+ use DiarioApiRequestTestTrait;
+ use DatabaseTransactions;
/** @var LegacyEnrollment */
private $enrollment;
@@ -39,14 +42,14 @@ public function testApproveWithoutPostGradeInExemptionStages()
// Dispensa a primeira etapa da primeira disciplina
/** @var LegacyDisciplineExemption $dispensa */
- $dispensa = factory(LegacyDisciplineExemption::class)->create([
+ $dispensa = LegacyDisciplineExemptionFactory::new()->create([
'ref_cod_matricula' => $registration->id,
'ref_cod_disciplina' => $disciplines[0]->id,
'ref_cod_escola' => $registration->ref_ref_cod_escola,
'ref_cod_serie' => $registration->ref_ref_cod_serie,
]);
- factory(LegacyExemptionStage::class)->create([
+ LegacyExemptionStageFactory::new()->create([
'ref_cod_dispensa' => $dispensa->cod_dispensa,
'etapa' => 1,
]);
@@ -109,18 +112,18 @@ public function testApproveWithoutPostGradeInExemption()
// Dispensa as duas etapas da primeira disciplina
/** @var LegacyDisciplineExemption $dispensa */
- $dispensa = factory(LegacyDisciplineExemption::class)->create([
+ $dispensa = LegacyDisciplineExemptionFactory::new()->create([
'ref_cod_matricula' => $registration->id,
'ref_cod_disciplina' => $disciplines[0]->id,
'ref_cod_escola' => $registration->ref_ref_cod_escola,
'ref_cod_serie' => $registration->ref_ref_cod_serie,
]);
- factory(LegacyExemptionStage::class)->create([
+ LegacyExemptionStageFactory::new()->create([
'ref_cod_dispensa' => $dispensa->cod_dispensa,
'etapa' => 1,
]);
- factory(LegacyExemptionStage::class)->create([
+ LegacyExemptionStageFactory::new()->create([
'ref_cod_dispensa' => $dispensa->cod_dispensa,
'etapa' => 2,
]);
@@ -176,14 +179,14 @@ public function testApproveWithExemptionInLastStage()
// Dispensa a ultima etapa da primeira disciplina
/** @var LegacyDisciplineExemption $dispensa */
- $dispensa = factory(LegacyDisciplineExemption::class)->create([
+ $dispensa = LegacyDisciplineExemptionFactory::new()->create([
'ref_cod_matricula' => $registration->id,
'ref_cod_disciplina' => $disciplines[0]->id,
'ref_cod_escola' => $registration->ref_ref_cod_escola,
'ref_cod_serie' => $registration->ref_ref_cod_serie,
]);
- factory(LegacyExemptionStage::class)->create([
+ LegacyExemptionStageFactory::new()->create([
'ref_cod_dispensa' => $dispensa->cod_dispensa,
'etapa' => 2,
]);
diff --git a/tests/Feature/DiarioApi/ProgressionWithAverageCalculationWeightedRecoveryTest.php b/tests/Feature/DiarioApi/ProgressionWithAverageCalculationWeightedRecoveryTest.php
index ecedcd455c..8e2bf91775 100644
--- a/tests/Feature/DiarioApi/ProgressionWithAverageCalculationWeightedRecoveryTest.php
+++ b/tests/Feature/DiarioApi/ProgressionWithAverageCalculationWeightedRecoveryTest.php
@@ -9,7 +9,9 @@
class ProgressionWithAverageCalculationWeightedRecoveryTest extends TestCase
{
- use DiarioApiFakeDataTestTrait, DiarioApiRequestTestTrait, DatabaseTransactions;
+ use DiarioApiFakeDataTestTrait;
+ use DiarioApiRequestTestTrait;
+ use DatabaseTransactions;
/**
* @var LegacyEnrollment
diff --git a/tests/Feature/DiarioApi/PromotionFromAverageAndAttendanceWithoutRetakeTest.php b/tests/Feature/DiarioApi/PromotionFromAverageAndAttendanceWithoutRetakeTest.php
index b5c1fc3f2a..eaf1eaeac7 100644
--- a/tests/Feature/DiarioApi/PromotionFromAverageAndAttendanceWithoutRetakeTest.php
+++ b/tests/Feature/DiarioApi/PromotionFromAverageAndAttendanceWithoutRetakeTest.php
@@ -8,7 +8,9 @@
class PromotionFromAverageAndAttendanceWithoutRetakeTest extends TestCase
{
- use DiarioApiFakeDataTestTrait, DiarioApiRequestTestTrait, DatabaseTransactions;
+ use DiarioApiFakeDataTestTrait;
+ use DiarioApiRequestTestTrait;
+ use DatabaseTransactions;
/**
* @var LegacyEnrollment
diff --git a/tests/Feature/DiarioApi/WithoutScoreDiarioApiTest.php b/tests/Feature/DiarioApi/WithoutScoreDiarioApiTest.php
index d8bebbf318..682f2dcef9 100644
--- a/tests/Feature/DiarioApi/WithoutScoreDiarioApiTest.php
+++ b/tests/Feature/DiarioApi/WithoutScoreDiarioApiTest.php
@@ -4,12 +4,15 @@
use App\Models\LegacyEvaluationRule;
use App_Model_MatriculaSituacao;
+use Database\Factories\LegacyEvaluationRuleFactory;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Tests\TestCase;
class WithoutScoreDiarioApiTest extends TestCase
{
- use DatabaseTransactions, DiarioApiRequestTestTrait, DiarioApiFakeDataTestTrait;
+ use DatabaseTransactions;
+ use DiarioApiRequestTestTrait;
+ use DiarioApiFakeDataTestTrait;
/**
* @var LegacyEvaluationRule
@@ -22,7 +25,7 @@ class WithoutScoreDiarioApiTest extends TestCase
protected function setUp(): void
{
parent::setUp();
- $this->evaluationRule = factory(LegacyEvaluationRule::class)->state('without-score')->create();
+ $this->evaluationRule = LegacyEvaluationRuleFactory::new()->withoutScore()->create();
}
/**
diff --git a/tests/Feature/SequencialEnturmacaoTest.php b/tests/Feature/SequencialEnturmacaoTest.php
index 843a74be2c..7da08d2437 100644
--- a/tests/Feature/SequencialEnturmacaoTest.php
+++ b/tests/Feature/SequencialEnturmacaoTest.php
@@ -2,9 +2,9 @@
namespace Tests\Feature;
-use App\Models\LegacyEnrollment;
-use App\Models\LegacyRegistration;
-use App\Models\LegacySchoolClass;
+use Database\Factories\LegacyEnrollmentFactory;
+use Database\Factories\LegacyRegistrationFactory;
+use Database\Factories\LegacySchoolClassFactory;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use SequencialEnturmacao;
use Tests\TestCase;
@@ -15,8 +15,8 @@ class SequencialEnturmacaoTest extends TestCase
public function testSequencialEqualsOneWhenRelocationDateIsNull()
{
- $schoolClass = factory(LegacySchoolClass::class)->create();
- $registration = factory(LegacyRegistration::class)->create([
+ $schoolClass = LegacySchoolClassFactory::new()->create();
+ $registration = LegacyRegistrationFactory::new()->create([
'ref_ref_cod_serie' => $schoolClass->ref_ref_cod_serie,
'ref_ref_cod_escola' => $schoolClass->ref_ref_cod_escola,
'ref_cod_curso' => $schoolClass->ref_cod_curso,
@@ -29,30 +29,30 @@ public function testSequencialEqualsOneWhenRelocationDateIsNull()
public function testSequencialEqualsThreeWhenRelocationDateIsNull()
{
- $schoolClass = factory(LegacySchoolClass::class)->create();
- $registration1 = factory(LegacyRegistration::class)->create([
+ $schoolClass = LegacySchoolClassFactory::new()->create();
+ $registration1 = LegacyRegistrationFactory::new()->create([
'ref_ref_cod_serie' => $schoolClass->ref_ref_cod_serie,
'ref_ref_cod_escola' => $schoolClass->ref_ref_cod_escola,
'ref_cod_curso' => $schoolClass->ref_cod_curso,
]);
- $registration2 = factory(LegacyRegistration::class)->create([
+ $registration2 = LegacyRegistrationFactory::new()->create([
'ref_ref_cod_serie' => $schoolClass->ref_ref_cod_serie,
'ref_ref_cod_escola' => $schoolClass->ref_ref_cod_escola,
'ref_cod_curso' => $schoolClass->ref_cod_curso,
]);
- $registration3 = factory(LegacyRegistration::class)->create([
+ $registration3 = LegacyRegistrationFactory::new()->create([
'ref_ref_cod_serie' => $schoolClass->ref_ref_cod_serie,
'ref_ref_cod_escola' => $schoolClass->ref_ref_cod_escola,
'ref_cod_curso' => $schoolClass->ref_cod_curso,
]);
- factory(LegacyEnrollment::class)->create([
+ LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $schoolClass->cod_turma,
'ref_cod_matricula' => $registration1->cod_matricula,
'sequencial_fechamento' => 1
]);
- factory(LegacyEnrollment::class)->create([
+ LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $schoolClass->cod_turma,
'ref_cod_matricula' => $registration2->cod_matricula,
'sequencial_fechamento' => 2
diff --git a/tests/Feature/Services/EnrollmentServiceTest.php b/tests/Feature/Services/EnrollmentServiceTest.php
index 88067a3a60..f1396cff17 100644
--- a/tests/Feature/Services/EnrollmentServiceTest.php
+++ b/tests/Feature/Services/EnrollmentServiceTest.php
@@ -12,11 +12,13 @@
use App\Exceptions\Enrollment\PreviousEnrollDateException;
use App\Models\LegacyEnrollment;
use App\Models\LegacySchoolClass;
-use App\Models\LegacySchoolClassStage;
-use App\Models\LegacyUser;
use App\Services\EnrollmentService;
use App\User;
use Carbon\Carbon;
+use Database\Factories\LegacyEnrollmentFactory;
+use Database\Factories\LegacySchoolClassFactory;
+use Database\Factories\LegacySchoolClassStageFactory;
+use Database\Factories\LegacyUserFactory;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Tests\TestCase;
use Throwable;
@@ -42,13 +44,13 @@ protected function setUp(): void
{
parent::setUp();
- $user = factory(LegacyUser::class)->state('unique')->make();
+ $user = LegacyUserFactory::new()->unique()->make();
$user = User::find($user->id);
- $schoolClass = factory(LegacySchoolClass::class)->create();
+ $schoolClass = LegacySchoolClassFactory::new()->create();
- factory(LegacySchoolClassStage::class)->create([
+ LegacySchoolClassStageFactory::new()->create([
'ref_cod_turma' => $schoolClass,
]);
@@ -59,13 +61,14 @@ protected function setUp(): void
/**
* Cancelamento de enturmação com sucesso.
*
+ * @throws Throwable
+ *
* @return void
*
- * @throws Throwable
*/
public function testCancelEnrollment()
{
- $enrollment = factory(LegacyEnrollment::class)->create([
+ $enrollment = LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -83,9 +86,10 @@ public function testCancelEnrollment()
* Erro ao cancelar uma enturmação devido a data de saída ser anterior ao
* início do ano letivo.
*
+ * @throws Throwable
+ *
* @return void
*
- * @throws Throwable
*/
public function testCancellationDateBeforeAcademicYearException()
{
@@ -96,7 +100,7 @@ public function testCancellationDateBeforeAcademicYearException()
$stage->data_inicio = now()->addDay();
$stage->save();
- $enrollment = factory(LegacyEnrollment::class)->create([
+ $enrollment = LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -110,9 +114,10 @@ public function testCancellationDateBeforeAcademicYearException()
* Erro ao cancelar uma enturmação devido a data de saída ser posterior ao
* fim do ano letivo.
*
+ * @throws Throwable
+ *
* @return void
*
- * @throws Throwable
*/
public function testCancellationDateAfterAcademicYearException()
{
@@ -123,7 +128,7 @@ public function testCancellationDateAfterAcademicYearException()
$stage->data_fim = now()->subDay();
$stage->save();
- $enrollment = factory(LegacyEnrollment::class)->create([
+ $enrollment = LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -134,15 +139,16 @@ public function testCancellationDateAfterAcademicYearException()
* Erro ao cancelar uma enturmação devido a data de saída ser anterior que
* a data de enturmação.
*
+ * @throws Throwable
+ *
* @return void
*
- * @throws Throwable
*/
public function testPreviousCancellationDateException()
{
$this->expectException(PreviousCancellationDateException::class);
- $enrollment = factory(LegacyEnrollment::class)->create([
+ $enrollment = LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -156,7 +162,7 @@ public function testPreviousCancellationDateException()
*/
public function testEnroll()
{
- $enrollment = factory(LegacyEnrollment::class)->make([
+ $enrollment = LegacyEnrollmentFactory::new()->make([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -183,7 +189,7 @@ public function testNoVacancyException()
{
$this->expectException(NoVacancyException::class);
- $enrollment = factory(LegacyEnrollment::class)->make([
+ $enrollment = LegacyEnrollmentFactory::new()->make([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -205,7 +211,7 @@ public function testExistsActiveEnrollmentException()
{
$this->expectException(ExistsActiveEnrollmentException::class);
- $enrollment = factory(LegacyEnrollment::class)->create([
+ $enrollment = LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -220,15 +226,16 @@ public function testExistsActiveEnrollmentException()
* Erro ao enturmar uma matrícula devido a data de entrada ser anterior ao
* início do ano letivo.
*
+ * @throws Throwable
+ *
* @return void
*
- * @throws Throwable
*/
public function testEnrollDateBeforeAcademicYearException()
{
$this->expectException(EnrollDateBeforeAcademicYearException::class);
- $enrollment = factory(LegacyEnrollment::class)->make([
+ $enrollment = LegacyEnrollmentFactory::new()->make([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -251,13 +258,14 @@ public function testEnrollDateBeforeAcademicYearException()
* Permite matrícular antes do início do ano letivo se o parâmetro permitir_matricula_fora_periodo_letivo
* estiver habilitado na instituição
*
+ * @throws Throwable
+ *
* @return void
*
- * @throws Throwable
*/
public function testEnrollDateBeforeAcademicYearAllowed()
{
- $enrollment = factory(LegacyEnrollment::class)->make([
+ $enrollment = LegacyEnrollmentFactory::new()->make([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -282,15 +290,16 @@ public function testEnrollDateBeforeAcademicYearAllowed()
* Erro ao enturmar uma matrícula devido a data de entrada ser posterior ao
* fim do ano letivo.
*
+ * @throws Throwable
+ *
* @return void
*
- * @throws Throwable
*/
public function testEnrollDateAfterAcademicYearException()
{
$this->expectException(EnrollDateAfterAcademicYearException::class);
- $enrollment = factory(LegacyEnrollment::class)->make([
+ $enrollment = LegacyEnrollmentFactory::new()->make([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -309,15 +318,16 @@ public function testEnrollDateAfterAcademicYearException()
/**
* A data de enturmação é anterior a data de matrícula.
*
+ * @throws Throwable
+ *
* @return void
*
- * @throws Throwable
*/
public function testPreviousEnrollDateException()
{
$this->expectException(PreviousEnrollDateException::class);
- $enrollment = factory(LegacyEnrollment::class)->create([
+ $enrollment = LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -336,7 +346,7 @@ public function testPreviousEnrollDateException()
public function testGetPreviousEnrollmentWithouRelocationDate()
{
/** @var LegacyEnrollment $enrollment */
- $enrollment = factory(LegacyEnrollment::class)->create([
+ $enrollment = LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $this->schoolClass,
]);
@@ -354,7 +364,7 @@ public function testGetPreviousEnrollmentWithouRelocationDate()
public function testGetPreviousEnrollmentWithRelocationDateBeforeDepartedDate()
{
/** @var LegacyEnrollment $enrollment */
- $enrollment = factory(LegacyEnrollment::class)->create([
+ $enrollment = LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $this->schoolClass,
'data_exclusao' => now(),
]);
@@ -373,7 +383,7 @@ public function testGetPreviousEnrollmentWithRelocationDateBeforeDepartedDate()
public function testGetPreviousEnrollmentWithRelocationDateAfterDepartedDate()
{
/** @var LegacyEnrollment $enrollment */
- $enrollment = factory(LegacyEnrollment::class)->create([
+ $enrollment = LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $this->schoolClass,
'data_exclusao' => Carbon::yesterday(),
]);
@@ -390,19 +400,19 @@ public function testReorder()
{
$schoolClass = $this->schoolClass->getKey();
- $enrollment = factory(LegacyEnrollment::class)->create([
+ $enrollment = LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $schoolClass,
]);
$registration = $enrollment->registration->getKey();
- factory(LegacyEnrollment::class)->create([
+ LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $schoolClass,
'ref_cod_matricula' => $registration,
'sequencial' => 3
]);
- factory(LegacyEnrollment::class)->create([
+ LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $schoolClass,
'ref_cod_matricula' => $registration,
'sequencial' => 5
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 5108ba930e..12aefcf386 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -74,6 +74,6 @@ protected function setUpTraits()
*/
public function getHtmlCodeFromFile($fileName)
{
- return file_get_contents(__DIR__ . '/Unit/assets/' . $fileName);
+ return file_get_contents(__DIR__ . '/Unit/assets/' . $fileName);
}
}
diff --git a/tests/Unit/App/Model/IedFinderTest.php b/tests/Unit/App/Model/IedFinderTest.php
index 3ac5d04180..2719c1ab53 100644
--- a/tests/Unit/App/Model/IedFinderTest.php
+++ b/tests/Unit/App/Model/IedFinderTest.php
@@ -1,9 +1,7 @@
_validator->setOptions(['choices' => $this->_choices['bit']]);
+
try {
$this->_validator->isValid([0, 2, 3]);
$this->fail('CoreExt_Validate_ChoiceMultiple deveria ter lançado exceção.');
diff --git a/tests/Unit/CoreExt/Validate/ChoiceTest.php b/tests/Unit/CoreExt/Validate/ChoiceTest.php
index 7db82faaea..bdbced01c6 100644
--- a/tests/Unit/CoreExt/Validate/ChoiceTest.php
+++ b/tests/Unit/CoreExt/Validate/ChoiceTest.php
@@ -1,7 +1,5 @@
_validator->setOptions(['choices' => $this->_choices['bit']]);
+
try {
$this->_validator->isValid(2);
$this->fail('CoreExt_Validate_Choice deveria ter lançado exceção.');
diff --git a/tests/Unit/CoreExt/Validate/StringTest.php b/tests/Unit/CoreExt/Validate/StringTest.php
index 0c66f14f8e..1da7d945bb 100644
--- a/tests/Unit/CoreExt/Validate/StringTest.php
+++ b/tests/Unit/CoreExt/Validate/StringTest.php
@@ -1,7 +1,5 @@
-
- pessoa_id
- curso_id
- confirmado
-
- 1
- 1
- t
-
-
- 1
- 2
- t
-
-
-
\ No newline at end of file
+
+ pessoa_id
+ curso_id
+ confirmado
+
+ 1
+ 1
+ t
+
+
+ 1
+ 2
+ t
+
+
+
diff --git a/tests/Unit/CoreExt/_fixtures/matricula-depois-removido.xml b/tests/Unit/CoreExt/_fixtures/matricula-depois-removido.xml
index 8be7b7044d..a9d2ab9217 100644
--- a/tests/Unit/CoreExt/_fixtures/matricula-depois-removido.xml
+++ b/tests/Unit/CoreExt/_fixtures/matricula-depois-removido.xml
@@ -1,13 +1,13 @@
-
- pessoa_id
- curso_id
- confirmado
-
- 1
- 1
- t
-
-
-
\ No newline at end of file
+
+ pessoa_id
+ curso_id
+ confirmado
+
+ 1
+ 1
+ t
+
+
+
diff --git a/tests/Unit/CoreExt/_fixtures/matricula-depois-salvo.xml b/tests/Unit/CoreExt/_fixtures/matricula-depois-salvo.xml
index cf21a8fd70..6664162226 100644
--- a/tests/Unit/CoreExt/_fixtures/matricula-depois-salvo.xml
+++ b/tests/Unit/CoreExt/_fixtures/matricula-depois-salvo.xml
@@ -1,23 +1,23 @@
-
- pessoa_id
- curso_id
- confirmado
-
- 1
- 1
- t
-
-
- 1
- 2
- f
-
-
- 1
- 3
- t
-
-
-
\ No newline at end of file
+
+ pessoa_id
+ curso_id
+ confirmado
+
+ 1
+ 1
+ t
+
+
+ 1
+ 2
+ f
+
+
+ 1
+ 3
+ t
+
+
+
diff --git a/tests/Unit/CoreExt/_fixtures/matricula.xml b/tests/Unit/CoreExt/_fixtures/matricula.xml
index 2b6a2061b4..db3f1da981 100644
--- a/tests/Unit/CoreExt/_fixtures/matricula.xml
+++ b/tests/Unit/CoreExt/_fixtures/matricula.xml
@@ -1,18 +1,18 @@
-
- pessoa_id
- curso_id
- confirmado
-
- 1
- 1
- t
-
-
- 1
- 2
- f
-
-
-
\ No newline at end of file
+
+ pessoa_id
+ curso_id
+ confirmado
+
+ 1
+ 1
+ t
+
+
+ 1
+ 2
+ f
+
+
+
diff --git a/tests/Unit/CoreExt/_fixtures/parent-child.xml b/tests/Unit/CoreExt/_fixtures/parent-child.xml
index b18ec16688..92b51a8ba7 100644
--- a/tests/Unit/CoreExt/_fixtures/parent-child.xml
+++ b/tests/Unit/CoreExt/_fixtures/parent-child.xml
@@ -1,39 +1,39 @@
-
- id
- filho_id
- nome
-
- 1
- 1
- Arnaldo Antunes
-
-
- 2
- 2
- Marvin Gaye
-
-
-
- id
- nome
- sexo
- tipo_sanguineo
- peso
-
- 1
- Antunes Jr.
- 1
- 4
- 12.300
-
-
- 2
- Gaye Jr.
- 1
- 3
- 22.850
-
-
-
\ No newline at end of file
+
+ id
+ filho_id
+ nome
+
+ 1
+ 1
+ Arnaldo Antunes
+
+
+ 2
+ 2
+ Marvin Gaye
+
+
+
+ id
+ nome
+ sexo
+ tipo_sanguineo
+ peso
+
+ 1
+ Antunes Jr.
+ 1
+ 4
+ 12.300
+
+
+ 2
+ Gaye Jr.
+ 1
+ 3
+ 22.850
+
+
+
diff --git a/tests/Unit/CoreExt/_fixtures/pessoa-depois-atualizado.xml b/tests/Unit/CoreExt/_fixtures/pessoa-depois-atualizado.xml
index c273d2cb14..d072e16225 100644
--- a/tests/Unit/CoreExt/_fixtures/pessoa-depois-atualizado.xml
+++ b/tests/Unit/CoreExt/_fixtures/pessoa-depois-atualizado.xml
@@ -1,21 +1,21 @@
-
- id
- nome
- estado_civil
- doador
-
- 1
- Arnaldo Antunes
- solteiro
- t
-
-
- 2
- Marvin Gaye
- solteiro
-
-
-
-
\ No newline at end of file
+
+ id
+ nome
+ estado_civil
+ doador
+
+ 1
+ Arnaldo Antunes
+ solteiro
+ t
+
+
+ 2
+ Marvin Gaye
+ solteiro
+
+
+
+
diff --git a/tests/Unit/CoreExt/_fixtures/pessoa-depois-removido.xml b/tests/Unit/CoreExt/_fixtures/pessoa-depois-removido.xml
index 35dc85a887..6ab388e67f 100644
--- a/tests/Unit/CoreExt/_fixtures/pessoa-depois-removido.xml
+++ b/tests/Unit/CoreExt/_fixtures/pessoa-depois-removido.xml
@@ -1,15 +1,15 @@
-
- id
- nome
- estado_civil
- doador
-
- 2
- Marvin Gaye
- casado
- t
-
-
-
\ No newline at end of file
+
+ id
+ nome
+ estado_civil
+ doador
+
+ 2
+ Marvin Gaye
+ casado
+ t
+
+
+
diff --git a/tests/Unit/CoreExt/_fixtures/pessoa-depois-salvo.xml b/tests/Unit/CoreExt/_fixtures/pessoa-depois-salvo.xml
index 3f6aeb93c7..0f6f47c8d9 100644
--- a/tests/Unit/CoreExt/_fixtures/pessoa-depois-salvo.xml
+++ b/tests/Unit/CoreExt/_fixtures/pessoa-depois-salvo.xml
@@ -1,27 +1,27 @@
-
- id
- nome
- estado_civil
- doador
-
- 1
- Arnaldo Antunes
- solteiro
- t
-
-
- 2
- Marvin Gaye
- casado
- t
-
-
- 3
- Fernando Nascimento
- solteiro
- t
-
-
-
\ No newline at end of file
+
+ id
+ nome
+ estado_civil
+ doador
+
+ 1
+ Arnaldo Antunes
+ solteiro
+ t
+
+
+ 2
+ Marvin Gaye
+ casado
+ t
+
+
+ 3
+ Fernando Nascimento
+ solteiro
+ t
+
+
+
diff --git a/tests/Unit/CoreExt/_fixtures/pessoa.xml b/tests/Unit/CoreExt/_fixtures/pessoa.xml
index 14a287b6ec..7e9793c4ad 100644
--- a/tests/Unit/CoreExt/_fixtures/pessoa.xml
+++ b/tests/Unit/CoreExt/_fixtures/pessoa.xml
@@ -1,21 +1,21 @@
-
- id
- nome
- estado_civil
- doador
-
- 1
- Arnaldo Antunes
- solteiro
- t
-
-
- 2
- Marvin Gaye
- casado
- t
-
-
-
\ No newline at end of file
+
+ id
+ nome
+ estado_civil
+ doador
+
+ 1
+ Arnaldo Antunes
+ solteiro
+ t
+
+
+ 2
+ Marvin Gaye
+ casado
+ t
+
+
+
diff --git a/tests/Unit/CoreExt/_stub/ChildEntity.php b/tests/Unit/CoreExt/_stub/ChildEntity.php
index 01136a58ed..9c2289bdd9 100644
--- a/tests/Unit/CoreExt/_stub/ChildEntity.php
+++ b/tests/Unit/CoreExt/_stub/ChildEntity.php
@@ -1,7 +1,5 @@
1
diff --git a/tests/Unit/CoreExt/_stub/Enum2.php b/tests/Unit/CoreExt/_stub/Enum2.php
index 1b78624200..2a33ef2b76 100644
--- a/tests/Unit/CoreExt/_stub/Enum2.php
+++ b/tests/Unit/CoreExt/_stub/Enum2.php
@@ -1,10 +1,8 @@
2
diff --git a/tests/Unit/CoreExt/_stub/EnumCoffee.php b/tests/Unit/CoreExt/_stub/EnumCoffee.php
index 5e39f4b994..9dad0b196c 100644
--- a/tests/Unit/CoreExt/_stub/EnumCoffee.php
+++ b/tests/Unit/CoreExt/_stub/EnumCoffee.php
@@ -1,12 +1,10 @@
'',
diff --git a/tests/Unit/CoreExt/_stub/EnumSex.php b/tests/Unit/CoreExt/_stub/EnumSex.php
index 64b1e73b9e..de74f07bac 100644
--- a/tests/Unit/CoreExt/_stub/EnumSex.php
+++ b/tests/Unit/CoreExt/_stub/EnumSex.php
@@ -1,11 +1,9 @@
'masculino',
diff --git a/tests/Unit/CoreExt/_stub/EnumString.php b/tests/Unit/CoreExt/_stub/EnumString.php
index 9aeddc3ca5..e91ba26598 100644
--- a/tests/Unit/CoreExt/_stub/EnumString.php
+++ b/tests/Unit/CoreExt/_stub/EnumString.php
@@ -1,10 +1,8 @@
'#FF0000'
diff --git a/tests/Unit/CoreExt/_stub/EnumTipoSanguineo.php b/tests/Unit/CoreExt/_stub/EnumTipoSanguineo.php
index ab50dbee8f..8f77f3dab1 100644
--- a/tests/Unit/CoreExt/_stub/EnumTipoSanguineo.php
+++ b/tests/Unit/CoreExt/_stub/EnumTipoSanguineo.php
@@ -1,13 +1,11 @@
'A',
diff --git a/tests/Unit/CoreExt/_stub/ParentEntity.php b/tests/Unit/CoreExt/_stub/ParentEntity.php
index e4d16eb3ee..3f27f5b237 100644
--- a/tests/Unit/CoreExt/_stub/ParentEntity.php
+++ b/tests/Unit/CoreExt/_stub/ParentEntity.php
@@ -1,7 +1,5 @@
assertTrue($validator->isValid());
@@ -18,7 +18,7 @@ public function testOnlyOneDeficiencyChoosed()
public function testChooseCegueiraAndAllowedDeficiency()
{
- $values = [ Deficiencias::CEGUEIRA, Deficiencias::TRANSTORNO_ESPECTRO_AUTISTA ];
+ $values = [Deficiencias::CEGUEIRA, Deficiencias::TRANSTORNO_ESPECTRO_AUTISTA];
$validator = new DeficiencyValidator($values);
$this->assertTrue($validator->isValid());
@@ -34,7 +34,7 @@ public function testChooseCegueiraAndForbiddenDeficiency()
$randomIndex = array_rand($forbiddenDeficiencies);
- $values = [ Deficiencias::CEGUEIRA, $forbiddenDeficiencies[$randomIndex] ];
+ $values = [Deficiencias::CEGUEIRA, $forbiddenDeficiencies[$randomIndex]];
$validator = new DeficiencyValidator($values);
$descriptions = Deficiencias::getDescriptiveValues();
@@ -48,7 +48,7 @@ public function testChooseCegueiraAndForbiddenDeficiency()
public function testChooseBaixaVisaoAndAllowedDeficiency()
{
- $values = [ Deficiencias::BAIXA_VISAO, Deficiencias::TRANSTORNO_ESPECTRO_AUTISTA ];
+ $values = [Deficiencias::BAIXA_VISAO, Deficiencias::TRANSTORNO_ESPECTRO_AUTISTA];
$validator = new DeficiencyValidator($values);
$this->assertTrue($validator->isValid());
@@ -60,7 +60,7 @@ public function testChooseBaixaVisaoAndForbiddenDeficiency()
Deficiencias::SURDOCEGUEIRA,
];
- $values = [ Deficiencias::BAIXA_VISAO, $forbiddenDeficiencies[0] ];
+ $values = [Deficiencias::BAIXA_VISAO, $forbiddenDeficiencies[0]];
$validator = new DeficiencyValidator($values);
$forbiddenDescriptions = $this->getDeficienciesDescriptions($forbiddenDeficiencies);
@@ -72,7 +72,7 @@ public function testChooseBaixaVisaoAndForbiddenDeficiency()
public function testChooseSurdezAndAllowedDeficiency()
{
- $values = [ Deficiencias::SURDEZ, Deficiencias::TRANSTORNO_ESPECTRO_AUTISTA ];
+ $values = [Deficiencias::SURDEZ, Deficiencias::TRANSTORNO_ESPECTRO_AUTISTA];
$validator = new DeficiencyValidator($values);
$this->assertTrue($validator->isValid());
@@ -87,7 +87,7 @@ public function testChooseSurdezAndForbiddenDeficiency()
$randomIndex = array_rand($forbiddenDeficiencies);
- $values = [ Deficiencias::SURDEZ, $forbiddenDeficiencies[$randomIndex] ];
+ $values = [Deficiencias::SURDEZ, $forbiddenDeficiencies[$randomIndex]];
$validator = new DeficiencyValidator($values);
$descriptions = Deficiencias::getDescriptiveValues();
@@ -101,7 +101,7 @@ public function testChooseSurdezAndForbiddenDeficiency()
public function testChooseDeficienciaAuditivaAndAllowedDeficiency()
{
- $values = [ Deficiencias::DEFICIENCIA_AUDITIVA, Deficiencias::TRANSTORNO_ESPECTRO_AUTISTA ];
+ $values = [Deficiencias::DEFICIENCIA_AUDITIVA, Deficiencias::TRANSTORNO_ESPECTRO_AUTISTA];
$validator = new DeficiencyValidator($values);
$this->assertTrue($validator->isValid());
@@ -113,7 +113,7 @@ public function testChooseDeficienciaAuditivaAndForbiddenDeficiency()
Deficiencias::SURDOCEGUEIRA,
];
- $values = [ Deficiencias::DEFICIENCIA_AUDITIVA, $forbiddenDeficiencies[0] ];
+ $values = [Deficiencias::DEFICIENCIA_AUDITIVA, $forbiddenDeficiencies[0]];
$validator = new DeficiencyValidator($values);
$descriptions = Deficiencias::getDescriptiveValues();
diff --git a/tests/Unit/Educacenso/Validator/InepExamValidatorTest.php b/tests/Unit/Educacenso/Validator/InepExamValidatorTest.php
index 3c6cf49699..0a1ab13fd0 100644
--- a/tests/Unit/Educacenso/Validator/InepExamValidatorTest.php
+++ b/tests/Unit/Educacenso/Validator/InepExamValidatorTest.php
@@ -11,7 +11,7 @@ class InepExamValidatorTest extends TestCase
{
public function testJustNenhumSelected()
{
- $resources = [ RecursosRealizacaoProvas::NENHUM ];
+ $resources = [RecursosRealizacaoProvas::NENHUM];
$deficiencies = [];
$validator = new InepExamValidator($resources, $deficiencies);
@@ -20,8 +20,8 @@ public function testJustNenhumSelected()
public function testNenhumAndAnotherResourceSelected()
{
- $resources = [ RecursosRealizacaoProvas::NENHUM, RecursosRealizacaoProvas::AUXILIO_LEDOR ];
- $deficiencies = [ Deficiencias::CEGUEIRA ];
+ $resources = [RecursosRealizacaoProvas::NENHUM, RecursosRealizacaoProvas::AUXILIO_LEDOR];
+ $deficiencies = [Deficiencias::CEGUEIRA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -30,8 +30,8 @@ public function testNenhumAndAnotherResourceSelected()
public function testProvaAmpliadaAndAnotherPermitedOptionChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_AMPLIADA_FONTE_18, RecursosRealizacaoProvas::AUXILIO_LEDOR ];
- $deficiencies = [ Deficiencias::BAIXA_VISAO ];
+ $resources = [RecursosRealizacaoProvas::PROVA_AMPLIADA_FONTE_18, RecursosRealizacaoProvas::AUXILIO_LEDOR];
+ $deficiencies = [Deficiencias::BAIXA_VISAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -39,8 +39,8 @@ public function testProvaAmpliadaAndAnotherPermitedOptionChoosed()
public function testProvaAmpliadaAndAnotherForbiddenOptionChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_AMPLIADA_FONTE_18, RecursosRealizacaoProvas::PROVA_SUPERAMPLIADA_FONTE_24 ];
- $deficiencies = [ Deficiencias::BAIXA_VISAO ];
+ $resources = [RecursosRealizacaoProvas::PROVA_AMPLIADA_FONTE_18, RecursosRealizacaoProvas::PROVA_SUPERAMPLIADA_FONTE_24];
+ $deficiencies = [Deficiencias::BAIXA_VISAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -49,8 +49,8 @@ public function testProvaAmpliadaAndAnotherForbiddenOptionChoosed()
public function testAuxilioLedorAndAllowedDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::AUXILIO_LEDOR ];
- $deficiencies = [ Deficiencias::CEGUEIRA ];
+ $resources = [RecursosRealizacaoProvas::AUXILIO_LEDOR];
+ $deficiencies = [Deficiencias::CEGUEIRA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -58,8 +58,8 @@ public function testAuxilioLedorAndAllowedDeficiencyChoosed()
public function testAuxilioLedorAndAllowedAndForbiddenDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::AUXILIO_LEDOR ];
- $deficiencies = [ Deficiencias::CEGUEIRA, Deficiencias::SURDEZ ];
+ $resources = [RecursosRealizacaoProvas::AUXILIO_LEDOR];
+ $deficiencies = [Deficiencias::CEGUEIRA, Deficiencias::SURDEZ];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -68,8 +68,8 @@ public function testAuxilioLedorAndAllowedAndForbiddenDeficiencyChoosed()
public function testAuxilioLedorAndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::AUXILIO_LEDOR ];
- $deficiencies = [ Deficiencias::DEFICIENCIA_AUDITIVA ];
+ $resources = [RecursosRealizacaoProvas::AUXILIO_LEDOR];
+ $deficiencies = [Deficiencias::DEFICIENCIA_AUDITIVA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -78,8 +78,8 @@ public function testAuxilioLedorAndNeutralDeficiencyChoosed()
public function testAuxilioTranscricaoAndAllowedAloneDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::AUXILIO_TRANSCRICAO ];
- $deficiencies = [ Deficiencias::BAIXA_VISAO ];
+ $resources = [RecursosRealizacaoProvas::AUXILIO_TRANSCRICAO];
+ $deficiencies = [Deficiencias::BAIXA_VISAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -87,8 +87,8 @@ public function testAuxilioTranscricaoAndAllowedAloneDeficiencyChoosed()
public function testAuxilioTranscricaoAndNotAllowedAloneDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::AUXILIO_TRANSCRICAO ];
- $deficiencies = [ Deficiencias::CEGUEIRA ];
+ $resources = [RecursosRealizacaoProvas::AUXILIO_TRANSCRICAO];
+ $deficiencies = [Deficiencias::CEGUEIRA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -97,8 +97,8 @@ public function testAuxilioTranscricaoAndNotAllowedAloneDeficiencyChoosed()
public function testAuxilioTranscricaoAndNotAllowedAloneDeficiencyWithAnotherResourceChoosed()
{
- $resources = [ RecursosRealizacaoProvas::AUXILIO_TRANSCRICAO, RecursosRealizacaoProvas::AUXILIO_LEDOR ];
- $deficiencies = [ Deficiencias::CEGUEIRA ];
+ $resources = [RecursosRealizacaoProvas::AUXILIO_TRANSCRICAO, RecursosRealizacaoProvas::AUXILIO_LEDOR];
+ $deficiencies = [Deficiencias::CEGUEIRA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -106,8 +106,8 @@ public function testAuxilioTranscricaoAndNotAllowedAloneDeficiencyWithAnotherRes
public function testAuxilioTranscricaoAndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::AUXILIO_TRANSCRICAO ];
- $deficiencies = [ Deficiencias::DEFICIENCIA_AUDITIVA ];
+ $resources = [RecursosRealizacaoProvas::AUXILIO_TRANSCRICAO];
+ $deficiencies = [Deficiencias::DEFICIENCIA_AUDITIVA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -116,8 +116,8 @@ public function testAuxilioTranscricaoAndNeutralDeficiencyChoosed()
public function testGuiaInterpreteAndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::GUIA_INTERPRETE ];
- $deficiencies = [ Deficiencias::DEFICIENCIA_AUDITIVA ];
+ $resources = [RecursosRealizacaoProvas::GUIA_INTERPRETE];
+ $deficiencies = [Deficiencias::DEFICIENCIA_AUDITIVA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -125,8 +125,8 @@ public function testGuiaInterpreteAndNeutralDeficiencyChoosed()
public function testGuiaInterpreteAndForbiddenDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::GUIA_INTERPRETE ];
- $deficiencies = [ Deficiencias::SURDOCEGUEIRA ];
+ $resources = [RecursosRealizacaoProvas::GUIA_INTERPRETE];
+ $deficiencies = [Deficiencias::SURDOCEGUEIRA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -135,8 +135,8 @@ public function testGuiaInterpreteAndForbiddenDeficiencyChoosed()
public function testTradutorInterpreteAndAllowedDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::TRADUTOR_INTERPRETE_DE_LIBRAS ];
- $deficiencies = [ Deficiencias::SURDEZ ];
+ $resources = [RecursosRealizacaoProvas::TRADUTOR_INTERPRETE_DE_LIBRAS];
+ $deficiencies = [Deficiencias::SURDEZ];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -144,8 +144,8 @@ public function testTradutorInterpreteAndAllowedDeficiencyChoosed()
public function testTradutorInterpreteAndAllowedAndForbiddenDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::TRADUTOR_INTERPRETE_DE_LIBRAS ];
- $deficiencies = [ Deficiencias::CEGUEIRA, Deficiencias::SURDEZ ];
+ $resources = [RecursosRealizacaoProvas::TRADUTOR_INTERPRETE_DE_LIBRAS];
+ $deficiencies = [Deficiencias::CEGUEIRA, Deficiencias::SURDEZ];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -154,8 +154,8 @@ public function testTradutorInterpreteAndAllowedAndForbiddenDeficiencyChoosed()
public function testTradutorInterpreteAndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::TRADUTOR_INTERPRETE_DE_LIBRAS ];
- $deficiencies = [ Deficiencias::DEFICIENCIA_FISICA ];
+ $resources = [RecursosRealizacaoProvas::TRADUTOR_INTERPRETE_DE_LIBRAS];
+ $deficiencies = [Deficiencias::DEFICIENCIA_FISICA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -164,8 +164,8 @@ public function testTradutorInterpreteAndNeutralDeficiencyChoosed()
public function testLeituraLabialAndAllowedDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::LEITURA_LABIAL ];
- $deficiencies = [ Deficiencias::SURDEZ ];
+ $resources = [RecursosRealizacaoProvas::LEITURA_LABIAL];
+ $deficiencies = [Deficiencias::SURDEZ];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -173,8 +173,8 @@ public function testLeituraLabialAndAllowedDeficiencyChoosed()
public function testLeituraLabialAndAllowedAndForbiddenDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::LEITURA_LABIAL ];
- $deficiencies = [ Deficiencias::CEGUEIRA, Deficiencias::SURDEZ ];
+ $resources = [RecursosRealizacaoProvas::LEITURA_LABIAL];
+ $deficiencies = [Deficiencias::CEGUEIRA, Deficiencias::SURDEZ];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -183,8 +183,8 @@ public function testLeituraLabialAndAllowedAndForbiddenDeficiencyChoosed()
public function testLeituraLabialAndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::LEITURA_LABIAL ];
- $deficiencies = [ Deficiencias::DEFICIENCIA_FISICA ];
+ $resources = [RecursosRealizacaoProvas::LEITURA_LABIAL];
+ $deficiencies = [Deficiencias::DEFICIENCIA_FISICA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -193,8 +193,8 @@ public function testLeituraLabialAndNeutralDeficiencyChoosed()
public function testProvaAmpliadaFonte18AndAllowedDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_AMPLIADA_FONTE_18 ];
- $deficiencies = [ Deficiencias::BAIXA_VISAO ];
+ $resources = [RecursosRealizacaoProvas::PROVA_AMPLIADA_FONTE_18];
+ $deficiencies = [Deficiencias::BAIXA_VISAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -202,8 +202,8 @@ public function testProvaAmpliadaFonte18AndAllowedDeficiencyChoosed()
public function testProvaAmpliadaFonte18AndAllowedAndForbiddenDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_AMPLIADA_FONTE_18 ];
- $deficiencies = [ Deficiencias::CEGUEIRA, Deficiencias::BAIXA_VISAO ];
+ $resources = [RecursosRealizacaoProvas::PROVA_AMPLIADA_FONTE_18];
+ $deficiencies = [Deficiencias::CEGUEIRA, Deficiencias::BAIXA_VISAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -212,8 +212,8 @@ public function testProvaAmpliadaFonte18AndAllowedAndForbiddenDeficiencyChoosed(
public function testProvaAmpliadaFonte18AndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_AMPLIADA_FONTE_18 ];
- $deficiencies = [ Deficiencias::DEFICIENCIA_FISICA ];
+ $resources = [RecursosRealizacaoProvas::PROVA_AMPLIADA_FONTE_18];
+ $deficiencies = [Deficiencias::DEFICIENCIA_FISICA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -222,8 +222,8 @@ public function testProvaAmpliadaFonte18AndNeutralDeficiencyChoosed()
public function testProvaSuperAmpliadaFonte24AndAllowedDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_SUPERAMPLIADA_FONTE_24 ];
- $deficiencies = [ Deficiencias::BAIXA_VISAO ];
+ $resources = [RecursosRealizacaoProvas::PROVA_SUPERAMPLIADA_FONTE_24];
+ $deficiencies = [Deficiencias::BAIXA_VISAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -231,8 +231,8 @@ public function testProvaSuperAmpliadaFonte24AndAllowedDeficiencyChoosed()
public function testProvaSuperAmpliadaFonte24AndAllowedAndForbiddenDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_SUPERAMPLIADA_FONTE_24 ];
- $deficiencies = [ Deficiencias::CEGUEIRA, Deficiencias::BAIXA_VISAO ];
+ $resources = [RecursosRealizacaoProvas::PROVA_SUPERAMPLIADA_FONTE_24];
+ $deficiencies = [Deficiencias::CEGUEIRA, Deficiencias::BAIXA_VISAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -241,8 +241,8 @@ public function testProvaSuperAmpliadaFonte24AndAllowedAndForbiddenDeficiencyCho
public function testProvaSuperAmpliadaFonte24AndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_SUPERAMPLIADA_FONTE_24 ];
- $deficiencies = [ Deficiencias::DEFICIENCIA_FISICA ];
+ $resources = [RecursosRealizacaoProvas::PROVA_SUPERAMPLIADA_FONTE_24];
+ $deficiencies = [Deficiencias::DEFICIENCIA_FISICA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -251,8 +251,8 @@ public function testProvaSuperAmpliadaFonte24AndNeutralDeficiencyChoosed()
public function testCdComAudioAndAllowedDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::CD_COM_AUDIO_PARA_DEFICIENTE_VISUAL ];
- $deficiencies = [ Deficiencias::CEGUEIRA ];
+ $resources = [RecursosRealizacaoProvas::CD_COM_AUDIO_PARA_DEFICIENTE_VISUAL];
+ $deficiencies = [Deficiencias::CEGUEIRA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -260,8 +260,8 @@ public function testCdComAudioAndAllowedDeficiencyChoosed()
public function testCdComAudioAndAllowedAndForbiddenDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::CD_COM_AUDIO_PARA_DEFICIENTE_VISUAL ];
- $deficiencies = [ Deficiencias::SURDEZ, Deficiencias::CEGUEIRA ];
+ $resources = [RecursosRealizacaoProvas::CD_COM_AUDIO_PARA_DEFICIENTE_VISUAL];
+ $deficiencies = [Deficiencias::SURDEZ, Deficiencias::CEGUEIRA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -270,8 +270,8 @@ public function testCdComAudioAndAllowedAndForbiddenDeficiencyChoosed()
public function testCdComAudioAndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::CD_COM_AUDIO_PARA_DEFICIENTE_VISUAL ];
- $deficiencies = [ Deficiencias::ALTAS_HABILIDADES_SUPERDOTACAO ];
+ $resources = [RecursosRealizacaoProvas::CD_COM_AUDIO_PARA_DEFICIENTE_VISUAL];
+ $deficiencies = [Deficiencias::ALTAS_HABILIDADES_SUPERDOTACAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -280,8 +280,8 @@ public function testCdComAudioAndNeutralDeficiencyChoosed()
public function testProvaLinguaPortuguesaSegundaLinguaAndAllowedDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_LINGUA_PORTUGUESA_SEGUNDA_LINGUA_SURDOS ];
- $deficiencies = [ Deficiencias::SURDEZ ];
+ $resources = [RecursosRealizacaoProvas::PROVA_LINGUA_PORTUGUESA_SEGUNDA_LINGUA_SURDOS];
+ $deficiencies = [Deficiencias::SURDEZ];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -289,8 +289,8 @@ public function testProvaLinguaPortuguesaSegundaLinguaAndAllowedDeficiencyChoose
public function testProvaLinguaPortuguesaSegundaLinguaAndAllowedAndForbiddenDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_LINGUA_PORTUGUESA_SEGUNDA_LINGUA_SURDOS ];
- $deficiencies = [ Deficiencias::SURDEZ, Deficiencias::CEGUEIRA ];
+ $resources = [RecursosRealizacaoProvas::PROVA_LINGUA_PORTUGUESA_SEGUNDA_LINGUA_SURDOS];
+ $deficiencies = [Deficiencias::SURDEZ, Deficiencias::CEGUEIRA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -299,8 +299,8 @@ public function testProvaLinguaPortuguesaSegundaLinguaAndAllowedAndForbiddenDefi
public function testProvaLinguaPortuguesaSegundaLinguaAndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_LINGUA_PORTUGUESA_SEGUNDA_LINGUA_SURDOS ];
- $deficiencies = [ Deficiencias::ALTAS_HABILIDADES_SUPERDOTACAO ];
+ $resources = [RecursosRealizacaoProvas::PROVA_LINGUA_PORTUGUESA_SEGUNDA_LINGUA_SURDOS];
+ $deficiencies = [Deficiencias::ALTAS_HABILIDADES_SUPERDOTACAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -309,8 +309,8 @@ public function testProvaLinguaPortuguesaSegundaLinguaAndNeutralDeficiencyChoose
public function testProvaVideoLibrasAndAllowedDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_EM_VIDEO_EM_LIBRAS ];
- $deficiencies = [ Deficiencias::SURDEZ ];
+ $resources = [RecursosRealizacaoProvas::PROVA_EM_VIDEO_EM_LIBRAS];
+ $deficiencies = [Deficiencias::SURDEZ];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -318,8 +318,8 @@ public function testProvaVideoLibrasAndAllowedDeficiencyChoosed()
public function testProvaVideoLibrasAndAllowedAndForbiddenDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_EM_VIDEO_EM_LIBRAS ];
- $deficiencies = [ Deficiencias::SURDEZ, Deficiencias::CEGUEIRA ];
+ $resources = [RecursosRealizacaoProvas::PROVA_EM_VIDEO_EM_LIBRAS];
+ $deficiencies = [Deficiencias::SURDEZ, Deficiencias::CEGUEIRA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -328,8 +328,8 @@ public function testProvaVideoLibrasAndAllowedAndForbiddenDeficiencyChoosed()
public function testProvaVideoLibrasAndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::PROVA_EM_VIDEO_EM_LIBRAS ];
- $deficiencies = [ Deficiencias::ALTAS_HABILIDADES_SUPERDOTACAO ];
+ $resources = [RecursosRealizacaoProvas::PROVA_EM_VIDEO_EM_LIBRAS];
+ $deficiencies = [Deficiencias::ALTAS_HABILIDADES_SUPERDOTACAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -338,8 +338,8 @@ public function testProvaVideoLibrasAndNeutralDeficiencyChoosed()
public function testMaterialDidaticoProvaBrailleAndAllowedDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::MATERIAL_DIDATICO_E_PROVA_EM_BRAILLE ];
- $deficiencies = [ Deficiencias::CEGUEIRA ];
+ $resources = [RecursosRealizacaoProvas::MATERIAL_DIDATICO_E_PROVA_EM_BRAILLE];
+ $deficiencies = [Deficiencias::CEGUEIRA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
@@ -347,8 +347,8 @@ public function testMaterialDidaticoProvaBrailleAndAllowedDeficiencyChoosed()
public function testMaterialDidaticoProvaBrailleAndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::MATERIAL_DIDATICO_E_PROVA_EM_BRAILLE ];
- $deficiencies = [ Deficiencias::ALTAS_HABILIDADES_SUPERDOTACAO ];
+ $resources = [RecursosRealizacaoProvas::MATERIAL_DIDATICO_E_PROVA_EM_BRAILLE];
+ $deficiencies = [Deficiencias::ALTAS_HABILIDADES_SUPERDOTACAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -357,8 +357,8 @@ public function testMaterialDidaticoProvaBrailleAndNeutralDeficiencyChoosed()
public function testNenhumAndForbiddenDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::NENHUM ];
- $deficiencies = [ Deficiencias::CEGUEIRA ];
+ $resources = [RecursosRealizacaoProvas::NENHUM];
+ $deficiencies = [Deficiencias::CEGUEIRA];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertFalse($validator->isValid());
@@ -367,8 +367,8 @@ public function testNenhumAndForbiddenDeficiencyChoosed()
public function testNenhumAndNeutralDeficiencyChoosed()
{
- $resources = [ RecursosRealizacaoProvas::NENHUM ];
- $deficiencies = [ Deficiencias::ALTAS_HABILIDADES_SUPERDOTACAO ];
+ $resources = [RecursosRealizacaoProvas::NENHUM];
+ $deficiencies = [Deficiencias::ALTAS_HABILIDADES_SUPERDOTACAO];
$validator = new InepExamValidator($resources, $deficiencies);
$this->assertTrue($validator->isValid());
diff --git a/tests/Unit/Eloquent/LegacySchoolClassTest.php b/tests/Unit/Eloquent/LegacySchoolClassTest.php
index 8b6b9d9164..a8dda7b996 100644
--- a/tests/Unit/Eloquent/LegacySchoolClassTest.php
+++ b/tests/Unit/Eloquent/LegacySchoolClassTest.php
@@ -3,11 +3,12 @@
namespace Tests\Unit\Eloquent;
use App\Models\LegacyCourse;
-use App\Models\LegacyEnrollment;
use App\Models\LegacyLevel;
-use App\Models\LegacyRegistration;
use App\Models\LegacySchool;
use App\Models\LegacySchoolClass;
+use Database\Factories\LegacyEnrollmentFactory;
+use Database\Factories\LegacyRegistrationFactory;
+use Database\Factories\LegacySchoolClassFactory;
use Illuminate\Support\Collection;
use Tests\EloquentTestCase;
@@ -63,23 +64,23 @@ public function testDeleteUsingEloquent()
public function testGetTotalEnrolledMethod()
{
/** @var LegacySchoolClass $schoolClass */
- $schoolClass = factory(LegacySchoolClass::class)->create();
+ $schoolClass = LegacySchoolClassFactory::new()->create();
- $registration = factory(LegacyRegistration::class)->create([
+ $registration = LegacyRegistrationFactory::new()->create([
'dependencia' => true,
]);
- factory(LegacyEnrollment::class)->create([
+ LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $schoolClass,
'ref_cod_matricula' => $registration,
]);
- factory(LegacyEnrollment::class)->create([
+ LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $schoolClass,
'ativo' => false,
]);
- factory(LegacyEnrollment::class)->create([
+ LegacyEnrollmentFactory::new()->create([
'ref_cod_turma' => $schoolClass,
]);
diff --git a/tests/Unit/Eloquent/SettingTest.php b/tests/Unit/Eloquent/SettingTest.php
index 81669673f0..c8097e99d3 100644
--- a/tests/Unit/Eloquent/SettingTest.php
+++ b/tests/Unit/Eloquent/SettingTest.php
@@ -3,6 +3,7 @@
namespace Tests\Unit\Eloquent;
use App\Setting;
+use Database\Factories\SettingFactory;
use Tests\EloquentTestCase;
class SettingTest extends EloquentTestCase
@@ -20,22 +21,22 @@ protected function getEloquentModelName()
*/
public function testBoolean()
{
- $settingTrueString = factory(Setting::class)->create([
+ $settingTrueString = SettingFactory::new()->create([
'type' => 'boolean',
'value' => 'true',
]);
- $settingOneString = factory(Setting::class)->create([
+ $settingOneString = SettingFactory::new()->create([
'type' => 'boolean',
'value' => '1',
]);
- $settingOne = factory(Setting::class)->create([
+ $settingOne = SettingFactory::new()->create([
'type' => 'boolean',
'value' => 1,
]);
- $settingTrue = factory(Setting::class)->create([
+ $settingTrue = SettingFactory::new()->create([
'type' => 'boolean',
'value' => true,
]);
@@ -45,37 +46,37 @@ public function testBoolean()
$this->assertTrue($settingOne->value);
$this->assertTrue($settingTrue->value);
- $settingFalseString = factory(Setting::class)->create([
+ $settingFalseString = SettingFactory::new()->create([
'type' => 'boolean',
'value' => 'false',
]);
- $settingFalseZeroString = factory(Setting::class)->create([
+ $settingFalseZeroString = SettingFactory::new()->create([
'type' => 'boolean',
'value' => '0',
]);
- $settingFalseZero = factory(Setting::class)->create([
+ $settingFalseZero = SettingFactory::new()->create([
'type' => 'boolean',
'value' => 0,
]);
- $settingFalse = factory(Setting::class)->create([
+ $settingFalse = SettingFactory::new()->create([
'type' => 'boolean',
'value' => false,
]);
- $settingFalseEmptyString = factory(Setting::class)->create([
+ $settingFalseEmptyString = SettingFactory::new()->create([
'type' => 'boolean',
'value' => '',
]);
- $settingFalseNull = factory(Setting::class)->create([
+ $settingFalseNull = SettingFactory::new()->create([
'type' => 'boolean',
'value' => null,
]);
- $settingFalseNullString = factory(Setting::class)->create([
+ $settingFalseNullString = SettingFactory::new()->create([
'type' => 'boolean',
'value' => 'null',
]);
diff --git a/tests/Unit/Http/Middleware/LoadSettingsTest.php b/tests/Unit/Http/Middleware/LoadSettingsTest.php
index 815262b0aa..5eb1bfb50f 100644
--- a/tests/Unit/Http/Middleware/LoadSettingsTest.php
+++ b/tests/Unit/Http/Middleware/LoadSettingsTest.php
@@ -4,6 +4,7 @@
use App\Http\Middleware\LoadSettings;
use App\Setting;
+use Database\Factories\SettingFactory;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Config;
@@ -18,7 +19,7 @@ class LoadSettingsTest extends TestCase
*/
public function testMiddleware()
{
- factory(Setting::class)->create([
+ SettingFactory::new()->create([
'key' => 'load.settings.test',
'value' => 'Middleware for Test',
'type' => Setting::TYPE_STRING,
diff --git a/tests/Unit/Modules/AllTests.php b/tests/Unit/Modules/AllTests.php
index 301ea55d96..c13d14a4e3 100644
--- a/tests/Unit/Modules/AllTests.php
+++ b/tests/Unit/Modules/AllTests.php
@@ -1,7 +1,5 @@
addDirectoryTests();
}
diff --git a/tests/Unit/Modules/AlunoTest.php b/tests/Unit/Modules/AlunoTest.php
index 8d9aca8b9d..2b606a594d 100644
--- a/tests/Unit/Modules/AlunoTest.php
+++ b/tests/Unit/Modules/AlunoTest.php
@@ -1,7 +1,5 @@
addDirectoryTests();
}
diff --git a/tests/Unit/Modules/Service/AvaliacaoServiceSituacaoTest.php b/tests/Unit/Modules/Service/AvaliacaoServiceSituacaoTest.php
index ba4cc6498b..aaadaf2b32 100644
--- a/tests/Unit/Modules/Service/AvaliacaoServiceSituacaoTest.php
+++ b/tests/Unit/Modules/Service/AvaliacaoServiceSituacaoTest.php
@@ -1,7 +1,7 @@
method('getRegra')
->willReturn($regra);
- $registration = factory(LegacyRegistration::class)
+ $registration = LegacyRegistrationFactory::new()
->create(
[
- 'ref_ref_cod_serie' => factory(LegacyLevel::class)->create(),
+ 'ref_ref_cod_serie' => LegacyLevelFactory::new()->create(),
'dependencia' => true,
]
);
diff --git a/tests/Unit/Modules/Service/FaltaAlunoTest.php b/tests/Unit/Modules/Service/FaltaAlunoTest.php
index e45b636313..645a1a60b0 100644
--- a/tests/Unit/Modules/Service/FaltaAlunoTest.php
+++ b/tests/Unit/Modules/Service/FaltaAlunoTest.php
@@ -2,7 +2,6 @@
use PHPUnit\Framework\MockObject\MockObject;
-
class Avaliacao_Service_FaltaAlunoTest extends Avaliacao_Service_TestCommon
{
public function testCriaNovaInstanciaDeFaltaAluno()
diff --git a/tests/Unit/Modules/Service/FaltaCommon.php b/tests/Unit/Modules/Service/FaltaCommon.php
index 1e1cdadd85..6df58b6177 100644
--- a/tests/Unit/Modules/Service/FaltaCommon.php
+++ b/tests/Unit/Modules/Service/FaltaCommon.php
@@ -1,7 +1,5 @@
user = factory(User::class)->state('admin')->make();
+
+ $this->user = UserFactory::new()->admin()->make();
}
/**
@@ -36,8 +40,8 @@ public function testExistingSchoolShouldNotDuplicate()
{
$model = $this->getImportModel();
- $school = factory(LegacySchool::class)->create();
- $inep = factory(SchoolInep::class)->create([
+ $school = LegacySchoolFactory::new()->create();
+ $inep = SchoolInepFactory::new()->create([
'cod_escola' => $school,
'cod_escola_inep' => $model->codigoInep,
]);
@@ -92,7 +96,7 @@ public function testCreateSchoolPhone()
$phones = $school->person->phone;
$this->assertCount(1, $phones);
- $this->assertEquals((int)$model->telefone, (int)$phones->first()->fone);
+ $this->assertEquals((int) $model->telefone, (int) $phones->first()->fone);
}
/**
diff --git a/tests/Unit/Services/RemoveHtmlTagsServiceTest.php b/tests/Unit/Services/RemoveHtmlTagsServiceTest.php
index 9318dd65f8..fd3ce40095 100644
--- a/tests/Unit/Services/RemoveHtmlTagsServiceTest.php
+++ b/tests/Unit/Services/RemoveHtmlTagsServiceTest.php
@@ -1,6 +1,7 @@
execute($text);
- self::assertTrue(preg_match($pattern,$parecer) === 0);
+ self::assertTrue(preg_match($pattern, $parecer) === 0);
}
public function provideData()
diff --git a/tests/Unit/Services/SchoolClass/AvailableTimeServiceTest.php b/tests/Unit/Services/SchoolClass/AvailableTimeServiceTest.php
index d1a7bc2553..c47071df01 100644
--- a/tests/Unit/Services/SchoolClass/AvailableTimeServiceTest.php
+++ b/tests/Unit/Services/SchoolClass/AvailableTimeServiceTest.php
@@ -2,12 +2,12 @@
namespace Tests\Unit\Services\SchoolClass;
-use App\Models\LegacyEnrollment;
-use App\Models\LegacyRegistration;
-use App\Models\LegacySchoolClass;
-use App\Models\LegacySchoolClassStage;
-use App\Models\LegacyStudent;
use App\Services\SchoolClass\AvailableTimeService;
+use Database\Factories\LegacyEnrollmentFactory;
+use Database\Factories\LegacyRegistrationFactory;
+use Database\Factories\LegacySchoolClassFactory;
+use Database\Factories\LegacySchoolClassStageFactory;
+use Database\Factories\LegacyStudentFactory;
use iEducar\Modules\Educacenso\Model\TipoAtendimentoTurma;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -48,8 +48,8 @@ public function tearDown(): void
*/
public function testWithoutOthersEnrollmentsReturnsTrue()
{
- $schoolClass = factory(LegacySchoolClass::class)->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- $registration = factory(LegacyRegistration::class)->create();
+ $schoolClass = LegacySchoolClassFactory::new()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $registration = LegacyRegistrationFactory::new()->create();
$this->assertTrue($this->service->isAvailable($registration->ref_cod_aluno, $schoolClass->cod_turma));
}
@@ -59,20 +59,20 @@ public function testWithoutOthersEnrollmentsReturnsTrue()
*/
public function testWithEnrollmentsSameDayDifferentTimeReturnsTrue()
{
- $schoolClass = factory(LegacySchoolClass::class)->state('morning')->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- $otherSchoolClass = factory(LegacySchoolClass::class)->state('afternoon')->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- $registration = factory(LegacyRegistration::class)->create();
+ $schoolClass = LegacySchoolClassFactory::new()->morning()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $otherSchoolClass = LegacySchoolClassFactory::new()->afternoon()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $registration = LegacyRegistrationFactory::new()->create();
- factory(LegacyEnrollment::class)->state('active')->create([
+ LegacyEnrollmentFactory::new()->active()->create([
'ref_cod_turma' => $otherSchoolClass->cod_turma,
'ref_cod_matricula' => $registration->cod_matricula,
]);
- factory(LegacySchoolClassStage::class)->create([
+ LegacySchoolClassStageFactory::new()->create([
'ref_cod_turma' => $schoolClass,
]);
- factory(LegacySchoolClassStage::class)->create([
+ LegacySchoolClassStageFactory::new()->create([
'ref_cod_turma' => $otherSchoolClass,
]);
@@ -84,19 +84,19 @@ public function testWithEnrollmentsSameDayDifferentTimeReturnsTrue()
*/
public function testWithEnrollmentsSameDaySameTimeSameYearReturnsFalse()
{
- $schoolClass = factory(LegacySchoolClass::class)->state('morning')->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- $otherSchoolClass = factory(LegacySchoolClass::class)->state('morning')->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- $registration = factory(LegacyRegistration::class)->create(['ano' => $schoolClass->ano, 'aprovado' => 3]);
+ $schoolClass = LegacySchoolClassFactory::new()->morning()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $otherSchoolClass = LegacySchoolClassFactory::new()->morning()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $registration = LegacyRegistrationFactory::new()->create(['ano' => $schoolClass->ano, 'aprovado' => 3]);
- factory(LegacySchoolClassStage::class)->create([
+ LegacySchoolClassStageFactory::new()->create([
'ref_cod_turma' => $schoolClass,
]);
- factory(LegacySchoolClassStage::class)->create([
+ LegacySchoolClassStageFactory::new()->create([
'ref_cod_turma' => $otherSchoolClass,
]);
- factory(LegacyEnrollment::class)->state('active')->create([
+ LegacyEnrollmentFactory::new()->active()->create([
'ref_cod_turma' => $otherSchoolClass->cod_turma,
'ref_cod_matricula' => $registration->cod_matricula,
]);
@@ -109,11 +109,11 @@ public function testWithEnrollmentsSameDaySameTimeSameYearReturnsFalse()
*/
public function testWithEnrollmentsSameDaySameTimeDifferentYearReturnsTrue()
{
- $schoolClass = factory(LegacySchoolClass::class)->state('morning')->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- $otherSchoolClass = factory(LegacySchoolClass::class)->state('morning')->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- $registration = factory(LegacyRegistration::class)->create(['ano' => ($schoolClass->ano - 1)]);
+ $schoolClass = LegacySchoolClassFactory::new()->morning()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $otherSchoolClass = LegacySchoolClassFactory::new()->morning()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $registration = LegacyRegistrationFactory::new()->create(['ano' => ($schoolClass->ano - 1)]);
- factory(LegacyEnrollment::class)->state('active')->create([
+ LegacyEnrollmentFactory::new()->active()->create([
'ref_cod_turma' => $otherSchoolClass->cod_turma,
'ref_cod_matricula' => $registration->cod_matricula,
]);
@@ -126,14 +126,14 @@ public function testWithEnrollmentsSameDaySameTimeDifferentYearReturnsTrue()
*/
public function testWithEnrollmentsDifferentDaySameTimeReturnsFalse()
{
- $schoolClass = factory(LegacySchoolClass::class)->state('morning')->create([
+ $schoolClass = LegacySchoolClassFactory::new()->morning()->create([
'tipo_mediacao_didatico_pedagogico' => 1,
'dias_semana' => '{1, 7}',
]);
- $otherSchoolClass = factory(LegacySchoolClass::class)->state('morning')->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- $registration = factory(LegacyRegistration::class)->create();
+ $otherSchoolClass = LegacySchoolClassFactory::new()->morning()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $registration = LegacyRegistrationFactory::new()->create();
- factory(LegacyEnrollment::class)->state('active')->create([
+ LegacyEnrollmentFactory::new()->active()->create([
'ref_cod_turma' => $otherSchoolClass->cod_turma,
'ref_cod_matricula' => $registration->cod_matricula,
]);
@@ -148,7 +148,7 @@ public function testShouldLaunchExceptionWhenPassInvalidSchoolClassId()
{
$this->expectException(ModelNotFoundException::class);
- $registration = factory(LegacyRegistration::class)->create();
+ $registration = LegacyRegistrationFactory::new()->create();
$this->service->isAvailable($registration->ref_cod_aluno, -1);
}
@@ -158,32 +158,32 @@ public function testShouldLaunchExceptionWhenPassInvalidSchoolClassId()
*/
public function testSameYearButDifferentAcademicPeriods()
{
- $student = factory(LegacyStudent::class)->create();
+ $student = LegacyStudentFactory::new()->create();
- $schoolClass = factory(LegacySchoolClass::class)->state('morning')->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- $otherSchoolClass = factory(LegacySchoolClass::class)->state('morning')->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $schoolClass = LegacySchoolClassFactory::new()->morning()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $otherSchoolClass = LegacySchoolClassFactory::new()->morning()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- factory(LegacySchoolClassStage::class)->create([
+ LegacySchoolClassStageFactory::new()->create([
'ref_cod_turma' => $schoolClass,
'data_inicio' => now()->subMonths(3),
'data_fim' => now()->subMonths(2),
]);
- factory(LegacySchoolClassStage::class)->create([
+ LegacySchoolClassStageFactory::new()->create([
'ref_cod_turma' => $otherSchoolClass,
'data_inicio' => now()->addMonths(3),
'data_fim' => now()->addMonths(2),
]);
- $registration = factory(LegacyRegistration::class)->create([
+ $registration = LegacyRegistrationFactory::new()->create([
'ref_cod_aluno' => $student
]);
- $otherRegistration = factory(LegacyRegistration::class)->create([
+ $otherRegistration = LegacyRegistrationFactory::new()->create([
'ref_cod_aluno' => $student
]);
- factory(LegacyEnrollment::class)->state('active')->create([
+ LegacyEnrollmentFactory::new()->active()->create([
'ref_cod_turma' => $schoolClass,
'ref_cod_matricula' => $registration,
]);
@@ -196,13 +196,13 @@ public function testSameYearButDifferentAcademicPeriods()
*/
public function testWithEnrollmentsSameDaySameTimeSameYearAndOneAeeOtherEscolarizacaoReturnsTrue()
{
- $schoolClass = factory(LegacySchoolClass::class)->state('morning')->create(
+ $schoolClass = LegacySchoolClassFactory::new()->morning()->create(
[
'tipo_mediacao_didatico_pedagogico' => 1,
'tipo_atendimento' => TipoAtendimentoTurma::AEE,
]
);
- $otherSchoolClass = factory(LegacySchoolClass::class)->state('morning')->create(
+ $otherSchoolClass = LegacySchoolClassFactory::new()->morning()->create(
[
'tipo_mediacao_didatico_pedagogico' => 1,
'tipo_atendimento' => TipoAtendimentoTurma::ESCOLARIZACAO,
@@ -210,17 +210,17 @@ public function testWithEnrollmentsSameDaySameTimeSameYearAndOneAeeOtherEscolari
]
);
- $registration = factory(LegacyRegistration::class)->create(['ano' => $schoolClass->ano]);
+ $registration = LegacyRegistrationFactory::new()->create(['ano' => $schoolClass->ano]);
- factory(LegacySchoolClassStage::class)->create([
+ LegacySchoolClassStageFactory::new()->create([
'ref_cod_turma' => $schoolClass,
]);
- factory(LegacySchoolClassStage::class)->create([
+ LegacySchoolClassStageFactory::new()->create([
'ref_cod_turma' => $otherSchoolClass,
]);
- factory(LegacyEnrollment::class)->state('active')->create([
+ LegacyEnrollmentFactory::new()->active()->create([
'ref_cod_turma' => $otherSchoolClass->cod_turma,
'ref_cod_matricula' => $registration->cod_matricula,
]);
@@ -233,19 +233,19 @@ public function testWithEnrollmentsSameDaySameTimeSameYearAndOneAeeOtherEscolari
*/
public function testWithInactiveEnrollmentsSameDaySameTimeSameYearReturnsTrue()
{
- $schoolClass = factory(LegacySchoolClass::class)->state('morning')->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- $otherSchoolClass = factory(LegacySchoolClass::class)->state('morning')->create(['tipo_mediacao_didatico_pedagogico' => 1]);
- $registration = factory(LegacyRegistration::class)->create(['ano' => $schoolClass->ano, 'aprovado' => 3]);
+ $schoolClass = LegacySchoolClassFactory::new()->morning()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $otherSchoolClass = LegacySchoolClassFactory::new()->morning()->create(['tipo_mediacao_didatico_pedagogico' => 1]);
+ $registration = LegacyRegistrationFactory::new()->create(['ano' => $schoolClass->ano, 'aprovado' => 3]);
- factory(LegacySchoolClassStage::class)->create([
+ LegacySchoolClassStageFactory::new()->create([
'ref_cod_turma' => $schoolClass,
]);
- factory(LegacySchoolClassStage::class)->create([
+ LegacySchoolClassStageFactory::new()->create([
'ref_cod_turma' => $otherSchoolClass,
]);
- factory(LegacyEnrollment::class)->state('inactive')->create([
+ LegacyEnrollmentFactory::new()->inactive()->create([
'ref_cod_turma' => $otherSchoolClass->cod_turma,
'ref_cod_matricula' => $registration->cod_matricula,
]);
diff --git a/tests/Unit/Services/SchoolLevelsServiceTest.php b/tests/Unit/Services/SchoolLevelsServiceTest.php
index 7e66ca50a3..a2be63d32c 100644
--- a/tests/Unit/Services/SchoolLevelsServiceTest.php
+++ b/tests/Unit/Services/SchoolLevelsServiceTest.php
@@ -5,6 +5,8 @@
use App\Models\LegacyEvaluationRule;
use App\Models\LegacyLevel;
use App\Services\SchoolLevelsService;
+use Database\Factories\LegacyEvaluationRuleFactory;
+use Database\Factories\LegacyLevelFactory;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Tests\TestCase;
@@ -34,9 +36,9 @@ public function tearDown(): void
public function testRetornaRegrasAvaliacao()
{
- $regraAvaliacaoFake = factory(LegacyEvaluationRule::class)->create();
+ $regraAvaliacaoFake = LegacyEvaluationRuleFactory::new()->create();
/** @var LegacyLevel $level */
- $level = factory(LegacyLevel::class)->create();
+ $level = LegacyLevelFactory::new()->create();
$level->evaluationRules()->attach($regraAvaliacaoFake->id, ['ano_letivo' => 2019]);
@@ -48,7 +50,7 @@ public function testRetornaRegrasAvaliacao()
public function testSemRegrasDeveRetornarVazio()
{
- $level = factory(LegacyLevel::class)->create();
+ $level = LegacyLevelFactory::new()->create();
$evaluationRules = $this->service->getEvaluationRules($level->cod_serie);
$this->assertEmpty($evaluationRules);
}
@@ -58,12 +60,12 @@ public function testSemRegraAvaliacaoDeveRetornarFalse()
$result = $this->service->levelAllowDefineDisciplinePerStage(null, 2019);
$this->assertFalse($result);
- $level = factory(LegacyLevel::class)->create();
+ $level = LegacyLevelFactory::new()->create();
$result = $this->service->levelAllowDefineDisciplinePerStage($level->cod_serie, 2019);
$this->assertFalse($result);
- $level = factory(LegacyLevel::class)->create();
- $regraAvaliacaoFake = factory(LegacyEvaluationRule::class)->create([
+ $level = LegacyLevelFactory::new()->create();
+ $regraAvaliacaoFake = LegacyEvaluationRuleFactory::new()->create([
'definir_componente_etapa' => true,
]);
$level->evaluationRules()->attach($regraAvaliacaoFake->id, ['ano_letivo' => 2019]);
@@ -73,8 +75,8 @@ public function testSemRegraAvaliacaoDeveRetornarFalse()
public function testRegraAvaliacaoPermiteDefinirComponentesEtapa()
{
- $level = factory(LegacyLevel::class)->create();
- $regraAvaliacaoFake = factory(LegacyEvaluationRule::class)->create([
+ $level = LegacyLevelFactory::new()->create();
+ $regraAvaliacaoFake = LegacyEvaluationRuleFactory::new()->create([
'definir_componente_etapa' => true,
]);
@@ -83,8 +85,8 @@ public function testRegraAvaliacaoPermiteDefinirComponentesEtapa()
$this->assertTrue($result);
- $level = factory(LegacyLevel::class)->create();
- $regraAvaliacaoFake = factory(LegacyEvaluationRule::class)->create([
+ $level = LegacyLevelFactory::new()->create();
+ $regraAvaliacaoFake = LegacyEvaluationRuleFactory::new()->create([
'definir_componente_etapa' => false,
]);
diff --git a/tests/Unit/Support/Database/MappedAttributesTest.php b/tests/Unit/Support/Database/MappedAttributesTest.php
index 6c8dd5ae9b..974ecdd4ba 100644
--- a/tests/Unit/Support/Database/MappedAttributesTest.php
+++ b/tests/Unit/Support/Database/MappedAttributesTest.php
@@ -18,7 +18,7 @@ class MappedAttributesTest extends TestCase
*/
protected function setUp(): void
{
- $this->abstract = new class extends Model {
+ $this->abstract = new class () extends Model {
use MappedAttributes;
protected $fillable = [
diff --git a/tests/Unit/Support/Database/WhenDeletedTest.php b/tests/Unit/Support/Database/WhenDeletedTest.php
index b9468fefec..4d63102bd3 100644
--- a/tests/Unit/Support/Database/WhenDeletedTest.php
+++ b/tests/Unit/Support/Database/WhenDeletedTest.php
@@ -20,7 +20,7 @@ protected function setUp(): void
{
parent::setUp();
- $this->instance = new class {
+ $this->instance = new class () {
use WhenDeleted;
};
}
diff --git a/tests/Unit/UnitBaseTest.class.php b/tests/Unit/UnitBaseTest.class.php
index a7b4a4faeb..6503800ec3 100644
--- a/tests/Unit/UnitBaseTest.class.php
+++ b/tests/Unit/UnitBaseTest.class.php
@@ -93,8 +93,7 @@ public function getCleanMock(
$callOriginalConstructor = false,
$callOriginalClone = false,
$callOriginalAutoload = false
- )
- {
+ ) {
if (0 == count($mockMethods)) {
$reflectiveClass = new ReflectionClass($className);
$methods = $reflectiveClass->getMethods();
@@ -133,7 +132,7 @@ public function getDbMock()
{
// Cria um mock de clsBanco, preservando o código do método formatValues
return $this->setExcludedMethods(['formatValues'])
- ->getCleanMock('clsBanco');
+ ->getCleanMock('clsBanco');
}
/**
diff --git a/tests/Unit/dumps/fakeusers.sql b/tests/Unit/dumps/fakeusers.sql
index 7105090385..39c3770883 100644
--- a/tests/Unit/dumps/fakeusers.sql
+++ b/tests/Unit/dumps/fakeusers.sql
@@ -1,2 +1,5 @@
-DELETE FROM pmieducar.usuario;
-INSERT INTO pmieducar.usuario (cod_usuario, ref_cod_instituicao, ref_funcionario_cad, data_cadastro, ativo) VALUES (1, 1, 1, NOW(), 1), (2, 1, 1, NOW(), 1);
\ No newline at end of file
+DELETE
+FROM pmieducar.usuario;
+INSERT INTO pmieducar.usuario (cod_usuario, ref_cod_instituicao, ref_funcionario_cad, data_cadastro, ativo)
+VALUES (1, 1, 1, NOW(), 1),
+ (2, 1, 1, NOW(), 1);
diff --git a/yarn.lock b/yarn.lock
index 5c921c3466..83eb4c70c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,32 +2,32 @@
# yarn lockfile v1
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
- integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8":
+ version "7.15.8"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503"
+ integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==
dependencies:
"@babel/highlight" "^7.14.5"
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08"
- integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0":
+ version "7.15.0"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
+ integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
"@babel/core@^7.14.5":
- version "7.14.6"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab"
- integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==
- dependencies:
- "@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.14.5"
- "@babel/helper-compilation-targets" "^7.14.5"
- "@babel/helper-module-transforms" "^7.14.5"
- "@babel/helpers" "^7.14.6"
- "@babel/parser" "^7.14.6"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.5"
- "@babel/types" "^7.14.5"
+ version "7.15.8"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.8.tgz#195b9f2bffe995d2c6c159e72fe525b4114e8c10"
+ integrity sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==
+ dependencies:
+ "@babel/code-frame" "^7.15.8"
+ "@babel/generator" "^7.15.8"
+ "@babel/helper-compilation-targets" "^7.15.4"
+ "@babel/helper-module-transforms" "^7.15.8"
+ "@babel/helpers" "^7.15.4"
+ "@babel/parser" "^7.15.8"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.6"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
@@ -35,51 +35,51 @@
semver "^6.3.0"
source-map "^0.5.0"
-"@babel/generator@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz#848d7b9f031caca9d0cd0af01b063f226f52d785"
- integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==
+"@babel/generator@^7.15.4", "@babel/generator@^7.15.8":
+ version "7.15.8"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.8.tgz#fa56be6b596952ceb231048cf84ee499a19c0cd1"
+ integrity sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.6"
jsesc "^2.5.1"
source-map "^0.5.0"
-"@babel/helper-annotate-as-pure@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61"
- integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==
+"@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
+ integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191"
- integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f"
+ integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==
dependencies:
- "@babel/helper-explode-assignable-expression" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-explode-assignable-expression" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf"
- integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
+ integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
dependencies:
- "@babel/compat-data" "^7.14.5"
+ "@babel/compat-data" "^7.15.0"
"@babel/helper-validator-option" "^7.14.5"
browserslist "^4.16.6"
semver "^6.3.0"
-"@babel/helper-create-class-features-plugin@^7.14.5":
- version "7.14.6"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz#f114469b6c06f8b5c59c6c4e74621f5085362542"
- integrity sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==
+"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
+ integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-member-expression-to-functions" "^7.14.5"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/helper-replace-supers" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/helper-member-expression-to-functions" "^7.15.4"
+ "@babel/helper-optimise-call-expression" "^7.15.4"
+ "@babel/helper-replace-supers" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
"@babel/helper-create-regexp-features-plugin@^7.14.5":
version "7.14.5"
@@ -103,144 +103,144 @@
resolve "^1.14.2"
semver "^6.1.2"
-"@babel/helper-explode-assignable-expression@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645"
- integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==
+"@babel/helper-explode-assignable-expression@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c"
+ integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-function-name@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
- integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
+"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
+ integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
dependencies:
- "@babel/helper-get-function-arity" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-get-function-arity" "^7.15.4"
+ "@babel/template" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-get-function-arity@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
- integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
+"@babel/helper-get-function-arity@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
+ integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-hoist-variables@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
- integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
+"@babel/helper-hoist-variables@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
+ integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-member-expression-to-functions@^7.14.5":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970"
- integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==
+"@babel/helper-member-expression-to-functions@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
+ integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
- integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
+ integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-module-transforms@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz#7de42f10d789b423eb902ebd24031ca77cb1e10e"
- integrity sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==
+"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4", "@babel/helper-module-transforms@^7.15.8":
+ version "7.15.8"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz#d8c0e75a87a52e374a8f25f855174786a09498b2"
+ integrity sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==
dependencies:
- "@babel/helper-module-imports" "^7.14.5"
- "@babel/helper-replace-supers" "^7.14.5"
- "@babel/helper-simple-access" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/helper-validator-identifier" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-module-imports" "^7.15.4"
+ "@babel/helper-replace-supers" "^7.15.4"
+ "@babel/helper-simple-access" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
+ "@babel/helper-validator-identifier" "^7.15.7"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.6"
-"@babel/helper-optimise-call-expression@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
- integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
+"@babel/helper-optimise-call-expression@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
+ integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
-"@babel/helper-remap-async-to-generator@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6"
- integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==
+"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
+ integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-wrap-function" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-wrap-function" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-replace-supers@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94"
- integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==
+"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
+ integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
dependencies:
- "@babel/helper-member-expression-to-functions" "^7.14.5"
- "@babel/helper-optimise-call-expression" "^7.14.5"
- "@babel/traverse" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-member-expression-to-functions" "^7.15.4"
+ "@babel/helper-optimise-call-expression" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helper-simple-access@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz#66ea85cf53ba0b4e588ba77fc813f53abcaa41c4"
- integrity sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==
+"@babel/helper-simple-access@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
+ integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-skip-transparent-expression-wrappers@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4"
- integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==
+"@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb"
+ integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-split-export-declaration@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
- integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
+"@babel/helper-split-export-declaration@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
+ integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
dependencies:
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.4"
-"@babel/helper-validator-identifier@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8"
- integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==
+"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7":
+ version "7.15.7"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
+ integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
"@babel/helper-validator-option@^7.14.5":
version "7.14.5"
resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
-"@babel/helper-wrap-function@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff"
- integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==
+"@babel/helper-wrap-function@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7"
+ integrity sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==
dependencies:
- "@babel/helper-function-name" "^7.14.5"
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/helpers@^7.14.6":
- version "7.14.6"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz#5b58306b95f1b47e2a0199434fa8658fa6c21635"
- integrity sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==
+"@babel/helpers@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
+ integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
dependencies:
- "@babel/template" "^7.14.5"
- "@babel/traverse" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/template" "^7.15.4"
+ "@babel/traverse" "^7.15.4"
+ "@babel/types" "^7.15.4"
"@babel/highlight@^7.14.5":
version "7.14.5"
@@ -251,27 +251,27 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595"
- integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.15.4", "@babel/parser@^7.15.8":
+ version "7.15.8"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.8.tgz#7bacdcbe71bdc3ff936d510c15dcea7cf0b99016"
+ integrity sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"
- integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e"
+ integrity sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
-"@babel/plugin-proposal-async-generator-functions@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace"
- integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q==
+"@babel/plugin-proposal-async-generator-functions@^7.15.8":
+ version "7.15.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz#a3100f785fab4357987c4223ab1b02b599048403"
+ integrity sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-remap-async-to-generator" "^7.14.5"
+ "@babel/helper-remap-async-to-generator" "^7.15.4"
"@babel/plugin-syntax-async-generators" "^7.8.4"
"@babel/plugin-proposal-class-properties@^7.14.5":
@@ -282,12 +282,12 @@
"@babel/helper-create-class-features-plugin" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-class-static-block@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681"
- integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==
+"@babel/plugin-proposal-class-static-block@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7"
+ integrity sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-create-class-features-plugin" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-class-static-block" "^7.14.5"
@@ -339,16 +339,16 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
-"@babel/plugin-proposal-object-rest-spread@^7.14.5", "@babel/plugin-proposal-object-rest-spread@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363"
- integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==
+"@babel/plugin-proposal-object-rest-spread@^7.14.5", "@babel/plugin-proposal-object-rest-spread@^7.15.6":
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11"
+ integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==
dependencies:
- "@babel/compat-data" "^7.14.7"
- "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/compat-data" "^7.15.0"
+ "@babel/helper-compilation-targets" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-object-rest-spread" "^7.8.3"
- "@babel/plugin-transform-parameters" "^7.14.5"
+ "@babel/plugin-transform-parameters" "^7.15.4"
"@babel/plugin-proposal-optional-catch-binding@^7.14.5":
version "7.14.5"
@@ -375,13 +375,13 @@
"@babel/helper-create-class-features-plugin" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-private-property-in-object@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636"
- integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==
+"@babel/plugin-proposal-private-property-in-object@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5"
+ integrity sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-create-class-features-plugin" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-private-property-in-object" "^7.14.5"
@@ -514,24 +514,24 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-block-scoping@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939"
- integrity sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==
+"@babel/plugin-transform-block-scoping@^7.15.3":
+ version "7.15.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
+ integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-classes@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf"
- integrity sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA==
+"@babel/plugin-transform-classes@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1"
+ integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-optimise-call-expression" "^7.14.5"
+ "@babel/helper-annotate-as-pure" "^7.15.4"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/helper-optimise-call-expression" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-replace-supers" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
globals "^11.1.0"
"@babel/plugin-transform-computed-properties@^7.14.5":
@@ -571,10 +571,10 @@
"@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-for-of@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb"
- integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==
+"@babel/plugin-transform-for-of@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2"
+ integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
@@ -609,25 +609,25 @@
"@babel/helper-plugin-utils" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-commonjs@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97"
- integrity sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==
+"@babel/plugin-transform-modules-commonjs@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1"
+ integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==
dependencies:
- "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-module-transforms" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-simple-access" "^7.14.5"
+ "@babel/helper-simple-access" "^7.15.4"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-systemjs@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29"
- integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==
+"@babel/plugin-transform-modules-systemjs@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132"
+ integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==
dependencies:
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-hoist-variables" "^7.15.4"
+ "@babel/helper-module-transforms" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-validator-identifier" "^7.14.5"
+ "@babel/helper-validator-identifier" "^7.14.9"
babel-plugin-dynamic-import-node "^2.3.3"
"@babel/plugin-transform-modules-umd@^7.14.5":
@@ -638,10 +638,10 @@
"@babel/helper-module-transforms" "^7.14.5"
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-named-capturing-groups-regex@^7.14.7":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e"
- integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9":
+ version "7.14.9"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2"
+ integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==
dependencies:
"@babel/helper-create-regexp-features-plugin" "^7.14.5"
@@ -660,10 +660,10 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-replace-supers" "^7.14.5"
-"@babel/plugin-transform-parameters@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3"
- integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==
+"@babel/plugin-transform-parameters@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62"
+ integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
@@ -689,14 +689,14 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-runtime@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz#30491dad49c6059f8f8fa5ee8896a0089e987523"
- integrity sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==
+ version "7.15.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.8.tgz#9d15b1e94e1c7f6344f65a8d573597d93c6cd886"
+ integrity sha512-+6zsde91jMzzvkzuEA3k63zCw+tm/GvuuabkpisgbDMTPQsIMHllE3XczJFFtEHLjjhKQFZmGQVRdELetlWpVw==
dependencies:
- "@babel/helper-module-imports" "^7.14.5"
+ "@babel/helper-module-imports" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
babel-plugin-polyfill-corejs2 "^0.2.2"
- babel-plugin-polyfill-corejs3 "^0.2.2"
+ babel-plugin-polyfill-corejs3 "^0.2.5"
babel-plugin-polyfill-regenerator "^0.2.2"
semver "^6.3.0"
@@ -707,13 +707,13 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-spread@^7.14.6":
- version "7.14.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144"
- integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==
+"@babel/plugin-transform-spread@^7.15.8":
+ version "7.15.8"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz#79d5aa27f68d700449b2da07691dfa32d2f6d468"
+ integrity sha512-/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ==
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
"@babel/plugin-transform-sticky-regex@^7.14.5":
version "7.14.5"
@@ -752,29 +752,29 @@
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/preset-env@^7.14.5":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.7.tgz#5c70b22d4c2d893b03d8c886a5c17422502b932a"
- integrity sha512-itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA==
+ version "7.15.8"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.8.tgz#f527ce5bcb121cd199f6b502bf23e420b3ff8dba"
+ integrity sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==
dependencies:
- "@babel/compat-data" "^7.14.7"
- "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/compat-data" "^7.15.0"
+ "@babel/helper-compilation-targets" "^7.15.4"
"@babel/helper-plugin-utils" "^7.14.5"
"@babel/helper-validator-option" "^7.14.5"
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5"
- "@babel/plugin-proposal-async-generator-functions" "^7.14.7"
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4"
+ "@babel/plugin-proposal-async-generator-functions" "^7.15.8"
"@babel/plugin-proposal-class-properties" "^7.14.5"
- "@babel/plugin-proposal-class-static-block" "^7.14.5"
+ "@babel/plugin-proposal-class-static-block" "^7.15.4"
"@babel/plugin-proposal-dynamic-import" "^7.14.5"
"@babel/plugin-proposal-export-namespace-from" "^7.14.5"
"@babel/plugin-proposal-json-strings" "^7.14.5"
"@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
"@babel/plugin-proposal-numeric-separator" "^7.14.5"
- "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
+ "@babel/plugin-proposal-object-rest-spread" "^7.15.6"
"@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
"@babel/plugin-proposal-optional-chaining" "^7.14.5"
"@babel/plugin-proposal-private-methods" "^7.14.5"
- "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
+ "@babel/plugin-proposal-private-property-in-object" "^7.15.4"
"@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
"@babel/plugin-syntax-async-generators" "^7.8.4"
"@babel/plugin-syntax-class-properties" "^7.12.13"
@@ -793,41 +793,41 @@
"@babel/plugin-transform-arrow-functions" "^7.14.5"
"@babel/plugin-transform-async-to-generator" "^7.14.5"
"@babel/plugin-transform-block-scoped-functions" "^7.14.5"
- "@babel/plugin-transform-block-scoping" "^7.14.5"
- "@babel/plugin-transform-classes" "^7.14.5"
+ "@babel/plugin-transform-block-scoping" "^7.15.3"
+ "@babel/plugin-transform-classes" "^7.15.4"
"@babel/plugin-transform-computed-properties" "^7.14.5"
"@babel/plugin-transform-destructuring" "^7.14.7"
"@babel/plugin-transform-dotall-regex" "^7.14.5"
"@babel/plugin-transform-duplicate-keys" "^7.14.5"
"@babel/plugin-transform-exponentiation-operator" "^7.14.5"
- "@babel/plugin-transform-for-of" "^7.14.5"
+ "@babel/plugin-transform-for-of" "^7.15.4"
"@babel/plugin-transform-function-name" "^7.14.5"
"@babel/plugin-transform-literals" "^7.14.5"
"@babel/plugin-transform-member-expression-literals" "^7.14.5"
"@babel/plugin-transform-modules-amd" "^7.14.5"
- "@babel/plugin-transform-modules-commonjs" "^7.14.5"
- "@babel/plugin-transform-modules-systemjs" "^7.14.5"
+ "@babel/plugin-transform-modules-commonjs" "^7.15.4"
+ "@babel/plugin-transform-modules-systemjs" "^7.15.4"
"@babel/plugin-transform-modules-umd" "^7.14.5"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
"@babel/plugin-transform-new-target" "^7.14.5"
"@babel/plugin-transform-object-super" "^7.14.5"
- "@babel/plugin-transform-parameters" "^7.14.5"
+ "@babel/plugin-transform-parameters" "^7.15.4"
"@babel/plugin-transform-property-literals" "^7.14.5"
"@babel/plugin-transform-regenerator" "^7.14.5"
"@babel/plugin-transform-reserved-words" "^7.14.5"
"@babel/plugin-transform-shorthand-properties" "^7.14.5"
- "@babel/plugin-transform-spread" "^7.14.6"
+ "@babel/plugin-transform-spread" "^7.15.8"
"@babel/plugin-transform-sticky-regex" "^7.14.5"
"@babel/plugin-transform-template-literals" "^7.14.5"
"@babel/plugin-transform-typeof-symbol" "^7.14.5"
"@babel/plugin-transform-unicode-escapes" "^7.14.5"
"@babel/plugin-transform-unicode-regex" "^7.14.5"
"@babel/preset-modules" "^0.1.4"
- "@babel/types" "^7.14.5"
+ "@babel/types" "^7.15.6"
babel-plugin-polyfill-corejs2 "^0.2.2"
- babel-plugin-polyfill-corejs3 "^0.2.2"
+ babel-plugin-polyfill-corejs3 "^0.2.5"
babel-plugin-polyfill-regenerator "^0.2.2"
- core-js-compat "^3.15.0"
+ core-js-compat "^3.16.0"
semver "^6.3.0"
"@babel/preset-modules@^0.1.4":
@@ -842,48 +842,48 @@
esutils "^2.0.2"
"@babel/runtime@^7.14.5", "@babel/runtime@^7.8.4":
- version "7.14.6"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
- integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
+ integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.14.5":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
- integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
+"@babel/template@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
+ integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/parser" "^7.14.5"
- "@babel/types" "^7.14.5"
+ "@babel/parser" "^7.15.4"
+ "@babel/types" "^7.15.4"
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5":
- version "7.14.7"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753"
- integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4":
+ version "7.15.4"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
+ integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
dependencies:
"@babel/code-frame" "^7.14.5"
- "@babel/generator" "^7.14.5"
- "@babel/helper-function-name" "^7.14.5"
- "@babel/helper-hoist-variables" "^7.14.5"
- "@babel/helper-split-export-declaration" "^7.14.5"
- "@babel/parser" "^7.14.7"
- "@babel/types" "^7.14.5"
+ "@babel/generator" "^7.15.4"
+ "@babel/helper-function-name" "^7.15.4"
+ "@babel/helper-hoist-variables" "^7.15.4"
+ "@babel/helper-split-export-declaration" "^7.15.4"
+ "@babel/parser" "^7.15.4"
+ "@babel/types" "^7.15.4"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.3.0", "@babel/types@^7.4.4":
- version "7.14.5"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz#3bb997ba829a2104cedb20689c4a5b8121d383ff"
- integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==
+"@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.3.0", "@babel/types@^7.4.4":
+ version "7.15.6"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
+ integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
dependencies:
- "@babel/helper-validator-identifier" "^7.14.5"
+ "@babel/helper-validator-identifier" "^7.14.9"
to-fast-properties "^2.0.0"
"@discoveryjs/json-ext@^0.5.0":
- version "0.5.3"
- resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d"
- integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==
+ version "0.5.5"
+ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3"
+ integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==
"@nodelib/fs.scandir@2.1.5":
version "2.1.5"
@@ -899,22 +899,22 @@
integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
"@nodelib/fs.walk@^1.2.3":
- version "1.2.7"
- resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz#94c23db18ee4653e129abd26fb06f870ac9e1ee2"
- integrity sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==
+ version "1.2.8"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+ integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
dependencies:
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"
-"@trysound/sax@0.1.1":
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.1.1.tgz#3348564048e7a2d7398c935d466c0414ebb6a669"
- integrity sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==
+"@trysound/sax@0.2.0":
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
+ integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
"@types/babel__core@^7.1.14":
- version "7.1.14"
- resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402"
- integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==
+ version "7.1.16"
+ resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702"
+ integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==
dependencies:
"@babel/parser" "^7.1.0"
"@babel/types" "^7.0.0"
@@ -923,94 +923,89 @@
"@types/babel__traverse" "*"
"@types/babel__generator@*":
- version "7.6.2"
- resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8"
- integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==
+ version "7.6.3"
+ resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5"
+ integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==
dependencies:
"@babel/types" "^7.0.0"
"@types/babel__template@*":
- version "7.4.0"
- resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be"
- integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==
+ version "7.4.1"
+ resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
+ integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
dependencies:
"@babel/parser" "^7.1.0"
"@babel/types" "^7.0.0"
"@types/babel__traverse@*":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.0.tgz#a34277cf8acbd3185ea74129e1f100491eb1da7f"
- integrity sha512-IilJZ1hJBUZwMOVDNTdflOOLzJB/ZtljYVa7k3gEZN/jqIJIPkWHC6dvbX+DD2CwZDHB9wAKzZPzzqMIkW37/w==
+ version "7.14.2"
+ resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
+ integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
dependencies:
"@babel/types" "^7.3.0"
"@types/clean-css@^4.2.4":
- version "4.2.4"
- resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-4.2.4.tgz#4fe4705c384e6ec9ee8454bc3d49089f38dc038a"
- integrity sha512-x8xEbfTtcv5uyQDrBXKg9Beo5QhTPqO4vM0uq4iU27/nhyRRWNEMKHjxvAb0WDvp2Mnt4Sw0jKmIi5yQF/k2Ag==
+ version "4.2.5"
+ resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-4.2.5.tgz#69ce62cc13557c90ca40460133f672dc52ceaf89"
+ integrity sha512-NEzjkGGpbs9S9fgC4abuBvTpVwE3i+Acu9BBod3PUyjDVZcNsGx61b8r2PphR61QGPnn0JHVs5ey6/I4eTrkxw==
dependencies:
"@types/node" "*"
source-map "^0.6.0"
"@types/eslint-scope@^3.7.0":
- version "3.7.0"
- resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86"
- integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==
+ version "3.7.1"
+ resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e"
+ integrity sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==
dependencies:
"@types/eslint" "*"
"@types/estree" "*"
"@types/eslint@*":
- version "7.2.13"
- resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.13.tgz#e0ca7219ba5ded402062ad6f926d491ebb29dd53"
- integrity sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==
+ version "7.28.1"
+ resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.1.tgz#50b07747f1f84c2ba8cd394cf0fe0ba07afce320"
+ integrity sha512-XhZKznR3i/W5dXqUhgU9fFdJekufbeBd5DALmkuXoeFcjbQcPk+2cL+WLHf6Q81HWAnM2vrslIHpGVyCAviRwg==
dependencies:
"@types/estree" "*"
"@types/json-schema" "*"
-"@types/estree@*":
- version "0.0.49"
- resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.49.tgz#3facb98ebcd4114a4ecef74e0de2175b56fd4464"
- integrity sha512-K1AFuMe8a+pXmfHTtnwBvqoEylNKVeaiKYkjmcEAdytMQVJ/i9Fu7sc13GxgXdO49gkE7Hy8SyJonUZUn+eVaw==
-
-"@types/estree@^0.0.48":
- version "0.0.48"
- resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.48.tgz#18dc8091b285df90db2f25aa7d906cfc394b7f74"
- integrity sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew==
+"@types/estree@*", "@types/estree@^0.0.50":
+ version "0.0.50"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
+ integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
"@types/glob@^7.1.1":
- version "7.1.3"
- resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
- integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
+ version "7.1.4"
+ resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672"
+ integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==
dependencies:
"@types/minimatch" "*"
"@types/node" "*"
"@types/http-proxy@^1.17.5":
- version "1.17.6"
- resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.6.tgz#62dc3fade227d6ac2862c8f19ee0da9da9fd8616"
- integrity sha512-+qsjqR75S/ib0ig0R9WN+CDoZeOBU6F2XLewgC4KVgdXiNHiKKHFEMRHOrs5PbYE97D5vataw5wPj4KLYfUkuQ==
+ version "1.17.7"
+ resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f"
+ integrity sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==
dependencies:
"@types/node" "*"
"@types/imagemin-gifsicle@^7.0.0":
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/@types/imagemin-gifsicle/-/imagemin-gifsicle-7.0.0.tgz#80cfc5f68b2bbce57c6a3b97556ffa861a649132"
- integrity sha512-RVFQZhPm/6vLC8wDvzHa34ZDrJECqmDV4XBS99AEk2ObyV4pcLQwObGYlmBv6fi9AtRLHf8mnKGczIHtF77u7w==
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/@types/imagemin-gifsicle/-/imagemin-gifsicle-7.0.1.tgz#0844a96a338438bb98f77b298acf217260d0d409"
+ integrity sha512-kUz6sUh0P95JOS0RGEaaemWUrASuw+dLsWIveK2UZJx74id/B9epgblMkCk/r5MjUWbZ83wFvacG5Rb/f97gyA==
dependencies:
"@types/imagemin" "*"
"@types/imagemin-mozjpeg@^8.0.0":
- version "8.0.0"
- resolved "https://registry.yarnpkg.com/@types/imagemin-mozjpeg/-/imagemin-mozjpeg-8.0.0.tgz#6986c34734aa767d83672eeb519379a2d7ec8b16"
- integrity sha512-sR2nEZOrlbgnmVgG+lXetZOvhgtctLe1hBfvySnPnxDd2pOon9mMPq7SHFI89VZT1AXvFgRs8w6X8ik8potpgA==
+ version "8.0.1"
+ resolved "https://registry.yarnpkg.com/@types/imagemin-mozjpeg/-/imagemin-mozjpeg-8.0.1.tgz#eaf2f07aea3a317a1710ef2c763ec53f3bcfcdc5"
+ integrity sha512-kMQWEoKxxhlnH4POI3qfW9DjXlQfi80ux3l2b3j5R3eudSCoUIzKQLkfMjNJ6eMYnMWBcB+rfQOWqIzdIwFGKw==
dependencies:
"@types/imagemin" "*"
"@types/imagemin-optipng@^5.2.0":
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/@types/imagemin-optipng/-/imagemin-optipng-5.2.0.tgz#83046e0695739661fa738ad253bdbf51bc4f9e9d"
- integrity sha512-Qn4gTV1fpPG2WIsUIl10yi2prudOuDIx+D+O0H3aKZRcTCwpMjszBVeRWUqkhG5wADhWO4giLut1sFNr3H2XIQ==
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/@types/imagemin-optipng/-/imagemin-optipng-5.2.1.tgz#6ef033f3b15d281009de4e0bd2cadf6cbd2e741a"
+ integrity sha512-XCM/3q+HUL7v4zOqMI+dJ5dTxT+MUukY9KU49DSnYb/4yWtSMHJyADP+WHSMVzTR63J2ZvfUOzSilzBNEQW78g==
dependencies:
"@types/imagemin" "*"
@@ -1023,26 +1018,26 @@
"@types/svgo" "^1"
"@types/imagemin@*":
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/@types/imagemin/-/imagemin-7.0.0.tgz#cb99d719190ebe421015213733d656fac1f8af2e"
- integrity sha512-BiNd5FazD5ZmJUYD9txsbrttL0P0welrb9yAPn6ykKK3kWufwFsxYqw5KdggfZQDjiNYwsBrX+Fwei0Xsw4oAw==
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@types/imagemin/-/imagemin-8.0.0.tgz#bf5bbe1feff3b112c7e0de06d024712ad261e033"
+ integrity sha512-B9X2CUeDv/uUeY9CqkzSTfmsLkeJP6PkmXlh4lODBbf9SwpmNuLS30WzUOi863dgsjY3zt3gY5q2F+UdifRi1A==
dependencies:
"@types/node" "*"
-"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
- version "7.0.7"
- resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
- integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
+ version "7.0.9"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
+ integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
"@types/minimatch@*":
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
- integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
+ version "3.0.5"
+ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
"@types/node@*":
- version "15.14.0"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-15.14.0.tgz#74dbf254fb375551a9d2a71faf6b9dbc2178dc53"
- integrity sha512-um/+/ip3QZmwLfIkWZSNtQIJNVAqrJ92OkLMeuZrjZMTAJniI7fh8N8OICyDhAJ2mzgk/fmYFo72jRr5HyZ1EQ==
+ version "16.11.0"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.0.tgz#4b95f2327bacd1ef8f08d8ceda193039c5d7f52e"
+ integrity sha512-8MLkBIYQMuhRBQzGN9875bYsOhPnf/0rgXGo66S2FemHkhbn9qtsz9ywV1iCG+vbjigE4WUNVvw37Dx+L0qsPg==
"@types/parse-json@^4.0.0":
version "4.0.0"
@@ -1050,152 +1045,152 @@
integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
"@types/retry@^0.12.0":
- version "0.12.0"
- resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
- integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
+ version "0.12.1"
+ resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
+ integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
"@types/svgo@^1":
- version "1.3.5"
- resolved "https://registry.yarnpkg.com/@types/svgo/-/svgo-1.3.5.tgz#18a0166fbcdfbfc7f17d0491da2ea07ee397d3f9"
- integrity sha512-y9Pw8IK50OqFRDpdI9Is29KlWiENVW9FDvlTmGHelvTfR2brYFJbsClvulZfeq6YKacFrDsG9a39w0kJZdHLaw==
-
-"@webassemblyjs/ast@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f"
- integrity sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==
- dependencies:
- "@webassemblyjs/helper-numbers" "1.11.0"
- "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
-
-"@webassemblyjs/floating-point-hex-parser@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz#34d62052f453cd43101d72eab4966a022587947c"
- integrity sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==
-
-"@webassemblyjs/helper-api-error@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz#aaea8fb3b923f4aaa9b512ff541b013ffb68d2d4"
- integrity sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==
-
-"@webassemblyjs/helper-buffer@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz#d026c25d175e388a7dbda9694e91e743cbe9b642"
- integrity sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==
-
-"@webassemblyjs/helper-numbers@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz#7ab04172d54e312cc6ea4286d7d9fa27c88cd4f9"
- integrity sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==
- dependencies:
- "@webassemblyjs/floating-point-hex-parser" "1.11.0"
- "@webassemblyjs/helper-api-error" "1.11.0"
+ version "1.3.6"
+ resolved "https://registry.yarnpkg.com/@types/svgo/-/svgo-1.3.6.tgz#9db00a7ddf9b26ad2feb6b834bef1818677845e1"
+ integrity sha512-AZU7vQcy/4WFEuwnwsNsJnFwupIpbllH1++LXScN6uxT1Z4zPzdrWG97w4/I7eFKFTvfy/bHFStWjdBAg2Vjug==
+
+"@webassemblyjs/ast@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
+ integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+ dependencies:
+ "@webassemblyjs/helper-numbers" "1.11.1"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+
+"@webassemblyjs/floating-point-hex-parser@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
+ integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+
+"@webassemblyjs/helper-api-error@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
+ integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+
+"@webassemblyjs/helper-buffer@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
+ integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+
+"@webassemblyjs/helper-numbers@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
+ integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+ dependencies:
+ "@webassemblyjs/floating-point-hex-parser" "1.11.1"
+ "@webassemblyjs/helper-api-error" "1.11.1"
"@xtuc/long" "4.2.2"
-"@webassemblyjs/helper-wasm-bytecode@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz#85fdcda4129902fe86f81abf7e7236953ec5a4e1"
- integrity sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==
+"@webassemblyjs/helper-wasm-bytecode@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
+ integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
-"@webassemblyjs/helper-wasm-section@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz#9ce2cc89300262509c801b4af113d1ca25c1a75b"
- integrity sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==
+"@webassemblyjs/helper-wasm-section@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
+ integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
dependencies:
- "@webassemblyjs/ast" "1.11.0"
- "@webassemblyjs/helper-buffer" "1.11.0"
- "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
- "@webassemblyjs/wasm-gen" "1.11.0"
+ "@webassemblyjs/ast" "1.11.1"
+ "@webassemblyjs/helper-buffer" "1.11.1"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+ "@webassemblyjs/wasm-gen" "1.11.1"
-"@webassemblyjs/ieee754@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz#46975d583f9828f5d094ac210e219441c4e6f5cf"
- integrity sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==
+"@webassemblyjs/ieee754@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
+ integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
dependencies:
"@xtuc/ieee754" "^1.2.0"
-"@webassemblyjs/leb128@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.0.tgz#f7353de1df38aa201cba9fb88b43f41f75ff403b"
- integrity sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==
+"@webassemblyjs/leb128@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
+ integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
dependencies:
"@xtuc/long" "4.2.2"
-"@webassemblyjs/utf8@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.0.tgz#86e48f959cf49e0e5091f069a709b862f5a2cadf"
- integrity sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==
-
-"@webassemblyjs/wasm-edit@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz#ee4a5c9f677046a210542ae63897094c2027cb78"
- integrity sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==
- dependencies:
- "@webassemblyjs/ast" "1.11.0"
- "@webassemblyjs/helper-buffer" "1.11.0"
- "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
- "@webassemblyjs/helper-wasm-section" "1.11.0"
- "@webassemblyjs/wasm-gen" "1.11.0"
- "@webassemblyjs/wasm-opt" "1.11.0"
- "@webassemblyjs/wasm-parser" "1.11.0"
- "@webassemblyjs/wast-printer" "1.11.0"
-
-"@webassemblyjs/wasm-gen@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz#3cdb35e70082d42a35166988dda64f24ceb97abe"
- integrity sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==
- dependencies:
- "@webassemblyjs/ast" "1.11.0"
- "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
- "@webassemblyjs/ieee754" "1.11.0"
- "@webassemblyjs/leb128" "1.11.0"
- "@webassemblyjs/utf8" "1.11.0"
-
-"@webassemblyjs/wasm-opt@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz#1638ae188137f4bb031f568a413cd24d32f92978"
- integrity sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==
- dependencies:
- "@webassemblyjs/ast" "1.11.0"
- "@webassemblyjs/helper-buffer" "1.11.0"
- "@webassemblyjs/wasm-gen" "1.11.0"
- "@webassemblyjs/wasm-parser" "1.11.0"
-
-"@webassemblyjs/wasm-parser@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz#3e680b8830d5b13d1ec86cc42f38f3d4a7700754"
- integrity sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==
- dependencies:
- "@webassemblyjs/ast" "1.11.0"
- "@webassemblyjs/helper-api-error" "1.11.0"
- "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
- "@webassemblyjs/ieee754" "1.11.0"
- "@webassemblyjs/leb128" "1.11.0"
- "@webassemblyjs/utf8" "1.11.0"
-
-"@webassemblyjs/wast-printer@1.11.0":
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz#680d1f6a5365d6d401974a8e949e05474e1fab7e"
- integrity sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==
- dependencies:
- "@webassemblyjs/ast" "1.11.0"
+"@webassemblyjs/utf8@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
+ integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
+
+"@webassemblyjs/wasm-edit@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
+ integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.1"
+ "@webassemblyjs/helper-buffer" "1.11.1"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+ "@webassemblyjs/helper-wasm-section" "1.11.1"
+ "@webassemblyjs/wasm-gen" "1.11.1"
+ "@webassemblyjs/wasm-opt" "1.11.1"
+ "@webassemblyjs/wasm-parser" "1.11.1"
+ "@webassemblyjs/wast-printer" "1.11.1"
+
+"@webassemblyjs/wasm-gen@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
+ integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.1"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+ "@webassemblyjs/ieee754" "1.11.1"
+ "@webassemblyjs/leb128" "1.11.1"
+ "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wasm-opt@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
+ integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.1"
+ "@webassemblyjs/helper-buffer" "1.11.1"
+ "@webassemblyjs/wasm-gen" "1.11.1"
+ "@webassemblyjs/wasm-parser" "1.11.1"
+
+"@webassemblyjs/wasm-parser@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
+ integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.1"
+ "@webassemblyjs/helper-api-error" "1.11.1"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+ "@webassemblyjs/ieee754" "1.11.1"
+ "@webassemblyjs/leb128" "1.11.1"
+ "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wast-printer@1.11.1":
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
+ integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.1"
"@xtuc/long" "4.2.2"
-"@webpack-cli/configtest@^1.0.4":
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz#f03ce6311c0883a83d04569e2c03c6238316d2aa"
- integrity sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ==
+"@webpack-cli/configtest@^1.1.0":
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.0.tgz#8342bef0badfb7dfd3b576f2574ab80c725be043"
+ integrity sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==
-"@webpack-cli/info@^1.3.0":
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz#9d78a31101a960997a4acd41ffd9b9300627fe2b"
- integrity sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w==
+"@webpack-cli/info@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.0.tgz#b9179c3227ab09cbbb149aa733475fcf99430223"
+ integrity sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==
dependencies:
envinfo "^7.7.3"
-"@webpack-cli/serve@^1.5.1":
- version "1.5.1"
- resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.1.tgz#b5fde2f0f79c1e120307c415a4c1d5eb15a6f278"
- integrity sha512-4vSVUiOPJLmr45S8rMGy7WDvpWxfFxfP/Qx/cxZFCfvoypTYpPPL1X8VIZMe0WTA+Jr7blUxwUSEZNkjoMTgSw==
+"@webpack-cli/serve@^1.6.0":
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.0.tgz#2c275aa05c895eccebbfc34cfb223c6e8bd591a2"
+ integrity sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==
"@xtuc/ieee754@^1.2.0":
version "1.2.0"
@@ -1215,10 +1210,15 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
mime-types "~2.1.24"
negotiator "0.6.2"
+acorn-import-assertions@^1.7.6:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
+ integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+
acorn@^8.4.1:
- version "8.4.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
- integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
+ version "8.5.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
+ integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
adjust-sourcemap-loader@3.0.0:
version "3.0.0"
@@ -1268,16 +1268,21 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.1:
dependencies:
type-fest "^0.21.3"
-ansi-html@^0.0.7:
- version "0.0.7"
- resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
- integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
+ansi-html-community@^0.0.8:
+ version "0.0.8"
+ resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
+ integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
-ansi-regex@^5.0.0:
+ansi-regex@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+ansi-regex@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+ integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
ansi-styles@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -1373,15 +1378,15 @@ atob@^2.1.2:
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
autoprefixer@^10.2.6:
- version "10.2.6"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.6.tgz#aadd9ec34e1c98d403e01950038049f0eb252949"
- integrity sha512-8lChSmdU6dCNMCQopIf4Pe5kipkAGj/fvTMslCsih0uHpOrXOPUEVOmYMMqmw3cekQkSD7EhIeuYl5y0BLdKqg==
+ version "10.3.7"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.3.7.tgz#cef2562058406bd378c94aacda36bb46a97b3186"
+ integrity sha512-EmGpu0nnQVmMhX8ROoJ7Mx8mKYPlcUHuxkwrRYEYMz85lu7H09v8w6R1P0JPdn/hKU32GjpLBFEOuIlDWCRWvg==
dependencies:
- browserslist "^4.16.6"
- caniuse-lite "^1.0.30001230"
- colorette "^1.2.2"
+ browserslist "^4.17.3"
+ caniuse-lite "^1.0.30001264"
fraction.js "^4.1.1"
normalize-range "^0.1.2"
+ picocolors "^0.2.1"
postcss-value-parser "^4.1.0"
aws-sign2@~0.7.0:
@@ -1427,13 +1432,13 @@ babel-plugin-polyfill-corejs2@^0.2.2:
"@babel/helper-define-polyfill-provider" "^0.2.2"
semver "^6.1.1"
-babel-plugin-polyfill-corejs3@^0.2.2:
- version "0.2.3"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz#72add68cf08a8bf139ba6e6dfc0b1d504098e57b"
- integrity sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g==
+babel-plugin-polyfill-corejs3@^0.2.5:
+ version "0.2.5"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92"
+ integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==
dependencies:
"@babel/helper-define-polyfill-provider" "^0.2.2"
- core-js-compat "^3.14.0"
+ core-js-compat "^3.16.2"
babel-plugin-polyfill-regenerator@^0.2.2:
version "0.2.2"
@@ -1623,21 +1628,21 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.6:
- version "4.16.6"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
- integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
+browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.6, browserslist@^4.17.3:
+ version "4.17.4"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.4.tgz#72e2508af2a403aec0a49847ef31bd823c57ead4"
+ integrity sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ==
dependencies:
- caniuse-lite "^1.0.30001219"
- colorette "^1.2.2"
- electron-to-chromium "^1.3.723"
+ caniuse-lite "^1.0.30001265"
+ electron-to-chromium "^1.3.867"
escalade "^3.1.1"
- node-releases "^1.1.71"
+ node-releases "^2.0.0"
+ picocolors "^1.0.0"
buffer-from@^1.0.0:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
- integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+ integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
buffer-indexof@^1.0.0:
version "1.1.1"
@@ -1709,10 +1714,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001230:
- version "1.0.30001241"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz#cd3fae47eb3d7691692b406568d7a3e5b23c7598"
- integrity sha512-1uoSZ1Pq1VpH0WerIMqwptXHNNGfdl7d1cJUFs80CwQ/lVzdhTvsFZCeNFslze7AjsQnb4C85tzclPa1VShbeQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001264, caniuse-lite@^1.0.30001265:
+ version "1.0.30001267"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001267.tgz#b1cf2937175afc0570e4615fc2d2f9069fa0ed30"
+ integrity sha512-r1mjTzAuJ9W8cPBGbbus8E0SKcUP7gn03R14Wk8FlAlqhH9hroy9nLqmpuXlfKEw/oILW+FGz47ipXV2O7x8lg==
caseless@~0.12.0:
version "0.12.0"
@@ -1729,9 +1734,9 @@ chalk@^2.0.0, chalk@^2.4.2:
supports-color "^5.3.0"
chalk@^4.1.0, chalk@^4.1.1:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
- integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+ integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
dependencies:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
@@ -1766,7 +1771,7 @@ chrome-trace-event@^1.0.2:
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
-ci-info@^3.0.0:
+ci-info@^3.1.1:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6"
integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==
@@ -1787,9 +1792,9 @@ clean-css@^4.2.3:
source-map "~0.6.0"
"clean-css@^4.2.3 || ^5.1.2":
- version "5.1.3"
- resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.1.3.tgz#42348778c3acb0083946ba340896802be5517ee2"
- integrity sha512-qGXzUCDpLwAlPx0kYeU4QXjzQIcIYZbJjD4FNm7NnSjoP0hYMVZhHOpUYJ6AwfkMX2cceLRq54MeCgHy/va1cA==
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.2.1.tgz#e5bdb1bee5f332c67e98cb6181251d4f88c0a6ab"
+ integrity sha512-ooQCa1/70oRfVdUUGjKpbHuxgMgm8BsDT5EBqBGvPxMoRoGXf4PNx5mMnkjzJ9Ptx4vvmDdha0QVh86QtYIk1g==
dependencies:
source-map "~0.6.0"
@@ -1853,9 +1858,9 @@ cluster-key-slot@^1.1.0:
integrity sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw==
collect.js@^4.28.5:
- version "4.28.6"
- resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.28.6.tgz#7fb75ae93b8198f7bb88461e263ea09744d0c56b"
- integrity sha512-NAyuk1DnCotRaDZIS5kJ4sptgkwOeYqElird10yziN5JBuwYOGkOTguhNcPn5g344IfylZecxNYZAVXgv19p5Q==
+ version "4.29.0"
+ resolved "https://registry.yarnpkg.com/collect.js/-/collect.js-4.29.0.tgz#2fecc535b5e5712a5c7eeaa2c2d510f3113ec423"
+ integrity sha512-yhgGYEsLEcqnLT1NmRlN1+1euoz9SDhxQ4QyDhWYsKoWsg7252PKA5++dWaDs8mdFxbkmXDXQUaHXI9J2eTPkQ==
color-convert@^1.9.0:
version "1.9.3"
@@ -1881,15 +1886,20 @@ color-name@~1.1.4:
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-colord@^2.0.1:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/colord/-/colord-2.1.0.tgz#28cd9d6ac874dff97ef5ec1432c5c0b4e58e49c7"
- integrity sha512-H5sDP9XDk2uP+x/xSGkgB9SEFc1bojdI5DMKU0jmSXQtml2GIe48dj1DcSS0e53QQAHn+JKqUXbGeGX24xWD7w==
+colord@^2.0.1, colord@^2.6:
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/colord/-/colord-2.8.0.tgz#64fb7aa03de7652b5a39eee50271a104c2783b12"
+ integrity sha512-kNkVV4KFta3TYQv0bzs4xNwLaeag261pxgzGQSh4cQ1rEhYjcTJfFRP0SDlbhLONg0eSoLzrDd79PosjbltufA==
+
+colorette@^1.2.2:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
+ integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==
-colorette@^1.2.1, colorette@^1.2.2:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
- integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+colorette@^2.0.10, colorette@^2.0.14:
+ version "2.0.16"
+ resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
+ integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
colors@^1.1.2, colors@^1.4.0:
version "1.4.0"
@@ -1913,7 +1923,7 @@ commander@^4.1.1:
resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-commander@^7.0.0, commander@^7.1.0, commander@^7.2.0:
+commander@^7.0.0, commander@^7.2.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
@@ -2048,23 +2058,28 @@ cookie@~0.4.1:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-core-js-compat@^3.14.0, core-js-compat@^3.15.0:
- version "3.15.2"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz#47272fbb479880de14b4e6081f71f3492f5bd3cb"
- integrity sha512-Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ==
+core-js-compat@^3.16.0, core-js-compat@^3.16.2:
+ version "3.18.3"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.3.tgz#e0e7e87abc55efb547e7fa19169e45fa9df27a67"
+ integrity sha512-4zP6/y0a2RTHN5bRGT7PTq9lVt3WzvffTNjqnTKsXhkAYNDTkdCLOIfAdOLcQ/7TDdyRj3c+NeHe1NmF1eDScw==
dependencies:
- browserslist "^4.16.6"
+ browserslist "^4.17.3"
semver "7.0.0"
-core-util-is@1.0.2, core-util-is@~1.0.0:
+core-util-is@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+core-util-is@~1.0.0:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+ integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
+
cosmiconfig@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
- integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+ integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
dependencies:
"@types/parse-json" "^4.0.0"
import-fresh "^3.2.1"
@@ -2152,27 +2167,22 @@ crypto-browserify@^3.11.0:
randombytes "^2.0.0"
randomfill "^1.0.3"
-css-color-names@^0.0.4:
- version "0.0.4"
- resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
- integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
-
css-color-names@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz#6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67"
integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==
css-declaration-sorter@^6.0.3:
- version "6.0.3"
- resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.0.3.tgz#9dfd8ea0df4cc7846827876fafb52314890c21a9"
- integrity sha512-52P95mvW1SMzuRZegvpluT6yEv0FqQusydKQPZsNN5Q7hh8EwQvN8E2nwuJ16BBvNN6LcoIZXu/Bk58DAhrrxw==
+ version "6.1.3"
+ resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2"
+ integrity sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA==
dependencies:
timsort "^0.3.0"
css-loader@^5.2.6:
- version "5.2.6"
- resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.6.tgz#c3c82ab77fea1f360e587d871a6811f4450cc8d1"
- integrity sha512-0wyN5vXMQZu6BvjbrPdUJvkCzGEO24HC7IS7nW4llc6BBFC+zwR9CKtYGv63Puzsg10L/o12inMY5/2ByzfD6w==
+ version "5.2.7"
+ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae"
+ integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==
dependencies:
icss-utils "^5.1.0"
loader-utils "^2.0.0"
@@ -2196,7 +2206,7 @@ css-select@^4.1.3:
domutils "^2.6.0"
nth-check "^2.0.0"
-css-tree@^1.1.2:
+css-tree@^1.1.2, css-tree@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
@@ -2205,9 +2215,9 @@ css-tree@^1.1.2:
source-map "^0.6.1"
css-what@^5.0.0:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad"
- integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
+ integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
css@^2.0.0:
version "2.2.4"
@@ -2224,10 +2234,10 @@ cssesc@^3.0.0:
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
-cssnano-preset-default@^5.1.3:
- version "5.1.3"
- resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.3.tgz#caa54183a8c8df03124a9e23f374ab89df5a9a99"
- integrity sha512-qo9tX+t4yAAZ/yagVV3b+QBKeLklQbmgR3wI7mccrDcR+bEk9iHgZN1E7doX68y9ThznLya3RDmR+nc7l6/2WQ==
+cssnano-preset-default@^5.1.4:
+ version "5.1.4"
+ resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz#359943bf00c5c8e05489f12dd25f3006f2c1cbd2"
+ integrity sha512-sPpQNDQBI3R/QsYxQvfB4mXeEcWuw0wGtKtmS5eg8wudyStYMgKOQT39G07EbW1LB56AOYrinRS9f0ig4Y3MhQ==
dependencies:
css-declaration-sorter "^6.0.3"
cssnano-utils "^2.0.1"
@@ -2241,7 +2251,7 @@ cssnano-preset-default@^5.1.3:
postcss-merge-longhand "^5.0.2"
postcss-merge-rules "^5.0.2"
postcss-minify-font-values "^5.0.1"
- postcss-minify-gradients "^5.0.1"
+ postcss-minify-gradients "^5.0.2"
postcss-minify-params "^5.0.1"
postcss-minify-selectors "^5.1.0"
postcss-normalize-charset "^5.0.1"
@@ -2265,13 +2275,14 @@ cssnano-utils@^2.0.1:
integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==
cssnano@^5.0.6:
- version "5.0.6"
- resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.6.tgz#2a91ad34c6521ae31eab3da9c90108ea3093535d"
- integrity sha512-NiaLH/7yqGksFGsFNvSRe2IV/qmEBAeDE64dYeD8OBrgp6lE8YoMeQJMtsv5ijo6MPyhuoOvFhI94reahBRDkw==
+ version "5.0.8"
+ resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.8.tgz#39ad166256980fcc64faa08c9bb18bb5789ecfa9"
+ integrity sha512-Lda7geZU0Yu+RZi2SGpjYuQz4HI4/1Y+BhdD0jL7NXAQ5larCzVn+PUGuZbDMYz904AXXCOgO5L1teSvgu7aFg==
dependencies:
- cosmiconfig "^7.0.0"
- cssnano-preset-default "^5.1.3"
+ cssnano-preset-default "^5.1.4"
is-resolvable "^1.1.0"
+ lilconfig "^2.0.3"
+ yaml "^1.10.2"
csso@^4.2.0:
version "4.2.0"
@@ -2315,9 +2326,9 @@ debug@^3.1.1:
ms "^2.1.1"
debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
- version "4.3.1"
- resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
- integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+ version "4.3.2"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+ integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
dependencies:
ms "2.1.2"
@@ -2364,6 +2375,11 @@ default-gateway@^6.0.0:
dependencies:
execa "^5.0.0"
+define-lazy-prop@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
+ integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
+
define-properties@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -2391,9 +2407,9 @@ delayed-stream@~1.0.0:
integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
denque@^1.1.0:
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de"
- integrity sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ==
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf"
+ integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==
depd@~1.1.2:
version "1.1.2"
@@ -2481,16 +2497,16 @@ domhandler@^3.0.0:
domelementtype "^2.0.1"
domhandler@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
- integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f"
+ integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==
dependencies:
domelementtype "^2.2.0"
domutils@^2.0.0, domutils@^2.6.0:
- version "2.7.0"
- resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442"
- integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+ integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
dependencies:
dom-serializer "^1.0.1"
domelementtype "^2.2.0"
@@ -2532,10 +2548,10 @@ ee-first@1.1.1:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-electron-to-chromium@^1.3.723:
- version "1.3.765"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.765.tgz#36fa0ef7a81048bb487bfe3d297100967e2b8db2"
- integrity sha512-4NhcsfZYlr1x4FehYkK+R9CNNTOZ8vLcIu8Y1uWehxYp5r/jlCGAfBqChIubEfdtX+rBQpXx4yJuX/dzILH/nw==
+electron-to-chromium@^1.3.867:
+ version "1.3.870"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.870.tgz#c15c921e66a46985181b261f8093b91c2abb6604"
+ integrity sha512-PiJMshfq6PL+i1V+nKLwhHbCKeD8eAz8rvO9Cwk/7cChOHJBtufmjajLyYLsSRHguRFiOCVx3XzJLeZsIAYfSA==
elliptic@^6.5.3:
version "6.5.4"
@@ -2610,10 +2626,10 @@ engine.io@~3.5.0:
engine.io-parser "~2.2.0"
ws "~7.4.2"
-enhanced-resolve@^5.8.0:
- version "5.8.2"
- resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"
- integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==
+enhanced-resolve@^5.8.3:
+ version "5.8.3"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0"
+ integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==
dependencies:
graceful-fs "^4.2.4"
tapable "^2.2.0"
@@ -2635,10 +2651,10 @@ error-ex@^1.3.1:
dependencies:
is-arrayish "^0.2.1"
-es-module-lexer@^0.6.0:
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.6.0.tgz#e72ab05b7412e62b9be37c37a09bdb6000d706f0"
- integrity sha512-f8kcHX1ArhllUtb/wVSyvygoKCznIjnxhLxy7TCvIiMdT7fL4ZDTIKaadMe6eLvOXg6Wk02UeoFgUoZ2EKZZUA==
+es-module-lexer@^0.9.0:
+ version "0.9.3"
+ resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
+ integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
es5-ext@^0.10.35, es5-ext@^0.10.50:
version "0.10.53"
@@ -2786,11 +2802,11 @@ express@^4.17.1:
vary "~1.1.2"
ext@^1.1.2:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
- integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52"
+ integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
dependencies:
- type "^2.0.0"
+ type "^2.5.0"
extend@~3.0.2:
version "3.0.2"
@@ -2822,9 +2838,9 @@ fast-deep-equal@^3.1.1:
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
fast-glob@^3.0.3, fast-glob@^3.1.1:
- version "3.2.6"
- resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.6.tgz#434dd9529845176ea049acc9343e8282765c6e1a"
- integrity sha512-GnLuqj/pvQ7pX8/L4J84nijv6sAnlwvSDpMkJi9i7nPmPxGtRPkBSStfvDW5l6nMdX9VWe+pkKWFTgD+vF2QSQ==
+ version "3.2.7"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
+ integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
@@ -2843,9 +2859,9 @@ fastest-levenshtein@^1.0.12:
integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
fastq@^1.6.0:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
- integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+ integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
dependencies:
reusify "^1.0.4"
@@ -2897,9 +2913,9 @@ finalhandler@~1.1.2:
unpipe "~1.0.0"
find-cache-dir@^3.3.1:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880"
- integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+ integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
dependencies:
commondir "^1.0.1"
make-dir "^3.0.2"
@@ -2913,15 +2929,10 @@ find-up@^4.0.0, find-up@^4.1.0:
locate-path "^5.0.0"
path-exists "^4.0.0"
-follow-redirects@^1.0.0:
- version "1.14.1"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
- integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
-
-follow-redirects@^1.14.0:
- version "1.14.3"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e"
- integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==
+follow-redirects@^1.0.0, follow-redirects@^1.14.0:
+ version "1.14.4"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
+ integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
forever-agent@~0.6.1:
version "0.6.1"
@@ -3025,9 +3036,9 @@ glob-to-regexp@^0.4.1:
integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
glob@^7.1.3, glob@^7.1.7:
- version "7.1.7"
- resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
- integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+ integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
@@ -3068,9 +3079,9 @@ globby@^11.0.1:
slash "^3.0.0"
graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
- version "4.2.6"
- resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
- integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+ version "4.2.8"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+ integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
growly@^1.3.0:
version "1.3.0"
@@ -3122,6 +3133,13 @@ has-symbols@^1.0.1, has-symbols@^1.0.2:
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+has-tostringtag@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+ integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+ dependencies:
+ has-symbols "^1.0.2"
+
has@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -3156,11 +3174,6 @@ he@^1.1.0, he@^1.2.0:
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-hex-color-regex@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
- integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
-
hmac-drbg@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -3180,16 +3193,6 @@ hpack.js@^2.1.6:
readable-stream "^2.0.1"
wbuf "^1.1.0"
-hsl-regex@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
- integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=
-
-hsla-regex@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
- integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
-
html-entities@^2.3.2:
version "2.3.2"
resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
@@ -3270,10 +3273,10 @@ http-parser-js@>=0.5.1:
resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9"
integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==
-http-proxy-middleware@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665"
- integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==
+http-proxy-middleware@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f"
+ integrity sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==
dependencies:
"@types/http-proxy" "^1.17.5"
http-proxy "^1.18.1"
@@ -3374,9 +3377,9 @@ import-from@^3.0.0:
resolve-from "^5.0.0"
import-local@^3.0.2:
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6"
- integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0"
+ integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==
dependencies:
pkg-dir "^4.2.0"
resolve-cwd "^3.0.0"
@@ -3449,15 +3452,16 @@ interpret@^2.2.0:
integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
ioredis@^4.16.0:
- version "4.27.6"
- resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.27.6.tgz#a53d427d3fe75fbd10ed7ad150ce00559df8dcf8"
- integrity sha512-6W3ZHMbpCa8ByMyC1LJGOi7P2WiOKP9B3resoZOVLDhi+6dDBOW+KNsRq3yI36Hmnb2sifCxHX+YSarTeXh48A==
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.28.0.tgz#5a2be3f37ff2075e2332f280eaeb02ab4d9ff0d3"
+ integrity sha512-I+zkeeWp3XFgPT2CtJKxvaF5FjGBGt4yGYljRjQecdQKteThuAsKqffeF1lgHVlYnuNeozRbPOCDNZ7tDWPeig==
dependencies:
cluster-key-slot "^1.1.0"
debug "^4.3.1"
denque "^1.1.0"
lodash.defaults "^4.2.0"
lodash.flatten "^4.4.0"
+ lodash.isarguments "^3.1.0"
p-map "^2.1.0"
redis-commands "1.7.0"
redis-errors "^1.2.0"
@@ -3479,7 +3483,7 @@ ipaddr.js@1.9.1, ipaddr.js@^1.9.1:
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
-ipaddr.js@^2.0.0:
+ipaddr.js@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
@@ -3490,11 +3494,12 @@ is-absolute-url@^3.0.3:
integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==
is-arguments@^1.0.4:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9"
- integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
+ integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
dependencies:
- call-bind "^1.0.0"
+ call-bind "^1.0.2"
+ has-tostringtag "^1.0.0"
is-arrayish@^0.2.1:
version "0.2.1"
@@ -3513,31 +3518,21 @@ is-buffer@~1.1.6:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-is-color-stop@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
- integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=
- dependencies:
- css-color-names "^0.0.4"
- hex-color-regex "^1.1.0"
- hsl-regex "^1.0.0"
- hsla-regex "^1.0.0"
- rgb-regex "^1.0.1"
- rgba-regex "^1.0.0"
-
is-core-module@^2.2.0:
- version "2.4.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
- integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
+ version "2.8.0"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
+ integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
dependencies:
has "^1.0.3"
is-date-object@^1.0.1:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
- integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+ integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+ dependencies:
+ has-tostringtag "^1.0.0"
-is-docker@^2.0.0:
+is-docker@^2.0.0, is-docker@^2.1.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
@@ -3553,9 +3548,9 @@ is-fullwidth-code-point@^3.0.0:
integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
is-glob@^4.0.1, is-glob@~4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
- integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+ integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
dependencies:
is-extglob "^2.1.1"
@@ -3594,12 +3589,12 @@ is-plain-object@^2.0.4:
isobject "^3.0.1"
is-regex@^1.0.4:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
- integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+ integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
dependencies:
call-bind "^1.0.2"
- has-symbols "^1.0.2"
+ has-tostringtag "^1.0.0"
is-resolvable@^1.1.0:
version "1.1.0"
@@ -3607,16 +3602,16 @@ is-resolvable@^1.1.0:
integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
is-stream@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
- integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+ integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
is-typedarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-is-wsl@^2.1.1, is-wsl@^2.2.0:
+is-wsl@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
@@ -3648,10 +3643,10 @@ isstream@~0.1.2:
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-jest-worker@^27.0.2:
- version "27.0.6"
- resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz#a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed"
- integrity sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==
+jest-worker@^27.0.6:
+ version "27.2.5"
+ resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.2.5.tgz#ed42865661959488aa020e8a325df010597c36d4"
+ integrity sha512-HTjEPZtcNKZ4LnhSp02NEH4vE+5OpJ0EsOWYvGQpHgUMLngydESAAMH5Wd/asPf29+XUDQZszxpLg1BkIIA2aw==
dependencies:
"@types/node" "*"
merge-stream "^2.0.0"
@@ -3745,11 +3740,6 @@ junk@^3.1.0:
resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
-killable@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
- integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
-
kind-of@^6.0.2:
version "6.0.3"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
@@ -3776,14 +3766,14 @@ laravel-echo-server@^1.6.2:
yargs "^15.3.1"
laravel-echo@^1.10.0:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/laravel-echo/-/laravel-echo-1.11.0.tgz#3ca5160317cd7b1417256fdfb9ae9210d27369f4"
- integrity sha512-0IThWqI+UNjrwIu/JI3/MGYXLT15LPrwNymP80cgZckYDyY57+Pf2WXKXa+ViX9qh+1WU34vBjMsJAj8wA5iVQ==
+ version "1.11.2"
+ resolved "https://registry.yarnpkg.com/laravel-echo/-/laravel-echo-1.11.2.tgz#64b62f114b98bcc30b96df0addf586022ae827ea"
+ integrity sha512-LiMTeWDLgI/bCTXJ8r96NcwE2sjWhzt3cIPDFri27EfMt9fcc1D/DBfXU5urOHaWrFwDQEHrdNzS16ewEQaWtA==
laravel-mix@^6.0.6:
- version "6.0.25"
- resolved "https://registry.yarnpkg.com/laravel-mix/-/laravel-mix-6.0.25.tgz#6989f3e1a6d4cc0b73732bf02e5355a8f3696156"
- integrity sha512-SDpLGUnXJ8g0rvtiLljSTJSR6awj86M2Jd3MhbtT32TCgwXdtajVLF7Mv2blsPLixGHtynwZgi+UFlYQbquPLg==
+ version "6.0.34"
+ resolved "https://registry.yarnpkg.com/laravel-mix/-/laravel-mix-6.0.34.tgz#9118e2a63fb4b79393d0d7bd85e8e8ac27fd3533"
+ integrity sha512-Je9ksXGCk9ytD+OMsgir043sERPlROMv1Lw5DOvRg2599lT9jWMHQn9x7Hn83HfmFw54mc6tmPLNhSU/SdI7jw==
dependencies:
"@babel/core" "^7.14.5"
"@babel/plugin-proposal-object-rest-spread" "^7.14.5"
@@ -3830,7 +3820,7 @@ laravel-mix@^6.0.6:
vue-style-loader "^4.1.3"
webpack "^5.38.1"
webpack-cli "^4.7.2"
- webpack-dev-server "4.0.0-beta.3"
+ webpack-dev-server "4.1.1"
webpack-merge "^5.8.0"
webpack-notifier "^1.13.0"
webpackbar "^5.0.0-3"
@@ -3900,6 +3890,11 @@ lodash.flatten@^4.4.0:
resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+lodash.isarguments@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+ integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+
lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -3936,13 +3931,6 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
dependencies:
semver "^6.0.0"
-map-age-cleaner@^0.1.3:
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
- integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
- dependencies:
- p-defer "^1.0.0"
-
md5.js@^1.3.4:
version "1.3.5"
resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -3971,18 +3959,10 @@ media-typer@0.3.0:
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-mem@^8.1.1:
- version "8.1.1"
- resolved "https://registry.yarnpkg.com/mem/-/mem-8.1.1.tgz#cf118b357c65ab7b7e0817bdf00c8062297c0122"
- integrity sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==
- dependencies:
- map-age-cleaner "^0.1.3"
- mimic-fn "^3.1.0"
-
memfs@^3.2.2:
- version "3.2.2"
- resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.2.tgz#5de461389d596e3f23d48bb7c2afb6161f4df40e"
- integrity sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.3.0.tgz#4da2d1fc40a04b170a56622c7164c6be2c4cbef2"
+ integrity sha512-BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg==
dependencies:
fs-monkey "1.0.3"
@@ -4022,17 +4002,17 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
-mime-db@1.48.0, "mime-db@>= 1.43.0 < 2":
- version "1.48.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
- integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
+mime-db@1.50.0, "mime-db@>= 1.43.0 < 2":
+ version "1.50.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
+ integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
-mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.30, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
- version "2.1.31"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
- integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+ version "2.1.33"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb"
+ integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==
dependencies:
- mime-db "1.48.0"
+ mime-db "1.50.0"
mime@1.6.0:
version "1.6.0"
@@ -4044,11 +4024,6 @@ mimic-fn@^2.1.0:
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-mimic-fn@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74"
- integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==
-
mini-css-extract-plugin@^1.6.0:
version "1.6.2"
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8"
@@ -4125,10 +4100,15 @@ mute-stream@0.0.8:
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-nanoid@^3.1.23:
- version "3.1.23"
- resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
- integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+nanocolors@^0.1.12:
+ version "0.1.12"
+ resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
+ integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==
+
+nanoid@^3.1.28:
+ version "3.1.30"
+ resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362"
+ integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==
negotiator@0.6.2:
version "0.6.2"
@@ -4204,10 +4184,10 @@ node-notifier@^9.0.0:
uuid "^8.3.0"
which "^2.0.2"
-node-releases@^1.1.71:
- version "1.1.73"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"
- integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==
+node-releases@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.0.tgz#67dc74903100a7deb044037b8a2e5f453bb05400"
+ integrity sha512-aA87l0flFYMzCHpTM3DERFSYxc6lv/BltdbRTOMZuxZ0cwZCD3mejE5n9vLhSJCN++/eOqr77G1IO5uXxlQYWA==
normalize-path@^3.0.0, normalize-path@~3.0.0:
version "3.0.0"
@@ -4302,13 +4282,14 @@ onetime@^5.1.0, onetime@^5.1.2:
dependencies:
mimic-fn "^2.1.0"
-open@^7.4.2:
- version "7.4.2"
- resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
- integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
+open@^8.0.9:
+ version "8.3.0"
+ resolved "https://registry.yarnpkg.com/open/-/open-8.3.0.tgz#fdef1cdfe405e60dec8ebd18889e7e812f39c59f"
+ integrity sha512-7INcPWb1UcOwSQxAXTnBJ+FxVV4MPs/X++FWWBtgY69/J5lc+tCteMt/oFK1MnkyHC4VILLa9ntmwKTwDR4Q9w==
dependencies:
- is-docker "^2.0.0"
- is-wsl "^2.1.1"
+ define-lazy-prop "^2.0.0"
+ is-docker "^2.1.1"
+ is-wsl "^2.2.0"
os-browserify@^0.3.0:
version "0.3.0"
@@ -4320,11 +4301,6 @@ os-tmpdir@~1.0.2:
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-p-defer@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
- integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
p-event@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/p-event/-/p-event-4.2.0.tgz#af4b049c8acd91ae81083ebd1e6f5cae2044c1b5"
@@ -4376,9 +4352,9 @@ p-pipe@^3.0.0:
integrity sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==
p-retry@^4.5.0:
- version "4.6.0"
- resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.0.tgz#9de15ae696278cffe86fce2d8f73b7f894f8bc9e"
- integrity sha512-SAHbQEwg3X5DRNaLmWjT+DlGc93ba5i+aP3QLfVNDncQEQO4xjbYW4N/lcVTSuP0aJietGfx2t94dJLzfBMpXw==
+ version "4.6.1"
+ resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"
+ integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==
dependencies:
"@types/retry" "^0.12.0"
retry "^0.13.1"
@@ -4515,6 +4491,16 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+picocolors@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
+ integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
+
+picocolors@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+ integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
version "2.3.0"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
@@ -4601,9 +4587,9 @@ postcss-load-config@^3.0.1:
yaml "^1.10.2"
postcss-loader@^6.1.0:
- version "6.1.1"
- resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.1.1.tgz#58dd0a3accd9bc87cc52eff75244db578d11301a"
- integrity sha512-lBmJMvRh1D40dqpWKr9Rpygwxn8M74U9uaCSeYGNKLGInbk9mXBt1ultHf2dH9Ghk6Ue4UXlXWwGMH9QdUJ5ug==
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.0.tgz#714370a3f567141cf4cadcdf9575f5234d186bc5"
+ integrity sha512-H9hv447QjQJVDbHj3OUdciyAXY3v5+UDduzEytAlZCVHCpNAAg/mCSwhYYqZr9BiGYhmYspU8QXxZwiHTLn3yA==
dependencies:
cosmiconfig "^7.0.0"
klona "^2.0.4"
@@ -4636,13 +4622,13 @@ postcss-minify-font-values@^5.0.1:
dependencies:
postcss-value-parser "^4.1.0"
-postcss-minify-gradients@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.1.tgz#2dc79fd1a1afcb72a9e727bc549ce860f93565d2"
- integrity sha512-odOwBFAIn2wIv+XYRpoN2hUV3pPQlgbJ10XeXPq8UY2N+9ZG42xu45lTn/g9zZ+d70NKSQD6EOi6UiCMu3FN7g==
+postcss-minify-gradients@^5.0.2:
+ version "5.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz#7c175c108f06a5629925d698b3c4cf7bd3864ee5"
+ integrity sha512-7Do9JP+wqSD6Prittitt2zDLrfzP9pqKs2EcLX7HJYxsxCOwrrcLt4x/ctQTsiOw+/8HYotAoqNkrzItL19SdQ==
dependencies:
+ colord "^2.6"
cssnano-utils "^2.0.1"
- is-color-stop "^1.1.0"
postcss-value-parser "^4.1.0"
postcss-minify-params@^5.0.1:
@@ -4823,12 +4809,12 @@ postcss@7.0.36:
supports-color "^6.1.0"
postcss@^8.2.15:
- version "8.3.5"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709"
- integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==
+ version "8.3.9"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.9.tgz#98754caa06c4ee9eb59cc48bd073bb6bd3437c31"
+ integrity sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==
dependencies:
- colorette "^1.2.2"
- nanoid "^3.1.23"
+ nanoid "^3.1.28"
+ picocolors "^0.2.1"
source-map-js "^0.6.2"
pretty-time@^1.1.0:
@@ -4976,9 +4962,9 @@ readdirp@~3.6.0:
picomatch "^2.2.1"
rechoir@^0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca"
- integrity sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==
+ version "0.7.1"
+ resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
+ integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
dependencies:
resolve "^1.9.0"
@@ -4999,22 +4985,22 @@ redis-parser@^3.0.0:
dependencies:
redis-errors "^1.0.0"
-regenerate-unicode-properties@^8.2.0:
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
- integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+regenerate-unicode-properties@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
+ integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
dependencies:
- regenerate "^1.4.0"
+ regenerate "^1.4.2"
-regenerate@^1.4.0:
+regenerate@^1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
regenerator-runtime@^0.13.4:
- version "0.13.7"
- resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
- integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+ version "0.13.9"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+ integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
regenerator-transform@^0.14.2:
version "0.14.5"
@@ -5037,26 +5023,26 @@ regexp.prototype.flags@^1.2.0:
define-properties "^1.1.3"
regexpu-core@^4.7.1:
- version "4.7.1"
- resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
- integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
- dependencies:
- regenerate "^1.4.0"
- regenerate-unicode-properties "^8.2.0"
- regjsgen "^0.5.1"
- regjsparser "^0.6.4"
- unicode-match-property-ecmascript "^1.0.4"
- unicode-match-property-value-ecmascript "^1.2.0"
-
-regjsgen@^0.5.1:
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
+ integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
+ dependencies:
+ regenerate "^1.4.2"
+ regenerate-unicode-properties "^9.0.0"
+ regjsgen "^0.5.2"
+ regjsparser "^0.7.0"
+ unicode-match-property-ecmascript "^2.0.0"
+ unicode-match-property-value-ecmascript "^2.0.0"
+
+regjsgen@^0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
-regjsparser@^0.6.4:
- version "0.6.9"
- resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
- integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
+regjsparser@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
+ integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
dependencies:
jsesc "~0.5.0"
@@ -5188,16 +5174,6 @@ rework@1.0.1:
convert-source-map "^0.3.3"
css "^2.0.0"
-rgb-regex@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
- integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE=
-
-rgba-regex@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
- integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
-
rimraf@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -5259,9 +5235,9 @@ sass-loader@^7.1.0:
semver "^6.3.0"
sass@^1.26.3:
- version "1.35.1"
- resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.1.tgz#90ecf774dfe68f07b6193077e3b42fb154b9e1cd"
- integrity sha512-oCisuQJstxMcacOPmxLNiLlj4cUyN2+8xJnG7VanRoh2GOLr9RqkvI4AxA4a6LHVg/rsu+PmxXeGhrdSF9jCiQ==
+ version "1.43.2"
+ resolved "https://registry.yarnpkg.com/sass/-/sass-1.43.2.tgz#c02501520c624ad6622529a8b3724eb08da82d65"
+ integrity sha512-DncYhjl3wBaPMMJR0kIUaH3sF536rVrOcqqVGmTZHQRRzj7LQlyGV7Mb8aCKFyILMr5VsPHwRYtyKpnKYlmQSQ==
dependencies:
chokidar ">=3.0.0 <4.0.0"
@@ -5274,12 +5250,12 @@ schema-utils@^2.6.5:
ajv "^6.12.4"
ajv-keywords "^3.5.2"
-schema-utils@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
- integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
+schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+ integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
dependencies:
- "@types/json-schema" "^7.0.6"
+ "@types/json-schema" "^7.0.8"
ajv "^6.12.5"
ajv-keywords "^3.5.2"
@@ -5431,9 +5407,9 @@ shellwords@^0.1.1:
integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
signal-exit@^3.0.2, signal-exit@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
- integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+ version "3.0.5"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f"
+ integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==
slash@^3.0.0:
version "3.0.0"
@@ -5501,7 +5477,7 @@ sockjs@^0.3.21:
uuid "^3.4.0"
websocket-driver "^0.7.4"
-source-list-map@^2.0.0, source-list-map@^2.0.1:
+source-list-map@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
@@ -5522,10 +5498,10 @@ source-map-resolve@^0.5.2:
source-map-url "^0.4.0"
urix "^0.1.0"
-source-map-support@~0.5.12, source-map-support@~0.5.19:
- version "0.5.19"
- resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
- integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+source-map-support@~0.5.12, source-map-support@~0.5.20:
+ version "0.5.20"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+ integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
@@ -5604,11 +5580,11 @@ standard-as-callback@^2.1.0:
integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
std-env@^2.2.1:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/std-env/-/std-env-2.3.0.tgz#66d4a4a4d5224242ed8e43f5d65cfa9095216eee"
- integrity sha512-4qT5B45+Kjef2Z6pE0BkskzsH0GO7GrND0wGlTM1ioUe3v0dGYx9ZJH0Aro/YyA8fqQ5EyIKDRjZojJYMFTflw==
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/std-env/-/std-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1"
+ integrity sha512-eOsoKTWnr6C8aWrqJJ2KAReXoa7Vn5Ywyw6uCXgA/xDhxPoaIsBa5aNJmISY04dLwXPBnDHW4diGM7Sn5K4R/g==
dependencies:
- ci-info "^3.0.0"
+ ci-info "^3.1.1"
stream-browserify@^2.0.1:
version "2.0.2"
@@ -5630,13 +5606,13 @@ stream-http@^2.7.2:
xtend "^4.0.0"
string-width@^4.1.0, string-width@^4.2.0:
- version "4.2.2"
- resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
- integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+ integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
- strip-ansi "^6.0.0"
+ strip-ansi "^6.0.1"
string_decoder@^1.0.0, string_decoder@^1.1.1:
version "1.3.0"
@@ -5652,12 +5628,19 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"
-strip-ansi@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
- integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+ integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
- ansi-regex "^5.0.0"
+ ansi-regex "^5.0.1"
+
+strip-ansi@^7.0.0:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
+ integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==
+ dependencies:
+ ansi-regex "^6.0.1"
strip-final-newline@^2.0.0:
version "2.0.0"
@@ -5709,34 +5692,34 @@ supports-color@^8.0.0:
has-flag "^4.0.0"
svgo@^2.3.0:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.3.1.tgz#603a69ce50311c0e36791528f549644ec1b3f4bc"
- integrity sha512-riDDIQgXpEnn0BEl9Gvhh1LNLIyiusSpt64IR8upJu7MwxnzetmF/Y57pXQD2NMX2lVyMRzXt5f2M5rO4wG7Dw==
+ version "2.7.0"
+ resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.7.0.tgz#e164cded22f4408fe4978f082be80159caea1e2d"
+ integrity sha512-aDLsGkre4fTDCWvolyW+fs8ZJFABpzLXbtdK1y71CKnHzAnpDxKXPj2mNKj+pyOXUCzFHzuxRJ94XOFygOWV3w==
dependencies:
- "@trysound/sax" "0.1.1"
- chalk "^4.1.0"
- commander "^7.1.0"
+ "@trysound/sax" "0.2.0"
+ commander "^7.2.0"
css-select "^4.1.3"
- css-tree "^1.1.2"
+ css-tree "^1.1.3"
csso "^4.2.0"
+ nanocolors "^0.1.12"
stable "^0.1.8"
tapable@^2.1.1, tapable@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b"
- integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+ integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
terser-webpack-plugin@^5.1.3:
- version "5.1.4"
- resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz#c369cf8a47aa9922bd0d8a94fe3d3da11a7678a1"
- integrity sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==
+ version "5.2.4"
+ resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz#ad1be7639b1cbe3ea49fab995cbe7224b31747a1"
+ integrity sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==
dependencies:
- jest-worker "^27.0.2"
+ jest-worker "^27.0.6"
p-limit "^3.1.0"
- schema-utils "^3.0.0"
+ schema-utils "^3.1.1"
serialize-javascript "^6.0.0"
source-map "^0.6.1"
- terser "^5.7.0"
+ terser "^5.7.2"
terser@^4.6.3:
version "4.8.0"
@@ -5747,14 +5730,14 @@ terser@^4.6.3:
source-map "~0.6.1"
source-map-support "~0.5.12"
-terser@^5.7.0:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784"
- integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==
+terser@^5.7.0, terser@^5.7.2:
+ version "5.9.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351"
+ integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==
dependencies:
commander "^2.20.0"
source-map "~0.7.2"
- source-map-support "~0.5.19"
+ source-map-support "~0.5.20"
text-table@^0.2.0:
version "0.2.0"
@@ -5831,9 +5814,9 @@ tslib@^1.9.0:
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
tslib@^2.0.3:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
- integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+ integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
tty-browserify@0.0.0:
version "0.0.0"
@@ -5870,33 +5853,33 @@ type@^1.0.1:
resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-type@^2.0.0:
+type@^2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
-unicode-canonical-property-names-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
- integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+unicode-canonical-property-names-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+ integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
-unicode-match-property-ecmascript@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
- integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+unicode-match-property-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+ integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
dependencies:
- unicode-canonical-property-names-ecmascript "^1.0.4"
- unicode-property-aliases-ecmascript "^1.0.4"
+ unicode-canonical-property-names-ecmascript "^2.0.0"
+ unicode-property-aliases-ecmascript "^2.0.0"
-unicode-match-property-value-ecmascript@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
- integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+unicode-match-property-value-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+ integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
-unicode-property-aliases-ecmascript@^1.0.4:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4"
- integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==
+unicode-property-aliases-ecmascript@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+ integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
uniqs@^2.0.0:
version "2.0.0"
@@ -6033,15 +6016,15 @@ wbuf@^1.1.0, wbuf@^1.7.3:
minimalistic-assert "^1.0.0"
webpack-cli@^4.7.2:
- version "4.7.2"
- resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.2.tgz#a718db600de6d3906a4357e059ae584a89f4c1a5"
- integrity sha512-mEoLmnmOIZQNiRl0ebnjzQ74Hk0iKS5SiEEnpq3dRezoyR3yPaeQZCMCe+db4524pj1Pd5ghZXjT41KLzIhSLw==
+ version "4.9.0"
+ resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.0.tgz#dc43e6e0f80dd52e89cbf73d5294bcd7ad6eb343"
+ integrity sha512-n/jZZBMzVEl4PYIBs+auy2WI0WTQ74EnJDiyD98O2JZY6IVIHJNitkYp/uTXOviIOMfgzrNvC9foKv/8o8KSZw==
dependencies:
"@discoveryjs/json-ext" "^0.5.0"
- "@webpack-cli/configtest" "^1.0.4"
- "@webpack-cli/info" "^1.3.0"
- "@webpack-cli/serve" "^1.5.1"
- colorette "^1.2.1"
+ "@webpack-cli/configtest" "^1.1.0"
+ "@webpack-cli/info" "^1.4.0"
+ "@webpack-cli/serve" "^1.6.0"
+ colorette "^2.0.14"
commander "^7.0.0"
execa "^5.0.0"
fastest-levenshtein "^1.0.12"
@@ -6051,50 +6034,47 @@ webpack-cli@^4.7.2:
v8-compile-cache "^2.2.0"
webpack-merge "^5.7.3"
-webpack-dev-middleware@^4.1.0:
- version "4.3.0"
- resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-4.3.0.tgz#179cc40795882cae510b1aa7f3710cbe93c9333e"
- integrity sha512-PjwyVY95/bhBh6VUqt6z4THplYcsvQ8YNNBTBM873xLVmw8FLeALn0qurHbs9EmcfhzQis/eoqypSnZeuUz26w==
+webpack-dev-middleware@^5.0.0:
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.2.1.tgz#97c948144349177856a3d2d9c612cc3fee180cf1"
+ integrity sha512-Kx1X+36Rn9JaZcQMrJ7qN3PMAuKmEDD9ZISjUj3Cgq4A6PtwYsC4mpaKotSRYH3iOF6HsUa8viHKS59FlyVifQ==
dependencies:
- colorette "^1.2.2"
- mem "^8.1.1"
+ colorette "^2.0.10"
memfs "^3.2.2"
- mime-types "^2.1.30"
+ mime-types "^2.1.31"
range-parser "^1.2.1"
- schema-utils "^3.0.0"
+ schema-utils "^3.1.0"
-webpack-dev-server@4.0.0-beta.3:
- version "4.0.0-beta.3"
- resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.0.0-beta.3.tgz#57368679f7f1fdd7ec8d9dd287275117271164f0"
- integrity sha512-Ud7ieH15No/KiSdRuzk+2k+S4gSCR/N7m4hJhesDbKQEZy3P+NPXTXfsimNOZvbVX2TRuIEFB+VdLZFn8DwGwg==
+webpack-dev-server@4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.1.1.tgz#e8eb8f0ce1a0e1fa65e234641763c97735398bed"
+ integrity sha512-Kl1mnCEw8Cy1Kw173gCxLIB242LfPKEOj9WoKhKz/MbryZTNrILzOJTk8kiczw/YUEPzn3gcltCQv6hDsLudRg==
dependencies:
- ansi-html "^0.0.7"
+ ansi-html-community "^0.0.8"
bonjour "^3.5.0"
chokidar "^3.5.1"
+ colorette "^1.2.2"
compression "^1.7.4"
connect-history-api-fallback "^1.6.0"
del "^6.0.0"
express "^4.17.1"
- find-cache-dir "^3.3.1"
graceful-fs "^4.2.6"
html-entities "^2.3.2"
- http-proxy-middleware "^1.3.1"
+ http-proxy-middleware "^2.0.0"
internal-ip "^6.2.0"
- ipaddr.js "^2.0.0"
- is-absolute-url "^3.0.3"
- killable "^1.0.1"
- open "^7.4.2"
+ ipaddr.js "^2.0.1"
+ open "^8.0.9"
p-retry "^4.5.0"
portfinder "^1.0.28"
- schema-utils "^3.0.0"
+ schema-utils "^3.1.0"
selfsigned "^1.10.11"
serve-index "^1.9.1"
sockjs "^0.3.21"
spdy "^4.0.2"
- strip-ansi "^6.0.0"
+ strip-ansi "^7.0.0"
url "^0.11.0"
- webpack-dev-middleware "^4.1.0"
- ws "^7.4.5"
+ webpack-dev-middleware "^5.0.0"
+ ws "^8.1.0"
webpack-merge@^5.7.3, webpack-merge@^5.8.0:
version "5.8.0"
@@ -6105,9 +6085,9 @@ webpack-merge@^5.7.3, webpack-merge@^5.8.0:
wildcard "^2.0.0"
webpack-notifier@^1.13.0:
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/webpack-notifier/-/webpack-notifier-1.13.0.tgz#24e43d00ee47032f047373ca291b2d1f543ec12d"
- integrity sha512-QLk6l/TZKGhyN6Hd1zobaiYno7S9YPX3wH86+YOSufHes77SegGhnGdj+4vrLDFK5A4ZKoQD5GRXXFnM0h0N8A==
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/webpack-notifier/-/webpack-notifier-1.14.1.tgz#c7fc6769262c06ac186ed45c32be7b7025f3dc7a"
+ integrity sha512-OVOoiOyKHS3z9pN1nLdPY2Pf/R3wiBsN0KiPc3K6ApwMBfHbyUomQc2Mr0naeKxfqXyCBPHfQuqpL9yoL0rgkA==
dependencies:
node-notifier "^9.0.0"
strip-ansi "^6.0.0"
@@ -6120,29 +6100,27 @@ webpack-sources@^1.1.0:
source-list-map "^2.0.0"
source-map "~0.6.1"
-webpack-sources@^2.3.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa"
- integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==
- dependencies:
- source-list-map "^2.0.1"
- source-map "^0.6.1"
+webpack-sources@^3.2.0:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.1.tgz#251a7d9720d75ada1469ca07dbb62f3641a05b6d"
+ integrity sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA==
webpack@^5.38.1:
- version "5.42.0"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.42.0.tgz#39aadbce84ad2cebf86cc5f88a2c53db65cbddfb"
- integrity sha512-Ln8HL0F831t1x/yPB/qZEUVmZM4w9BnHZ1EQD/sAUHv8m22hthoPniWTXEzFMh/Sf84mhrahut22TX5KxWGuyQ==
+ version "5.58.2"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.58.2.tgz#6b4af12fc9bd5cbedc00dc0a2fc2b9592db16b44"
+ integrity sha512-3S6e9Vo1W2ijk4F4PPWRIu6D/uGgqaPmqw+av3W3jLDujuNkdxX5h5c+RQ6GkjVR+WwIPOfgY8av+j5j4tMqJw==
dependencies:
"@types/eslint-scope" "^3.7.0"
- "@types/estree" "^0.0.48"
- "@webassemblyjs/ast" "1.11.0"
- "@webassemblyjs/wasm-edit" "1.11.0"
- "@webassemblyjs/wasm-parser" "1.11.0"
+ "@types/estree" "^0.0.50"
+ "@webassemblyjs/ast" "1.11.1"
+ "@webassemblyjs/wasm-edit" "1.11.1"
+ "@webassemblyjs/wasm-parser" "1.11.1"
acorn "^8.4.1"
+ acorn-import-assertions "^1.7.6"
browserslist "^4.14.5"
chrome-trace-event "^1.0.2"
- enhanced-resolve "^5.8.0"
- es-module-lexer "^0.6.0"
+ enhanced-resolve "^5.8.3"
+ es-module-lexer "^0.9.0"
eslint-scope "5.1.1"
events "^3.2.0"
glob-to-regexp "^0.4.1"
@@ -6151,11 +6129,11 @@ webpack@^5.38.1:
loader-runner "^4.2.0"
mime-types "^2.1.27"
neo-async "^2.6.2"
- schema-utils "^3.0.0"
+ schema-utils "^3.1.0"
tapable "^2.1.1"
terser-webpack-plugin "^5.1.3"
watchpack "^2.2.0"
- webpack-sources "^2.3.0"
+ webpack-sources "^3.2.0"
webpackbar@^5.0.0-3:
version "5.0.0-3"
@@ -6232,10 +6210,10 @@ wrappy@1:
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-ws@^7.4.5:
- version "7.5.1"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.1.tgz#44fc000d87edb1d9c53e51fbc69a0ac1f6871d66"
- integrity sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow==
+ws@^8.1.0:
+ version "8.2.3"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
+ integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
ws@~7.4.2:
version "7.4.6"
@@ -6303,9 +6281,9 @@ yargs@^15.3.1:
yargs-parser "^18.1.2"
yargs@^17.0.1:
- version "17.0.1"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"
- integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==
+ version "17.2.1"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea"
+ integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==
dependencies:
cliui "^7.0.2"
escalade "^3.1.1"