diff --git a/composer.json b/composer.json index 9aab24692..d2e1a6e84 100644 --- a/composer.json +++ b/composer.json @@ -35,10 +35,10 @@ "laravel/framework": "5.7.*", "luracast/restler": "3.0", "bshaffer/oauth2-server-php": "v1.0", - "colosa/pmui": "release/3.5.0-dev", - "colosa/michelangelofe": "release/3.5.0-dev", - "colosa/pmdynaform": "release/3.5.0-dev", - "colosa/taskscheduler": "release/1.0.0-dev", + "colosa/pmui": "release/3.6.0-dev", + "colosa/michelangelofe": "release/3.6.0-dev", + "colosa/pmdynaform": "release/3.6.0-dev", + "colosa/taskscheduler": "release/1.0.2-dev", "google/apiclient": "1.1.6", "dapphp/securimage": "^3.6", "psr/log": "1.0.0", diff --git a/composer.lock b/composer.lock index 01634eb2a..4fc5290a8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b4b98120465decfffe2a22ac61ca359b", + "content-hash": "8186bf55af9b094297df563f73892ff6", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.158.6", + "version": "3.171.3", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "4e912c1ae4d4b3538ada36ac1478f980f9bdf329" + "reference": "7469c8e7f8db5dec544937677d08d8fff4f2f4e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4e912c1ae4d4b3538ada36ac1478f980f9bdf329", - "reference": "4e912c1ae4d4b3538ada36ac1478f980f9bdf329", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7469c8e7f8db5dec544937677d08d8fff4f2f4e9", + "reference": "7469c8e7f8db5dec544937677d08d8fff4f2f4e9", "shasum": "" }, "require": { @@ -89,7 +89,7 @@ "s3", "sdk" ], - "time": "2020-10-09T18:11:48+00:00" + "time": "2020-12-21T19:14:02+00:00" }, { "name": "bshaffer/oauth2-server-php", @@ -198,14 +198,14 @@ }, { "name": "colosa/MichelangeloFE", - "version": "dev-release/3.5.0", + "version": "dev-release/3.6.0", "source": { "type": "git", "url": "git@bitbucket.org:colosa/michelangelofe.git", - "reference": "9b00d86acd2265b9f93fe01ebf46525cc24d82e9" + "reference": "e3ffab0a121943cde4ba0c143f1738a6675e2388" }, "require": { - "colosa/pmui": "release/3.5.0-dev" + "colosa/pmui": "release/3.6.0-dev" }, "type": "library", "description": "ProcessMaker Michelangelo Front End", @@ -213,15 +213,15 @@ "keywords": [ "js app ProcessMaker" ], - "time": "2020-07-15T17:53:27+00:00" + "time": "2020-12-21T19:08:40+00:00" }, { "name": "colosa/pmDynaform", - "version": "dev-release/3.5.0", + "version": "dev-release/3.6.0", "source": { "type": "git", "url": "git@bitbucket.org:colosa/pmdynaform.git", - "reference": "5bd486aef748a9c5527bc7d478e46920af2187e8" + "reference": "2b27b2d3e706bab3f69e52213e1de90f49a871ff" }, "type": "library", "description": "JS Library to render ProcessMaker Dynaforms", @@ -229,15 +229,15 @@ "keywords": [ "js lib ProcessMaker Dynaforms" ], - "time": "2020-07-30T00:09:50+00:00" + "time": "2020-12-11T20:06:23+00:00" }, { "name": "colosa/pmUI", - "version": "dev-release/3.5.0", + "version": "dev-release/3.6.0", "source": { "type": "git", "url": "git@bitbucket.org:colosa/pmui.git", - "reference": "06067194d4d01de7786d803aca597ab081b60342" + "reference": "4d5932e1a9fb21f1eccc5bc6908ae5351e3e8ec1" }, "type": "library", "description": "JS UI Library", @@ -245,15 +245,15 @@ "keywords": [ "js lib ProcessMaker UI" ], - "time": "2019-04-26T14:15:30+00:00" + "time": "2020-09-14T20:25:08+00:00" }, { "name": "colosa/taskscheduler", - "version": "dev-release/1.0.0", + "version": "dev-release/1.0.2", "source": { "type": "git", "url": "git@bitbucket.org:colosa/taskscheduler.git", - "reference": "d8a16adccc4df88abf93b898185f3d2a1f7fc355" + "reference": "8811bf19b26a0d40307e1dfb172cef9ca3c9a748" }, "type": "library", "description": "JS Library to ProcessMaker Task scheduler", @@ -261,7 +261,7 @@ "keywords": [ "js lib ProcessMaker Task scheduler" ], - "time": "2020-07-24T13:14:57+00:00" + "time": "2020-10-23T13:31:53+00:00" }, { "name": "cretueusebiu/laravel-javascript", @@ -520,19 +520,19 @@ "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "69ab0de70a3fdc7b99fe8fa9b1ef073e3b2b5e00" + "reference": "65b2d8ee1f10915efb3b55597da3404f096acba2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/69ab0de70a3fdc7b99fe8fa9b1ef073e3b2b5e00", - "reference": "69ab0de70a3fdc7b99fe8fa9b1ef073e3b2b5e00", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2", + "reference": "65b2d8ee1f10915efb3b55597da3404f096acba2", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.0|^8.0" }, "require-dev": { - "phpunit/phpunit": "^6.4|^7.0" + "phpunit/phpunit": "^6.4|^7.0|^8.0|^9.0" }, "type": "library", "extra": { @@ -572,20 +572,20 @@ "type": "github" } ], - "time": "2020-10-12T18:35:36+00:00" + "time": "2020-10-13T00:52:37+00:00" }, { "name": "egulias/email-validator", - "version": "2.1.22", + "version": "2.1.24", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5" + "reference": "ca90a3291eee1538cd48ff25163240695bd95448" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5", - "reference": "68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ca90a3291eee1538cd48ff25163240695bd95448", + "reference": "ca90a3291eee1538cd48ff25163240695bd95448", "shasum": "" }, "require": { @@ -630,7 +630,13 @@ "validation", "validator" ], - "time": "2020-09-26T15:48:38+00:00" + "funding": [ + { + "url": "https://github.com/egulias", + "type": "github" + } + ], + "time": "2020-11-14T15:56:27+00:00" }, { "name": "erusev/parsedown", @@ -680,16 +686,16 @@ }, { "name": "fzaninotto/faker", - "version": "v1.9.1", + "version": "v1.9.2", "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "fc10d778e4b84d5bd315dad194661e091d307c6f" + "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/fc10d778e4b84d5bd315dad194661e091d307c6f", - "reference": "fc10d778e4b84d5bd315dad194661e091d307c6f", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/848d8125239d7dbf8ab25cb7f054f1a630e68c2e", + "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e", "shasum": "" }, "require": { @@ -727,7 +733,7 @@ "fixtures" ], "abandoned": true, - "time": "2019-12-12T13:22:17+00:00" + "time": "2020-12-11T09:56:16+00:00" }, { "name": "geshi/geshi", @@ -801,7 +807,7 @@ "src/" ] }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "Apache-2.0" ], @@ -1134,6 +1140,20 @@ } ], "description": "Update helper", + "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": "2020-04-07T20:44:10+00:00" }, { @@ -1461,16 +1481,16 @@ }, { "name": "lcobucci/jwt", - "version": "3.3.3", + "version": "3.4.2", "source": { "type": "git", "url": "https://github.com/lcobucci/jwt.git", - "reference": "c1123697f6a2ec29162b82f170dd4a491f524773" + "reference": "17cb82dd625ccb17c74bf8f38563d3b260306483" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lcobucci/jwt/zipball/c1123697f6a2ec29162b82f170dd4a491f524773", - "reference": "c1123697f6a2ec29162b82f170dd4a491f524773", + "url": "https://api.github.com/repos/lcobucci/jwt/zipball/17cb82dd625ccb17c74bf8f38563d3b260306483", + "reference": "17cb82dd625ccb17c74bf8f38563d3b260306483", "shasum": "" }, "require": { @@ -1485,6 +1505,9 @@ "phpunit/phpunit": "^5.7 || ^7.3", "squizlabs/php_codesniffer": "~2.3" }, + "suggest": { + "lcobucci/clock": "*" + }, "type": "library", "extra": { "branch-alias": { @@ -1494,7 +1517,12 @@ "autoload": { "psr-4": { "Lcobucci\\JWT\\": "src" - } + }, + "files": [ + "compat/class-aliases.php", + "compat/json-exception-polyfill.php", + "compat/lcobucci-clock-polyfill.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1522,7 +1550,7 @@ "type": "patreon" } ], - "time": "2020-08-20T13:22:28+00:00" + "time": "2020-12-03T13:43:45+00:00" }, { "name": "league/flysystem", @@ -1616,29 +1644,28 @@ }, { "name": "league/oauth2-client", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth2-client.git", - "reference": "d9f2a1e000dc14eb3c02e15d15759385ec7ff0fb" + "reference": "badb01e62383430706433191b82506b6df24ad98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/d9f2a1e000dc14eb3c02e15d15759385ec7ff0fb", - "reference": "d9f2a1e000dc14eb3c02e15d15759385ec7ff0fb", + "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/badb01e62383430706433191b82506b6df24ad98", + "reference": "badb01e62383430706433191b82506b6df24ad98", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^6.0 || ^7.0", - "paragonie/random_compat": "^1|^2|^9.99", - "php": "^5.6|^7.0" + "paragonie/random_compat": "^1 || ^2 || ^9.99", + "php": "^5.6 || ^7.0 || ^8.0" }, "require-dev": { - "eloquent/liberator": "^2.0", - "eloquent/phony-phpunit": "^1.0|^3.0", - "jakub-onderka/php-parallel-lint": "^0.9.2", - "phpunit/phpunit": "^5.7|^6.0", - "squizlabs/php_codesniffer": "^2.3|^3.0" + "mockery/mockery": "^1.3", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpunit/phpunit": "^5.7 || ^6.0 || ^9.3", + "squizlabs/php_codesniffer": "^2.3 || ^3.0" }, "type": "library", "extra": { @@ -1679,7 +1706,7 @@ "oauth2", "single sign on" ], - "time": "2020-07-18T17:54:32+00:00" + "time": "2020-10-28T02:03:40+00:00" }, { "name": "league/oauth2-google", @@ -1758,7 +1785,7 @@ ], "authors": [ { - "name": "Jean-Marc Tr??meaux", + "name": "Jean-Marc Trémeaux", "homepage": "http://naku.dohcrew.com/", "role": "Developer" }, @@ -2199,16 +2226,16 @@ }, { "name": "opis/closure", - "version": "3.6.0", + "version": "3.6.1", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "c547f8262a5fa9ff507bd06cc394067b83a75085" + "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/c547f8262a5fa9ff507bd06cc394067b83a75085", - "reference": "c547f8262a5fa9ff507bd06cc394067b83a75085", + "url": "https://api.github.com/repos/opis/closure/zipball/943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5", + "reference": "943b5d70cc5ae7483f6aff6ff43d7e34592ca0f5", "shasum": "" }, "require": { @@ -2256,7 +2283,7 @@ "serialization", "serialize" ], - "time": "2020-10-11T21:42:15+00:00" + "time": "2020-11-07T02:01:34+00:00" }, { "name": "paragonie/random_compat", @@ -2358,16 +2385,16 @@ }, { "name": "pear/archive_tar", - "version": "1.4.10", + "version": "1.4.11", "source": { "type": "git", "url": "https://github.com/pear/Archive_Tar.git", - "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b" + "reference": "17d355cb7d3c4ff08e5729f29cd7660145208d9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/bbb4f10f71a1da2715ec6d9a683f4f23c507a49b", - "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b", + "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/17d355cb7d3c4ff08e5729f29cd7660145208d9d", + "reference": "17d355cb7d3c4ff08e5729f29cd7660145208d9d", "shasum": "" }, "require": { @@ -2420,7 +2447,7 @@ "archive", "tar" ], - "time": "2020-09-15T14:13:23+00:00" + "time": "2020-11-19T22:10:24+00:00" }, { "name": "pear/console_getopt", @@ -2875,16 +2902,16 @@ }, { "name": "phpmyadmin/sql-parser", - "version": "5.4.0", + "version": "5.4.1", "source": { "type": "git", "url": "https://github.com/phpmyadmin/sql-parser.git", - "reference": "6c597821433d9dfbc796f105149614f802a25a4e" + "reference": "32175ee13bde3aef7bdff492ce2d0f0c9cb5cbf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/6c597821433d9dfbc796f105149614f802a25a4e", - "reference": "6c597821433d9dfbc796f105149614f802a25a4e", + "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/32175ee13bde3aef7bdff492ce2d0f0c9cb5cbf4", + "reference": "32175ee13bde3aef7bdff492ce2d0f0c9cb5cbf4", "shasum": "" }, "require": { @@ -2937,7 +2964,7 @@ "parser", "sql" ], - "time": "2020-10-08T19:21:19+00:00" + "time": "2020-10-15T15:19:46+00:00" }, { "name": "predis/predis", @@ -2987,6 +3014,16 @@ "predis", "redis" ], + "funding": [ + { + "url": "https://www.paypal.me/tillkruss", + "type": "custom" + }, + { + "url": "https://github.com/tillkruss", + "type": "github" + } + ], "time": "2016-06-16T16:22:20+00:00" }, { @@ -3480,32 +3517,31 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.3", + "version": "v6.2.4", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "149cfdf118b169f7840bbe3ef0d4bc795d1780c9" + "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/149cfdf118b169f7840bbe3ef0d4bc795d1780c9", - "reference": "149cfdf118b169f7840bbe3ef0d4bc795d1780c9", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", + "reference": "56f0ab23f54c4ccbb0d5dcc67ff8552e0c98d59e", "shasum": "" }, "require": { - "egulias/email-validator": "~2.0", + "egulias/email-validator": "^2.0", "php": ">=7.0.0", "symfony/polyfill-iconv": "^1.0", "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, "require-dev": { - "mockery/mockery": "~0.9.1", - "symfony/phpunit-bridge": "^3.4.19|^4.1.8" + "mockery/mockery": "^1.0", + "symfony/phpunit-bridge": "^4.4|^5.0" }, "suggest": { - "ext-intl": "Needed to support internationalized email addresses", - "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed" + "ext-intl": "Needed to support internationalized email addresses" }, "type": "library", "extra": { @@ -3538,20 +3574,30 @@ "mail", "mailer" ], - "time": "2019-11-12T09:31:26+00:00" + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer", + "type": "tidelift" + } + ], + "time": "2020-12-08T18:02:06+00:00" }, { "name": "symfony/config", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "7c5a1002178a612787c291a4f515f87b19176b61" + "reference": "e501c56d2fa70798075b9811d0eb4c27de491459" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/7c5a1002178a612787c291a4f515f87b19176b61", - "reference": "7c5a1002178a612787c291a4f515f87b19176b61", + "url": "https://api.github.com/repos/symfony/config/zipball/e501c56d2fa70798075b9811d0eb4c27de491459", + "reference": "e501c56d2fa70798075b9811d0eb4c27de491459", "shasum": "" }, "require": { @@ -3573,11 +3619,6 @@ "symfony/yaml": "To use the yaml reference dumper" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Config\\": "" @@ -3616,20 +3657,20 @@ "type": "tidelift" } ], - "time": "2020-10-02T07:34:48+00:00" + "time": "2020-12-09T08:58:17+00:00" }, { "name": "symfony/console", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "90933b39c7b312fc3ceaa1ddeac7eb48cb953124" + "reference": "12e071278e396cc3e1c149857337e9e192deca0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/90933b39c7b312fc3ceaa1ddeac7eb48cb953124", - "reference": "90933b39c7b312fc3ceaa1ddeac7eb48cb953124", + "url": "https://api.github.com/repos/symfony/console/zipball/12e071278e396cc3e1c149857337e9e192deca0b", + "reference": "12e071278e396cc3e1c149857337e9e192deca0b", "shasum": "" }, "require": { @@ -3664,11 +3705,6 @@ "symfony/process": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Console\\": "" @@ -3707,31 +3743,26 @@ "type": "tidelift" } ], - "time": "2020-09-15T07:58:55+00:00" + "time": "2020-12-18T07:41:31+00:00" }, { "name": "symfony/css-selector", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "bf17dc9f6ce144e41f786c32435feea4d8e11dcc" + "reference": "74bd82e75da256ad20851af6ded07823332216c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/bf17dc9f6ce144e41f786c32435feea4d8e11dcc", - "reference": "bf17dc9f6ce144e41f786c32435feea4d8e11dcc", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/74bd82e75da256ad20851af6ded07823332216c7", + "reference": "74bd82e75da256ad20851af6ded07823332216c7", "shasum": "" }, "require": { "php": ">=7.1.3" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\CssSelector\\": "" @@ -3774,20 +3805,20 @@ "type": "tidelift" } ], - "time": "2020-07-05T09:39:30+00:00" + "time": "2020-12-08T16:59:59+00:00" }, { "name": "symfony/debug", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "726b85e69342e767d60e3853b98559a68ff74183" + "reference": "5dfc7825f3bfe9bb74b23d8b8ce0e0894e32b544" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/726b85e69342e767d60e3853b98559a68ff74183", - "reference": "726b85e69342e767d60e3853b98559a68ff74183", + "url": "https://api.github.com/repos/symfony/debug/zipball/5dfc7825f3bfe9bb74b23d8b8ce0e0894e32b544", + "reference": "5dfc7825f3bfe9bb74b23d8b8ce0e0894e32b544", "shasum": "" }, "require": { @@ -3802,11 +3833,6 @@ "symfony/http-kernel": "^3.4|^4.0|^5.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Debug\\": "" @@ -3845,20 +3871,20 @@ "type": "tidelift" } ], - "time": "2020-09-09T05:20:36+00:00" + "time": "2020-12-10T16:34:26+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "89274c8847dff2ed703e481843eb9159ca25cc6e" + "reference": "3860f64c6deb2cb48b1ada27460c58ae479bdc0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/89274c8847dff2ed703e481843eb9159ca25cc6e", - "reference": "89274c8847dff2ed703e481843eb9159ca25cc6e", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/3860f64c6deb2cb48b1ada27460c58ae479bdc0f", + "reference": "3860f64c6deb2cb48b1ada27460c58ae479bdc0f", "shasum": "" }, "require": { @@ -3889,11 +3915,6 @@ "symfony/yaml": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\DependencyInjection\\": "" @@ -3932,20 +3953,20 @@ "type": "tidelift" } ], - "time": "2020-09-10T10:08:39+00:00" + "time": "2020-12-18T07:41:31+00:00" }, { "name": "symfony/error-handler", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "c8be4a5c70af70fec82e762dd93e3bbcf95c035f" + "reference": "ef2f7ddd3b9177bbf8ff2ecd8d0e970ed48da0c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/c8be4a5c70af70fec82e762dd93e3bbcf95c035f", - "reference": "c8be4a5c70af70fec82e762dd93e3bbcf95c035f", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/ef2f7ddd3b9177bbf8ff2ecd8d0e970ed48da0c3", + "reference": "ef2f7ddd3b9177bbf8ff2ecd8d0e970ed48da0c3", "shasum": "" }, "require": { @@ -3960,11 +3981,6 @@ "symfony/serializer": "^4.4|^5.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\ErrorHandler\\": "" @@ -4003,20 +4019,20 @@ "type": "tidelift" } ], - "time": "2020-10-01T16:21:20+00:00" + "time": "2020-12-09T11:15:38+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "e17bb5e0663dc725f7cdcafc932132735b4725cd" + "reference": "5d4c874b0eb1c32d40328a09dbc37307a5a910b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e17bb5e0663dc725f7cdcafc932132735b4725cd", - "reference": "e17bb5e0663dc725f7cdcafc932132735b4725cd", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5d4c874b0eb1c32d40328a09dbc37307a5a910b0", + "reference": "5d4c874b0eb1c32d40328a09dbc37307a5a910b0", "shasum": "" }, "require": { @@ -4045,11 +4061,6 @@ "symfony/http-kernel": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" @@ -4088,7 +4099,7 @@ "type": "tidelift" } ], - "time": "2020-09-18T14:07:46+00:00" + "time": "2020-12-18T07:41:31+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4168,16 +4179,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "ebc51494739d3b081ea543ed7c462fa73a4f74db" + "reference": "d99fbef7e0f69bf162ae6131b31132fa3cc4bcbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/ebc51494739d3b081ea543ed7c462fa73a4f74db", - "reference": "ebc51494739d3b081ea543ed7c462fa73a4f74db", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/d99fbef7e0f69bf162ae6131b31132fa3cc4bcbe", + "reference": "d99fbef7e0f69bf162ae6131b31132fa3cc4bcbe", "shasum": "" }, "require": { @@ -4185,11 +4196,6 @@ "symfony/polyfill-ctype": "~1.8" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Filesystem\\": "" @@ -4228,31 +4234,26 @@ "type": "tidelift" } ], - "time": "2020-09-27T13:54:16+00:00" + "time": "2020-11-30T13:04:35+00:00" }, { "name": "symfony/finder", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "60d08560f9aa72997c44077c40d47aa28a963230" + "reference": "ebd0965f2dc2d4e0f11487c16fbb041e50b5c09b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/60d08560f9aa72997c44077c40d47aa28a963230", - "reference": "60d08560f9aa72997c44077c40d47aa28a963230", + "url": "https://api.github.com/repos/symfony/finder/zipball/ebd0965f2dc2d4e0f11487c16fbb041e50b5c09b", + "reference": "ebd0965f2dc2d4e0f11487c16fbb041e50b5c09b", "shasum": "" }, "require": { "php": ">=7.1.3" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Finder\\": "" @@ -4291,7 +4292,7 @@ "type": "tidelift" } ], - "time": "2020-10-02T07:34:48+00:00" + "time": "2020-12-08T16:59:59+00:00" }, { "name": "symfony/http-client-contracts", @@ -4370,33 +4371,29 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "10683b407c3b6087c64619ebc97a87e36ea62c92" + "reference": "5ebda66b51612516bf338d5f87da2f37ff74cf34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/10683b407c3b6087c64619ebc97a87e36ea62c92", - "reference": "10683b407c3b6087c64619ebc97a87e36ea62c92", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5ebda66b51612516bf338d5f87da2f37ff74cf34", + "reference": "5ebda66b51612516bf338d5f87da2f37ff74cf34", "shasum": "" }, "require": { "php": ">=7.1.3", "symfony/mime": "^4.3|^5.0", - "symfony/polyfill-mbstring": "~1.1" + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php80": "^1.15" }, "require-dev": { "predis/predis": "~1.0", "symfony/expression-language": "^3.4|^4.0|^5.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" @@ -4435,20 +4432,20 @@ "type": "tidelift" } ], - "time": "2020-09-27T14:14:06+00:00" + "time": "2020-12-18T07:41:31+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6544745997b06c7dcecf0d4a70f09e5de1db7ca8" + "reference": "eaff9a43e74513508867ecfa66ef94fbb96ab128" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6544745997b06c7dcecf0d4a70f09e5de1db7ca8", - "reference": "6544745997b06c7dcecf0d4a70f09e5de1db7ca8", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/eaff9a43e74513508867ecfa66ef94fbb96ab128", + "reference": "eaff9a43e74513508867ecfa66ef94fbb96ab128", "shasum": "" }, "require": { @@ -4498,11 +4495,6 @@ "symfony/dependency-injection": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\HttpKernel\\": "" @@ -4541,20 +4533,20 @@ "type": "tidelift" } ], - "time": "2020-10-04T07:48:13+00:00" + "time": "2020-12-18T13:32:33+00:00" }, { "name": "symfony/mime", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "42df2507eb8e6cd9795f51c99dd52bab543a918f" + "reference": "7a4176a1cbc4cc99268c531de547fccbd0beb370" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/42df2507eb8e6cd9795f51c99dd52bab543a918f", - "reference": "42df2507eb8e6cd9795f51c99dd52bab543a918f", + "url": "https://api.github.com/repos/symfony/mime/zipball/7a4176a1cbc4cc99268c531de547fccbd0beb370", + "reference": "7a4176a1cbc4cc99268c531de547fccbd0beb370", "shasum": "" }, "require": { @@ -4570,11 +4562,6 @@ "symfony/dependency-injection": "^3.4|^4.1|^5.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Mime\\": "" @@ -4617,24 +4604,24 @@ "type": "tidelift" } ], - "time": "2020-09-02T16:08:58+00:00" + "time": "2020-12-09T11:15:38+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "1c302646f6efc070cd46856e600e5e0684d6b454" + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454", - "reference": "1c302646f6efc070cd46856e600e5e0684d6b454", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-ctype": "For best performance" @@ -4642,7 +4629,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4693,24 +4680,24 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36" + "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36", - "reference": "6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c536646fdb4f29104dd26effc2fdcb9a5b085024", + "reference": "c536646fdb4f29104dd26effc2fdcb9a5b085024", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-iconv": "For best performance" @@ -4718,7 +4705,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4770,26 +4757,25 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251" + "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251", - "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117", + "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117", "shasum": "" }, "require": { - "php": ">=5.3.3", + "php": ">=7.1", "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php70": "^1.10", "symfony/polyfill-php72": "^1.10" }, "suggest": { @@ -4798,7 +4784,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4855,24 +4841,24 @@ "type": "tidelift" } ], - "time": "2020-08-04T06:02:08+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e" + "reference": "727d1096295d807c309fb01a851577302394c897" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", - "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897", + "reference": "727d1096295d807c309fb01a851577302394c897", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-intl": "For best performance" @@ -4880,7 +4866,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4936,24 +4922,24 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a" + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a", - "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-mbstring": "For best performance" @@ -4961,7 +4947,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5013,106 +4999,29 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" - }, - { - "name": "symfony/polyfill-php70", - "version": "v1.18.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", - "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "~1.0|~2.0|~9.99", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php70\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "639447d008615574653fb3bc60d1986d7172eaae" + "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae", - "reference": "639447d008615574653fb3bc60d1986d7172eaae", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", + "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5163,29 +5072,29 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca" + "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca", - "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/8ff431c517be11c78c48a39a66d37431e26a6bed", + "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5239,29 +5148,29 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.18.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981" + "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981", - "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/e70aa8b064c5b72d3df2abd5ab1e90464ad009de", + "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de", "shasum": "" }, "require": { - "php": ">=7.0.8" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -5319,31 +5228,26 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/process", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "9b887acc522935f77555ae8813495958c7771ba7" + "reference": "075316ff72233ce3d04a9743414292e834f2cb4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/9b887acc522935f77555ae8813495958c7771ba7", - "reference": "9b887acc522935f77555ae8813495958c7771ba7", + "url": "https://api.github.com/repos/symfony/process/zipball/075316ff72233ce3d04a9743414292e834f2cb4a", + "reference": "075316ff72233ce3d04a9743414292e834f2cb4a", "shasum": "" }, "require": { "php": ">=7.1.3" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Process\\": "" @@ -5382,20 +5286,20 @@ "type": "tidelift" } ], - "time": "2020-09-02T16:08:58+00:00" + "time": "2020-12-08T16:59:59+00:00" }, { "name": "symfony/routing", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "006b2d06672b8650998f328fc603eb6f3feb979f" + "reference": "80b042c20b035818daec844723e23b9825134ba0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/006b2d06672b8650998f328fc603eb6f3feb979f", - "reference": "006b2d06672b8650998f328fc603eb6f3feb979f", + "url": "https://api.github.com/repos/symfony/routing/zipball/80b042c20b035818daec844723e23b9825134ba0", + "reference": "80b042c20b035818daec844723e23b9825134ba0", "shasum": "" }, "require": { @@ -5423,11 +5327,6 @@ "symfony/yaml": "For using the YAML loader" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Routing\\": "" @@ -5472,7 +5371,7 @@ "type": "tidelift" } ], - "time": "2020-10-01T16:25:17+00:00" + "time": "2020-12-08T16:59:59+00:00" }, { "name": "symfony/service-contracts", @@ -5552,16 +5451,16 @@ }, { "name": "symfony/translation", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "8494fa1bbf9d77fe1e7d50ac8ccfb80a858a98bd" + "reference": "c1001b7d75b3136648f94b245588209d881c6939" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/8494fa1bbf9d77fe1e7d50ac8ccfb80a858a98bd", - "reference": "8494fa1bbf9d77fe1e7d50ac8ccfb80a858a98bd", + "url": "https://api.github.com/repos/symfony/translation/zipball/c1001b7d75b3136648f94b245588209d881c6939", + "reference": "c1001b7d75b3136648f94b245588209d881c6939", "shasum": "" }, "require": { @@ -5595,11 +5494,6 @@ "symfony/yaml": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Translation\\": "" @@ -5638,7 +5532,7 @@ "type": "tidelift" } ], - "time": "2020-10-02T07:34:48+00:00" + "time": "2020-12-08T16:59:59+00:00" }, { "name": "symfony/translation-contracts", @@ -5717,16 +5611,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0dc22bdf9d1197467bb04d505355180b6f20bcca" + "reference": "4f31364bbc8177f2a6dbc125ac3851634ebe2a03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0dc22bdf9d1197467bb04d505355180b6f20bcca", - "reference": "0dc22bdf9d1197467bb04d505355180b6f20bcca", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4f31364bbc8177f2a6dbc125ac3851634ebe2a03", + "reference": "4f31364bbc8177f2a6dbc125ac3851634ebe2a03", "shasum": "" }, "require": { @@ -5754,11 +5648,6 @@ "Resources/bin/var-dump-server" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "files": [ "Resources/functions/dump.php" @@ -5804,7 +5693,7 @@ "type": "tidelift" } ], - "time": "2020-09-18T08:35:10+00:00" + "time": "2020-12-08T16:59:59+00:00" }, { "name": "tecnickcom/tcpdf", @@ -6425,36 +6314,31 @@ }, { "name": "doctrine/instantiator", - "version": "1.3.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "f350df0268e904597e3bd9c4685c53e0e333feea" + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea", - "reference": "f350df0268e904597e3bd9c4685c53e0e333feea", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", + "doctrine/coding-standard": "^8.0", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.13", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-shim": "^0.11", - "phpunit/phpunit": "^7.0" + "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" @@ -6468,7 +6352,7 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" + "homepage": "https://ocramius.github.io/" } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", @@ -6477,7 +6361,21 @@ "constructor", "instantiate" ], - "time": "2020-05-29T17:27:14+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2020-11-10T18:47:58+00:00" }, { "name": "filp/whoops", @@ -6600,16 +6498,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.10.1", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5" + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5", - "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", "shasum": "" }, "require": { @@ -6650,7 +6548,7 @@ "type": "tidelift" } ], - "time": "2020-06-29T13:22:24+00:00" + "time": "2020-11-13T09:40:50+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -7257,23 +7155,23 @@ }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18" + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", - "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": ">=5.6" }, "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.0" + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { @@ -7298,7 +7196,13 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2017-03-04T06:30:41+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T08:15:22+00:00" }, { "name": "sebastian/comparator", @@ -7770,16 +7674,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.6", + "version": "3.5.8", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "e97627871a7eab2f70e59166072a6b767d5834e0" + "reference": "9d583721a7157ee997f235f327de038e7ea6dac4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0", - "reference": "e97627871a7eab2f70e59166072a6b767d5834e0", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4", + "reference": "9d583721a7157ee997f235f327de038e7ea6dac4", "shasum": "" }, "require": { @@ -7817,20 +7721,20 @@ "phpcs", "standards" ], - "time": "2020-08-10T04:50:15+00:00" + "time": "2020-10-23T02:01:07+00:00" }, { "name": "symfony/yaml", - "version": "v4.4.15", + "version": "v4.4.18", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "c7885964b1eceb70b0981556d0a9b01d2d97c8d1" + "reference": "bbce94f14d73732340740366fcbe63363663a403" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c7885964b1eceb70b0981556d0a9b01d2d97c8d1", - "reference": "c7885964b1eceb70b0981556d0a9b01d2d97c8d1", + "url": "https://api.github.com/repos/symfony/yaml/zipball/bbce94f14d73732340740366fcbe63363663a403", + "reference": "bbce94f14d73732340740366fcbe63363663a403", "shasum": "" }, "require": { @@ -7847,11 +7751,6 @@ "symfony/console": "For validating YAML files using the lint command" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" @@ -7890,7 +7789,7 @@ "type": "tidelift" } ], - "time": "2020-09-27T03:36:23+00:00" + "time": "2020-12-08T16:59:59+00:00" }, { "name": "webmozart/assert", diff --git a/database/factories/ApplicationFactory.php b/database/factories/ApplicationFactory.php index 7223e9974..2688502b8 100644 --- a/database/factories/ApplicationFactory.php +++ b/database/factories/ApplicationFactory.php @@ -67,6 +67,15 @@ $factory->state(\ProcessMaker\Model\Application::class, 'foreign_keys', function ]; }); +$factory->state(\ProcessMaker\Model\Application::class, 'web_entry', function (Faker $faker) { + $appNumber = $faker->unique()->numberBetween(5000); + return [ + 'APP_NUMBER' => $appNumber * -1, + 'APP_STATUS_ID' => 2, + 'APP_STATUS' => 'TO_DO' + ]; +}); + $factory->state(\ProcessMaker\Model\Application::class, 'todo', function (Faker $faker) { return [ 'APP_NUMBER' => $faker->unique()->numberBetween(1000), diff --git a/database/factories/DelegationFactory.php b/database/factories/DelegationFactory.php index b86c42285..afc2c8ca2 100644 --- a/database/factories/DelegationFactory.php +++ b/database/factories/DelegationFactory.php @@ -86,6 +86,51 @@ $factory->state(\ProcessMaker\Model\Delegation::class, 'foreign_keys', function ]; }); +// Create a delegation with the foreign keys +$factory->state(\ProcessMaker\Model\Delegation::class, 'web_entry', function (Faker $faker) { + // Create values in the foreign key relations + $user = factory(\ProcessMaker\Model\User::class)->create(); + $category = factory(\ProcessMaker\Model\ProcessCategory::class)->create(); + $process = factory(\ProcessMaker\Model\Process::class)->create([ + 'PRO_CATEGORY' => $category->CATEGORY_UID, + 'CATEGORY_ID' => $category->CATEGORY_ID + ]); + $task = factory(\ProcessMaker\Model\Task::class)->create([ + 'PRO_UID' => $process->PRO_UID, + 'PRO_ID' => $process->PRO_ID + ]); + $application = factory(\ProcessMaker\Model\Application::class)->states('web_entry')->create([ + 'PRO_UID' => $process->PRO_UID, + 'APP_INIT_USER' => $user->USR_UID, + 'APP_CUR_USER' => $user->USR_UID + ]); + + // Return with default values + return [ + 'DELEGATION_ID' => $faker->unique()->numberBetween(5000), + 'APP_UID' => $application->APP_UID, + 'DEL_INDEX' => 1, + 'APP_NUMBER' => $application->APP_NUMBER, + 'DEL_PREVIOUS' => 0, + 'PRO_UID' => $process->PRO_UID, + 'TAS_UID' => $task->TAS_UID, + 'USR_UID' => $user->USR_UID, + 'DEL_TYPE' => 'NORMAL', + 'DEL_THREAD' => 1, + 'DEL_THREAD_STATUS' => 'OPEN', + 'DEL_PRIORITY' => 3, + 'DEL_DELEGATE_DATE' => $faker->dateTime(), + 'DEL_INIT_DATE' => $faker->dateTime(), + 'DEL_TASK_DUE_DATE' => $faker->dateTime(), + 'DEL_RISK_DATE' => $faker->dateTime(), + 'USR_ID' => $user->USR_ID, + 'PRO_ID' => $process->PRO_ID, + 'TAS_ID' => $task->TAS_ID, + 'DEL_DATA' => '', + 'DEL_TITLE' => $faker->word() + ]; +}); + // Create a open delegation $factory->state(\ProcessMaker\Model\Delegation::class, 'open', function (Faker $faker) { // Create dates with sense diff --git a/rbac/engine/classes/model/AuthenticationSource.php b/rbac/engine/classes/model/AuthenticationSource.php index 3b16760c6..60f093290 100644 --- a/rbac/engine/classes/model/AuthenticationSource.php +++ b/rbac/engine/classes/model/AuthenticationSource.php @@ -16,6 +16,8 @@ */ require_once 'classes/model/om/BaseAuthenticationSource.php'; +use Illuminate\Support\Facades\Log; + /** * @package rbac-classes-model */ @@ -69,6 +71,7 @@ class AuthenticationSource extends BaseAuthenticationSource { $oConnection->begin(); $iResult = $oAuthenticationSource->save(); $oConnection->commit(); + Log::channel(':ldapAdvanced')->info("create", Bootstrap::context($aData)); $authSourceServerName = isset($aData['AUTH_SOURCE_SERVER_NAME']) ? ' - Server Name: '.$aData['AUTH_SOURCE_SERVER_NAME'] : ''; $authSourcePort = isset($aData['AUTH_SOURCE_PORT']) ? ' - Port: '.$aData['AUTH_SOURCE_PORT'] : ''; @@ -122,6 +125,7 @@ class AuthenticationSource extends BaseAuthenticationSource { $oConnection->begin(); $iResult = $oAuthenticationSource->save(); $oConnection->commit(); + Log::channel(':ldapAdvanced')->info("update", Bootstrap::context($aData)); G::auditLog("UpdateAuthSource", "Authentication Source Name: ".$aData['AUTH_SOURCE_NAME']." - Authentication Source ID: (".$aData['AUTH_SOURCE_UID'].") ".$authSourceServerName.$authSourcePort.$authSourceEnabledTLS.$authSourceVersion.$authSourceBaseDn.$authAnonymous.$authSourceSearchUser.$authSourceLdapType.$authSourceIdentifier.$authSourceFilter); return $iResult; } @@ -131,6 +135,7 @@ class AuthenticationSource extends BaseAuthenticationSource { foreach($aValidationFailures as $oValidationFailure) { $sMessage .= $oValidationFailure->getMessage() . '
'; } + Log::channel(':ldapAdvanced')->error($sMessage, Bootstrap::context($aData)); throw(new Exception('The registry cannot be updated!
'.$sMessage)); } } @@ -158,6 +163,7 @@ class AuthenticationSource extends BaseAuthenticationSource { $oConnection->begin(); $iResult = $oAuthenticationSource->delete(); $oConnection->commit(); + Log::channel(':ldapAdvanced')->info("remove", Bootstrap::context(["AUTH_SOURCE_UID" => $sUID])); G::auditLog("DeleteAuthSource", "Authentication Source Name: ".$authenticationSource['AUTH_SOURCE_NAME']." Authentication Source ID: (".$sUID.") "); return $iResult; diff --git a/resources/assets/js/api/Api.js b/resources/assets/js/api/Api.js index 6a3ee6dad..d8024421a 100644 --- a/resources/assets/js/api/Api.js +++ b/resources/assets/js/api/Api.js @@ -14,7 +14,7 @@ const services = { GET_LISTS_COMPLETED: "/light/completed", GET_USERS_PICTURES: "/light/users/data", FORMS_ARRAY: "/light/project/{pro_uid}/activity/{act_uid}/steps", - GET_NEW_CASES: "/light/start-case", + GET_NEW_CASES: "/case/start-cases?type_view=category", GET_HISTORY_CASES: "/light/history/{app_uid}", LOGOUT_USER: "/light/logout", UPLOAD_LOCATION: "/light/case/{app_uid}/upload/location", diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js index ba41f5f07..d890f5851 100644 --- a/resources/assets/js/api/Cases.js +++ b/resources/assets/js/api/Cases.js @@ -111,6 +111,11 @@ export let cases = { window.config.SYS_URI + `cases/open?APP_UID=${data.APP_UID}&DEL_INDEX=${data.DEL_INDEX}&action=${data.ACTION}`); }, + cases_open(data) { + return axios.get(window.config.SYS_SERVER + + window.config.SYS_URI + + `cases/cases_Open?APP_UID=${data.APP_UID}&DEL_INDEX=${data.DEL_INDEX}&action=${data.ACTION}`); + }, cancel(data) { var params = new URLSearchParams(); params.append('action', 'cancelCase'); diff --git a/resources/assets/js/components/home/caseDetail/CaseComments.vue b/resources/assets/js/components/home/caseDetail/CaseComments.vue index 7d55afb13..51f6c868f 100644 --- a/resources/assets/js/components/home/caseDetail/CaseComments.vue +++ b/resources/assets/js/components/home/caseDetail/CaseComments.vue @@ -58,7 +58,7 @@ > - diff --git a/resources/assets/js/components/home/caseDetail/IoDocuments.vue b/resources/assets/js/components/home/caseDetail/IoDocuments.vue index ce92f23e9..7f6480ede 100644 --- a/resources/assets/js/components/home/caseDetail/IoDocuments.vue +++ b/resources/assets/js/components/home/caseDetail/IoDocuments.vue @@ -5,7 +5,7 @@
@@ -79,6 +79,13 @@ export default { return this.icon[icon] ? this.icon[icon] : "fas fa-file-alt"; }, href(item) { + if (item.data.DOWNLOAD_LINK) { + return ( + window.config.SYS_SERVER + + window.config.SYS_URI + + `cases/${item.data.DOWNLOAD_LINK}` + ); + } return ( window.config.SYS_SERVER + window.config.SYS_URI + diff --git a/resources/assets/js/components/home/caseDetail/ProcessMap.vue b/resources/assets/js/components/home/caseDetail/ProcessMap.vue index 8da4ce21d..165e82dca 100644 --- a/resources/assets/js/components/home/caseDetail/ProcessMap.vue +++ b/resources/assets/js/components/home/caseDetail/ProcessMap.vue @@ -15,7 +15,7 @@ export default { name: "ProcessMap", props: { - data: Object, + data: Object }, data() { return { diff --git a/resources/assets/js/components/search/AdvancedFilter.vue b/resources/assets/js/components/search/AdvancedFilter.vue index 32a453bfb..5faf578ad 100644 --- a/resources/assets/js/components/search/AdvancedFilter.vue +++ b/resources/assets/js/components/search/AdvancedFilter.vue @@ -10,15 +10,17 @@ :title="addSearchTitle" > - {{$t('ID_CLEAN_ALL')}} +
+ {{$t('ID_CLEAN_ALL')}} + +
@@ -74,13 +78,21 @@
- +
+ + + +
@@ -88,50 +100,57 @@
- - + +
+
+ + + + + +
+ @@ -232,6 +251,42 @@ export default { return `${this.tagPrefix}: ${data[0].value}`; } }, + { + type: "caseStatus", + id: "CaseStatus", + title: `${this.$i18n.t('ID_FILTER')}: ${this.$i18n.t('ID_CASE_STATUS')}`, + optionLabel: this.$i18n.t('ID_STATUS'), + detail: "ID_PLEASE_SELECT_THE_STATUS_FOR_THE_SEARCH", + tagText: "", + tagPrefix: this.$i18n.t('ID_SEARCH_BY_STATUS'), + items:[ + { + id: "caseStatuses", + value: "", + options: [ + { + value: "DRAFT", + label: this.$i18n.t('ID_DRAFT') + }, + { + value: "TO_DO", + label: this.$i18n.t('ID_TO_DO') + }, + { + value: "COMPLETED", + label: this.$i18n.t('ID_COMPLETED') + }, + { + value: "CANCELED", + label: this.$i18n.t('ID_CANCELLED') + } + ] + } + ], + makeTagText: function (params, data) { + return `${this.tagPrefix} ${data[0].label || ''}`; + } + }, { type: "ProcessName", id: "processName", @@ -269,7 +324,7 @@ export default { } ], makeTagText: function (params, data) { - return `${this.tagPrefix}: ${data[0].label || ''}`; + return `${this.tagPrefix} ${data[0].label || ''}`; } }, { @@ -350,7 +405,8 @@ export default { caseNumber: "", saveModalTitle: this.$i18n.t('ID_SAVE_SEARCH'), localName: "", - nameState: null, + nameState: null, + caseNumberState: null }; }, watch: { @@ -360,12 +416,11 @@ export default { this.searchTags = []; this.selected = []; this.setFilters(newVal); - }, + } } }, - - methods: { + /** * Set Filters and make the tag labels * @param {object} filters json to manage the query @@ -419,30 +474,31 @@ export default { onOk() { let self = this, element, - tmp, item, + filter, initialFilters = []; - this.$root.$emit('bv::hide::popover'); + this.$root.$emit('bv::hide::popover'); for (var i = 0; i < this.selected.length; i+=1) { item = this.selected[i]; element = _.find(this.filterItems, function(o) { return o.id === item; }); if (element) { - _.forEach(element.items, function(value, key) { - tmp = { - filterVar: value.id, - fieldId: item, - value: '', - label: "", - options: [] - }; - initialFilters.push(tmp); + _.forEach(element.items, function(value, key) { + filter = _.find(self.filters, function(o) { return o.filterVar === value.id; }); + if (filter) { + initialFilters.push(filter); + } else { + initialFilters.push({ + filterVar: value.id, + fieldId: item, + value: '', + label: "", + options: [] + }); + } }); } - } this.$emit("onUpdateFilters", initialFilters); - - }, cleanAllTags() { @@ -467,8 +523,25 @@ export default { temp = [...new Set([...this.filters,...params])] this.$emit("onUpdateFilters", temp); }, + /** + * Jump To action handler + * Validates the form input + */ + handleJumpTo() { + const valid = this.$refs.jump.checkValidity() && parseInt(this.caseNumber) > 0; + this.caseNumberState = valid; + if (!valid) { + return; + } + this.$nextTick(() => { + this.$emit("onJumpCase", this.caseNumber); + }); + }, + /** + * Click evemt hamdler for "Jump To" button + */ onJumpCase() { - this.$emit("onJumpCase", this.caseNumber); + this.handleJumpTo(); }, onClick() { if (this.id) { @@ -530,6 +603,12 @@ export default { name: this.name, filters: this.filters }); + }, + /** + * On click tag handler + */ + onClickTag() { + this.$root.$emit('bv::hide::popover'); } } }; @@ -555,4 +634,8 @@ export default { .bv-example-row-flex-cols .row { min-height: 10rem; } + +.tag { + width: 100%; +} diff --git a/resources/assets/js/components/search/popovers/CaseIntegerNumber.vue b/resources/assets/js/components/search/popovers/CaseIntegerNumber.vue index 365746501..cce92aee3 100644 --- a/resources/assets/js/components/search/popovers/CaseIntegerNumber.vue +++ b/resources/assets/js/components/search/popovers/CaseIntegerNumber.vue @@ -14,7 +14,7 @@ {{ info.detail }} - {{ option.text }} + {{ option.label }} @@ -31,7 +31,7 @@ export default { components: { SearchPopover }, - props: ["tag", "info"], + props: ["tag", "info", "filter"], methods: { /** * Ok button handler @@ -43,17 +43,18 @@ export default { * Submit button handler */ handleSubmit() { - let selectedOptions = []; - let self = this; - _.forEach(this.info.caseStatuses, function(value) { - selectedOptions.push(_.find(self.info.options, function(o) { return o.value === value; })); - }); - this.$emit("updateSearchTag", { - CaseStatus: { - caseStatuses: this.info.caseStatuses.join(","), - selectedOptions: selectedOptions + let selectedLabels = [], + self = this, + item; + this.filter[0].value=this.filter[0].options.join(","); + _.forEach(this.filter[0].options, function(value) { + item = _.find(self.info.items[0].options, function(o) { return o.value === value; }); + if (item) { + selectedLabels.push(item.label); } }); + this.filter[0].label=selectedLabels.join(","); + this.$emit("updateSearchTag", this.filter); this.$root.$emit("bv::hide::popover") }, /** diff --git a/resources/assets/js/components/search/popovers/SearchPopover.vue b/resources/assets/js/components/search/popovers/SearchPopover.vue index f4ccab5ac..cf3c63e6d 100644 --- a/resources/assets/js/components/search/popovers/SearchPopover.vue +++ b/resources/assets/js/components/search/popovers/SearchPopover.vue @@ -8,7 +8,8 @@ ref="popover" triggers="click" placement="bottom" - class="popovercustom" + class="popovercustom" + @show="onshow" > @@ -73,6 +71,7 @@ export default { data() { return { metrics: [], + title: this.$i18n.t('ID_MY_CASES'), filter: "CASES_INBOX", allView: [], filterHeader: "STARTED", @@ -122,11 +121,16 @@ export default { }, }, translations: null, - pmDateFormat: "Y-m-d H:i:s", + pmDateFormat: window.config.FORMATS.dateFormat }; }, mounted() { this.getHeaders(); + // force to open start cases modal + // if the user has start case as a default case menu option + if (window.config._nodeId === "CASES_START_CASE") { + this.$refs["newRequest"].show(); + } }, watch: {}, computed: { @@ -195,14 +199,15 @@ export default { CASE_TITLE: v.DEL_TITLE, PROCESS_NAME: v.PRO_TITLE, STATUS: v.APP_STATUS, - START_DATE: v.APP_CREATE_DATE || "", - FINISH_DATE: v.APP_FINISH_DATE || "", + START_DATE: v.APP_CREATE_DATE_LABEL || "", + FINISH_DATE: v.APP_FINISH_DATE_LABEL || "", PENDING_TASKS: that.formantPendingTask(v.PENDING), DURATION: v.DURATION, DEL_INDEX: v.DEL_INDEX, APP_UID: v.APP_UID, PRO_UID: v.PRO_UID, TAS_UID: v.TAS_UID, + MESSAGE_COLOR: v.CASE_NOTES_COUNT > 0 ? "black":"silver" }); }); return data; @@ -402,6 +407,7 @@ export default { item: v.id, icon: info[v.id].icon, onClick: (obj) => { + that.title = obj.title; that.filterHeader = obj.item; that.$refs["vueTable"].getData(); }, @@ -410,6 +416,10 @@ export default { }); return data; }, + /** + * Open the case notes modal + * @param {object} data - needed to create the data + */ openComments(data) { let that = this; api.cases.open(_.extend({ ACTION: "todo" }, data)).then(() => { @@ -427,6 +437,12 @@ export default { }); } }, + /** + * Post notes event handler + */ + onPostNotes() { + this.$refs["vueTable"].getData(); + } }, }; diff --git a/resources/assets/js/home/Paused.vue b/resources/assets/js/home/Paused.vue index ea5bb1321..9c322de8d 100644 --- a/resources/assets/js/home/Paused.vue +++ b/resources/assets/js/home/Paused.vue @@ -191,16 +191,16 @@ export default { CASE_NUMBER: v.APP_NUMBER, CASE_TITLE: v.DEL_TITLE, PROCESS_NAME: v.PRO_TITLE, - TASK: { + TASK: [{ TITLE: v.TAS_TITLE, CODE_COLOR: v.TAS_COLOR, COLOR: v.TAS_COLOR_LABEL, - }, + }], USR_FIRSTNAME: v.USR_FIRSTNAME, USR_LASTNAME: v.USR_LASTNAME, USR_USERNAME: v.USR_USERNAME, - DUE_DATE: v.DEL_TASK_DUE_DATE, - DELEGATION_DATE: v.DEL_DELEGATE_DATE, + DUE_DATE: v.DEL_TASK_DUE_DATE_LABEL, + DELEGATION_DATE: v.DEL_DELEGATE_DATE_LABEL, PRIORITY: v.DEL_PRIORITY_LABEL, DEL_INDEX: v.DEL_INDEX, APP_UID: v.APP_UID, @@ -249,7 +249,7 @@ export default { */ openCaseDetail(item) { let that = this; - api.cases.open(_.extend({ ACTION: "todo" }, item)).then(() => { + api.cases.cases_open(_.extend({ ACTION: "todo" }, item)).then(() => { that.$emit("onUpdateDataCase", { APP_UID: item.APP_UID, DEL_INDEX: item.DEL_INDEX, diff --git a/resources/assets/js/home/TabsCaseDetail.vue b/resources/assets/js/home/TabsCaseDetail.vue index 20091af7e..605a06899 100644 --- a/resources/assets/js/home/TabsCaseDetail.vue +++ b/resources/assets/js/home/TabsCaseDetail.vue @@ -1,11 +1,12 @@