diff --git a/bootstrap/classaliasmap.php b/bootstrap/classaliasmap.php index 35bcba995..6415732c6 100644 --- a/bootstrap/classaliasmap.php +++ b/bootstrap/classaliasmap.php @@ -70,6 +70,7 @@ return array( 'replacementLogo' => ReplacementLogo::class, 'Report' => Report::class, 'ReportTables' => ReportTables::class, + 'request' => Illuminate\Http\Request::class, 'serverConf' => ServerConf::class, 'Sessions' => Sessions::class, 'spoolRun' => SpoolRun::class, diff --git a/composer.json b/composer.json index cff48d5cf..291f144b6 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,6 @@ "monolog/monolog": "1.19.0", "geshi/geshi": "dev-master", "libchart/libchart": "1.4.0", - "indeyets/pake": "1.99.*", "phpmailer/phpmailer": "5.2.*", "pear/archive_tar": "1.4.*", "pear/console_getopt": "1.4.*", @@ -80,6 +79,7 @@ "gulliver/includes/inc.ajax.php", "gulliver/includes/smarty_plugins/function.pmos.php", "thirdparty/pear/PEAR.php", + "thirdparty/pake/pakeFunction.php", "thirdparty/HTMLPurifier/HTMLPurifier.auto.php", "workflow/engine/classes/class.pmFunctions.php", "workflow/engine/src/ProcessMaker/Util/helpers.php" diff --git a/composer.lock b/composer.lock index d14a950ca..e3279b80a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "047fd790a13c1ba76987614467ecec45", - "content-hash": "c118a4dc7a7e3cd273f394337e5fb835", + "content-hash": "fe59fa461e9821731c50135b7703f06e", "packages": [ { "name": "bshaffer/oauth2-server-php", @@ -48,7 +47,7 @@ "oauth", "oauth2" ], - "time": "2013-08-12 16:35:58" + "time": "2013-08-12T16:35:58+00:00" }, { "name": "colosa/MichelangeloFE", @@ -56,7 +55,7 @@ "source": { "type": "git", "url": "git@bitbucket.org:colosa/michelangelofe.git", - "reference": "9e9328acb6bf3e5adaa58e90a78929cb9834ca6e" + "reference": "753238e0b1e4cd0884665e47423010d2550cf72e" }, "require": { "colosa/pmui": "release/3.2.2-dev" @@ -67,7 +66,7 @@ "keywords": [ "js app ProcessMaker" ], - "time": "2017-08-11 21:55:11" + "time": "2017-09-05T17:01:30+00:00" }, { "name": "colosa/pmDynaform", @@ -75,7 +74,7 @@ "source": { "type": "git", "url": "git@bitbucket.org:colosa/pmdynaform.git", - "reference": "8710582804bb17b7940129982c5a0d710093d382" + "reference": "121530470f026968aee051879968cdbcc138393e" }, "type": "library", "description": "JS Library to render ProcessMaker Dynaforms", @@ -83,7 +82,7 @@ "keywords": [ "js lib ProcessMaker Dynaforms" ], - "time": "2017-08-21 21:20:20" + "time": "2017-09-05T17:02:30+00:00" }, { "name": "colosa/pmUI", @@ -99,7 +98,7 @@ "keywords": [ "js lib ProcessMaker UI" ], - "time": "2017-08-10 14:57:39" + "time": "2017-08-10T14:57:39+00:00" }, { "name": "dapphp/securimage", @@ -146,7 +145,7 @@ "captcha", "security" ], - "time": "2016-12-04 17:45:57" + "time": "2016-12-04T17:45:57+00:00" }, { "name": "doctrine/inflector", @@ -213,7 +212,7 @@ "singularize", "string" ], - "time": "2015-11-06 14:35:42" + "time": "2015-11-06T14:35:42+00:00" }, { "name": "erusev/parsedown", @@ -255,7 +254,7 @@ "markdown", "parser" ], - "time": "2017-05-14 14:47:48" + "time": "2017-05-14T14:47:48+00:00" }, { "name": "geshi/geshi", @@ -295,7 +294,7 @@ ], "description": "Generic Syntax Highlighter", "homepage": "http://qbnz.com/highlighter/", - "time": "2017-07-30 00:08:49" + "time": "2017-07-30T00:08:49+00:00" }, { "name": "google/apiclient", @@ -338,86 +337,20 @@ "keywords": [ "google" ], - "time": "2015-10-16 22:11:08" - }, - { - "name": "indeyets/pake", - "version": "1.99.3", - "source": { - "type": "git", - "url": "https://github.com/indeyets/pake.git", - "reference": "410d0d5c18bb3438d323570fdb502402aa7a1aba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/indeyets/pake/zipball/410d0d5c18bb3438d323570fdb502402aa7a1aba", - "reference": "410d0d5c18bb3438d323570fdb502402aa7a1aba", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=5.2.1" - }, - "require-dev": { - "simpletest/simpletest": "1.1.*" - }, - "suggest": { - "ext-bz2": "*", - "ext-pcntl": "*", - "ext-phar": "*", - "ext-posix": "*", - "ext-zlib": "*", - "phing/phing": "2.4.*", - "simpletest/simpletest": "1.1.*" - }, - "bin": [ - "bin/pake" - ], - "type": "library", - "autoload": { - "files": [ - "lib/pake/autoload.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien.potencier@symfony-project.org", - "homepage": "http://fabien.potencier.org/", - "role": "Developer" - }, - { - "name": "Alexey Zakhlestin", - "email": "indeyets@gmail.com", - "homepage": "https://indeyets.ru/", - "role": "Developer" - } - ], - "description": "PHP automation tool inspired by Rake", - "homepage": "https://github.com/indeyets/pake/wiki", - "keywords": [ - "automation", - "build", - "task" - ], - "time": "2013-11-04 08:29:46" + "time": "2015-10-16T22:11:08+00:00" }, { "name": "laravel/framework", - "version": "v5.4.33", + "version": "v5.4.36", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "e53a81a2bf406f501cdf818ad949f8d6c8dabfc0" + "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/e53a81a2bf406f501cdf818ad949f8d6c8dabfc0", - "reference": "e53a81a2bf406f501cdf818ad949f8d6c8dabfc0", + "url": "https://api.github.com/repos/laravel/framework/zipball/1062a22232071c3e8636487c86ec1ae75681bbf9", + "reference": "1062a22232071c3e8636487c86ec1ae75681bbf9", "shasum": "" }, "require": { @@ -533,7 +466,7 @@ "framework", "laravel" ], - "time": "2017-08-14 20:17:41" + "time": "2017-08-30T09:26:16+00:00" }, { "name": "league/flysystem", @@ -616,7 +549,7 @@ "sftp", "storage" ], - "time": "2017-08-06 17:41:04" + "time": "2017-08-06T17:41:04+00:00" }, { "name": "libchart/libchart", @@ -662,7 +595,7 @@ "line charts", "pie charts" ], - "time": "2013-10-19 22:21:30" + "time": "2013-10-19T22:21:30+00:00" }, { "name": "luracast/restler", @@ -741,7 +674,7 @@ "rest", "server" ], - "time": "2017-01-11 03:42:36" + "time": "2017-01-11T03:42:36+00:00" }, { "name": "monolog/monolog", @@ -819,7 +752,7 @@ "logging", "psr-3" ], - "time": "2016-04-12 18:29:35" + "time": "2016-04-12T18:29:35+00:00" }, { "name": "mtdowling/cron-expression", @@ -863,7 +796,7 @@ "cron", "schedule" ], - "time": "2017-01-23 04:29:33" + "time": "2017-01-23T04:29:33+00:00" }, { "name": "nesbot/carbon", @@ -916,7 +849,7 @@ "datetime", "time" ], - "time": "2017-01-16 07:55:07" + "time": "2017-01-16T07:55:07+00:00" }, { "name": "paragonie/random_compat", @@ -964,7 +897,7 @@ "pseudorandom", "random" ], - "time": "2017-03-13 16:27:32" + "time": "2017-03-13T16:27:32+00:00" }, { "name": "pear/archive_tar", @@ -1030,7 +963,7 @@ "archive", "tar" ], - "time": "2017-06-11 17:28:11" + "time": "2017-06-11T17:28:11+00:00" }, { "name": "pear/console_getopt", @@ -1077,7 +1010,7 @@ } ], "description": "More info available on: http://pear.php.net/package/Console_Getopt", - "time": "2015-07-20 20:28:12" + "time": "2015-07-20T20:28:12+00:00" }, { "name": "pear/pear-core-minimal", @@ -1121,7 +1054,7 @@ } ], "description": "Minimal set of PEAR core files to be used as composer dependency", - "time": "2017-02-28 16:46:11" + "time": "2017-02-28T16:46:11+00:00" }, { "name": "pear/pear_exception", @@ -1176,20 +1109,20 @@ "keywords": [ "exception" ], - "time": "2015-02-10 20:07:52" + "time": "2015-02-10T20:07:52+00:00" }, { "name": "phpmailer/phpmailer", - "version": "v5.2.24", + "version": "v5.2.25", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "22d04c6a58145a244696f3f254c1875aa653b26a" + "reference": "2baf20b01690fba8cf720c1ebcf9b988eda50915" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/22d04c6a58145a244696f3f254c1875aa653b26a", - "reference": "22d04c6a58145a244696f3f254c1875aa653b26a", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2baf20b01690fba8cf720c1ebcf9b988eda50915", + "reference": "2baf20b01690fba8cf720c1ebcf9b988eda50915", "shasum": "" }, "require": { @@ -1253,7 +1186,7 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2017-07-26 21:00:20" + "time": "2017-08-28T11:12:07+00:00" }, { "name": "psr/log", @@ -1291,7 +1224,7 @@ "psr", "psr-3" ], - "time": "2012-12-21 11:40:51" + "time": "2012-12-21T11:40:51+00:00" }, { "name": "ramsey/uuid", @@ -1373,7 +1306,7 @@ "identifier", "uuid" ], - "time": "2017-08-04 13:39:04" + "time": "2017-08-04T13:39:04+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -1427,24 +1360,24 @@ "mail", "mailer" ], - "time": "2017-05-01 15:54:03" + "time": "2017-05-01T15:54:03+00:00" }, { "name": "symfony/console", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "b0878233cb5c4391347e5495089c7af11b8e6201" + "reference": "d6596cb5022b6a0bd940eae54a1de78646a5fda6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/b0878233cb5c4391347e5495089c7af11b8e6201", - "reference": "b0878233cb5c4391347e5495089c7af11b8e6201", + "url": "https://api.github.com/repos/symfony/console/zipball/d6596cb5022b6a0bd940eae54a1de78646a5fda6", + "reference": "d6596cb5022b6a0bd940eae54a1de78646a5fda6", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "symfony/debug": "~2.8|~3.0", "symfony/polyfill-mbstring": "~1.0" }, @@ -1457,7 +1390,6 @@ "symfony/dependency-injection": "~3.3", "symfony/event-dispatcher": "~2.8|~3.0", "symfony/filesystem": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0", "symfony/process": "~2.8|~3.0" }, "suggest": { @@ -1496,24 +1428,24 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-07-29 21:27:59" + "time": "2017-08-27T14:52:21+00:00" }, { "name": "symfony/css-selector", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "4d882dced7b995d5274293039370148e291808f2" + "reference": "c5f5263ed231f164c58368efbce959137c7d9488" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/4d882dced7b995d5274293039370148e291808f2", - "reference": "4d882dced7b995d5274293039370148e291808f2", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/c5f5263ed231f164c58368efbce959137c7d9488", + "reference": "c5f5263ed231f164c58368efbce959137c7d9488", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { @@ -1549,24 +1481,24 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2017-05-01 15:01:29" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "symfony/debug", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13" + "reference": "084d804fe35808eb2ef596ec83d85d9768aa6c9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/7c13ae8ce1e2adbbd574fc39de7be498e1284e13", - "reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13", + "url": "https://api.github.com/repos/symfony/debug/zipball/084d804fe35808eb2ef596ec83d85d9768aa6c9d", + "reference": "084d804fe35808eb2ef596ec83d85d9768aa6c9d", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "psr/log": "~1.0" }, "conflict": { @@ -1605,24 +1537,24 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-07-28 15:27:31" + "time": "2017-08-27T14:52:21+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e" + "reference": "54ca9520a00386f83bca145819ad3b619aaa2485" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67535f1e3fd662bdc68d7ba317c93eecd973617e", - "reference": "67535f1e3fd662bdc68d7ba317c93eecd973617e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/54ca9520a00386f83bca145819ad3b619aaa2485", + "reference": "54ca9520a00386f83bca145819ad3b619aaa2485", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "conflict": { "symfony/dependency-injection": "<3.3" @@ -1668,24 +1600,24 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-06-09 14:53:08" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "symfony/finder", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4" + "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4", - "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4", + "url": "https://api.github.com/repos/symfony/finder/zipball/b2260dbc80f3c4198f903215f91a1ac7fe9fe09e", + "reference": "b2260dbc80f3c4198f903215f91a1ac7fe9fe09e", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { @@ -1717,24 +1649,24 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-06-01 21:01:25" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "symfony/http-foundation", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031" + "reference": "14bacad23a4f075bfd3fd456755236cb261320e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49e8cd2d59a7aa9bfab19e46de680c76e500a031", - "reference": "49e8cd2d59a7aa9bfab19e46de680c76e500a031", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/14bacad23a4f075bfd3fd456755236cb261320e3", + "reference": "14bacad23a4f075bfd3fd456755236cb261320e3", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { @@ -1770,24 +1702,24 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-07-21 11:04:46" + "time": "2017-08-10T07:07:06+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "db10d05f1d95e4168e638db7a81c79616f568ea5" + "reference": "1c1717d28904744dc9a9f6a9d97a8b9bed1680e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/db10d05f1d95e4168e638db7a81c79616f568ea5", - "reference": "db10d05f1d95e4168e638db7a81c79616f568ea5", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1c1717d28904744dc9a9f6a9d97a8b9bed1680e9", + "reference": "1c1717d28904744dc9a9f6a9d97a8b9bed1680e9", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "psr/log": "~1.0", "symfony/debug": "~2.8|~3.0", "symfony/event-dispatcher": "~2.8|~3.0", @@ -1856,7 +1788,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-08-01 10:25:59" + "time": "2017-08-28T22:35:03+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -1915,24 +1847,24 @@ "portable", "shim" ], - "time": "2017-06-14 15:44:48" + "time": "2017-06-14T15:44:48+00:00" }, { "name": "symfony/process", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a" + "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/07432804942b9f6dd7b7377faf9920af5f95d70a", - "reference": "07432804942b9f6dd7b7377faf9920af5f95d70a", + "url": "https://api.github.com/repos/symfony/process/zipball/b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0", + "reference": "b7666e9b438027a1ea0e1ee813ec5042d5d7f6f0", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { @@ -1964,24 +1896,24 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2017-07-13 13:05:09" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "symfony/routing", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26" + "reference": "970326dcd04522e1cd1fe128abaee54c225e27f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26", - "reference": "4aee1a917fd4859ff8b51b9fd1dfb790a5ecfa26", + "url": "https://api.github.com/repos/symfony/routing/zipball/970326dcd04522e1cd1fe128abaee54c225e27f9", + "reference": "970326dcd04522e1cd1fe128abaee54c225e27f9", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "conflict": { "symfony/config": "<2.8", @@ -2042,24 +1974,24 @@ "uri", "url" ], - "time": "2017-07-21 17:43:13" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "symfony/translation", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3" + "reference": "add53753d978f635492dfe8cd6953f6a7361ef90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3", - "reference": "35dd5fb003c90e8bd4d8cabdf94bf9c96d06fdc3", + "url": "https://api.github.com/repos/symfony/translation/zipball/add53753d978f635492dfe8cd6953f6a7361ef90", + "reference": "add53753d978f635492dfe8cd6953f6a7361ef90", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -2107,24 +2039,24 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-06-24 16:45:30" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "b2623bccb969ad595c2090f9be498b74670d0663" + "reference": "89fcb5a73e0ede2be2512234c4e40457bb22b35f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b2623bccb969ad595c2090f9be498b74670d0663", - "reference": "b2623bccb969ad595c2090f9be498b74670d0663", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89fcb5a73e0ede2be2512234c4e40457bb22b35f", + "reference": "89fcb5a73e0ede2be2512234c4e40457bb22b35f", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -2175,7 +2107,7 @@ "debug", "dump" ], - "time": "2017-07-28 06:06:09" + "time": "2017-08-27T14:52:21+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -2222,7 +2154,7 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", - "time": "2016-09-20 12:50:39" + "time": "2016-09-20T12:50:39+00:00" }, { "name": "typo3/class-alias-loader", @@ -2280,7 +2212,7 @@ "classloader", "composer" ], - "time": "2015-10-06 10:25:44" + "time": "2015-10-06T10:25:44+00:00" }, { "name": "vlucas/phpdotenv", @@ -2330,7 +2262,7 @@ "env", "environment" ], - "time": "2016-09-01 10:05:43" + "time": "2016-09-01T10:05:43+00:00" } ], "packages-dev": [ @@ -2387,7 +2319,7 @@ "assertion", "validation" ], - "time": "2017-05-04 02:00:24" + "time": "2017-05-04T02:00:24+00:00" }, { "name": "behat/behat", @@ -2469,20 +2401,20 @@ "symfony", "testing" ], - "time": "2017-05-15 16:49:16" + "time": "2017-05-15T16:49:16+00:00" }, { "name": "behat/gherkin", - "version": "v4.4.5", + "version": "v4.5.1", "source": { "type": "git", "url": "https://github.com/Behat/Gherkin.git", - "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74" + "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Gherkin/zipball/5c14cff4f955b17d20d088dec1bde61c0539ec74", - "reference": "5c14cff4f955b17d20d088dec1bde61c0539ec74", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a", + "reference": "74ac03d52c5e23ad8abd5c5cce4ab0e8dc1b530a", "shasum": "" }, "require": { @@ -2528,7 +2460,7 @@ "gherkin", "parser" ], - "time": "2016-10-30 11:50:56" + "time": "2017-08-30T11:04:43+00:00" }, { "name": "behat/mink", @@ -2586,7 +2518,7 @@ "testing", "web" ], - "time": "2016-03-05 08:26:18" + "time": "2016-03-05T08:26:18+00:00" }, { "name": "behat/mink-selenium2-driver", @@ -2647,7 +2579,7 @@ "testing", "webdriver" ], - "time": "2016-03-05 09:10:18" + "time": "2016-03-05T09:10:18+00:00" }, { "name": "behat/transliterator", @@ -2691,7 +2623,7 @@ "slug", "transliterator" ], - "time": "2017-04-04 11:38:05" + "time": "2017-04-04T11:38:05+00:00" }, { "name": "clue/graph", @@ -2736,7 +2668,7 @@ "network", "vertex" ], - "time": "2015-03-07 18:11:31" + "time": "2015-03-07T18:11:31+00:00" }, { "name": "container-interop/container-interop", @@ -2767,7 +2699,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", - "time": "2017-02-14 19:40:03" + "time": "2017-02-14T19:40:03+00:00" }, { "name": "doctrine/instantiator", @@ -2821,7 +2753,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "facebook/webdriver", @@ -2873,7 +2805,7 @@ "selenium", "webdriver" ], - "time": "2017-04-28 14:54:49" + "time": "2017-04-28T14:54:49+00:00" }, { "name": "florianwolters/component-core-stringutils", @@ -2918,7 +2850,7 @@ "string", "wrapper" ], - "time": "2013-07-01 10:24:07" + "time": "2013-07-01T10:24:07+00:00" }, { "name": "florianwolters/component-util-reflection", @@ -2962,7 +2894,7 @@ "reflection", "utility" ], - "time": "2013-03-19 16:42:41" + "time": "2013-03-19T16:42:41+00:00" }, { "name": "florianwolters/component-util-singleton", @@ -3013,7 +2945,7 @@ "singleton", "utility" ], - "time": "2013-06-29 12:35:22" + "time": "2013-06-29T12:35:22+00:00" }, { "name": "graphp/algorithms", @@ -3063,7 +2995,7 @@ "prim", "shortest path" ], - "time": "2015-03-08 10:12:01" + "time": "2015-03-08T10:12:01+00:00" }, { "name": "guzzle/guzzle", @@ -3156,7 +3088,7 @@ "web service" ], "abandoned": "guzzlehttp/guzzle", - "time": "2013-01-28 00:07:40" + "time": "2013-01-28T00:07:40+00:00" }, { "name": "instaclick/php-webdriver", @@ -3215,7 +3147,7 @@ "webdriver", "webtest" ], - "time": "2017-06-30 04:02:48" + "time": "2017-06-30T04:02:48+00:00" }, { "name": "lmc/steward", @@ -3290,7 +3222,7 @@ "testing", "webdriver" ], - "time": "2017-06-05 23:56:28" + "time": "2017-06-05T23:56:28+00:00" }, { "name": "myclabs/deep-copy", @@ -3332,20 +3264,20 @@ "object", "object graph" ], - "time": "2017-04-12 18:52:22" + "time": "2017-04-12T18:52:22+00:00" }, { "name": "nette/caching", - "version": "v2.5.4", + "version": "v2.5.5", "source": { "type": "git", "url": "https://github.com/nette/caching.git", - "reference": "6a15f06019c4e6ec97d312d31f8edceb01b85060" + "reference": "997d3b9868840da8b51f27565bfe1a8210e94620" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/caching/zipball/6a15f06019c4e6ec97d312d31f8edceb01b85060", - "reference": "6a15f06019c4e6ec97d312d31f8edceb01b85060", + "url": "https://api.github.com/repos/nette/caching/zipball/997d3b9868840da8b51f27565bfe1a8210e94620", + "reference": "997d3b9868840da8b51f27565bfe1a8210e94620", "shasum": "" }, "require": { @@ -3392,9 +3324,16 @@ "homepage": "https://nette.org/contributors" } ], - "description": "Nette Caching Component", + "description": "⏱ Nette Caching: library with easy-to-use API and many cache backends.", "homepage": "https://nette.org", - "time": "2017-07-11 16:41:08" + "keywords": [ + "cache", + "journal", + "memcached", + "nette", + "sqlite" + ], + "time": "2017-08-18T15:20:18+00:00" }, { "name": "nette/finder", @@ -3450,7 +3389,7 @@ ], "description": "Nette Finder: Files Searching", "homepage": "https://nette.org", - "time": "2017-07-10 23:47:08" + "time": "2017-07-10T23:47:08+00:00" }, { "name": "nette/reflection", @@ -3514,20 +3453,20 @@ "nette", "reflection" ], - "time": "2017-07-11 19:28:57" + "time": "2017-07-11T19:28:57+00:00" }, { "name": "nette/utils", - "version": "v2.4.7", + "version": "v2.4.8", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "2750d3948e255f59715a5e01c7453a1fec610996" + "reference": "f1584033b5af945b470533b466b81a789d532034" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/2750d3948e255f59715a5e01c7453a1fec610996", - "reference": "2750d3948e255f59715a5e01c7453a1fec610996", + "url": "https://api.github.com/repos/nette/utils/zipball/f1584033b5af945b470533b466b81a789d532034", + "reference": "f1584033b5af945b470533b466b81a789d532034", "shasum": "" }, "require": { @@ -3575,9 +3514,25 @@ "homepage": "https://nette.org/contributors" } ], - "description": "Nette Utility Classes", + "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.", "homepage": "https://nette.org", - "time": "2017-07-11 19:25:29" + "keywords": [ + "array", + "core", + "datetime", + "images", + "json", + "nette", + "paginator", + "password", + "slugify", + "string", + "unicode", + "utf-8", + "utility", + "validation" + ], + "time": "2017-08-20T17:32:29+00:00" }, { "name": "ondram/ci-detector", @@ -3630,7 +3585,7 @@ "teamcity", "travis" ], - "time": "2017-05-26 16:39:57" + "time": "2017-05-26T16:39:57+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -3684,7 +3639,7 @@ "reflection", "static analysis" ], - "time": "2015-12-27 11:43:31" + "time": "2015-12-27T11:43:31+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -3729,7 +3684,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-08-08 06:39:58" + "time": "2017-08-08T06:39:58+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -3776,26 +3731,26 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-06-03 08:32:36" + "time": "2017-06-03T08:32:36+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.7.0", + "version": "v1.7.2", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", "sebastian/comparator": "^1.1|^2.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, @@ -3806,7 +3761,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -3839,7 +3794,7 @@ "spy", "stub" ], - "time": "2017-03-02 20:05:34" + "time": "2017-09-04T11:05:03+00:00" }, { "name": "phpunit/php-code-coverage", @@ -3902,7 +3857,7 @@ "testing", "xunit" ], - "time": "2017-04-02 07:44:40" + "time": "2017-04-02T07:44:40+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3949,7 +3904,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03 07:40:28" + "time": "2016-10-03T07:40:28+00:00" }, { "name": "phpunit/php-text-template", @@ -3990,7 +3945,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -4039,7 +3994,7 @@ "keywords": [ "timer" ], - "time": "2017-02-26 11:10:40" + "time": "2017-02-26T11:10:40+00:00" }, { "name": "phpunit/php-token-stream", @@ -4088,7 +4043,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-02-27 10:12:30" + "time": "2017-02-27T10:12:30+00:00" }, { "name": "phpunit/phpunit", @@ -4170,7 +4125,7 @@ "testing", "xunit" ], - "time": "2017-06-21 08:11:54" + "time": "2017-06-21T08:11:54+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -4229,7 +4184,7 @@ "mock", "xunit" ], - "time": "2017-06-30 09:13:00" + "time": "2017-06-30T09:13:00+00:00" }, { "name": "psr/container", @@ -4278,7 +4233,7 @@ "container-interop", "psr" ], - "time": "2017-02-14 16:28:37" + "time": "2017-02-14T16:28:37+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -4323,7 +4278,7 @@ ], "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-04 06:30:41" + "time": "2017-03-04T06:30:41+00:00" }, { "name": "sebastian/comparator", @@ -4387,7 +4342,7 @@ "compare", "equality" ], - "time": "2017-01-29 09:50:25" + "time": "2017-01-29T09:50:25+00:00" }, { "name": "sebastian/diff", @@ -4439,7 +4394,7 @@ "keywords": [ "diff" ], - "time": "2017-05-22 07:24:03" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", @@ -4489,7 +4444,7 @@ "environment", "hhvm" ], - "time": "2016-11-26 07:53:53" + "time": "2016-11-26T07:53:53+00:00" }, { "name": "sebastian/exporter", @@ -4556,7 +4511,7 @@ "export", "exporter" ], - "time": "2016-11-19 08:54:04" + "time": "2016-11-19T08:54:04+00:00" }, { "name": "sebastian/global-state", @@ -4607,7 +4562,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/object-enumerator", @@ -4653,7 +4608,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-02-18 15:18:39" + "time": "2017-02-18T15:18:39+00:00" }, { "name": "sebastian/recursion-context", @@ -4706,7 +4661,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19 07:33:16" + "time": "2016-11-19T07:33:16+00:00" }, { "name": "sebastian/resource-operations", @@ -4748,7 +4703,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28 20:34:47" + "time": "2015-07-28T20:34:47+00:00" }, { "name": "sebastian/version", @@ -4791,7 +4746,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03 07:35:21" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -4842,24 +4797,24 @@ "phpcs", "standards" ], - "time": "2017-07-18 01:12:32" + "time": "2017-07-18T01:12:32+00:00" }, { "name": "symfony/class-loader", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f" + "reference": "9c69968ce57924e9e93550895cd2b0477edf0e19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/386a294d621576302e7cc36965d6ed53b8c73c4f", - "reference": "386a294d621576302e7cc36965d6ed53b8c73c4f", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/9c69968ce57924e9e93550895cd2b0477edf0e19", + "reference": "9c69968ce57924e9e93550895cd2b0477edf0e19", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "require-dev": { "symfony/finder": "~2.8|~3.0", @@ -4898,24 +4853,24 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2017-06-02 09:51:43" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "symfony/config", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "54ee12b0dd60f294132cabae6f5da9573d2e5297" + "reference": "6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/54ee12b0dd60f294132cabae6f5da9573d2e5297", - "reference": "54ee12b0dd60f294132cabae6f5da9573d2e5297", + "url": "https://api.github.com/repos/symfony/config/zipball/6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488", + "reference": "6ac0cc1f047c1dbc058fc25b7a4d91b068ed4488", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "symfony/filesystem": "~2.8|~3.0" }, "conflict": { @@ -4960,24 +4915,24 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2017-07-19 07:37:29" + "time": "2017-08-03T08:59:45+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "8d70987f991481e809c63681ffe8ce3f3fde68a0" + "reference": "2ac658972626c75cbde7b0067c84b988170a6907" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/8d70987f991481e809c63681ffe8ce3f3fde68a0", - "reference": "8d70987f991481e809c63681ffe8ce3f3fde68a0", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ac658972626c75cbde7b0067c84b988170a6907", + "reference": "2ac658972626c75cbde7b0067c84b988170a6907", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "psr/container": "^1.0" }, "conflict": { @@ -5030,24 +4985,24 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-07-28 15:27:31" + "time": "2017-08-28T22:20:37+00:00" }, { "name": "symfony/filesystem", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "427987eb4eed764c3b6e38d52a0f87989e010676" + "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/427987eb4eed764c3b6e38d52a0f87989e010676", - "reference": "427987eb4eed764c3b6e38d52a0f87989e010676", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b32a0e5f928d0fa3d1dd03c78d020777e50c10cb", + "reference": "b32a0e5f928d0fa3d1dd03c78d020777e50c10cb", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { @@ -5079,24 +5034,24 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-07-11 07:17:58" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "symfony/options-resolver", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "ff48982d295bcac1fd861f934f041ebc73ae40f0" + "reference": "ee4e22978fe885b54ee5da8c7964f0a5301abfb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ff48982d295bcac1fd861f934f041ebc73ae40f0", - "reference": "ff48982d295bcac1fd861f934f041ebc73ae40f0", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ee4e22978fe885b54ee5da8c7964f0a5301abfb6", + "reference": "ee4e22978fe885b54ee5da8c7964f0a5301abfb6", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { @@ -5133,24 +5088,24 @@ "configuration", "options" ], - "time": "2017-04-12 14:14:56" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "symfony/stopwatch", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "602a15299dc01556013b07167d4f5d3a60e90d15" + "reference": "9a5610a8d6a50985a7be485c0ba745c22607beeb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/602a15299dc01556013b07167d4f5d3a60e90d15", - "reference": "602a15299dc01556013b07167d4f5d3a60e90d15", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/9a5610a8d6a50985a7be485c0ba745c22607beeb", + "reference": "9a5610a8d6a50985a7be485c0ba745c22607beeb", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "type": "library", "extra": { @@ -5182,24 +5137,24 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2017-04-12 14:14:56" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "symfony/yaml", - "version": "v3.3.6", + "version": "v3.3.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed" + "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/ddc23324e6cfe066f3dd34a37ff494fa80b617ed", - "reference": "ddc23324e6cfe066f3dd34a37ff494fa80b617ed", + "url": "https://api.github.com/repos/symfony/yaml/zipball/1d8c2a99c80862bdc3af94c1781bf70f86bccac0", + "reference": "1d8c2a99c80862bdc3af94c1781bf70f86bccac0", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" }, "require-dev": { "symfony/console": "~2.8|~3.0" @@ -5237,7 +5192,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-07-23 12:43:26" + "time": "2017-07-29T21:54:42+00:00" }, { "name": "webmozart/assert", @@ -5287,7 +5242,7 @@ "check", "validate" ], - "time": "2016-11-23 20:04:58" + "time": "2016-11-23T20:04:58+00:00" }, { "name": "wimg/php-compatibility", @@ -5339,7 +5294,7 @@ "phpcs", "standards" ], - "time": "2017-08-07 19:39:05" + "time": "2017-08-07T19:39:05+00:00" } ], "aliases": [], diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php index ef62f23e6..817864831 100644 --- a/framework/src/Maveriks/WebApplication.php +++ b/framework/src/Maveriks/WebApplication.php @@ -486,6 +486,7 @@ class WebApplication // Change storage path app()->useStoragePath(realpath(PATH_DATA)); app()->make(Kernel::class)->bootstrap(); + restore_error_handler(); error_reporting(error_reporting() & ~E_STRICT & ~E_DEPRECATED); Bootstrap::setLanguage(); diff --git a/gulliver/bin/tasks/pakePropel.php b/gulliver/bin/tasks/pakePropel.php index 52d7d721b..f2c8ac6d8 100644 --- a/gulliver/bin/tasks/pakePropel.php +++ b/gulliver/bin/tasks/pakePropel.php @@ -223,51 +223,53 @@ function run_propel_build_model($task, $args) function run_propel_build_sql($task, $args) { - if ( isset ( $args[1] ) ) { - $propelIniFile = $args[1] . '.ini'; - $alternateDir = ''; - if ( ! file_exists ( 'config' . PATH_SEP . $propelIniFile ) ) { - $path = explode ( '/', $args[1] ); - if ( count($path) > 2 ) - throw new Exception('the propel.ini must be in your config directory.'); - if ( count($path) == 1 ) - $path[1] = 'propel'; + $alternateDir = ''; + if (isset ($args[1])) { + $propelIniFile = $args[1] . '.ini'; + $alternateDir = ''; + if (!file_exists('config' . PATH_SEP . $propelIniFile)) { + $path = explode('/', $args[1]); + if (count($path) > 2) + throw new Exception('the propel.ini must be in your config directory.'); + if (count($path) == 1) + $path[1] = 'propel'; - $propelIniFile = 'plugins' .PATH_SEP . $path[0] . PATH_SEP . 'config' . PATH_SEP . $path[1] . '.ini'; - if ( ! file_exists($propelIniFile) ) - throw new Exception("the propel.ini must be in your config directory. ($propelIniFile)"); + $propelIniFile = 'plugins' . PATH_SEP . $path[0] . PATH_SEP . 'config' . PATH_SEP . $path[1] . '.ini'; + if (!file_exists($propelIniFile)) + throw new Exception("the propel.ini must be in your config directory. ($propelIniFile)"); - pake_echo_action('propel.ini', "using the file : $propelIniFile "); - $alternateDir = PATH_PLUGINS . $path[0] . PATH_SEP; - //_call_phing($task, 'om', false, $path[1] . '.ini' , PATH_PLUGINS . $path[0] . PATH_SEP ); - //return; - } + pake_echo_action('propel.ini', "using the file : $propelIniFile "); + $alternateDir = PATH_PLUGINS . $path[0] . PATH_SEP; + } - } - - $aDB = array('mysql', 'mssql', 'oracle', 'pgsql'); - - if ( !in_array($args[0], $aDB)) { - throw new Exception('invalid database Adapter, available:[mysql|mssql|oracle|pgsql].'); - } - else { - switch ( $args [0]) { - case 'mysql' : if ( $alternateDir != '' ) - _call_phing($task, 'sql', false, 'propel.mysql.ini', $alternateDir ); - else - _call_phing($task, 'sql', true, 'propel.mysql.ini' ); - break; - case 'mssql' : _call_phing($task, 'sql', true, 'propel.mssql.ini' ); - break; - case 'oracle' : _call_phing($task, 'sql', true, 'propel.oracle.ini' ); - break; - case 'pgsql' : _call_phing($task, 'sql', true, 'propel.pgsql.ini' ); - break; - default : - throw new Exception('specify database Adapter, valid values are: mysql, mssql, oracle, pgsql.'); } - } + $aDB = array('mysql', 'mssql', 'oracle', 'pgsql'); + + if (!in_array($args[0], $aDB)) { + throw new Exception('invalid database Adapter, available:[mysql|mssql|oracle|pgsql].'); + } else { + switch ($args [0]) { + case 'mysql' : + if ($alternateDir != '') + _call_phing($task, 'sql', false, 'propel.mysql.ini', $alternateDir); + else + _call_phing($task, 'sql', true, 'propel.mysql.ini'); + break; + case 'mssql' : + _call_phing($task, 'sql', true, 'propel.mssql.ini'); + break; + case 'oracle' : + _call_phing($task, 'sql', true, 'propel.oracle.ini'); + break; + case 'pgsql' : + _call_phing($task, 'sql', true, 'propel.pgsql.ini'); + break; + default : + throw new Exception('specify database Adapter, valid values are: mysql, mssql, oracle, pgsql.'); + } + + } } function run_propel_build_db($task, $args) diff --git a/thirdparty/propel/adapter/DBAdapter.php b/thirdparty/propel/adapter/DBAdapter.php index 5b07394ec..9d00f1eba 100644 --- a/thirdparty/propel/adapter/DBAdapter.php +++ b/thirdparty/propel/adapter/DBAdapter.php @@ -71,16 +71,16 @@ abstract class DBAdapter { * @return DBAdapter An instance of a Propel database adapter. * @throws PropelException if the adapter could not be instantiated. */ - public static function factory($driver) { - $adapterClass = isset(self::$adapters[$driver]) ? self::$adapters[$driver] : null; - if ($adapterClass !== null) { - require_once 'propel/adapter/'.$adapterClass.'.php'; - $a = new $adapterClass(); - return $a; - } else { - throw new PropelException("Unsupported Propel driver: " . $driver . ": Check your configuration file"); - } - } + public static function factory($driver) + { + $adapterClass = isset(self::$adapters[$driver]) ? self::$adapters[$driver] : null; + if ($adapterClass !== null) { + $a = new $adapterClass(); + return $a; + } else { + throw new PropelException("Unsupported Propel driver: " . $driver . ": Check your configuration file"); + } + } /** * This method is used to ignore case. diff --git a/workflow/engine/bin/cron.php b/workflow/engine/bin/cron.php index 8b158cd50..73f7dac89 100644 --- a/workflow/engine/bin/cron.php +++ b/workflow/engine/bin/cron.php @@ -92,6 +92,7 @@ try { app()->useStoragePath(realpath(PATH_DATA)); app()->make(Kernel::class)->bootstrap(); + restore_error_handler(); //Do not change any of these settings directly, use env.ini instead ini_set('display_errors', $arraySystemConfiguration['debug']); ini_set('error_reporting', $e_all); diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 5b90f449b..ae686b118 100644 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -82,6 +82,7 @@ try { app()->useStoragePath(realpath(PATH_DATA)); app()->make(Kernel::class)->bootstrap(); + restore_error_handler(); //Do not change any of these settings directly, use env.ini instead ini_set('display_errors', $arraySystemConfiguration['debug']); ini_set('error_reporting', $e_all); diff --git a/workflow/engine/classes/Applications.php b/workflow/engine/classes/Applications.php index 9196779b6..2cc198869 100644 --- a/workflow/engine/classes/Applications.php +++ b/workflow/engine/classes/Applications.php @@ -22,6 +22,7 @@ class Applications * @param string $category uid for the process * @param date $dateFrom * @param date $dateTo + * @param string $columnSearch name of column for a specific search * @return array $result result of the query */ public function searchAll( @@ -35,7 +36,8 @@ class Applications $sort = null, $category = null, $dateFrom = null, - $dateTo = null + $dateTo = null, + $columnSearch = 'APP_TITLE' ) { //Exclude the Task Dummies in the delegations $arrayTaskTypeToExclude = array("WEBENTRYEVENT", "END-MESSAGE-EVENT", "START-MESSAGE-EVENT", "INTERMEDIATE-THROW-MESSAGE-EVENT", "INTERMEDIATE-CATCH-MESSAGE-EVENT"); @@ -127,8 +129,42 @@ class Applications } if (!empty($search)) { - //In the filter search we check in the following columns: APP_NUMBER APP_TAS_TITLE APP_TITLE - $sqlData .= " AND (APPLICATION.APP_TITLE LIKE '%{$search}%' OR APP_DELEGATION.APP_NUMBER LIKE '%{$search}%' OR TASK.TAS_TITLE LIKE '%{$search}%')"; + //If the filter is related to the APPLICATION table: APP_NUMBER or APP_TITLE + if ($columnSearch === 'APP_NUMBER' || $columnSearch === 'APP_TITLE') { + $sqlSearch = "SELECT APPLICATION.APP_NUMBER FROM APPLICATION"; + $sqlSearch .= " WHERE APPLICATION.{$columnSearch} LIKE '%{$search}%'"; + switch ($columnSearch) { + case 'APP_TITLE': + break; + case 'APP_NUMBER': + //Cast the search criteria to string + if (!is_string($search)) { + $search = (string)$search; + } + //Only if is integer we will to add to greater equal in the query + if (substr($search, 0, 1) != '0' && ctype_digit($search)) { + $sqlSearch .= " AND APPLICATION.{$columnSearch} >= {$search}"; + } + break; + } + if (!empty($start)) { + $sqlSearch .= " LIMIT $start, " . $limit; + } else { + $sqlSearch .= " LIMIT " . $limit; + } + $dataset = $stmt->executeQuery($sqlSearch); + $appNumbers = array(-1); + while ($dataset->next()) { + $newRow = $dataset->getRow(); + array_push($appNumbers, $newRow['APP_NUMBER']); + } + $sqlData .= " AND APP_DELEGATION.APP_NUMBER IN (" . implode(",", $appNumbers) . ")"; + } + //If the filter is related to the TASK table: TAS_TITLE + if ($columnSearch === 'TAS_TITLE') { + $sqlData .= " AND TASK.TAS_TITLE LIKE '%{$search}%' "; + } + } if (!empty($dateFrom)) { @@ -141,7 +177,7 @@ class Applications } //Add the additional filters - if (!empty($sort)) { + if (!empty($sort) && empty($search)) { switch ($sort) { case 'APP_NUMBER': //The order by APP_DELEGATION.APP_NUMBER is must be fast than APPLICATION.APP_NUMBER @@ -156,7 +192,7 @@ class Applications } //Sorts the records in descending order by default - if (!empty($dir)) { + if (!empty($dir) && empty($search)) { $sqlData .= " " . $dir; } @@ -164,7 +200,7 @@ class Applications if(empty($limit)) { $limit = 25; } - if (!empty($start)) { + if (!empty($start) && empty($search)) { $sqlData .= " LIMIT $start, " . $limit; } else { $sqlData .= " LIMIT " . $limit; @@ -633,23 +669,6 @@ class Applications // this is the optimal way or query to render the cases search list // fixing the bug related to the wrong data displayed in the list - /* - if ($action == 'search') { - $oDatasetIndex = AppCacheViewPeer::doSelectRS( $Criteria ); - $oDatasetIndex->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $oDatasetIndex->next(); - $maxDelIndexList = array (); - // a list of MAX_DEL_INDEXES is required in order to validate the right row - while ($aRow = $oDatasetIndex->getRow()) { - $maxDelIndexList[] = $aRow['MAX_DEL_INDEX']; - $oDatasetIndex->next(); - } - // adding the validation condition in order to get the right row using the group by sentence - $Criteria->add( AppCacheViewPeer::DEL_INDEX, $maxDelIndexList, Criteria::IN ); - // - //$params = array($maxDelIndexList); - } - */ //here we count how many records exists for this criteria. //BUT there are some special cases, and if we dont optimize them the server will crash. @@ -657,16 +676,6 @@ class Applications //case 1. when the SEARCH action is selected and none filter, search criteria is defined, //we need to count using the table APPLICATION, because APP_CACHE_VIEW takes 3 seconds - /* - if ($action == 'search' && $filter == '' && $search == '' && $process == '' && $status == '' && $dateFrom == '' && $dateTo == '' && $category == '') { - $totalCount = $oAppCache->getSearchAllCount(); - $doCountAlreadyExecuted = true; - } - if ($category != '') { - $totalCount = $oAppCache->getSearchCountCriteria(); - $doCountAlreadyExecuted = true; - } - */ $tableNameAux = ''; $totalCount = 0; if ($doCountAlreadyExecuted == true) { @@ -786,31 +795,6 @@ class Applications while ($oDataset->next()) { $aRow = $oDataset->getRow(); - //$aRow = $oAppCache->replaceRowUserData($aRow); - - /* - * For participated cases, we want the last step in the case, not only the last step this user participated. To do that we get every case information again for the last step. (This could be solved by a subquery, but Propel might not support it and subqueries can be slower for larger - * datasets). - */ - /*if ($action == 'sent' || $action == 'search') { - $maxCriteria = new Criteria('workflow'); - $maxCriteria->add(AppCacheViewPeer::APP_UID, $aRow['APP_UID'], Criteria::EQUAL); - $maxCriteria->addDescendingOrderByColumn(AppCacheViewPeer::DEL_INDEX); - $maxCriteria->setLimit(1); - - $maxDataset = AppCacheViewPeer::doSelectRS( $maxCriteria ); - $maxDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - $maxDataset->next(); - - $newData = $maxDataset->getRow(); - foreach ($aRow as $col => $value) { - if (array_key_exists($col, $newData)) - $aRow[$col] = $newData[$col]; - } - - $maxDataset->close(); - }*/ - //Current delegation (*) if ($action == 'sent' || $action == 'simple_search' || $action == 'to_reassign') { //Current task diff --git a/workflow/engine/classes/IndicatorsCalculator.php b/workflow/engine/classes/IndicatorsCalculator.php index 2d877a52a..d62e7b1f6 100644 --- a/workflow/engine/classes/IndicatorsCalculator.php +++ b/workflow/engine/classes/IndicatorsCalculator.php @@ -81,10 +81,10 @@ class IndicatorsCalculator private $userGroupReportingMetadata = array("tableName" => "USR_REPORTING", "keyField" => "PRO_UID"); private $processCategoryReportingMetadata = array("tableName" => "PRO_REPORTING", "keyField" => "PRO_UID"); - private $peiCostFormula = " SUM(case when (TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK) > 0 then (TOTAL_CASES_OUT * CONFIGURED_TASK_TIME - (TOTAL_TIME_BY_TASK * USER_HOUR_COST + TOTAL_QUEUE_TIME_BY_TASK * PRO_COST)) else 0 end)"; + private $peiCostFormula = " SUM(case when (TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK) > 0 then (TOTAL_CASES_OUT * CONFIGURED_TASK_TIME * PRO_COST - (TOTAL_TIME_BY_TASK * USER_HOUR_COST + TOTAL_QUEUE_TIME_BY_TASK * PRO_COST)) else 0 end)"; private $peiFormula = "SUM(TOTAL_CASES_OUT*CONFIGURED_TASK_TIME) / SUM(SDV_TIME * TOTAL_CASES_OUT + (TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK))"; - private $ueiCostFormula = " SUM(case when (TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK) > 0 then (TOTAL_CASES_OUT * CONFIGURED_TASK_TIME - (TOTAL_TIME_BY_TASK * USER_HOUR_COST + TOTAL_QUEUE_TIME_BY_TASK * PRO_COST)) else 0 end)"; + private $ueiCostFormula = " SUM(case when (TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK) > 0 then (TOTAL_CASES_OUT * CONFIGURED_TASK_TIME * PRO_COST - (TOTAL_TIME_BY_TASK * USER_HOUR_COST + TOTAL_QUEUE_TIME_BY_TASK * PRO_COST)) else 0 end)"; private $ueiFormula = "SUM(TOTAL_CASES_OUT * CONFIGURED_TASK_TIME) / SUM((TOTAL_TIME_BY_TASK + TOTAL_QUEUE_TIME_BY_TASK))"; public function getSkewOfDataDistribution($table, $field) { diff --git a/workflow/engine/classes/PMLicensedFeatures.php b/workflow/engine/classes/PMLicensedFeatures.php index 5c0f632c7..0673c7be8 100644 --- a/workflow/engine/classes/PMLicensedFeatures.php +++ b/workflow/engine/classes/PMLicensedFeatures.php @@ -1,7 +1,10 @@ featuresDetails[$value[0]] = new stdclass(); } $this->featuresDetails[$value[0]]->enabled = $enable; + + $cached[$featureName] = $enable; + Cache::put(PmLicenseManager::CACHE_KEY . '.' . SYS_SYS, $cached, Carbon::now()->addDay(1)); + return $enable; } diff --git a/workflow/engine/classes/PmLicenseManager.php b/workflow/engine/classes/PmLicenseManager.php index fd1aff4b6..7ab55db4f 100644 --- a/workflow/engine/classes/PmLicenseManager.php +++ b/workflow/engine/classes/PmLicenseManager.php @@ -1,7 +1,7 @@ setLicenseType ( $LicenseType ); $res = $tr->save (); + Cache::forget(PmLicenseManager::CACHE_KEY . '.' . SYS_SYS); } catch ( Exception $e ) { G::pr($e); } diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index 11cde69cd..14f5896b9 100644 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -3979,12 +3979,9 @@ function pmSqlEscape($vValue) //End - Private functions -/* * ************************************************************************* - * Error handler - * author: Julio Cesar Laura Avenda�o - * date: 2009-10-01 - * ************************************************************************* */ /** + * Error handler + * * @param $errno * @param $errstr * @param $errfile diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php index 8ddadd997..962779261 100644 --- a/workflow/engine/methods/cases/casesListExtJs.php +++ b/workflow/engine/methods/cases/casesListExtJs.php @@ -136,30 +136,31 @@ if ($action == "todo" || $action == "draft" || $action == "sent" || $action == " } //get values for the comboBoxes -$processes[] = array ('',G::LoadTranslation( 'ID_ALL_PROCESS' )); -$status = getStatusArray( $action, $userUid ); +$processes[] = array('', G::LoadTranslation('ID_ALL_PROCESS')); +$status = getStatusArray($action, $userUid); $category = getCategoryArray(); - -$oHeadPublisher->assign( 'reassignReaderFields', $reassignReaderFields ); //sending the fields to get from proxy -$oHeadPublisher->addExtJsScript( 'cases/reassignList', false ); +$columnToSearch = getColumnsSearchArray(); +$oHeadPublisher->assign('reassignReaderFields', $reassignReaderFields); //sending the fields to get from proxy +$oHeadPublisher->addExtJsScript('cases/reassignList', false); $enableEnterprise = false; -if (class_exists( 'enterprisePlugin' )) { +if (class_exists('enterprisePlugin')) { $enableEnterprise = true; - $oHeadPublisher->addExtJsScript(PATH_PLUGINS . "enterprise" . PATH_SEP . "advancedTools" . PATH_SEP , false, true); + $oHeadPublisher->addExtJsScript(PATH_PLUGINS . "enterprise" . PATH_SEP . "advancedTools" . PATH_SEP, false, true); } -$oHeadPublisher->assign( 'pageSize', $pageSize ); //sending the page size -$oHeadPublisher->assign( 'columns', $columns ); //sending the columns to display in grid -$oHeadPublisher->assign( 'readerFields', $readerFields ); //sending the fields to get from proxy -$oHeadPublisher->assign( 'reassignColumns', $reassignColumns ); //sending the columns to display in grid -$oHeadPublisher->assign( 'action', $action ); //sending the action to make -$oHeadPublisher->assign( 'urlProxy', $urlProxy ); //sending the urlProxy to make -$oHeadPublisher->assign( 'PMDateFormat', $dateFormat ); //sending the fields to get from proxy -$oHeadPublisher->assign( 'statusValues', $status ); //Sending the listing of status -$oHeadPublisher->assign( 'processValues', $processes ); //Sending the listing of processes -$oHeadPublisher->assign( 'categoryValues', $category ); //Sending the listing of categories -$oHeadPublisher->assign( 'solrEnabled', $solrEnabled ); //Sending the status of solar -$oHeadPublisher->assign( 'enableEnterprise', $enableEnterprise ); //sending the page size +$oHeadPublisher->assign('pageSize', $pageSize); //sending the page size +$oHeadPublisher->assign('columns', $columns); //sending the columns to display in grid +$oHeadPublisher->assign('readerFields', $readerFields); //sending the fields to get from proxy +$oHeadPublisher->assign('reassignColumns', $reassignColumns); //sending the columns to display in grid +$oHeadPublisher->assign('action', $action); //sending the action to make +$oHeadPublisher->assign('urlProxy', $urlProxy); //sending the urlProxy to make +$oHeadPublisher->assign('PMDateFormat', $dateFormat); //sending the fields to get from proxy +$oHeadPublisher->assign('statusValues', $status); //Sending the listing of status +$oHeadPublisher->assign('processValues', $processes); //Sending the listing of processes +$oHeadPublisher->assign('categoryValues', $category); //Sending the listing of categories +$oHeadPublisher->assign('solrEnabled', $solrEnabled); //Sending the status of solar +$oHeadPublisher->assign('enableEnterprise', $enableEnterprise); //sending the page size +$oHeadPublisher->assign('columnSearchValues', $columnToSearch); //Sending the list of column for search: caseTitle, caseNumber, tasTitle /*----------------------------------********---------------------------------*/ @@ -214,7 +215,6 @@ if(sizeof($fromPlugin)) { } } $oHeadPublisher->assign( 'openReassignCallback', $jsFunction ); - G::RenderPage( 'publish', 'extJs' ); function getCategoryArray () @@ -255,8 +255,6 @@ function getStatusArray($action, $userUid) return $status; } -//these getXX function gets the default fields in casesListSetup - /** * get the list configuration headers of the cases checked for reassign, for the * reassign cases list. @@ -388,6 +386,18 @@ function getAdditionalFields($action, $confCasesList = array()) return $arrayConfig; } +/** + * This function define the possibles columns for apply the specific search + * @return array $filters values of the dropdown + */ +function getColumnsSearchArray () +{ + $filters = []; + $filters[] = ['APP_TITLE', G::LoadTranslation('ID_CASE_TITLE')]; + $filters[] = ['APP_NUMBER', G::LoadTranslation('ID_CASE_NUMBER')]; + $filters[] = ['TAS_TITLE', G::LoadTranslation('ID_TASK')]; + return $filters; +} /*----------------------------------********---------------------------------*/ function getClientCredentials($clientId) diff --git a/workflow/engine/methods/cases/proxyCasesList.php b/workflow/engine/methods/cases/proxyCasesList.php index 9eda4c6c2..40bf8e518 100644 --- a/workflow/engine/methods/cases/proxyCasesList.php +++ b/workflow/engine/methods/cases/proxyCasesList.php @@ -36,8 +36,8 @@ $dateTo = isset($_REQUEST["dateTo"]) ? substr($_REQUEST["dateTo"], 0, 10) : ""; $first = isset($_REQUEST["first"]) ? true : false; $openApplicationUid = (isset($_REQUEST['openApplicationUid']) && $_REQUEST['openApplicationUid'] != '') ? $_REQUEST['openApplicationUid'] : null; - $search = (!is_null($openApplicationUid)) ? $openApplicationUid : $search; +$columnSearch = isset($_REQUEST["columnSearch"]) ? strtoupper($_REQUEST["columnSearch"]) : ""; if ($sort == 'CASE_SUMMARY' || $sort == 'CASE_NOTES_COUNT') { $sort = 'APP_NUMBER';//DEFAULT VALUE @@ -81,7 +81,8 @@ try { $sort, $category, $dateFrom, - $dateTo + $dateTo, + $columnSearch ); } else { $data = $apps->getAll( diff --git a/workflow/engine/methods/services/ActionsByEmailDataFormPost.php b/workflow/engine/methods/services/ActionsByEmailDataFormPost.php index 0d5234973..4c2385f16 100644 --- a/workflow/engine/methods/services/ActionsByEmailDataFormPost.php +++ b/workflow/engine/methods/services/ActionsByEmailDataFormPost.php @@ -123,8 +123,6 @@ if (PMLicensedFeatures if ($code == 0) { //Save Cases Notes - include_once 'utils.php'; - $dataAbeRequests = loadAbeRequest($aber); $dataAbeConfiguration = loadAbeConfiguration($dataAbeRequests['ABE_UID']); diff --git a/workflow/engine/methods/services/soap2.php b/workflow/engine/methods/services/soap2.php index 6a237d103..45520398d 100644 --- a/workflow/engine/methods/services/soap2.php +++ b/workflow/engine/methods/services/soap2.php @@ -650,7 +650,7 @@ function NewCase($params) $oSession = new Sessions(); $session = $oSession->getSessionUser($params->sessionId); $userId = $session['USR_UID']; - $variables = $params->variables; + $variables = isset($params->variables) ? $params->variables : null; $field = array(); diff --git a/workflow/engine/src/ProcessMaker/Util/ParseSoapVariableName.php b/workflow/engine/src/ProcessMaker/Util/ParseSoapVariableName.php index 3e74af0d3..6387e8b37 100644 --- a/workflow/engine/src/ProcessMaker/Util/ParseSoapVariableName.php +++ b/workflow/engine/src/ProcessMaker/Util/ParseSoapVariableName.php @@ -1,6 +1,7 @@ ", '-', + _('ID_FILTER_BY'), + comboColumnSearch, + '-', textSearch, resetSearchButton, btnSearch , @@ -2357,7 +2383,7 @@ Ext.onReady ( function() { storeCases.setBaseParam("category", ""); storeCases.setBaseParam("process", ""); storeCases.setBaseParam("status", comboStatus.store.getAt(0).get(comboStatus.valueField)); - //storeCases.setBaseParam("user", comboUser.store.getAt(0).get(comboUser.valueField)); + storeCases.setBaseParam("columnSearch", comboColumnSearch.store.getAt(0).get(comboColumnSearch.valueField)); storeCases.setBaseParam("search", textSearch.getValue()); storeCases.setBaseParam("dateFrom", dateFrom.getValue()); storeCases.setBaseParam("dateTo", dateTo.getValue()); @@ -2504,6 +2530,7 @@ Ext.onReady ( function() { comboCategory.setValue(""); suggestProcess.setValue(""); comboStatus.setValue(""); + comboColumnSearch.setValue("APP_TITLE"); /*----------------------------------********---------------------------------*/ if (typeof valueFilterStatus != 'undefined') { comboFilterStatus.setValue(valueFilterStatus); diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index b992ccbe5..d61fbc598 100644 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -553,6 +553,7 @@ if (! defined( 'PATH_DATA' ) || ! file_exists( PATH_DATA )) { app()->useStoragePath(realpath(PATH_DATA)); app()->make(Kernel::class)->bootstrap(); +restore_error_handler(); //Overwrite with the Processmaker env.ini configuration used in production environments //@todo: move env.ini configuration to .env ini_set( 'display_errors', $config['display_errors']);