From 224f670ea879b086d7db6eb399080f662c4ad18d Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Fri, 27 Sep 2024 12:40:14 -0300 Subject: [PATCH 01/33] =?UTF-8?q?Adiciona=20regra=20de=20aprova=C3=A7?= =?UTF-8?q?=C3=A3o=20ap=C3=B3s=20exame=20final=20com=20base=20na=20frequ?= =?UTF-8?q?=C3=AAncia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/assets.php | 2 +- ...lds_aprovar_pela_frequencia_apos_exame.php | 21 +++++++++++++++++++ ieducar/modules/Avaliacao/Service/Boletim.php | 6 ++++-- .../Service/Boletim/RegraAvaliacao.php | 10 +++++++++ .../Avaliacao/Views/DiarioApiController.php | 1 + .../modules/RegraAvaliacao/Model/Regra.php | 1 + .../RegraAvaliacao/Model/RegraDataMapper.php | 1 + .../RegraAvaliacao/Views/EditController.php | 20 ++++++++++++++++++ .../Assets/Javascripts/RegraAvaliacao.js | 2 +- 9 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 database/migrations/2024_09_26_094053_add_fields_aprovar_pela_frequencia_apos_exame.php diff --git a/config/assets.php b/config/assets.php index ff78e2d2ac..3d98f84b29 100644 --- a/config/assets.php +++ b/config/assets.php @@ -14,7 +14,7 @@ | */ - 'version' => '0.1.99', + 'version' => '0.1.100', /* |-------------------------------------------------------------------------- diff --git a/database/migrations/2024_09_26_094053_add_fields_aprovar_pela_frequencia_apos_exame.php b/database/migrations/2024_09_26_094053_add_fields_aprovar_pela_frequencia_apos_exame.php new file mode 100644 index 0000000000..0b574fb9d7 --- /dev/null +++ b/database/migrations/2024_09_26_094053_add_fields_aprovar_pela_frequencia_apos_exame.php @@ -0,0 +1,21 @@ +boolean('aprovar_pela_frequencia_apos_exame')->default(false); + }); + } + + public function down() + { + Schema::table('modules.regra_avaliacao', function (Blueprint $table) { + $table->dropColumn('aprovar_pela_frequencia_apos_exame'); + }); + } +}; diff --git a/ieducar/modules/Avaliacao/Service/Boletim.php b/ieducar/modules/Avaliacao/Service/Boletim.php index 9d258f432d..df1b255493 100644 --- a/ieducar/modules/Avaliacao/Service/Boletim.php +++ b/ieducar/modules/Avaliacao/Service/Boletim.php @@ -2699,6 +2699,8 @@ public function promover($novaSituacaoMatricula = null) // situação de todas as disciplinas e não só da que está sendo lançada $this->reloadComponentes(); $tipoProgressao = $this->getRegraAvaliacaoTipoProgressao(); + $aprovarPelaFrequenciaAposExame = $this->getRegraAvaliacaoAprovarPelaFrequenciaAposExame(); + $situacaoMatricula = $this->getOption('aprovado'); $situacaoBoletim = $this->getSituacaoAluno(); $exceptionMsg = ''; @@ -2733,7 +2735,7 @@ public function promover($novaSituacaoMatricula = null) $novaSituacaoMatricula = App_Model_MatriculaSituacao::REPROVADO_POR_FALTAS; } } else { - $novaSituacaoMatricula = App_Model_MatriculaSituacao::REPROVADO; + $novaSituacaoMatricula = $aprovarPelaFrequenciaAposExame ? App_Model_MatriculaSituacao::APROVADO : App_Model_MatriculaSituacao::REPROVADO; } } } @@ -2751,7 +2753,7 @@ public function promover($novaSituacaoMatricula = null) } } else { if (!$situacaoBoletim->aprovado) { - $novaSituacaoMatricula = App_Model_MatriculaSituacao::REPROVADO; + $novaSituacaoMatricula = $aprovarPelaFrequenciaAposExame ? App_Model_MatriculaSituacao::APROVADO : App_Model_MatriculaSituacao::REPROVADO; } else { $novaSituacaoMatricula = App_Model_MatriculaSituacao::APROVADO; } diff --git a/ieducar/modules/Avaliacao/Service/Boletim/RegraAvaliacao.php b/ieducar/modules/Avaliacao/Service/Boletim/RegraAvaliacao.php index 42c44e1d28..6424f5da5a 100644 --- a/ieducar/modules/Avaliacao/Service/Boletim/RegraAvaliacao.php +++ b/ieducar/modules/Avaliacao/Service/Boletim/RegraAvaliacao.php @@ -102,6 +102,16 @@ public function getRegraAvaliacaoTipoProgressao() return (int) $this->getRegraAvaliacao()->get('tipoProgressao'); } + /** + * Retorna aprovar pela frequencia após exame da regra de avaliação. + * + * @return bool + */ + public function getRegraAvaliacaoAprovarPelaFrequenciaAposExame() + { + return $this->getRegraAvaliacao()->get('aprovarPelaFrequenciaAposExame') && $this->hasRegraAvaliacaoFormulaRecuperacao(); + } + /** * Retorna "1" se a regra de avaliação é do tipo nota geral por etapa. * diff --git a/ieducar/modules/Avaliacao/Views/DiarioApiController.php b/ieducar/modules/Avaliacao/Views/DiarioApiController.php index 798f2896d6..23c0e549ca 100644 --- a/ieducar/modules/Avaliacao/Views/DiarioApiController.php +++ b/ieducar/modules/Avaliacao/Views/DiarioApiController.php @@ -1770,6 +1770,7 @@ protected function getEvaluationRule($evaluationRule) $rule['definir_componente_por_etapa'] = $evaluationRule->definir_componente_etapa == 1; $rule['formula_recuperacao_final'] = $evaluationRule->formula_recuperacao_id; $rule['desconsiderar_lancamento_frequencia'] = $evaluationRule->desconsiderar_lancamento_frequencia; + $rule['aprovar_pela_frequencia_apos_exame'] = $evaluationRule->aprovar_pela_frequencia_apos_exame; return $rule; } diff --git a/ieducar/modules/RegraAvaliacao/Model/Regra.php b/ieducar/modules/RegraAvaliacao/Model/Regra.php index f29b4b3af3..b1644d19c8 100644 --- a/ieducar/modules/RegraAvaliacao/Model/Regra.php +++ b/ieducar/modules/RegraAvaliacao/Model/Regra.php @@ -35,6 +35,7 @@ class RegraAvaliacao_Model_Regra extends CoreExt_Entity 'calculaMediaRecParalela' => null, 'tipoCalculoRecuperacaoParalela' => null, 'desconsiderarLancamentoFrequencia' => null, + 'aprovarPelaFrequenciaAposExame' => null ]; protected $_dataTypes = [ diff --git a/ieducar/modules/RegraAvaliacao/Model/RegraDataMapper.php b/ieducar/modules/RegraAvaliacao/Model/RegraDataMapper.php index bae170baa3..b0bf2a371b 100644 --- a/ieducar/modules/RegraAvaliacao/Model/RegraDataMapper.php +++ b/ieducar/modules/RegraAvaliacao/Model/RegraDataMapper.php @@ -40,6 +40,7 @@ class RegraAvaliacao_Model_RegraDataMapper extends CoreExt_DataMapper 'aprovaMediaDisciplina' => 'aprova_media_disciplina', 'reprovacaoAutomatica' => 'reprovacao_automatica', 'regraDiferenciada' => 'regra_diferenciada_id', + 'aprovarPelaFrequenciaAposExame' => 'aprovar_pela_frequencia_apos_exame' ]; protected $_primaryKey = [ diff --git a/ieducar/modules/RegraAvaliacao/Views/EditController.php b/ieducar/modules/RegraAvaliacao/Views/EditController.php index fb279a657e..8da1576314 100644 --- a/ieducar/modules/RegraAvaliacao/Views/EditController.php +++ b/ieducar/modules/RegraAvaliacao/Views/EditController.php @@ -102,6 +102,10 @@ class EditController extends Core_Controller_Page_EditController 'label' => 'Média da recuperação paralela', 'help' => '', ], + 'aprovarPelaFrequenciaAposExame' => [ + 'label' => 'Aprovar alunos pela frequencia após exame', + 'help' => 'Alunos que não atingirem a média mínima no exame final, ainda serão aprovados caso tenha frequência mínima', + ], 'regraDiferenciada' => [ 'label' => 'Regra inclusiva', 'help' => 'Regra de avaliação inclusiva para alunos com deficiência', @@ -716,6 +720,17 @@ public function Gerar() $this->_getHelp('aprovaMediaDisciplina') ); + $this->campoCheck( + 'aprovarPelaFrequenciaAposExame', + $this->_getLabel('aprovarPelaFrequenciaAposExame'), + $this->getEntity()->aprovarPelaFrequenciaAposExame, + '', + false, + false, + false, + $this->_getHelp('aprovarPelaFrequenciaAposExame') + ); + $regras = $this->getDataMapper()->findAll( ['id', 'nome'], [], @@ -967,6 +982,11 @@ protected function _save() $data['calculaMediaRecParalela'] = '0'; } + //fixup for checkbox + if (!isset($data['aprovarPelaFrequenciaAposExame'])) { + $data['aprovarPelaFrequenciaAposExame'] = '0'; + } + if (isset($entity)) { $this->getEntity()->setOptions($data); } else { diff --git a/public/vendor/legacy/RegraAvaliacao/Assets/Javascripts/RegraAvaliacao.js b/public/vendor/legacy/RegraAvaliacao/Assets/Javascripts/RegraAvaliacao.js index 0d7df9c744..d3c73c6ea6 100644 --- a/public/vendor/legacy/RegraAvaliacao/Assets/Javascripts/RegraAvaliacao.js +++ b/public/vendor/legacy/RegraAvaliacao/Assets/Javascripts/RegraAvaliacao.js @@ -64,7 +64,7 @@ $j('[name^="recuperacao[excluir]"]').on('change', function(){ $j(this).val(''); }); -$j('#notaGeralPorEtapa, #aprovaMediaDisciplina, #reprovacaoAutomatica, #definirComponentePorEtapa, #desconsiderarLancamentoFrequencia').on('change', function(){ +$j('#notaGeralPorEtapa, #aprovaMediaDisciplina, #reprovacaoAutomatica, #definirComponentePorEtapa, #desconsiderarLancamentoFrequencia, #aprovarPelaFrequenciaAposExame').on('change', function(){ if($j(this).is(':checked')) $j(this).val('1'); else From 6056813782bcd135a5417ff01f17a1dab29deb65 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 30 Sep 2024 14:17:48 -0300 Subject: [PATCH 02/33] =?UTF-8?q?Corrige=20servi=C3=A7o=20dos=20hor=C3=A1r?= =?UTF-8?q?ios=20da=20turma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/SchoolClass/AvailableTimeService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/SchoolClass/AvailableTimeService.php b/app/Services/SchoolClass/AvailableTimeService.php index 0306aea05d..5c311c44b5 100644 --- a/app/Services/SchoolClass/AvailableTimeService.php +++ b/app/Services/SchoolClass/AvailableTimeService.php @@ -33,7 +33,7 @@ public function isAvailable(int $studentId, int $schoolClassId, ?int $turnoId = { $schoolClass = LegacySchoolClass::findOrFail($schoolClassId); - if ($schoolClass->tipo_mediacao_didatico_pedagogico != 1) { + if ($schoolClass->tipo_mediacao_didatico_pedagogico != 1 || ($this->onlySchoolClassesInformedOnCensus && $schoolClass->nao_informar_educacenso == 1)) { return true; } From 7d511ea2b85c9610ecac1de8de03a94bced6cf0e Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Wed, 2 Oct 2024 09:57:05 -0300 Subject: [PATCH 03/33] =?UTF-8?q?Atualiza=20vers=C3=A3o=20`dex/frontier`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- composer.lock | 828 +++++++++++++++++++++++--------------------------- 2 files changed, 381 insertions(+), 449 deletions(-) diff --git a/composer.json b/composer.json index 34f4d9c19f..f6072d2dbc 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "aws/aws-sdk-php-laravel": "^3.7", "composer/semver": "^3.2", "dex/composer-plug-and-play": "^0.20", - "dex/frontier": "^0.12.0", + "dex/frontier": "^0.14.0", "google/recaptcha": "^1.2", "guzzlehttp/guzzle": "^7.3", "honeybadger-io/honeybadger-laravel": "^4.0", diff --git a/composer.lock b/composer.lock index 46e194bcca..a96f2fbbfd 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": "12a88f2baf1a66e702ca0501cdd85766", + "content-hash": "964fc1c79c1ab58d40b259280b77b310", "packages": [ { "name": "ankurk91/laravel-eloquent-relationships", @@ -114,16 +114,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.320.3", + "version": "3.322.9", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "afe137e61b0b536c93a71ce3bb3cdac2e92ae789" + "reference": "0bd7513a7dd9b5330cb92575da99d9057f79b39c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/afe137e61b0b536c93a71ce3bb3cdac2e92ae789", - "reference": "afe137e61b0b536c93a71ce3bb3cdac2e92ae789", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0bd7513a7dd9b5330cb92575da99d9057f79b39c", + "reference": "0bd7513a7dd9b5330cb92575da99d9057f79b39c", "shasum": "" }, "require": { @@ -206,9 +206,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.320.3" + "source": "https://github.com/aws/aws-sdk-php/tree/3.322.9" }, - "time": "2024-08-19T18:05:46+00:00" + "time": "2024-10-01T18:23:10+00:00" }, { "name": "aws/aws-sdk-php-laravel", @@ -418,24 +418,24 @@ }, { "name": "composer/semver", - "version": "3.4.2", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6" + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6", - "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6", + "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" }, "type": "library", "extra": { @@ -479,7 +479,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.2" + "source": "https://github.com/composer/semver/tree/3.4.3" }, "funding": [ { @@ -495,7 +495,7 @@ "type": "tidelift" } ], - "time": "2024-07-12T11:35:52+00:00" + "time": "2024-09-19T14:15:21+00:00" }, { "name": "dex/composer-plug-and-play", @@ -550,16 +550,16 @@ }, { "name": "dex/frontier", - "version": "0.12.0", + "version": "0.14.0", "source": { "type": "git", "url": "https://github.com/edersoares/frontier.git", - "reference": "15a6eeee849edf381c47b875e1642d7251c19c7d" + "reference": "0382284ea1e55ca2d6c43ee20b8c47434fc4149b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/edersoares/frontier/zipball/15a6eeee849edf381c47b875e1642d7251c19c7d", - "reference": "15a6eeee849edf381c47b875e1642d7251c19c7d", + "url": "https://api.github.com/repos/edersoares/frontier/zipball/0382284ea1e55ca2d6c43ee20b8c47434fc4149b", + "reference": "0382284ea1e55ca2d6c43ee20b8c47434fc4149b", "shasum": "" }, "require": { @@ -601,9 +601,9 @@ "description": "The frontier between your Laravel app and your decoupled frontend", "support": { "issues": "https://github.com/edersoares/frontier/issues", - "source": "https://github.com/edersoares/frontier/tree/0.12.0" + "source": "https://github.com/edersoares/frontier/tree/0.14.0" }, - "time": "2024-06-18T18:45:33+00:00" + "time": "2024-09-09T13:00:46+00:00" }, { "name": "dflydev/dot-access-data", @@ -1635,16 +1635,16 @@ }, { "name": "honeybadger-io/honeybadger-laravel", - "version": "v4.1.1", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/honeybadger-io/honeybadger-laravel.git", - "reference": "2074b1b97b149b4ed79ce8c04686aa0f86838ff3" + "reference": "7e41ae984b0c9e25a86ffa0b9bf235df98655fea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/honeybadger-io/honeybadger-laravel/zipball/2074b1b97b149b4ed79ce8c04686aa0f86838ff3", - "reference": "2074b1b97b149b4ed79ce8c04686aa0f86838ff3", + "url": "https://api.github.com/repos/honeybadger-io/honeybadger-laravel/zipball/7e41ae984b0c9e25a86ffa0b9bf235df98655fea", + "reference": "7e41ae984b0c9e25a86ffa0b9bf235df98655fea", "shasum": "" }, "require": { @@ -1703,22 +1703,22 @@ ], "support": { "issues": "https://github.com/honeybadger-io/honeybadger-laravel/issues", - "source": "https://github.com/honeybadger-io/honeybadger-laravel/tree/v4.1.1" + "source": "https://github.com/honeybadger-io/honeybadger-laravel/tree/v4.2.0" }, - "time": "2024-08-16T06:43:29+00:00" + "time": "2024-09-17T07:12:33+00:00" }, { "name": "honeybadger-io/honeybadger-php", - "version": "v2.19.3", + "version": "2.19.4", "source": { "type": "git", "url": "https://github.com/honeybadger-io/honeybadger-php.git", - "reference": "3ea21ad94628b48410c9578e8b96d418ade57dd3" + "reference": "278b89723b4456fd3f3a60e38bd392e0a304ce12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/honeybadger-io/honeybadger-php/zipball/3ea21ad94628b48410c9578e8b96d418ade57dd3", - "reference": "3ea21ad94628b48410c9578e8b96d418ade57dd3", + "url": "https://api.github.com/repos/honeybadger-io/honeybadger-php/zipball/278b89723b4456fd3f3a60e38bd392e0a304ce12", + "reference": "278b89723b4456fd3f3a60e38bd392e0a304ce12", "shasum": "" }, "require": { @@ -1769,9 +1769,9 @@ ], "support": { "issues": "https://github.com/honeybadger-io/honeybadger-php/issues", - "source": "https://github.com/honeybadger-io/honeybadger-php/tree/v2.19.3" + "source": "https://github.com/honeybadger-io/honeybadger-php/tree/2.19.4" }, - "time": "2024-07-06T18:01:41+00:00" + "time": "2024-08-28T06:16:33+00:00" }, { "name": "intervention/image", @@ -1859,16 +1859,16 @@ }, { "name": "laravel/framework", - "version": "v11.20.0", + "version": "v11.26.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "3cd7593dd9b67002fc416b46616f4d4d1da3e571" + "reference": "b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/3cd7593dd9b67002fc416b46616f4d4d1da3e571", - "reference": "3cd7593dd9b67002fc416b46616f4d4d1da3e571", + "url": "https://api.github.com/repos/laravel/framework/zipball/b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b", + "reference": "b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b", "shasum": "" }, "require": { @@ -1887,7 +1887,7 @@ "fruitcake/php-cors": "^1.3", "guzzlehttp/guzzle": "^7.8", "guzzlehttp/uri-template": "^1.0", - "laravel/prompts": "^0.1.18", + "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0", "laravel/serializable-closure": "^1.3", "league/commonmark": "^2.2.1", "league/flysystem": "^3.8.0", @@ -1930,6 +1930,7 @@ "illuminate/bus": "self.version", "illuminate/cache": "self.version", "illuminate/collections": "self.version", + "illuminate/concurrency": "self.version", "illuminate/conditionable": "self.version", "illuminate/config": "self.version", "illuminate/console": "self.version", @@ -1972,7 +1973,7 @@ "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.6", "nyholm/psr7": "^1.2", - "orchestra/testbench-core": "^9.1.5", + "orchestra/testbench-core": "^9.5", "pda/pheanstalk": "^5.0", "phpstan/phpstan": "^1.11.5", "phpunit/phpunit": "^10.5|^11.0", @@ -2030,6 +2031,8 @@ "src/Illuminate/Events/functions.php", "src/Illuminate/Filesystem/functions.php", "src/Illuminate/Foundation/helpers.php", + "src/Illuminate/Log/functions.php", + "src/Illuminate/Support/functions.php", "src/Illuminate/Support/helpers.php" ], "psr-4": { @@ -2061,20 +2064,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-08-06T14:39:21+00:00" + "time": "2024-10-01T14:29:34+00:00" }, { "name": "laravel/horizon", - "version": "v5.27.1", + "version": "v5.29.0", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "184449be3eb296ab16c13a69ce22049f32d0fc2c" + "reference": "1d97f94412e89ff48683acd58d4a702d6bee7b88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/184449be3eb296ab16c13a69ce22049f32d0fc2c", - "reference": "184449be3eb296ab16c13a69ce22049f32d0fc2c", + "url": "https://api.github.com/repos/laravel/horizon/zipball/1d97f94412e89ff48683acd58d4a702d6bee7b88", + "reference": "1d97f94412e89ff48683acd58d4a702d6bee7b88", "shasum": "" }, "require": { @@ -2138,27 +2141,27 @@ ], "support": { "issues": "https://github.com/laravel/horizon/issues", - "source": "https://github.com/laravel/horizon/tree/v5.27.1" + "source": "https://github.com/laravel/horizon/tree/v5.29.0" }, - "time": "2024-08-05T14:23:30+00:00" + "time": "2024-09-24T13:38:25+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.24", + "version": "v0.3.0", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "409b0b4305273472f3754826e68f4edbd0150149" + "reference": "ea57a2261093986721d4a5f4f9524d76f21f9fa0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/409b0b4305273472f3754826e68f4edbd0150149", - "reference": "409b0b4305273472f3754826e68f4edbd0150149", + "url": "https://api.github.com/repos/laravel/prompts/zipball/ea57a2261093986721d4a5f4f9524d76f21f9fa0", + "reference": "ea57a2261093986721d4a5f4f9524d76f21f9fa0", "shasum": "" }, "require": { + "composer-runtime-api": "^2.2", "ext-mbstring": "*", - "illuminate/collections": "^10.0|^11.0", "php": "^8.1", "symfony/console": "^6.2|^7.0" }, @@ -2167,6 +2170,7 @@ "laravel/framework": ">=10.17.0 <10.25.0" }, "require-dev": { + "illuminate/collections": "^10.0|^11.0", "mockery/mockery": "^1.5", "pestphp/pest": "^2.3", "phpstan/phpstan": "^1.11", @@ -2178,7 +2182,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "0.1.x-dev" + "dev-main": "0.3.x-dev" } }, "autoload": { @@ -2196,22 +2200,22 @@ "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.24" + "source": "https://github.com/laravel/prompts/tree/v0.3.0" }, - "time": "2024-06-17T13:58:22+00:00" + "time": "2024-09-30T14:27:51+00:00" }, { "name": "laravel/sanctum", - "version": "v4.0.2", + "version": "v4.0.3", "source": { "type": "git", "url": "https://github.com/laravel/sanctum.git", - "reference": "9cfc0ce80cabad5334efff73ec856339e8ec1ac1" + "reference": "54aea9d13743ae8a6cdd3c28dbef128a17adecab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sanctum/zipball/9cfc0ce80cabad5334efff73ec856339e8ec1ac1", - "reference": "9cfc0ce80cabad5334efff73ec856339e8ec1ac1", + "url": "https://api.github.com/repos/laravel/sanctum/zipball/54aea9d13743ae8a6cdd3c28dbef128a17adecab", + "reference": "54aea9d13743ae8a6cdd3c28dbef128a17adecab", "shasum": "" }, "require": { @@ -2262,20 +2266,20 @@ "issues": "https://github.com/laravel/sanctum/issues", "source": "https://github.com/laravel/sanctum" }, - "time": "2024-04-10T19:39:58+00:00" + "time": "2024-09-27T14:55:41+00:00" }, { "name": "laravel/serializable-closure", - "version": "v1.3.4", + "version": "v1.3.5", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81" + "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81", - "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c", + "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c", "shasum": "" }, "require": { @@ -2323,20 +2327,20 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2024-08-02T07:48:17+00:00" + "time": "2024-09-23T13:33:08+00:00" }, { "name": "laravel/tinker", - "version": "v2.9.0", + "version": "v2.10.0", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe" + "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/502e0fe3f0415d06d5db1f83a472f0f3b754bafe", - "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe", + "url": "https://api.github.com/repos/laravel/tinker/zipball/ba4d51eb56de7711b3a37d63aa0643e99a339ae5", + "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5", "shasum": "" }, "require": { @@ -2387,9 +2391,9 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.9.0" + "source": "https://github.com/laravel/tinker/tree/v2.10.0" }, - "time": "2024-01-04T16:10:04+00:00" + "time": "2024-09-23T13:32:56+00:00" }, { "name": "laravel/ui", @@ -2732,16 +2736,16 @@ }, { "name": "league/flysystem", - "version": "3.28.0", + "version": "3.29.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c" + "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c", - "reference": "e611adab2b1ae2e3072fa72d62c62f52c2bf1f0c", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0adc0d9a51852e170e0028a60bd271726626d3f0", + "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0", "shasum": "" }, "require": { @@ -2809,22 +2813,22 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.28.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.29.0" }, - "time": "2024-05-22T10:09:12+00:00" + "time": "2024-09-29T11:59:11+00:00" }, { "name": "league/flysystem-aws-s3-v3", - "version": "3.28.0", + "version": "3.29.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "22071ef1604bc776f5ff2468ac27a752514665c8" + "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/22071ef1604bc776f5ff2468ac27a752514665c8", - "reference": "22071ef1604bc776f5ff2468ac27a752514665c8", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/c6ff6d4606e48249b63f269eba7fabdb584e76a9", + "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9", "shasum": "" }, "require": { @@ -2864,22 +2868,22 @@ "storage" ], "support": { - "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.28.0" + "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.29.0" }, - "time": "2024-05-06T20:05:52+00:00" + "time": "2024-08-17T13:10:48+00:00" }, { "name": "league/flysystem-ftp", - "version": "3.28.0", + "version": "3.29.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-ftp.git", - "reference": "6c65e1de3767dca7f2712571a915cb952bae42e0" + "reference": "17e8e422cb43a7fefa06ec8ddf36ee8ec936d138" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-ftp/zipball/6c65e1de3767dca7f2712571a915cb952bae42e0", - "reference": "6c65e1de3767dca7f2712571a915cb952bae42e0", + "url": "https://api.github.com/repos/thephpleague/flysystem-ftp/zipball/17e8e422cb43a7fefa06ec8ddf36ee8ec936d138", + "reference": "17e8e422cb43a7fefa06ec8ddf36ee8ec936d138", "shasum": "" }, "require": { @@ -2914,22 +2918,22 @@ "ftpd" ], "support": { - "source": "https://github.com/thephpleague/flysystem-ftp/tree/3.28.0" + "source": "https://github.com/thephpleague/flysystem-ftp/tree/3.29.0" }, - "time": "2024-05-06T20:05:52+00:00" + "time": "2024-06-12T09:46:12+00:00" }, { "name": "league/flysystem-local", - "version": "3.28.0", + "version": "3.29.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40" + "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/13f22ea8be526ea58c2ddff9e158ef7c296e4f40", - "reference": "13f22ea8be526ea58c2ddff9e158ef7c296e4f40", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27", + "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27", "shasum": "" }, "require": { @@ -2963,22 +2967,22 @@ "local" ], "support": { - "source": "https://github.com/thephpleague/flysystem-local/tree/3.28.0" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0" }, - "time": "2024-05-06T20:05:52+00:00" + "time": "2024-08-09T21:24:39+00:00" }, { "name": "league/flysystem-sftp-v3", - "version": "3.28.0", + "version": "3.29.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-sftp-v3.git", - "reference": "abedadd3c64d4f0e276d6ecc796ec8194d136b41" + "reference": "ce9b209e2fbe33122c755ffc18eb4d5bd256f252" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-sftp-v3/zipball/abedadd3c64d4f0e276d6ecc796ec8194d136b41", - "reference": "abedadd3c64d4f0e276d6ecc796ec8194d136b41", + "url": "https://api.github.com/repos/thephpleague/flysystem-sftp-v3/zipball/ce9b209e2fbe33122c755ffc18eb4d5bd256f252", + "reference": "ce9b209e2fbe33122c755ffc18eb4d5bd256f252", "shasum": "" }, "require": { @@ -3012,22 +3016,22 @@ "sftp" ], "support": { - "source": "https://github.com/thephpleague/flysystem-sftp-v3/tree/3.28.0" + "source": "https://github.com/thephpleague/flysystem-sftp-v3/tree/3.29.0" }, - "time": "2024-05-06T20:05:52+00:00" + "time": "2024-08-14T19:35:54+00:00" }, { "name": "league/mime-type-detection", - "version": "1.15.0", + "version": "1.16.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301" + "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", - "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9", + "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9", "shasum": "" }, "require": { @@ -3058,7 +3062,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0" }, "funding": [ { @@ -3070,20 +3074,20 @@ "type": "tidelift" } ], - "time": "2024-01-28T23:22:08+00:00" + "time": "2024-09-21T08:32:55+00:00" }, { "name": "maatwebsite/excel", - "version": "3.1.56", + "version": "3.1.58", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "0381d0225b42c3f328d90f0dd05ca071fca3953f" + "reference": "18495a71b112f43af8ffab35111a58b4e4ba4a4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/0381d0225b42c3f328d90f0dd05ca071fca3953f", - "reference": "0381d0225b42c3f328d90f0dd05ca071fca3953f", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/18495a71b112f43af8ffab35111a58b4e4ba4a4d", + "reference": "18495a71b112f43af8ffab35111a58b4e4ba4a4d", "shasum": "" }, "require": { @@ -3091,7 +3095,7 @@ "ext-json": "*", "illuminate/support": "5.8.*||^6.0||^7.0||^8.0||^9.0||^10.0||^11.0", "php": "^7.0||^8.0", - "phpoffice/phpspreadsheet": "^1.18", + "phpoffice/phpspreadsheet": "^1.29.1", "psr/simple-cache": "^1.0||^2.0||^3.0" }, "require-dev": { @@ -3139,7 +3143,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.56" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.58" }, "funding": [ { @@ -3151,7 +3155,7 @@ "type": "github" } ], - "time": "2024-08-19T09:40:43+00:00" + "time": "2024-09-07T13:53:36+00:00" }, { "name": "maennchen/zipstream-php", @@ -3444,16 +3448,16 @@ }, { "name": "mtdowling/jmespath.php", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b" + "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b", - "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b", + "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/a2a865e05d5f420b50cc2f85bb78d565db12a6bc", + "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc", "shasum": "" }, "require": { @@ -3470,7 +3474,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -3504,9 +3508,9 @@ ], "support": { "issues": "https://github.com/jmespath/jmespath.php/issues", - "source": "https://github.com/jmespath/jmespath.php/tree/2.7.0" + "source": "https://github.com/jmespath/jmespath.php/tree/2.8.0" }, - "time": "2023-08-25T10:54:48+00:00" + "time": "2024-09-04T18:46:31+00:00" }, { "name": "nesbot/carbon", @@ -3764,16 +3768,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.1.0", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1" + "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/683130c2ff8c2739f4822ff7ac5c873ec529abd1", - "reference": "683130c2ff8c2739f4822ff7ac5c873ec529abd1", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a", + "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a", "shasum": "" }, "require": { @@ -3816,22 +3820,22 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.1.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0" }, - "time": "2024-07-01T20:03:41+00:00" + "time": "2024-09-29T13:56:26+00:00" }, { "name": "nunomaduro/termwind", - "version": "v2.0.1", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/termwind.git", - "reference": "58c4c58cf23df7f498daeb97092e34f5259feb6a" + "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/58c4c58cf23df7f498daeb97092e34f5259feb6a", - "reference": "58c4c58cf23df7f498daeb97092e34f5259feb6a", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/e5f21eade88689536c0cdad4c3cd75f3ed26e01a", + "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a", "shasum": "" }, "require": { @@ -3841,11 +3845,11 @@ }, "require-dev": { "ergebnis/phpstan-rules": "^2.2.0", - "illuminate/console": "^11.0.0", - "laravel/pint": "^1.14.0", - "mockery/mockery": "^1.6.7", - "pestphp/pest": "^2.34.1", - "phpstan/phpstan": "^1.10.59", + "illuminate/console": "^11.1.1", + "laravel/pint": "^1.15.0", + "mockery/mockery": "^1.6.11", + "pestphp/pest": "^2.34.6", + "phpstan/phpstan": "^1.10.66", "phpstan/phpstan-strict-rules": "^1.5.2", "symfony/var-dumper": "^7.0.4", "thecodingmachine/phpstan-strict-rules": "^1.0.0" @@ -3890,7 +3894,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/termwind/issues", - "source": "https://github.com/nunomaduro/termwind/tree/v2.0.1" + "source": "https://github.com/nunomaduro/termwind/tree/v2.1.0" }, "funding": [ { @@ -3906,7 +3910,7 @@ "type": "github" } ], - "time": "2024-03-06T16:17:14+00:00" + "time": "2024-09-05T15:25:50+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -4027,16 +4031,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.29.0", + "version": "1.29.2", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0" + "reference": "3a5a818d7d3e4b5bd2e56fb9de44dbded6eae07f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/fde2ccf55eaef7e86021ff1acce26479160a0fa0", - "reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/3a5a818d7d3e4b5bd2e56fb9de44dbded6eae07f", + "reference": "3a5a818d7d3e4b5bd2e56fb9de44dbded6eae07f", "shasum": "" }, "require": { @@ -4071,7 +4075,7 @@ "phpcompatibility/php-compatibility": "^9.3", "phpstan/phpstan": "^1.1", "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^8.5 || ^9.0 || ^10.0", + "phpunit/phpunit": "^8.5 || ^9.0", "squizlabs/php_codesniffer": "^3.7", "tecnickcom/tcpdf": "^6.5" }, @@ -4126,9 +4130,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.0" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.2" }, - "time": "2023-06-14T22:48:31+00:00" + "time": "2024-09-29T07:04:47+00:00" }, { "name": "phpoption/phpoption", @@ -4207,16 +4211,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.41", + "version": "3.0.42", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb" + "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/621c73f7dcb310b61de34d1da4c4204e8ace6ceb", - "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/db92f1b1987b12b13f248fe76c3a52cadb67bb98", + "reference": "db92f1b1987b12b13f248fe76c3a52cadb67bb98", "shasum": "" }, "require": { @@ -4297,7 +4301,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.41" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.42" }, "funding": [ { @@ -4313,7 +4317,7 @@ "type": "tidelift" } ], - "time": "2024-08-12T00:13:54+00:00" + "time": "2024-09-16T03:06:04+00:00" }, { "name": "predis/predis", @@ -4694,16 +4698,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { @@ -4738,9 +4742,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-09-11T13:17:53+00:00" }, { "name": "psr/simple-cache", @@ -5152,16 +5156,16 @@ }, { "name": "staudenmeir/eloquent-has-many-deep-contracts", - "version": "v1.2", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/staudenmeir/eloquent-has-many-deep-contracts.git", - "reference": "bcbe1a921caad7201b324e297eddb696d4bd8647" + "reference": "3ad76c6eeda60042f262d113bf471dcce584d88b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staudenmeir/eloquent-has-many-deep-contracts/zipball/bcbe1a921caad7201b324e297eddb696d4bd8647", - "reference": "bcbe1a921caad7201b324e297eddb696d4bd8647", + "url": "https://api.github.com/repos/staudenmeir/eloquent-has-many-deep-contracts/zipball/3ad76c6eeda60042f262d113bf471dcce584d88b", + "reference": "3ad76c6eeda60042f262d113bf471dcce584d88b", "shasum": "" }, "require": { @@ -5187,22 +5191,22 @@ "description": "Contracts for staudenmeir/eloquent-has-many-deep", "support": { "issues": "https://github.com/staudenmeir/eloquent-has-many-deep-contracts/issues", - "source": "https://github.com/staudenmeir/eloquent-has-many-deep-contracts/tree/v1.2" + "source": "https://github.com/staudenmeir/eloquent-has-many-deep-contracts/tree/v1.2.1" }, - "time": "2024-01-18T01:20:44+00:00" + "time": "2024-09-25T18:24:22+00:00" }, { "name": "staudenmeir/laravel-adjacency-list", - "version": "v1.22", + "version": "v1.22.2", "source": { "type": "git", "url": "https://github.com/staudenmeir/laravel-adjacency-list.git", - "reference": "0ec695e5d4094434f4a7adb956ebd23e228970ea" + "reference": "3bdb2b294f678d5f18b25c401b24bfd9b4a5fbab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staudenmeir/laravel-adjacency-list/zipball/0ec695e5d4094434f4a7adb956ebd23e228970ea", - "reference": "0ec695e5d4094434f4a7adb956ebd23e228970ea", + "url": "https://api.github.com/repos/staudenmeir/laravel-adjacency-list/zipball/3bdb2b294f678d5f18b25c401b24bfd9b4a5fbab", + "reference": "3bdb2b294f678d5f18b25c401b24bfd9b4a5fbab", "shasum": "" }, "require": { @@ -5213,10 +5217,12 @@ }, "require-dev": { "barryvdh/laravel-ide-helper": "^3.0", + "harrygulliford/laravel-firebird": "dev-laravel-11.x", "larastan/larastan": "^2.0", "mockery/mockery": "^1.5.1", "orchestra/testbench": "^9.0", - "phpunit/phpunit": "^10.5", + "phpstan/phpstan-mockery": "^1.1", + "phpunit/phpunit": "^11.0", "singlestoredb/singlestoredb-laravel": "^1.5.4", "staudenmeir/eloquent-has-many-deep": "^1.20" }, @@ -5249,7 +5255,7 @@ "description": "Recursive Laravel Eloquent relationships with CTEs", "support": { "issues": "https://github.com/staudenmeir/laravel-adjacency-list/issues", - "source": "https://github.com/staudenmeir/laravel-adjacency-list/tree/v1.22" + "source": "https://github.com/staudenmeir/laravel-adjacency-list/tree/v1.22.2" }, "funding": [ { @@ -5257,7 +5263,7 @@ "type": "custom" } ], - "time": "2024-04-19T12:11:45+00:00" + "time": "2024-08-29T16:28:51+00:00" }, { "name": "staudenmeir/laravel-cte", @@ -5396,16 +5402,16 @@ }, { "name": "symfony/console", - "version": "v7.1.3", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9" + "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9", - "reference": "cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9", + "url": "https://api.github.com/repos/symfony/console/zipball/0fa539d12b3ccf068a722bbbffa07ca7079af9ee", + "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee", "shasum": "" }, "require": { @@ -5469,7 +5475,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.1.3" + "source": "https://github.com/symfony/console/tree/v7.1.5" }, "funding": [ { @@ -5485,7 +5491,7 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:41:01+00:00" + "time": "2024-09-20T08:28:38+00:00" }, { "name": "symfony/css-selector", @@ -5852,16 +5858,16 @@ }, { "name": "symfony/finder", - "version": "v7.1.3", + "version": "v7.1.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "717c6329886f32dc65e27461f80f2a465412fdca" + "reference": "d95bbf319f7d052082fb7af147e0f835a695e823" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/717c6329886f32dc65e27461f80f2a465412fdca", - "reference": "717c6329886f32dc65e27461f80f2a465412fdca", + "url": "https://api.github.com/repos/symfony/finder/zipball/d95bbf319f7d052082fb7af147e0f835a695e823", + "reference": "d95bbf319f7d052082fb7af147e0f835a695e823", "shasum": "" }, "require": { @@ -5896,7 +5902,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.1.3" + "source": "https://github.com/symfony/finder/tree/v7.1.4" }, "funding": [ { @@ -5912,20 +5918,20 @@ "type": "tidelift" } ], - "time": "2024-07-24T07:08:44+00:00" + "time": "2024-08-13T14:28:19+00:00" }, { "name": "symfony/http-client", - "version": "v6.4.10", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "b5e498f763e0bf5eed8dcd946e50a3b3f71d4ded" + "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/b5e498f763e0bf5eed8dcd946e50a3b3f71d4ded", - "reference": "b5e498f763e0bf5eed8dcd946e50a3b3f71d4ded", + "url": "https://api.github.com/repos/symfony/http-client/zipball/fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", + "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", "shasum": "" }, "require": { @@ -5989,7 +5995,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.10" + "source": "https://github.com/symfony/http-client/tree/v6.4.12" }, "funding": [ { @@ -6005,7 +6011,7 @@ "type": "tidelift" } ], - "time": "2024-07-15T09:26:24+00:00" + "time": "2024-09-20T08:21:33+00:00" }, { "name": "symfony/http-client-contracts", @@ -6087,16 +6093,16 @@ }, { "name": "symfony/http-foundation", - "version": "v7.1.3", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "f602d5c17d1fa02f8019ace2687d9d136b7f4a1a" + "reference": "e30ef73b1e44eea7eb37ba69600a354e553f694b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f602d5c17d1fa02f8019ace2687d9d136b7f4a1a", - "reference": "f602d5c17d1fa02f8019ace2687d9d136b7f4a1a", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e30ef73b1e44eea7eb37ba69600a354e553f694b", + "reference": "e30ef73b1e44eea7eb37ba69600a354e553f694b", "shasum": "" }, "require": { @@ -6144,7 +6150,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.1.3" + "source": "https://github.com/symfony/http-foundation/tree/v7.1.5" }, "funding": [ { @@ -6160,20 +6166,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:41:01+00:00" + "time": "2024-09-20T08:28:38+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.1.3", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "db9702f3a04cc471ec8c70e881825db26ac5f186" + "reference": "44204d96150a9df1fc57601ec933d23fefc2d65b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/db9702f3a04cc471ec8c70e881825db26ac5f186", - "reference": "db9702f3a04cc471ec8c70e881825db26ac5f186", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/44204d96150a9df1fc57601ec933d23fefc2d65b", + "reference": "44204d96150a9df1fc57601ec933d23fefc2d65b", "shasum": "" }, "require": { @@ -6258,7 +6264,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.1.3" + "source": "https://github.com/symfony/http-kernel/tree/v7.1.5" }, "funding": [ { @@ -6274,20 +6280,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T14:58:15+00:00" + "time": "2024-09-21T06:09:21+00:00" }, { "name": "symfony/mailer", - "version": "v7.1.2", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee" + "reference": "bbf21460c56f29810da3df3e206e38dfbb01e80b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/8fcff0af9043c8f8a8e229437cea363e282f9aee", - "reference": "8fcff0af9043c8f8a8e229437cea363e282f9aee", + "url": "https://api.github.com/repos/symfony/mailer/zipball/bbf21460c56f29810da3df3e206e38dfbb01e80b", + "reference": "bbf21460c56f29810da3df3e206e38dfbb01e80b", "shasum": "" }, "require": { @@ -6338,7 +6344,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v7.1.2" + "source": "https://github.com/symfony/mailer/tree/v7.1.5" }, "funding": [ { @@ -6354,7 +6360,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T08:00:31+00:00" + "time": "2024-09-08T12:32:26+00:00" }, { "name": "symfony/mailgun-mailer", @@ -6427,16 +6433,16 @@ }, { "name": "symfony/mime", - "version": "v7.1.2", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc" + "reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/26a00b85477e69a4bab63b66c5dce64f18b0cbfc", - "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc", + "url": "https://api.github.com/repos/symfony/mime/zipball/711d2e167e8ce65b05aea6b258c449671cdd38ff", + "reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff", "shasum": "" }, "require": { @@ -6491,7 +6497,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v7.1.2" + "source": "https://github.com/symfony/mime/tree/v7.1.5" }, "funding": [ { @@ -6507,24 +6513,24 @@ "type": "tidelift" } ], - "time": "2024-06-28T10:03:55+00:00" + "time": "2024-09-20T08:28:38+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -6570,7 +6576,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -6586,24 +6592,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -6648,7 +6654,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -6664,26 +6670,25 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c" + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -6732,7 +6737,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" }, "funding": [ { @@ -6748,24 +6753,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -6813,7 +6818,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -6829,24 +6834,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -6893,80 +6898,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.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": "2024-06-19T12:30:46+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.30.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "10112722600777e02d2745716b70c5db4ca70442" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442", - "reference": "10112722600777e02d2745716b70c5db4ca70442", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "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.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -6982,24 +6914,24 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -7046,7 +6978,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -7062,24 +6994,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php83", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9" + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", - "reference": "dbdcdf1a4dcc2743591f1079d0c35ab1e2dcbbc9", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491", + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -7122,7 +7054,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0" }, "funding": [ { @@ -7138,24 +7070,24 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:35:24+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-uuid", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-uuid.git", - "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9" + "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/2ba1f33797470debcda07fe9dce20a0003df18e9", - "reference": "2ba1f33797470debcda07fe9dce20a0003df18e9", + "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/21533be36c24be3f4b1669c4725c7d1d2bab4ae2", + "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-uuid": "*" @@ -7201,7 +7133,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/polyfill-uuid/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-uuid/tree/v1.31.0" }, "funding": [ { @@ -7217,20 +7149,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", - "version": "v7.1.3", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca" + "reference": "5c03ee6369281177f07f7c68252a280beccba847" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/7f2f542c668ad6c313dc4a5e9c3321f733197eca", - "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca", + "url": "https://api.github.com/repos/symfony/process/zipball/5c03ee6369281177f07f7c68252a280beccba847", + "reference": "5c03ee6369281177f07f7c68252a280beccba847", "shasum": "" }, "require": { @@ -7262,7 +7194,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.1.3" + "source": "https://github.com/symfony/process/tree/v7.1.5" }, "funding": [ { @@ -7278,20 +7210,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:44:47+00:00" + "time": "2024-09-19T21:48:23+00:00" }, { "name": "symfony/routing", - "version": "v7.1.3", + "version": "v7.1.4", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "8a908a3f22d5a1b5d297578c2ceb41b02fa916d0" + "reference": "1500aee0094a3ce1c92626ed8cf3c2037e86f5a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/8a908a3f22d5a1b5d297578c2ceb41b02fa916d0", - "reference": "8a908a3f22d5a1b5d297578c2ceb41b02fa916d0", + "url": "https://api.github.com/repos/symfony/routing/zipball/1500aee0094a3ce1c92626ed8cf3c2037e86f5a7", + "reference": "1500aee0094a3ce1c92626ed8cf3c2037e86f5a7", "shasum": "" }, "require": { @@ -7343,7 +7275,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v7.1.3" + "source": "https://github.com/symfony/routing/tree/v7.1.4" }, "funding": [ { @@ -7359,7 +7291,7 @@ "type": "tidelift" } ], - "time": "2024-07-17T06:10:24+00:00" + "time": "2024-08-29T08:16:25+00:00" }, { "name": "symfony/service-contracts", @@ -7446,16 +7378,16 @@ }, { "name": "symfony/string", - "version": "v6.4.10", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "ccf9b30251719567bfd46494138327522b9a9446" + "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/ccf9b30251719567bfd46494138327522b9a9446", - "reference": "ccf9b30251719567bfd46494138327522b9a9446", + "url": "https://api.github.com/repos/symfony/string/zipball/f8a1ccebd0997e16112dfecfd74220b78e5b284b", + "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b", "shasum": "" }, "require": { @@ -7512,7 +7444,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.10" + "source": "https://github.com/symfony/string/tree/v6.4.12" }, "funding": [ { @@ -7528,20 +7460,20 @@ "type": "tidelift" } ], - "time": "2024-07-22T10:21:14+00:00" + "time": "2024-09-20T08:15:52+00:00" }, { "name": "symfony/translation", - "version": "v7.1.3", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1" + "reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/8d5e50c813ba2859a6dfc99a0765c550507934a1", - "reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1", + "url": "https://api.github.com/repos/symfony/translation/zipball/235535e3f84f3dfbdbde0208ede6ca75c3a489ea", + "reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea", "shasum": "" }, "require": { @@ -7606,7 +7538,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.1.3" + "source": "https://github.com/symfony/translation/tree/v7.1.5" }, "funding": [ { @@ -7622,7 +7554,7 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:41:01+00:00" + "time": "2024-09-16T06:30:38+00:00" }, { "name": "symfony/translation-contracts", @@ -7704,16 +7636,16 @@ }, { "name": "symfony/uid", - "version": "v7.1.1", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/uid.git", - "reference": "bb59febeecc81528ff672fad5dab7f06db8c8277" + "reference": "8c7bb8acb933964055215d89f9a9871df0239317" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/uid/zipball/bb59febeecc81528ff672fad5dab7f06db8c8277", - "reference": "bb59febeecc81528ff672fad5dab7f06db8c8277", + "url": "https://api.github.com/repos/symfony/uid/zipball/8c7bb8acb933964055215d89f9a9871df0239317", + "reference": "8c7bb8acb933964055215d89f9a9871df0239317", "shasum": "" }, "require": { @@ -7758,7 +7690,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/uid/tree/v7.1.1" + "source": "https://github.com/symfony/uid/tree/v7.1.5" }, "funding": [ { @@ -7774,20 +7706,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-09-17T09:16:35+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.1.3", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "86af4617cca75a6e28598f49ae0690f3b9d4591f" + "reference": "e20e03889539fd4e4211e14d2179226c513c010d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/86af4617cca75a6e28598f49ae0690f3b9d4591f", - "reference": "86af4617cca75a6e28598f49ae0690f3b9d4591f", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e20e03889539fd4e4211e14d2179226c513c010d", + "reference": "e20e03889539fd4e4211e14d2179226c513c010d", "shasum": "" }, "require": { @@ -7841,7 +7773,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.1.3" + "source": "https://github.com/symfony/var-dumper/tree/v7.1.5" }, "funding": [ { @@ -7857,7 +7789,7 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:41:01+00:00" + "time": "2024-09-16T10:07:02+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8336,16 +8268,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" + "reference": "8520451a140d3f46ac33042715115e290cf5785f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", + "reference": "8520451a140d3f46ac33042715115e290cf5785f", "shasum": "" }, "require": { @@ -8385,7 +8317,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" }, "funding": [ { @@ -8393,30 +8325,30 @@ "type": "github" } ], - "time": "2024-02-07T09:43:46+00:00" + "time": "2024-08-06T10:04:20+00:00" }, { "name": "filp/whoops", - "version": "2.15.4", + "version": "2.16.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546" + "reference": "befcdc0e5dce67252aa6322d82424be928214fa2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546", - "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546", + "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2", + "reference": "befcdc0e5dce67252aa6322d82424be928214fa2", "shasum": "" }, "require": { - "php": "^5.5.9 || ^7.0 || ^8.0", + "php": "^7.1 || ^8.0", "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "require-dev": { - "mockery/mockery": "^0.9 || ^1.0", - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3", - "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0" + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3", + "symfony/var-dumper": "^4.0 || ^5.0" }, "suggest": { "symfony/var-dumper": "Pretty print complex values better with var-dumper available", @@ -8456,7 +8388,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.15.4" + "source": "https://github.com/filp/whoops/tree/2.16.0" }, "funding": [ { @@ -8464,7 +8396,7 @@ "type": "github" } ], - "time": "2023-11-03T12:00:00+00:00" + "time": "2024-09-25T12:00:00+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -8578,16 +8510,16 @@ }, { "name": "laravel/pint", - "version": "v1.17.2", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "e8a88130a25e3f9d4d5785e6a1afca98268ab110" + "reference": "35c00c05ec43e6b46d295efc0f4386ceb30d50d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/e8a88130a25e3f9d4d5785e6a1afca98268ab110", - "reference": "e8a88130a25e3f9d4d5785e6a1afca98268ab110", + "url": "https://api.github.com/repos/laravel/pint/zipball/35c00c05ec43e6b46d295efc0f4386ceb30d50d9", + "reference": "35c00c05ec43e6b46d295efc0f4386ceb30d50d9", "shasum": "" }, "require": { @@ -8598,13 +8530,13 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.61.1", - "illuminate/view": "^10.48.18", + "friendsofphp/php-cs-fixer": "^3.64.0", + "illuminate/view": "^10.48.20", "larastan/larastan": "^2.9.8", "laravel-zero/framework": "^10.4.0", "mockery/mockery": "^1.6.12", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.35.0" + "pestphp/pest": "^2.35.1" }, "bin": [ "builds/pint" @@ -8640,20 +8572,20 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2024-08-06T15:11:54+00:00" + "time": "2024-09-24T17:22:50+00:00" }, { "name": "laravel/sail", - "version": "v1.31.1", + "version": "v1.34.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "3d06dd18cee8059baa7b388af00ba47f6d96bd85" + "reference": "511e9c95b0f3ee778dc9e11e242bcd2af8e002cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/3d06dd18cee8059baa7b388af00ba47f6d96bd85", - "reference": "3d06dd18cee8059baa7b388af00ba47f6d96bd85", + "url": "https://api.github.com/repos/laravel/sail/zipball/511e9c95b0f3ee778dc9e11e242bcd2af8e002cd", + "reference": "511e9c95b0f3ee778dc9e11e242bcd2af8e002cd", "shasum": "" }, "require": { @@ -8703,20 +8635,20 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2024-08-02T07:45:47+00:00" + "time": "2024-09-27T14:58:09+00:00" }, { "name": "laravel/telescope", - "version": "v5.2.0", + "version": "v5.2.2", "source": { "type": "git", "url": "https://github.com/laravel/telescope.git", - "reference": "dd3f5e205dea0cb58f89a79470a38e0dc9732876" + "reference": "daaf95dee9fab2dd80f59b5f6611c6c0eff44878" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/dd3f5e205dea0cb58f89a79470a38e0dc9732876", - "reference": "dd3f5e205dea0cb58f89a79470a38e0dc9732876", + "url": "https://api.github.com/repos/laravel/telescope/zipball/daaf95dee9fab2dd80f59b5f6611c6c0eff44878", + "reference": "daaf95dee9fab2dd80f59b5f6611c6c0eff44878", "shasum": "" }, "require": { @@ -8770,9 +8702,9 @@ ], "support": { "issues": "https://github.com/laravel/telescope/issues", - "source": "https://github.com/laravel/telescope/tree/v5.2.0" + "source": "https://github.com/laravel/telescope/tree/v5.2.2" }, - "time": "2024-08-02T07:49:39+00:00" + "time": "2024-08-26T12:40:52+00:00" }, { "name": "mockery/mockery", @@ -9016,21 +8948,21 @@ }, { "name": "pestphp/pest", - "version": "v2.35.0", + "version": "v2.35.1", "source": { "type": "git", "url": "https://github.com/pestphp/pest.git", - "reference": "d0ff2c8ec294b7aa7fcb0f3ddc4fdec864234646" + "reference": "b13acb630df52c06123588d321823c31fc685545" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest/zipball/d0ff2c8ec294b7aa7fcb0f3ddc4fdec864234646", - "reference": "d0ff2c8ec294b7aa7fcb0f3ddc4fdec864234646", + "url": "https://api.github.com/repos/pestphp/pest/zipball/b13acb630df52c06123588d321823c31fc685545", + "reference": "b13acb630df52c06123588d321823c31fc685545", "shasum": "" }, "require": { "brianium/paratest": "^7.3.1", - "nunomaduro/collision": "^7.10.0|^8.3.0", + "nunomaduro/collision": "^7.10.0|^8.4.0", "nunomaduro/termwind": "^1.15.1|^2.0.1", "pestphp/pest-plugin": "^2.1.1", "pestphp/pest-plugin-arch": "^2.7.0", @@ -9108,7 +9040,7 @@ ], "support": { "issues": "https://github.com/pestphp/pest/issues", - "source": "https://github.com/pestphp/pest/tree/v2.35.0" + "source": "https://github.com/pestphp/pest/tree/v2.35.1" }, "funding": [ { @@ -9120,7 +9052,7 @@ "type": "github" } ], - "time": "2024-08-02T10:57:29+00:00" + "time": "2024-08-20T21:41:50+00:00" }, { "name": "pestphp/pest-plugin", @@ -9558,16 +9490,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.29.1", + "version": "1.32.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4" + "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4", - "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4", + "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4", "shasum": "" }, "require": { @@ -9599,38 +9531,38 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0" }, - "time": "2024-05-31T08:52:43+00:00" + "time": "2024-09-26T07:23:32+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "10.1.15", + "version": "10.1.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae" + "reference": "7e308268858ed6baedc8704a304727d20bc07c77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae", - "reference": "5da8b1728acd1e6ffdf2ff32ffbdfd04307f26ae", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7e308268858ed6baedc8704a304727d20bc07c77", + "reference": "7e308268858ed6baedc8704a304727d20bc07c77", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", + "nikic/php-parser": "^4.19.1 || ^5.1.0", "php": ">=8.1", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-text-template": "^3.0", - "sebastian/code-unit-reverse-lookup": "^3.0", - "sebastian/complexity": "^3.0", - "sebastian/environment": "^6.0", - "sebastian/lines-of-code": "^2.0", - "sebastian/version": "^4.0", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/php-text-template": "^3.0.1", + "sebastian/code-unit-reverse-lookup": "^3.0.0", + "sebastian/complexity": "^3.2.0", + "sebastian/environment": "^6.1.0", + "sebastian/lines-of-code": "^2.0.2", + "sebastian/version": "^4.0.1", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { "phpunit/phpunit": "^10.1" @@ -9642,7 +9574,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.1-dev" + "dev-main": "10.1.x-dev" } }, "autoload": { @@ -9671,7 +9603,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.15" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.16" }, "funding": [ { @@ -9679,7 +9611,7 @@ "type": "github" } ], - "time": "2024-06-29T08:25:15+00:00" + "time": "2024-08-22T04:31:57+00:00" }, { "name": "phpunit/php-file-iterator", @@ -11323,16 +11255,16 @@ }, { "name": "symfony/yaml", - "version": "v7.1.1", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "fa34c77015aa6720469db7003567b9f772492bf2" + "reference": "4e561c316e135e053bd758bf3b3eb291d9919de4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/fa34c77015aa6720469db7003567b9f772492bf2", - "reference": "fa34c77015aa6720469db7003567b9f772492bf2", + "url": "https://api.github.com/repos/symfony/yaml/zipball/4e561c316e135e053bd758bf3b3eb291d9919de4", + "reference": "4e561c316e135e053bd758bf3b3eb291d9919de4", "shasum": "" }, "require": { @@ -11374,7 +11306,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.1.1" + "source": "https://github.com/symfony/yaml/tree/v7.1.5" }, "funding": [ { @@ -11390,7 +11322,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-09-17T12:49:58+00:00" }, { "name": "ta-tikoma/phpunit-architecture-test", From dab27a7ed36fa8905b5c14b5ab06bef65bab9bd9 Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Thu, 10 Oct 2024 15:48:27 -0300 Subject: [PATCH 04/33] =?UTF-8?q?Altera=20execu=C3=A7=C3=A3o=20de=20functi?= =?UTF-8?q?on=20devido=20=C3=A0=20replica=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/intranet/educar_ano_letivo_modulo_cad.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieducar/intranet/educar_ano_letivo_modulo_cad.php b/ieducar/intranet/educar_ano_letivo_modulo_cad.php index 0f03f4af56..75d38ee87c 100644 --- a/ieducar/intranet/educar_ano_letivo_modulo_cad.php +++ b/ieducar/intranet/educar_ano_letivo_modulo_cad.php @@ -323,7 +323,7 @@ public function Novo() $this->copyEmployeeAllocations(refCodEscola: $this->ref_ref_cod_escola, anoDestino: $this->ref_ano); } - Portabilis_Utils_Database::selectField(sql: "SELECT pmieducar.copiaAnosLetivos({$this->ref_ano}::smallint, {$this->ref_ref_cod_escola});"); + DB::unprepared("SELECT pmieducar.copiaAnosLetivos({$this->ref_ano}::smallint, {$this->ref_ref_cod_escola});"); $schoolAcademicYear = new LegacySchoolAcademicYear(); From 18ef9453b0ccfdfa7843c05d8d82506ad19d68dc Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Sat, 12 Oct 2024 19:45:05 -0300 Subject: [PATCH 05/33] GraphQL --- config/cors.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cors.php b/config/cors.php index 8a39e6daa6..7a495b5ce9 100644 --- a/config/cors.php +++ b/config/cors.php @@ -15,7 +15,7 @@ | */ - 'paths' => ['api/*', 'sanctum/csrf-cookie'], + 'paths' => ['api/*', 'sanctum/csrf-cookie', 'graphql'], 'allowed_methods' => ['*'], From e55606733349615d510ffd83b3659f416bac0a19 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Sun, 13 Oct 2024 00:00:43 -0300 Subject: [PATCH 06/33] Version --- composer.lock | 171 +++++++++++++++++++++++++------------------------- 1 file changed, 85 insertions(+), 86 deletions(-) diff --git a/composer.lock b/composer.lock index a96f2fbbfd..74c51a15f2 100644 --- a/composer.lock +++ b/composer.lock @@ -114,16 +114,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.322.9", + "version": "3.324.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "0bd7513a7dd9b5330cb92575da99d9057f79b39c" + "reference": "5b824a9b8015a38f18c53b023975c0f63c7bd3dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0bd7513a7dd9b5330cb92575da99d9057f79b39c", - "reference": "0bd7513a7dd9b5330cb92575da99d9057f79b39c", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5b824a9b8015a38f18c53b023975c0f63c7bd3dc", + "reference": "5b824a9b8015a38f18c53b023975c0f63c7bd3dc", "shasum": "" }, "require": { @@ -206,9 +206,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.322.9" + "source": "https://github.com/aws/aws-sdk-php/tree/3.324.1" }, - "time": "2024-10-01T18:23:10+00:00" + "time": "2024-10-11T18:22:01+00:00" }, { "name": "aws/aws-sdk-php-laravel", @@ -850,16 +850,16 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.3.3", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a" + "reference": "8c784d071debd117328803d86b2097615b457500" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", - "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500", + "reference": "8c784d071debd117328803d86b2097615b457500", "shasum": "" }, "require": { @@ -872,10 +872,14 @@ "require-dev": { "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.0", - "phpstan/phpstan-webmozart-assert": "^1.0", "phpunit/phpunit": "^7.0|^8.0|^9.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, "autoload": { "psr-4": { "Cron\\": "src/Cron/" @@ -899,7 +903,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0" }, "funding": [ { @@ -907,7 +911,7 @@ "type": "github" } ], - "time": "2023-08-10T19:36:49+00:00" + "time": "2024-10-09T13:47:03+00:00" }, { "name": "egulias/email-validator", @@ -1635,21 +1639,21 @@ }, { "name": "honeybadger-io/honeybadger-laravel", - "version": "v4.2.0", + "version": "v4.2.2", "source": { "type": "git", "url": "https://github.com/honeybadger-io/honeybadger-laravel.git", - "reference": "7e41ae984b0c9e25a86ffa0b9bf235df98655fea" + "reference": "b96932cb21f7bf98e55775746ca83faff7425986" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/honeybadger-io/honeybadger-laravel/zipball/7e41ae984b0c9e25a86ffa0b9bf235df98655fea", - "reference": "7e41ae984b0c9e25a86ffa0b9bf235df98655fea", + "url": "https://api.github.com/repos/honeybadger-io/honeybadger-laravel/zipball/b96932cb21f7bf98e55775746ca83faff7425986", + "reference": "b96932cb21f7bf98e55775746ca83faff7425986", "shasum": "" }, "require": { "ext-json": "*", - "honeybadger-io/honeybadger-php": ">=2.19.1", + "honeybadger-io/honeybadger-php": ">=2.19.5", "illuminate/console": "^10.0|^11.0", "illuminate/support": "^10.0|^11.0", "monolog/monolog": "^2.0|^3.2", @@ -1703,22 +1707,22 @@ ], "support": { "issues": "https://github.com/honeybadger-io/honeybadger-laravel/issues", - "source": "https://github.com/honeybadger-io/honeybadger-laravel/tree/v4.2.0" + "source": "https://github.com/honeybadger-io/honeybadger-laravel/tree/v4.2.2" }, - "time": "2024-09-17T07:12:33+00:00" + "time": "2024-10-11T11:53:54+00:00" }, { "name": "honeybadger-io/honeybadger-php", - "version": "2.19.4", + "version": "v2.19.5", "source": { "type": "git", "url": "https://github.com/honeybadger-io/honeybadger-php.git", - "reference": "278b89723b4456fd3f3a60e38bd392e0a304ce12" + "reference": "a0cc4c22faaf76fad25601773cb2b6fa62a2220b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/honeybadger-io/honeybadger-php/zipball/278b89723b4456fd3f3a60e38bd392e0a304ce12", - "reference": "278b89723b4456fd3f3a60e38bd392e0a304ce12", + "url": "https://api.github.com/repos/honeybadger-io/honeybadger-php/zipball/a0cc4c22faaf76fad25601773cb2b6fa62a2220b", + "reference": "a0cc4c22faaf76fad25601773cb2b6fa62a2220b", "shasum": "" }, "require": { @@ -1769,9 +1773,9 @@ ], "support": { "issues": "https://github.com/honeybadger-io/honeybadger-php/issues", - "source": "https://github.com/honeybadger-io/honeybadger-php/tree/2.19.4" + "source": "https://github.com/honeybadger-io/honeybadger-php/tree/v2.19.5" }, - "time": "2024-08-28T06:16:33+00:00" + "time": "2024-10-11T08:35:27+00:00" }, { "name": "intervention/image", @@ -1859,16 +1863,16 @@ }, { "name": "laravel/framework", - "version": "v11.26.0", + "version": "v11.27.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b" + "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b", - "reference": "b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b", + "url": "https://api.github.com/repos/laravel/framework/zipball/a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9", + "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9", "shasum": "" }, "require": { @@ -2064,20 +2068,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-10-01T14:29:34+00:00" + "time": "2024-10-09T04:17:35+00:00" }, { "name": "laravel/horizon", - "version": "v5.29.0", + "version": "v5.29.1", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "1d97f94412e89ff48683acd58d4a702d6bee7b88" + "reference": "9f482f21c23ed01c2366d1157843165165579c23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/1d97f94412e89ff48683acd58d4a702d6bee7b88", - "reference": "1d97f94412e89ff48683acd58d4a702d6bee7b88", + "url": "https://api.github.com/repos/laravel/horizon/zipball/9f482f21c23ed01c2366d1157843165165579c23", + "reference": "9f482f21c23ed01c2366d1157843165165579c23", "shasum": "" }, "require": { @@ -2141,9 +2145,9 @@ ], "support": { "issues": "https://github.com/laravel/horizon/issues", - "source": "https://github.com/laravel/horizon/tree/v5.29.0" + "source": "https://github.com/laravel/horizon/tree/v5.29.1" }, - "time": "2024-09-24T13:38:25+00:00" + "time": "2024-10-08T18:23:02+00:00" }, { "name": "laravel/prompts", @@ -2648,16 +2652,16 @@ }, { "name": "league/csv", - "version": "9.16.0", + "version": "9.17.0", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440" + "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/998280c6c34bd67d8125fdc8b45bae28d761b440", - "reference": "998280c6c34bd67d8125fdc8b45bae28d761b440", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/8cab815fb11ec93aa2f7b8a57b3daa1f1a364011", + "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011", "shasum": "" }, "require": { @@ -2665,17 +2669,16 @@ "php": "^8.1.2" }, "require-dev": { - "doctrine/collections": "^2.2.2", "ext-dom": "*", "ext-xdebug": "*", - "friendsofphp/php-cs-fixer": "^3.57.1", - "phpbench/phpbench": "^1.2.15", - "phpstan/phpstan": "^1.11.1", - "phpstan/phpstan-deprecation-rules": "^1.2.0", + "friendsofphp/php-cs-fixer": "^3.64.0", + "phpbench/phpbench": "^1.3.1", + "phpstan/phpstan": "^1.12.5", + "phpstan/phpstan-deprecation-rules": "^1.2.1", "phpstan/phpstan-phpunit": "^1.4.0", - "phpstan/phpstan-strict-rules": "^1.6.0", - "phpunit/phpunit": "^10.5.16 || ^11.1.3", - "symfony/var-dumper": "^6.4.6 || ^7.0.7" + "phpstan/phpstan-strict-rules": "^1.6.1", + "phpunit/phpunit": "^10.5.16 || ^11.4.0", + "symfony/var-dumper": "^6.4.8 || ^7.1.5" }, "suggest": { "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes", @@ -2693,7 +2696,7 @@ "src/functions_include.php" ], "psr-4": { - "League\\Csv\\": "src" + "League\\Csv\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2732,20 +2735,20 @@ "type": "github" } ], - "time": "2024-05-24T11:04:54+00:00" + "time": "2024-10-10T10:30:28+00:00" }, { "name": "league/flysystem", - "version": "3.29.0", + "version": "3.29.1", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0" + "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0adc0d9a51852e170e0028a60bd271726626d3f0", - "reference": "0adc0d9a51852e170e0028a60bd271726626d3f0", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319", + "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319", "shasum": "" }, "require": { @@ -2813,9 +2816,9 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.29.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.29.1" }, - "time": "2024-09-29T11:59:11+00:00" + "time": "2024-10-08T08:58:34+00:00" }, { "name": "league/flysystem-aws-s3-v3", @@ -3159,16 +3162,16 @@ }, { "name": "maennchen/zipstream-php", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/maennchen/ZipStream-PHP.git", - "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1" + "reference": "6187e9cc4493da94b9b63eb2315821552015fca9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/b8174494eda667f7d13876b4a7bfef0f62a7c0d1", - "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/6187e9cc4493da94b9b63eb2315821552015fca9", + "reference": "6187e9cc4493da94b9b63eb2315821552015fca9", "shasum": "" }, "require": { @@ -3224,19 +3227,15 @@ ], "support": { "issues": "https://github.com/maennchen/ZipStream-PHP/issues", - "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.0" + "source": "https://github.com/maennchen/ZipStream-PHP/tree/3.1.1" }, "funding": [ { "url": "https://github.com/maennchen", "type": "github" - }, - { - "url": "https://opencollective.com/zipstream", - "type": "open_collective" } ], - "time": "2023-06-21T14:59:35+00:00" + "time": "2024-10-10T12:33:01+00:00" }, { "name": "markbaker/complex", @@ -3620,24 +3619,24 @@ }, { "name": "nette/schema", - "version": "v1.3.0", + "version": "v1.3.2", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188" + "reference": "da801d52f0354f70a638673c4a0f04e16529431d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", - "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188", + "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d", + "reference": "da801d52f0354f70a638673c4a0f04e16529431d", "shasum": "" }, "require": { "nette/utils": "^4.0", - "php": "8.1 - 8.3" + "php": "8.1 - 8.4" }, "require-dev": { - "nette/tester": "^2.4", + "nette/tester": "^2.5.2", "phpstan/phpstan-nette": "^1.0", "tracy/tracy": "^2.8" }, @@ -3676,9 +3675,9 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.3.0" + "source": "https://github.com/nette/schema/tree/v1.3.2" }, - "time": "2023-12-11T11:54:22+00:00" + "time": "2024-10-06T23:10:23+00:00" }, { "name": "nette/utils", @@ -3768,16 +3767,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.3.0", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a" + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a", - "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", "shasum": "" }, "require": { @@ -3820,9 +3819,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" }, - "time": "2024-09-29T13:56:26+00:00" + "time": "2024-10-08T18:51:32+00:00" }, { "name": "nunomaduro/termwind", @@ -8576,16 +8575,16 @@ }, { "name": "laravel/sail", - "version": "v1.34.0", + "version": "v1.35.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "511e9c95b0f3ee778dc9e11e242bcd2af8e002cd" + "reference": "992bc2d9e52174c79515967f30849d21daa334d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/511e9c95b0f3ee778dc9e11e242bcd2af8e002cd", - "reference": "511e9c95b0f3ee778dc9e11e242bcd2af8e002cd", + "url": "https://api.github.com/repos/laravel/sail/zipball/992bc2d9e52174c79515967f30849d21daa334d8", + "reference": "992bc2d9e52174c79515967f30849d21daa334d8", "shasum": "" }, "require": { @@ -8635,7 +8634,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2024-09-27T14:58:09+00:00" + "time": "2024-10-08T14:45:26+00:00" }, { "name": "laravel/telescope", From 54f4efafc93775e5d25ddb199142ab68a62904e8 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 14 Oct 2024 17:13:23 -0300 Subject: [PATCH 07/33] =?UTF-8?q?Adiciona=20novo=20m=C3=A9todo=20no=20mode?= =?UTF-8?q?l=20da=20regra=20de=20avalia=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/LegacyEvaluationRule.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Models/LegacyEvaluationRule.php b/app/Models/LegacyEvaluationRule.php index ce007c574c..eaf5d99a24 100644 --- a/app/Models/LegacyEvaluationRule.php +++ b/app/Models/LegacyEvaluationRule.php @@ -105,6 +105,11 @@ public function isSpecificRetake(): bool return $this->tipo_recuperacao_paralela == self::PARALLEL_REMEDIAL_PER_SPECIFIC_STAGE; } + public function isByStage(): bool + { + return $this->tipo_recuperacao_paralela == self::PARALLEL_REMEDIAL_PER_STAGE; + } + public function isSumScoreCalculation(): bool { return $this->tipo_recuperacao_paralela == self::PARALLEL_REMEDIAL_PER_STAGE From 08114435e204ef47153844030dff9426979109bb Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Fri, 18 Oct 2024 12:06:11 -0300 Subject: [PATCH 08/33] =?UTF-8?q?Ignora=20conex=C3=A3o=20de=20auditoria?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Support/Database/Connections.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Support/Database/Connections.php b/app/Support/Database/Connections.php index 9bbf054ed3..8d4e75b26a 100644 --- a/app/Support/Database/Connections.php +++ b/app/Support/Database/Connections.php @@ -8,6 +8,6 @@ public function getConnections() { $connections = config('database.connections'); - return array_diff(array_keys($connections), ['sqlite', 'mysql', 'pgsql', 'sqlsrv', 'bussolastaging', 'mariadb']); + return array_diff(array_keys($connections), ['sqlite', 'mysql', 'pgsql', 'sqlsrv', 'bussolastaging', 'mariadb', 'audit']); } } From 2353889e555dad1975ccdcb1b7641b467f175234 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Fri, 18 Oct 2024 13:38:35 -0300 Subject: [PATCH 09/33] =?UTF-8?q?Incrementa=20vers=C3=A3o=20dos=20assets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/assets.php b/config/assets.php index 3d98f84b29..7df7f80868 100644 --- a/config/assets.php +++ b/config/assets.php @@ -14,7 +14,7 @@ | */ - 'version' => '0.1.100', + 'version' => '0.1.101', /* |-------------------------------------------------------------------------- From ef5fe7d028fa6a2e8cc908a72ed71c172ea037ce Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Fri, 18 Oct 2024 19:45:33 -0300 Subject: [PATCH 10/33] =?UTF-8?q?Corrige=20valida=C3=A7=C3=A3o=20dos=20par?= =?UTF-8?q?eceres=20descritivos=20incompat=C3=ADveis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Rules/IncompatibleDescriptiveOpinion.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Rules/IncompatibleDescriptiveOpinion.php b/app/Rules/IncompatibleDescriptiveOpinion.php index e69f410a0a..3072ff2ce7 100644 --- a/app/Rules/IncompatibleDescriptiveOpinion.php +++ b/app/Rules/IncompatibleDescriptiveOpinion.php @@ -25,13 +25,18 @@ public function passes($attribute, $value) $schoolClass = $value[0]['turma_id']; $schoolClass = LegacySchoolClass::find($schoolClass); $grades = array_column($value, 'serie_id'); + $utilizaRegraDiferenciada = $schoolClass->school->utiliza_regra_diferenciada; $descriptiveOpinionType = LegacyEvaluationRuleGradeYear::query() ->whereIn('serie_id', $grades) ->where('ano_letivo', $schoolClass->ano) - ->with('evaluationRule') + ->with(['evaluationRule', 'differentiatedEvaluationRule']) ->get() - ->map(function ($model) { + ->map(function ($model) use ($utilizaRegraDiferenciada) { + if ($utilizaRegraDiferenciada && $model->differentiatedEvaluationRule) { + return $model->differentiatedEvaluationRule->parecer_descritivo; + } + return $model->evaluationRule->parecer_descritivo; }) ->toArray(); From b332cf58e024ba8c556b7b05959161840a31e132 Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Mon, 21 Oct 2024 17:20:52 -0300 Subject: [PATCH 11/33] =?UTF-8?q?Adiciona=20eventos=20de=20cria=C3=A7?= =?UTF-8?q?=C3=A3o=20de=20funcion=C3=A1rio=20e=20estudante?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Events/EmployeeCreated.php | 20 ++++++++++++++++++++ app/Events/StudentCreated.php | 19 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100755 app/Events/EmployeeCreated.php create mode 100755 app/Events/StudentCreated.php diff --git a/app/Events/EmployeeCreated.php b/app/Events/EmployeeCreated.php new file mode 100755 index 0000000000..733e71237c --- /dev/null +++ b/app/Events/EmployeeCreated.php @@ -0,0 +1,20 @@ + Date: Tue, 22 Oct 2024 11:12:13 -0300 Subject: [PATCH 12/33] Corrige testes para utilizar o nome da tabela --- tests/Api/CriaAnoLetivoTest.php | 2 +- tests/Api/LegacyAbandonmentTypeTest.php | 2 +- tests/Api/LegacyBenefitTest.php | 2 +- tests/Api/LegacyCopySchoolClassTeacherTest.php | 2 +- tests/Api/LegacyDisciplinaryOccurrenceTypeTest.php | 2 +- tests/Api/LegacyEducationLevelTest.php | 2 +- tests/Api/LegacyEducationTypeTest.php | 2 +- tests/Api/LegacyExemptionTypeTest.php | 2 +- tests/Api/LegacyProjectTest.php | 2 +- tests/Api/LegacyRegimeTypeTest.php | 2 +- tests/Api/LegacySchoolClassTypeTest.php | 2 +- tests/Api/LegacyStageTypeTest.php | 2 +- tests/Api/LegacyTransferTypeTest.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/Api/CriaAnoLetivoTest.php b/tests/Api/CriaAnoLetivoTest.php index 441ec0b99a..1ae4c7c213 100644 --- a/tests/Api/CriaAnoLetivoTest.php +++ b/tests/Api/CriaAnoLetivoTest.php @@ -158,7 +158,7 @@ public function testCreateNewSchoolAcademicYear() $this->post('/intranet/educar_ano_letivo_modulo_cad.php?ref_cod_escola=' . $school->getKey() . '&ano=' . $nextYear, $request) ->assertRedirectContains('educar_escola_det.php?cod_escola=' . $school->getKey() . '#ano_letivo'); - $this->assertDatabaseHas($schoolAcademicYearFactory, [ + $this->assertDatabaseHas($schoolAcademicYearFactory->getTable(), [ 'ano' => $nextYear, 'ref_cod_escola' => $school->getKey(), ]); diff --git a/tests/Api/LegacyAbandonmentTypeTest.php b/tests/Api/LegacyAbandonmentTypeTest.php index ebb66bb4b9..1ba5a71d2b 100644 --- a/tests/Api/LegacyAbandonmentTypeTest.php +++ b/tests/Api/LegacyAbandonmentTypeTest.php @@ -31,7 +31,7 @@ public function testSaveSuccess(): void $this->post('/intranet/educar_abandono_tipo_cad.php', $payload) ->assertRedirectContains('educar_abandono_tipo_lst.php'); - $this->assertDatabaseHas($type, [ + $this->assertDatabaseHas($type->getTable(), [ 'ref_cod_instituicao' => $type->ref_cod_instituicao, 'ref_usuario_cad' => $user->getKey(), 'nome' => $type->nome, diff --git a/tests/Api/LegacyBenefitTest.php b/tests/Api/LegacyBenefitTest.php index 5d0cf06790..30406b1d32 100644 --- a/tests/Api/LegacyBenefitTest.php +++ b/tests/Api/LegacyBenefitTest.php @@ -30,7 +30,7 @@ public function testSaveSuccess(): void $this->post('/intranet/educar_aluno_beneficio_cad.php', $payload) ->assertRedirectContains('educar_aluno_beneficio_lst.php'); - $this->assertDatabaseHas($benefit, [ + $this->assertDatabaseHas($benefit->getTable(), [ 'nm_beneficio' => $benefit->name, 'desc_beneficio' => $benefit->description, 'ref_usuario_cad' => $user->getKey(), diff --git a/tests/Api/LegacyCopySchoolClassTeacherTest.php b/tests/Api/LegacyCopySchoolClassTeacherTest.php index 42dec5b76e..5988dc98c9 100644 --- a/tests/Api/LegacyCopySchoolClassTeacherTest.php +++ b/tests/Api/LegacyCopySchoolClassTeacherTest.php @@ -46,7 +46,7 @@ public function testCopySchoolClassTeacher(): void $this->post('/intranet/copia_vinculos_servidores_cad.php', $payload) ->assertRedirectContains('educar_turma_det.php?cod_turma=' . $turmaAtual->getKey()); - $this->assertDatabaseHas($vinculo, [ + $this->assertDatabaseHas($vinculo->getTable(), [ 'ano' => now()->year, 'turma_id' => $turmaAtual->getKey(), 'instituicao_id' => $instituicao->getKey(), diff --git a/tests/Api/LegacyDisciplinaryOccurrenceTypeTest.php b/tests/Api/LegacyDisciplinaryOccurrenceTypeTest.php index f021ab5b98..88b9c60fbe 100644 --- a/tests/Api/LegacyDisciplinaryOccurrenceTypeTest.php +++ b/tests/Api/LegacyDisciplinaryOccurrenceTypeTest.php @@ -33,7 +33,7 @@ public function testSaveSuccess(): void $this->post('/intranet/educar_tipo_ocorrencia_disciplinar_cad.php', $payload) ->assertRedirectContains('educar_tipo_ocorrencia_disciplinar_lst.php'); - $this->assertDatabaseHas($type, [ + $this->assertDatabaseHas($type->getTable(), [ 'ref_cod_instituicao' => $type->ref_cod_instituicao, 'ref_usuario_cad' => $user->getKey(), 'nm_tipo' => $type->nm_tipo, diff --git a/tests/Api/LegacyEducationLevelTest.php b/tests/Api/LegacyEducationLevelTest.php index 92d96200ea..f8e6776125 100644 --- a/tests/Api/LegacyEducationLevelTest.php +++ b/tests/Api/LegacyEducationLevelTest.php @@ -32,7 +32,7 @@ public function testSaveSuccess(): void $this->post('/intranet/educar_nivel_ensino_cad.php', $payload) ->assertRedirectContains('educar_nivel_ensino_lst.php'); - $this->assertDatabaseHas($type, [ + $this->assertDatabaseHas($type->getTable(), [ 'ref_cod_instituicao' => $type->ref_cod_instituicao, 'ref_usuario_cad' => $user->getKey(), 'nm_nivel' => $type->nm_nivel, diff --git a/tests/Api/LegacyEducationTypeTest.php b/tests/Api/LegacyEducationTypeTest.php index 279b76dbc7..922e260e6c 100644 --- a/tests/Api/LegacyEducationTypeTest.php +++ b/tests/Api/LegacyEducationTypeTest.php @@ -32,7 +32,7 @@ public function testSaveSuccess(): void $this->post('/intranet/educar_tipo_ensino_cad.php', $payload) ->assertRedirectContains('educar_tipo_ensino_lst.php'); - $this->assertDatabaseHas($type, [ + $this->assertDatabaseHas($type->getTable(), [ 'ref_cod_instituicao' => $type->ref_cod_instituicao, 'ref_usuario_cad' => $user->getKey(), 'nm_tipo' => $type->nm_tipo, diff --git a/tests/Api/LegacyExemptionTypeTest.php b/tests/Api/LegacyExemptionTypeTest.php index 68612e3568..6be408d5e3 100644 --- a/tests/Api/LegacyExemptionTypeTest.php +++ b/tests/Api/LegacyExemptionTypeTest.php @@ -32,7 +32,7 @@ public function testSaveSuccess(): void $this->post('/intranet/educar_tipo_dispensa_cad.php', $payload) ->assertRedirectContains('educar_tipo_dispensa_lst.php'); - $this->assertDatabaseHas($type, [ + $this->assertDatabaseHas($type->getTable(), [ 'ref_cod_instituicao' => $type->ref_cod_instituicao, 'ref_usuario_cad' => $user->getKey(), 'nm_tipo' => $type->nm_tipo, diff --git a/tests/Api/LegacyProjectTest.php b/tests/Api/LegacyProjectTest.php index dc381f3985..e38fd294e4 100644 --- a/tests/Api/LegacyProjectTest.php +++ b/tests/Api/LegacyProjectTest.php @@ -31,7 +31,7 @@ public function testSaveSuccess(): void $this->post('/intranet/educar_projeto_cad.php', $payload) ->assertRedirectContains('educar_projeto_lst.php'); - $this->assertDatabaseHas($project, [ + $this->assertDatabaseHas($project->getTable(), [ 'nome' => $project->nome, 'observacao' => $project->observacao, ]); diff --git a/tests/Api/LegacyRegimeTypeTest.php b/tests/Api/LegacyRegimeTypeTest.php index 867af52f4d..b70182ac6f 100644 --- a/tests/Api/LegacyRegimeTypeTest.php +++ b/tests/Api/LegacyRegimeTypeTest.php @@ -31,7 +31,7 @@ public function testSaveSuccess(): void $this->post('/intranet/educar_tipo_regime_cad.php', $payload) ->assertRedirectContains('educar_tipo_regime_lst.php'); - $this->assertDatabaseHas($type, [ + $this->assertDatabaseHas($type->getTable(), [ 'ref_cod_instituicao' => $type->ref_cod_instituicao, 'ref_usuario_cad' => $user->getKey(), 'nm_tipo' => $type->nm_tipo, diff --git a/tests/Api/LegacySchoolClassTypeTest.php b/tests/Api/LegacySchoolClassTypeTest.php index c257a31f70..b07eab8f37 100644 --- a/tests/Api/LegacySchoolClassTypeTest.php +++ b/tests/Api/LegacySchoolClassTypeTest.php @@ -32,7 +32,7 @@ public function testSaveSuccess(): void $this->post('/intranet/educar_turma_tipo_cad.php', $payload) ->assertRedirectContains('educar_turma_tipo_lst.php'); - $this->assertDatabaseHas($type, [ + $this->assertDatabaseHas($type->getTable(), [ 'ref_cod_instituicao' => $type->ref_cod_instituicao, 'ref_usuario_cad' => $user->getKey(), 'nm_tipo' => $type->nm_tipo, diff --git a/tests/Api/LegacyStageTypeTest.php b/tests/Api/LegacyStageTypeTest.php index 643cce7c91..97fed040c4 100644 --- a/tests/Api/LegacyStageTypeTest.php +++ b/tests/Api/LegacyStageTypeTest.php @@ -35,7 +35,7 @@ public function testSaveSuccess(): void $this->post('/intranet/educar_modulo_cad.php', $payload) ->assertRedirectContains('educar_modulo_lst.php'); - $this->assertDatabaseHas($type, [ + $this->assertDatabaseHas($type->getTable(), [ 'ref_cod_instituicao' => $type->ref_cod_instituicao, 'ref_usuario_cad' => $user->getKey(), 'nm_tipo' => $type->nm_tipo, diff --git a/tests/Api/LegacyTransferTypeTest.php b/tests/Api/LegacyTransferTypeTest.php index 8f358cc415..4e010d92f5 100644 --- a/tests/Api/LegacyTransferTypeTest.php +++ b/tests/Api/LegacyTransferTypeTest.php @@ -32,7 +32,7 @@ public function testSaveSuccess(): void $this->post('/intranet/educar_transferencia_tipo_cad.php', $payload) ->assertRedirectContains('educar_transferencia_tipo_lst.php'); - $this->assertDatabaseHas($type, [ + $this->assertDatabaseHas($type->getTable(), [ 'ref_cod_instituicao' => $type->ref_cod_instituicao, 'ref_usuario_cad' => $user->getKey(), 'nm_tipo' => $type->nm_tipo, From d3f2d3584429830d6486f9b826a9a273b24338d9 Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Tue, 22 Oct 2024 11:27:05 -0300 Subject: [PATCH 13/33] Corrige testes para utilizar o nome da tabela --- tests/Api/CriaAnoLetivoTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Api/CriaAnoLetivoTest.php b/tests/Api/CriaAnoLetivoTest.php index 1ae4c7c213..af80fc01ce 100644 --- a/tests/Api/CriaAnoLetivoTest.php +++ b/tests/Api/CriaAnoLetivoTest.php @@ -164,7 +164,7 @@ public function testCreateNewSchoolAcademicYear() ]); $this->assertDatabaseHas( - $schoolClass, + $schoolClass->getTable(), [ 'ref_ref_cod_escola' => $schoolGrade->school_id, 'ref_ref_cod_serie' => $schoolGrade->grade_id, @@ -196,7 +196,7 @@ public function testCreateNewSchoolAcademicYear() )->first(); $this->assertDatabaseHas( - $legacySchoolClassTeacher, + $legacySchoolClassTeacher->getTable(), [ 'servidor_id' => $employee->getKey(), 'turma_id' => $newSchoolClass->getKey(), @@ -388,13 +388,13 @@ public function testCreateNewSchoolAcademicYearWithSchoolClassMultiplesGrades() $this->post('/intranet/educar_ano_letivo_modulo_cad.php?ref_cod_escola=' . $school->getKey() . '&ano=' . $nextYear, $request) ->assertRedirectContains('educar_escola_det.php?cod_escola=' . $school->getKey() . '#ano_letivo'); - $this->assertDatabaseHas($schoolAcademicYearFactory, [ + $this->assertDatabaseHas($schoolAcademicYearFactory->getTable(), [ 'ano' => $nextYear, 'ref_cod_escola' => $school->getKey(), ]); $this->assertDatabaseHas( - $schoolClass, + $schoolClass->getTable(), [ 'ref_ref_cod_escola' => $schoolGrade->school_id, 'ref_ref_cod_serie' => $schoolGrade->grade_id, From 559c47a077e503435b8a5a0a4f7c1389c0a1b4f9 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Wed, 23 Oct 2024 16:33:10 -0300 Subject: [PATCH 14/33] =?UTF-8?q?Adiciona=20Forma=C3=A7=C3=A3o/Complementa?= =?UTF-8?q?=C3=A7=C3=A3o=20pedag=C3=B3gica=20no=20exportador=20de=20profes?= =?UTF-8?q?sores?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/Exporter/Teacher.php | 1 + ...0_23_104038_update_view_export_teacher.php | 21 +++ .../public.exporter_teacher-2024-10-23.sql | 137 ++++++++++++++++++ .../sqls/views/public.exporter_teacher.sql | 36 +++++ tests/Unit/View/Exporter/TeacherTest.php | 1 + 5 files changed, 196 insertions(+) create mode 100644 database/migrations/2024_10_23_104038_update_view_export_teacher.php create mode 100644 database/sqls/views/public.exporter_teacher-2024-10-23.sql diff --git a/app/Models/Exporter/Teacher.php b/app/Models/Exporter/Teacher.php index f9e1f2e5db..ea5e1aaf40 100644 --- a/app/Models/Exporter/Teacher.php +++ b/app/Models/Exporter/Teacher.php @@ -70,6 +70,7 @@ public function getExportedColumnsByGroup() 'high_school_type' => 'Tipo de ensino médio cursado', 'employee_postgraduates_complete' => 'Pós-Graduações concluídas', 'continuing_education_course' => 'Outros cursos de formação continuada', + 'complementacao_pedagogica' => 'Formação/Complementação pedagógica', 'employee_graduation_complete' => 'Curso(s) superior(es) concluído(s)', 'allocations.funcao_exercida' => 'Função exercida', 'allocations.tipo_vinculo' => 'Tipo de vínculo', diff --git a/database/migrations/2024_10_23_104038_update_view_export_teacher.php b/database/migrations/2024_10_23_104038_update_view_export_teacher.php new file mode 100644 index 0000000000..f22b99cc12 --- /dev/null +++ b/database/migrations/2024_10_23_104038_update_view_export_teacher.php @@ -0,0 +1,21 @@ +dropView('public.exporter_teacher'); + $this->createView('public.exporter_teacher', '2024-10-23'); + } + + public function down() + { + $this->dropView('public.exporter_teacher'); + $this->createView('public.exporter_teacher', '2023-06-19'); + } +}; diff --git a/database/sqls/views/public.exporter_teacher-2024-10-23.sql b/database/sqls/views/public.exporter_teacher-2024-10-23.sql new file mode 100644 index 0000000000..850449f82c --- /dev/null +++ b/database/sqls/views/public.exporter_teacher-2024-10-23.sql @@ -0,0 +1,137 @@ +create view public.exporter_teacher as +select + distinct p.*, + pt.ano as year, + c.nm_curso as course, + s.nm_serie as grade, + ep.nome as school, + t.nm_turma as school_class, + c.cod_curso as course_id, + s.cod_serie as grade_id, + e.cod_escola as school_id, + t.cod_turma as school_class_id, + pt.id as pivot_id, + servidor.cod_servidor, + employee_graduation.complete as employee_graduation_complete, + escolaridade.descricao as schooling_degree, + employee_postgraduates.complete as employee_postgraduates_complete, + CASE servidor.tipo_ensino_medio_cursado + WHEN 1 THEN 'Formação Geral' + WHEN 2 THEN 'Modalidade Normal (Magistério)' + WHEN 3 THEN 'Curso Técnico' + WHEN 4 THEN 'Magistério Indígena Modalidade Normal' + ELSE '' + END AS high_school_type, + form.continuing_education_course, + form_complementacao_pedagogica.complementacao_pedagogica, + sf.matricula AS enrollments +from modules.professor_turma pt + inner join public.exporter_person p + on p.id = pt.servidor_id + inner join pmieducar.turma t + on t.cod_turma = pt.turma_id + inner join pmieducar.escola e + on e.cod_escola = t.ref_ref_cod_escola + inner join cadastro.pessoa ep + on ep.idpes = e.ref_idpes + inner join pmieducar.serie s + on s.cod_serie = t.ref_ref_cod_serie + inner join pmieducar.curso c + on c.cod_curso = t.ref_cod_curso + left join pmieducar.servidor servidor + on pt.servidor_id = servidor.cod_servidor + LEFT JOIN pmieducar.servidor_alocacao sa on sa.ref_cod_servidor = servidor.cod_servidor AND + sa.ano = pt.ano AND + sa.ref_cod_escola = e.cod_escola + LEFT JOIN pmieducar.servidor_funcao sf on sf.ref_cod_servidor = sa.ref_cod_servidor AND + sf.cod_servidor_funcao = sa.ref_cod_servidor_funcao + left join cadastro.escolaridade + on escolaridade.idesco = servidor.ref_idesco, + LATERAL ( + SELECT CONCAT_WS(', ', + CASE WHEN (ARRAY[1] <@ scfc.curso_formacao_continuada)::bool THEN 'Creche (0 a 3 anos)'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[2] <@ scfc.curso_formacao_continuada)::bool THEN 'Pré-escola (4 e 5 anos)'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[3] <@ scfc.curso_formacao_continuada)::bool THEN 'Anos iniciais do ensino fundamental'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[4] <@ scfc.curso_formacao_continuada)::bool THEN 'Anos finais do ensino fundamental'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[5] <@ scfc.curso_formacao_continuada)::bool THEN 'Ensino médio'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[6] <@ scfc.curso_formacao_continuada)::bool THEN 'Educação de jovens e adultos'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[7] <@ scfc.curso_formacao_continuada)::bool THEN 'Educação especial'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[8] <@ scfc.curso_formacao_continuada)::bool THEN 'Educação indígena'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[9] <@ scfc.curso_formacao_continuada)::bool THEN 'Educação do campo'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[10] <@ scfc.curso_formacao_continuada)::bool THEN 'Educação ambiental'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[11] <@ scfc.curso_formacao_continuada)::bool THEN 'Educação em direitos humanos'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[12] <@ scfc.curso_formacao_continuada)::bool THEN 'Gênero e diversidade sexual'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[13] <@ scfc.curso_formacao_continuada)::bool THEN 'Direitos de criança e adolescente'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[14] <@ scfc.curso_formacao_continuada)::bool THEN 'Educação para as relações étnico-raciais e História e cultura Afro-Brasileira e Africana'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[17] <@ scfc.curso_formacao_continuada)::bool THEN 'Gestão Escolar'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[15] <@ scfc.curso_formacao_continuada)::bool THEN 'Outros'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[16] <@ scfc.curso_formacao_continuada)::bool THEN 'Nenhum'::VARCHAR ELSE NULL::VARCHAR END + ) + AS continuing_education_course + FROM pmieducar.servidor as scfc + WHERE servidor.curso_formacao_continuada IS NOT NULL + AND curso_formacao_continuada != '{}' + and scfc.cod_servidor = servidor.cod_servidor + ) form, + LATERAL ( + SELECT CONCAT_WS(', ', + CASE WHEN (ARRAY[1] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Química'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[2] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Física'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[3] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Matemática'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[4] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Biologia'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[5] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Ciências'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[6] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua / Literatura Portuguesa'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[7] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua / Literatura Estrangeira - Inglês'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[8] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua / Literatura Estrangeira - Espanhol'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[30] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua / Literatura Estrangeira - Francês'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[9] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua / Literatura Estrangeira - Outra'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[10] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Arte (Educação Artística, Teatro, Dança, Música, Artes Plásticas e outras)'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[11] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Educação Física'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[12] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'História'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[13] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Geografia'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[14] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Filosofia'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[28] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Estudos Sociais'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[29] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Sociologia'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[16] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Informática / Computação'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[17] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Áreas do conhecimento profissionalizantes'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[23] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Libras'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[25] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Áreas do conhecimento pedagógicas'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[26] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Ensino religioso'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[27] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua indígena'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[31] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua Portuguesa como Segunda Língua'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[32] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Estágio Curricular Supervisionado'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[33] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Projeto de vida'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[99] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Outras áreas do conhecimento'::VARCHAR ELSE NULL::VARCHAR END + ) AS complementacao_pedagogica + FROM pmieducar.servidor as scfc + WHERE scfc.complementacao_pedagogica IS NOT NULL + AND scfc.complementacao_pedagogica != '{}' + AND scfc.cod_servidor = servidor.cod_servidor + ) form_complementacao_pedagogica, + LATERAL ( + SELECT STRING_AGG( + ('['||CONCAT_WS(', ',educacenso_curso_superior.nome,completion_year,educacenso_ies.nome,employee_graduation_disciplines.name)||']')::varchar, ';') as complete + FROM employee_graduations + JOIN modules.educacenso_curso_superior ON educacenso_curso_superior.id = employee_graduations.course_id + JOIN modules.educacenso_ies ON educacenso_ies.id = employee_graduations.college_id + LEFT JOIN employee_graduation_disciplines ON employee_graduations.discipline_id = employee_graduation_disciplines.id + WHERE employee_graduations.employee_id = servidor.cod_servidor + ) AS employee_graduation, + LATERAL ( + SELECT CONCAT_WS(', ', + CASE WHEN epg.type_id = 1 THEN 'Especialização' ELSE NULL::VARCHAR END, + CASE WHEN epg.type_id = 2 THEN 'Mestrado' ELSE NULL::VARCHAR END, + CASE WHEN epg.type_id = 3 THEN 'Doutorado' ELSE NULL::VARCHAR END, + CASE WHEN epg.type_id = 4 THEN 'Não tem pós-graduação concluída' ELSE NULL::VARCHAR END + ) + AS complete + FROM pmieducar.servidor as serv + LEFT JOIN employee_posgraduate as epg ON epg.employee_id = serv.cod_servidor + WHERE servidor.cod_servidor = serv.cod_servidor + ) AS employee_postgraduates +order by + p.name, + ep.nome, + c.nm_curso, + s.nm_serie, + t.nm_turma; diff --git a/database/sqls/views/public.exporter_teacher.sql b/database/sqls/views/public.exporter_teacher.sql index 5298f2c0e7..12ead8a137 100644 --- a/database/sqls/views/public.exporter_teacher.sql +++ b/database/sqls/views/public.exporter_teacher.sql @@ -23,6 +23,7 @@ select ELSE '' END AS high_school_type, form.continuing_education_course, + form_complementacao_pedagogica.complementacao_pedagogica, sf.matricula AS matricula from modules.professor_turma pt inner join public.exporter_person p @@ -68,6 +69,41 @@ on escolaridade.idesco = servidor.ref_idesco, AND curso_formacao_continuada != '{}' and scfc.cod_servidor = servidor.cod_servidor ) form, + LATERAL ( + SELECT CONCAT_WS(', ', + CASE WHEN (ARRAY[1] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Química'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[2] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Física'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[3] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Matemática'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[4] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Biologia'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[5] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Ciências'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[6] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua / Literatura Portuguesa'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[7] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua / Literatura Estrangeira - Inglês'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[8] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua / Literatura Estrangeira - Espanhol'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[30] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua / Literatura Estrangeira - Francês'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[9] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua / Literatura Estrangeira - Outra'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[10] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Arte (Educação Artística, Teatro, Dança, Música, Artes Plásticas e outras)'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[11] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Educação Física'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[12] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'História'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[13] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Geografia'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[14] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Filosofia'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[28] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Estudos Sociais'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[29] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Sociologia'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[16] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Informática / Computação'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[17] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Áreas do conhecimento profissionalizantes'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[23] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Libras'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[25] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Áreas do conhecimento pedagógicas'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[26] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Ensino religioso'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[27] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua indígena'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[31] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Língua Portuguesa como Segunda Língua'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[32] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Estágio Curricular Supervisionado'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[33] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Projeto de vida'::VARCHAR ELSE NULL::VARCHAR END, + CASE WHEN (ARRAY[99] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Outras áreas do conhecimento'::VARCHAR ELSE NULL::VARCHAR END + ) AS complementacao_pedagogica + FROM pmieducar.servidor as scfc + WHERE scfc.complementacao_pedagogica IS NOT NULL + AND scfc.complementacao_pedagogica != '{}' + AND scfc.cod_servidor = servidor.cod_servidor + ) form_complementacao_pedagogica, LATERAL ( SELECT STRING_AGG( ('['||CONCAT_WS(', ',educacenso_curso_superior.nome,completion_year,educacenso_ies.nome,employee_graduation_disciplines.name)||']')::varchar, ';') as complete diff --git a/tests/Unit/View/Exporter/TeacherTest.php b/tests/Unit/View/Exporter/TeacherTest.php index 7eb671e620..c64fc331e6 100644 --- a/tests/Unit/View/Exporter/TeacherTest.php +++ b/tests/Unit/View/Exporter/TeacherTest.php @@ -74,6 +74,7 @@ public function testGetExportedColumnsByGroup(): void 'high_school_type' => 'Tipo de ensino médio cursado', 'employee_postgraduates_complete' => 'Pós-Graduações concluídas', 'continuing_education_course' => 'Outros cursos de formação continuada', + 'complementacao_pedagogica' => 'Formação/Complementação pedagógica', 'employee_graduation_complete' => 'Curso(s) superior(es) concluído(s)', 'allocations.funcao_exercida' => 'Função exercida', 'allocations.tipo_vinculo' => 'Tipo de vínculo', From b32f4345aaf8f8c757a6fd219a85b252644a3368 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Wed, 23 Oct 2024 21:24:48 -0300 Subject: [PATCH 15/33] =?UTF-8?q?Corrige=20visualiza=C3=A7=C3=A3o=20dos=20?= =?UTF-8?q?detalhes=20do=20aluno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/assets.php | 2 +- ieducar/intranet/educar_aluno_det.php | 8 ++++---- .../legacy/Cadastro/Assets/Javascripts/AlunoShow.js | 10 ++++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/config/assets.php b/config/assets.php index 7df7f80868..0ef790a2e2 100644 --- a/config/assets.php +++ b/config/assets.php @@ -14,7 +14,7 @@ | */ - 'version' => '0.1.101', + 'version' => '0.1.102', /* |-------------------------------------------------------------------------- diff --git a/ieducar/intranet/educar_aluno_det.php b/ieducar/intranet/educar_aluno_det.php index 6297a33175..3343f27572 100644 --- a/ieducar/intranet/educar_aluno_det.php +++ b/ieducar/intranet/educar_aluno_det.php @@ -640,7 +640,7 @@ public function Gerar() $reg = $objFichaMedica->detalhe(); if ($reg) { - $this->addDetalhe(detalhe: ['', null]); + $this->addHtml(''); if (trim(string: $reg['grupo_sanguineo']) != '') { $this->addDetalhe(detalhe: ['Grupo sanguíneo', $reg['grupo_sanguineo']]); } @@ -750,7 +750,7 @@ public function Gerar() $this->addDetalhe(detalhe: ['Nome', $reg['responsavel_nome']]); $this->addDetalhe(detalhe: ['Parentesco', $reg['responsavel_parentesco']]); $this->addDetalhe(detalhe: ['Telefone', $reg['responsavel_parentesco_telefone']]); - $this->addDetalhe(detalhe: ['Celular', $reg['responsavel_parentesco_celular']]); + $this->addDetalhe(detalhe: ['Celular', $reg['responsavel_parentesco_celular']]); } $uniformDistribution = UniformDistribution::where('student_id', $this->cod_aluno) @@ -873,7 +873,7 @@ public function Gerar() $this->addDetalhe(detalhe: ['Possui energia elétrica', $reg['energia']]); $this->addDetalhe(detalhe: ['Possui tratamento de esgoto', $reg['esgoto']]); $this->addDetalhe(detalhe: ['Possui fossa', $reg['fossa']]); - $this->addDetalhe(detalhe: ['Possui coleta de lixo', $reg['lixo']]); + $this->addDetalhe(detalhe: ['Possui coleta de lixo', $reg['lixo']]); } $reg = LegacyProject::query()->where(column: 'pmieducar.projeto_aluno.ref_cod_aluno', operator: $this->cod_aluno) @@ -881,7 +881,7 @@ public function Gerar() ->orderBy(column: 'nome', direction: 'ASC') ->get(); - if (!empty($reg)) { + if ($reg->isNotEmpty()) { $tabela_projetos = ' diff --git a/public/vendor/legacy/Cadastro/Assets/Javascripts/AlunoShow.js b/public/vendor/legacy/Cadastro/Assets/Javascripts/AlunoShow.js index 8e7278bdd8..cd43a7500d 100644 --- a/public/vendor/legacy/Cadastro/Assets/Javascripts/AlunoShow.js +++ b/public/vendor/legacy/Cadastro/Assets/Javascripts/AlunoShow.js @@ -316,6 +316,7 @@ if(possui_ficha_medica){ // Pega o número dessa linha linha_inicial_fmedica = $j('#tfmedica').index() + 1; + linha_final_fmedica = $j('#ffmedica').closest('tr').index() + 1; // hide nos campos das outras abas (deixando só os campos da primeira aba) $j('.tableDetalhe >tbody > tr').each(function(index, row) { @@ -353,6 +354,7 @@ if(possui_moradia){ // Pega o número dessa linha linha_inicial_fmoradia = $j('#tfmoradia').index() + 1; + linha_final_fmoradia = $j('#ffmoradia').closest('tr').index() + 1; // hide nos campos das outras abas (deixando só os campos da primeira aba) $j('.tableDetalhe >tbody > tr').each(function(index, row) { @@ -370,7 +372,7 @@ if(participa_projetos){ $j('#fprojeto').closest('tr').attr('id','tfprojeto'); // Pega o número dessa linha - linha_inicial_fprojeto = $j('#tfprojeto').index() + 1; + linha_inicial_fprojeto = $j('#tfprojeto').index(); // hide nos campos das outras abas (deixando só os campos da primeira aba) $j('.tableDetalhe >tbody > tr').each(function(index, row) { @@ -428,7 +430,7 @@ $j(document).ready(function() { $j('#tab2').toggleClass('alunoTab2 alunoTab-active2') $j('.tableDetalhe >tbody > tr').each(function(index, row) { if (row.id!='stop'){ - if (index>=linha_inicial_fmedica && index=linha_inicial_fmedica && index1){ row.hide(); @@ -466,10 +468,10 @@ $j(document).ready(function() { function(){ if (possui_moradia){ $j('.alunoTab-active2').toggleClass('alunoTab-active2 alunoTab2'); - $j('#tab4').toggleClass('alunoTab2 alunoTab-active2') + $j('#tab4').toggleClass('alunoTab2 alunoTab-active2'); $j('.tableDetalhe >tbody > tr').each(function(index, row) { if (row.id!='stop'){ - if (index>=linha_inicial_fmoradia){ + if (index>=linha_inicial_fmoradia && index1){ row.hide(); From 49c47fff74f609aa4ec39fd392024d10eadbc73d Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Thu, 24 Oct 2024 11:06:14 -0300 Subject: [PATCH 16/33] =?UTF-8?q?Corrige=20exibi=C3=A7=C3=A3o=20do=20nome?= =?UTF-8?q?=20na=20exibi=C3=A7=C3=A3o=20da=20ficha=20m=C3=A9dica=20do=20al?= =?UTF-8?q?uno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/intranet/educar_aluno_det.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieducar/intranet/educar_aluno_det.php b/ieducar/intranet/educar_aluno_det.php index 3343f27572..3e1110535d 100644 --- a/ieducar/intranet/educar_aluno_det.php +++ b/ieducar/intranet/educar_aluno_det.php @@ -747,7 +747,7 @@ public function Gerar() $this->addDetalhe(detalhe: ['Em caso de emergência, autorizo levar meu(minha) filho(a) para o Hospital ou Clínica mais próximos:']); $this->addDetalhe(detalhe: ['Responsável', $reg['desc_aceita_hospital_proximo']]); $this->addDetalhe(detalhe: ['Em caso de emergência, se não for possível contatar os responsáveis, comunicar']); - $this->addDetalhe(detalhe: ['Nome', $reg['responsavel_nome']]); + $this->addDetalhe(detalhe: ['Nome', $reg['responsavel']]); $this->addDetalhe(detalhe: ['Parentesco', $reg['responsavel_parentesco']]); $this->addDetalhe(detalhe: ['Telefone', $reg['responsavel_parentesco_telefone']]); $this->addDetalhe(detalhe: ['Celular', $reg['responsavel_parentesco_celular']]); From 8d74e982e6b29260ec92306ffe53f4d375cad3ec Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Thu, 24 Oct 2024 11:10:45 -0300 Subject: [PATCH 17/33] =?UTF-8?q?Adiciona=20o=20disparo=20de=20evento=20na?= =?UTF-8?q?=20cria=C3=A7=C3=A3o=20de=20um=20servidor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/intranet/educar_servidor_cad.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ieducar/intranet/educar_servidor_cad.php b/ieducar/intranet/educar_servidor_cad.php index e9ad8ebd9e..831c150105 100644 --- a/ieducar/intranet/educar_servidor_cad.php +++ b/ieducar/intranet/educar_servidor_cad.php @@ -1,5 +1,6 @@ find($this->cod_servidor); + EmployeeCreated::dispatch($employee); + $this->mensagem = 'Cadastro efetuado com sucesso.
'; $this->simpleRedirect("educar_servidor_det.php?cod_servidor={$this->cod_servidor}&ref_cod_instituicao={$this->ref_cod_instituicao}"); } From 13e0ccc6802e600d8190e8f33ae505c2ba9215f7 Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Thu, 24 Oct 2024 11:43:57 -0300 Subject: [PATCH 18/33] =?UTF-8?q?Adiciona=20evento=20na=20cria=C3=A7=C3=A3?= =?UTF-8?q?o=20de=20um=20estudante?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intranet/include/pmieducar/clsPmieducarAluno.inc.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ieducar/intranet/include/pmieducar/clsPmieducarAluno.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarAluno.inc.php index fc4b8895c5..8808d2f7f6 100644 --- a/ieducar/intranet/include/pmieducar/clsPmieducarAluno.inc.php +++ b/ieducar/intranet/include/pmieducar/clsPmieducarAluno.inc.php @@ -1,5 +1,7 @@ Consulta("INSERT INTO pmieducar.aluno ($campos) VALUES ($valores)"); - return $db->InsertId('pmieducar.aluno_cod_aluno_seq'); + $studentId = $db->InsertId('pmieducar.aluno_cod_aluno_seq'); + $student = LegacyStudent::query()->find($studentId); + StudentCreated::dispatch($student); + + return $studentId; } return false; From 151c3b387c65292514213df8be22a3898cbed0ba Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Thu, 24 Oct 2024 11:44:14 -0300 Subject: [PATCH 19/33] Cria teste para garantir o disparo de eventos do estudante e servidor --- tests/Api/EmployeeCreatedEventTest.php | 39 ++++++++++++++++++++++ tests/Api/StudentCreatedEventTest.php | 46 ++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 tests/Api/EmployeeCreatedEventTest.php create mode 100644 tests/Api/StudentCreatedEventTest.php diff --git a/tests/Api/EmployeeCreatedEventTest.php b/tests/Api/EmployeeCreatedEventTest.php new file mode 100644 index 0000000000..7ff3be4ae1 --- /dev/null +++ b/tests/Api/EmployeeCreatedEventTest.php @@ -0,0 +1,39 @@ +admin()->create(); + $this->actingAs($user); + + Event::fake(); + + $employeeIndividual = LegacyIndividualFactory::new()->create(); + + $data = [ + 'tipoacao' => 'Novo', + 'carga_horaria' => '20:00', + 'cod_servidor' => $employeeIndividual->getKey(), + 'ref_cod_instituicao' => $user->ref_cod_instituicao, + ]; + + $this->post('/intranet/educar_servidor_cad.php', $data) + ->assertRedirectContains('educar_servidor_det.php'); + + Event::assertDispatched(EmployeeCreated::class); + } +} diff --git a/tests/Api/StudentCreatedEventTest.php b/tests/Api/StudentCreatedEventTest.php new file mode 100644 index 0000000000..9c8726b7fd --- /dev/null +++ b/tests/Api/StudentCreatedEventTest.php @@ -0,0 +1,46 @@ +create(); + $guardianIndividual = LegacyIndividualFactory::new()->create(); + + $data = [ + 'oper' => 'post', + 'resource' => 'aluno', + 'pessoa_id' => $studentIndividual->getKey(), + 'mae_id' => $guardianIndividual->getKey(), + 'tipo_responsavel' => 'mae', + 'alfabetizado' => 'checked', + 'material' => 'A', + 'tipo_transporte' => 'nenhum', + 'deficiencias' => [], + 'transtornos' => [], + ]; + + $response = $this->getResource('/module/Api/Aluno', $data); + $response->assertStatus(200); + + $studentId = $response->json('id'); + + Event::assertDispatched(StudentCreated::class, function ($e) use ($studentId) { + return $e->student->getKey() === $studentId; + }); + } +} From 7236dcbde410005106f4de1fb015400fb72149fd Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Fri, 25 Oct 2024 09:51:48 -0300 Subject: [PATCH 20/33] =?UTF-8?q?Incrementa=20vers=C3=A3o=20dos=20assets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/assets.php b/config/assets.php index 0ef790a2e2..36741a50da 100644 --- a/config/assets.php +++ b/config/assets.php @@ -14,7 +14,7 @@ | */ - 'version' => '0.1.102', + 'version' => '0.1.103', /* |-------------------------------------------------------------------------- From f5d8190c6286e54b14827e676fa73d998a084264 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Tue, 29 Oct 2024 16:54:25 -0300 Subject: [PATCH 21/33] =?UTF-8?q?Corrige=20erro=20na=20exporta=C3=A7=C3=A3?= =?UTF-8?q?o=20quando=20n=C3=A3o=20possui=20forma=C3=A7=C3=A3o/complementa?= =?UTF-8?q?=C3=A7=C3=A3o=20pedag=C3=B3gica?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/sqls/views/public.exporter_teacher-2024-10-23.sql | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/database/sqls/views/public.exporter_teacher-2024-10-23.sql b/database/sqls/views/public.exporter_teacher-2024-10-23.sql index 850449f82c..69827677c3 100644 --- a/database/sqls/views/public.exporter_teacher-2024-10-23.sql +++ b/database/sqls/views/public.exporter_teacher-2024-10-23.sql @@ -104,9 +104,7 @@ from modules.professor_turma pt CASE WHEN (ARRAY[99] <@ scfc.complementacao_pedagogica::integer[])::bool THEN 'Outras áreas do conhecimento'::VARCHAR ELSE NULL::VARCHAR END ) AS complementacao_pedagogica FROM pmieducar.servidor as scfc - WHERE scfc.complementacao_pedagogica IS NOT NULL - AND scfc.complementacao_pedagogica != '{}' - AND scfc.cod_servidor = servidor.cod_servidor + WHERE scfc.cod_servidor = servidor.cod_servidor ) form_complementacao_pedagogica, LATERAL ( SELECT STRING_AGG( From adf041fdf3825327e4f0b22211f9b1ab00fa7942 Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Tue, 29 Oct 2024 17:27:14 -0300 Subject: [PATCH 22/33] Cria estado civil manualmente --- tests/Api/StudentCreatedEventTest.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/Api/StudentCreatedEventTest.php b/tests/Api/StudentCreatedEventTest.php index 9c8726b7fd..37c3dcefbf 100644 --- a/tests/Api/StudentCreatedEventTest.php +++ b/tests/Api/StudentCreatedEventTest.php @@ -4,6 +4,7 @@ use App\Events\StudentCreated; use Database\Factories\LegacyIndividualFactory; +use Database\Factories\LegacyMaritalStatusFactory; use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Support\Facades\Event; use Tests\Api\DiarioApiRequestTestTrait; @@ -18,8 +19,17 @@ public function testStudentCreatedEvent() { Event::fake(); - $studentIndividual = LegacyIndividualFactory::new()->create(); - $guardianIndividual = LegacyIndividualFactory::new()->create(); + $legacyMaritalStatus = LegacyMaritalStatusFactory::new()->create([ + 'ideciv' => 1, + 'descricao' => 'Solteiro', + ]); + + $studentIndividual = LegacyIndividualFactory::new()->create([ + 'ideciv' => $legacyMaritalStatus, + ]); + $guardianIndividual = LegacyIndividualFactory::new()->create([ + 'ideciv' => $legacyMaritalStatus, + ]); $data = [ 'oper' => 'post', From 4c70ec516c9b8e234d378da5efa48d5420003cad Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Tue, 29 Oct 2024 17:36:05 -0300 Subject: [PATCH 23/33] =?UTF-8?q?Organiza=20`ReportsRenderServerFactory`?= =?UTF-8?q?=20para=20permitir=20a=20gera=C3=A7=C3=A3o=20de=20relat=C3=B3ri?= =?UTF-8?q?os=20em=20outros=20pacotes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/lib/Portabilis/Report/ReportsRenderServerFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieducar/lib/Portabilis/Report/ReportsRenderServerFactory.php b/ieducar/lib/Portabilis/Report/ReportsRenderServerFactory.php index eb3430a50f..3563be3781 100644 --- a/ieducar/lib/Portabilis/Report/ReportsRenderServerFactory.php +++ b/ieducar/lib/Portabilis/Report/ReportsRenderServerFactory.php @@ -118,7 +118,7 @@ public function dumps($report, $options = []) if ($report->useHtml()) { $data = $report->getHtmlData(); $payload = [ - 'view' => 'reports::' . $templateName, + 'view' => str_contains($templateName, '::') ? $templateName : 'reports::' . $templateName, 'parameters' => $data['main'], 'orientation' => $data['orientation'] ?? null, 'driver' => $data['driver'] ?? null, From 816d15a25fe14853819d9eb05728e8dbd0d23478 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Wed, 30 Oct 2024 17:10:22 -0300 Subject: [PATCH 24/33] =?UTF-8?q?Cria=20tela=20de=20atualizar=20em=20lote?= =?UTF-8?q?=20a=20op=C3=A7=C3=A3o=20bloquear=20enturma=C3=A7=C3=A3o=20ap?= =?UTF-8?q?=C3=B3s=20atingir=20limite=20de=20vagas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BlockEnrollmentController.php | 59 ++++++++ app/Http/Requests/BlockEnrollmentRequest.php | 24 ++++ app/Models/LegacySchoolGrade.php | 5 + app/Process.php | 2 + ...334_create_block_enrollment_menu_table.php | 25 ++++ .../views/block-enrollment/edit.blade.php | 136 ++++++++++++++++++ routes/web.php | 3 + 7 files changed, 254 insertions(+) create mode 100644 app/Http/Controllers/BlockEnrollmentController.php create mode 100644 app/Http/Requests/BlockEnrollmentRequest.php create mode 100644 database/migrations/data/2024_10_30_223334_create_block_enrollment_menu_table.php create mode 100644 resources/views/block-enrollment/edit.blade.php diff --git a/app/Http/Controllers/BlockEnrollmentController.php b/app/Http/Controllers/BlockEnrollmentController.php new file mode 100644 index 0000000000..2901205030 --- /dev/null +++ b/app/Http/Controllers/BlockEnrollmentController.php @@ -0,0 +1,59 @@ +whereHas('school', fn ($q) => $q->whereInstitution($request->get('ref_cod_instituicao'))) + ->when($request->get('ref_cod_escola'), fn ($q, $school) => $q->where('ref_cod_escola', $school)) + ->when($request->get('ref_cod_curso'), function ($q, $course) { + $q->whereHas('grade', fn ($q) => $q->whereCourse($course)); + }) + ->whereRaw("anos_letivos @> ?", ["{" . $request->get('ano') . "}"]) + ->where('ativo', 1); + + $gradesCount = $query->count(); + + if ($gradesCount === 0) { + return redirect()->route('block-enrollment.edit')->withInput()->with('error', 'Nenhuma série da escola encontrada com os filtros selecionados'); + } + + if (empty($request->get('confirmation'))) { + return redirect()->route('block-enrollment.edit')->withInput()->with('show-confirmation', $gradesCount); + } + + try { + DB::beginTransaction(); + $query->update([ + 'bloquear_enturmacao_sem_vagas' => $request->get('bloquear_enturmacao_sem_vagas'), + 'updated_at' => now() + ]); + DB::commit(); + session()->flash('success', 'Atualização em lote efetuada com sucesso.'); + } catch (Exception) { + DB::rollBack(); + session()->flash('error', 'Atualização em lote não realizada.'); + } + + return redirect()->route('block-enrollment.edit'); + } + + public function edit() + { + $this->menu(Process::BLOCK_ENROLLMENT); + $this->breadcrumb('Bloquear enturmação em lote', [ + url('/intranet/educar_configuracoes_index.php') => 'Configurações', + ]); + + return view('block-enrollment.edit', ['user' => request()->user()]); + } +} diff --git a/app/Http/Requests/BlockEnrollmentRequest.php b/app/Http/Requests/BlockEnrollmentRequest.php new file mode 100644 index 0000000000..bb5cc8a82f --- /dev/null +++ b/app/Http/Requests/BlockEnrollmentRequest.php @@ -0,0 +1,24 @@ +merge([ + 'bloquear_enturmacao_sem_vagas' => $this->has('bloquear_enturmacao_sem_vagas') ? 1 : 0, + ]); + } + + public function rules() + { + return [ + 'ano' => ['required','integer'], + 'ref_cod_instituicao' => ['required','integer'], + 'bloquear_enturmacao_sem_vagas' => ['required','in:0,1'], + ]; + } +} diff --git a/app/Models/LegacySchoolGrade.php b/app/Models/LegacySchoolGrade.php index b744169cad..3bbb367bfd 100644 --- a/app/Models/LegacySchoolGrade.php +++ b/app/Models/LegacySchoolGrade.php @@ -59,4 +59,9 @@ public function grade(): BelongsTo { return $this->belongsTo(LegacyGrade::class, 'ref_cod_serie'); } + + public function school(): BelongsTo + { + return $this->belongsTo(LegacySchool::class, 'ref_cod_escola'); + } } diff --git a/app/Process.php b/app/Process.php index afc7c8e464..1af17d301e 100644 --- a/app/Process.php +++ b/app/Process.php @@ -77,4 +77,6 @@ class Process public const ACTIVE_LOOKING = 9998921; public const ANNOUNCEMENT = 9999114; + + public const BLOCK_ENROLLMENT = 9999115; } diff --git a/database/migrations/data/2024_10_30_223334_create_block_enrollment_menu_table.php b/database/migrations/data/2024_10_30_223334_create_block_enrollment_menu_table.php new file mode 100644 index 0000000000..74d9422a19 --- /dev/null +++ b/database/migrations/data/2024_10_30_223334_create_block_enrollment_menu_table.php @@ -0,0 +1,25 @@ +updateOrCreate(['old' => Process::BLOCK_ENROLLMENT], [ + 'parent_id' => Menu::query()->where('old', Process::CONFIGURATIONS_TOOLS)->firstOrFail()->getKey(), + 'process' => Process::BLOCK_ENROLLMENT, + 'title' => 'Bloquear enturmação em lote', + 'order' => 0, + 'parent_old' => Process::CONFIGURATIONS_TOOLS, + 'link' => '/bloquear-enturmacao', + ]); + } + + public function down(): void + { + Menu::query()->where('old', Process::BLOCK_ENROLLMENT)->delete(); + } +}; diff --git a/resources/views/block-enrollment/edit.blade.php b/resources/views/block-enrollment/edit.blade.php new file mode 100644 index 0000000000..811a7e708a --- /dev/null +++ b/resources/views/block-enrollment/edit.blade.php @@ -0,0 +1,136 @@ +@extends('layout.default') + +@push('styles') + + +@endpush + +@section('content') +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + @if(Session::has('show-confirmation')) + + @endif +@endsection + +@prepend('scripts') + + + + + + + + +@endprepend diff --git a/routes/web.php b/routes/web.php index e766917cd9..942fe858e3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -146,6 +146,9 @@ Route::get('/atualiza-data-entrada', 'UpdateRegistrationDateController@index')->middleware('can:view:' . Process::UPDATE_REGISTRATION_DATE)->name('update-registration-date.index'); Route::post('/atualiza-data-entrada', 'UpdateRegistrationDateController@updateStatus')->middleware('can:modify:' . Process::UPDATE_REGISTRATION_DATE)->name('update-registration-date.update-date'); + Route::get('/bloquear-enturmacao', 'BlockEnrollmentController@edit')->middleware('can:modify:' . Process::BLOCK_ENROLLMENT)->name('block-enrollment.edit'); + Route::post('/bloquear-enturmacao', 'BlockEnrollmentController@update')->middleware('can:modify:' . Process::BLOCK_ENROLLMENT)->name('block-enrollment.update'); + Route::get('/configuracoes/configuracoes-de-sistema', 'SettingController@index')->name('settings.index'); Route::post('/configuracoes/configuracoes-de-sistema', 'SettingController@saveInputs')->name('settings.update'); Route::get('/periodo-lancamento/excluir', 'ReleasePeriodController@delete')->name('release-period.delete'); From 1a961221efc813d5b46ee9e11a8944da7bf1a7b8 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Wed, 30 Oct 2024 17:25:50 -0300 Subject: [PATCH 25/33] =?UTF-8?q?Remove=20cast=20para=20inteiro=20na=20car?= =?UTF-8?q?ga=20hor=C3=A1ria=20dos=20hist=C3=B3ricos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/intranet/educar_historico_escolar_cad.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/ieducar/intranet/educar_historico_escolar_cad.php b/ieducar/intranet/educar_historico_escolar_cad.php index 907e1c10cb..3a67bf516c 100644 --- a/ieducar/intranet/educar_historico_escolar_cad.php +++ b/ieducar/intranet/educar_historico_escolar_cad.php @@ -319,7 +319,6 @@ public function Novo() $obj_permissoes = new clsPermissoes(); $obj_permissoes->permissao_cadastra(int_processo_ap: 578, int_idpes_usuario: $this->pessoa_logada, int_soma_nivel_acesso: 7, str_pagina_redirecionar: "educar_historico_escolar_lst.php?ref_cod_aluno={$this->ref_cod_aluno}"); - $this->carga_horaria = is_numeric($this->carga_horaria) ? intval($this->carga_horaria) : $this->carga_horaria; $this->frequencia = $this->fixupFrequencia($this->frequencia); $this->extra_curricular = is_null($this->extra_curricular) ? 0 : 1; @@ -392,7 +391,6 @@ public function Editar() $obj_permissoes = new clsPermissoes(); $obj_permissoes->permissao_cadastra(int_processo_ap: 578, int_idpes_usuario: $this->pessoa_logada, int_soma_nivel_acesso: 7, str_pagina_redirecionar: "educar_historico_escolar_lst.php?ref_cod_aluno={$this->ref_cod_aluno}"); - $this->carga_horaria = is_numeric($this->carga_horaria) ? (int) $this->carga_horaria : $this->carga_horaria; $this->frequencia = $this->fixupFrequencia($this->frequencia); $faltasGlobalizadas = $this->faltas_globalizadas; From 7202bbd079d4bea17da01506c0945b2b6ed5fa46 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Thu, 31 Oct 2024 14:19:32 -0300 Subject: [PATCH 26/33] =?UTF-8?q?Corrige=20atualiza=C3=A7=C3=A3o=20da=20si?= =?UTF-8?q?tua=C3=A7=C3=A3o=20de=20matr=C3=ADculas=20em=20lote?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/RegistrationService.php | 58 ++++++++++++++++++---------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/app/Services/RegistrationService.php b/app/Services/RegistrationService.php index a95ef450d9..48364412b6 100644 --- a/app/Services/RegistrationService.php +++ b/app/Services/RegistrationService.php @@ -4,11 +4,14 @@ use App\Models\LegacyEnrollment; use App\Models\LegacyRegistration; +use App\Models\LegacyRegistrationScore; use App\Models\LegacySchoolClass; use App\Models\LegacySchoolClassGrade; use App\Models\LegacyTransferRequest; use App\User; use App_Model_MatriculaSituacao; +use Avaliacao_Model_NotaAlunoDataMapper; +use Avaliacao_Model_NotaComponenteMediaDataMapper; use DateTime; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; @@ -95,30 +98,43 @@ private function checkUpdatedStatusAction($data, LegacyRegistration $registratio { $newStatus = $data['nova_situacao']; - if ($newStatus == App_Model_MatriculaSituacao::TRANSFERIDO) { - $this->markEnrollmentsAsTransferred($registration); - $this->createTransferRequest( - $data['transferencia_data'], - $data['transferencia_tipo'], - $data['transferencia_observacoes'], - $registration - ); - - $registration->data_cancel = DateTime::createFromFormat('d/m/Y', $data['transferencia_data']); - $registration->saveOrFail(); - } - - if ($newStatus == App_Model_MatriculaSituacao::RECLASSIFICADO) { - $this->markEnrollmentsAsReclassified($registration); + switch ($newStatus) { + case App_Model_MatriculaSituacao::TRANSFERIDO: + $this->markEnrollmentsAsTransferred($registration); + $this->createTransferRequest( + $data['transferencia_data'], + $data['transferencia_tipo'], + $data['transferencia_observacoes'], + $registration + ); + $registration->data_cancel = DateTime::createFromFormat('d/m/Y', $data['transferencia_data']); + $registration->saveOrFail(); + $this->processDisciplineScoreSituation($registration, $newStatus); + break; + + case App_Model_MatriculaSituacao::RECLASSIFICADO: + $this->markEnrollmentsAsReclassified($registration); + break; + + case App_Model_MatriculaSituacao::ABANDONO: + $this->markEnrollmentsAsAbandoned($registration); + $this->processDisciplineScoreSituation($registration, $newStatus); + break; + + case App_Model_MatriculaSituacao::FALECIDO: + $this->markEnrollmentsAsDeceased($registration); + $this->processDisciplineScoreSituation($registration, $newStatus); + break; } + } - if ($newStatus == App_Model_MatriculaSituacao::ABANDONO) { - $this->markEnrollmentsAsAbandoned($registration); - } + private function processDisciplineScoreSituation(LegacyRegistration $registration, $newStatus) + { + /* $registrationScoreId = $registration->registrationStores()->value('id'); - if ($newStatus == App_Model_MatriculaSituacao::FALECIDO) { - $this->markEnrollmentsAsDeceased($registration); - } + if ($registrationScoreId) { + (new Avaliacao_Model_NotaComponenteMediaDataMapper())->updateSituation($registrationScoreId, $newStatus); + }*/ } private function markEnrollmentsAsTransferred(LegacyRegistration $registration) From 31f8684df2f9948d47c8b384fd3bb72f7bd31174 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 4 Nov 2024 11:44:42 -0300 Subject: [PATCH 27/33] =?UTF-8?q?Incrementa=20vers=C3=A3o=20dos=20assets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/assets.php b/config/assets.php index 36741a50da..a893033015 100644 --- a/config/assets.php +++ b/config/assets.php @@ -14,7 +14,7 @@ | */ - 'version' => '0.1.103', + 'version' => '0.1.104', /* |-------------------------------------------------------------------------- From 35fd6c44a477ade610e932cafb1bba40da065c27 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Wed, 6 Nov 2024 13:04:09 -0300 Subject: [PATCH 28/33] =?UTF-8?q?Adiciona=20regra=20de=20aprovar=20pela=20?= =?UTF-8?q?frequ=C3=AAncia=20ap=C3=B3s=20exame=20na=20situa=C3=A7=C3=A3o?= =?UTF-8?q?=20da=20disciplina?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/modules/Avaliacao/Service/Boletim.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ieducar/modules/Avaliacao/Service/Boletim.php b/ieducar/modules/Avaliacao/Service/Boletim.php index df1b255493..d9f24127e1 100644 --- a/ieducar/modules/Avaliacao/Service/Boletim.php +++ b/ieducar/modules/Avaliacao/Service/Boletim.php @@ -988,7 +988,7 @@ public function getSituacaoNotas($calcularSituacaoAluno = false) } elseif ($etapa == $this->getOption('etapas') && $media < $this->getRegraAvaliacaoMedia()) { $situacaoGeral = App_Model_MatriculaSituacao::REPROVADO; } elseif ($etapa == 'Rc' && $media < $this->getRegraAvaliacaoMediaRecuperacao()) { - $situacaoGeral = App_Model_MatriculaSituacao::REPROVADO; + $situacaoGeral = $this->getRegraAvaliacaoAprovarPelaFrequenciaAposExame() ? App_Model_MatriculaSituacao::APROVADO_APOS_EXAME : App_Model_MatriculaSituacao::REPROVADO; } elseif ($etapa == 'Rc' && $media >= $this->getRegraAvaliacaoMediaRecuperacao() && $this->hasRegraAvaliacaoFormulaRecuperacao()) { $situacaoGeral = App_Model_MatriculaSituacao::APROVADO_APOS_EXAME; } elseif ($etapa < $this->getOption('etapas') && $etapa != 'Rc') { @@ -1096,7 +1096,7 @@ public function getSituacaoNotas($calcularSituacaoAluno = false) if ($this->hasRegraAvaliacaoReprovacaoAutomatica()) { $previsaoRecuperacao = $this->preverNotaRecuperacao($id); if (is_numeric($previsaoRecuperacao) && ($previsaoRecuperacao == '+' . $this->getRegraAvaliacaoNotaMaximaExameFinal())) { - $situacao->componentesCurriculares[$id]->situacao = App_Model_MatriculaSituacao::REPROVADO; + $situacao->componentesCurriculares[$id]->situacao = App_Model_MatriculaSituacao::APROVADO; if ($this->exibeSituacao($id)) { $qtdComponenteReprovado++; } @@ -1111,7 +1111,7 @@ public function getSituacaoNotas($calcularSituacaoAluno = false) if ($this->exibeSituacao($id)) { $qtdComponenteReprovado++; } - $situacao->componentesCurriculares[$id]->situacao = App_Model_MatriculaSituacao::REPROVADO; + $situacao->componentesCurriculares[$id]->situacao = $this->getRegraAvaliacaoAprovarPelaFrequenciaAposExame() ? App_Model_MatriculaSituacao::APROVADO_APOS_EXAME :App_Model_MatriculaSituacao::REPROVADO; } elseif ( (string) $etapa == 'Rc' && $media >= $this->getRegraAvaliacaoMediaRecuperacao() @@ -2699,7 +2699,6 @@ public function promover($novaSituacaoMatricula = null) // situação de todas as disciplinas e não só da que está sendo lançada $this->reloadComponentes(); $tipoProgressao = $this->getRegraAvaliacaoTipoProgressao(); - $aprovarPelaFrequenciaAposExame = $this->getRegraAvaliacaoAprovarPelaFrequenciaAposExame(); $situacaoMatricula = $this->getOption('aprovado'); $situacaoBoletim = $this->getSituacaoAluno(); @@ -2735,7 +2734,7 @@ public function promover($novaSituacaoMatricula = null) $novaSituacaoMatricula = App_Model_MatriculaSituacao::REPROVADO_POR_FALTAS; } } else { - $novaSituacaoMatricula = $aprovarPelaFrequenciaAposExame ? App_Model_MatriculaSituacao::APROVADO : App_Model_MatriculaSituacao::REPROVADO; + $novaSituacaoMatricula = $this->getRegraAvaliacaoAprovarPelaFrequenciaAposExame() ? App_Model_MatriculaSituacao::APROVADO : App_Model_MatriculaSituacao::REPROVADO; } } } @@ -2753,7 +2752,7 @@ public function promover($novaSituacaoMatricula = null) } } else { if (!$situacaoBoletim->aprovado) { - $novaSituacaoMatricula = $aprovarPelaFrequenciaAposExame ? App_Model_MatriculaSituacao::APROVADO : App_Model_MatriculaSituacao::REPROVADO; + $novaSituacaoMatricula = $this->getRegraAvaliacaoAprovarPelaFrequenciaAposExame() ? App_Model_MatriculaSituacao::APROVADO : App_Model_MatriculaSituacao::REPROVADO; } else { $novaSituacaoMatricula = App_Model_MatriculaSituacao::APROVADO; } From 033b835ee4466be060d7ae9ee9e9cf112cf434e6 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Thu, 7 Nov 2024 12:54:20 -0300 Subject: [PATCH 29/33] =?UTF-8?q?Atualiza=20vers=C3=A3o=20dos=20assets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/assets.php b/config/assets.php index 3d98f84b29..5ce78cb2d4 100644 --- a/config/assets.php +++ b/config/assets.php @@ -14,7 +14,7 @@ | */ - 'version' => '0.1.100', + 'version' => '0.1.105', /* |-------------------------------------------------------------------------- From c17234a081b149b8ab12da1a451ce1c5fa7220a7 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Thu, 7 Nov 2024 15:46:26 -0300 Subject: [PATCH 30/33] =?UTF-8?q?Corrige=20situa=C3=A7=C3=A3o=20do=20compo?= =?UTF-8?q?nente=20curricular?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/modules/Avaliacao/Service/Boletim.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieducar/modules/Avaliacao/Service/Boletim.php b/ieducar/modules/Avaliacao/Service/Boletim.php index d9f24127e1..4f1076b7bc 100644 --- a/ieducar/modules/Avaliacao/Service/Boletim.php +++ b/ieducar/modules/Avaliacao/Service/Boletim.php @@ -1096,7 +1096,7 @@ public function getSituacaoNotas($calcularSituacaoAluno = false) if ($this->hasRegraAvaliacaoReprovacaoAutomatica()) { $previsaoRecuperacao = $this->preverNotaRecuperacao($id); if (is_numeric($previsaoRecuperacao) && ($previsaoRecuperacao == '+' . $this->getRegraAvaliacaoNotaMaximaExameFinal())) { - $situacao->componentesCurriculares[$id]->situacao = App_Model_MatriculaSituacao::APROVADO; + $situacao->componentesCurriculares[$id]->situacao = App_Model_MatriculaSituacao::REPROVADO; if ($this->exibeSituacao($id)) { $qtdComponenteReprovado++; } From 869bfc64dd4086fb661bc5e72449b9e03e589189 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 11 Nov 2024 17:32:08 -0300 Subject: [PATCH 31/33] =?UTF-8?q?Remove=20coment=C3=A1rio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/RegistrationService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Services/RegistrationService.php b/app/Services/RegistrationService.php index 48364412b6..7a07051b9f 100644 --- a/app/Services/RegistrationService.php +++ b/app/Services/RegistrationService.php @@ -130,11 +130,11 @@ private function checkUpdatedStatusAction($data, LegacyRegistration $registratio private function processDisciplineScoreSituation(LegacyRegistration $registration, $newStatus) { - /* $registrationScoreId = $registration->registrationStores()->value('id'); + $registrationScoreId = $registration->registrationStores()->value('id'); if ($registrationScoreId) { (new Avaliacao_Model_NotaComponenteMediaDataMapper())->updateSituation($registrationScoreId, $newStatus); - }*/ + } } private function markEnrollmentsAsTransferred(LegacyRegistration $registration) From aa91ed6f2d1e62faa9176281ce12dd6f278b2f7c Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Tue, 12 Nov 2024 17:00:14 -0300 Subject: [PATCH 32/33] Remove propriedade depreciada --- resources/views/announcement/publish/create.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/announcement/publish/create.blade.php b/resources/views/announcement/publish/create.blade.php index 14df837f25..8b863c057a 100644 --- a/resources/views/announcement/publish/create.blade.php +++ b/resources/views/announcement/publish/create.blade.php @@ -75,7 +75,7 @@ class="ml-5 fa fa-info-circle"> - Tipos de usuários que serão notificados + Tipos de usuários que serão notificados @include('form.select-user-type-multiple') From bd7926158eefd9aaa95e4e737016d120acec9f64 Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Tue, 12 Nov 2024 17:07:04 -0300 Subject: [PATCH 33/33] Atualiza o composer.lock --- composer.lock | 743 +++++++++++++++++++++++++------------------------- 1 file changed, 372 insertions(+), 371 deletions(-) diff --git a/composer.lock b/composer.lock index 74c51a15f2..4b29a83d07 100644 --- a/composer.lock +++ b/composer.lock @@ -60,16 +60,16 @@ }, { "name": "aws/aws-crt-php", - "version": "v1.2.6", + "version": "v1.2.7", "source": { "type": "git", "url": "https://github.com/awslabs/aws-crt-php.git", - "reference": "a63485b65b6b3367039306496d49737cf1995408" + "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/a63485b65b6b3367039306496d49737cf1995408", - "reference": "a63485b65b6b3367039306496d49737cf1995408", + "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/d71d9906c7bb63a28295447ba12e74723bd3730e", + "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e", "shasum": "" }, "require": { @@ -108,22 +108,22 @@ ], "support": { "issues": "https://github.com/awslabs/aws-crt-php/issues", - "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.6" + "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.7" }, - "time": "2024-06-13T17:21:28+00:00" + "time": "2024-10-18T22:15:13+00:00" }, { "name": "aws/aws-sdk-php", - "version": "3.324.1", + "version": "3.325.7", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "5b824a9b8015a38f18c53b023975c0f63c7bd3dc" + "reference": "55852104253172e66c3358bf4c35281bbd8622b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5b824a9b8015a38f18c53b023975c0f63c7bd3dc", - "reference": "5b824a9b8015a38f18c53b023975c0f63c7bd3dc", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/55852104253172e66c3358bf4c35281bbd8622b2", + "reference": "55852104253172e66c3358bf4c35281bbd8622b2", "shasum": "" }, "require": { @@ -206,9 +206,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.324.1" + "source": "https://github.com/aws/aws-sdk-php/tree/3.325.7" }, - "time": "2024-10-11T18:22:01+00:00" + "time": "2024-11-12T19:27:31+00:00" }, { "name": "aws/aws-sdk-php-laravel", @@ -982,20 +982,20 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.17.0", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c" + "reference": "cb56001e54359df7ae76dc522d08845dc741621b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c", - "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/cb56001e54359df7ae76dc522d08845dc741621b", + "reference": "cb56001e54359df7ae76dc522d08845dc741621b", "shasum": "" }, "require": { - "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" }, "require-dev": { "cerdic/css-tidy": "^1.7 || ^2.0", @@ -1037,9 +1037,9 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.18.0" }, - "time": "2023-11-17T15:01:25+00:00" + "time": "2024-11-01T03:51:45+00:00" }, { "name": "fruitcake/php-cors", @@ -1354,16 +1354,16 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8" + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", + "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "shasum": "" }, "require": { @@ -1417,7 +1417,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.3" + "source": "https://github.com/guzzle/promises/tree/2.0.4" }, "funding": [ { @@ -1433,7 +1433,7 @@ "type": "tidelift" } ], - "time": "2024-07-18T10:29:17+00:00" + "time": "2024-10-17T10:06:22+00:00" }, { "name": "guzzlehttp/psr7", @@ -1639,21 +1639,21 @@ }, { "name": "honeybadger-io/honeybadger-laravel", - "version": "v4.2.2", + "version": "v4.3.0", "source": { "type": "git", "url": "https://github.com/honeybadger-io/honeybadger-laravel.git", - "reference": "b96932cb21f7bf98e55775746ca83faff7425986" + "reference": "99b690eb37fdd405f320da3fd780856dee27d617" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/honeybadger-io/honeybadger-laravel/zipball/b96932cb21f7bf98e55775746ca83faff7425986", - "reference": "b96932cb21f7bf98e55775746ca83faff7425986", + "url": "https://api.github.com/repos/honeybadger-io/honeybadger-laravel/zipball/99b690eb37fdd405f320da3fd780856dee27d617", + "reference": "99b690eb37fdd405f320da3fd780856dee27d617", "shasum": "" }, "require": { "ext-json": "*", - "honeybadger-io/honeybadger-php": ">=2.19.5", + "honeybadger-io/honeybadger-php": ">=2.21.0", "illuminate/console": "^10.0|^11.0", "illuminate/support": "^10.0|^11.0", "monolog/monolog": "^2.0|^3.2", @@ -1707,22 +1707,22 @@ ], "support": { "issues": "https://github.com/honeybadger-io/honeybadger-laravel/issues", - "source": "https://github.com/honeybadger-io/honeybadger-laravel/tree/v4.2.2" + "source": "https://github.com/honeybadger-io/honeybadger-laravel/tree/v4.3.0" }, - "time": "2024-10-11T11:53:54+00:00" + "time": "2024-11-01T17:40:40+00:00" }, { "name": "honeybadger-io/honeybadger-php", - "version": "v2.19.5", + "version": "v2.21.0", "source": { "type": "git", "url": "https://github.com/honeybadger-io/honeybadger-php.git", - "reference": "a0cc4c22faaf76fad25601773cb2b6fa62a2220b" + "reference": "3d0b2674d236e8f958044b91c59fcef672256ec2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/honeybadger-io/honeybadger-php/zipball/a0cc4c22faaf76fad25601773cb2b6fa62a2220b", - "reference": "a0cc4c22faaf76fad25601773cb2b6fa62a2220b", + "url": "https://api.github.com/repos/honeybadger-io/honeybadger-php/zipball/3d0b2674d236e8f958044b91c59fcef672256ec2", + "reference": "3d0b2674d236e8f958044b91c59fcef672256ec2", "shasum": "" }, "require": { @@ -1773,9 +1773,9 @@ ], "support": { "issues": "https://github.com/honeybadger-io/honeybadger-php/issues", - "source": "https://github.com/honeybadger-io/honeybadger-php/tree/v2.19.5" + "source": "https://github.com/honeybadger-io/honeybadger-php/tree/v2.21.0" }, - "time": "2024-10-11T08:35:27+00:00" + "time": "2024-11-01T17:28:12+00:00" }, { "name": "intervention/image", @@ -1863,16 +1863,16 @@ }, { "name": "laravel/framework", - "version": "v11.27.2", + "version": "v11.31.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9" + "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9", - "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9", + "url": "https://api.github.com/repos/laravel/framework/zipball/365090ed2c68244e3141cdb5e247cdf3dfba2c40", + "reference": "365090ed2c68244e3141cdb5e247cdf3dfba2c40", "shasum": "" }, "require": { @@ -2068,20 +2068,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-10-09T04:17:35+00:00" + "time": "2024-11-12T15:36:15+00:00" }, { "name": "laravel/horizon", - "version": "v5.29.1", + "version": "v5.29.3", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "9f482f21c23ed01c2366d1157843165165579c23" + "reference": "a48d242759704e598242074daf0060bbeb6ed46d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/9f482f21c23ed01c2366d1157843165165579c23", - "reference": "9f482f21c23ed01c2366d1157843165165579c23", + "url": "https://api.github.com/repos/laravel/horizon/zipball/a48d242759704e598242074daf0060bbeb6ed46d", + "reference": "a48d242759704e598242074daf0060bbeb6ed46d", "shasum": "" }, "require": { @@ -2096,6 +2096,7 @@ "ramsey/uuid": "^4.0", "symfony/console": "^6.0|^7.0", "symfony/error-handler": "^6.0|^7.0", + "symfony/polyfill-php83": "^1.28", "symfony/process": "^6.0|^7.0" }, "require-dev": { @@ -2145,22 +2146,22 @@ ], "support": { "issues": "https://github.com/laravel/horizon/issues", - "source": "https://github.com/laravel/horizon/tree/v5.29.1" + "source": "https://github.com/laravel/horizon/tree/v5.29.3" }, - "time": "2024-10-08T18:23:02+00:00" + "time": "2024-11-07T21:51:45+00:00" }, { "name": "laravel/prompts", - "version": "v0.3.0", + "version": "v0.3.2", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "ea57a2261093986721d4a5f4f9524d76f21f9fa0" + "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/ea57a2261093986721d4a5f4f9524d76f21f9fa0", - "reference": "ea57a2261093986721d4a5f4f9524d76f21f9fa0", + "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f", + "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f", "shasum": "" }, "require": { @@ -2176,7 +2177,7 @@ "require-dev": { "illuminate/collections": "^10.0|^11.0", "mockery/mockery": "^1.5", - "pestphp/pest": "^2.3", + "pestphp/pest": "^2.3|^3.4", "phpstan/phpstan": "^1.11", "phpstan/phpstan-mockery": "^1.1" }, @@ -2204,9 +2205,9 @@ "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.3.0" + "source": "https://github.com/laravel/prompts/tree/v0.3.2" }, - "time": "2024-09-30T14:27:51+00:00" + "time": "2024-11-12T14:59:47+00:00" }, { "name": "laravel/sanctum", @@ -2274,16 +2275,16 @@ }, { "name": "laravel/serializable-closure", - "version": "v1.3.5", + "version": "v1.3.6", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c" + "reference": "f865a58ea3a0107c336b7045104c75243fa59d96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c", - "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f865a58ea3a0107c336b7045104c75243fa59d96", + "reference": "f865a58ea3a0107c336b7045104c75243fa59d96", "shasum": "" }, "require": { @@ -2331,7 +2332,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2024-09-23T13:33:08+00:00" + "time": "2024-11-11T17:06:04+00:00" }, { "name": "laravel/tinker", @@ -2652,16 +2653,16 @@ }, { "name": "league/csv", - "version": "9.17.0", + "version": "9.18.0", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011" + "reference": "b02d010e4055ae992247f6ffd1e7b103ef2a0790" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/8cab815fb11ec93aa2f7b8a57b3daa1f1a364011", - "reference": "8cab815fb11ec93aa2f7b8a57b3daa1f1a364011", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/b02d010e4055ae992247f6ffd1e7b103ef2a0790", + "reference": "b02d010e4055ae992247f6ffd1e7b103ef2a0790", "shasum": "" }, "require": { @@ -2673,11 +2674,11 @@ "ext-xdebug": "*", "friendsofphp/php-cs-fixer": "^3.64.0", "phpbench/phpbench": "^1.3.1", - "phpstan/phpstan": "^1.12.5", + "phpstan/phpstan": "^1.12.6", "phpstan/phpstan-deprecation-rules": "^1.2.1", "phpstan/phpstan-phpunit": "^1.4.0", "phpstan/phpstan-strict-rules": "^1.6.1", - "phpunit/phpunit": "^10.5.16 || ^11.4.0", + "phpunit/phpunit": "^10.5.16 || ^11.4.1", "symfony/var-dumper": "^6.4.8 || ^7.1.5" }, "suggest": { @@ -2735,7 +2736,7 @@ "type": "github" } ], - "time": "2024-10-10T10:30:28+00:00" + "time": "2024-10-18T08:14:48+00:00" }, { "name": "league/flysystem", @@ -3081,16 +3082,16 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.58", + "version": "3.1.60", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "18495a71b112f43af8ffab35111a58b4e4ba4a4d" + "reference": "4906dc57fbe6a41c405a77e1f7cac9078982c9c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/18495a71b112f43af8ffab35111a58b4e4ba4a4d", - "reference": "18495a71b112f43af8ffab35111a58b4e4ba4a4d", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/4906dc57fbe6a41c405a77e1f7cac9078982c9c7", + "reference": "4906dc57fbe6a41c405a77e1f7cac9078982c9c7", "shasum": "" }, "require": { @@ -3098,7 +3099,7 @@ "ext-json": "*", "illuminate/support": "5.8.*||^6.0||^7.0||^8.0||^9.0||^10.0||^11.0", "php": "^7.0||^8.0", - "phpoffice/phpspreadsheet": "^1.29.1", + "phpoffice/phpspreadsheet": "^1.29.4", "psr/simple-cache": "^1.0||^2.0||^3.0" }, "require-dev": { @@ -3146,7 +3147,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.58" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.60" }, "funding": [ { @@ -3158,7 +3159,7 @@ "type": "github" } ], - "time": "2024-09-07T13:53:36+00:00" + "time": "2024-11-11T12:27:45+00:00" }, { "name": "maennchen/zipstream-php", @@ -3346,16 +3347,16 @@ }, { "name": "monolog/monolog", - "version": "3.7.0", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8" + "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8", - "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67", + "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67", "shasum": "" }, "require": { @@ -3375,12 +3376,14 @@ "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "phpstan/phpstan": "^1.9", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-strict-rules": "^1.4", - "phpunit/phpunit": "^10.5.17", + "php-console/php-console": "^3.1.8", + "phpstan/phpstan": "^2", + "phpstan/phpstan-deprecation-rules": "^2", + "phpstan/phpstan-strict-rules": "^2", + "phpunit/phpunit": "^10.5.17 || ^11.0.7", "predis/predis": "^1.1 || ^2", - "ruflin/elastica": "^7", + "rollbar/rollbar": "^4.0", + "ruflin/elastica": "^7 || ^8", "symfony/mailer": "^5.4 || ^6", "symfony/mime": "^5.4 || ^6" }, @@ -3431,7 +3434,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.7.0" + "source": "https://github.com/Seldaek/monolog/tree/3.8.0" }, "funding": [ { @@ -3443,7 +3446,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:40:51+00:00" + "time": "2024-11-12T13:57:08+00:00" }, { "name": "mtdowling/jmespath.php", @@ -3513,20 +3516,20 @@ }, { "name": "nesbot/carbon", - "version": "3.8.0", + "version": "3.8.2", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f" + "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbd3eef89af8ba66a3aa7952b5439168fbcc529f", - "reference": "bbd3eef89af8ba66a3aa7952b5439168fbcc529f", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947", + "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947", "shasum": "" }, "require": { - "carbonphp/carbon-doctrine-types": "*", + "carbonphp/carbon-doctrine-types": "<100.0", "ext-json": "*", "php": "^8.1", "psr/clock": "^1.0", @@ -3615,7 +3618,7 @@ "type": "tidelift" } ], - "time": "2024-08-19T06:22:39+00:00" + "time": "2024-11-07T17:46:48+00:00" }, { "name": "nette/schema", @@ -3825,32 +3828,31 @@ }, { "name": "nunomaduro/termwind", - "version": "v2.1.0", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/termwind.git", - "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a" + "reference": "42c84e4e8090766bbd6445d06cd6e57650626ea3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/e5f21eade88689536c0cdad4c3cd75f3ed26e01a", - "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/42c84e4e8090766bbd6445d06cd6e57650626ea3", + "reference": "42c84e4e8090766bbd6445d06cd6e57650626ea3", "shasum": "" }, "require": { "ext-mbstring": "*", "php": "^8.2", - "symfony/console": "^7.0.4" + "symfony/console": "^7.1.5" }, "require-dev": { - "ergebnis/phpstan-rules": "^2.2.0", - "illuminate/console": "^11.1.1", - "laravel/pint": "^1.15.0", - "mockery/mockery": "^1.6.11", - "pestphp/pest": "^2.34.6", - "phpstan/phpstan": "^1.10.66", - "phpstan/phpstan-strict-rules": "^1.5.2", - "symfony/var-dumper": "^7.0.4", + "illuminate/console": "^11.28.0", + "laravel/pint": "^1.18.1", + "mockery/mockery": "^1.6.12", + "pestphp/pest": "^2.36.0", + "phpstan/phpstan": "^1.12.6", + "phpstan/phpstan-strict-rules": "^1.6.1", + "symfony/var-dumper": "^7.1.5", "thecodingmachine/phpstan-strict-rules": "^1.0.0" }, "type": "library", @@ -3893,7 +3895,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/termwind/issues", - "source": "https://github.com/nunomaduro/termwind/tree/v2.1.0" + "source": "https://github.com/nunomaduro/termwind/tree/v2.2.0" }, "funding": [ { @@ -3909,7 +3911,7 @@ "type": "github" } ], - "time": "2024-09-05T15:25:50+00:00" + "time": "2024-10-15T16:15:16+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -4030,16 +4032,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.29.2", + "version": "1.29.4", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "3a5a818d7d3e4b5bd2e56fb9de44dbded6eae07f" + "reference": "7ca7e325dca3adb6a598385aab81f527b8d6c75d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/3a5a818d7d3e4b5bd2e56fb9de44dbded6eae07f", - "reference": "3a5a818d7d3e4b5bd2e56fb9de44dbded6eae07f", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/7ca7e325dca3adb6a598385aab81f527b8d6c75d", + "reference": "7ca7e325dca3adb6a598385aab81f527b8d6c75d", "shasum": "" }, "require": { @@ -4129,9 +4131,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.2" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.4" }, - "time": "2024-09-29T07:04:47+00:00" + "time": "2024-11-10T16:26:22+00:00" }, { "name": "phpoption/phpoption", @@ -5196,16 +5198,16 @@ }, { "name": "staudenmeir/laravel-adjacency-list", - "version": "v1.22.2", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/staudenmeir/laravel-adjacency-list.git", - "reference": "3bdb2b294f678d5f18b25c401b24bfd9b4a5fbab" + "reference": "3c4c0d964e8e4f2669d0917917c87ad61d2f0017" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staudenmeir/laravel-adjacency-list/zipball/3bdb2b294f678d5f18b25c401b24bfd9b4a5fbab", - "reference": "3bdb2b294f678d5f18b25c401b24bfd9b4a5fbab", + "url": "https://api.github.com/repos/staudenmeir/laravel-adjacency-list/zipball/3c4c0d964e8e4f2669d0917917c87ad61d2f0017", + "reference": "3c4c0d964e8e4f2669d0917917c87ad61d2f0017", "shasum": "" }, "require": { @@ -5216,11 +5218,10 @@ }, "require-dev": { "barryvdh/laravel-ide-helper": "^3.0", - "harrygulliford/laravel-firebird": "dev-laravel-11.x", - "larastan/larastan": "^2.0", + "harrygulliford/laravel-firebird": "^3.3", + "larastan/larastan": "2.9.8", "mockery/mockery": "^1.5.1", "orchestra/testbench": "^9.0", - "phpstan/phpstan-mockery": "^1.1", "phpunit/phpunit": "^11.0", "singlestoredb/singlestoredb-laravel": "^1.5.4", "staudenmeir/eloquent-has-many-deep": "^1.20" @@ -5254,7 +5255,7 @@ "description": "Recursive Laravel Eloquent relationships with CTEs", "support": { "issues": "https://github.com/staudenmeir/laravel-adjacency-list/issues", - "source": "https://github.com/staudenmeir/laravel-adjacency-list/tree/v1.22.2" + "source": "https://github.com/staudenmeir/laravel-adjacency-list/tree/v1.23.1" }, "funding": [ { @@ -5262,7 +5263,7 @@ "type": "custom" } ], - "time": "2024-08-29T16:28:51+00:00" + "time": "2024-11-03T10:47:29+00:00" }, { "name": "staudenmeir/laravel-cte", @@ -5327,16 +5328,16 @@ }, { "name": "symfony/clock", - "version": "v7.1.1", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/clock.git", - "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7" + "reference": "97bebc53548684c17ed696bc8af016880f0f098d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/clock/zipball/3dfc8b084853586de51dd1441c6242c76a28cbe7", - "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7", + "url": "https://api.github.com/repos/symfony/clock/zipball/97bebc53548684c17ed696bc8af016880f0f098d", + "reference": "97bebc53548684c17ed696bc8af016880f0f098d", "shasum": "" }, "require": { @@ -5381,7 +5382,7 @@ "time" ], "support": { - "source": "https://github.com/symfony/clock/tree/v7.1.1" + "source": "https://github.com/symfony/clock/tree/v7.1.6" }, "funding": [ { @@ -5397,20 +5398,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/console", - "version": "v7.1.5", + "version": "v7.1.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee" + "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0fa539d12b3ccf068a722bbbffa07ca7079af9ee", - "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee", + "url": "https://api.github.com/repos/symfony/console/zipball/3284aafcac338b6e86fd955ee4d794cbe434151a", + "reference": "3284aafcac338b6e86fd955ee4d794cbe434151a", "shasum": "" }, "require": { @@ -5474,7 +5475,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.1.5" + "source": "https://github.com/symfony/console/tree/v7.1.7" }, "funding": [ { @@ -5490,20 +5491,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:28:38+00:00" + "time": "2024-11-05T15:34:55+00:00" }, { "name": "symfony/css-selector", - "version": "v7.1.1", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4" + "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/1c7cee86c6f812896af54434f8ce29c8d94f9ff4", - "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/4aa4f6b3d6749c14d3aa815eef8226632e7bbc66", + "reference": "4aa4f6b3d6749c14d3aa815eef8226632e7bbc66", "shasum": "" }, "require": { @@ -5539,7 +5540,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v7.1.1" + "source": "https://github.com/symfony/css-selector/tree/v7.1.6" }, "funding": [ { @@ -5555,7 +5556,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/deprecation-contracts", @@ -5626,16 +5627,16 @@ }, { "name": "symfony/error-handler", - "version": "v7.1.3", + "version": "v7.1.7", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "432bb369952795c61ca1def65e078c4a80dad13c" + "reference": "010e44661f4c6babaf8c4862fe68c24a53903342" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/432bb369952795c61ca1def65e078c4a80dad13c", - "reference": "432bb369952795c61ca1def65e078c4a80dad13c", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/010e44661f4c6babaf8c4862fe68c24a53903342", + "reference": "010e44661f4c6babaf8c4862fe68c24a53903342", "shasum": "" }, "require": { @@ -5681,7 +5682,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v7.1.3" + "source": "https://github.com/symfony/error-handler/tree/v7.1.7" }, "funding": [ { @@ -5697,20 +5698,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T13:02:51+00:00" + "time": "2024-11-05T15:34:55+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v7.1.1", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7" + "reference": "87254c78dd50721cfd015b62277a8281c5589702" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7", - "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87254c78dd50721cfd015b62277a8281c5589702", + "reference": "87254c78dd50721cfd015b62277a8281c5589702", "shasum": "" }, "require": { @@ -5761,7 +5762,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.1" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.6" }, "funding": [ { @@ -5777,7 +5778,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -5857,16 +5858,16 @@ }, { "name": "symfony/finder", - "version": "v7.1.4", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "d95bbf319f7d052082fb7af147e0f835a695e823" + "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/d95bbf319f7d052082fb7af147e0f835a695e823", - "reference": "d95bbf319f7d052082fb7af147e0f835a695e823", + "url": "https://api.github.com/repos/symfony/finder/zipball/2cb89664897be33f78c65d3d2845954c8d7a43b8", + "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8", "shasum": "" }, "require": { @@ -5901,7 +5902,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.1.4" + "source": "https://github.com/symfony/finder/tree/v7.1.6" }, "funding": [ { @@ -5917,20 +5918,20 @@ "type": "tidelift" } ], - "time": "2024-08-13T14:28:19+00:00" + "time": "2024-10-01T08:31:23+00:00" }, { "name": "symfony/http-client", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56" + "reference": "05d88cbd816ad6e0202edd9a9963cb9d615b8826" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", - "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", + "url": "https://api.github.com/repos/symfony/http-client/zipball/05d88cbd816ad6e0202edd9a9963cb9d615b8826", + "reference": "05d88cbd816ad6e0202edd9a9963cb9d615b8826", "shasum": "" }, "require": { @@ -5994,7 +5995,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.12" + "source": "https://github.com/symfony/http-client/tree/v6.4.14" }, "funding": [ { @@ -6010,7 +6011,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:21:33+00:00" + "time": "2024-11-05T16:39:55+00:00" }, { "name": "symfony/http-client-contracts", @@ -6092,16 +6093,16 @@ }, { "name": "symfony/http-foundation", - "version": "v7.1.5", + "version": "v7.1.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e30ef73b1e44eea7eb37ba69600a354e553f694b" + "reference": "5183b61657807099d98f3367bcccb850238b17a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e30ef73b1e44eea7eb37ba69600a354e553f694b", - "reference": "e30ef73b1e44eea7eb37ba69600a354e553f694b", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5183b61657807099d98f3367bcccb850238b17a9", + "reference": "5183b61657807099d98f3367bcccb850238b17a9", "shasum": "" }, "require": { @@ -6149,7 +6150,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.1.5" + "source": "https://github.com/symfony/http-foundation/tree/v7.1.7" }, "funding": [ { @@ -6165,20 +6166,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:28:38+00:00" + "time": "2024-11-06T09:02:46+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.1.5", + "version": "v7.1.7", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "44204d96150a9df1fc57601ec933d23fefc2d65b" + "reference": "7f137cda31fd41e422edcdc01915f2c095b84399" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/44204d96150a9df1fc57601ec933d23fefc2d65b", - "reference": "44204d96150a9df1fc57601ec933d23fefc2d65b", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7f137cda31fd41e422edcdc01915f2c095b84399", + "reference": "7f137cda31fd41e422edcdc01915f2c095b84399", "shasum": "" }, "require": { @@ -6263,7 +6264,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.1.5" + "source": "https://github.com/symfony/http-kernel/tree/v7.1.7" }, "funding": [ { @@ -6279,20 +6280,20 @@ "type": "tidelift" } ], - "time": "2024-09-21T06:09:21+00:00" + "time": "2024-11-06T09:54:34+00:00" }, { "name": "symfony/mailer", - "version": "v7.1.5", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "bbf21460c56f29810da3df3e206e38dfbb01e80b" + "reference": "69c9948451fb3a6a4d47dc8261d1794734e76cdd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/bbf21460c56f29810da3df3e206e38dfbb01e80b", - "reference": "bbf21460c56f29810da3df3e206e38dfbb01e80b", + "url": "https://api.github.com/repos/symfony/mailer/zipball/69c9948451fb3a6a4d47dc8261d1794734e76cdd", + "reference": "69c9948451fb3a6a4d47dc8261d1794734e76cdd", "shasum": "" }, "require": { @@ -6343,7 +6344,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v7.1.5" + "source": "https://github.com/symfony/mailer/tree/v7.1.6" }, "funding": [ { @@ -6359,20 +6360,20 @@ "type": "tidelift" } ], - "time": "2024-09-08T12:32:26+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/mailgun-mailer", - "version": "v6.4.10", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/mailgun-mailer.git", - "reference": "3eb7c7b644179a766f5d816620b7b6d4a4e7ec43" + "reference": "ad4e79798a5eb80af99004a4871b4fe5effe33a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/3eb7c7b644179a766f5d816620b7b6d4a4e7ec43", - "reference": "3eb7c7b644179a766f5d816620b7b6d4a4e7ec43", + "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/ad4e79798a5eb80af99004a4871b4fe5effe33a3", + "reference": "ad4e79798a5eb80af99004a4871b4fe5effe33a3", "shasum": "" }, "require": { @@ -6412,7 +6413,7 @@ "description": "Symfony Mailgun Mailer Bridge", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailgun-mailer/tree/v6.4.10" + "source": "https://github.com/symfony/mailgun-mailer/tree/v6.4.13" }, "funding": [ { @@ -6428,20 +6429,20 @@ "type": "tidelift" } ], - "time": "2024-07-04T11:16:22+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/mime", - "version": "v7.1.5", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff" + "reference": "caa1e521edb2650b8470918dfe51708c237f0598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/711d2e167e8ce65b05aea6b258c449671cdd38ff", - "reference": "711d2e167e8ce65b05aea6b258c449671cdd38ff", + "url": "https://api.github.com/repos/symfony/mime/zipball/caa1e521edb2650b8470918dfe51708c237f0598", + "reference": "caa1e521edb2650b8470918dfe51708c237f0598", "shasum": "" }, "require": { @@ -6496,7 +6497,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v7.1.5" + "source": "https://github.com/symfony/mime/tree/v7.1.6" }, "funding": [ { @@ -6512,7 +6513,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:28:38+00:00" + "time": "2024-10-25T15:11:02+00:00" }, { "name": "symfony/polyfill-ctype", @@ -7152,16 +7153,16 @@ }, { "name": "symfony/process", - "version": "v7.1.5", + "version": "v7.1.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "5c03ee6369281177f07f7c68252a280beccba847" + "reference": "9b8a40b7289767aa7117e957573c2a535efe6585" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/5c03ee6369281177f07f7c68252a280beccba847", - "reference": "5c03ee6369281177f07f7c68252a280beccba847", + "url": "https://api.github.com/repos/symfony/process/zipball/9b8a40b7289767aa7117e957573c2a535efe6585", + "reference": "9b8a40b7289767aa7117e957573c2a535efe6585", "shasum": "" }, "require": { @@ -7193,7 +7194,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.1.5" + "source": "https://github.com/symfony/process/tree/v7.1.7" }, "funding": [ { @@ -7209,20 +7210,20 @@ "type": "tidelift" } ], - "time": "2024-09-19T21:48:23+00:00" + "time": "2024-11-06T09:25:12+00:00" }, { "name": "symfony/routing", - "version": "v7.1.4", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "1500aee0094a3ce1c92626ed8cf3c2037e86f5a7" + "reference": "66a2c469f6c22d08603235c46a20007c0701ea0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/1500aee0094a3ce1c92626ed8cf3c2037e86f5a7", - "reference": "1500aee0094a3ce1c92626ed8cf3c2037e86f5a7", + "url": "https://api.github.com/repos/symfony/routing/zipball/66a2c469f6c22d08603235c46a20007c0701ea0a", + "reference": "66a2c469f6c22d08603235c46a20007c0701ea0a", "shasum": "" }, "require": { @@ -7274,7 +7275,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v7.1.4" + "source": "https://github.com/symfony/routing/tree/v7.1.6" }, "funding": [ { @@ -7290,7 +7291,7 @@ "type": "tidelift" } ], - "time": "2024-08-29T08:16:25+00:00" + "time": "2024-10-01T08:31:23+00:00" }, { "name": "symfony/service-contracts", @@ -7377,16 +7378,16 @@ }, { "name": "symfony/string", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b" + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f8a1ccebd0997e16112dfecfd74220b78e5b284b", - "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b", + "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", "shasum": "" }, "require": { @@ -7443,7 +7444,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.12" + "source": "https://github.com/symfony/string/tree/v6.4.13" }, "funding": [ { @@ -7459,20 +7460,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:15:52+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/translation", - "version": "v7.1.5", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea" + "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/235535e3f84f3dfbdbde0208ede6ca75c3a489ea", - "reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea", + "url": "https://api.github.com/repos/symfony/translation/zipball/b9f72ab14efdb6b772f85041fa12f820dee8d55f", + "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f", "shasum": "" }, "require": { @@ -7537,7 +7538,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.1.5" + "source": "https://github.com/symfony/translation/tree/v7.1.6" }, "funding": [ { @@ -7553,7 +7554,7 @@ "type": "tidelift" } ], - "time": "2024-09-16T06:30:38+00:00" + "time": "2024-09-28T12:35:13+00:00" }, { "name": "symfony/translation-contracts", @@ -7635,16 +7636,16 @@ }, { "name": "symfony/uid", - "version": "v7.1.5", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/uid.git", - "reference": "8c7bb8acb933964055215d89f9a9871df0239317" + "reference": "65befb3bb2d503bbffbd08c815aa38b472999917" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/uid/zipball/8c7bb8acb933964055215d89f9a9871df0239317", - "reference": "8c7bb8acb933964055215d89f9a9871df0239317", + "url": "https://api.github.com/repos/symfony/uid/zipball/65befb3bb2d503bbffbd08c815aa38b472999917", + "reference": "65befb3bb2d503bbffbd08c815aa38b472999917", "shasum": "" }, "require": { @@ -7689,7 +7690,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/uid/tree/v7.1.5" + "source": "https://github.com/symfony/uid/tree/v7.1.6" }, "funding": [ { @@ -7705,20 +7706,20 @@ "type": "tidelift" } ], - "time": "2024-09-17T09:16:35+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.1.5", + "version": "v7.1.7", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e20e03889539fd4e4211e14d2179226c513c010d" + "reference": "f6ea51f669760cacd7464bf7eaa0be87b8072db1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e20e03889539fd4e4211e14d2179226c513c010d", - "reference": "e20e03889539fd4e4211e14d2179226c513c010d", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f6ea51f669760cacd7464bf7eaa0be87b8072db1", + "reference": "f6ea51f669760cacd7464bf7eaa0be87b8072db1", "shasum": "" }, "require": { @@ -7772,7 +7773,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.1.5" + "source": "https://github.com/symfony/var-dumper/tree/v7.1.7" }, "funding": [ { @@ -7788,7 +7789,7 @@ "type": "tidelift" } ], - "time": "2024-09-16T10:07:02+00:00" + "time": "2024-11-05T15:34:55+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8063,16 +8064,16 @@ "packages-dev": [ { "name": "brianium/paratest", - "version": "v7.4.3", + "version": "v7.4.8", "source": { "type": "git", "url": "https://github.com/paratestphp/paratest.git", - "reference": "64fcfd0e28a6b8078a19dbf9127be2ee645b92ec" + "reference": "cf16fcbb9b8107a7df6b97e497fc91e819774d8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paratestphp/paratest/zipball/64fcfd0e28a6b8078a19dbf9127be2ee645b92ec", - "reference": "64fcfd0e28a6b8078a19dbf9127be2ee645b92ec", + "url": "https://api.github.com/repos/paratestphp/paratest/zipball/cf16fcbb9b8107a7df6b97e497fc91e819774d8b", + "reference": "cf16fcbb9b8107a7df6b97e497fc91e819774d8b", "shasum": "" }, "require": { @@ -8080,31 +8081,30 @@ "ext-pcre": "*", "ext-reflection": "*", "ext-simplexml": "*", - "fidry/cpu-core-counter": "^1.1.0", - "jean85/pretty-package-versions": "^2.0.5", - "php": "~8.2.0 || ~8.3.0", - "phpunit/php-code-coverage": "^10.1.11 || ^11.0.0", - "phpunit/php-file-iterator": "^4.1.0 || ^5.0.0", - "phpunit/php-timer": "^6.0.0 || ^7.0.0", - "phpunit/phpunit": "^10.5.9 || ^11.0.3", - "sebastian/environment": "^6.0.1 || ^7.0.0", - "symfony/console": "^6.4.3 || ^7.0.3", - "symfony/process": "^6.4.3 || ^7.0.3" + "fidry/cpu-core-counter": "^1.2.0", + "jean85/pretty-package-versions": "^2.0.6", + "php": "~8.2.0 || ~8.3.0 || ~8.4.0", + "phpunit/php-code-coverage": "^10.1.16", + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/php-timer": "^6.0.0", + "phpunit/phpunit": "^10.5.36", + "sebastian/environment": "^6.1.0", + "symfony/console": "^6.4.7 || ^7.1.5", + "symfony/process": "^6.4.7 || ^7.1.5" }, "require-dev": { "doctrine/coding-standard": "^12.0.0", "ext-pcov": "*", "ext-posix": "*", - "phpstan/phpstan": "^1.10.58", - "phpstan/phpstan-deprecation-rules": "^1.1.4", - "phpstan/phpstan-phpunit": "^1.3.15", - "phpstan/phpstan-strict-rules": "^1.5.2", - "squizlabs/php_codesniffer": "^3.9.0", - "symfony/filesystem": "^6.4.3 || ^7.0.3" + "phpstan/phpstan": "^1.12.6", + "phpstan/phpstan-deprecation-rules": "^1.2.1", + "phpstan/phpstan-phpunit": "^1.4.0", + "phpstan/phpstan-strict-rules": "^1.6.1", + "squizlabs/php_codesniffer": "^3.10.3", + "symfony/filesystem": "^6.4.3 || ^7.1.5" }, "bin": [ "bin/paratest", - "bin/paratest.bat", "bin/paratest_for_phpstorm" ], "type": "library", @@ -8141,7 +8141,7 @@ ], "support": { "issues": "https://github.com/paratestphp/paratest/issues", - "source": "https://github.com/paratestphp/paratest/tree/v7.4.3" + "source": "https://github.com/paratestphp/paratest/tree/v7.4.8" }, "funding": [ { @@ -8153,7 +8153,7 @@ "type": "paypal" } ], - "time": "2024-02-20T07:24:02+00:00" + "time": "2024-10-15T12:45:19+00:00" }, { "name": "doctrine/deprecations", @@ -8204,16 +8204,16 @@ }, { "name": "fakerphp/faker", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b" + "reference": "a136842a532bac9ecd8a1c723852b09915d7db50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b", - "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/a136842a532bac9ecd8a1c723852b09915d7db50", + "reference": "a136842a532bac9ecd8a1c723852b09915d7db50", "shasum": "" }, "require": { @@ -8261,9 +8261,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1" + "source": "https://github.com/FakerPHP/Faker/tree/v1.24.0" }, - "time": "2024-01-02T13:46:09+00:00" + "time": "2024-11-07T15:11:20+00:00" }, { "name": "fidry/cpu-core-counter", @@ -8575,16 +8575,16 @@ }, { "name": "laravel/sail", - "version": "v1.35.0", + "version": "v1.38.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "992bc2d9e52174c79515967f30849d21daa334d8" + "reference": "d17abae06661dd6c46d13627b1683a2924259145" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/992bc2d9e52174c79515967f30849d21daa334d8", - "reference": "992bc2d9e52174c79515967f30849d21daa334d8", + "url": "https://api.github.com/repos/laravel/sail/zipball/d17abae06661dd6c46d13627b1683a2924259145", + "reference": "d17abae06661dd6c46d13627b1683a2924259145", "shasum": "" }, "require": { @@ -8634,20 +8634,20 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2024-10-08T14:45:26+00:00" + "time": "2024-11-11T20:16:51+00:00" }, { "name": "laravel/telescope", - "version": "v5.2.2", + "version": "v5.2.5", "source": { "type": "git", "url": "https://github.com/laravel/telescope.git", - "reference": "daaf95dee9fab2dd80f59b5f6611c6c0eff44878" + "reference": "f68386a8d816c9e3a011b8301bfd263213bf00d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/daaf95dee9fab2dd80f59b5f6611c6c0eff44878", - "reference": "daaf95dee9fab2dd80f59b5f6611c6c0eff44878", + "url": "https://api.github.com/repos/laravel/telescope/zipball/f68386a8d816c9e3a011b8301bfd263213bf00d4", + "reference": "f68386a8d816c9e3a011b8301bfd263213bf00d4", "shasum": "" }, "require": { @@ -8701,9 +8701,9 @@ ], "support": { "issues": "https://github.com/laravel/telescope/issues", - "source": "https://github.com/laravel/telescope/tree/v5.2.2" + "source": "https://github.com/laravel/telescope/tree/v5.2.5" }, - "time": "2024-08-26T12:40:52+00:00" + "time": "2024-10-31T17:06:07+00:00" }, { "name": "mockery/mockery", @@ -8790,16 +8790,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", "shasum": "" }, "require": { @@ -8838,7 +8838,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" }, "funding": [ { @@ -8846,27 +8846,27 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:39:25+00:00" + "time": "2024-11-08T17:47:46+00:00" }, { "name": "nunomaduro/collision", - "version": "v8.4.0", + "version": "v8.5.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a" + "reference": "f5c101b929c958e849a633283adff296ed5f38f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/e7d1aa8ed753f63fa816932bbc89678238843b4a", - "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f5c101b929c958e849a633283adff296ed5f38f5", + "reference": "f5c101b929c958e849a633283adff296ed5f38f5", "shasum": "" }, "require": { - "filp/whoops": "^2.15.4", - "nunomaduro/termwind": "^2.0.1", + "filp/whoops": "^2.16.0", + "nunomaduro/termwind": "^2.1.0", "php": "^8.2.0", - "symfony/console": "^7.1.3" + "symfony/console": "^7.1.5" }, "conflict": { "laravel/framework": "<11.0.0 || >=12.0.0", @@ -8874,14 +8874,14 @@ }, "require-dev": { "larastan/larastan": "^2.9.8", - "laravel/framework": "^11.19.0", - "laravel/pint": "^1.17.1", - "laravel/sail": "^1.31.0", - "laravel/sanctum": "^4.0.2", - "laravel/tinker": "^2.9.0", - "orchestra/testbench-core": "^9.2.3", - "pestphp/pest": "^2.35.0 || ^3.0.0", - "sebastian/environment": "^6.1.0 || ^7.0.0" + "laravel/framework": "^11.28.0", + "laravel/pint": "^1.18.1", + "laravel/sail": "^1.36.0", + "laravel/sanctum": "^4.0.3", + "laravel/tinker": "^2.10.0", + "orchestra/testbench-core": "^9.5.3", + "pestphp/pest": "^2.36.0 || ^3.4.0", + "sebastian/environment": "^6.1.0 || ^7.2.0" }, "type": "library", "extra": { @@ -8943,40 +8943,41 @@ "type": "patreon" } ], - "time": "2024-08-03T15:32:23+00:00" + "time": "2024-10-15T16:06:32+00:00" }, { "name": "pestphp/pest", - "version": "v2.35.1", + "version": "v2.36.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest.git", - "reference": "b13acb630df52c06123588d321823c31fc685545" + "reference": "f8c88bd14dc1772bfaf02169afb601ecdf2724cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest/zipball/b13acb630df52c06123588d321823c31fc685545", - "reference": "b13acb630df52c06123588d321823c31fc685545", + "url": "https://api.github.com/repos/pestphp/pest/zipball/f8c88bd14dc1772bfaf02169afb601ecdf2724cd", + "reference": "f8c88bd14dc1772bfaf02169afb601ecdf2724cd", "shasum": "" }, "require": { "brianium/paratest": "^7.3.1", - "nunomaduro/collision": "^7.10.0|^8.4.0", - "nunomaduro/termwind": "^1.15.1|^2.0.1", + "nunomaduro/collision": "^7.11.0|^8.4.0", + "nunomaduro/termwind": "^1.16.0|^2.1.0", "pestphp/pest-plugin": "^2.1.1", "pestphp/pest-plugin-arch": "^2.7.0", "php": "^8.1.0", - "phpunit/phpunit": "^10.5.17" + "phpunit/phpunit": "^10.5.36" }, "conflict": { - "phpunit/phpunit": ">10.5.17", + "filp/whoops": "<2.16.0", + "phpunit/phpunit": ">10.5.36", "sebastian/exporter": "<5.1.0", "webmozart/assert": "<1.11.0" }, "require-dev": { - "pestphp/pest-dev-tools": "^2.16.0", - "pestphp/pest-plugin-type-coverage": "^2.8.5", - "symfony/process": "^6.4.0|^7.1.3" + "pestphp/pest-dev-tools": "^2.17.0", + "pestphp/pest-plugin-type-coverage": "^2.8.7", + "symfony/process": "^6.4.0|^7.1.5" }, "bin": [ "bin/pest" @@ -9039,7 +9040,7 @@ ], "support": { "issues": "https://github.com/pestphp/pest/issues", - "source": "https://github.com/pestphp/pest/tree/v2.35.1" + "source": "https://github.com/pestphp/pest/tree/v2.36.0" }, "funding": [ { @@ -9051,7 +9052,7 @@ "type": "github" } ], - "time": "2024-08-20T21:41:50+00:00" + "time": "2024-10-15T15:30:56+00:00" }, { "name": "pestphp/pest-plugin", @@ -9367,16 +9368,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.4.1", + "version": "5.6.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3558a4c23426d12bffeaab463f8a8d8b681193c", + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c", "shasum": "" }, "require": { @@ -9385,17 +9386,17 @@ "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", "phpdocumentor/type-resolver": "^1.7", - "phpstan/phpdoc-parser": "^1.7", + "phpstan/phpdoc-parser": "^1.7|^2.0", "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.5", + "mockery/mockery": "~1.3.5 || ~1.6.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8", "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-webmozart-assert": "^1.2", "phpunit/phpunit": "^9.5", - "vimeo/psalm": "^5.13" + "psalm/phar": "^5.26" }, "type": "library", "extra": { @@ -9425,29 +9426,29 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.0" }, - "time": "2024-05-21T05:55:05+00:00" + "time": "2024-11-12T11:25:25+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.2", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "153ae662783729388a584b4361f2545e4d841e3c" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", - "reference": "153ae662783729388a584b4361f2545e4d841e3c", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.13" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -9483,36 +9484,36 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, - "time": "2024-02-23T11:10:43+00:00" + "time": "2024-11-09T15:12:26+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.32.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4" + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299", + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "doctrine/annotations": "^2.0", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^5.3.0", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^9.6", "symfony/process": "^5.2" }, "type": "library", @@ -9530,9 +9531,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0" }, - "time": "2024-09-26T07:23:32+00:00" + "time": "2024-10-13T11:29:49+00:00" }, { "name": "phpunit/php-code-coverage", @@ -9857,16 +9858,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.17", + "version": "10.5.36", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c1f736a473d21957ead7e94fcc029f571895abf5" + "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c1f736a473d21957ead7e94fcc029f571895abf5", - "reference": "c1f736a473d21957ead7e94fcc029f571895abf5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870", + "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870", "shasum": "" }, "require": { @@ -9876,26 +9877,26 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=8.1", - "phpunit/php-code-coverage": "^10.1.5", - "phpunit/php-file-iterator": "^4.0", - "phpunit/php-invoker": "^4.0", - "phpunit/php-text-template": "^3.0", - "phpunit/php-timer": "^6.0", - "sebastian/cli-parser": "^2.0", - "sebastian/code-unit": "^2.0", - "sebastian/comparator": "^5.0", - "sebastian/diff": "^5.0", - "sebastian/environment": "^6.0", - "sebastian/exporter": "^5.1", - "sebastian/global-state": "^6.0.1", - "sebastian/object-enumerator": "^5.0", - "sebastian/recursion-context": "^5.0", - "sebastian/type": "^4.0", - "sebastian/version": "^4.0" + "phpunit/php-code-coverage": "^10.1.16", + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/php-invoker": "^4.0.0", + "phpunit/php-text-template": "^3.0.1", + "phpunit/php-timer": "^6.0.0", + "sebastian/cli-parser": "^2.0.1", + "sebastian/code-unit": "^2.0.0", + "sebastian/comparator": "^5.0.2", + "sebastian/diff": "^5.1.1", + "sebastian/environment": "^6.1.0", + "sebastian/exporter": "^5.1.2", + "sebastian/global-state": "^6.0.2", + "sebastian/object-enumerator": "^5.0.0", + "sebastian/recursion-context": "^5.0.0", + "sebastian/type": "^4.0.0", + "sebastian/version": "^4.0.1" }, "suggest": { "ext-soap": "To be able to generate mocks based on WSDL files" @@ -9938,7 +9939,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.17" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.36" }, "funding": [ { @@ -9954,7 +9955,7 @@ "type": "tidelift" } ], - "time": "2024-04-05T04:39:01+00:00" + "time": "2024-10-08T15:36:51+00:00" }, { "name": "sebastian/cli-parser", @@ -10126,16 +10127,16 @@ }, { "name": "sebastian/comparator", - "version": "5.0.2", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53" + "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", - "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", + "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", "shasum": "" }, "require": { @@ -10146,7 +10147,7 @@ "sebastian/exporter": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^10.4" + "phpunit/phpunit": "^10.5" }, "type": "library", "extra": { @@ -10191,7 +10192,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2" + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3" }, "funding": [ { @@ -10199,7 +10200,7 @@ "type": "github" } ], - "time": "2024-08-12T06:03:08+00:00" + "time": "2024-10-18T14:56:07+00:00" }, { "name": "sebastian/complexity", @@ -11254,16 +11255,16 @@ }, { "name": "symfony/yaml", - "version": "v7.1.5", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "4e561c316e135e053bd758bf3b3eb291d9919de4" + "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/4e561c316e135e053bd758bf3b3eb291d9919de4", - "reference": "4e561c316e135e053bd758bf3b3eb291d9919de4", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3ced3f29e4f0d6bce2170ff26719f1fe9aacc671", + "reference": "3ced3f29e4f0d6bce2170ff26719f1fe9aacc671", "shasum": "" }, "require": { @@ -11305,7 +11306,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.1.5" + "source": "https://github.com/symfony/yaml/tree/v7.1.6" }, "funding": [ { @@ -11321,7 +11322,7 @@ "type": "tidelift" } ], - "time": "2024-09-17T12:49:58+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "ta-tikoma/phpunit-architecture-test",