From b8279e25dc2772d82cf687058e225f3cc7f4fc55 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Mon, 4 Dec 2023 15:49:31 -0300 Subject: [PATCH 01/47] =?UTF-8?q?Remove=20depend=C3=AAncias=20de=20desenvo?= =?UTF-8?q?lvimento?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 9 +- composer.lock | 2132 ++++++++++++++++++++++++------------------------- 2 files changed, 1046 insertions(+), 1095 deletions(-) diff --git a/composer.json b/composer.json index ace3379c93..5391b6c17e 100644 --- a/composer.json +++ b/composer.json @@ -50,16 +50,13 @@ "symfony/mailgun-mailer": "^6.0" }, "require-dev": { - "beyondcode/laravel-dump-server": "^1.7", - "brianium/paratest": "^7.0", "fakerphp/faker": "^1.15", - "filp/whoops": "^2.14", "laravel/pint": "^1.10", - "laravel/sail": "^1.0", + "laravel/sail": "^1.18", "laravel/telescope": "^4.7", - "mockery/mockery": "^1.4.3", + "mockery/mockery": "^1.4.4", "nunomaduro/collision": "^7.0", - "phpunit/phpunit": "10.2.1", + "phpunit/phpunit": "^10.1", "spatie/laravel-ignition": "^2.0", "uderline/openapi-php-attributes": "^1.5" }, diff --git a/composer.lock b/composer.lock index b098281110..f9c2fa6e78 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": "174d445234c9d177bbde1398869d435c", + "content-hash": "a5035fe78375d52b99fd98fb3d326f2e", "packages": [ { "name": "ankurk91/laravel-eloquent-relationships", @@ -60,16 +60,16 @@ }, { "name": "aws/aws-crt-php", - "version": "v1.2.1", + "version": "v1.2.4", "source": { "type": "git", "url": "https://github.com/awslabs/aws-crt-php.git", - "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5" + "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5", - "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5", + "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/eb0c6e4e142224a10b08f49ebf87f32611d162b2", + "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2", "shasum": "" }, "require": { @@ -108,35 +108,35 @@ ], "support": { "issues": "https://github.com/awslabs/aws-crt-php/issues", - "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.1" + "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.4" }, - "time": "2023-03-24T20:22:19+00:00" + "time": "2023-11-08T00:42:13+00:00" }, { "name": "aws/aws-sdk-php", - "version": "3.275.8", + "version": "3.293.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "18ebb727039c974aa9e997772486b2c869ec2bb6" + "reference": "1d3e952ea2f45bb0d42d7f873d1b4957bb6362c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/18ebb727039c974aa9e997772486b2c869ec2bb6", - "reference": "18ebb727039c974aa9e997772486b2c869ec2bb6", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1d3e952ea2f45bb0d42d7f873d1b4957bb6362c4", + "reference": "1d3e952ea2f45bb0d42d7f873d1b4957bb6362c4", "shasum": "" }, "require": { - "aws/aws-crt-php": "^1.0.4", + "aws/aws-crt-php": "^1.2.3", "ext-json": "*", "ext-pcre": "*", "ext-simplexml": "*", "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", - "guzzlehttp/promises": "^1.4.0", + "guzzlehttp/promises": "^1.4.0 || ^2.0", "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "mtdowling/jmespath.php": "^2.6", - "php": ">=5.5", - "psr/http-message": "^1.0" + "php": ">=7.2.5", + "psr/http-message": "^1.0 || ^2.0" }, "require-dev": { "andrewsville/php-token-reflection": "^1.4", @@ -151,7 +151,7 @@ "ext-sockets": "*", "nette/neon": "^2.3", "paragonie/random_compat": ">= 2", - "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5", + "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5", "psr/cache": "^1.0", "psr/simple-cache": "^1.0", "sebastian/comparator": "^1.2.3 || ^4.0", @@ -203,9 +203,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.275.8" + "source": "https://github.com/aws/aws-sdk-php/tree/3.293.2" }, - "time": "2023-07-17T18:32:24+00:00" + "time": "2023-12-01T19:06:15+00:00" }, { "name": "aws/aws-sdk-php-laravel", @@ -339,18 +339,87 @@ ], "time": "2023-01-15T23:15:59+00:00" }, + { + "name": "carbonphp/carbon-doctrine-types", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git", + "reference": "67a77972b9f398ae7068dabacc39c08aeee170d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/67a77972b9f398ae7068dabacc39c08aeee170d5", + "reference": "67a77972b9f398ae7068dabacc39c08aeee170d5", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "conflict": { + "doctrine/dbal": "<3.7.0 || >=4.0.0" + }, + "require-dev": { + "doctrine/dbal": "^3.7.0", + "nesbot/carbon": "^2.71.0 || ^3.0.0", + "phpunit/phpunit": "^10.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Carbon\\Doctrine\\": "src/Carbon/Doctrine/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KyleKatarn", + "email": "kylekatarnls@gmail.com" + } + ], + "description": "Types to use Carbon in Doctrine", + "keywords": [ + "carbon", + "date", + "datetime", + "doctrine", + "time" + ], + "support": { + "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues", + "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.0.0" + }, + "funding": [ + { + "url": "https://github.com/kylekatarnls", + "type": "github" + }, + { + "url": "https://opencollective.com/Carbon", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "type": "tidelift" + } + ], + "time": "2023-10-01T14:29:01+00:00" + }, { "name": "composer/semver", - "version": "3.3.2", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", - "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", "shasum": "" }, "require": { @@ -400,9 +469,9 @@ "versioning" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.2" + "source": "https://github.com/composer/semver/tree/3.4.0" }, "funding": [ { @@ -418,7 +487,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T19:23:25+00:00" + "time": "2023-08-31T09:50:34+00:00" }, { "name": "dex/composer-plug-and-play", @@ -698,16 +767,16 @@ }, { "name": "doctrine/dbal", - "version": "3.6.4", + "version": "3.7.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f" + "reference": "0ac3c270590e54910715e9a1a044cc368df282b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f", - "reference": "19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2", + "reference": "0ac3c270590e54910715e9a1a044cc368df282b2", "shasum": "" }, "require": { @@ -722,11 +791,12 @@ "require-dev": { "doctrine/coding-standard": "12.0.0", "fig/log-test": "^1", - "jetbrains/phpstorm-stubs": "2022.3", - "phpstan/phpstan": "1.10.14", + "jetbrains/phpstorm-stubs": "2023.1", + "phpstan/phpstan": "1.10.42", "phpstan/phpstan-strict-rules": "^1.5", - "phpunit/phpunit": "9.6.7", + "phpunit/phpunit": "9.6.13", "psalm/plugin-phpunit": "0.18.4", + "slevomat/coding-standard": "8.13.1", "squizlabs/php_codesniffer": "3.7.2", "symfony/cache": "^5.4|^6.0", "symfony/console": "^4.4|^5.4|^6.0", @@ -790,7 +860,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.6.4" + "source": "https://github.com/doctrine/dbal/tree/3.7.2" }, "funding": [ { @@ -806,20 +876,20 @@ "type": "tidelift" } ], - "time": "2023-06-15T07:40:12+00:00" + "time": "2023-11-19T08:06:58+00:00" }, { "name": "doctrine/deprecations", - "version": "v1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { @@ -851,9 +921,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" + "source": "https://github.com/doctrine/deprecations/tree/1.1.2" }, - "time": "2023-06-03T09:27:29+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/event-manager", @@ -1116,16 +1186,16 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.3.2", + "version": "v3.3.3", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8" + "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8", - "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", + "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", "shasum": "" }, "require": { @@ -1165,7 +1235,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.2" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3" }, "funding": [ { @@ -1173,20 +1243,20 @@ "type": "github" } ], - "time": "2022-09-10T18:51:20+00:00" + "time": "2023-08-10T19:36:49+00:00" }, { "name": "egulias/email-validator", - "version": "4.0.1", + "version": "4.0.2", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff" + "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/3a85486b709bc384dae8eb78fb2eec649bdb64ff", - "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e", + "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e", "shasum": "" }, "require": { @@ -1195,8 +1265,8 @@ "symfony/polyfill-intl-idn": "^1.26" }, "require-dev": { - "phpunit/phpunit": "^9.5.27", - "vimeo/psalm": "^4.30" + "phpunit/phpunit": "^10.2", + "vimeo/psalm": "^5.12" }, "suggest": { "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" @@ -1232,7 +1302,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/4.0.1" + "source": "https://github.com/egulias/EmailValidator/tree/4.0.2" }, "funding": [ { @@ -1240,24 +1310,24 @@ "type": "github" } ], - "time": "2023-01-14T14:17:03+00:00" + "time": "2023-10-06T06:47:41+00:00" }, { "name": "ezyang/htmlpurifier", - "version": "v4.16.0", + "version": "v4.17.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" + "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", - "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c", + "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c", "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" + "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" }, "require-dev": { "cerdic/css-tidy": "^1.7 || ^2.0", @@ -1299,27 +1369,27 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0" }, - "time": "2022-09-18T07:06:19+00:00" + "time": "2023-11-17T15:01:25+00:00" }, { "name": "fruitcake/php-cors", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/fruitcake/php-cors.git", - "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e" + "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/58571acbaa5f9f462c9c77e911700ac66f446d4e", - "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e", + "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b", + "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b", "shasum": "" }, "require": { "php": "^7.4|^8.0", - "symfony/http-foundation": "^4.4|^5.4|^6" + "symfony/http-foundation": "^4.4|^5.4|^6|^7" }, "require-dev": { "phpstan/phpstan": "^1.4", @@ -1329,7 +1399,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -1360,7 +1430,7 @@ ], "support": { "issues": "https://github.com/fruitcake/php-cors/issues", - "source": "https://github.com/fruitcake/php-cors/tree/v1.2.0" + "source": "https://github.com/fruitcake/php-cors/tree/v1.3.0" }, "funding": [ { @@ -1372,7 +1442,7 @@ "type": "github" } ], - "time": "2022-02-20T15:07:15+00:00" + "time": "2023-10-12T05:21:21+00:00" }, { "name": "google/recaptcha", @@ -1428,24 +1498,24 @@ }, { "name": "graham-campbell/result-type", - "version": "v1.1.1", + "version": "v1.1.2", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831" + "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831", - "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862", + "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.1" + "phpoption/phpoption": "^1.9.2" }, "require-dev": { - "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" }, "type": "library", "autoload": { @@ -1474,7 +1544,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.1" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2" }, "funding": [ { @@ -1486,26 +1556,26 @@ "type": "tidelift" } ], - "time": "2023-02-25T20:23:15+00:00" + "time": "2023-11-12T22:16:48+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.7.0", + "version": "7.8.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5" + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5", - "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0", - "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1514,11 +1584,11 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23", + "phpunit/phpunit": "^8.5.36 || ^9.6.15", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -1596,7 +1666,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.7.0" + "source": "https://github.com/guzzle/guzzle/tree/7.8.1" }, "funding": [ { @@ -1612,33 +1682,37 @@ "type": "tidelift" } ], - "time": "2023-05-21T14:04:53+00:00" + "time": "2023-12-03T20:35:24+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.3", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" }, "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -1675,7 +1749,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.3" + "source": "https://github.com/guzzle/promises/tree/2.0.2" }, "funding": [ { @@ -1691,20 +1765,20 @@ "type": "tidelift" } ], - "time": "2023-05-21T12:31:43+00:00" + "time": "2023-12-03T20:19:20+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.5.0", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "b635f279edd83fc275f822a1188157ffea568ff6" + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6", - "reference": "b635f279edd83fc275f822a1188157ffea568ff6", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", "shasum": "" }, "require": { @@ -1718,9 +1792,9 @@ "psr/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni/composer-bin-plugin": "^1.8.2", "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.29 || ^9.5.23" + "phpunit/phpunit": "^8.5.36 || ^9.6.15" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -1791,7 +1865,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.5.0" + "source": "https://github.com/guzzle/psr7/tree/2.6.2" }, "funding": [ { @@ -1807,34 +1881,36 @@ "type": "tidelift" } ], - "time": "2023-04-17T16:11:26+00:00" + "time": "2023-12-03T20:05:35+00:00" }, { "name": "guzzlehttp/uri-template", - "version": "v1.0.1", + "version": "v1.0.3", "source": { "type": "git", "url": "https://github.com/guzzle/uri-template.git", - "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2" + "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/uri-template/zipball/b945d74a55a25a949158444f09ec0d3c120d69e2", - "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2", + "url": "https://api.github.com/repos/guzzle/uri-template/zipball/ecea8feef63bd4fef1f037ecb288386999ecc11c", + "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "symfony/polyfill-php80": "^1.17" + "symfony/polyfill-php80": "^1.24" }, "require-dev": { - "phpunit/phpunit": "^8.5.19 || ^9.5.8", + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.36 || ^9.6.15", "uri-template/tests": "1.0.0" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.0-dev" + "bamarni-bin": { + "bin-links": true, + "forward-command": false } }, "autoload": { @@ -1875,7 +1951,7 @@ ], "support": { "issues": "https://github.com/guzzle/uri-template/issues", - "source": "https://github.com/guzzle/uri-template/tree/v1.0.1" + "source": "https://github.com/guzzle/uri-template/tree/v1.0.3" }, "funding": [ { @@ -1891,25 +1967,25 @@ "type": "tidelift" } ], - "time": "2021-10-07T12:57:01+00:00" + "time": "2023-12-03T19:50:20+00:00" }, { "name": "honeybadger-io/honeybadger-laravel", - "version": "3.15.0", + "version": "v3.18.1", "source": { "type": "git", "url": "https://github.com/honeybadger-io/honeybadger-laravel.git", - "reference": "b2d6b5590b8d675345fc96f1155d839a69d6ef2c" + "reference": "82890f3330aca8648718b1aa9252bcd897b36911" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/honeybadger-io/honeybadger-laravel/zipball/b2d6b5590b8d675345fc96f1155d839a69d6ef2c", - "reference": "b2d6b5590b8d675345fc96f1155d839a69d6ef2c", + "url": "https://api.github.com/repos/honeybadger-io/honeybadger-laravel/zipball/82890f3330aca8648718b1aa9252bcd897b36911", + "reference": "82890f3330aca8648718b1aa9252bcd897b36911", "shasum": "" }, "require": { "ext-json": "*", - "honeybadger-io/honeybadger-php": "^2.8.2", + "honeybadger-io/honeybadger-php": "^2.17.2", "illuminate/console": "^7.0|^8.0|^9.0|^10.0", "illuminate/support": "^7.0|^8.0|^9.0|^10.0", "monolog/monolog": "^2.0|^3.2", @@ -1963,22 +2039,22 @@ ], "support": { "issues": "https://github.com/honeybadger-io/honeybadger-laravel/issues", - "source": "https://github.com/honeybadger-io/honeybadger-laravel/tree/3.15.0" + "source": "https://github.com/honeybadger-io/honeybadger-laravel/tree/v3.18.1" }, - "time": "2023-02-16T16:44:44+00:00" + "time": "2023-11-16T08:03:44+00:00" }, { "name": "honeybadger-io/honeybadger-php", - "version": "2.14.0", + "version": "v2.17.2", "source": { "type": "git", "url": "https://github.com/honeybadger-io/honeybadger-php.git", - "reference": "366ce32a3c4f56c084c58effb13286c56667f45a" + "reference": "f7d3a5902ce370e7fae22f084c5b9162f86035ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/honeybadger-io/honeybadger-php/zipball/366ce32a3c4f56c084c58effb13286c56667f45a", - "reference": "366ce32a3c4f56c084c58effb13286c56667f45a", + "url": "https://api.github.com/repos/honeybadger-io/honeybadger-php/zipball/f7d3a5902ce370e7fae22f084c5b9162f86035ab", + "reference": "f7d3a5902ce370e7fae22f084c5b9162f86035ab", "shasum": "" }, "require": { @@ -2029,9 +2105,9 @@ ], "support": { "issues": "https://github.com/honeybadger-io/honeybadger-php/issues", - "source": "https://github.com/honeybadger-io/honeybadger-php/tree/2.14.0" + "source": "https://github.com/honeybadger-io/honeybadger-php/tree/v2.17.2" }, - "time": "2023-02-16T16:37:46+00:00" + "time": "2023-11-16T07:59:43+00:00" }, { "name": "intervention/image", @@ -2119,16 +2195,16 @@ }, { "name": "laravel/framework", - "version": "v10.15.0", + "version": "v10.34.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "c7599dc92e04532824bafbd226c2936ce6a905b8" + "reference": "c581caa233e380610b34cc491490bfa147a3b62b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/c7599dc92e04532824bafbd226c2936ce6a905b8", - "reference": "c7599dc92e04532824bafbd226c2936ce6a905b8", + "url": "https://api.github.com/repos/laravel/framework/zipball/c581caa233e380610b34cc491490bfa147a3b62b", + "reference": "c581caa233e380610b34cc491490bfa147a3b62b", "shasum": "" }, "require": { @@ -2146,11 +2222,12 @@ "ext-tokenizer": "*", "fruitcake/php-cors": "^1.2", "guzzlehttp/uri-template": "^1.0", + "laravel/prompts": "^0.1.9", "laravel/serializable-closure": "^1.3", "league/commonmark": "^2.2.1", "league/flysystem": "^3.8.0", "monolog/monolog": "^3.0", - "nesbot/carbon": "^2.62.1", + "nesbot/carbon": "^2.67", "nunomaduro/termwind": "^1.13", "php": "^8.1", "psr/container": "^1.1.1|^2.0.1", @@ -2160,7 +2237,7 @@ "symfony/console": "^6.2", "symfony/error-handler": "^6.2", "symfony/finder": "^6.2", - "symfony/http-foundation": "^6.2", + "symfony/http-foundation": "^6.3", "symfony/http-kernel": "^6.2", "symfony/mailer": "^6.2", "symfony/mime": "^6.2", @@ -2227,14 +2304,15 @@ "league/flysystem-read-only": "^3.3", "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.5.1", - "orchestra/testbench-core": "^8.4", + "nyholm/psr7": "^1.2", + "orchestra/testbench-core": "^8.15.1", "pda/pheanstalk": "^4.0", - "phpstan/phpdoc-parser": "^1.15", "phpstan/phpstan": "^1.4.7", "phpunit/phpunit": "^10.0.7", "predis/predis": "^2.0.2", "symfony/cache": "^6.2", - "symfony/http-client": "^6.2.4" + "symfony/http-client": "^6.2.4", + "symfony/psr-http-message-bridge": "^2.0" }, "suggest": { "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).", @@ -2315,20 +2393,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-07-11T13:43:52+00:00" + "time": "2023-11-28T19:06:27+00:00" }, { "name": "laravel/horizon", - "version": "v5.18.0", + "version": "v5.21.4", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "b14498a09af826035e46ae8d6b013d0ec849bdb7" + "reference": "bdf58c84b592b83f62262cc6ca98b0debbbc308b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/b14498a09af826035e46ae8d6b013d0ec849bdb7", - "reference": "b14498a09af826035e46ae8d6b013d0ec849bdb7", + "url": "https://api.github.com/repos/laravel/horizon/zipball/bdf58c84b592b83f62262cc6ca98b0debbbc308b", + "reference": "bdf58c84b592b83f62262cc6ca98b0debbbc308b", "shasum": "" }, "require": { @@ -2391,22 +2469,79 @@ ], "support": { "issues": "https://github.com/laravel/horizon/issues", - "source": "https://github.com/laravel/horizon/tree/v5.18.0" + "source": "https://github.com/laravel/horizon/tree/v5.21.4" + }, + "time": "2023-11-23T15:47:58+00:00" + }, + { + "name": "laravel/prompts", + "version": "v0.1.13", + "source": { + "type": "git", + "url": "https://github.com/laravel/prompts.git", + "reference": "e1379d8ead15edd6cc4369c22274345982edc95a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/prompts/zipball/e1379d8ead15edd6cc4369c22274345982edc95a", + "reference": "e1379d8ead15edd6cc4369c22274345982edc95a", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "illuminate/collections": "^10.0|^11.0", + "php": "^8.1", + "symfony/console": "^6.2|^7.0" + }, + "conflict": { + "illuminate/console": ">=10.17.0 <10.25.0", + "laravel/framework": ">=10.17.0 <10.25.0" + }, + "require-dev": { + "mockery/mockery": "^1.5", + "pestphp/pest": "^2.3", + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-mockery": "^1.1" }, - "time": "2023-06-30T15:11:51+00:00" + "suggest": { + "ext-pcntl": "Required for the spinner to be animated." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "0.1.x-dev" + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Laravel\\Prompts\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "support": { + "issues": "https://github.com/laravel/prompts/issues", + "source": "https://github.com/laravel/prompts/tree/v0.1.13" + }, + "time": "2023-10-27T13:53:59+00:00" }, { "name": "laravel/sanctum", - "version": "v3.2.5", + "version": "v3.3.2", "source": { "type": "git", "url": "https://github.com/laravel/sanctum.git", - "reference": "8ebda85d59d3c414863a7f4d816ef8302faad876" + "reference": "e1a272893bec13cf135627f7e156030b3afe1e60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sanctum/zipball/8ebda85d59d3c414863a7f4d816ef8302faad876", - "reference": "8ebda85d59d3c414863a7f4d816ef8302faad876", + "url": "https://api.github.com/repos/laravel/sanctum/zipball/e1a272893bec13cf135627f7e156030b3afe1e60", + "reference": "e1a272893bec13cf135627f7e156030b3afe1e60", "shasum": "" }, "require": { @@ -2419,9 +2554,9 @@ }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "^7.0|^8.0", + "orchestra/testbench": "^7.28.2|^8.8.3", "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6" }, "type": "library", "extra": { @@ -2459,20 +2594,20 @@ "issues": "https://github.com/laravel/sanctum/issues", "source": "https://github.com/laravel/sanctum" }, - "time": "2023-05-01T19:39:51+00:00" + "time": "2023-11-03T13:42:14+00:00" }, { "name": "laravel/serializable-closure", - "version": "v1.3.0", + "version": "v1.3.3", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37" + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f23fe9d4e95255dacee1bf3525e0810d1a1b0f37", - "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754", + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754", "shasum": "" }, "require": { @@ -2519,20 +2654,20 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2023-01-30T18:31:20+00:00" + "time": "2023-11-08T14:08:06+00:00" }, { "name": "laravel/tinker", - "version": "v2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10" + "reference": "b936d415b252b499e8c3b1f795cd4fc20f57e1f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/04a2d3bd0d650c0764f70bf49d1ee39393e4eb10", - "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10", + "url": "https://api.github.com/repos/laravel/tinker/zipball/b936d415b252b499e8c3b1f795cd4fc20f57e1f3", + "reference": "b936d415b252b499e8c3b1f795cd4fc20f57e1f3", "shasum": "" }, "require": { @@ -2545,6 +2680,7 @@ }, "require-dev": { "mockery/mockery": "~1.3.3|^1.4.2", + "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^8.5.8|^9.3.3" }, "suggest": { @@ -2585,22 +2721,22 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.8.1" + "source": "https://github.com/laravel/tinker/tree/v2.8.2" }, - "time": "2023-02-15T16:40:09+00:00" + "time": "2023-08-15T14:27:00+00:00" }, { "name": "laravel/ui", - "version": "v4.2.2", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "a58ec468db4a340b33f3426c778784717a2c144b" + "reference": "eb532ea096ca1c0298c87c19233daf011fda743a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/a58ec468db4a340b33f3426c778784717a2c144b", - "reference": "a58ec468db4a340b33f3426c778784717a2c144b", + "url": "https://api.github.com/repos/laravel/ui/zipball/eb532ea096ca1c0298c87c19233daf011fda743a", + "reference": "eb532ea096ca1c0298c87c19233daf011fda743a", "shasum": "" }, "require": { @@ -2647,22 +2783,22 @@ "ui" ], "support": { - "source": "https://github.com/laravel/ui/tree/v4.2.2" + "source": "https://github.com/laravel/ui/tree/v4.2.3" }, - "time": "2023-05-09T19:47:28+00:00" + "time": "2023-11-23T14:44:22+00:00" }, { "name": "league/commonmark", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "d44a24690f16b8c1808bf13b1bd54ae4c63ea048" + "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d44a24690f16b8c1808bf13b1bd54ae4c63ea048", - "reference": "d44a24690f16b8c1808bf13b1bd54ae4c63ea048", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/3669d6d5f7a47a93c08ddff335e6d945481a1dd5", + "reference": "3669d6d5f7a47a93c08ddff335e6d945481a1dd5", "shasum": "" }, "require": { @@ -2755,7 +2891,7 @@ "type": "tidelift" } ], - "time": "2023-03-24T15:16:10+00:00" + "time": "2023-08-30T16:55:00+00:00" }, { "name": "league/config", @@ -2841,34 +2977,36 @@ }, { "name": "league/csv", - "version": "9.9.0", + "version": "9.12.0", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "b4418ede47fbd88facc34e40a16c8ce9153b961b" + "reference": "c1dc31e23eb3cd0f7b537ee1a669d5f58d5cfe21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/b4418ede47fbd88facc34e40a16c8ce9153b961b", - "reference": "b4418ede47fbd88facc34e40a16c8ce9153b961b", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/c1dc31e23eb3cd0f7b537ee1a669d5f58d5cfe21", + "reference": "c1dc31e23eb3cd0f7b537ee1a669d5f58d5cfe21", "shasum": "" }, "require": { + "ext-filter": "*", "ext-json": "*", "ext-mbstring": "*", "php": "^8.1.2" }, "require-dev": { - "doctrine/collections": "^2.1.2", + "doctrine/collections": "^2.1.4", "ext-dom": "*", "ext-xdebug": "*", - "friendsofphp/php-cs-fixer": "^v3.14.3", - "phpbench/phpbench": "^1.2.8", - "phpstan/phpstan": "^1.10.4", - "phpstan/phpstan-deprecation-rules": "^1.1.2", - "phpstan/phpstan-phpunit": "^1.3.10", - "phpstan/phpstan-strict-rules": "^1.5.0", - "phpunit/phpunit": "^10.0.14" + "friendsofphp/php-cs-fixer": "^v3.22.0", + "phpbench/phpbench": "^1.2.15", + "phpstan/phpstan": "^1.10.46", + "phpstan/phpstan-deprecation-rules": "^1.1.4", + "phpstan/phpstan-phpunit": "^1.3.15", + "phpstan/phpstan-strict-rules": "^1.5.2", + "phpunit/phpunit": "^10.4.2", + "symfony/var-dumper": "^6.4.0" }, "suggest": { "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes", @@ -2924,20 +3062,20 @@ "type": "github" } ], - "time": "2023-03-11T15:57:12+00:00" + "time": "2023-12-01T17:54:07+00:00" }, { "name": "league/flysystem", - "version": "3.15.1", + "version": "3.23.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "a141d430414fcb8bf797a18716b09f759a385bed" + "reference": "d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a141d430414fcb8bf797a18716b09f759a385bed", - "reference": "a141d430414fcb8bf797a18716b09f759a385bed", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc", + "reference": "d4ad81e2b67396e33dc9d7e54ec74ccf73151dcc", "shasum": "" }, "require": { @@ -2946,6 +3084,8 @@ "php": "^8.0.2" }, "conflict": { + "async-aws/core": "<1.19.0", + "async-aws/s3": "<1.14.0", "aws/aws-sdk-php": "3.209.31 || 3.210.0", "guzzlehttp/guzzle": "<7.0", "guzzlehttp/ringphp": "<1.1.1", @@ -2953,8 +3093,8 @@ "symfony/http-client": "<5.2" }, "require-dev": { - "async-aws/s3": "^1.5", - "async-aws/simple-s3": "^1.1", + "async-aws/s3": "^1.5 || ^2.0", + "async-aws/simple-s3": "^1.1 || ^2.0", "aws/aws-sdk-php": "^3.220.0", "composer/semver": "^3.0", "ext-fileinfo": "*", @@ -2963,9 +3103,9 @@ "friendsofphp/php-cs-fixer": "^3.5", "google/cloud-storage": "^1.23", "microsoft/azure-storage-blob": "^1.1", - "phpseclib/phpseclib": "^3.0.14", - "phpstan/phpstan": "^0.12.26", - "phpunit/phpunit": "^9.5.11", + "phpseclib/phpseclib": "^3.0.34", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^9.5.11|^10.0", "sabre/dav": "^4.3.1" }, "type": "library", @@ -3000,7 +3140,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.15.1" + "source": "https://github.com/thephpleague/flysystem/tree/3.23.0" }, "funding": [ { @@ -3012,20 +3152,20 @@ "type": "github" } ], - "time": "2023-05-04T09:04:26+00:00" + "time": "2023-12-04T10:16:17+00:00" }, { "name": "league/flysystem-aws-s3-v3", - "version": "3.15.0", + "version": "3.22.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git", - "reference": "d8de61ee10b6a607e7996cff388c5a3a663e8c8a" + "reference": "9808919ee5d819730d9582d4e1673e8d195c38d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/d8de61ee10b6a607e7996cff388c5a3a663e8c8a", - "reference": "d8de61ee10b6a607e7996cff388c5a3a663e8c8a", + "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/9808919ee5d819730d9582d4e1673e8d195c38d8", + "reference": "9808919ee5d819730d9582d4e1673e8d195c38d8", "shasum": "" }, "require": { @@ -3066,7 +3206,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues", - "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.15.0" + "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.22.0" }, "funding": [ { @@ -3078,20 +3218,20 @@ "type": "github" } ], - "time": "2023-05-02T20:02:14+00:00" + "time": "2023-11-18T14:03:37+00:00" }, { "name": "league/flysystem-ftp", - "version": "3.15.0", + "version": "3.22.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-ftp.git", - "reference": "8b288ff74e85b6d7a247aa7898490e4bd4215795" + "reference": "bde7827b7f8c28c95f337189e359f631d74a80cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-ftp/zipball/8b288ff74e85b6d7a247aa7898490e4bd4215795", - "reference": "8b288ff74e85b6d7a247aa7898490e4bd4215795", + "url": "https://api.github.com/repos/thephpleague/flysystem-ftp/zipball/bde7827b7f8c28c95f337189e359f631d74a80cf", + "reference": "bde7827b7f8c28c95f337189e359f631d74a80cf", "shasum": "" }, "require": { @@ -3126,7 +3266,7 @@ "ftpd" ], "support": { - "source": "https://github.com/thephpleague/flysystem-ftp/tree/3.15.0" + "source": "https://github.com/thephpleague/flysystem-ftp/tree/3.22.0" }, "funding": [ { @@ -3138,20 +3278,20 @@ "type": "github" } ], - "time": "2023-05-02T20:02:14+00:00" + "time": "2023-11-18T14:03:37+00:00" }, { "name": "league/flysystem-local", - "version": "3.15.0", + "version": "3.23.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "543f64c397fefdf9cfeac443ffb6beff602796b3" + "reference": "5cf046ba5f059460e86a997c504dd781a39a109b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/543f64c397fefdf9cfeac443ffb6beff602796b3", - "reference": "543f64c397fefdf9cfeac443ffb6beff602796b3", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/5cf046ba5f059460e86a997c504dd781a39a109b", + "reference": "5cf046ba5f059460e86a997c504dd781a39a109b", "shasum": "" }, "require": { @@ -3186,7 +3326,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem-local/issues", - "source": "https://github.com/thephpleague/flysystem-local/tree/3.15.0" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.23.0" }, "funding": [ { @@ -3198,20 +3338,20 @@ "type": "github" } ], - "time": "2023-05-02T20:02:14+00:00" + "time": "2023-12-04T10:14:46+00:00" }, { "name": "league/flysystem-sftp-v3", - "version": "3.15.0", + "version": "3.22.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-sftp-v3.git", - "reference": "659d85c63489ef11130b648f2740277a17337c8b" + "reference": "a9827f810265d756690f5bfc257c0d82acd4ca84" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-sftp-v3/zipball/659d85c63489ef11130b648f2740277a17337c8b", - "reference": "659d85c63489ef11130b648f2740277a17337c8b", + "url": "https://api.github.com/repos/thephpleague/flysystem-sftp-v3/zipball/a9827f810265d756690f5bfc257c0d82acd4ca84", + "reference": "a9827f810265d756690f5bfc257c0d82acd4ca84", "shasum": "" }, "require": { @@ -3246,7 +3386,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem-sftp-v3/issues", - "source": "https://github.com/thephpleague/flysystem-sftp-v3/tree/3.15.0" + "source": "https://github.com/thephpleague/flysystem-sftp-v3/tree/3.22.0" }, "funding": [ { @@ -3258,30 +3398,30 @@ "type": "github" } ], - "time": "2023-05-02T20:02:14+00:00" + "time": "2023-12-03T15:42:36+00:00" }, { "name": "league/mime-type-detection", - "version": "1.11.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e", + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e", "shasum": "" }, "require": { "ext-fileinfo": "*", - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "phpstan/phpstan": "^0.12.68", - "phpunit/phpunit": "^8.5.8 || ^9.3" + "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0" }, "type": "library", "autoload": { @@ -3302,7 +3442,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.11.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0" }, "funding": [ { @@ -3314,32 +3454,32 @@ "type": "tidelift" } ], - "time": "2022-04-17T13:12:02+00:00" + "time": "2023-10-17T14:13:20+00:00" }, { "name": "maatwebsite/excel", - "version": "3.1.48", + "version": "3.1.50", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "6d0fe2a1d195960c7af7bf0de760582da02a34b9" + "reference": "d79e66391aa306983bb7e234503f5605c3e33348" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/6d0fe2a1d195960c7af7bf0de760582da02a34b9", - "reference": "6d0fe2a1d195960c7af7bf0de760582da02a34b9", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/d79e66391aa306983bb7e234503f5605c3e33348", + "reference": "d79e66391aa306983bb7e234503f5605c3e33348", "shasum": "" }, "require": { "composer/semver": "^3.3", "ext-json": "*", - "illuminate/support": "5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0", - "php": "^7.0|^8.0", + "illuminate/support": "5.8.*||^6.0||^7.0||^8.0||^9.0||^10.0", + "php": "^7.0||^8.0", "phpoffice/phpspreadsheet": "^1.18", - "psr/simple-cache": "^1.0|^2.0|^3.0" + "psr/simple-cache": "^1.0||^2.0||^3.0" }, "require-dev": { - "orchestra/testbench": "^6.0|^7.0|^8.0", + "orchestra/testbench": "^6.0||^7.0||^8.0", "predis/predis": "^1.1" }, "type": "library", @@ -3382,7 +3522,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.48" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.50" }, "funding": [ { @@ -3394,7 +3534,7 @@ "type": "github" } ], - "time": "2023-02-22T21:01:38+00:00" + "time": "2023-11-06T11:29:48+00:00" }, { "name": "maennchen/zipstream-php", @@ -3586,16 +3726,16 @@ }, { "name": "monolog/monolog", - "version": "3.4.0", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "e2392369686d420ca32df3803de28b5d6f76867d" + "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/e2392369686d420ca32df3803de28b5d6f76867d", - "reference": "e2392369686d420ca32df3803de28b5d6f76867d", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c915e2634718dbc8a4a15c61b0e62e7a44e14448", + "reference": "c915e2634718dbc8a4a15c61b0e62e7a44e14448", "shasum": "" }, "require": { @@ -3671,7 +3811,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.4.0" + "source": "https://github.com/Seldaek/monolog/tree/3.5.0" }, "funding": [ { @@ -3683,29 +3823,29 @@ "type": "tidelift" } ], - "time": "2023-06-21T08:46:11+00:00" + "time": "2023-10-27T15:32:31+00:00" }, { "name": "mtdowling/jmespath.php", - "version": "2.6.1", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb" + "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb", + "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b", + "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b", "shasum": "" }, "require": { - "php": "^5.4 || ^7.0 || ^8.0", + "php": "^7.2.5 || ^8.0", "symfony/polyfill-mbstring": "^1.17" }, "require-dev": { - "composer/xdebug-handler": "^1.4 || ^2.0", - "phpunit/phpunit": "^4.8.36 || ^7.5.15" + "composer/xdebug-handler": "^3.0.3", + "phpunit/phpunit": "^8.5.33" }, "bin": [ "bin/jp.php" @@ -3713,7 +3853,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -3729,6 +3869,11 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", @@ -3742,34 +3887,39 @@ ], "support": { "issues": "https://github.com/jmespath/jmespath.php/issues", - "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1" + "source": "https://github.com/jmespath/jmespath.php/tree/2.7.0" }, - "time": "2021-06-14T00:11:39+00:00" + "time": "2023-08-25T10:54:48+00:00" }, { "name": "nesbot/carbon", - "version": "2.68.1", + "version": "2.72.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da" + "reference": "a6885fcbad2ec4360b0e200ee0da7d9b7c90786b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4f991ed2a403c85efbc4f23eb4030063fdbe01da", - "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a6885fcbad2ec4360b0e200ee0da7d9b7c90786b", + "reference": "a6885fcbad2ec4360b0e200ee0da7d9b7c90786b", "shasum": "" }, "require": { + "carbonphp/carbon-doctrine-types": "*", "ext-json": "*", "php": "^7.1.8 || ^8.0", + "psr/clock": "^1.0", "symfony/polyfill-mbstring": "^1.0", "symfony/polyfill-php80": "^1.16", "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0" }, + "provide": { + "psr/clock-implementation": "1.0" + }, "require-dev": { - "doctrine/dbal": "^2.0 || ^3.1.4", - "doctrine/orm": "^2.7", + "doctrine/dbal": "^2.0 || ^3.1.4 || ^4.0", + "doctrine/orm": "^2.7 || ^3.0", "friendsofphp/php-cs-fixer": "^3.0", "kylekatarnls/multi-tester": "^2.0", "ondrejmirtes/better-reflection": "*", @@ -3846,25 +3996,25 @@ "type": "tidelift" } ], - "time": "2023-06-20T18:29:04+00:00" + "time": "2023-11-28T10:13:25+00:00" }, { "name": "nette/schema", - "version": "v1.2.3", + "version": "v1.2.5", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f" + "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f", - "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f", + "url": "https://api.github.com/repos/nette/schema/zipball/0462f0166e823aad657c9224d0f849ecac1ba10a", + "reference": "0462f0166e823aad657c9224d0f849ecac1ba10a", "shasum": "" }, "require": { "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0", - "php": ">=7.1 <8.3" + "php": "7.1 - 8.3" }, "require-dev": { "nette/tester": "^2.3 || ^2.4", @@ -3906,26 +4056,26 @@ ], "support": { "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.2.3" + "source": "https://github.com/nette/schema/tree/v1.2.5" }, - "time": "2022-10-13T01:24:26+00:00" + "time": "2023-10-05T20:37:59+00:00" }, { "name": "nette/utils", - "version": "v4.0.0", + "version": "v4.0.3", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e" + "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/cacdbf5a91a657ede665c541eda28941d4b09c1e", - "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e", + "url": "https://api.github.com/repos/nette/utils/zipball/a9d127dd6a203ce6d255b2e2db49759f7506e015", + "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015", "shasum": "" }, "require": { - "php": ">=8.0 <8.3" + "php": ">=8.0 <8.4" }, "conflict": { "nette/finder": "<3", @@ -3933,7 +4083,7 @@ }, "require-dev": { "jetbrains/phpstorm-attributes": "dev-master", - "nette/tester": "^2.4", + "nette/tester": "^2.5", "phpstan/phpstan": "^1.0", "tracy/tracy": "^2.9" }, @@ -3943,8 +4093,7 @@ "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", "ext-json": "to use Nette\\Utils\\Json", "ext-mbstring": "to use Strings::lower() etc...", - "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()", - "ext-xml": "to use Strings::length() etc. when mbstring is not available" + "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()" }, "type": "library", "extra": { @@ -3993,22 +4142,22 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.0.0" + "source": "https://github.com/nette/utils/tree/v4.0.3" }, - "time": "2023-02-02T10:41:53+00:00" + "time": "2023-10-29T21:02:13+00:00" }, { "name": "nikic/php-parser", - "version": "v4.16.0", + "version": "v4.17.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17" + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", "shasum": "" }, "require": { @@ -4049,9 +4198,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" }, - "time": "2023-06-25T14:52:30+00:00" + "time": "2023-08-13T19:53:39+00:00" }, { "name": "nunomaduro/termwind", @@ -4363,16 +4512,16 @@ }, { "name": "phpoption/phpoption", - "version": "1.9.1", + "version": "1.9.2", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e" + "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dd3a383e599f49777d8b628dadbb90cae435b87e", - "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820", + "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820", "shasum": "" }, "require": { @@ -4380,7 +4529,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" }, "type": "library", "extra": { @@ -4422,7 +4571,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.1" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.2" }, "funding": [ { @@ -4434,20 +4583,20 @@ "type": "tidelift" } ], - "time": "2023-02-25T19:38:58+00:00" + "time": "2023-11-12T21:59:55+00:00" }, { "name": "phpseclib/phpseclib", - "version": "3.0.21", + "version": "3.0.34", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1" + "reference": "56c79f16a6ae17e42089c06a2144467acc35348a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4580645d3fc05c189024eb3b834c6c1e4f0f30a1", - "reference": "4580645d3fc05c189024eb3b834c6c1e4f0f30a1", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56c79f16a6ae17e42089c06a2144467acc35348a", + "reference": "56c79f16a6ae17e42089c06a2144467acc35348a", "shasum": "" }, "require": { @@ -4528,7 +4677,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.21" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.34" }, "funding": [ { @@ -4544,7 +4693,7 @@ "type": "tidelift" } ], - "time": "2023-07-09T15:24:48+00:00" + "time": "2023-11-27T11:13:31+00:00" }, { "name": "predis/predis", @@ -4661,6 +4810,54 @@ }, "time": "2021-02-03T23:26:27+00:00" }, + { + "name": "psr/clock", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "support": { + "issues": "https://github.com/php-fig/clock/issues", + "source": "https://github.com/php-fig/clock/tree/1.0.0" + }, + "time": "2022-11-25T14:36:26+00:00" + }, { "name": "psr/container", "version": "2.0.2", @@ -4766,16 +4963,16 @@ }, { "name": "psr/http-client", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { @@ -4812,9 +5009,9 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/1.0.2" + "source": "https://github.com/php-fig/http-client" }, - "time": "2023-04-10T20:12:12+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { "name": "psr/http-factory", @@ -4873,16 +5070,16 @@ }, { "name": "psr/http-message", - "version": "1.1", + "version": "2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", "shasum": "" }, "require": { @@ -4891,7 +5088,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -4906,7 +5103,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP messages", @@ -4920,9 +5117,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/1.1" + "source": "https://github.com/php-fig/http-message/tree/2.0" }, - "time": "2023-04-04T09:50:52+00:00" + "time": "2023-04-04T09:54:51+00:00" }, { "name": "psr/log", @@ -5027,16 +5224,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.19", + "version": "v0.11.22", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "1724ceff278daeeac5a006744633bacbb2dc4706" + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1724ceff278daeeac5a006744633bacbb2dc4706", - "reference": "1724ceff278daeeac5a006744633bacbb2dc4706", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", "shasum": "" }, "require": { @@ -5065,7 +5262,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "0.11.x-dev" + "dev-0.11": "0.11.x-dev" + }, + "bamarni-bin": { + "bin-links": false, + "forward-command": false } }, "autoload": { @@ -5097,9 +5298,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.19" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" }, - "time": "2023-07-15T19:42:19+00:00" + "time": "2023-10-14T21:56:36+00:00" }, { "name": "ralouphie/getallheaders", @@ -5236,16 +5437,16 @@ }, { "name": "ramsey/uuid", - "version": "4.7.4", + "version": "4.7.5", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "60a4c63ab724854332900504274f6150ff26d286" + "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/60a4c63ab724854332900504274f6150ff26d286", - "reference": "60a4c63ab724854332900504274f6150ff26d286", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e", + "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e", "shasum": "" }, "require": { @@ -5312,7 +5513,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.7.4" + "source": "https://github.com/ramsey/uuid/tree/4.7.5" }, "funding": [ { @@ -5324,7 +5525,7 @@ "type": "tidelift" } ], - "time": "2023-04-15T23:01:58+00:00" + "time": "2023-11-08T05:53:05+00:00" }, { "name": "sixlive/dotenv-editor", @@ -5422,29 +5623,32 @@ }, { "name": "staudenmeir/laravel-adjacency-list", - "version": "v1.13.8", + "version": "v1.14", "source": { "type": "git", "url": "https://github.com/staudenmeir/laravel-adjacency-list.git", - "reference": "15735749a50e7aa6f1922e09dde3341ffdf92bac" + "reference": "051f35cf6a54c8950fb0669b71c1ea2943a25af2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staudenmeir/laravel-adjacency-list/zipball/15735749a50e7aa6f1922e09dde3341ffdf92bac", - "reference": "15735749a50e7aa6f1922e09dde3341ffdf92bac", + "url": "https://api.github.com/repos/staudenmeir/laravel-adjacency-list/zipball/051f35cf6a54c8950fb0669b71c1ea2943a25af2", + "reference": "051f35cf6a54c8950fb0669b71c1ea2943a25af2", "shasum": "" }, "require": { "illuminate/database": "^10.0", "php": "^8.1", "staudenmeir/eloquent-has-many-deep-contracts": "^1.1", - "staudenmeir/laravel-cte": "^1.7" + "staudenmeir/laravel-cte": "^1.8" }, "require-dev": { "barryvdh/laravel-ide-helper": "^2.13", "doctrine/dbal": "^3.5.2", "mockery/mockery": "^1.5.1", + "nunomaduro/larastan": "^2.0", + "orchestra/testbench": "^8.15", "phpunit/phpunit": "^10.1", + "singlestoredb/singlestoredb-laravel": "^1.5.1", "staudenmeir/eloquent-has-many-deep": "^1.18.1" }, "suggest": { @@ -5469,7 +5673,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.13.8" + "source": "https://github.com/staudenmeir/laravel-adjacency-list/tree/v1.14" }, "funding": [ { @@ -5477,20 +5681,20 @@ "type": "custom" } ], - "time": "2023-07-10T21:42:59+00:00" + "time": "2023-11-30T13:36:43+00:00" }, { "name": "staudenmeir/laravel-cte", - "version": "v1.7.1", + "version": "v1.9", "source": { "type": "git", "url": "https://github.com/staudenmeir/laravel-cte.git", - "reference": "3c1d62d55c0f29bb9597c48de2ab8ed8253880d4" + "reference": "87f4447829a0f6a6268f52f875c468915cab4909" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staudenmeir/laravel-cte/zipball/3c1d62d55c0f29bb9597c48de2ab8ed8253880d4", - "reference": "3c1d62d55c0f29bb9597c48de2ab8ed8253880d4", + "url": "https://api.github.com/repos/staudenmeir/laravel-cte/zipball/87f4447829a0f6a6268f52f875c468915cab4909", + "reference": "87f4447829a0f6a6268f52f875c468915cab4909", "shasum": "" }, "require": { @@ -5499,7 +5703,9 @@ }, "require-dev": { "orchestra/testbench": "^8.0", - "phpunit/phpunit": "^10.0" + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^10.1", + "singlestoredb/singlestoredb-laravel": "^1.5.1" }, "type": "library", "extra": { @@ -5527,7 +5733,7 @@ "description": "Laravel queries with common table expressions", "support": { "issues": "https://github.com/staudenmeir/laravel-cte/issues", - "source": "https://github.com/staudenmeir/laravel-cte/tree/v1.7.1" + "source": "https://github.com/staudenmeir/laravel-cte/tree/v1.9" }, "funding": [ { @@ -5535,20 +5741,20 @@ "type": "custom" } ], - "time": "2023-07-12T20:48:41+00:00" + "time": "2023-09-01T17:22:23+00:00" }, { "name": "symfony/console", - "version": "v6.3.0", + "version": "v6.4.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7" + "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7", - "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7", + "url": "https://api.github.com/repos/symfony/console/zipball/a550a7c99daeedef3f9d23fb82e3531525ff11fd", + "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd", "shasum": "" }, "require": { @@ -5556,7 +5762,7 @@ "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0" + "symfony/string": "^5.4|^6.0|^7.0" }, "conflict": { "symfony/dependency-injection": "<5.4", @@ -5570,12 +5776,16 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/lock": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -5609,7 +5819,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.3.0" + "source": "https://github.com/symfony/console/tree/v6.4.1" }, "funding": [ { @@ -5625,20 +5835,20 @@ "type": "tidelift" } ], - "time": "2023-05-29T12:49:39+00:00" + "time": "2023-11-30T10:54:28+00:00" }, { "name": "symfony/css-selector", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf" + "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf", - "reference": "88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/d036c6c0d0b09e24a14a35f8292146a658f986e4", + "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4", "shasum": "" }, "require": { @@ -5674,7 +5884,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.3.0" + "source": "https://github.com/symfony/css-selector/tree/v6.4.0" }, "funding": [ { @@ -5690,11 +5900,11 @@ "type": "tidelift" } ], - "time": "2023-03-20T16:43:42+00:00" + "time": "2023-10-31T08:40:20+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -5741,7 +5951,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -5761,30 +5971,31 @@ }, { "name": "symfony/error-handler", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "99d2d814a6351461af350ead4d963bd67451236f" + "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/99d2d814a6351461af350ead4d963bd67451236f", - "reference": "99d2d814a6351461af350ead4d963bd67451236f", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/c873490a1c97b3a0a4838afc36ff36c112d02788", + "reference": "c873490a1c97b3a0a4838afc36ff36c112d02788", "shasum": "" }, "require": { "php": ">=8.1", "psr/log": "^1|^2|^3", - "symfony/var-dumper": "^5.4|^6.0" + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "conflict": { - "symfony/deprecation-contracts": "<2.5" + "symfony/deprecation-contracts": "<2.5", + "symfony/http-kernel": "<6.4" }, "require-dev": { "symfony/deprecation-contracts": "^2.5|^3", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/serializer": "^5.4|^6.0" + "symfony/http-kernel": "^6.4|^7.0", + "symfony/serializer": "^5.4|^6.0|^7.0" }, "bin": [ "Resources/bin/patch-type-declarations" @@ -5815,7 +6026,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/v6.3.0" + "source": "https://github.com/symfony/error-handler/tree/v6.4.0" }, "funding": [ { @@ -5831,28 +6042,28 @@ "type": "tidelift" } ], - "time": "2023-05-10T12:03:13+00:00" + "time": "2023-10-18T09:43:34+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v6.3.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa" + "reference": "c459b40ffe67c49af6fd392aac374c9edf8a027e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa", - "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c459b40ffe67c49af6fd392aac374c9edf8a027e", + "reference": "c459b40ffe67c49af6fd392aac374c9edf8a027e", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/event-dispatcher-contracts": "^2.5|^3" }, "conflict": { - "symfony/dependency-injection": "<5.4", + "symfony/dependency-injection": "<6.4", "symfony/service-contracts": "<2.5" }, "provide": { @@ -5861,13 +6072,13 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/error-handler": "^5.4|^6.0", - "symfony/expression-language": "^5.4|^6.0", - "symfony/http-foundation": "^5.4|^6.0", + "symfony/config": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/error-handler": "^6.4|^7.0", + "symfony/expression-language": "^6.4|^7.0", + "symfony/http-foundation": "^6.4|^7.0", "symfony/service-contracts": "^2.5|^3", - "symfony/stopwatch": "^5.4|^6.0" + "symfony/stopwatch": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -5895,7 +6106,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/v6.3.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.0" }, "funding": [ { @@ -5911,11 +6122,11 @@ "type": "tidelift" } ], - "time": "2023-04-21T14:41:17+00:00" + "time": "2023-07-27T16:29:09+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", @@ -5971,7 +6182,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" }, "funding": [ { @@ -5991,23 +6202,23 @@ }, { "name": "symfony/finder", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2" + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/d9b01ba073c44cef617c7907ce2419f8d00d75e2", - "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2", + "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce", + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce", "shasum": "" }, "require": { "php": ">=8.1" }, "require-dev": { - "symfony/filesystem": "^6.0" + "symfony/filesystem": "^6.0|^7.0" }, "type": "library", "autoload": { @@ -6035,7 +6246,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.3.0" + "source": "https://github.com/symfony/finder/tree/v6.4.0" }, "funding": [ { @@ -6051,20 +6262,20 @@ "type": "tidelift" } ], - "time": "2023-04-02T01:25:41+00:00" + "time": "2023-10-31T17:30:12+00:00" }, { "name": "symfony/http-client", - "version": "v6.3.1", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "1c828a06aef2f5eeba42026dfc532d4fc5406123" + "reference": "5c584530b77aa10ae216989ffc48b4bedc9c0b29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/1c828a06aef2f5eeba42026dfc532d4fc5406123", - "reference": "1c828a06aef2f5eeba42026dfc532d4fc5406123", + "url": "https://api.github.com/repos/symfony/http-client/zipball/5c584530b77aa10ae216989ffc48b4bedc9c0b29", + "reference": "5c584530b77aa10ae216989ffc48b4bedc9c0b29", "shasum": "" }, "require": { @@ -6093,10 +6304,11 @@ "nyholm/psr7": "^1.0", "php-http/httplug": "^1.0|^2.0", "psr/http-client": "^1.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/stopwatch": "^5.4|^6.0" + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -6127,7 +6339,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.3.1" + "source": "https://github.com/symfony/http-client/tree/v6.4.0" }, "funding": [ { @@ -6143,20 +6355,20 @@ "type": "tidelift" } ], - "time": "2023-06-24T11:51:27+00:00" + "time": "2023-11-28T20:55:58+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "3b66325d0176b4ec826bffab57c9037d759c31fb" + "reference": "1ee70e699b41909c209a0c930f11034b93578654" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/3b66325d0176b4ec826bffab57c9037d759c31fb", - "reference": "3b66325d0176b4ec826bffab57c9037d759c31fb", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654", + "reference": "1ee70e699b41909c209a0c930f11034b93578654", "shasum": "" }, "require": { @@ -6205,7 +6417,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0" }, "funding": [ { @@ -6221,20 +6433,20 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2023-07-30T20:28:31+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.3.1", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e0ad0d153e1c20069250986cd9e9dd1ccebb0d66" + "reference": "44a6d39a9cc11e154547d882d5aac1e014440771" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e0ad0d153e1c20069250986cd9e9dd1ccebb0d66", - "reference": "e0ad0d153e1c20069250986cd9e9dd1ccebb0d66", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/44a6d39a9cc11e154547d882d5aac1e014440771", + "reference": "44a6d39a9cc11e154547d882d5aac1e014440771", "shasum": "" }, "require": { @@ -6244,17 +6456,17 @@ "symfony/polyfill-php83": "^1.27" }, "conflict": { - "symfony/cache": "<6.2" + "symfony/cache": "<6.3" }, "require-dev": { - "doctrine/dbal": "^2.13.1|^3.0", + "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/expression-language": "^5.4|^6.0", - "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4", - "symfony/mime": "^5.4|^6.0", - "symfony/rate-limiter": "^5.2|^6.0" + "symfony/cache": "^6.3|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0", + "symfony/mime": "^5.4|^6.0|^7.0", + "symfony/rate-limiter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -6282,7 +6494,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.3.1" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.0" }, "funding": [ { @@ -6298,29 +6510,29 @@ "type": "tidelift" } ], - "time": "2023-06-24T11:51:27+00:00" + "time": "2023-11-20T16:41:16+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.3.1", + "version": "v6.4.1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "161e16fd2e35fb4881a43bc8b383dfd5be4ac374" + "reference": "2953274c16a229b3933ef73a6898e18388e12e1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/161e16fd2e35fb4881a43bc8b383dfd5be4ac374", - "reference": "161e16fd2e35fb4881a43bc8b383dfd5be4ac374", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2953274c16a229b3933ef73a6898e18388e12e1b", + "reference": "2953274c16a229b3933ef73a6898e18388e12e1b", "shasum": "" }, "require": { "php": ">=8.1", "psr/log": "^1|^2|^3", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/error-handler": "^6.3", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/http-foundation": "^6.2.7", + "symfony/error-handler": "^6.4|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", "symfony/polyfill-ctype": "^1.8" }, "conflict": { @@ -6328,7 +6540,7 @@ "symfony/cache": "<5.4", "symfony/config": "<6.1", "symfony/console": "<5.4", - "symfony/dependency-injection": "<6.3", + "symfony/dependency-injection": "<6.4", "symfony/doctrine-bridge": "<5.4", "symfony/form": "<5.4", "symfony/http-client": "<5.4", @@ -6338,7 +6550,7 @@ "symfony/translation": "<5.4", "symfony/translation-contracts": "<2.5", "symfony/twig-bridge": "<5.4", - "symfony/validator": "<5.4", + "symfony/validator": "<6.4", "symfony/var-dumper": "<6.3", "twig/twig": "<2.13" }, @@ -6347,26 +6559,26 @@ }, "require-dev": { "psr/cache": "^1.0|^2.0|^3.0", - "symfony/browser-kit": "^5.4|^6.0", - "symfony/clock": "^6.2", - "symfony/config": "^6.1", - "symfony/console": "^5.4|^6.0", - "symfony/css-selector": "^5.4|^6.0", - "symfony/dependency-injection": "^6.3", - "symfony/dom-crawler": "^5.4|^6.0", - "symfony/expression-language": "^5.4|^6.0", - "symfony/finder": "^5.4|^6.0", + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/clock": "^6.2|^7.0", + "symfony/config": "^6.1|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/dom-crawler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", "symfony/http-client-contracts": "^2.5|^3", - "symfony/process": "^5.4|^6.0", - "symfony/property-access": "^5.4.5|^6.0.5", - "symfony/routing": "^5.4|^6.0", - "symfony/serializer": "^6.3", - "symfony/stopwatch": "^5.4|^6.0", - "symfony/translation": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/property-access": "^5.4.5|^6.0.5|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.3|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4|^6.0|^7.0", "symfony/translation-contracts": "^2.5|^3", - "symfony/uid": "^5.4|^6.0", - "symfony/validator": "^6.3", - "symfony/var-exporter": "^6.2", + "symfony/uid": "^5.4|^6.0|^7.0", + "symfony/validator": "^6.4|^7.0", + "symfony/var-exporter": "^6.2|^7.0", "twig/twig": "^2.13|^3.0.4" }, "type": "library", @@ -6395,7 +6607,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/v6.3.1" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.1" }, "funding": [ { @@ -6411,20 +6623,20 @@ "type": "tidelift" } ], - "time": "2023-06-26T06:07:32+00:00" + "time": "2023-12-01T17:02:02+00:00" }, { "name": "symfony/mailer", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "7b03d9be1dea29bfec0a6c7b603f5072a4c97435" + "reference": "ca8dcf8892cdc5b4358ecf2528429bb5e706f7ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/7b03d9be1dea29bfec0a6c7b603f5072a4c97435", - "reference": "7b03d9be1dea29bfec0a6c7b603f5072a4c97435", + "url": "https://api.github.com/repos/symfony/mailer/zipball/ca8dcf8892cdc5b4358ecf2528429bb5e706f7ba", + "reference": "ca8dcf8892cdc5b4358ecf2528429bb5e706f7ba", "shasum": "" }, "require": { @@ -6432,8 +6644,8 @@ "php": ">=8.1", "psr/event-dispatcher": "^1", "psr/log": "^1|^2|^3", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/mime": "^6.2", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/mime": "^6.2|^7.0", "symfony/service-contracts": "^2.5|^3" }, "conflict": { @@ -6444,10 +6656,10 @@ "symfony/twig-bridge": "<6.2.1" }, "require-dev": { - "symfony/console": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/messenger": "^6.2", - "symfony/twig-bridge": "^6.2" + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/messenger": "^6.2|^7.0", + "symfony/twig-bridge": "^6.2|^7.0" }, "type": "library", "autoload": { @@ -6475,7 +6687,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.3.0" + "source": "https://github.com/symfony/mailer/tree/v6.4.0" }, "funding": [ { @@ -6491,32 +6703,32 @@ "type": "tidelift" } ], - "time": "2023-05-29T12:49:39+00:00" + "time": "2023-11-12T18:02:22+00:00" }, { "name": "symfony/mailgun-mailer", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/mailgun-mailer.git", - "reference": "2fafefe8683a93155aceb6cca622c7cee2e27174" + "reference": "72d2f72f2016e559d0152188bef5a5dc9ebf5ec7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/2fafefe8683a93155aceb6cca622c7cee2e27174", - "reference": "2fafefe8683a93155aceb6cca622c7cee2e27174", + "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/72d2f72f2016e559d0152188bef5a5dc9ebf5ec7", + "reference": "72d2f72f2016e559d0152188bef5a5dc9ebf5ec7", "shasum": "" }, "require": { "php": ">=8.1", - "symfony/mailer": "^5.4.21|^6.2.7" + "symfony/mailer": "^5.4.21|^6.2.7|^7.0" }, "conflict": { "symfony/http-foundation": "<6.2" }, "require-dev": { - "symfony/http-client": "^5.4|^6.0", - "symfony/webhook": "^6.3" + "symfony/http-client": "^6.3|^7.0", + "symfony/webhook": "^6.3|^7.0" }, "type": "symfony-mailer-bridge", "autoload": { @@ -6544,7 +6756,7 @@ "description": "Symfony Mailgun Mailer Bridge", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailgun-mailer/tree/v6.3.0" + "source": "https://github.com/symfony/mailgun-mailer/tree/v6.4.0" }, "funding": [ { @@ -6560,24 +6772,25 @@ "type": "tidelift" } ], - "time": "2023-05-02T16:15:19+00:00" + "time": "2023-11-06T17:20:05+00:00" }, { "name": "symfony/mime", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "7b5d2121858cd6efbed778abce9cfdd7ab1f62ad" + "reference": "ca4f58b2ef4baa8f6cecbeca2573f88cd577d205" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/7b5d2121858cd6efbed778abce9cfdd7ab1f62ad", - "reference": "7b5d2121858cd6efbed778abce9cfdd7ab1f62ad", + "url": "https://api.github.com/repos/symfony/mime/zipball/ca4f58b2ef4baa8f6cecbeca2573f88cd577d205", + "reference": "ca4f58b2ef4baa8f6cecbeca2573f88cd577d205", "shasum": "" }, "require": { "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, @@ -6586,16 +6799,16 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<5.4", - "symfony/serializer": "<6.2" + "symfony/serializer": "<6.3.2" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", "league/html-to-markdown": "^5.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/property-access": "^5.4|^6.0", - "symfony/property-info": "^5.4|^6.0", - "symfony/serializer": "^6.2" + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/property-access": "^5.4|^6.0|^7.0", + "symfony/property-info": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.3.2|^7.0" }, "type": "library", "autoload": { @@ -6627,7 +6840,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.3.0" + "source": "https://github.com/symfony/mime/tree/v6.4.0" }, "funding": [ { @@ -6643,20 +6856,20 @@ "type": "tidelift" } ], - "time": "2023-04-28T15:57:00+00:00" + "time": "2023-10-17T11:49:05+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -6671,7 +6884,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6709,7 +6922,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -6725,20 +6938,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -6750,7 +6963,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6790,7 +7003,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -6806,20 +7019,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da" + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", "shasum": "" }, "require": { @@ -6833,7 +7046,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6877,7 +7090,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0" }, "funding": [ { @@ -6893,20 +7106,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:30:37+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -6918,7 +7131,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6961,7 +7174,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -6977,20 +7190,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -7005,7 +7218,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7044,7 +7257,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -7060,20 +7273,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", "shasum": "" }, "require": { @@ -7082,7 +7295,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7120,7 +7333,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" }, "funding": [ { @@ -7136,20 +7349,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -7158,7 +7371,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7203,7 +7416,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -7219,20 +7432,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php83", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "508c652ba3ccf69f8c97f251534f229791b52a57" + "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/508c652ba3ccf69f8c97f251534f229791b52a57", - "reference": "508c652ba3ccf69f8c97f251534f229791b52a57", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11", + "reference": "b0f46ebbeeeda3e9d2faebdfbf4b4eae9b59fa11", "shasum": "" }, "require": { @@ -7242,7 +7455,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7255,7 +7468,10 @@ ], "psr-4": { "Symfony\\Polyfill\\Php83\\": "" - } + }, + "classmap": [ + "Resources/stubs" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -7280,7 +7496,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.28.0" }, "funding": [ { @@ -7296,20 +7512,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-08-16T06:22:46+00:00" }, { "name": "symfony/polyfill-uuid", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-uuid.git", - "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166" + "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/f3cf1a645c2734236ed1e2e671e273eeb3586166", - "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166", + "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/9c44518a5aff8da565c8a55dbe85d2769e6f630e", + "reference": "9c44518a5aff8da565c8a55dbe85d2769e6f630e", "shasum": "" }, "require": { @@ -7324,7 +7540,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -7362,7 +7578,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/polyfill-uuid/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-uuid/tree/v1.28.0" }, "funding": [ { @@ -7378,20 +7594,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/process", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628" + "reference": "191703b1566d97a5425dc969e4350d32b8ef17aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/8741e3ed7fe2e91ec099e02446fb86667a0f1628", - "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628", + "url": "https://api.github.com/repos/symfony/process/zipball/191703b1566d97a5425dc969e4350d32b8ef17aa", + "reference": "191703b1566d97a5425dc969e4350d32b8ef17aa", "shasum": "" }, "require": { @@ -7423,7 +7639,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.3.0" + "source": "https://github.com/symfony/process/tree/v6.4.0" }, "funding": [ { @@ -7439,24 +7655,25 @@ "type": "tidelift" } ], - "time": "2023-05-19T08:06:44+00:00" + "time": "2023-11-17T21:06:49+00:00" }, { "name": "symfony/routing", - "version": "v6.3.1", + "version": "v6.4.1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "d37ad1779c38b8eb71996d17dc13030dcb7f9cf5" + "reference": "0c95c164fdba18b12523b75e64199ca3503e6d40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/d37ad1779c38b8eb71996d17dc13030dcb7f9cf5", - "reference": "d37ad1779c38b8eb71996d17dc13030dcb7f9cf5", + "url": "https://api.github.com/repos/symfony/routing/zipball/0c95c164fdba18b12523b75e64199ca3503e6d40", + "reference": "0c95c164fdba18b12523b75e64199ca3503e6d40", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" }, "conflict": { "doctrine/annotations": "<1.12", @@ -7467,11 +7684,11 @@ "require-dev": { "doctrine/annotations": "^1.12|^2", "psr/log": "^1|^2|^3", - "symfony/config": "^6.2", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/expression-language": "^5.4|^6.0", - "symfony/http-foundation": "^5.4|^6.0", - "symfony/yaml": "^5.4|^6.0" + "symfony/config": "^6.2|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -7505,7 +7722,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.3.1" + "source": "https://github.com/symfony/routing/tree/v6.4.1" }, "funding": [ { @@ -7521,20 +7738,20 @@ "type": "tidelift" } ], - "time": "2023-06-05T15:30:22+00:00" + "time": "2023-12-01T14:54:37+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4" + "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838", + "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838", "shasum": "" }, "require": { @@ -7587,7 +7804,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.0" }, "funding": [ { @@ -7603,20 +7820,20 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2023-07-30T20:28:31+00:00" }, { "name": "symfony/string", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f" + "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f2e190ee75ff0f5eced645ec0be5c66fac81f51f", - "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f", + "url": "https://api.github.com/repos/symfony/string/zipball/b45fcf399ea9c3af543a92edf7172ba21174d809", + "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809", "shasum": "" }, "require": { @@ -7630,11 +7847,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -7673,7 +7890,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.0" + "source": "https://github.com/symfony/string/tree/v6.4.0" }, "funding": [ { @@ -7689,24 +7906,25 @@ "type": "tidelift" } ], - "time": "2023-03-21T21:06:29+00:00" + "time": "2023-11-28T20:41:49+00:00" }, { "name": "symfony/translation", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "f72b2cba8f79dd9d536f534f76874b58ad37876f" + "reference": "b1035dbc2a344b21f8fa8ac451c7ecec4ea45f37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/f72b2cba8f79dd9d536f534f76874b58ad37876f", - "reference": "f72b2cba8f79dd9d536f534f76874b58ad37876f", + "url": "https://api.github.com/repos/symfony/translation/zipball/b1035dbc2a344b21f8fa8ac451c7ecec4ea45f37", + "reference": "b1035dbc2a344b21f8fa8ac451c7ecec4ea45f37", "shasum": "" }, "require": { "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/translation-contracts": "^2.5|^3.0" }, @@ -7726,17 +7944,17 @@ "require-dev": { "nikic/php-parser": "^4.13", "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/console": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/finder": "^5.4|^6.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", "symfony/http-client-contracts": "^2.5|^3.0", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/intl": "^5.4|^6.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/intl": "^5.4|^6.0|^7.0", "symfony/polyfill-intl-icu": "^1.21", - "symfony/routing": "^5.4|^6.0", + "symfony/routing": "^5.4|^6.0|^7.0", "symfony/service-contracts": "^2.5|^3", - "symfony/yaml": "^5.4|^6.0" + "symfony/yaml": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -7767,7 +7985,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.3.0" + "source": "https://github.com/symfony/translation/tree/v6.4.0" }, "funding": [ { @@ -7783,20 +8001,20 @@ "type": "tidelift" } ], - "time": "2023-05-19T12:46:45+00:00" + "time": "2023-11-29T08:14:36+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86" + "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/02c24deb352fb0d79db5486c0c79905a85e37e86", - "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/dee0c6e5b4c07ce851b462530088e64b255ac9c5", + "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5", "shasum": "" }, "require": { @@ -7845,7 +8063,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.4.0" }, "funding": [ { @@ -7861,20 +8079,20 @@ "type": "tidelift" } ], - "time": "2023-05-30T17:17:10+00:00" + "time": "2023-07-25T15:08:44+00:00" }, { "name": "symfony/uid", - "version": "v6.3.0", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/uid.git", - "reference": "01b0f20b1351d997711c56f1638f7a8c3061e384" + "reference": "8092dd1b1a41372110d06374f99ee62f7f0b9a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/uid/zipball/01b0f20b1351d997711c56f1638f7a8c3061e384", - "reference": "01b0f20b1351d997711c56f1638f7a8c3061e384", + "url": "https://api.github.com/repos/symfony/uid/zipball/8092dd1b1a41372110d06374f99ee62f7f0b9a92", + "reference": "8092dd1b1a41372110d06374f99ee62f7f0b9a92", "shasum": "" }, "require": { @@ -7882,7 +8100,7 @@ "symfony/polyfill-uuid": "^1.15" }, "require-dev": { - "symfony/console": "^5.4|^6.0" + "symfony/console": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -7919,7 +8137,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/uid/tree/v6.3.0" + "source": "https://github.com/symfony/uid/tree/v6.4.0" }, "funding": [ { @@ -7935,24 +8153,25 @@ "type": "tidelift" } ], - "time": "2023-04-08T07:25:02+00:00" + "time": "2023-10-31T08:18:17+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.3.1", + "version": "v6.4.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "c81268d6960ddb47af17391a27d222bd58cf0515" + "reference": "c40f7d17e91d8b407582ed51a2bbf83c52c367f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c81268d6960ddb47af17391a27d222bd58cf0515", - "reference": "c81268d6960ddb47af17391a27d222bd58cf0515", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c40f7d17e91d8b407582ed51a2bbf83c52c367f6", + "reference": "c40f7d17e91d8b407582ed51a2bbf83c52c367f6", "shasum": "" }, "require": { "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -7960,9 +8179,11 @@ }, "require-dev": { "ext-iconv": "*", - "symfony/console": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/uid": "^5.4|^6.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^6.3|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", "twig/twig": "^2.13|^3.0.4" }, "bin": [ @@ -8001,7 +8222,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.3.1" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.0" }, "funding": [ { @@ -8017,7 +8238,7 @@ "type": "tidelift" } ], - "time": "2023-06-21T12:08:28+00:00" + "time": "2023-11-09T08:28:32+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8074,31 +8295,31 @@ }, { "name": "vlucas/phpdotenv", - "version": "v5.5.0", + "version": "v5.6.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7" + "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7", - "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", + "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4", "shasum": "" }, "require": { "ext-pcre": "*", - "graham-campbell/result-type": "^1.0.2", - "php": "^7.1.3 || ^8.0", - "phpoption/phpoption": "^1.8", - "symfony/polyfill-ctype": "^1.23", - "symfony/polyfill-mbstring": "^1.23.1", - "symfony/polyfill-php80": "^1.23.1" + "graham-campbell/result-type": "^1.1.2", + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9.2", + "symfony/polyfill-ctype": "^1.24", + "symfony/polyfill-mbstring": "^1.24", + "symfony/polyfill-php80": "^1.24" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.2", "ext-filter": "*", - "phpunit/phpunit": "^7.5.20 || ^8.5.30 || ^9.5.25" + "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2" }, "suggest": { "ext-filter": "Required to use the boolean validator." @@ -8110,7 +8331,7 @@ "forward-command": true }, "branch-alias": { - "dev-master": "5.5-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -8142,7 +8363,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.5.0" + "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0" }, "funding": [ { @@ -8154,7 +8375,7 @@ "type": "tidelift" } ], - "time": "2022-10-16T01:01:54+00:00" + "time": "2023-11-12T22:43:29+00:00" }, { "name": "voku/portable-ascii", @@ -8290,166 +8511,6 @@ } ], "packages-dev": [ - { - "name": "beyondcode/laravel-dump-server", - "version": "1.9.0", - "source": { - "type": "git", - "url": "https://github.com/beyondcode/laravel-dump-server.git", - "reference": "1f2452617afc64e47b3cf49978beb7beeef084df" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/beyondcode/laravel-dump-server/zipball/1f2452617afc64e47b3cf49978beb7beeef084df", - "reference": "1f2452617afc64e47b3cf49978beb7beeef084df", - "shasum": "" - }, - "require": { - "illuminate/console": "5.6.*|5.7.*|5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/http": "5.6.*|5.7.*|5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/support": "5.6.*|5.7.*|5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0", - "php": ">=7.2.5", - "symfony/var-dumper": "^5.0|^6.0" - }, - "require-dev": { - "larapack/dd": "^1.0", - "phpunit/phpunit": "^7.0|^9.3" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "BeyondCode\\DumpServer\\DumpServerServiceProvider" - ] - } - }, - "autoload": { - "files": [ - "helpers.php" - ], - "psr-4": { - "BeyondCode\\DumpServer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marcel Pociot", - "email": "marcel@beyondco.de", - "homepage": "https://beyondco.de", - "role": "Developer" - } - ], - "description": "Symfony Var-Dump Server for Laravel", - "homepage": "https://github.com/beyondcode/laravel-dump-server", - "keywords": [ - "beyondcode", - "laravel-dump-server" - ], - "support": { - "issues": "https://github.com/beyondcode/laravel-dump-server/issues", - "source": "https://github.com/beyondcode/laravel-dump-server/tree/1.9.0" - }, - "time": "2023-02-15T10:29:26+00:00" - }, - { - "name": "brianium/paratest", - "version": "v7.1.4", - "source": { - "type": "git", - "url": "https://github.com/paratestphp/paratest.git", - "reference": "153e68eb9e697baa3acf1db1d8ae1d1eb19fb816" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paratestphp/paratest/zipball/153e68eb9e697baa3acf1db1d8ae1d1eb19fb816", - "reference": "153e68eb9e697baa3acf1db1d8ae1d1eb19fb816", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-simplexml": "*", - "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1", - "jean85/pretty-package-versions": "^2.0.5", - "php": "~8.1.0 || ~8.2.0", - "phpunit/php-code-coverage": "^10.1.1", - "phpunit/php-file-iterator": "^4.0.1", - "phpunit/php-timer": "^6.0", - "phpunit/phpunit": "^10.1.2", - "sebastian/environment": "^6.0.1", - "symfony/console": "^6.2.10", - "symfony/process": "^6.2.10" - }, - "require-dev": { - "doctrine/coding-standard": "^12.0.0", - "ext-pcov": "*", - "ext-posix": "*", - "infection/infection": "^0.26.21", - "phpstan/phpstan": "^1.10.14", - "phpstan/phpstan-deprecation-rules": "^1.1.3", - "phpstan/phpstan-phpunit": "^1.3.11", - "phpstan/phpstan-strict-rules": "^1.5.1", - "squizlabs/php_codesniffer": "^3.7.2", - "symfony/filesystem": "^6.2.10" - }, - "bin": [ - "bin/paratest", - "bin/paratest.bat", - "bin/paratest_for_phpstorm" - ], - "type": "library", - "autoload": { - "psr-4": { - "ParaTest\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Brian Scaturro", - "email": "scaturrob@gmail.com", - "role": "Developer" - }, - { - "name": "Filippo Tessarotto", - "email": "zoeslam@gmail.com", - "role": "Developer" - } - ], - "description": "Parallel testing for PHP", - "homepage": "https://github.com/paratestphp/paratest", - "keywords": [ - "concurrent", - "parallel", - "phpunit", - "testing" - ], - "support": { - "issues": "https://github.com/paratestphp/paratest/issues", - "source": "https://github.com/paratestphp/paratest/tree/v7.1.4" - }, - "funding": [ - { - "url": "https://github.com/sponsors/Slamdunk", - "type": "github" - }, - { - "url": "https://paypal.me/filippotessarotto", - "type": "paypal" - } - ], - "time": "2023-05-05T09:09:30+00:00" - }, { "name": "fakerphp/faker", "version": "v1.23.0", @@ -8518,79 +8579,18 @@ }, "time": "2023-06-12T08:44:38+00:00" }, - { - "name": "fidry/cpu-core-counter", - "version": "0.5.1", - "source": { - "type": "git", - "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "require-dev": { - "fidry/makefile": "^0.2.0", - "phpstan/extension-installer": "^1.2.0", - "phpstan/phpstan": "^1.9.2", - "phpstan/phpstan-deprecation-rules": "^1.0.0", - "phpstan/phpstan-phpunit": "^1.2.2", - "phpstan/phpstan-strict-rules": "^1.4.4", - "phpunit/phpunit": "^9.5.26 || ^8.5.31", - "theofidry/php-cs-fixer-config": "^1.0", - "webmozarts/strict-phpunit": "^7.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "Fidry\\CpuCoreCounter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Théo FIDRY", - "email": "theo.fidry@gmail.com" - } - ], - "description": "Tiny utility to get the number of CPU cores.", - "keywords": [ - "CPU", - "core" - ], - "support": { - "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1" - }, - "funding": [ - { - "url": "https://github.com/theofidry", - "type": "github" - } - ], - "time": "2022-12-24T12:35:10+00:00" - }, { "name": "filp/whoops", - "version": "2.15.3", + "version": "2.15.4", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "c83e88a30524f9360b11f585f71e6b17313b7187" + "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/c83e88a30524f9360b11f585f71e6b17313b7187", - "reference": "c83e88a30524f9360b11f585f71e6b17313b7187", + "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546", + "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546", "shasum": "" }, "require": { @@ -8640,7 +8640,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.15.3" + "source": "https://github.com/filp/whoops/tree/2.15.4" }, "funding": [ { @@ -8648,7 +8648,7 @@ "type": "github" } ], - "time": "2023-07-13T12:00:00+00:00" + "time": "2023-11-03T12:00:00+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -8701,77 +8701,18 @@ }, "time": "2020-07-09T08:09:16+00:00" }, - { - "name": "jean85/pretty-package-versions", - "version": "2.0.5", - "source": { - "type": "git", - "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/ae547e455a3d8babd07b96966b17d7fd21d9c6af", - "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af", - "shasum": "" - }, - "require": { - "composer-runtime-api": "^2.0.0", - "php": "^7.1|^8.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.17", - "jean85/composer-provided-replaced-stub-package": "^1.0", - "phpstan/phpstan": "^0.12.66", - "phpunit/phpunit": "^7.5|^8.5|^9.4", - "vimeo/psalm": "^4.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Jean85\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Alessandro Lai", - "email": "alessandro.lai85@gmail.com" - } - ], - "description": "A library to get pretty versions strings of installed dependencies", - "keywords": [ - "composer", - "package", - "release", - "versions" - ], - "support": { - "issues": "https://github.com/Jean85/pretty-package-versions/issues", - "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.5" - }, - "time": "2021-10-08T21:21:46+00:00" - }, { "name": "laravel/pint", - "version": "v1.10.5", + "version": "v1.13.6", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "a458fb057bfa2f5a09888a8aa349610be807b0c3" + "reference": "3e3d2ab01c7d8b484c18e6100ecf53639c744fa7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/a458fb057bfa2f5a09888a8aa349610be807b0c3", - "reference": "a458fb057bfa2f5a09888a8aa349610be807b0c3", + "url": "https://api.github.com/repos/laravel/pint/zipball/3e3d2ab01c7d8b484c18e6100ecf53639c744fa7", + "reference": "3e3d2ab01c7d8b484c18e6100ecf53639c744fa7", "shasum": "" }, "require": { @@ -8782,13 +8723,13 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.21.1", - "illuminate/view": "^10.5.1", - "laravel-zero/framework": "^10.1.1", - "mockery/mockery": "^1.5.1", - "nunomaduro/larastan": "^2.5.1", + "friendsofphp/php-cs-fixer": "^3.38.0", + "illuminate/view": "^10.30.1", + "laravel-zero/framework": "^10.3.0", + "mockery/mockery": "^1.6.6", + "nunomaduro/larastan": "^2.6.4", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.4.0" + "pestphp/pest": "^2.24.2" }, "bin": [ "builds/pint" @@ -8824,31 +8765,31 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2023-07-14T10:26:01+00:00" + "time": "2023-11-07T17:59:57+00:00" }, { "name": "laravel/sail", - "version": "v1.23.1", + "version": "v1.26.2", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "62582606f80466aa81fba40b193b289106902853" + "reference": "c0177786b1cd05b687b0fa11364aeeecb42cd3d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/62582606f80466aa81fba40b193b289106902853", - "reference": "62582606f80466aa81fba40b193b289106902853", + "url": "https://api.github.com/repos/laravel/sail/zipball/c0177786b1cd05b687b0fa11364aeeecb42cd3d8", + "reference": "c0177786b1cd05b687b0fa11364aeeecb42cd3d8", "shasum": "" }, "require": { - "illuminate/console": "^8.0|^9.0|^10.0", - "illuminate/contracts": "^8.0|^9.0|^10.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/console": "^9.0|^10.0|^11.0", + "illuminate/contracts": "^9.0|^10.0|^11.0", + "illuminate/support": "^9.0|^10.0|^11.0", "php": "^8.0", - "symfony/yaml": "^6.0" + "symfony/yaml": "^6.0|^7.0" }, "require-dev": { - "orchestra/testbench": "^6.0|^7.0|^8.0", + "orchestra/testbench": "^7.0|^8.0|^9.0", "phpstan/phpstan": "^1.10" }, "bin": [ @@ -8889,20 +8830,20 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2023-06-28T18:31:28+00:00" + "time": "2023-11-27T14:46:06+00:00" }, { "name": "laravel/telescope", - "version": "v4.15.2", + "version": "v4.17.2", "source": { "type": "git", "url": "https://github.com/laravel/telescope.git", - "reference": "5d74ae4c9f269b756d7877ad1527770c59846e14" + "reference": "64da53ee46b99ef328458eaed32202b51e325a11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/5d74ae4c9f269b756d7877ad1527770c59846e14", - "reference": "5d74ae4c9f269b756d7877ad1527770c59846e14", + "url": "https://api.github.com/repos/laravel/telescope/zipball/64da53ee46b99ef328458eaed32202b51e325a11", + "reference": "64da53ee46b99ef328458eaed32202b51e325a11", "shasum": "" }, "require": { @@ -8958,43 +8899,39 @@ ], "support": { "issues": "https://github.com/laravel/telescope/issues", - "source": "https://github.com/laravel/telescope/tree/v4.15.2" + "source": "https://github.com/laravel/telescope/tree/v4.17.2" }, - "time": "2023-07-13T20:06:27+00:00" + "time": "2023-11-01T14:01:06+00:00" }, { "name": "mockery/mockery", - "version": "1.6.2", + "version": "1.6.6", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "13a7fa2642c76c58fa2806ef7f565344c817a191" + "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/13a7fa2642c76c58fa2806ef7f565344c817a191", - "reference": "13a7fa2642c76c58fa2806ef7f565344c817a191", + "url": "https://api.github.com/repos/mockery/mockery/zipball/b8e0bb7d8c604046539c1115994632c74dcb361e", + "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e", "shasum": "" }, "require": { "hamcrest/hamcrest-php": "^2.0.1", "lib-pcre": ">=7.0", - "php": "^7.4 || ^8.0" + "php": ">=7.3" }, "conflict": { "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.3", - "psalm/plugin-phpunit": "^0.18", - "vimeo/psalm": "^5.9" + "phpunit/phpunit": "^8.5 || ^9.6.10", + "psalm/plugin-phpunit": "^0.18.4", + "symplify/easy-coding-standard": "^11.5.0", + "vimeo/psalm": "^4.30" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.6.x-dev" - } - }, "autoload": { "files": [ "library/helpers.php", @@ -9012,12 +8949,20 @@ { "name": "Pádraic Brady", "email": "padraic.brady@gmail.com", - "homepage": "http://blog.astrumfutura.com" + "homepage": "https://github.com/padraic", + "role": "Author" }, { "name": "Dave Marshall", "email": "dave.marshall@atstsolutions.co.uk", - "homepage": "http://davedevelopment.co.uk" + "homepage": "https://davedevelopment.co.uk", + "role": "Developer" + }, + { + "name": "Nathanael Esayeas", + "email": "nathanael.esayeas@protonmail.com", + "homepage": "https://github.com/ghostwriter", + "role": "Lead Developer" } ], "description": "Mockery is a simple yet flexible PHP mock object framework", @@ -9035,10 +8980,13 @@ "testing" ], "support": { + "docs": "https://docs.mockery.io/", "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/1.6.2" + "rss": "https://github.com/mockery/mockery/releases.atom", + "security": "https://github.com/mockery/mockery/security/advisories", + "source": "https://github.com/mockery/mockery" }, - "time": "2023-06-07T09:07:52+00:00" + "time": "2023-08-09T00:03:52+00:00" }, { "name": "myclabs/deep-copy", @@ -9101,40 +9049,40 @@ }, { "name": "nunomaduro/collision", - "version": "v7.7.0", + "version": "v7.10.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "69a07197d055456d29911116fca3bc2c985f524b" + "reference": "49ec67fa7b002712da8526678abd651c09f375b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/69a07197d055456d29911116fca3bc2c985f524b", - "reference": "69a07197d055456d29911116fca3bc2c985f524b", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/49ec67fa7b002712da8526678abd651c09f375b2", + "reference": "49ec67fa7b002712da8526678abd651c09f375b2", "shasum": "" }, "require": { - "filp/whoops": "^2.15.2", + "filp/whoops": "^2.15.3", "nunomaduro/termwind": "^1.15.1", "php": "^8.1.0", - "symfony/console": "^6.3.0" + "symfony/console": "^6.3.4" }, "conflict": { - "phpunit/phpunit": "<10.1.2" + "laravel/framework": ">=11.0.0" }, "require-dev": { - "brianium/paratest": "^7.2.2", - "laravel/framework": "^10.14.1", - "laravel/pint": "^1.10.3", - "laravel/sail": "^1.23.0", - "laravel/sanctum": "^3.2.5", - "laravel/tinker": "^2.8.1", - "nunomaduro/larastan": "^2.6.3", - "orchestra/testbench-core": "^8.5.8", - "pestphp/pest": "^2.8.1", - "phpunit/phpunit": "^10.2.2", + "brianium/paratest": "^7.3.0", + "laravel/framework": "^10.28.0", + "laravel/pint": "^1.13.3", + "laravel/sail": "^1.25.0", + "laravel/sanctum": "^3.3.1", + "laravel/tinker": "^2.8.2", + "nunomaduro/larastan": "^2.6.4", + "orchestra/testbench-core": "^8.13.0", + "pestphp/pest": "^2.23.2", + "phpunit/phpunit": "^10.4.1", "sebastian/environment": "^6.0.1", - "spatie/laravel-ignition": "^2.2.0" + "spatie/laravel-ignition": "^2.3.1" }, "type": "library", "extra": { @@ -9193,7 +9141,7 @@ "type": "patreon" } ], - "time": "2023-06-29T09:10:16+00:00" + "time": "2023-10-11T15:45:01+00:00" }, { "name": "phar-io/manifest", @@ -9308,16 +9256,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.2", + "version": "10.1.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "db1497ec8dd382e82c962f7abbe0320e4882ee4e" + "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/db1497ec8dd382e82c962f7abbe0320e4882ee4e", - "reference": "db1497ec8dd382e82c962f7abbe0320e4882ee4e", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/a56a9ab2f680246adcf3db43f38ddf1765774735", + "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735", "shasum": "" }, "require": { @@ -9374,7 +9322,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.2" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.9" }, "funding": [ { @@ -9382,20 +9330,20 @@ "type": "github" } ], - "time": "2023-05-22T09:04:27+00:00" + "time": "2023-11-23T12:23:20+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "4.0.2", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "5647d65443818959172645e7ed999217360654b6" + "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/5647d65443818959172645e7ed999217360654b6", - "reference": "5647d65443818959172645e7ed999217360654b6", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c", + "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c", "shasum": "" }, "require": { @@ -9435,7 +9383,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.0.2" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0" }, "funding": [ { @@ -9443,7 +9391,7 @@ "type": "github" } ], - "time": "2023-05-07T09:13:23+00:00" + "time": "2023-08-31T06:24:48+00:00" }, { "name": "phpunit/php-invoker", @@ -9510,16 +9458,16 @@ }, { "name": "phpunit/php-text-template", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "9f3d3709577a527025f55bcf0f7ab8052c8bb37d" + "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/9f3d3709577a527025f55bcf0f7ab8052c8bb37d", - "reference": "9f3d3709577a527025f55bcf0f7ab8052c8bb37d", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748", + "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748", "shasum": "" }, "require": { @@ -9557,7 +9505,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.0" + "security": "https://github.com/sebastianbergmann/php-text-template/security/policy", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1" }, "funding": [ { @@ -9565,7 +9514,7 @@ "type": "github" } ], - "time": "2023-02-03T06:56:46+00:00" + "time": "2023-08-31T14:07:24+00:00" }, { "name": "phpunit/php-timer", @@ -9628,16 +9577,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.2.1", + "version": "10.5.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "599b33294350e8f51163119d5670512f98b0490d" + "reference": "d5d9dca6a902d05b34c4bcbc7c1636ce1dc25408" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/599b33294350e8f51163119d5670512f98b0490d", - "reference": "599b33294350e8f51163119d5670512f98b0490d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d5d9dca6a902d05b34c4bcbc7c1636ce1dc25408", + "reference": "d5d9dca6a902d05b34c4bcbc7c1636ce1dc25408", "shasum": "" }, "require": { @@ -9651,7 +9600,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=8.1", - "phpunit/php-code-coverage": "^10.1.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", @@ -9661,8 +9610,8 @@ "sebastian/comparator": "^5.0", "sebastian/diff": "^5.0", "sebastian/environment": "^6.0", - "sebastian/exporter": "^5.0", - "sebastian/global-state": "^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", @@ -9677,7 +9626,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.2-dev" + "dev-main": "10.5-dev" } }, "autoload": { @@ -9709,7 +9658,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.2.1" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.1" }, "funding": [ { @@ -9725,7 +9674,7 @@ "type": "tidelift" } ], - "time": "2023-06-05T05:15:51+00:00" + "time": "2023-12-01T16:57:05+00:00" }, { "name": "sebastian/cli-parser", @@ -9896,16 +9845,16 @@ }, { "name": "sebastian/comparator", - "version": "5.0.0", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "72f01e6586e0caf6af81297897bd112eb7e9627c" + "reference": "2db5010a484d53ebf536087a70b4a5423c102372" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/72f01e6586e0caf6af81297897bd112eb7e9627c", - "reference": "72f01e6586e0caf6af81297897bd112eb7e9627c", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372", + "reference": "2db5010a484d53ebf536087a70b4a5423c102372", "shasum": "" }, "require": { @@ -9916,7 +9865,7 @@ "sebastian/exporter": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^10.3" }, "type": "library", "extra": { @@ -9960,7 +9909,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.0" + "security": "https://github.com/sebastianbergmann/comparator/security/policy", + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1" }, "funding": [ { @@ -9968,20 +9918,20 @@ "type": "github" } ], - "time": "2023-02-03T07:07:16+00:00" + "time": "2023-08-14T13:18:12+00:00" }, { "name": "sebastian/complexity", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "e67d240970c9dc7ea7b2123a6d520e334dd61dc6" + "reference": "68cfb347a44871f01e33ab0ef8215966432f6957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/e67d240970c9dc7ea7b2123a6d520e334dd61dc6", - "reference": "e67d240970c9dc7ea7b2123a6d520e334dd61dc6", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68cfb347a44871f01e33ab0ef8215966432f6957", + "reference": "68cfb347a44871f01e33ab0ef8215966432f6957", "shasum": "" }, "require": { @@ -9994,7 +9944,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "3.1-dev" } }, "autoload": { @@ -10017,7 +9967,8 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/3.0.0" + "security": "https://github.com/sebastianbergmann/complexity/security/policy", + "source": "https://github.com/sebastianbergmann/complexity/tree/3.1.0" }, "funding": [ { @@ -10025,7 +9976,7 @@ "type": "github" } ], - "time": "2023-02-03T06:59:47+00:00" + "time": "2023-09-28T11:50:59+00:00" }, { "name": "sebastian/diff", @@ -10160,16 +10111,16 @@ }, { "name": "sebastian/exporter", - "version": "5.0.0", + "version": "5.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0" + "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0", - "reference": "f3ec4bf931c0b31e5b413f5b4fc970a7d03338c0", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/64f51654862e0f5e318db7e9dcc2292c63cdbddc", + "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc", "shasum": "" }, "require": { @@ -10183,7 +10134,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -10225,7 +10176,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/5.0.0" + "security": "https://github.com/sebastianbergmann/exporter/security/policy", + "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.1" }, "funding": [ { @@ -10233,20 +10185,20 @@ "type": "github" } ], - "time": "2023-02-03T07:06:49+00:00" + "time": "2023-09-24T13:22:09+00:00" }, { "name": "sebastian/global-state", - "version": "6.0.0", + "version": "6.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "aab257c712de87b90194febd52e4d184551c2d44" + "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/aab257c712de87b90194febd52e4d184551c2d44", - "reference": "aab257c712de87b90194febd52e4d184551c2d44", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/7ea9ead78f6d380d2a667864c132c2f7b83055e4", + "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4", "shasum": "" }, "require": { @@ -10286,7 +10238,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.0" + "security": "https://github.com/sebastianbergmann/global-state/security/policy", + "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.1" }, "funding": [ { @@ -10294,20 +10247,20 @@ "type": "github" } ], - "time": "2023-02-03T07:07:38+00:00" + "time": "2023-07-19T07:19:23+00:00" }, { "name": "sebastian/lines-of-code", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "17c4d940ecafb3d15d2cf916f4108f664e28b130" + "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/17c4d940ecafb3d15d2cf916f4108f664e28b130", - "reference": "17c4d940ecafb3d15d2cf916f4108f664e28b130", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/649e40d279e243d985aa8fb6e74dd5bb28dc185d", + "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d", "shasum": "" }, "require": { @@ -10343,7 +10296,8 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.0" + "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.1" }, "funding": [ { @@ -10351,7 +10305,7 @@ "type": "github" } ], - "time": "2023-02-03T07:08:02+00:00" + "time": "2023-08-31T09:25:50+00:00" }, { "name": "sebastian/object-enumerator", @@ -10701,35 +10655,35 @@ }, { "name": "spatie/flare-client-php", - "version": "1.4.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/spatie/flare-client-php.git", - "reference": "943894c6a6b00501365ac0b91ae0dce56f2226fa" + "reference": "5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/943894c6a6b00501365ac0b91ae0dce56f2226fa", - "reference": "943894c6a6b00501365ac0b91ae0dce56f2226fa", + "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec", + "reference": "5db2fdd743c3ede33f2a5367d89ec1a7c9c1d1ec", "shasum": "" }, "require": { - "illuminate/pipeline": "^8.0|^9.0|^10.0", + "illuminate/pipeline": "^8.0|^9.0|^10.0|^11.0", "nesbot/carbon": "^2.62.1", "php": "^8.0", "spatie/backtrace": "^1.5.2", - "symfony/http-foundation": "^5.0|^6.0", - "symfony/mime": "^5.2|^6.0", - "symfony/process": "^5.2|^6.0", - "symfony/var-dumper": "^5.2|^6.0" + "symfony/http-foundation": "^5.2|^6.0|^7.0", + "symfony/mime": "^5.2|^6.0|^7.0", + "symfony/process": "^5.2|^6.0|^7.0", + "symfony/var-dumper": "^5.2|^6.0|^7.0" }, "require-dev": { - "dms/phpunit-arraysubset-asserts": "^0.3.0", - "pestphp/pest": "^1.20", + "dms/phpunit-arraysubset-asserts": "^0.5.0", + "pestphp/pest": "^1.20|^2.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", - "spatie/phpunit-snapshot-assertions": "^4.0" + "spatie/phpunit-snapshot-assertions": "^4.0|^5.0" }, "type": "library", "extra": { @@ -10759,7 +10713,7 @@ ], "support": { "issues": "https://github.com/spatie/flare-client-php/issues", - "source": "https://github.com/spatie/flare-client-php/tree/1.4.1" + "source": "https://github.com/spatie/flare-client-php/tree/1.4.3" }, "funding": [ { @@ -10767,20 +10721,20 @@ "type": "github" } ], - "time": "2023-07-06T09:29:49+00:00" + "time": "2023-10-17T15:54:07+00:00" }, { "name": "spatie/ignition", - "version": "1.9.0", + "version": "1.11.3", "source": { "type": "git", "url": "https://github.com/spatie/ignition.git", - "reference": "de24ff1e01814d5043bd6eb4ab36a5a852a04973" + "reference": "3d886de644ff7a5b42e4d27c1e1f67c8b5f00044" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ignition/zipball/de24ff1e01814d5043bd6eb4ab36a5a852a04973", - "reference": "de24ff1e01814d5043bd6eb4ab36a5a852a04973", + "url": "https://api.github.com/repos/spatie/ignition/zipball/3d886de644ff7a5b42e4d27c1e1f67c8b5f00044", + "reference": "3d886de644ff7a5b42e4d27c1e1f67c8b5f00044", "shasum": "" }, "require": { @@ -10789,19 +10743,19 @@ "php": "^8.0", "spatie/backtrace": "^1.5.3", "spatie/flare-client-php": "^1.4.0", - "symfony/console": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "require-dev": { - "illuminate/cache": "^9.52", + "illuminate/cache": "^9.52|^10.0|^11.0", "mockery/mockery": "^1.4", - "pestphp/pest": "^1.20", + "pestphp/pest": "^1.20|^2.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.0", "psr/simple-cache-implementation": "*", - "symfony/cache": "^6.0", - "symfony/process": "^5.4|^6.0", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", "vlucas/phpdotenv": "^5.5" }, "suggest": { @@ -10850,20 +10804,20 @@ "type": "github" } ], - "time": "2023-06-28T13:24:59+00:00" + "time": "2023-10-18T14:09:40+00:00" }, { "name": "spatie/laravel-ignition", - "version": "2.2.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "dd15fbe82ef5392798941efae93c49395a87d943" + "reference": "bf21cd15aa47fa4ec5d73bbc932005c70261efc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/dd15fbe82ef5392798941efae93c49395a87d943", - "reference": "dd15fbe82ef5392798941efae93c49395a87d943", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/bf21cd15aa47fa4ec5d73bbc932005c70261efc8", + "reference": "bf21cd15aa47fa4ec5d73bbc932005c70261efc8", "shasum": "" }, "require": { @@ -10942,31 +10896,31 @@ "type": "github" } ], - "time": "2023-06-28T13:51:52+00:00" + "time": "2023-10-09T12:55:26+00:00" }, { "name": "symfony/yaml", - "version": "v6.3.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927" + "reference": "0055b230c408428b9b5cde7c55659555be5c0278" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/a9a8337aa641ef2aa39c3e028f9107ec391e5927", - "reference": "a9a8337aa641ef2aa39c3e028f9107ec391e5927", + "url": "https://api.github.com/repos/symfony/yaml/zipball/0055b230c408428b9b5cde7c55659555be5c0278", + "reference": "0055b230c408428b9b5cde7c55659555be5c0278", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<5.4" + "symfony/console": "<6.4" }, "require-dev": { - "symfony/console": "^5.4|^6.0" + "symfony/console": "^6.4|^7.0" }, "bin": [ "Resources/bin/yaml-lint" @@ -10997,7 +10951,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.3.0" + "source": "https://github.com/symfony/yaml/tree/v7.0.0" }, "funding": [ { @@ -11013,20 +10967,20 @@ "type": "tidelift" } ], - "time": "2023-04-28T13:28:14+00:00" + "time": "2023-11-07T10:26:03+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -11055,7 +11009,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -11063,7 +11017,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" }, { "name": "uderline/openapi-php-attributes", From 587526f738c6d4f9ec393f8c1bc49e58c40c39e7 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Mon, 4 Dec 2023 15:52:54 -0300 Subject: [PATCH 02/47] Composer Plug and Play --- composer.json | 2 +- composer.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 5391b6c17e..e530204134 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "ankurk91/laravel-eloquent-relationships": "^1.3", "aws/aws-sdk-php-laravel": "^3.7", "composer/semver": "^3.2", - "dex/composer-plug-and-play": "^0.18", + "dex/composer-plug-and-play": "^0.19", "dex/frontier": "^0.7.0", "doctrine/dbal": "^3.3", "google/recaptcha": "^1.2", diff --git a/composer.lock b/composer.lock index f9c2fa6e78..fe7d94f445 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": "a5035fe78375d52b99fd98fb3d326f2e", + "content-hash": "d647b0a3d2a523ec203370c96670b710", "packages": [ { "name": "ankurk91/laravel-eloquent-relationships", @@ -491,22 +491,22 @@ }, { "name": "dex/composer-plug-and-play", - "version": "0.18.0", + "version": "0.19.0", "source": { "type": "git", "url": "https://github.com/edersoares/composer-plug-and-play.git", - "reference": "ac1ded9a14b1aed6eb4c2a9c8d1b9f7c660e334a" + "reference": "7975e571a949c21009a10f63e4ee569039b06e52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/edersoares/composer-plug-and-play/zipball/ac1ded9a14b1aed6eb4c2a9c8d1b9f7c660e334a", - "reference": "ac1ded9a14b1aed6eb4c2a9c8d1b9f7c660e334a", + "url": "https://api.github.com/repos/edersoares/composer-plug-and-play/zipball/7975e571a949c21009a10f63e4ee569039b06e52", + "reference": "7975e571a949c21009a10f63e4ee569039b06e52", "shasum": "" }, "require": { "composer-plugin-api": "^2.3", "ext-json": "*", - "php": "^8.0" + "php": "^8.1" }, "require-dev": { "composer/composer": "^2.3.0", @@ -536,9 +536,9 @@ "description": "Plug and play packages for Composer", "support": { "issues": "https://github.com/edersoares/composer-plug-and-play/issues", - "source": "https://github.com/edersoares/composer-plug-and-play/tree/0.18.0" + "source": "https://github.com/edersoares/composer-plug-and-play/tree/0.19.0" }, - "time": "2023-03-28T20:22:01+00:00" + "time": "2023-08-22T18:34:24+00:00" }, { "name": "dex/frontier", @@ -11095,5 +11095,5 @@ "ext-pgsql": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 3682f0ec9acd762e7b557bd1e8d99b4ae15b60e1 Mon Sep 17 00:00:00 2001 From: Edinei Valdameri Date: Wed, 20 Dec 2023 16:08:41 -0300 Subject: [PATCH 03/47] Ajusta css para firefox --- resources/views/auth/login.blade.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 8e7cec2591..2e7af3b270 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -13,7 +13,7 @@ - + @@ -40,6 +40,22 @@ function showPassword() { } + + @if (config('legacy.app.recaptcha_v3.public_key') && config('legacy.app.recaptcha_v3.private_key')) From 0cc5f6a2e2a2505555693064df898137114591b0 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Wed, 3 Jan 2024 11:10:03 -0300 Subject: [PATCH 04/47] =?UTF-8?q?Adiciona=20c=C3=B3digo=20inep=20do=20alun?= =?UTF-8?q?o=20do=20exportador=20de=20dados=20de=20matr=C3=ADculas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/Exporter/Enrollment.php | 1 + ...03_162358_update_view_exporter_student.php | 24 +++++++ .../public.exporter_student-2024-01-03.sql | 68 +++++++++++++++++++ tests/Unit/View/Exporter/EnrollmentTest.php | 1 + 4 files changed, 94 insertions(+) create mode 100644 database/migrations/2024_01_03_162358_update_view_exporter_student.php create mode 100644 database/sqls/views/public.exporter_student-2024-01-03.sql diff --git a/app/Models/Exporter/Enrollment.php b/app/Models/Exporter/Enrollment.php index 7813bcb81a..3be83ded66 100644 --- a/app/Models/Exporter/Enrollment.php +++ b/app/Models/Exporter/Enrollment.php @@ -42,6 +42,7 @@ public function getExportedColumnsByGroup() 'school_class_id' => 'ID Turma', 'grade_id' => 'ID Série', 'course_id' => 'ID Curso', + 'inep_id' => 'Código INEP (Aluno)', ], 'Aluno' => [ 'name' => 'Nome', diff --git a/database/migrations/2024_01_03_162358_update_view_exporter_student.php b/database/migrations/2024_01_03_162358_update_view_exporter_student.php new file mode 100644 index 0000000000..1abfbc3cf8 --- /dev/null +++ b/database/migrations/2024_01_03_162358_update_view_exporter_student.php @@ -0,0 +1,24 @@ +dropView('public.exporter_social_assistance'); + $this->dropView('public.exporter_student'); + $this->createView('public.exporter_student', '2024-01-03'); + $this->createView('public.exporter_social_assistance', '2020-05-07'); + } + + public function down(): void + { + $this->dropView('public.exporter_social_assistance'); + $this->dropView('public.exporter_student'); + $this->createView('public.exporter_student', '2022-06-15'); + $this->createView('public.exporter_social_assistance', '2020-05-07'); + } +}; diff --git a/database/sqls/views/public.exporter_student-2024-01-03.sql b/database/sqls/views/public.exporter_student-2024-01-03.sql new file mode 100644 index 0000000000..db07d7be5b --- /dev/null +++ b/database/sqls/views/public.exporter_student-2024-01-03.sql @@ -0,0 +1,68 @@ +create or replace view public.exporter_student as +SELECT p.id, + p.name, + p.social_name, + p.cpf, + p.rg, + p.rg_issue_date, + p.rg_state_abbreviation, + p.date_of_birth, + p.email, + p.sus, + p.nis, + p.occupation, + p.organization, + p.monthly_income, + p.gender, + p.race, + p.religion, + p.mother_id, + p.father_id, + p.guardian_id, + ep.nome AS school, + t.nm_turma AS school_class, + s.nm_serie AS grade, + c.nm_curso AS course, + m.data_matricula::date AS registration_date, + COALESCE(m.data_cancel::date, mt.data_exclusao::date) AS registration_out, + m.ano AS year, + vs.cod_situacao AS status, + vs.texto_situacao AS status_text, + a.cod_aluno AS student_id, + a.aluno_estado_id AS registration_code_id, + m.cod_matricula AS registration_id, + m.ref_cod_curso AS course_id, + m.ref_ref_cod_serie AS grade_id, + m.ref_ref_cod_escola AS school_id, + t.cod_turma AS school_class_id, + t.tipo_atendimento AS attendance_type, + ece.cod_escola_inep AS school_inep, + t.etapa_educacenso AS school_class_stage, + COALESCE(tm.nome, tt.nome) AS period, + array_to_string(ARRAY( SELECT json_array_elements_text(ma.recursos_tecnologicos) AS json_array_elements_text), ';'::text) AS technological_resources, + p.nationality, + p.birthplace, + CASE m.modalidade_ensino + WHEN 0 THEN 'Semipresencial'::varchar + WHEN 1 THEN 'EAD'::varchar + WHEN 2 THEN 'Off-line'::varchar + ELSE 'Presencial'::varchar + END AS modalidade_ensino, + me.cod_aluno_inep AS inep_id +FROM exporter_person p + JOIN pmieducar.aluno a ON p.id = a.ref_idpes::numeric + JOIN pmieducar.matricula m ON m.ref_cod_aluno = a.cod_aluno + JOIN pmieducar.escola e ON e.cod_escola = m.ref_ref_cod_escola + JOIN cadastro.pessoa ep ON ep.idpes = e.ref_idpes::numeric + JOIN pmieducar.serie s ON s.cod_serie = m.ref_ref_cod_serie + JOIN pmieducar.curso c ON c.cod_curso = m.ref_cod_curso + JOIN pmieducar.matricula_turma mt ON mt.ref_cod_matricula = m.cod_matricula + JOIN relatorio.view_situacao vs ON vs.cod_matricula = m.cod_matricula AND vs.cod_turma = mt.ref_cod_turma AND vs.sequencial = mt.sequencial + JOIN pmieducar.turma t ON t.cod_turma = mt.ref_cod_turma + LEFT JOIN modules.educacenso_cod_escola ece ON e.cod_escola = ece.cod_escola + LEFT JOIN pmieducar.turma_turno tt ON tt.id = t.turma_turno_id + LEFT JOIN pmieducar.turma_turno tm ON tm.id = mt.turno_id + LEFT JOIN modules.moradia_aluno ma ON ma.ref_cod_aluno = a.cod_aluno + LEFT JOIN modules.educacenso_cod_aluno me ON me.cod_aluno = a.cod_aluno +WHERE true AND a.ativo = 1 AND m.ativo = 1 +ORDER BY a.ref_idpes; diff --git a/tests/Unit/View/Exporter/EnrollmentTest.php b/tests/Unit/View/Exporter/EnrollmentTest.php index f51968612d..f3e3384cbd 100644 --- a/tests/Unit/View/Exporter/EnrollmentTest.php +++ b/tests/Unit/View/Exporter/EnrollmentTest.php @@ -226,6 +226,7 @@ public function testGetExportedColumnsByGroup(): void 'school_class_id' => 'ID Turma', 'grade_id' => 'ID Série', 'course_id' => 'ID Curso', + 'inep_id' => 'Código INEP (Aluno)', ], 'Aluno' => [ 'name' => 'Nome', From 3706368c2f5ecf72534facbcf2dbde25ca48de08 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Wed, 3 Jan 2024 12:58:50 -0300 Subject: [PATCH 05/47] =?UTF-8?q?Atualiza=20arquivo=20principal=20da=20vie?= =?UTF-8?q?w=20do=20exportador=20de=20matr=C3=ADcula?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/sqls/views/public.exporter_student.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/database/sqls/views/public.exporter_student.sql b/database/sqls/views/public.exporter_student.sql index dc7f9ff5be..7a69515e0f 100644 --- a/database/sqls/views/public.exporter_student.sql +++ b/database/sqls/views/public.exporter_student.sql @@ -15,6 +15,7 @@ SELECT p.id, p.monthly_income, p.gender, p.race, + p.religion, p.mother_id, p.father_id, p.guardian_id, @@ -46,7 +47,8 @@ SELECT p.id, WHEN 1 THEN 'EAD'::varchar WHEN 2 THEN 'Off-line'::varchar ELSE 'Presencial'::varchar -END AS modalidade_ensino +END AS modalidade_ensino, +me.cod_aluno_inep AS inep_id FROM exporter_person p JOIN pmieducar.aluno a ON p.id = a.ref_idpes::numeric JOIN pmieducar.matricula m ON m.ref_cod_aluno = a.cod_aluno @@ -61,5 +63,6 @@ FROM exporter_person p LEFT JOIN pmieducar.turma_turno tt ON tt.id = t.turma_turno_id LEFT JOIN pmieducar.turma_turno tm ON tm.id = mt.turno_id LEFT JOIN modules.moradia_aluno ma ON ma.ref_cod_aluno = a.cod_aluno + LEFT JOIN modules.educacenso_cod_aluno me ON me.cod_aluno = a.cod_aluno WHERE true AND a.ativo = 1 AND m.ativo = 1 ORDER BY a.ref_idpes; From 74e9e84dda63e5d86b87fdc774417e9b12b18740 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 08:45:12 -0300 Subject: [PATCH 06/47] =?UTF-8?q?Adiciona=20a=20extens=C3=A3o=20zip=20no?= =?UTF-8?q?=20composer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index ace3379c93..6f194f846c 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,7 @@ "ext-json": "*", "ext-pdo": "*", "ext-pgsql": "*", + "ext-zip": "*", "ankurk91/laravel-eloquent-relationships": "^1.3", "aws/aws-sdk-php-laravel": "^3.7", "composer/semver": "^3.2", From 92d48e467e172cb2deed5268d18b9ce5939b0087 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 08:46:05 -0300 Subject: [PATCH 07/47] Adiciona o relacionamento com a foto --- app/Models/LegacyStudent.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Models/LegacyStudent.php b/app/Models/LegacyStudent.php index 65f6c636dd..8c1ecdf926 100644 --- a/app/Models/LegacyStudent.php +++ b/app/Models/LegacyStudent.php @@ -85,6 +85,11 @@ protected function realName(): Attribute ); } + public function picture(): HasOne + { + return $this->hasOne(LegacyIndividualPicture::class, 'idpes', 'ref_idpes'); + } + public function person(): BelongsTo { return $this->belongsTo(LegacyPerson::class, 'ref_idpes'); From f53b159a33ba8d415416ddcd22498394cbbce756 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 08:46:57 -0300 Subject: [PATCH 08/47] Adiciona tabelas e menu --- app/Process.php | 2 + ..._01_05_110000_create_file_export_table.php | 49 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 database/migrations/2024_01_05_110000_create_file_export_table.php diff --git a/app/Process.php b/app/Process.php index 2e4413ee43..d47de664f6 100644 --- a/app/Process.php +++ b/app/Process.php @@ -44,6 +44,8 @@ class Process public const BATCH_EXEMPTION = 1025; + public const DOCUMENT_EXPORT = 1026; + public const UNDO_STUDENT_UNIFICATION = 2001; public const EXEMPTION_LIST = 2002; diff --git a/database/migrations/2024_01_05_110000_create_file_export_table.php b/database/migrations/2024_01_05_110000_create_file_export_table.php new file mode 100644 index 0000000000..8e07fe3a54 --- /dev/null +++ b/database/migrations/2024_01_05_110000_create_file_export_table.php @@ -0,0 +1,49 @@ +id(); + $table->bigInteger('user_id'); + $table->string('hash'); + $table->string('filename'); + $table->integer('size')->nullable(); + $table->string('url')->nullable(); + $table->smallInteger('status_id'); + $table->timestamps(); + }); + + Menu::query()->create([ + 'parent_id' => Menu::query()->where('old', Process::CONFIGURATIONS_TOOLS)->firstOrFail()->getKey(), + 'title' => 'Exportações de documentos', + 'link' => '/arquivo/exportacoes', + 'process' => Process::DOCUMENT_EXPORT, + ]); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Menu::query() + ->where('process', Process::DOCUMENT_EXPORT) + ->delete(); + + Schema::dropIfExists('file_exports'); + } +}; From 7950c90368951896088c3685148c30f3c59fadbb Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 08:47:33 -0300 Subject: [PATCH 09/47] =?UTF-8?q?Cria=20enum=20para=20o=20status=20da=20ex?= =?UTF-8?q?porta=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/Enums/FileExportStatus.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 app/Models/Enums/FileExportStatus.php diff --git a/app/Models/Enums/FileExportStatus.php b/app/Models/Enums/FileExportStatus.php new file mode 100644 index 0000000000..570eb12843 --- /dev/null +++ b/app/Models/Enums/FileExportStatus.php @@ -0,0 +1,18 @@ + 'Aguardando a exportação do arquivo ser finalizada', + self::ERROR => 'O arquivo não pode ser exportado', + self::SUCCESS => 'Fazer download', + }; + } +} From 1b4d133b8cd2a7283e269f35235924494133c5e6 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 08:48:14 -0300 Subject: [PATCH 10/47] =?UTF-8?q?Cria=20contrato=20para=20emitir=20o=20rel?= =?UTF-8?q?at=C3=B3rio=20ficha=20do=20aluno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Reports/Contracts/StudentRecordReport.php | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/Reports/Contracts/StudentRecordReport.php diff --git a/src/Reports/Contracts/StudentRecordReport.php b/src/Reports/Contracts/StudentRecordReport.php new file mode 100644 index 0000000000..06fa8b9762 --- /dev/null +++ b/src/Reports/Contracts/StudentRecordReport.php @@ -0,0 +1,7 @@ + Date: Mon, 8 Jan 2024 08:48:31 -0300 Subject: [PATCH 11/47] Cria os models e rotas --- routes/web.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/routes/web.php b/routes/web.php index 10f74ab2f1..8754822aea 100644 --- a/routes/web.php +++ b/routes/web.php @@ -144,6 +144,10 @@ Route::get('/exportacoes/novo', [ExportController::class, 'form'])->middleware('can:modify:' . Process::DATA_EXPORT)->name('export.form'); Route::post('/exportacoes/exportar', 'ExportController@export')->middleware('can:modify:' . Process::DATA_EXPORT)->name('export.export'); + Route::get('/arquivo/exportacoes', 'FileExportController@index')->middleware('can:view:' . Process::DOCUMENT_EXPORT)->name('file.export.index'); + Route::get('/arquivo/exportacoes/novo', 'FileExportController@create')->middleware('can:modify:' . Process::DOCUMENT_EXPORT)->name('file.export.create'); + Route::post('/arquivo/exportacoes/novo', 'FileExportController@store')->middleware('can:modify:' . Process::DOCUMENT_EXPORT)->name('file.export.store'); + 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'); From 965bc1e1201fb08a9a149400dc97eec8da9e60db Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 08:49:20 -0300 Subject: [PATCH 12/47] Atualiza view do select de curso e series --- resources/views/form/select-course.blade.php | 8 ++++---- resources/views/form/select-grade.blade.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/form/select-course.blade.php b/resources/views/form/select-course.blade.php index 4a5678ac6b..331a97de44 100644 --- a/resources/views/form/select-course.blade.php +++ b/resources/views/form/select-course.blade.php @@ -1,20 +1,20 @@ -@if(Request::get('ref_cod_curso')) +@if(old('ref_cod_curso', Request::get('ref_cod_curso'))) @push('scripts') diff --git a/resources/views/form/select-grade.blade.php b/resources/views/form/select-grade.blade.php index ee90a2124a..9eba1e93a4 100644 --- a/resources/views/form/select-grade.blade.php +++ b/resources/views/form/select-grade.blade.php @@ -1,20 +1,20 @@ -@if(Request::get('ref_cod_serie')) +@if(old('ref_cod_serie', Request::get('ref_cod_serie'))) @push('scripts') From 0f43032505346cd63e6af00ac0d76e229cb725f6 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 08:51:26 -0300 Subject: [PATCH 13/47] Adiciona model, controller e form request --- app/Http/Controllers/FileExportController.php | 59 ++++++++++++++ .../Requests/StudentFileExportRequest.php | 44 +++++++++++ app/Models/FileExport.php | 79 +++++++++++++++++++ 3 files changed, 182 insertions(+) create mode 100644 app/Http/Controllers/FileExportController.php create mode 100644 app/Http/Requests/StudentFileExportRequest.php create mode 100644 app/Models/FileExport.php diff --git a/app/Http/Controllers/FileExportController.php b/app/Http/Controllers/FileExportController.php new file mode 100644 index 0000000000..16b4d86299 --- /dev/null +++ b/app/Http/Controllers/FileExportController.php @@ -0,0 +1,59 @@ +menu(Process::DOCUMENT_EXPORT); + $this->breadcrumb('Exportações', [ + url('/intranet/educar_configuracoes_index.php') => 'Configurações', + ]); + $exports = FileExport::query() + ->where('user_id', $request->user()->getKey()) + ->orderByDesc('created_at') + ->paginate(); + + return view('file_export.index', [ + 'exports' => $exports, + ]); + } + + public function store(StudentFileExportRequest $request) + { + $studentFileExport = FileExport::create([ + 'user_id' => $request->user()->getKey(), + 'filename' => 'Alunos' + ]); + StudentFileExporterJob::dispatchSync( + studentFileExport: $studentFileExport, + args: [ + 'year' => $request->get('ano'), + 'school' => $request->get('ref_cod_escola'), + 'course' => $request->get('ref_cod_curso'), + 'grade' => $request->get('ref_cod_serie'), + 'schoolClass' => $request->get('ref_cod_turma') + ] + ); + + return redirect()->route('file.export.index'); + } + + public function create() + { + $this->menu(Process::DOCUMENT_EXPORT); + $this->breadcrumb('Nova Exportação', [ + url('/intranet/educar_configuracoes_index.php') => 'Configurações', + route('file.export.index') => 'Exportações', + ]); + + return view('file_export.create'); + } +} diff --git a/app/Http/Requests/StudentFileExportRequest.php b/app/Http/Requests/StudentFileExportRequest.php new file mode 100644 index 0000000000..4dcd90a3f3 --- /dev/null +++ b/app/Http/Requests/StudentFileExportRequest.php @@ -0,0 +1,44 @@ + [ + 'required', + 'date_format:Y', + ], + 'ref_cod_instituicao' => 'required', + 'ref_cod_escola' => 'required', + 'ref_cod_curso' => 'required', + 'ref_cod_serie' => 'required', + 'ref_cod_turma' => 'required', + ]; + } + + /** + * @return array + */ + public function messages() + { + return [ + 'ano.required' => 'Você precisa informar o ano', + 'ano.date_format' => 'Você precisa informar um ano válido.', + 'ref_cod_instituicao.required' => 'Você precisa selecionar a instituição.', + 'ref_cod_curso.required' => 'Você precisa selecionar um curso.', + 'ref_cod_escola.required' => 'Você precisa selecionar uma escola.', + 'ref_cod_serie.required' => 'Você precisa selecionar uma série.', + 'ref_cod_turma.required' => 'Você precisa selecionar uma turma.', + ]; + } +} diff --git a/app/Models/FileExport.php b/app/Models/FileExport.php new file mode 100644 index 0000000000..470216e0ca --- /dev/null +++ b/app/Models/FileExport.php @@ -0,0 +1,79 @@ +hash = md5(time()); + $studentFileExport->status_id = FileExportStatus::WAITING; + }); + } + + protected function url(): Attribute + { + return Attribute::make( + get: fn ($value) => (new UrlPresigner)->getPresignedUrl($value) + ); + } + + protected function filename(): Attribute + { + return Attribute::make( + set: fn ($value) => str_replace(' ', '_', $value . '_' . Carbon::now()->format('Y-m-d H:i')) + ); + } + + protected function size(): Attribute + { + return Attribute::make( + get: function ($value) { + $units = [ + 'B', + 'KB', + 'MB', + 'GB', + 'TB' + ]; + $bytes = max($value, 0); + $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); + $pow = min($pow, count($units) - 1); + + return number_format($bytes / (1024 ** $pow), 2) . ' ' . $units[$pow]; + } + ); + } + + public function statusIsError(): bool + { + return $this->status_id === FileExportStatus::ERROR->value || ($this->statusIsWaiting() && $this->created_at < now()->subMinutes(30)); + } + + public function statusIsWaiting(): bool + { + return $this->status_id === FileExportStatus::WAITING->value; + } + + public function statusIsSuccess(): bool + { + return $this->status_id === FileExportStatus::SUCCESS->value; + } +} From d8dd7c190588f464005b9d2182503cbac35df322 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 08:51:47 -0300 Subject: [PATCH 14/47] =?UTF-8?q?Adiciona=20views=20de=20listagem=20e=20cr?= =?UTF-8?q?ia=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/file_export/create.blade.php | 98 ++++++++++++++++++++ resources/views/file_export/index.blade.php | 49 ++++++++++ 2 files changed, 147 insertions(+) create mode 100644 resources/views/file_export/create.blade.php create mode 100644 resources/views/file_export/index.blade.php diff --git a/resources/views/file_export/create.blade.php b/resources/views/file_export/create.blade.php new file mode 100644 index 0000000000..119557cd05 --- /dev/null +++ b/resources/views/file_export/create.blade.php @@ -0,0 +1,98 @@ +@extends('layout.default') + +@section('content') +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Dispensa em lote +
+ Ano + * +
+ somente números + 		+ @include('form.select-year') +
+ Instituição + * + + @include('form.select-institution') +
+ Escola + * + + @include('form.select-school') +
+ Curso + * + + @include('form.select-course') +
+ Série + * + + @include('form.select-grade') +
+ Turma + * + + @include('form.select-school-class') +
+ +
+ +
+
+@endsection + +@prepend('styles') + + +@endprepend + +@prepend('scripts') + + + + + + + +@endprepend diff --git a/resources/views/file_export/index.blade.php b/resources/views/file_export/index.blade.php new file mode 100644 index 0000000000..e20d5baebf --- /dev/null +++ b/resources/views/file_export/index.blade.php @@ -0,0 +1,49 @@ +@extends('layout.default') + +@push('styles') + +@endpush + +@section('content') +

Exportações de arquivos dos alunos

+ + + + + + + + + + @forelse($exports as $export) + + + + + + @empty + + + + @endforelse + +
ArquivoStatusData
{{ $export->filename }} + @if($export->statusIsError()) + O arquivo não pode ser exportado + @elseif($export->statusIsSuccess()) + Fazer download ({{ $export->size }}) + @else + Aguardando a exportação do arquivo ser finalizada + @endif + {{ $export->created_at->format('d/m/Y H:i') }}
Não existe nenhuma exportação
+ +
+ +
+ {{ $exports->links() }} +
+ + +@endsection From 7856eb869dcca42d064253536c003379449c3553 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 08:52:03 -0300 Subject: [PATCH 15/47] =?UTF-8?q?Adiciona=20job=20e=20servi=C3=A7o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Jobs/StudentFileExporterJob.php | 51 +++ app/Services/StudentFileExportService.php | 376 ++++++++++++++++++++++ 2 files changed, 427 insertions(+) create mode 100644 app/Jobs/StudentFileExporterJob.php create mode 100644 app/Services/StudentFileExportService.php diff --git a/app/Jobs/StudentFileExporterJob.php b/app/Jobs/StudentFileExporterJob.php new file mode 100644 index 0000000000..5f3ede8e31 --- /dev/null +++ b/app/Jobs/StudentFileExporterJob.php @@ -0,0 +1,51 @@ +studentFileExportService = new StudentFileExportService($this->studentFileExport, $this->args); + } + + public function handle() + { + $this->studentFileExportService->execute(); + } + + public function failed(Throwable $exception) + { + $this->studentFileExportService->failed(); + } + + public function tags(): array + { + return [ + $this->studentFileExport->getConnectionName(), + 'student-file-export', + ]; + } +} diff --git a/app/Services/StudentFileExportService.php b/app/Services/StudentFileExportService.php new file mode 100644 index 0000000000..ca50cac01f --- /dev/null +++ b/app/Services/StudentFileExportService.php @@ -0,0 +1,376 @@ +connection = $studentFileExport->getConnectionName(); + DB::setDefaultConnection($this->connection); + //temp + $this->mainPath = $this->getMainPath(); + $this->folderStudentsName = $this->getFolderStudentsName(); + $this->folderStudentsPath = $this->getFolderStudentsPath(); + $this->zipFilePath = $this->getZipFilePath(); + //destiny + $this->disk = $disk ?? config('filesystems.default'); + $this->destinyMainPath = $this->getDestinyMainPath(); + $this->destinyZipFilePath = $this->getDestinyZipFilePath(); + } + + private function getMainPath(): string + { + return "{$this->connection}/{$this->compressType}_temp/{$this->studentFileExport->hash}/"; + } + + private function getFolderStudentsName(): string + { + return $this->studentFileExport->filename; + } + + private function getFolderStudentsPath(): string + { + return $this->mainPath . $this->folderStudentsName . '/'; + } + + private function getZipFilePath(): string + { + return $this->mainPath . $this->folderStudentsName . '.' . $this->compressType; + } + + private function getDestinyMainPath(): string + { + return "{$this->connection}/{$this->compressType}/{$this->studentFileExport->hash}/"; + } + + private function getDestinyZipFilePath(): string + { + return $this->destinyMainPath . $this->folderStudentsName . '.' . $this->compressType; + } + + /** + * @throws Exception + */ + public function execute(): void + { + $this->createStudentsFolder(); + $this->compressStudentsFolder(); + $this->copyToFinallyDisk(); + $this->updateExporter(); + $this->notifyUser(); + } + + /** + * @throws Exception + */ + private function createStudentsFolder(): void + { + $this->deleteMainFolder(); //limpa a pasta principal em caso de falhas anteriores + $this->students = $this->getStudents(); + foreach ($this->students as $resource) { + $studentPath = $this->folderStudentsPath . $this->getResourcePath($resource); + $createStudentRecordReport = $this->createStudentRecordReport( + studentPath: $studentPath, + registration: $resource['registration'] + ); + $createStudentFiles = $this->createStudentFiles( + studentPath: $studentPath, + files: $resource['files'] + ); + //conta somente os alunos que tem arquivo + if ($createStudentRecordReport || $createStudentFiles) { + $this->student_folders_count++; + } + } + } + + public function deleteMainFolder(): void + { + if ($this->getStorageTemp()->directoryExists($this->mainPath)) { + $this->getStorageTemp()->deleteDirectory($this->mainPath); + } + } + + private function getStorageTemp(): Filesystem + { + return Storage::disk($this->tempDisk); + } + + private function getStudents() + { + return LegacyStudent::query() + ->select([ + 'cod_aluno', + 'ref_idpes', + 'url_documento', + 'url_laudo_medico' + ]) + ->active() + ->with([ + 'person:idpes,nome', + 'picture', + 'registrations' => function ($q) { + $q->with(['school:cod_escola,ref_cod_instituicao']); + $q->filter([ + 'yearEq' => $this->getarg('year'), + 'school' => $this->getarg('school'), + 'course' => $this->getarg('course'), + 'grade' => $this->getarg('grade') + ]); + $q->active(); + $q->whereHas('lastEnrollment', function ($q) { + $q->whereValid(); + $q->whereSchoolClass($this->getarg('schoolClass')); + }); + } + ]) + ->whereHas('registrations', function ($q) { + $q->filter([ + 'yearEq' => $this->getarg('year'), + 'school' => $this->getarg('school'), + 'course' => $this->getarg('course'), + 'grade' => $this->getarg('grade') + ]); + $q->active(); + $q->whereHas('lastEnrollment', function ($q) { + $q->whereValid(); + $q->whereSchoolClass($this->getarg('schoolClass')); + }); + }) + ->get() + ->map(function (LegacyStudent $student) { + $files = collect(json_decode($student->url_documento, false)) + ->map(function ($file, $index) { + $number = sprintf("%02d", $index + 1); + + return [ + 'filename' => "Documento-{$number}" . '.' . $this->getExtension($file->url), + 'url' => $file->url, + ]; + }); + $files = $files->merge(collect(json_decode($student->url_laudo_medico, false)) + ->map(function ($file, $index) { + $number = sprintf("%02d", $index + 1); + + return [ + 'filename' => "Laudo-{$number}" . '.' . $this->getExtension($file->url), + 'url' => $file->url, + ]; + })); + if ($student->picture) { + $files->push([ + 'filename' => 'Foto.' . $this->getExtension($student->picture->caminho), + 'url' => $student->picture->caminho, + ]); + } + + return [ + 'id' => $student->getKey(), + 'name' => $student->person->name, + 'registration' => $student->registrations->first(), + 'files' => $files->filter(fn ($file) => !empty($file['url'])) + ]; + }); + } + + private function getArg(string $key, mixed $default = null) + { + return Arr::get($this->args, $key, $default); + } + + private function getExtension(string|null $url) + { + if (empty($url)) { + return null; + } + $path_parts = pathinfo(parse_url($url, PHP_URL_PATH)); + + return $path_parts['extension']; + } + + private function getResourcePath(array $resource): string + { + //remove caracteres especiais e transforma em maiúsculo + return preg_replace('/[^\w\s]/u', '', mb_strtoupper($resource['name'])) . " - {$resource['id']}" . '/'; + } + + private function createStudentRecordReport(string $studentPath, LegacyRegistration $registration): bool + { + if (!app()->bound(StudentRecordReport::class)) { + return false; + } + $studentRecord = app(StudentRecordReport::class); + $studentRecord->addArg('ano', $registration->ano); + $studentRecord->addArg('instituicao', $registration->school->ref_cod_instituicao); + $studentRecord->addArg('escola', $registration->ref_ref_cod_escola); + $studentRecord->addArg('modelo', 1); + $studentRecord->addArg('curso', $registration->ref_cod_curso); + $studentRecord->addArg('serie', $registration->ref_ref_cod_serie); + $studentRecord->addArg('turma', $registration->lastEnrollment->ref_cod_turma); + $studentRecord->addArg('situacao', 9); + $studentRecord->addArg('matricula', $registration->cod_matricula); + $studentRecord->addArg('termo_declaracao', config('legacy.report.ficha_do_aluno.termo_declaracao')); + $studentRecord->addArg('SUBREPORT_DIR', config('legacy.report.source_path')); + $studentRecord->addArg('data_emissao', 0); + //precisa ignorar os erros devido o legado + $encoded = @$studentRecord->dumps([ + 'options' => [ + 'encoding' => 'base64', + ], + ]); + $pdfFilePath = $studentPath . 'Ficha_do_aluno.pdf'; + $this->getStorageTemp()->put($pdfFilePath, $encoded); + if (!$this->getStorageTemp()->fileExists($pdfFilePath)) { + throw new Exception('Não foi possível criar a ficha do aluno.'); + } + + return true; + } + + private function createStudentFiles(string $studentPath, Collection $files): bool + { + $countFiles = 0; + foreach ($files as $file) { + $filePath = $this->getPathFromUrl($file['url']); + if (Storage::fileExists($filePath)) { + $stream = Storage::readStream($filePath); + $filePath = $studentPath . $file['filename']; + $this->getStorageTemp()->writeStream($filePath, $stream); + $countFiles++; + } + } + + return $countFiles > 0; + } + + private function getPathFromUrl($url): string + { + // Remove o domínio e o esquema da URL + $path = parse_url($url, PHP_URL_PATH); + // Remove a barra inicial, se houver + $path = ltrim($path, '/'); + // Encontrar a posição de "storage/" e pegar a parte após isso + $posicaoStorage = strpos($path, 'storage/'); + if ($posicaoStorage !== false) { + $path = substr($path, $posicaoStorage + strlen('storage/')); + } + + return $path; + } + + private function compressStudentsFolder(): void + { + $zip = new ZipArchive; + $zipFileFullPath = $this->getStorageTemp()->path($this->zipFilePath); + if ($zip->open($zipFileFullPath, ZipArchive::CREATE | ZipArchive::OVERWRITE) === true) { + $files = $this->getStorageTemp()->allFiles($this->folderStudentsPath); + foreach ($files as $file) { + $filePath = $this->getStorageTemp()->path($file); + $zip->addFile( + filepath: $filePath, + entryname: $this->getShortPathToCompress($filePath) + ); + } + $zip->close(); + } + if (!$this->getStorageTemp()->fileExists($this->zipFilePath)) { + throw new Exception('Não foi possível criar o arquivo compactado.'); + } + $this->deleteStudentsFolder(); + } + + private function getShortPathToCompress(string $fullPath): string + { + $nomeArquivo = basename($fullPath); + $data = explode('/', $fullPath); + $ultimaPasta = $data[count($data) - 2]; + + return $ultimaPasta . '/' . $nomeArquivo; + } + + public function deleteStudentsFolder(): void + { + if ($this->getStorageTemp()->directoryExists($this->folderStudentsPath)) { + $this->getStorageTemp()->deleteDirectory($this->folderStudentsPath); + } + } + + private function copyToFinallyDisk(): void + { + $stream = $this->getStorageTemp()->readStream($this->zipFilePath); + $this->getDestinyStorage()->writeStream($this->destinyZipFilePath, $stream); + if (!$this->getDestinyStorage()->fileExists($this->destinyZipFilePath)) { + throw new Exception('Não foi possível copia o arquivo compactado para o disco de destino.'); + } + $this->deleteMainFolder(); + } + + private function getDestinyStorage(): Filesystem + { + return Storage::disk($this->disk); + } + + private function updateExporter(): void + { + $this->studentFileExport->update([ + 'url' => $this->getDestinyStorage()->url($this->destinyZipFilePath), + 'status_id' => FileExportStatus::SUCCESS, + 'size' => $this->getDestinyStorage()->size($this->destinyZipFilePath) + ]); + } + + private function notifyUser(): void + { + (new NotificationService())->createByUser( + userId: $this->studentFileExport->user_id, + text: $this->getMessage(), + link: $this->getDestinyStorage()->url($this->destinyZipFilePath), + type: NotificationType::OTHER + ); + } + + private function getMessage(): string + { + return "Foram exportados os documentos de {$this->student_folders_count} alunos. Clique aqui para fazer download do arquivo {$this->studentFileExport->filename}."; + } + + public function failed(): void + { + $this->deleteMainFolder(); + $this->studentFileExport->update([ + 'status_id' => FileExportStatus::ERROR + ]); + } +} From 27e252cce8b7354e9660ab0951f2f7083299fd60 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 09:32:22 -0300 Subject: [PATCH 16/47] =?UTF-8?q?Adiciona=20migration=20da=20cria=C3=A7?= =?UTF-8?q?=C3=A3o=20do=20menu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._01_05_110000_create_file_export_table.php | 13 ------- ...4_01_08_095911_create_file_export_menu.php | 34 +++++++++++++++++++ 2 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 database/migrations/data/2024_01_08_095911_create_file_export_menu.php diff --git a/database/migrations/2024_01_05_110000_create_file_export_table.php b/database/migrations/2024_01_05_110000_create_file_export_table.php index 8e07fe3a54..513e19081c 100644 --- a/database/migrations/2024_01_05_110000_create_file_export_table.php +++ b/database/migrations/2024_01_05_110000_create_file_export_table.php @@ -1,7 +1,5 @@ smallInteger('status_id'); $table->timestamps(); }); - - Menu::query()->create([ - 'parent_id' => Menu::query()->where('old', Process::CONFIGURATIONS_TOOLS)->firstOrFail()->getKey(), - 'title' => 'Exportações de documentos', - 'link' => '/arquivo/exportacoes', - 'process' => Process::DOCUMENT_EXPORT, - ]); } /** @@ -40,10 +31,6 @@ public function up() */ public function down() { - Menu::query() - ->where('process', Process::DOCUMENT_EXPORT) - ->delete(); - Schema::dropIfExists('file_exports'); } }; diff --git a/database/migrations/data/2024_01_08_095911_create_file_export_menu.php b/database/migrations/data/2024_01_08_095911_create_file_export_menu.php new file mode 100644 index 0000000000..bc3f170864 --- /dev/null +++ b/database/migrations/data/2024_01_08_095911_create_file_export_menu.php @@ -0,0 +1,34 @@ +create([ + 'parent_id' => Menu::query()->where('old', Process::CONFIGURATIONS_TOOLS)->firstOrFail()->getKey(), + 'title' => 'Exportações de documentos', + 'link' => '/arquivo/exportacoes', + 'process' => Process::DOCUMENT_EXPORT, + ]); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Menu::query() + ->where('process', Process::DOCUMENT_EXPORT) + ->delete(); + } +}; From c08958b820abe0d0cbdda92b9498211b5e469de9 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 09:56:33 -0300 Subject: [PATCH 17/47] Cria novo atributo para o tamanho formatado do arquivo --- app/Models/FileExport.php | 6 +++--- resources/views/file_export/index.blade.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Models/FileExport.php b/app/Models/FileExport.php index 470216e0ca..83274cd888 100644 --- a/app/Models/FileExport.php +++ b/app/Models/FileExport.php @@ -42,10 +42,10 @@ protected function filename(): Attribute ); } - protected function size(): Attribute + protected function sizeFormat(): Attribute { return Attribute::make( - get: function ($value) { + get: function () { $units = [ 'B', 'KB', @@ -53,7 +53,7 @@ protected function size(): Attribute 'GB', 'TB' ]; - $bytes = max($value, 0); + $bytes = max($this->size, 0); $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); $pow = min($pow, count($units) - 1); diff --git a/resources/views/file_export/index.blade.php b/resources/views/file_export/index.blade.php index e20d5baebf..af6f1db7ef 100644 --- a/resources/views/file_export/index.blade.php +++ b/resources/views/file_export/index.blade.php @@ -22,7 +22,7 @@ @if($export->statusIsError()) O arquivo não pode ser exportado @elseif($export->statusIsSuccess()) - Fazer download ({{ $export->size }}) + Fazer download ({{ $export->sizeFormat }}) @else Aguardando a exportação do arquivo ser finalizada @endif From 71e272f7849ac91d7bc2901ee4c62613ae1f2c77 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 09:57:13 -0300 Subject: [PATCH 18/47] Remove sync do disparo da job --- app/Http/Controllers/FileExportController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/FileExportController.php b/app/Http/Controllers/FileExportController.php index 16b4d86299..8af5fc59c6 100644 --- a/app/Http/Controllers/FileExportController.php +++ b/app/Http/Controllers/FileExportController.php @@ -32,7 +32,7 @@ public function store(StudentFileExportRequest $request) 'user_id' => $request->user()->getKey(), 'filename' => 'Alunos' ]); - StudentFileExporterJob::dispatchSync( + StudentFileExporterJob::dispatch( studentFileExport: $studentFileExport, args: [ 'year' => $request->get('ano'), From 93ec3120bda20e91525f3e0588f92e4e3e100e60 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 10:00:38 -0300 Subject: [PATCH 19/47] =?UTF-8?q?Cria=20novo=20atributo=20para=20a=20url?= =?UTF-8?q?=20tempor=C3=A1ria?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/FileExport.php | 4 ++-- resources/views/file_export/index.blade.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Models/FileExport.php b/app/Models/FileExport.php index 83274cd888..70fd3404a7 100644 --- a/app/Models/FileExport.php +++ b/app/Models/FileExport.php @@ -28,10 +28,10 @@ protected static function boot() }); } - protected function url(): Attribute + protected function presignedUrl(): Attribute { return Attribute::make( - get: fn ($value) => (new UrlPresigner)->getPresignedUrl($value) + get: fn () => (new UrlPresigner)->getPresignedUrl($this->url) ); } diff --git a/resources/views/file_export/index.blade.php b/resources/views/file_export/index.blade.php index af6f1db7ef..465cd73290 100644 --- a/resources/views/file_export/index.blade.php +++ b/resources/views/file_export/index.blade.php @@ -22,7 +22,7 @@ @if($export->statusIsError()) O arquivo não pode ser exportado @elseif($export->statusIsSuccess()) - Fazer download ({{ $export->sizeFormat }}) + Fazer download ({{ $export->sizeFormat }}) @else Aguardando a exportação do arquivo ser finalizada @endif From 0b818e8853fc26ff99f4c036fdfee9e9b1ea7dc2 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 10:16:07 -0300 Subject: [PATCH 20/47] Remove mutator do filename --- app/Http/Controllers/FileExportController.php | 3 ++- app/Models/FileExport.php | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/FileExportController.php b/app/Http/Controllers/FileExportController.php index 8af5fc59c6..88d8460f13 100644 --- a/app/Http/Controllers/FileExportController.php +++ b/app/Http/Controllers/FileExportController.php @@ -6,6 +6,7 @@ use App\Jobs\StudentFileExporterJob; use App\Models\FileExport; use App\Process; +use Carbon\Carbon; use Illuminate\Http\Request; class FileExportController extends Controller @@ -30,7 +31,7 @@ public function store(StudentFileExportRequest $request) { $studentFileExport = FileExport::create([ 'user_id' => $request->user()->getKey(), - 'filename' => 'Alunos' + 'filename' => 'Alunos_' . Carbon::now()->format('Y-m-d_H:i') ]); StudentFileExporterJob::dispatch( studentFileExport: $studentFileExport, diff --git a/app/Models/FileExport.php b/app/Models/FileExport.php index 70fd3404a7..7640eebac3 100644 --- a/app/Models/FileExport.php +++ b/app/Models/FileExport.php @@ -35,13 +35,6 @@ protected function presignedUrl(): Attribute ); } - protected function filename(): Attribute - { - return Attribute::make( - set: fn ($value) => str_replace(' ', '_', $value . '_' . Carbon::now()->format('Y-m-d H:i')) - ); - } - protected function sizeFormat(): Attribute { return Attribute::make( From f1da608ce875942e071837e1c6dabb4464cc2b88 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 10:20:41 -0300 Subject: [PATCH 21/47] Cria teste do model da tabela --- app/Models/FileExport.php | 1 - database/factories/FileExportFactory.php | 30 +++++++++++++++ tests/Unit/Eloquent/FileExportTest.php | 47 ++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 database/factories/FileExportFactory.php create mode 100644 tests/Unit/Eloquent/FileExportTest.php diff --git a/app/Models/FileExport.php b/app/Models/FileExport.php index 7640eebac3..db602fb7c9 100644 --- a/app/Models/FileExport.php +++ b/app/Models/FileExport.php @@ -4,7 +4,6 @@ use App\Models\Enums\FileExportStatus; use App\Services\UrlPresigner; -use Carbon\Carbon; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; diff --git a/database/factories/FileExportFactory.php b/database/factories/FileExportFactory.php new file mode 100644 index 0000000000..927d4add24 --- /dev/null +++ b/database/factories/FileExportFactory.php @@ -0,0 +1,30 @@ + fn () => LegacyUserFactory::new()->current(), + 'url' => $this->faker->url() . '/image.jpg', + 'filename' => 'Alunos_' . Carbon::now()->format('Y-m-d_H:i'), + 'size' => $this->faker->randomNumber(5) + ]; + } +} diff --git a/tests/Unit/Eloquent/FileExportTest.php b/tests/Unit/Eloquent/FileExportTest.php new file mode 100644 index 0000000000..5e92af7fdc --- /dev/null +++ b/tests/Unit/Eloquent/FileExportTest.php @@ -0,0 +1,47 @@ +assertEquals((new UrlPresigner)->getPresignedUrl($this->model->url), $this->model->presignedUrl); + } + + public function testFilename(): void + { + $this->assertEquals('Alunos_' . Carbon::now()->format('Y-m-d_H:i'), $this->model->filename); + } + + public function testSizeFormat(): void + { + $units = [ + 'B', + 'KB', + 'MB', + 'GB', + 'TB' + ]; + $bytes = max($this->model->size, 0); + $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); + $pow = min($pow, count($units) - 1); + $expected = number_format($bytes / (1024 ** $pow), 2) . ' ' . $units[$pow]; + + $this->assertEquals($expected, $this->model->sizeFormat); + } + + /** + * @return string + */ + protected function getEloquentModelName() + { + return FileExport::class; + } +} From e804ea456816bd5dd45ae0d791cc4b03dc453649 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 10:58:15 -0300 Subject: [PATCH 22/47] Renomeia classe e form request --- app/Http/Controllers/FileExportController.php | 13 +++---- ...xportRequest.php => FileExportRequest.php} | 2 +- ...ileExporterJob.php => FileExporterJob.php} | 18 +++++----- ...xportService.php => FileExportService.php} | 36 ++++++++++++------- 4 files changed, 41 insertions(+), 28 deletions(-) rename app/Http/Requests/{StudentFileExportRequest.php => FileExportRequest.php} (96%) rename app/Jobs/{StudentFileExporterJob.php => FileExporterJob.php} (53%) rename app/Services/{StudentFileExportService.php => FileExportService.php} (93%) diff --git a/app/Http/Controllers/FileExportController.php b/app/Http/Controllers/FileExportController.php index 88d8460f13..8f10fb4abf 100644 --- a/app/Http/Controllers/FileExportController.php +++ b/app/Http/Controllers/FileExportController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers; -use App\Http\Requests\StudentFileExportRequest; -use App\Jobs\StudentFileExporterJob; +use App\Http\Requests\FileExportRequest; +use App\Jobs\FileExporterJob; use App\Models\FileExport; use App\Process; use Carbon\Carbon; @@ -27,14 +27,15 @@ public function index(Request $request) ]); } - public function store(StudentFileExportRequest $request) + public function store(FileExportRequest $request) { - $studentFileExport = FileExport::create([ + $fileExport = FileExport::create([ 'user_id' => $request->user()->getKey(), 'filename' => 'Alunos_' . Carbon::now()->format('Y-m-d_H:i') ]); - StudentFileExporterJob::dispatch( - studentFileExport: $studentFileExport, + + FileExporterJob::dispatch( + fileExport: $fileExport, args: [ 'year' => $request->get('ano'), 'school' => $request->get('ref_cod_escola'), diff --git a/app/Http/Requests/StudentFileExportRequest.php b/app/Http/Requests/FileExportRequest.php similarity index 96% rename from app/Http/Requests/StudentFileExportRequest.php rename to app/Http/Requests/FileExportRequest.php index 4dcd90a3f3..1c7e80178c 100644 --- a/app/Http/Requests/StudentFileExportRequest.php +++ b/app/Http/Requests/FileExportRequest.php @@ -4,7 +4,7 @@ use Illuminate\Foundation\Http\FormRequest; -class StudentFileExportRequest extends FormRequest +class FileExportRequest extends FormRequest { /** * Get the validation rules that apply to the request. diff --git a/app/Jobs/StudentFileExporterJob.php b/app/Jobs/FileExporterJob.php similarity index 53% rename from app/Jobs/StudentFileExporterJob.php rename to app/Jobs/FileExporterJob.php index 5f3ede8e31..b4baa1337a 100644 --- a/app/Jobs/StudentFileExporterJob.php +++ b/app/Jobs/FileExporterJob.php @@ -3,7 +3,7 @@ namespace App\Jobs; use App\Models\FileExport; -use App\Services\StudentFileExportService; +use App\Services\FileExportService; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; @@ -11,7 +11,7 @@ use Illuminate\Queue\SerializesModels; use Throwable; -class StudentFileExporterJob implements ShouldQueue +class FileExporterJob implements ShouldQueue { use Dispatchable; use InteractsWithQueue; @@ -24,28 +24,28 @@ class StudentFileExporterJob implements ShouldQueue public $retryAfter = 5; - private StudentFileExportService $studentFileExportService; + private FileExportService $fileExportService; - public function __construct(private FileExport $studentFileExport, private array $args) + public function __construct(private FileExport $fileExport, private array $args) { - $this->studentFileExportService = new StudentFileExportService($this->studentFileExport, $this->args); + $this->fileExportService = new FileExportService($this->fileExport, $this->args); } public function handle() { - $this->studentFileExportService->execute(); + $this->fileExportService->execute(); } public function failed(Throwable $exception) { - $this->studentFileExportService->failed(); + $this->fileExportService->failed(); } public function tags(): array { return [ - $this->studentFileExport->getConnectionName(), - 'student-file-export', + $this->fileExport->getConnectionName(), + 'file-export', ]; } } diff --git a/app/Services/StudentFileExportService.php b/app/Services/FileExportService.php similarity index 93% rename from app/Services/StudentFileExportService.php rename to app/Services/FileExportService.php index ca50cac01f..10f31bae8d 100644 --- a/app/Services/StudentFileExportService.php +++ b/app/Services/FileExportService.php @@ -16,7 +16,7 @@ use Illuminate\Support\Facades\Storage; use ZipArchive; -class StudentFileExportService +class FileExportService { private string $mainPath; @@ -30,14 +30,15 @@ class StudentFileExportService private string $tempDisk = 'local'; private string $compressType = 'zip'; private int $student_folders_count = 0; + private bool $issueStudentRecordReport = true; public function __construct( - private FileExport $studentFileExport, + private FileExport $fileExport, private array $args, private string|null $disk = null ) { - $this->connection = $studentFileExport->getConnectionName(); + $this->connection = $fileExport->getConnectionName(); DB::setDefaultConnection($this->connection); //temp $this->mainPath = $this->getMainPath(); @@ -52,12 +53,12 @@ public function __construct( private function getMainPath(): string { - return "{$this->connection}/{$this->compressType}_temp/{$this->studentFileExport->hash}/"; + return "{$this->connection}/{$this->compressType}_temp/{$this->fileExport->hash}/"; } private function getFolderStudentsName(): string { - return $this->studentFileExport->filename; + return $this->fileExport->filename; } private function getFolderStudentsPath(): string @@ -72,10 +73,10 @@ private function getZipFilePath(): string private function getDestinyMainPath(): string { - return "{$this->connection}/{$this->compressType}/{$this->studentFileExport->hash}/"; + return "{$this->connection}/{$this->compressType}/{$this->fileExport->hash}/"; } - private function getDestinyZipFilePath(): string + public function getDestinyZipFilePath(): string { return $this->destinyMainPath . $this->folderStudentsName . '.' . $this->compressType; } @@ -228,7 +229,7 @@ private function getResourcePath(array $resource): string private function createStudentRecordReport(string $studentPath, LegacyRegistration $registration): bool { - if (!app()->bound(StudentRecordReport::class)) { + if (!$this->issueStudentRecordReport || !app()->bound(StudentRecordReport::class)) { return false; } $studentRecord = app(StudentRecordReport::class); @@ -344,7 +345,7 @@ private function getDestinyStorage(): Filesystem private function updateExporter(): void { - $this->studentFileExport->update([ + $this->fileExport->update([ 'url' => $this->getDestinyStorage()->url($this->destinyZipFilePath), 'status_id' => FileExportStatus::SUCCESS, 'size' => $this->getDestinyStorage()->size($this->destinyZipFilePath) @@ -354,7 +355,7 @@ private function updateExporter(): void private function notifyUser(): void { (new NotificationService())->createByUser( - userId: $this->studentFileExport->user_id, + userId: $this->fileExport->user_id, text: $this->getMessage(), link: $this->getDestinyStorage()->url($this->destinyZipFilePath), type: NotificationType::OTHER @@ -363,14 +364,25 @@ private function notifyUser(): void private function getMessage(): string { - return "Foram exportados os documentos de {$this->student_folders_count} alunos. Clique aqui para fazer download do arquivo {$this->studentFileExport->filename}."; + return "Foram exportados os documentos de {$this->student_folders_count} alunos. Clique aqui para fazer download do arquivo {$this->fileExport->filename}."; } public function failed(): void { $this->deleteMainFolder(); - $this->studentFileExport->update([ + $this->fileExport->update([ 'status_id' => FileExportStatus::ERROR ]); } + + /** + * @param bool $issueStudentRecordReport + * @return FileExportService + */ + public function setIssueStudentRecordReport(bool $issueStudentRecordReport): FileExportService + { + $this->issueStudentRecordReport = $issueStudentRecordReport; + + return $this; + } } From 78cc890b2bde5fe801962761aa95eeee848eaaaf Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 10:58:26 -0300 Subject: [PATCH 23/47] Cria teste para o exportador de documentos --- tests/Unit/Services/FileExportServiceTest.php | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 tests/Unit/Services/FileExportServiceTest.php diff --git a/tests/Unit/Services/FileExportServiceTest.php b/tests/Unit/Services/FileExportServiceTest.php new file mode 100644 index 0000000000..f9f92c9460 --- /dev/null +++ b/tests/Unit/Services/FileExportServiceTest.php @@ -0,0 +1,113 @@ +export = FileExportFactory::new()->create(); + + $count = DB::table('relatorio.situacao_matricula')->count(); + if ($count === 0) { + $seed = new DefaultRelatorioSituacaoMatriculaTableSeeder(); + $seed->run(); + } + $institution = LegacyInstitutionFactory::new()->create(); + $school = LegacySchoolFactory::new()->create([ + 'ref_cod_instituicao' => $institution->id, + ]); + $person = LegacyPersonFactory::new()->create(); + LegacyIndividualFactory::new()->create([ + 'idpes' => $person->idpes, + 'ativo' => 1, + ]); + $student = LegacyStudentFactory::new()->create([ + 'ref_idpes' => $person->idpes, + 'ativo' => 1, + ]); + $course = LegacyCourseFactory::new()->create([ + 'ref_cod_instituicao' => $institution->id, + ]); + $grade = LegacyGradeFactory::new()->create([ + 'ref_cod_curso' => $course->id, + ]); + LegacySchoolCourseFactory::new()->create([ + 'ref_cod_escola' => $school->id, + 'ref_cod_curso' => $course->id, + ]); + LegacySchoolGradeFactory::new()->create([ + 'ref_cod_escola' => $school->id, + 'ref_cod_serie' => $grade->id, + ]); + $registration = LegacyRegistrationFactory::new()->create([ + 'ref_cod_aluno' => $student->cod_aluno, + 'ref_ref_cod_serie' => $grade->id, + 'ref_cod_curso' => $course->id, + 'ref_ref_cod_escola' => $school->id, + 'ativo' => 1, + ]); + LegacyEvaluationRuleGradeYearFactory::new()->create([ + 'serie_id' => $grade->id, + 'ano_letivo' => now()->year, + ]); + $schoolClass = LegacySchoolClassFactory::new()->create([ + 'ref_ref_cod_serie' => $grade->id, + 'ref_cod_curso' => $course->id, + 'ref_ref_cod_escola' => $school->id, + 'ref_cod_instituicao' => $institution->id, + ]); + LegacyEnrollmentFactory::new()->active()->create([ + 'ref_cod_matricula' => $registration->id, + 'ref_cod_turma' => $schoolClass->id, + ]); + + $this->args = [ + 'year' => now()->year, + 'school' => $school->getKey(), + 'course' => $course->getKey(), + 'grade' => $grade->getKey(), + 'schoolClass' => $schoolClass->getKey() + ]; + } + + public function testExportService(): void + { + Queue::fake(); + Queue::assertNothingPushed(); + Queue::assertNotPushed(FileExporterJob::class); + FileExporterJob::dispatch($this->export, $this->args); + Queue::assertPushed(FileExporterJob::class, 1); + } +} From 2481e37c555ee6bf1e7147c131d1220bb45034dd Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 11:35:24 -0300 Subject: [PATCH 24/47] Adiciona teste do arquivo compactado --- tests/Unit/Services/FileExportServiceTest.php | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tests/Unit/Services/FileExportServiceTest.php b/tests/Unit/Services/FileExportServiceTest.php index f9f92c9460..623b1f56b3 100644 --- a/tests/Unit/Services/FileExportServiceTest.php +++ b/tests/Unit/Services/FileExportServiceTest.php @@ -2,9 +2,7 @@ namespace Tests\Unit\Services; -use App\Jobs\DatabaseToCsvExporter; use App\Jobs\FileExporterJob; -use App\Services\Exporter\ExportService; use App\Services\FileExportService; use Carbon\Carbon; use Database\Factories\FileExportFactory; @@ -38,7 +36,6 @@ public function setUp(): void { parent::setUp(); $this->export = FileExportFactory::new()->create(); - $count = DB::table('relatorio.situacao_matricula')->count(); if ($count === 0) { $seed = new DefaultRelatorioSituacaoMatriculaTableSeeder(); @@ -53,9 +50,17 @@ public function setUp(): void 'idpes' => $person->idpes, 'ativo' => 1, ]); + Storage::fake('local'); + Storage::disk('local')->put('student.jpg', 'content'); $student = LegacyStudentFactory::new()->create([ 'ref_idpes' => $person->idpes, 'ativo' => 1, + 'url_documento' => json_encode([ + [ + 'data' => now()->format('d/m/Y'), + 'url' => url(Storage::disk('local')->url('student.jpg')) + ] + ]) ]); $course = LegacyCourseFactory::new()->create([ 'ref_cod_instituicao' => $institution->id, @@ -92,8 +97,7 @@ public function setUp(): void 'ref_cod_matricula' => $registration->id, 'ref_cod_turma' => $schoolClass->id, ]); - - $this->args = [ + $this->args = [ 'year' => now()->year, 'school' => $school->getKey(), 'course' => $course->getKey(), @@ -109,5 +113,12 @@ public function testExportService(): void Queue::assertNotPushed(FileExporterJob::class); FileExporterJob::dispatch($this->export, $this->args); Queue::assertPushed(FileExporterJob::class, 1); + + $zipPath = "{$this->export->getConnectionName()}/zip/{$this->export->hash}/Alunos_" . Carbon::now()->format('Y-m-d_H:i') . '.zip'; + Storage::disk('local')->assertMissing($zipPath); + $service = new FileExportService($this->export, $this->args, 'local'); + $service->setIssueStudentRecordReport(false); + $service->execute(); + Storage::disk('local')->assertExists($zipPath); } } From d7f4e97d681dea7d4a9a9899592bd89779352060 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 13:57:01 -0300 Subject: [PATCH 25/47] =?UTF-8?q?Altera=20t=C3=ADtulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/file_export/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/file_export/index.blade.php b/resources/views/file_export/index.blade.php index 465cd73290..ff72c68aef 100644 --- a/resources/views/file_export/index.blade.php +++ b/resources/views/file_export/index.blade.php @@ -5,7 +5,7 @@ @endpush @section('content') -

Exportações de arquivos dos alunos

+

Exportações de documentos dos alunos

From a089b7f8818a9dfe2a06fbecf227b48fe6908963 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 18:47:05 -0300 Subject: [PATCH 26/47] =?UTF-8?q?Cria=20view=20para=20o=20select=20de=20ma?= =?UTF-8?q?tr=C3=ADculas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/lib/App/Model/IedFinder.php | 24 +++++++++++++++++++ resources/views/file_export/create.blade.php | 11 +++++++++ .../views/form/select-registration.blade.php | 22 +++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 resources/views/form/select-registration.blade.php diff --git a/ieducar/lib/App/Model/IedFinder.php b/ieducar/lib/App/Model/IedFinder.php index c5d62a1506..88219b7b1d 100644 --- a/ieducar/lib/App/Model/IedFinder.php +++ b/ieducar/lib/App/Model/IedFinder.php @@ -3,6 +3,7 @@ use App\Models\LegacyAcademicYearStage; use App\Models\LegacyDiscipline; use App\Models\LegacyDisciplineAcademicYear; +use App\Models\LegacyRegistration; use App\Models\LegacySchool; use App\Models\LegacySchoolClass; use App\Models\LegacySchoolClassStage; @@ -810,6 +811,29 @@ public static function getMatricula($codMatricula, $codTurma = null) return $matricula; } + /** + * Retorna um array populado com as matrículas de uma turma. + * + * @param int $codEscola + * @return array + * + */ + public static function getMatriculas($codTurma = null) + { + return LegacyRegistration::query() + ->with([ + 'student:cod_aluno,ref_idpes', + 'student.person:idpes,nome' + ]) + ->active() + ->whereSchoolClass($codTurma) + ->get([ + 'cod_matricula', + 'ref_cod_aluno' + ])->pluck('name', 'cod_matricula'); + } + + /** * Retorna uma instância de RegraAvaliacao_Model_Regra a partir dos dados * da matrícula. diff --git a/resources/views/file_export/create.blade.php b/resources/views/file_export/create.blade.php index 119557cd05..6362b067c9 100644 --- a/resources/views/file_export/create.blade.php +++ b/resources/views/file_export/create.blade.php @@ -65,6 +65,15 @@ @include('form.select-school-class') + + + + +
+ Matrícula + + @include('form.select-registration') +
@@ -93,6 +102,8 @@ src="{{ Asset::get("/vendor/legacy/DynamicInput/Assets/Javascripts/Serie.js") }}"> + @endprepend diff --git a/resources/views/form/select-registration.blade.php b/resources/views/form/select-registration.blade.php new file mode 100644 index 0000000000..c22731abd2 --- /dev/null +++ b/resources/views/form/select-registration.blade.php @@ -0,0 +1,22 @@ + + + + +@if(old('matricula', Request::get('matricula'))) + @push('scripts') + + @endpush +@endif From 5be5a1667771f3f285f34f573633c7394fb97153 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 18:48:29 -0300 Subject: [PATCH 27/47] =?UTF-8?q?Adiciona=20a=20exporta=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20apenas=20uma=20matr=C3=ADcula?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/FileExportController.php | 50 +++++++++++++++++-- app/Services/FileExportService.php | 24 +++++---- 2 files changed, 62 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/FileExportController.php b/app/Http/Controllers/FileExportController.php index 8f10fb4abf..9772a7b7a3 100644 --- a/app/Http/Controllers/FileExportController.php +++ b/app/Http/Controllers/FileExportController.php @@ -5,8 +5,10 @@ use App\Http\Requests\FileExportRequest; use App\Jobs\FileExporterJob; use App\Models\FileExport; +use App\Models\LegacyRegistration; +use App\Models\LegacySchool; +use App\Models\LegacySchoolClass; use App\Process; -use Carbon\Carbon; use Illuminate\Http\Request; class FileExportController extends Controller @@ -31,7 +33,11 @@ public function store(FileExportRequest $request) { $fileExport = FileExport::create([ 'user_id' => $request->user()->getKey(), - 'filename' => 'Alunos_' . Carbon::now()->format('Y-m-d_H:i') + 'filename' => $this->buildFileName( + schoolId: $request->get('ref_cod_escola'), + schoolClassId: $request->get('ref_cod_turma'), + registrationId: $request->get('matricula') + ) ]); FileExporterJob::dispatch( @@ -41,7 +47,8 @@ public function store(FileExportRequest $request) 'school' => $request->get('ref_cod_escola'), 'course' => $request->get('ref_cod_curso'), 'grade' => $request->get('ref_cod_serie'), - 'schoolClass' => $request->get('ref_cod_turma') + 'schoolClass' => $request->get('ref_cod_turma'), + 'registration' => $request->get('matricula'), ] ); @@ -58,4 +65,41 @@ public function create() return view('file_export.create'); } + + private function removeSpecialCharacters($string): string + { + return preg_replace('/[^\w\s]/u', '', $string); + } + + private function buildFileName(int $schoolId, int $schoolClassId, int|null $registrationId): string + { + if ($registrationId) { + $registration = LegacyRegistration::query()->find($registrationId, [ + 'cod_matricula', + 'ref_cod_aluno' + ]); + + return mb_strtoupper($this->removeSpecialCharacters($registration->name)) . " ({$registration->ref_cod_aluno})"; + } + + $school = LegacySchool::query()->with([ + 'person:idpes,nome', + 'organization:idpes,fantasia' + ])->find($schoolId, [ + 'cod_escola', + 'ref_idpes' + ]); + + $schoolClass = LegacySchoolClass::query() + ->whereKey($schoolClassId) + ->first([ + 'nm_turma', + 'ano' + ]); + + $schoolName = mb_strtoupper($this->removeSpecialCharacters($school->name)); + $schoolClassName = mb_strtoupper($this->removeSpecialCharacters($schoolClass->nm_turma)) . ' (' . $schoolClass->ano . ')'; + + return $schoolName . ' - ' . $schoolClassName; + } } diff --git a/app/Services/FileExportService.php b/app/Services/FileExportService.php index 10f31bae8d..68d494e8b4 100644 --- a/app/Services/FileExportService.php +++ b/app/Services/FileExportService.php @@ -100,15 +100,15 @@ private function createStudentsFolder(): void { $this->deleteMainFolder(); //limpa a pasta principal em caso de falhas anteriores $this->students = $this->getStudents(); - foreach ($this->students as $resource) { - $studentPath = $this->folderStudentsPath . $this->getResourcePath($resource); + foreach ($this->students as $student) { + $studentPath = $this->folderStudentsPath . $this->getStudentPath($student); $createStudentRecordReport = $this->createStudentRecordReport( studentPath: $studentPath, - registration: $resource['registration'] + registration: $student['registration'] ); $createStudentFiles = $this->createStudentFiles( studentPath: $studentPath, - files: $resource['files'] + files: $student['files'] ); //conta somente os alunos que tem arquivo if ($createStudentRecordReport || $createStudentFiles) { @@ -148,7 +148,8 @@ private function getStudents() 'yearEq' => $this->getarg('year'), 'school' => $this->getarg('school'), 'course' => $this->getarg('course'), - 'grade' => $this->getarg('grade') + 'grade' => $this->getarg('grade'), + 'registration' => $this->getarg('registration'), ]); $q->active(); $q->whereHas('lastEnrollment', function ($q) { @@ -162,7 +163,8 @@ private function getStudents() 'yearEq' => $this->getarg('year'), 'school' => $this->getarg('school'), 'course' => $this->getarg('course'), - 'grade' => $this->getarg('grade') + 'grade' => $this->getarg('grade'), + 'registration' => $this->getarg('registration'), ]); $q->active(); $q->whereHas('lastEnrollment', function ($q) { @@ -221,10 +223,10 @@ private function getExtension(string|null $url) return $path_parts['extension']; } - private function getResourcePath(array $resource): string + private function getStudentPath(array $student): string { //remove caracteres especiais e transforma em maiúsculo - return preg_replace('/[^\w\s]/u', '', mb_strtoupper($resource['name'])) . " - {$resource['id']}" . '/'; + return preg_replace('/[^\w\s]/u', '', mb_strtoupper($student['name'])) . " ({$student['id']})" . '/'; } private function createStudentRecordReport(string $studentPath, LegacyRegistration $registration): bool @@ -293,6 +295,10 @@ private function getPathFromUrl($url): string private function compressStudentsFolder(): void { + //se nao tiver documentos, deve-se colocar algum conteúdo para poder criar o zip + if ($this->student_folders_count === 0) { + $this->getStorageTemp()->put($this->folderStudentsPath . 'nenhum_documento_exportado.txt', ''); + } $zip = new ZipArchive; $zipFileFullPath = $this->getStorageTemp()->path($this->zipFilePath); if ($zip->open($zipFileFullPath, ZipArchive::CREATE | ZipArchive::OVERWRITE) === true) { @@ -318,7 +324,7 @@ private function getShortPathToCompress(string $fullPath): string $data = explode('/', $fullPath); $ultimaPasta = $data[count($data) - 2]; - return $ultimaPasta . '/' . $nomeArquivo; + return $this->getArg('registration') ? $nomeArquivo : $ultimaPasta . '/' . $nomeArquivo; } public function deleteStudentsFolder(): void From fd122992d35a82a5904f6fbf694c45a64e62ae88 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 8 Jan 2024 19:05:55 -0300 Subject: [PATCH 28/47] =?UTF-8?q?Adiciona=20o=20par=C3=A2metro=20database?= =?UTF-8?q?=20no=20relat=C3=B3rio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/FileExportService.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Services/FileExportService.php b/app/Services/FileExportService.php index 68d494e8b4..123bc68a64 100644 --- a/app/Services/FileExportService.php +++ b/app/Services/FileExportService.php @@ -244,6 +244,7 @@ private function createStudentRecordReport(string $studentPath, LegacyRegistrati $studentRecord->addArg('turma', $registration->lastEnrollment->ref_cod_turma); $studentRecord->addArg('situacao', 9); $studentRecord->addArg('matricula', $registration->cod_matricula); + $studentRecord->addArg('database', $this->fileExport->getConnectionName()); $studentRecord->addArg('termo_declaracao', config('legacy.report.ficha_do_aluno.termo_declaracao')); $studentRecord->addArg('SUBREPORT_DIR', config('legacy.report.source_path')); $studentRecord->addArg('data_emissao', 0); From c74292571056585876034a5e96cc6a73a88839d7 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Tue, 9 Jan 2024 08:15:41 -0300 Subject: [PATCH 29/47] =?UTF-8?q?Remove=20servi=C3=A7o=20do=20construct=20?= =?UTF-8?q?da=20job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Jobs/FileExporterJob.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/Jobs/FileExporterJob.php b/app/Jobs/FileExporterJob.php index b4baa1337a..98a8ba74b7 100644 --- a/app/Jobs/FileExporterJob.php +++ b/app/Jobs/FileExporterJob.php @@ -24,21 +24,18 @@ class FileExporterJob implements ShouldQueue public $retryAfter = 5; - private FileExportService $fileExportService; - public function __construct(private FileExport $fileExport, private array $args) { - $this->fileExportService = new FileExportService($this->fileExport, $this->args); } public function handle() { - $this->fileExportService->execute(); + (new FileExportService($this->fileExport, $this->args))->execute(); } public function failed(Throwable $exception) { - $this->fileExportService->failed(); + (new FileExportService($this->fileExport, $this->args))->failed(); } public function tags(): array From c486d648834e0b9b653e797be1706d50241ad5ec Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Tue, 9 Jan 2024 09:44:58 -0300 Subject: [PATCH 30/47] =?UTF-8?q?Adiciona=20as=20configura=C3=A7=C3=B5es?= =?UTF-8?q?=20dos=20relat=C3=B3rios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/FileExportService.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/app/Services/FileExportService.php b/app/Services/FileExportService.php index 123bc68a64..6376773fad 100644 --- a/app/Services/FileExportService.php +++ b/app/Services/FileExportService.php @@ -3,10 +3,11 @@ namespace App\Services; use App\Models\Enums\FileExportStatus; +use App\Models\FileExport; use App\Models\LegacyRegistration; use App\Models\LegacyStudent; use App\Models\NotificationType; -use App\Models\FileExport; +use App\Setting; use Exception; use iEducar\Reports\Contracts\StudentRecordReport; use Illuminate\Contracts\Filesystem\Filesystem; @@ -40,6 +41,7 @@ public function __construct( { $this->connection = $fileExport->getConnectionName(); DB::setDefaultConnection($this->connection); + $this->setReportConfigs(); //temp $this->mainPath = $this->getMainPath(); $this->folderStudentsName = $this->getFolderStudentsName(); @@ -93,6 +95,23 @@ public function execute(): void $this->notifyUser(); } + private function setReportConfigs(): void + { + if (!$this->issueStudentRecordReport) { + return; + } + + if ($value = Setting::where('key', $key = 'legacy.report.logo_file_name')->value('value')) { + config()->set($key, $value); + } + if ($value = Setting::where('key', $key = 'legacy.report.ficha_do_aluno.termo_declaracao')->value('value')) { + config()->set($key, $value); + } + if ($value = Setting::where('key', $key = 'legacy.report.source_path')->value('value')) { + config()->set($key, $value); + } + } + /** * @throws Exception */ From 4cf083b2352422cbc5597f32c1cef0d86bbe80d7 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Tue, 9 Jan 2024 11:16:03 -0300 Subject: [PATCH 31/47] =?UTF-8?q?Move=20local=20do=20boot=20da=20conex?= =?UTF-8?q?=C3=A3o=20e=20das=20configs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Jobs/FileExporterJob.php | 14 ++++++++++++++ app/Services/FileExportService.php | 23 +---------------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/app/Jobs/FileExporterJob.php b/app/Jobs/FileExporterJob.php index 98a8ba74b7..e49f680c91 100644 --- a/app/Jobs/FileExporterJob.php +++ b/app/Jobs/FileExporterJob.php @@ -4,11 +4,14 @@ use App\Models\FileExport; use App\Services\FileExportService; +use App\Setting; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\Config; +use Illuminate\Support\Facades\DB; use Throwable; class FileExporterJob implements ShouldQueue @@ -26,6 +29,17 @@ class FileExporterJob implements ShouldQueue public function __construct(private FileExport $fileExport, private array $args) { + DB::setDefaultConnection($fileExport->getConnectionName()); + + if ($value = Setting::where('key', $key = 'legacy.report.logo_file_name')->value('value')) { + config()->set($key, $value); + } + if ($value = Setting::where('key', $key = 'legacy.report.ficha_do_aluno.termo_declaracao')->value('value')) { + config()->set($key, $value); + } + if ($value = Setting::where('key', $key = 'legacy.report.source_path')->value('value')) { + config()->set($key, $value); + } } public function handle() diff --git a/app/Services/FileExportService.php b/app/Services/FileExportService.php index 6376773fad..4983169fcb 100644 --- a/app/Services/FileExportService.php +++ b/app/Services/FileExportService.php @@ -7,13 +7,11 @@ use App\Models\LegacyRegistration; use App\Models\LegacyStudent; use App\Models\NotificationType; -use App\Setting; use Exception; use iEducar\Reports\Contracts\StudentRecordReport; use Illuminate\Contracts\Filesystem\Filesystem; use Illuminate\Support\Arr; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Storage; use ZipArchive; @@ -40,8 +38,6 @@ public function __construct( ) { $this->connection = $fileExport->getConnectionName(); - DB::setDefaultConnection($this->connection); - $this->setReportConfigs(); //temp $this->mainPath = $this->getMainPath(); $this->folderStudentsName = $this->getFolderStudentsName(); @@ -95,23 +91,6 @@ public function execute(): void $this->notifyUser(); } - private function setReportConfigs(): void - { - if (!$this->issueStudentRecordReport) { - return; - } - - if ($value = Setting::where('key', $key = 'legacy.report.logo_file_name')->value('value')) { - config()->set($key, $value); - } - if ($value = Setting::where('key', $key = 'legacy.report.ficha_do_aluno.termo_declaracao')->value('value')) { - config()->set($key, $value); - } - if ($value = Setting::where('key', $key = 'legacy.report.source_path')->value('value')) { - config()->set($key, $value); - } - } - /** * @throws Exception */ @@ -263,7 +242,7 @@ private function createStudentRecordReport(string $studentPath, LegacyRegistrati $studentRecord->addArg('turma', $registration->lastEnrollment->ref_cod_turma); $studentRecord->addArg('situacao', 9); $studentRecord->addArg('matricula', $registration->cod_matricula); - $studentRecord->addArg('database', $this->fileExport->getConnectionName()); + $studentRecord->addArg('database', $this->connection); $studentRecord->addArg('termo_declaracao', config('legacy.report.ficha_do_aluno.termo_declaracao')); $studentRecord->addArg('SUBREPORT_DIR', config('legacy.report.source_path')); $studentRecord->addArg('data_emissao', 0); From 3cacd219b13b06b5803dfd2d210173c913b5ae6c Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Tue, 9 Jan 2024 11:23:44 -0300 Subject: [PATCH 32/47] =?UTF-8?q?Retorna=20as=20configura=C3=A7=C3=B5es=20?= =?UTF-8?q?para=20o=20servi=C3=A7o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Jobs/FileExporterJob.php | 10 ---------- app/Services/FileExportService.php | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/Jobs/FileExporterJob.php b/app/Jobs/FileExporterJob.php index e49f680c91..b2a243f9db 100644 --- a/app/Jobs/FileExporterJob.php +++ b/app/Jobs/FileExporterJob.php @@ -30,16 +30,6 @@ class FileExporterJob implements ShouldQueue public function __construct(private FileExport $fileExport, private array $args) { DB::setDefaultConnection($fileExport->getConnectionName()); - - if ($value = Setting::where('key', $key = 'legacy.report.logo_file_name')->value('value')) { - config()->set($key, $value); - } - if ($value = Setting::where('key', $key = 'legacy.report.ficha_do_aluno.termo_declaracao')->value('value')) { - config()->set($key, $value); - } - if ($value = Setting::where('key', $key = 'legacy.report.source_path')->value('value')) { - config()->set($key, $value); - } } public function handle() diff --git a/app/Services/FileExportService.php b/app/Services/FileExportService.php index 4983169fcb..626469c6fa 100644 --- a/app/Services/FileExportService.php +++ b/app/Services/FileExportService.php @@ -7,6 +7,7 @@ use App\Models\LegacyRegistration; use App\Models\LegacyStudent; use App\Models\NotificationType; +use App\Setting; use Exception; use iEducar\Reports\Contracts\StudentRecordReport; use Illuminate\Contracts\Filesystem\Filesystem; @@ -38,6 +39,16 @@ public function __construct( ) { $this->connection = $fileExport->getConnectionName(); + + if ($value = Setting::where('key', $key = 'legacy.report.logo_file_name')->value('value')) { + config()->set($key, $value); + } + if ($value = Setting::where('key', $key = 'legacy.report.ficha_do_aluno.termo_declaracao')->value('value')) { + config()->set($key, $value); + } + if ($value = Setting::where('key', $key = 'legacy.report.source_path')->value('value')) { + config()->set($key, $value); + } //temp $this->mainPath = $this->getMainPath(); $this->folderStudentsName = $this->getFolderStudentsName(); From 9fffd8a5092bf72d21b387bd50b91e9d7689f252 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Tue, 9 Jan 2024 11:32:38 -0300 Subject: [PATCH 33/47] =?UTF-8?q?Remove=20a=20configura=C3=A7=C3=A3o=20da?= =?UTF-8?q?=20conex=C3=A3o=20do=20construct=20do=20job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Jobs/FileExporterJob.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Jobs/FileExporterJob.php b/app/Jobs/FileExporterJob.php index b2a243f9db..e530d6c71b 100644 --- a/app/Jobs/FileExporterJob.php +++ b/app/Jobs/FileExporterJob.php @@ -29,16 +29,17 @@ class FileExporterJob implements ShouldQueue public function __construct(private FileExport $fileExport, private array $args) { - DB::setDefaultConnection($fileExport->getConnectionName()); } public function handle() { + DB::setDefaultConnection($this->fileExport->getConnectionName()); (new FileExportService($this->fileExport, $this->args))->execute(); } public function failed(Throwable $exception) { + DB::setDefaultConnection($this->fileExport->getConnectionName()); (new FileExportService($this->fileExport, $this->args))->failed(); } From 1705bb27f74d4c80f63b1bcde72c4dbb521ffaba Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Tue, 9 Jan 2024 11:45:02 -0300 Subject: [PATCH 34/47] =?UTF-8?q?Organiza=20o=20boot=20da=20conex=C3=A3o?= =?UTF-8?q?=20e=20das=20configs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Jobs/FileExporterJob.php | 15 +++++++++++++-- app/Services/FileExportService.php | 9 --------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/Jobs/FileExporterJob.php b/app/Jobs/FileExporterJob.php index e530d6c71b..cc937ab192 100644 --- a/app/Jobs/FileExporterJob.php +++ b/app/Jobs/FileExporterJob.php @@ -33,16 +33,27 @@ public function __construct(private FileExport $fileExport, private array $args) public function handle() { - DB::setDefaultConnection($this->fileExport->getConnectionName()); + $this->setConnection(); + $this->setConfigs(); (new FileExportService($this->fileExport, $this->args))->execute(); } public function failed(Throwable $exception) { - DB::setDefaultConnection($this->fileExport->getConnectionName()); + $this->setConnection(); (new FileExportService($this->fileExport, $this->args))->failed(); } + private function setConnection(): void + { + DB::setDefaultConnection($this->fileExport->getConnectionName()); + } + + private function setConfigs(): void + { + Config::set(Setting::all()->pluck('value', 'key')->toArray()); + } + public function tags(): array { return [ diff --git a/app/Services/FileExportService.php b/app/Services/FileExportService.php index 626469c6fa..2c5f454a8e 100644 --- a/app/Services/FileExportService.php +++ b/app/Services/FileExportService.php @@ -40,15 +40,6 @@ public function __construct( { $this->connection = $fileExport->getConnectionName(); - if ($value = Setting::where('key', $key = 'legacy.report.logo_file_name')->value('value')) { - config()->set($key, $value); - } - if ($value = Setting::where('key', $key = 'legacy.report.ficha_do_aluno.termo_declaracao')->value('value')) { - config()->set($key, $value); - } - if ($value = Setting::where('key', $key = 'legacy.report.source_path')->value('value')) { - config()->set($key, $value); - } //temp $this->mainPath = $this->getMainPath(); $this->folderStudentsName = $this->getFolderStudentsName(); From cb284fc9072f7171564482cad2f9610d2bf18e8f Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Tue, 9 Jan 2024 17:53:06 -0300 Subject: [PATCH 35/47] Altera para o tempo para 5 minutos em casos de erro --- app/Models/FileExport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/FileExport.php b/app/Models/FileExport.php index db602fb7c9..a5ea9d0b2d 100644 --- a/app/Models/FileExport.php +++ b/app/Models/FileExport.php @@ -56,7 +56,7 @@ protected function sizeFormat(): Attribute public function statusIsError(): bool { - return $this->status_id === FileExportStatus::ERROR->value || ($this->statusIsWaiting() && $this->created_at < now()->subMinutes(30)); + return $this->status_id === FileExportStatus::ERROR->value || ($this->statusIsWaiting() && $this->created_at < now()->subMinutes(5)); } public function statusIsWaiting(): bool From 6b0b3d913e5ffc6bd8f9365857593359ee028843 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Tue, 9 Jan 2024 22:39:15 -0300 Subject: [PATCH 36/47] =?UTF-8?q?Melhora=20organiza=C3=A7=C3=A3o=20as=20va?= =?UTF-8?q?ri=C3=A1veis=20do=20relat=C3=B3rio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/FileExportService.php | 45 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/app/Services/FileExportService.php b/app/Services/FileExportService.php index 2c5f454a8e..9c79a25348 100644 --- a/app/Services/FileExportService.php +++ b/app/Services/FileExportService.php @@ -7,7 +7,6 @@ use App\Models\LegacyRegistration; use App\Models\LegacyStudent; use App\Models\NotificationType; -use App\Setting; use Exception; use iEducar\Reports\Contracts\StudentRecordReport; use Illuminate\Contracts\Filesystem\Filesystem; @@ -174,6 +173,7 @@ private function getStudents() }) ->get() ->map(function (LegacyStudent $student) { + //documentos $files = collect(json_decode($student->url_documento, false)) ->map(function ($file, $index) { $number = sprintf("%02d", $index + 1); @@ -183,6 +183,7 @@ private function getStudents() 'url' => $file->url, ]; }); + //laudos $files = $files->merge(collect(json_decode($student->url_laudo_medico, false)) ->map(function ($file, $index) { $number = sprintf("%02d", $index + 1); @@ -192,6 +193,7 @@ private function getStudents() 'url' => $file->url, ]; })); + //foto if ($student->picture) { $files->push([ 'filename' => 'Foto.' . $this->getExtension($student->picture->caminho), @@ -235,19 +237,22 @@ private function createStudentRecordReport(string $studentPath, LegacyRegistrati return false; } $studentRecord = app(StudentRecordReport::class); - $studentRecord->addArg('ano', $registration->ano); - $studentRecord->addArg('instituicao', $registration->school->ref_cod_instituicao); - $studentRecord->addArg('escola', $registration->ref_ref_cod_escola); - $studentRecord->addArg('modelo', 1); - $studentRecord->addArg('curso', $registration->ref_cod_curso); - $studentRecord->addArg('serie', $registration->ref_ref_cod_serie); - $studentRecord->addArg('turma', $registration->lastEnrollment->ref_cod_turma); - $studentRecord->addArg('situacao', 9); - $studentRecord->addArg('matricula', $registration->cod_matricula); - $studentRecord->addArg('database', $this->connection); - $studentRecord->addArg('termo_declaracao', config('legacy.report.ficha_do_aluno.termo_declaracao')); - $studentRecord->addArg('SUBREPORT_DIR', config('legacy.report.source_path')); - $studentRecord->addArg('data_emissao', 0); + $studentRecord->args = [ + 'ano' => $registration->ano, + 'instituicao' => $registration->school->ref_cod_instituicao, + 'escola' => $registration->ref_ref_cod_escola, + 'modelo' => 1, + 'curso' => $registration->ref_cod_curso, + 'serie' => $registration->ref_ref_cod_serie, + 'turma' => $registration->lastEnrollment->ref_cod_turma, + 'situacao' => 9, + 'matricula' => $registration->getKey(), + 'database' => $this->connection, + 'termo_declaracao' => config('legacy.report.ficha_do_aluno.termo_declaracao'), + 'SUBREPORT_DIR' => config('legacy.report.source_path'), + 'data_emissao' => 0 + ]; + //precisa ignorar os erros devido o legado $encoded = @$studentRecord->dumps([ 'options' => [ @@ -286,9 +291,9 @@ private function getPathFromUrl($url): string // Remove a barra inicial, se houver $path = ltrim($path, '/'); // Encontrar a posição de "storage/" e pegar a parte após isso - $posicaoStorage = strpos($path, 'storage/'); - if ($posicaoStorage !== false) { - $path = substr($path, $posicaoStorage + strlen('storage/')); + $positionStorage = strpos($path, 'storage/'); + if ($positionStorage !== false) { + $path = substr($path, $positionStorage + strlen('storage/')); } return $path; @@ -382,11 +387,7 @@ public function failed(): void ]); } - /** - * @param bool $issueStudentRecordReport - * @return FileExportService - */ - public function setIssueStudentRecordReport(bool $issueStudentRecordReport): FileExportService + public function setIssueStudentRecordReport(bool $issueStudentRecordReport): self { $this->issueStudentRecordReport = $issueStudentRecordReport; From e67304d1bc9f75c2f9342f6cd4acc4d2223da71a Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Fri, 12 Jan 2024 11:28:21 -0300 Subject: [PATCH 37/47] =?UTF-8?q?Adiciona=20valida=C3=A7=C3=A3o=20para=20o?= =?UTF-8?q?=20ano=20letivo=20aberto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/intranet/educar_avancar_mod_cad.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ieducar/intranet/educar_avancar_mod_cad.php b/ieducar/intranet/educar_avancar_mod_cad.php index dfb91f0568..50f2624972 100644 --- a/ieducar/intranet/educar_avancar_mod_cad.php +++ b/ieducar/intranet/educar_avancar_mod_cad.php @@ -50,6 +50,12 @@ public function Novo() ->active() ->get(['id']); + if ($anoLetivos->isEmpty()) { + Session::now('notice', "Nenhum aluno letivo aberto para {$anoLetivo}."); + + return false; + } + $this->data_matricula = Portabilis_Date_Utils::brToPgSQL(date: $this->data_matricula); if ($anoLetivos->count() > 1) { From 59aab19b4cbabcbabf49731e1e4443116cea5dc0 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Fri, 12 Jan 2024 11:39:07 -0300 Subject: [PATCH 38/47] =?UTF-8?q?Adiciona=20valida=C3=A7=C3=A3o=20para=20o?= =?UTF-8?q?=20ano=20de=20destino?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/intranet/educar_avancar_mod_cad.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ieducar/intranet/educar_avancar_mod_cad.php b/ieducar/intranet/educar_avancar_mod_cad.php index 50f2624972..f8f6aaa769 100644 --- a/ieducar/intranet/educar_avancar_mod_cad.php +++ b/ieducar/intranet/educar_avancar_mod_cad.php @@ -42,6 +42,7 @@ public function Gerar() public function Novo() { $anoLetivo = request('ano_letivo'); + $ano = request('ano'); $anoLetivos = LegacySchoolAcademicYear::query() ->whereSchool($this->ref_cod_escola) @@ -50,6 +51,12 @@ public function Novo() ->active() ->get(['id']); + if ($anoLetivo < $ano) { + Session::now('notice', "O ano de destino ({$anoLetivo}) deve ser maior ou igual que o atual ({$ano})."); + + return false; + } + if ($anoLetivos->isEmpty()) { Session::now('notice', "Nenhum aluno letivo aberto para {$anoLetivo}."); From 65038fa4e4e24faeb14d0a2599242f08c0fdca7f Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Sat, 13 Jan 2024 15:57:15 -0300 Subject: [PATCH 39/47] =?UTF-8?q?2=C2=BA=20fase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../educar_exportacao_2_fase_educacenso.php | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 ieducar/intranet/educar_exportacao_2_fase_educacenso.php diff --git a/ieducar/intranet/educar_exportacao_2_fase_educacenso.php b/ieducar/intranet/educar_exportacao_2_fase_educacenso.php new file mode 100644 index 0000000000..bec130fc53 --- /dev/null +++ b/ieducar/intranet/educar_exportacao_2_fase_educacenso.php @@ -0,0 +1,85 @@ +permissao_cadastra( + int_processo_ap: $codigoMenu, + int_idpes_usuario: $this->pessoa_logada, + int_soma_nivel_acesso: 7, + str_pagina_redirecionar: 'educar_index.php' + ); + $this->ref_cod_instituicao = $obj_permissoes->getInstituicao($this->pessoa_logada); + + $nomeTela = '2ª fase - Situação final'; + + $this->breadcrumb(currentPage: $nomeTela, breadcrumbs: [ + url('intranet/educar_educacenso_index.php') => 'Educacenso', + ]); + + $exportacao = $_POST['exportacao']; + + if ($exportacao) { + $converted_to_iso88591 = mb_convert_encoding($exportacao, 'ISO-8859-1', 'UTF-8'); + + $inepEscola = DB::selectOne('SELECT cod_escola_inep FROM modules.educacenso_cod_escola WHERE cod_escola = ?', [$_POST['escola']]); + + $nomeArquivo = $inepEscola->cod_escola_inep . '_' . date('dm_Hi') . '.txt'; + + header('Content-type: text/plain'); + header('Content-Length: ' . strlen($converted_to_iso88591)); + header('Content-Disposition: attachment; filename=' . $nomeArquivo); + echo $converted_to_iso88591; + exit(); + } + + $this->acao_enviar = 'acaoExportar();'; + + return 'Nova exportação'; + } + + public function Gerar() + { + $this->campoOculto(nome: 'enable_export', valor: (int) config('legacy.educacenso.enable_export')); + $this->inputsHelper()->dynamic(['ano', 'instituicao', 'escola']); + $this->inputsHelper()->hidden(attrName: 'escola_em_andamento', inputOptions: ['value' => $this->escola_em_andamento]); + + if (!empty($this->ref_cod_escola)) { + Portabilis_View_Helper_Application::loadJavascript(viewInstance: $this, files: '/vendor/legacy/Educacenso/Assets/Javascripts/Educacenso.js'); + } + } + + public function Novo() + { + return false; + } + + public function makeExtra() + { + return file_get_contents(__DIR__ . '/scripts/extra/educar-exportacao-educacenso.js'); + } + + public function Formular() + { + $this->title = 'Exportação Educacenso'; + $this->processoAp = 846; + } +}; From 2baa8187259a26f90b513f7b8d4f2631e5e6821e Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 15 Jan 2024 09:28:25 -0300 Subject: [PATCH 40/47] Ajusta label do campo data de retorno/abondono --- ieducar/intranet/educar_busca_ativa_cad.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieducar/intranet/educar_busca_ativa_cad.php b/ieducar/intranet/educar_busca_ativa_cad.php index ae686508a4..1338b4629d 100644 --- a/ieducar/intranet/educar_busca_ativa_cad.php +++ b/ieducar/intranet/educar_busca_ativa_cad.php @@ -107,7 +107,7 @@ public function Gerar() $dataFim = $this->data_fim ? (new DateTime(datetime: $this->data_fim))->format(format: 'd/m/Y') : null; $this->inputsHelper()->date(attrName: 'data_fim', inputOptions: [ - 'label' => 'Data de retorno/abandono', + 'label' => 'Data de encerramento', 'placeholder' => 'dd/mm/yyyy', 'required' => false, 'value' => $dataFim, From c74ed97098db694dbc9dba86b313a6d42258db7a Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 15 Jan 2024 10:37:42 -0300 Subject: [PATCH 41/47] =?UTF-8?q?Adiciona=20transfer=C3=AAncia=20no=20resu?= =?UTF-8?q?ltado=20da=20busca=20ativa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/intranet/educar_busca_ativa_cad.php | 6 ++++ .../educar_transferencia_solicitacao_cad.php | 33 ++++++++++++++++--- src/Modules/School/Model/ActiveLooking.php | 4 +++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/ieducar/intranet/educar_busca_ativa_cad.php b/ieducar/intranet/educar_busca_ativa_cad.php index 1338b4629d..9f706045c0 100644 --- a/ieducar/intranet/educar_busca_ativa_cad.php +++ b/ieducar/intranet/educar_busca_ativa_cad.php @@ -175,6 +175,12 @@ public function Novo() return true; } + if ($this->resultado_busca_ativa == ActiveLooking::ACTIVE_LOOKING_TRANSFER_RESULT) { + $this->simpleRedirect(url: 'educar_transferencia_solicitacao_cad.php?ref_cod_matricula=' . $this->ref_cod_matricula . '&ref_cod_aluno=' . $this->ref_cod_aluno); + + return true; + } + $this->simpleRedirect(url: 'educar_busca_ativa_lst.php?ref_cod_matricula=' . $this->ref_cod_matricula); return true; diff --git a/ieducar/intranet/educar_transferencia_solicitacao_cad.php b/ieducar/intranet/educar_transferencia_solicitacao_cad.php index 4da96da6a0..1ec92daeab 100644 --- a/ieducar/intranet/educar_transferencia_solicitacao_cad.php +++ b/ieducar/intranet/educar_transferencia_solicitacao_cad.php @@ -1,11 +1,13 @@ where('ref_cod_matricula', $this->ref_cod_matricula) + ->where('resultado_busca_ativa', ActiveLooking::ACTIVE_LOOKING_IN_PROGRESS_RESULT) + ->update([ + 'resultado_busca_ativa' => ActiveLooking::ACTIVE_LOOKING_TRANSFER_RESULT, + 'data_fim' => $this->data_cancel, + ]); DB::commit(); @@ -298,10 +308,25 @@ public function Excluir() $obj_transferencia = new clsPmieducarTransferenciaSolicitacao(); $lst_transferencia = $obj_transferencia->lista(int_ref_cod_matricula_saida: $this->ref_cod_matricula, int_ativo: 1, int_ref_cod_aluno: $this->ref_cod_aluno); if (is_array(value: $lst_transferencia)) { - $det_transferencia = array_shift(array: $lst_transferencia); - $this->cod_transferencia_solicitacao = $det_transferencia['cod_transferencia_solicitacao']; - $obj = new clsPmieducarTransferenciaSolicitacao(cod_transferencia_solicitacao: $this->cod_transferencia_solicitacao, ref_cod_transferencia_tipo: null, ref_usuario_exc: $this->pessoa_logada, ref_usuario_cad: null, ref_cod_matricula_entrada: null, ref_cod_matricula_saida: null, observacao: null, data_cadastro: null, data_exclusao: null, ativo: 0); - $excluiu = $obj->excluir(); + try { + DB::beginTransaction(); + $det_transferencia = array_shift(array: $lst_transferencia); + $this->cod_transferencia_solicitacao = $det_transferencia['cod_transferencia_solicitacao']; + $obj = new clsPmieducarTransferenciaSolicitacao(cod_transferencia_solicitacao: $this->cod_transferencia_solicitacao, ref_cod_transferencia_tipo: null, ref_usuario_exc: $this->pessoa_logada, ref_usuario_cad: null, ref_cod_matricula_entrada: null, ref_cod_matricula_saida: null, observacao: null, data_cadastro: null, data_exclusao: null, ativo: 0); + $excluiu = $obj->excluir(); + //Desfaz a busca ativa com transferencia + LegacyActiveLooking::query() + ->where('ref_cod_matricula', $this->ref_cod_matricula) + ->where('resultado_busca_ativa', ActiveLooking::ACTIVE_LOOKING_TRANSFER_RESULT) + ->update([ + 'resultado_busca_ativa' => ActiveLooking::ACTIVE_LOOKING_IN_PROGRESS_RESULT, + 'data_fim' => null, + ]); + DB::commit(); + } catch (Exception) { + DB::rollBack(); + } + if ($excluiu) { $this->mensagem = 'Exclusão efetuada com sucesso.
'; $this->simpleRedirect(url: "educar_matricula_det.php?cod_matricula={$this->ref_cod_matricula}"); diff --git a/src/Modules/School/Model/ActiveLooking.php b/src/Modules/School/Model/ActiveLooking.php index f7257ecb41..51c8a151c7 100644 --- a/src/Modules/School/Model/ActiveLooking.php +++ b/src/Modules/School/Model/ActiveLooking.php @@ -16,11 +16,14 @@ class ActiveLooking public const ACTIVE_LOOKING_WITHOUT_ABSENCE_RESULT = 4; + public const ACTIVE_LOOKING_TRANSFER_RESULT = 5; + public static function getDescriptiveValues(): array { return [ self::ACTIVE_LOOKING_IN_PROGRESS_RESULT => 'Em andamento', self::ACTIVE_LOOKING_ABANDONMENT_RESULT => 'Abandono', + self::ACTIVE_LOOKING_TRANSFER_RESULT => 'Transferência', self::ACTIVE_LOOKING_WITH_ABSENCE_RESULT => 'Retorno com ausência justificada', self::ACTIVE_LOOKING_WITHOUT_ABSENCE_RESULT => 'Retorno sem ausência justificada', ]; @@ -31,6 +34,7 @@ public static function getShortDescriptiveValues(): array return [ self::ACTIVE_LOOKING_IN_PROGRESS_RESULT => 'Em andamento', self::ACTIVE_LOOKING_ABANDONMENT_RESULT => 'Abandono', + self::ACTIVE_LOOKING_TRANSFER_RESULT => 'Transferência', self::ACTIVE_LOOKING_WITH_ABSENCE_RESULT => 'Retorno c/ AJ', self::ACTIVE_LOOKING_WITHOUT_ABSENCE_RESULT => 'Retorno s/ AJ', ]; From ab8867694ff1d38835bfa74e435afbc000020c9c Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 15 Jan 2024 10:42:52 -0300 Subject: [PATCH 42/47] Atualiza endpoint na api da busca ativa --- ieducar/modules/Api/Views/MatriculaController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/ieducar/modules/Api/Views/MatriculaController.php b/ieducar/modules/Api/Views/MatriculaController.php index cf0a461f6d..f559e60d98 100644 --- a/ieducar/modules/Api/Views/MatriculaController.php +++ b/ieducar/modules/Api/Views/MatriculaController.php @@ -969,6 +969,7 @@ protected function getBuscaAtiva() WHEN 1 THEN 'Abandono'::varchar WHEN 3 THEN 'Retorno com ausência justificada'::varchar WHEN 4 THEN 'Retorno sem ausência justificada'::varchar + WHEN 5 THEN 'Transferência'::varchar ELSE 'Em andamento'::varchar END AS resulta_busca_ativa_text") ->join('pmieducar.matricula', 'ref_cod_matricula', '=', 'cod_matricula') ->where('ano', $ano); From e81bec83a5032daa0e43fd4682e9d8e15abf53ec Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Mon, 15 Jan 2024 12:28:44 -0300 Subject: [PATCH 43/47] Adiciona upload de arquivo no cadastro da busca ativa --- app/Models/LegacyActiveLooking.php | 1 + .../Exemption/ActiveLookingService.php | 1 + ieducar/intranet/educar_busca_ativa_cad.php | 44 ++++++++++++++++++- 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/app/Models/LegacyActiveLooking.php b/app/Models/LegacyActiveLooking.php index fda5bf4d2c..c8c8de79ee 100644 --- a/app/Models/LegacyActiveLooking.php +++ b/app/Models/LegacyActiveLooking.php @@ -17,6 +17,7 @@ class LegacyActiveLooking extends LegacyModel { use SoftDeletes; + use HasFiles; /** * @var string diff --git a/app/Services/Exemption/ActiveLookingService.php b/app/Services/Exemption/ActiveLookingService.php index 8e2d1c5302..a41ebd465a 100644 --- a/app/Services/Exemption/ActiveLookingService.php +++ b/app/Services/Exemption/ActiveLookingService.php @@ -20,6 +20,7 @@ public function store(LegacyActiveLooking $activeLooking, LegacyRegistration $re )->validate(); $activeLooking->save(); + return $activeLooking; } public function delete(LegacyActiveLooking $activeLooking) diff --git a/ieducar/intranet/educar_busca_ativa_cad.php b/ieducar/intranet/educar_busca_ativa_cad.php index 9f706045c0..e1044f9eb4 100644 --- a/ieducar/intranet/educar_busca_ativa_cad.php +++ b/ieducar/intranet/educar_busca_ativa_cad.php @@ -4,6 +4,8 @@ use App\Models\LegacyRegistration; use App\Process; use App\Services\Exemption\ActiveLookingService; +use App\Services\FileService; +use App\Services\UrlPresigner; use iEducar\Modules\School\Model\ActiveLooking; use iEducar\Support\View\SelectOptions; use Illuminate\Support\Carbon; @@ -92,6 +94,8 @@ public function Inicializar() public function Gerar() { + $this->form_enctype = ' enctype=\'multipart/form-data\''; + // primary keys $this->campoOculto(nome: 'ref_cod_matricula', valor: $this->ref_cod_matricula); @@ -134,6 +138,15 @@ public function Gerar() ]; $this->inputsHelper()->textArea(attrName: 'observacoes', inputOptions: $textAreaSettings); + if (empty($this->id)) { + $this->id = null; + } + + $fileService = new FileService(new UrlPresigner()); + $files = $fileService->getFiles(LegacyActiveLooking::find($this->id)); + + $this->addHtml(view('uploads.upload', ['files' => $files])->render()); + $this->url_cancelar = 'educar_busca_ativa_lst.php?ref_cod_matricula=' . $this->ref_cod_matricula; $this->nome_url_cancelar = 'Cancelar'; @@ -154,7 +167,28 @@ public function Novo() try { DB::beginTransaction(); - $activeLookingService->store(activeLooking: $legacyActiveLooking, registration: $legacyRegistration); + $activeLooking = $activeLookingService->store(activeLooking: $legacyActiveLooking, registration: $legacyRegistration); + + $fileService = new FileService(new UrlPresigner()); + if ($this->file_url) { + $newFiles = json_decode($this->file_url); + foreach ($newFiles as $file) { + $fileService->saveFile( + $file->url, + $file->size, + $file->originalName, + $file->extension, + LegacyActiveLooking::class, + $activeLooking->getKey() + ); + } + } + + if ($this->file_url_deleted) { + $deletedFiles = explode(',', $this->file_url_deleted); + $fileService->deleteFiles($deletedFiles); + } + DB::commit(); } catch (ValidationException $e) { $this->mensagem = $e->validator->errors()->first(); @@ -199,9 +233,17 @@ public function Excluir() $activeLookingService = new ActiveLookingService(); $legacyActiveLooking = $this->buildObjectBeforeStore(); + try { DB::beginTransaction(); + $files = $legacyActiveLooking->files->pluck('id'); + $activeLookingService->delete(activeLooking: $legacyActiveLooking); + if ($files->isNotEmpty()) { + $fileService = new FileService(new UrlPresigner()); + $fileService->deleteFiles($files); + } + DB::commit(); } catch (Exception) { DB::rollBack(); From 889300ed0ff3d081ba1817975a8a462fd9a0239c Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Thu, 18 Jan 2024 15:32:21 -0300 Subject: [PATCH 44/47] Revert "Permite matriculas alunos cursando" This reverts commit bdea789aaf896310c6ffae9bf2db35d90c87be2b. --- ieducar/intranet/educar_avancar_mod_cad.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ieducar/intranet/educar_avancar_mod_cad.php b/ieducar/intranet/educar_avancar_mod_cad.php index f8f6aaa769..09673dfb3f 100644 --- a/ieducar/intranet/educar_avancar_mod_cad.php +++ b/ieducar/intranet/educar_avancar_mod_cad.php @@ -128,7 +128,7 @@ protected function rematricularAlunos($escolaId, $cursoId, $serieId, $turmaId, $ " ); - if ($result && $situacao == 1 || $situacao == 12 || $situacao == 13 || $situacao == 3) { + if ($result && $situacao == 1 || $situacao == 12 || $situacao == 13) { $result = $this->rematricularAlunoAprovado(escolaId: $escolaId, serieId: $serieId, ano: $this->ano_letivo, alunoId: $alunoId); } elseif ($result && $situacao == 2 || $situacao == 14) { $result = $this->rematricularAlunoReprovado(escolaId: $escolaId, cursoId: $cursoId, serieId: $serieId, ano: $this->ano_letivo, alunoId: $alunoId); @@ -233,7 +233,7 @@ protected function selectMatriculas($escolaId, $cursoId, $serieId, $turmaId, $an AND aluno.cod_aluno = ref_cod_aluno ) as nome FROM pmieducar.matricula m, pmieducar.matricula_turma - WHERE aprovado in (1, 2, 3, 12, 13, 14) + WHERE aprovado in (1, 2, 12, 13, 14) AND m.ativo = 1 AND ref_ref_cod_escola = $escolaId AND ref_ref_cod_serie = $serieId From 4241b98201197d073c4416b2f57a6d39d4ac22a4 Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Thu, 18 Jan 2024 16:20:35 -0300 Subject: [PATCH 45/47] =?UTF-8?q?Revert=20"Exibe=20mensagem=20quando=20j?= =?UTF-8?q?=C3=A1=20rematr=C3=ADculados"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9d3f065bbed0194d44292c6d11bd57f507fe348f. --- ieducar/intranet/educar_avancar_mod_cad.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieducar/intranet/educar_avancar_mod_cad.php b/ieducar/intranet/educar_avancar_mod_cad.php index 09673dfb3f..6a522b5980 100644 --- a/ieducar/intranet/educar_avancar_mod_cad.php +++ b/ieducar/intranet/educar_avancar_mod_cad.php @@ -290,7 +290,7 @@ protected function existeMatriculasAprovadasReprovadas($escolaId, $cursoId, $ser $qtdMatriculasAprovadasReprovadas = 0; foreach ($matriculas as $m) { - if (in_array(needle: $m['aprovado'], haystack: [1, 2, 3, 12, 13])) { + if (in_array(needle: $m['aprovado'], haystack: [1, 2, 12, 13])) { $qtdMatriculasAprovadasReprovadas++; } } From 8b67106322383b4f9a1fa19d46891ebbf9e451ee Mon Sep 17 00:00:00 2001 From: Robert Ferraz Date: Thu, 18 Jan 2024 16:24:19 -0300 Subject: [PATCH 46/47] =?UTF-8?q?Adiciona=20o=20reprovado=20por=20faltas?= =?UTF-8?q?=20na=20valida=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/intranet/educar_avancar_mod_cad.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieducar/intranet/educar_avancar_mod_cad.php b/ieducar/intranet/educar_avancar_mod_cad.php index 6a522b5980..288d8f8602 100644 --- a/ieducar/intranet/educar_avancar_mod_cad.php +++ b/ieducar/intranet/educar_avancar_mod_cad.php @@ -290,7 +290,7 @@ protected function existeMatriculasAprovadasReprovadas($escolaId, $cursoId, $ser $qtdMatriculasAprovadasReprovadas = 0; foreach ($matriculas as $m) { - if (in_array(needle: $m['aprovado'], haystack: [1, 2, 12, 13])) { + if (in_array(needle: $m['aprovado'], haystack: [1, 2, 12, 13, 14])) { $qtdMatriculasAprovadasReprovadas++; } } From 21134748bda84515f11b95419914b06a8d95ba39 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Fri, 19 Jan 2024 16:56:04 -0300 Subject: [PATCH 47/47] Version --- composer.lock | 583 +++++++++++++++++++++++++------------------------- 1 file changed, 289 insertions(+), 294 deletions(-) diff --git a/composer.lock b/composer.lock index 1efe88d6bd..31246b7035 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": "d647b0a3d2a523ec203370c96670b710", + "content-hash": "9c3054f5e3285cf8ac83c703fb32a26f", "packages": [ { "name": "ankurk91/laravel-eloquent-relationships", @@ -114,16 +114,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.294.3", + "version": "3.296.6", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "05761093c61ca7a02c1b5ae9be279bf69360e060" + "reference": "11d0a94f8b2539d587e2f6db7c2fa8e39fe78a67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/05761093c61ca7a02c1b5ae9be279bf69360e060", - "reference": "05761093c61ca7a02c1b5ae9be279bf69360e060", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/11d0a94f8b2539d587e2f6db7c2fa8e39fe78a67", + "reference": "11d0a94f8b2539d587e2f6db7c2fa8e39fe78a67", "shasum": "" }, "require": { @@ -203,9 +203,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.294.3" + "source": "https://github.com/aws/aws-sdk-php/tree/3.296.6" }, - "time": "2023-12-19T19:07:14+00:00" + "time": "2024-01-19T19:14:55+00:00" }, { "name": "aws/aws-sdk-php-laravel", @@ -1018,16 +1018,16 @@ }, { "name": "doctrine/inflector", - "version": "2.0.8", + "version": "2.0.9", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff" + "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff", - "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/2930cd5ef353871c821d5c43ed030d39ac8cfe65", + "reference": "2930cd5ef353871c821d5c43ed030d39ac8cfe65", "shasum": "" }, "require": { @@ -1089,7 +1089,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.8" + "source": "https://github.com/doctrine/inflector/tree/2.0.9" }, "funding": [ { @@ -1105,7 +1105,7 @@ "type": "tidelift" } ], - "time": "2023-06-16T13:40:37+00:00" + "time": "2024-01-15T18:05:13+00:00" }, { "name": "doctrine/lexer", @@ -1971,21 +1971,21 @@ }, { "name": "honeybadger-io/honeybadger-laravel", - "version": "v3.18.1", + "version": "v3.18.2", "source": { "type": "git", "url": "https://github.com/honeybadger-io/honeybadger-laravel.git", - "reference": "82890f3330aca8648718b1aa9252bcd897b36911" + "reference": "764f4df58b172cdfeb410a698c0043bd68870bd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/honeybadger-io/honeybadger-laravel/zipball/82890f3330aca8648718b1aa9252bcd897b36911", - "reference": "82890f3330aca8648718b1aa9252bcd897b36911", + "url": "https://api.github.com/repos/honeybadger-io/honeybadger-laravel/zipball/764f4df58b172cdfeb410a698c0043bd68870bd6", + "reference": "764f4df58b172cdfeb410a698c0043bd68870bd6", "shasum": "" }, "require": { "ext-json": "*", - "honeybadger-io/honeybadger-php": "^2.17.2", + "honeybadger-io/honeybadger-php": "^2.18.0", "illuminate/console": "^7.0|^8.0|^9.0|^10.0", "illuminate/support": "^7.0|^8.0|^9.0|^10.0", "monolog/monolog": "^2.0|^3.2", @@ -2039,22 +2039,22 @@ ], "support": { "issues": "https://github.com/honeybadger-io/honeybadger-laravel/issues", - "source": "https://github.com/honeybadger-io/honeybadger-laravel/tree/v3.18.1" + "source": "https://github.com/honeybadger-io/honeybadger-laravel/tree/v3.18.2" }, - "time": "2023-11-16T08:03:44+00:00" + "time": "2023-12-28T15:20:55+00:00" }, { "name": "honeybadger-io/honeybadger-php", - "version": "v2.17.3", + "version": "v2.18.0", "source": { "type": "git", "url": "https://github.com/honeybadger-io/honeybadger-php.git", - "reference": "c31f5db79338f2ea8d9cef9246fbbadb4bcf6956" + "reference": "7193dbd82dcff242376dbfa6c0c0ec2e1178a0a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/honeybadger-io/honeybadger-php/zipball/c31f5db79338f2ea8d9cef9246fbbadb4bcf6956", - "reference": "c31f5db79338f2ea8d9cef9246fbbadb4bcf6956", + "url": "https://api.github.com/repos/honeybadger-io/honeybadger-php/zipball/7193dbd82dcff242376dbfa6c0c0ec2e1178a0a1", + "reference": "7193dbd82dcff242376dbfa6c0c0ec2e1178a0a1", "shasum": "" }, "require": { @@ -2105,9 +2105,9 @@ ], "support": { "issues": "https://github.com/honeybadger-io/honeybadger-php/issues", - "source": "https://github.com/honeybadger-io/honeybadger-php/tree/v2.17.3" + "source": "https://github.com/honeybadger-io/honeybadger-php/tree/v2.18.0" }, - "time": "2023-12-04T19:03:19+00:00" + "time": "2023-12-28T15:18:54+00:00" }, { "name": "intervention/image", @@ -2195,16 +2195,16 @@ }, { "name": "laravel/framework", - "version": "v10.38.1", + "version": "v10.41.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ced4689f495213e9d23995b36098f12a802cc15b" + "reference": "da31969bd35e6ee0bbcd9e876f88952dc754b012" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ced4689f495213e9d23995b36098f12a802cc15b", - "reference": "ced4689f495213e9d23995b36098f12a802cc15b", + "url": "https://api.github.com/repos/laravel/framework/zipball/da31969bd35e6ee0bbcd9e876f88952dc754b012", + "reference": "da31969bd35e6ee0bbcd9e876f88952dc754b012", "shasum": "" }, "require": { @@ -2307,7 +2307,7 @@ "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.5.1", "nyholm/psr7": "^1.2", - "orchestra/testbench-core": "^8.15.1", + "orchestra/testbench-core": "^8.18", "pda/pheanstalk": "^4.0", "phpstan/phpstan": "^1.4.7", "phpunit/phpunit": "^10.0.7", @@ -2396,40 +2396,40 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-12-20T14:52:12+00:00" + "time": "2024-01-16T15:23:58+00:00" }, { "name": "laravel/horizon", - "version": "v5.21.4", + "version": "v5.22.0", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "bdf58c84b592b83f62262cc6ca98b0debbbc308b" + "reference": "151f7fc544fd7711499512b736b30036dfaa5bc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/bdf58c84b592b83f62262cc6ca98b0debbbc308b", - "reference": "bdf58c84b592b83f62262cc6ca98b0debbbc308b", + "url": "https://api.github.com/repos/laravel/horizon/zipball/151f7fc544fd7711499512b736b30036dfaa5bc0", + "reference": "151f7fc544fd7711499512b736b30036dfaa5bc0", "shasum": "" }, "require": { "ext-json": "*", "ext-pcntl": "*", "ext-posix": "*", - "illuminate/contracts": "^8.17|^9.0|^10.0", - "illuminate/queue": "^8.17|^9.0|^10.0", - "illuminate/support": "^8.17|^9.0|^10.0", + "illuminate/contracts": "^8.17|^9.0|^10.0|^11.0", + "illuminate/queue": "^8.17|^9.0|^10.0|^11.0", + "illuminate/support": "^8.17|^9.0|^10.0|^11.0", "nesbot/carbon": "^2.17", "php": "^7.3|^8.0", "ramsey/uuid": "^4.0", - "symfony/error-handler": "^5.0|^6.0", - "symfony/process": "^5.0|^6.0" + "symfony/error-handler": "^5.0|^6.0|^7.0", + "symfony/process": "^5.0|^6.0|^7.0" }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "^6.0|^7.0|^8.0", + "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0", "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^9.0", + "phpunit/phpunit": "^9.0|^10.4", "predis/predis": "^1.1|^2.0" }, "suggest": { @@ -2472,22 +2472,22 @@ ], "support": { "issues": "https://github.com/laravel/horizon/issues", - "source": "https://github.com/laravel/horizon/tree/v5.21.4" + "source": "https://github.com/laravel/horizon/tree/v5.22.0" }, - "time": "2023-11-23T15:47:58+00:00" + "time": "2024-01-16T15:06:40+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.13", + "version": "v0.1.15", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "e1379d8ead15edd6cc4369c22274345982edc95a" + "reference": "d814a27514d99b03c85aa42b22cfd946568636c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/e1379d8ead15edd6cc4369c22274345982edc95a", - "reference": "e1379d8ead15edd6cc4369c22274345982edc95a", + "url": "https://api.github.com/repos/laravel/prompts/zipball/d814a27514d99b03c85aa42b22cfd946568636c1", + "reference": "d814a27514d99b03c85aa42b22cfd946568636c1", "shasum": "" }, "require": { @@ -2503,7 +2503,7 @@ "require-dev": { "mockery/mockery": "^1.5", "pestphp/pest": "^2.3", - "phpstan/phpstan": "^1.10", + "phpstan/phpstan": "^1.11", "phpstan/phpstan-mockery": "^1.1" }, "suggest": { @@ -2529,22 +2529,22 @@ ], "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.13" + "source": "https://github.com/laravel/prompts/tree/v0.1.15" }, - "time": "2023-10-27T13:53:59+00:00" + "time": "2023-12-29T22:37:42+00:00" }, { "name": "laravel/sanctum", - "version": "v3.3.2", + "version": "v3.3.3", "source": { "type": "git", "url": "https://github.com/laravel/sanctum.git", - "reference": "e1a272893bec13cf135627f7e156030b3afe1e60" + "reference": "8c104366459739f3ada0e994bcd3e6fd681ce3d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sanctum/zipball/e1a272893bec13cf135627f7e156030b3afe1e60", - "reference": "e1a272893bec13cf135627f7e156030b3afe1e60", + "url": "https://api.github.com/repos/laravel/sanctum/zipball/8c104366459739f3ada0e994bcd3e6fd681ce3d5", + "reference": "8c104366459739f3ada0e994bcd3e6fd681ce3d5", "shasum": "" }, "require": { @@ -2597,7 +2597,7 @@ "issues": "https://github.com/laravel/sanctum/issues", "source": "https://github.com/laravel/sanctum" }, - "time": "2023-11-03T13:42:14+00:00" + "time": "2023-12-19T18:44:48+00:00" }, { "name": "laravel/serializable-closure", @@ -2661,25 +2661,25 @@ }, { "name": "laravel/tinker", - "version": "v2.8.2", + "version": "v2.9.0", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "b936d415b252b499e8c3b1f795cd4fc20f57e1f3" + "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/b936d415b252b499e8c3b1f795cd4fc20f57e1f3", - "reference": "b936d415b252b499e8c3b1f795cd4fc20f57e1f3", + "url": "https://api.github.com/repos/laravel/tinker/zipball/502e0fe3f0415d06d5db1f83a472f0f3b754bafe", + "reference": "502e0fe3f0415d06d5db1f83a472f0f3b754bafe", "shasum": "" }, "require": { - "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", "php": "^7.2.5|^8.0", - "psy/psysh": "^0.10.4|^0.11.1", - "symfony/var-dumper": "^4.3.4|^5.0|^6.0" + "psy/psysh": "^0.11.1|^0.12.0", + "symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0" }, "require-dev": { "mockery/mockery": "~1.3.3|^1.4.2", @@ -2687,13 +2687,10 @@ "phpunit/phpunit": "^8.5.8|^9.3.3" }, "suggest": { - "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0)." + "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0)." }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - }, "laravel": { "providers": [ "Laravel\\Tinker\\TinkerServiceProvider" @@ -2724,34 +2721,34 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.8.2" + "source": "https://github.com/laravel/tinker/tree/v2.9.0" }, - "time": "2023-08-15T14:27:00+00:00" + "time": "2024-01-04T16:10:04+00:00" }, { "name": "laravel/ui", - "version": "v4.3.0", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "d166e09cdcb2e23836f694774cba77a32edb6007" + "reference": "7335d7049b2cde345c029e9d2de839b80af62bc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/d166e09cdcb2e23836f694774cba77a32edb6007", - "reference": "d166e09cdcb2e23836f694774cba77a32edb6007", + "url": "https://api.github.com/repos/laravel/ui/zipball/7335d7049b2cde345c029e9d2de839b80af62bc0", + "reference": "7335d7049b2cde345c029e9d2de839b80af62bc0", "shasum": "" }, "require": { - "illuminate/console": "^9.21|^10.0", - "illuminate/filesystem": "^9.21|^10.0", - "illuminate/support": "^9.21|^10.0", - "illuminate/validation": "^9.21|^10.0", + "illuminate/console": "^9.21|^10.0|^11.0", + "illuminate/filesystem": "^9.21|^10.0|^11.0", + "illuminate/support": "^9.21|^10.0|^11.0", + "illuminate/validation": "^9.21|^10.0|^11.0", "php": "^8.0" }, "require-dev": { - "orchestra/testbench": "^7.0|^8.0", - "phpunit/phpunit": "^9.3" + "orchestra/testbench": "^7.0|^8.0|^9.0", + "phpunit/phpunit": "^9.3|^10.4" }, "type": "library", "extra": { @@ -2786,9 +2783,9 @@ "ui" ], "support": { - "source": "https://github.com/laravel/ui/tree/v4.3.0" + "source": "https://github.com/laravel/ui/tree/v4.4.0" }, - "time": "2023-12-19T14:46:09+00:00" + "time": "2024-01-12T15:56:45+00:00" }, { "name": "league/commonmark", @@ -2980,16 +2977,16 @@ }, { "name": "league/csv", - "version": "9.13.0", + "version": "9.14.0", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "3690cc71bfe8dc3b6daeef356939fac95348f0a8" + "reference": "34bf0df7340b60824b9449b5c526fcc3325070d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/3690cc71bfe8dc3b6daeef356939fac95348f0a8", - "reference": "3690cc71bfe8dc3b6daeef356939fac95348f0a8", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/34bf0df7340b60824b9449b5c526fcc3325070d5", + "reference": "34bf0df7340b60824b9449b5c526fcc3325070d5", "shasum": "" }, "require": { @@ -3065,7 +3062,7 @@ "type": "github" } ], - "time": "2023-12-16T11:03:20+00:00" + "time": "2023-12-29T07:34:53+00:00" }, { "name": "league/flysystem", @@ -3461,16 +3458,16 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.51", + "version": "3.1.52", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "6d3c78ce6645abada32e03b40dc7f3c561878bc3" + "reference": "4471416045dbb869d0a218d2e88441adc362e2b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/6d3c78ce6645abada32e03b40dc7f3c561878bc3", - "reference": "6d3c78ce6645abada32e03b40dc7f3c561878bc3", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/4471416045dbb869d0a218d2e88441adc362e2b0", + "reference": "4471416045dbb869d0a218d2e88441adc362e2b0", "shasum": "" }, "require": { @@ -3482,6 +3479,7 @@ "psr/simple-cache": "^1.0||^2.0||^3.0" }, "require-dev": { + "laravel/scout": "^7.0||^8.0||^9.0||^10.0", "orchestra/testbench": "^6.0||^7.0||^8.0", "predis/predis": "^1.1" }, @@ -3525,7 +3523,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.51" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.52" }, "funding": [ { @@ -3537,7 +3535,7 @@ "type": "github" } ], - "time": "2023-12-08T12:44:49+00:00" + "time": "2024-01-16T10:41:30+00:00" }, { "name": "maennchen/zipstream-php", @@ -4065,16 +4063,16 @@ }, { "name": "nette/utils", - "version": "v4.0.3", + "version": "v4.0.4", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015" + "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/a9d127dd6a203ce6d255b2e2db49759f7506e015", - "reference": "a9d127dd6a203ce6d255b2e2db49759f7506e015", + "url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218", + "reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218", "shasum": "" }, "require": { @@ -4145,31 +4143,33 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v4.0.3" + "source": "https://github.com/nette/utils/tree/v4.0.4" }, - "time": "2023-10-29T21:02:13+00:00" + "time": "2024-01-17T16:50:36+00:00" }, { "name": "nikic/php-parser", - "version": "v4.18.0", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc", + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -4177,7 +4177,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -4201,9 +4201,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0" }, - "time": "2023-12-10T21:03:43+00:00" + "time": "2024-01-07T17:17:35+00:00" }, { "name": "nunomaduro/termwind", @@ -4590,16 +4590,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.34", + "version": "3.0.35", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "56c79f16a6ae17e42089c06a2144467acc35348a" + "reference": "4b1827beabce71953ca479485c0ae9c51287f2fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/56c79f16a6ae17e42089c06a2144467acc35348a", - "reference": "56c79f16a6ae17e42089c06a2144467acc35348a", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4b1827beabce71953ca479485c0ae9c51287f2fe", + "reference": "4b1827beabce71953ca479485c0ae9c51287f2fe", "shasum": "" }, "require": { @@ -4680,7 +4680,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.34" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.35" }, "funding": [ { @@ -4696,7 +4696,7 @@ "type": "tidelift" } ], - "time": "2023-11-27T11:13:31+00:00" + "time": "2023-12-29T01:59:53+00:00" }, { "name": "predis/predis", @@ -5227,25 +5227,25 @@ }, { "name": "psy/psysh", - "version": "v0.11.22", + "version": "v0.12.0", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" + "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", - "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/750bf031a48fd07c673dbe3f11f72362ea306d0d", + "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d", "shasum": "" }, "require": { "ext-json": "*", "ext-tokenizer": "*", - "nikic/php-parser": "^4.0 || ^3.1", - "php": "^8.0 || ^7.0.8", - "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4", - "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4" + "nikic/php-parser": "^5.0 || ^4.0", + "php": "^8.0 || ^7.4", + "symfony/console": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4", + "symfony/var-dumper": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4" }, "conflict": { "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" @@ -5256,8 +5256,7 @@ "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", "ext-pdo-sqlite": "The doc command requires SQLite to work.", - "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history." + "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well." }, "bin": [ "bin/psysh" @@ -5265,7 +5264,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-0.11": "0.11.x-dev" + "dev-main": "0.12.x-dev" }, "bamarni-bin": { "bin-links": false, @@ -5301,9 +5300,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.0" }, - "time": "2023-10-14T21:56:36+00:00" + "time": "2023-12-20T15:28:09+00:00" }, { "name": "ralouphie/getallheaders", @@ -5626,16 +5625,16 @@ }, { "name": "staudenmeir/laravel-adjacency-list", - "version": "v1.15", + "version": "v1.17", "source": { "type": "git", "url": "https://github.com/staudenmeir/laravel-adjacency-list.git", - "reference": "8554592508d44a504b2a0b96d04b4b3dfc3e51b1" + "reference": "a6ba4990d299a78382dd3490f6d7785b8b2d88db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staudenmeir/laravel-adjacency-list/zipball/8554592508d44a504b2a0b96d04b4b3dfc3e51b1", - "reference": "8554592508d44a504b2a0b96d04b4b3dfc3e51b1", + "url": "https://api.github.com/repos/staudenmeir/laravel-adjacency-list/zipball/a6ba4990d299a78382dd3490f6d7785b8b2d88db", + "reference": "a6ba4990d299a78382dd3490f6d7785b8b2d88db", "shasum": "" }, "require": { @@ -5683,7 +5682,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.15" + "source": "https://github.com/staudenmeir/laravel-adjacency-list/tree/v1.17" }, "funding": [ { @@ -5691,7 +5690,7 @@ "type": "custom" } ], - "time": "2023-12-15T20:13:49+00:00" + "time": "2024-01-17T23:36:36+00:00" }, { "name": "staudenmeir/laravel-cte", @@ -5755,16 +5754,16 @@ }, { "name": "symfony/console", - "version": "v6.4.1", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd" + "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a550a7c99daeedef3f9d23fb82e3531525ff11fd", - "reference": "a550a7c99daeedef3f9d23fb82e3531525ff11fd", + "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625", + "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625", "shasum": "" }, "require": { @@ -5829,7 +5828,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.1" + "source": "https://github.com/symfony/console/tree/v6.4.2" }, "funding": [ { @@ -5845,7 +5844,7 @@ "type": "tidelift" } ], - "time": "2023-11-30T10:54:28+00:00" + "time": "2023-12-10T16:15:48+00:00" }, { "name": "symfony/css-selector", @@ -6056,16 +6055,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v7.0.0", + "version": "v7.0.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "c459b40ffe67c49af6fd392aac374c9edf8a027e" + "reference": "098b62ae81fdd6cbf941f355059f617db28f4f9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c459b40ffe67c49af6fd392aac374c9edf8a027e", - "reference": "c459b40ffe67c49af6fd392aac374c9edf8a027e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/098b62ae81fdd6cbf941f355059f617db28f4f9a", + "reference": "098b62ae81fdd6cbf941f355059f617db28f4f9a", "shasum": "" }, "require": { @@ -6116,7 +6115,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.0.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.2" }, "funding": [ { @@ -6132,7 +6131,7 @@ "type": "tidelift" } ], - "time": "2023-07-27T16:29:09+00:00" + "time": "2023-12-27T22:24:19+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -6276,16 +6275,16 @@ }, { "name": "symfony/http-client", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "5c584530b77aa10ae216989ffc48b4bedc9c0b29" + "reference": "fc0944665bd932cf32a7b8a1d009466afc16528f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/5c584530b77aa10ae216989ffc48b4bedc9c0b29", - "reference": "5c584530b77aa10ae216989ffc48b4bedc9c0b29", + "url": "https://api.github.com/repos/symfony/http-client/zipball/fc0944665bd932cf32a7b8a1d009466afc16528f", + "reference": "fc0944665bd932cf32a7b8a1d009466afc16528f", "shasum": "" }, "require": { @@ -6349,7 +6348,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.0" + "source": "https://github.com/symfony/http-client/tree/v6.4.2" }, "funding": [ { @@ -6365,7 +6364,7 @@ "type": "tidelift" } ], - "time": "2023-11-28T20:55:58+00:00" + "time": "2023-12-02T12:49:56+00:00" }, { "name": "symfony/http-client-contracts", @@ -6447,16 +6446,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "44a6d39a9cc11e154547d882d5aac1e014440771" + "reference": "172d807f9ef3fc3fbed8377cc57c20d389269271" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/44a6d39a9cc11e154547d882d5aac1e014440771", - "reference": "44a6d39a9cc11e154547d882d5aac1e014440771", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/172d807f9ef3fc3fbed8377cc57c20d389269271", + "reference": "172d807f9ef3fc3fbed8377cc57c20d389269271", "shasum": "" }, "require": { @@ -6504,7 +6503,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.0" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.2" }, "funding": [ { @@ -6520,20 +6519,20 @@ "type": "tidelift" } ], - "time": "2023-11-20T16:41:16+00:00" + "time": "2023-12-27T22:16:42+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.1", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "2953274c16a229b3933ef73a6898e18388e12e1b" + "reference": "13e8387320b5942d0dc408440c888e2d526efef4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2953274c16a229b3933ef73a6898e18388e12e1b", - "reference": "2953274c16a229b3933ef73a6898e18388e12e1b", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/13e8387320b5942d0dc408440c888e2d526efef4", + "reference": "13e8387320b5942d0dc408440c888e2d526efef4", "shasum": "" }, "require": { @@ -6617,7 +6616,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/v6.4.1" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.2" }, "funding": [ { @@ -6633,20 +6632,20 @@ "type": "tidelift" } ], - "time": "2023-12-01T17:02:02+00:00" + "time": "2023-12-30T15:31:44+00:00" }, { "name": "symfony/mailer", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "ca8dcf8892cdc5b4358ecf2528429bb5e706f7ba" + "reference": "6da89e5c9202f129717a770a03183fb140720168" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/ca8dcf8892cdc5b4358ecf2528429bb5e706f7ba", - "reference": "ca8dcf8892cdc5b4358ecf2528429bb5e706f7ba", + "url": "https://api.github.com/repos/symfony/mailer/zipball/6da89e5c9202f129717a770a03183fb140720168", + "reference": "6da89e5c9202f129717a770a03183fb140720168", "shasum": "" }, "require": { @@ -6697,7 +6696,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.4.0" + "source": "https://github.com/symfony/mailer/tree/v6.4.2" }, "funding": [ { @@ -6713,7 +6712,7 @@ "type": "tidelift" } ], - "time": "2023-11-12T18:02:22+00:00" + "time": "2023-12-19T09:12:31+00:00" }, { "name": "symfony/mailgun-mailer", @@ -7608,16 +7607,16 @@ }, { "name": "symfony/process", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "191703b1566d97a5425dc969e4350d32b8ef17aa" + "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/191703b1566d97a5425dc969e4350d32b8ef17aa", - "reference": "191703b1566d97a5425dc969e4350d32b8ef17aa", + "url": "https://api.github.com/repos/symfony/process/zipball/c4b1ef0bc80533d87a2e969806172f1c2a980241", + "reference": "c4b1ef0bc80533d87a2e969806172f1c2a980241", "shasum": "" }, "require": { @@ -7649,7 +7648,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.0" + "source": "https://github.com/symfony/process/tree/v6.4.2" }, "funding": [ { @@ -7665,20 +7664,20 @@ "type": "tidelift" } ], - "time": "2023-11-17T21:06:49+00:00" + "time": "2023-12-22T16:42:54+00:00" }, { "name": "symfony/routing", - "version": "v6.4.1", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "0c95c164fdba18b12523b75e64199ca3503e6d40" + "reference": "98eab13a07fddc85766f1756129c69f207ffbc21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/0c95c164fdba18b12523b75e64199ca3503e6d40", - "reference": "0c95c164fdba18b12523b75e64199ca3503e6d40", + "url": "https://api.github.com/repos/symfony/routing/zipball/98eab13a07fddc85766f1756129c69f207ffbc21", + "reference": "98eab13a07fddc85766f1756129c69f207ffbc21", "shasum": "" }, "require": { @@ -7732,7 +7731,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.1" + "source": "https://github.com/symfony/routing/tree/v6.4.2" }, "funding": [ { @@ -7748,25 +7747,25 @@ "type": "tidelift" } ], - "time": "2023-12-01T14:54:37+00:00" + "time": "2023-12-29T15:34:34+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.4.0", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838" + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838", - "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^2.0" + "psr/container": "^1.1|^2.0" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -7814,7 +7813,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" }, "funding": [ { @@ -7830,20 +7829,20 @@ "type": "tidelift" } ], - "time": "2023-07-30T20:28:31+00:00" + "time": "2023-12-26T14:02:43+00:00" }, { "name": "symfony/string", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809" + "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/b45fcf399ea9c3af543a92edf7172ba21174d809", - "reference": "b45fcf399ea9c3af543a92edf7172ba21174d809", + "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc", + "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc", "shasum": "" }, "require": { @@ -7900,7 +7899,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.0" + "source": "https://github.com/symfony/string/tree/v6.4.2" }, "funding": [ { @@ -7916,20 +7915,20 @@ "type": "tidelift" } ], - "time": "2023-11-28T20:41:49+00:00" + "time": "2023-12-10T16:15:48+00:00" }, { "name": "symfony/translation", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "b1035dbc2a344b21f8fa8ac451c7ecec4ea45f37" + "reference": "a2ab2ec1a462e53016de8e8d5e8912bfd62ea681" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/b1035dbc2a344b21f8fa8ac451c7ecec4ea45f37", - "reference": "b1035dbc2a344b21f8fa8ac451c7ecec4ea45f37", + "url": "https://api.github.com/repos/symfony/translation/zipball/a2ab2ec1a462e53016de8e8d5e8912bfd62ea681", + "reference": "a2ab2ec1a462e53016de8e8d5e8912bfd62ea681", "shasum": "" }, "require": { @@ -7995,7 +7994,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.0" + "source": "https://github.com/symfony/translation/tree/v6.4.2" }, "funding": [ { @@ -8011,20 +8010,20 @@ "type": "tidelift" } ], - "time": "2023-11-29T08:14:36+00:00" + "time": "2023-12-18T09:25:29+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.4.0", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5" + "reference": "06450585bf65e978026bda220cdebca3f867fde7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/dee0c6e5b4c07ce851b462530088e64b255ac9c5", - "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7", + "reference": "06450585bf65e978026bda220cdebca3f867fde7", "shasum": "" }, "require": { @@ -8073,7 +8072,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1" }, "funding": [ { @@ -8089,7 +8088,7 @@ "type": "tidelift" } ], - "time": "2023-07-25T15:08:44+00:00" + "time": "2023-12-26T14:02:43+00:00" }, { "name": "symfony/uid", @@ -8167,16 +8166,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.4.0", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "c40f7d17e91d8b407582ed51a2bbf83c52c367f6" + "reference": "68d6573ec98715ddcae5a0a85bee3c1c27a4c33f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c40f7d17e91d8b407582ed51a2bbf83c52c367f6", - "reference": "c40f7d17e91d8b407582ed51a2bbf83c52c367f6", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/68d6573ec98715ddcae5a0a85bee3c1c27a4c33f", + "reference": "68d6573ec98715ddcae5a0a85bee3c1c27a4c33f", "shasum": "" }, "require": { @@ -8232,7 +8231,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.0" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.2" }, "funding": [ { @@ -8248,7 +8247,7 @@ "type": "tidelift" } ], - "time": "2023-11-09T08:28:32+00:00" + "time": "2023-12-28T19:16:56+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -8523,16 +8522,16 @@ "packages-dev": [ { "name": "fakerphp/faker", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01" + "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e3daa170d00fde61ea7719ef47bb09bb8f1d9b01", - "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b", + "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b", "shasum": "" }, "require": { @@ -8558,11 +8557,6 @@ "ext-mbstring": "Required for multibyte Unicode string functionality." }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "v1.21-dev" - } - }, "autoload": { "psr-4": { "Faker\\": "src/Faker/" @@ -8585,9 +8579,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.23.0" + "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1" }, - "time": "2023-06-12T08:44:38+00:00" + "time": "2024-01-02T13:46:09+00:00" }, { "name": "filp/whoops", @@ -8713,16 +8707,16 @@ }, { "name": "laravel/pint", - "version": "v1.13.7", + "version": "v1.13.9", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "4157768980dbd977f1c4b4cc94997416d8b30ece" + "reference": "e3e269cc5d874c8efd2dc7962b1c7ff2585fe525" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/4157768980dbd977f1c4b4cc94997416d8b30ece", - "reference": "4157768980dbd977f1c4b4cc94997416d8b30ece", + "url": "https://api.github.com/repos/laravel/pint/zipball/e3e269cc5d874c8efd2dc7962b1c7ff2585fe525", + "reference": "e3e269cc5d874c8efd2dc7962b1c7ff2585fe525", "shasum": "" }, "require": { @@ -8733,13 +8727,13 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.38.0", - "illuminate/view": "^10.30.1", + "friendsofphp/php-cs-fixer": "^3.47.0", + "illuminate/view": "^10.40.0", + "larastan/larastan": "^2.8.1", "laravel-zero/framework": "^10.3.0", - "mockery/mockery": "^1.6.6", - "nunomaduro/larastan": "^2.6.4", + "mockery/mockery": "^1.6.7", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.24.2" + "pestphp/pest": "^2.31.0" }, "bin": [ "builds/pint" @@ -8775,20 +8769,20 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2023-12-05T19:43:12+00:00" + "time": "2024-01-16T17:39:29+00:00" }, { "name": "laravel/sail", - "version": "v1.26.3", + "version": "v1.27.1", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "fa1ad5fbb03686dfc752bfd1861d86091cc1c32d" + "reference": "9dc648978e4276f2bfd37a076a52e3bd9394777f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/fa1ad5fbb03686dfc752bfd1861d86091cc1c32d", - "reference": "fa1ad5fbb03686dfc752bfd1861d86091cc1c32d", + "url": "https://api.github.com/repos/laravel/sail/zipball/9dc648978e4276f2bfd37a076a52e3bd9394777f", + "reference": "9dc648978e4276f2bfd37a076a52e3bd9394777f", "shasum": "" }, "require": { @@ -8840,7 +8834,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2023-12-02T18:26:39+00:00" + "time": "2024-01-13T18:46:48+00:00" }, { "name": "laravel/telescope", @@ -9264,23 +9258,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.10", + "version": "10.1.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "599109c8ca6bae97b23482d557d2874c25a65e59" + "reference": "78c3b7625965c2513ee96569a4dbb62601784145" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/599109c8ca6bae97b23482d557d2874c25a65e59", - "reference": "599109c8ca6bae97b23482d557d2874c25a65e59", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/78c3b7625965c2513ee96569a4dbb62601784145", + "reference": "78c3b7625965c2513ee96569a4dbb62601784145", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1", "phpunit/php-file-iterator": "^4.0", "phpunit/php-text-template": "^3.0", @@ -9330,7 +9324,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.10" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.11" }, "funding": [ { @@ -9338,7 +9332,7 @@ "type": "github" } ], - "time": "2023-12-11T06:28:43+00:00" + "time": "2023-12-21T15:38:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -9585,16 +9579,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.3", + "version": "10.5.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19" + "reference": "08f4fa74d5fbfff1ef22abffee47aaedcaea227e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6fce887c71076a73f32fd3e0774a6833fc5c7f19", - "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/08f4fa74d5fbfff1ef22abffee47aaedcaea227e", + "reference": "08f4fa74d5fbfff1ef22abffee47aaedcaea227e", "shasum": "" }, "require": { @@ -9666,7 +9660,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.3" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.8" }, "funding": [ { @@ -9682,7 +9676,7 @@ "type": "tidelift" } ], - "time": "2023-12-13T07:25:23+00:00" + "time": "2024-01-19T07:07:27+00:00" }, { "name": "sebastian/cli-parser", @@ -9930,20 +9924,20 @@ }, { "name": "sebastian/complexity", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957" + "reference": "68ff824baeae169ec9f2137158ee529584553799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68cfb347a44871f01e33ab0ef8215966432f6957", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799", + "reference": "68ff824baeae169ec9f2137158ee529584553799", "shasum": "" }, "require": { - "nikic/php-parser": "^4.10", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1" }, "require-dev": { @@ -9952,7 +9946,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.2-dev" } }, "autoload": { @@ -9976,7 +9970,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", "security": "https://github.com/sebastianbergmann/complexity/security/policy", - "source": "https://github.com/sebastianbergmann/complexity/tree/3.1.0" + "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0" }, "funding": [ { @@ -9984,20 +9978,20 @@ "type": "github" } ], - "time": "2023-09-28T11:50:59+00:00" + "time": "2023-12-21T08:37:17+00:00" }, { "name": "sebastian/diff", - "version": "5.0.3", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b" + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f", "shasum": "" }, "require": { @@ -10010,7 +10004,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -10043,7 +10037,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0" }, "funding": [ { @@ -10051,7 +10045,7 @@ "type": "github" } ], - "time": "2023-05-01T07:48:21+00:00" + "time": "2023-12-22T10:55:06+00:00" }, { "name": "sebastian/environment", @@ -10259,20 +10253,20 @@ }, { "name": "sebastian/lines-of-code", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d" + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/649e40d279e243d985aa8fb6e74dd5bb28dc185d", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0", + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0", "shasum": "" }, "require": { - "nikic/php-parser": "^4.10", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1" }, "require-dev": { @@ -10305,7 +10299,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.1" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2" }, "funding": [ { @@ -10313,7 +10307,7 @@ "type": "github" } ], - "time": "2023-08-31T09:25:50+00:00" + "time": "2023-12-21T08:38:20+00:00" }, { "name": "sebastian/object-enumerator", @@ -10733,16 +10727,16 @@ }, { "name": "spatie/ignition", - "version": "1.11.3", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/spatie/ignition.git", - "reference": "3d886de644ff7a5b42e4d27c1e1f67c8b5f00044" + "reference": "5b6f801c605a593106b623e45ca41496a6e7d56d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ignition/zipball/3d886de644ff7a5b42e4d27c1e1f67c8b5f00044", - "reference": "3d886de644ff7a5b42e4d27c1e1f67c8b5f00044", + "url": "https://api.github.com/repos/spatie/ignition/zipball/5b6f801c605a593106b623e45ca41496a6e7d56d", + "reference": "5b6f801c605a593106b623e45ca41496a6e7d56d", "shasum": "" }, "require": { @@ -10812,39 +10806,39 @@ "type": "github" } ], - "time": "2023-10-18T14:09:40+00:00" + "time": "2024-01-03T15:49:39+00:00" }, { "name": "spatie/laravel-ignition", - "version": "2.3.2", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "4800661a195e15783477d99f7f8f669a49793996" + "reference": "005e1e7b1232f3b22d7e7be3f602693efc7dba67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/4800661a195e15783477d99f7f8f669a49793996", - "reference": "4800661a195e15783477d99f7f8f669a49793996", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/005e1e7b1232f3b22d7e7be3f602693efc7dba67", + "reference": "005e1e7b1232f3b22d7e7be3f602693efc7dba67", "shasum": "" }, "require": { "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", - "illuminate/support": "^10.0", + "illuminate/support": "^10.0|^11.0", "php": "^8.1", "spatie/flare-client-php": "^1.3.5", "spatie/ignition": "^1.9", - "symfony/console": "^6.2.3", - "symfony/var-dumper": "^6.2.3" + "symfony/console": "^6.2.3|^7.0", + "symfony/var-dumper": "^6.2.3|^7.0" }, "require-dev": { - "livewire/livewire": "^2.11", + "livewire/livewire": "^2.11|^3.3.5", "mockery/mockery": "^1.5.1", - "openai-php/client": "^0.3.4", - "orchestra/testbench": "^8.0", - "pestphp/pest": "^1.22.3", + "openai-php/client": "^0.8.1", + "orchestra/testbench": "^8.0|^9.0", + "pestphp/pest": "^2.30", "phpstan/extension-installer": "^1.2", "phpstan/phpstan-deprecation-rules": "^1.1.1", "phpstan/phpstan-phpunit": "^1.3.3", @@ -10904,7 +10898,7 @@ "type": "github" } ], - "time": "2023-12-15T13:44:49+00:00" + "time": "2024-01-12T13:14:58+00:00" }, { "name": "symfony/yaml", @@ -11100,8 +11094,9 @@ "ext-gd": "*", "ext-json": "*", "ext-pdo": "*", - "ext-pgsql": "*" + "ext-pgsql": "*", + "ext-zip": "*" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" }