diff --git a/composer.lock b/composer.lock
index 8b7e5aa5a..20505546a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -54,16 +54,16 @@
},
{
"name": "cakephp/cakephp",
- "version": "3.8.5",
+ "version": "3.8.6",
"source": {
"type": "git",
"url": "https://github.com/cakephp/cakephp.git",
- "reference": "ea64434740f0d2a53438f95a3de414de63a11101"
+ "reference": "34833a0c02fc1fc21e27ceb69cf7b4f7c131a3cc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/cakephp/zipball/ea64434740f0d2a53438f95a3de414de63a11101",
- "reference": "ea64434740f0d2a53438f95a3de414de63a11101",
+ "url": "https://api.github.com/repos/cakephp/cakephp/zipball/34833a0c02fc1fc21e27ceb69cf7b4f7c131a3cc",
+ "reference": "34833a0c02fc1fc21e27ceb69cf7b4f7c131a3cc",
"shasum": ""
},
"require": {
@@ -139,7 +139,7 @@
"rapid-development",
"validation"
],
- "time": "2019-10-07T00:51:50+00:00"
+ "time": "2019-11-07T01:11:43+00:00"
},
{
"name": "cakephp/chronos",
@@ -200,16 +200,16 @@
},
{
"name": "cakephp/migrations",
- "version": "2.3.0",
+ "version": "2.4.0",
"source": {
"type": "git",
"url": "https://github.com/cakephp/migrations.git",
- "reference": "3d1750bb218958b4c48fea1365c619bedea62d69"
+ "reference": "643e54e627e876c10b5ffa1c706a6819aa6a70b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/migrations/zipball/3d1750bb218958b4c48fea1365c619bedea62d69",
- "reference": "3d1750bb218958b4c48fea1365c619bedea62d69",
+ "url": "https://api.github.com/repos/cakephp/migrations/zipball/643e54e627e876c10b5ffa1c706a6819aa6a70b9",
+ "reference": "643e54e627e876c10b5ffa1c706a6819aa6a70b9",
"shasum": ""
},
"require": {
@@ -249,7 +249,7 @@
"cakephp",
"migrations"
],
- "time": "2019-10-07T22:04:21+00:00"
+ "time": "2019-11-10T15:12:59+00:00"
},
{
"name": "cakephp/plugin-installer",
@@ -432,16 +432,16 @@
},
{
"name": "paragonie/sodium_compat",
- "version": "v1.12.0",
+ "version": "v1.12.1",
"source": {
"type": "git",
"url": "https://github.com/paragonie/sodium_compat.git",
- "reference": "8228b286d6b8fe24825f42ce02403f72656ac826"
+ "reference": "063cae9b3a7323579063e7037720f5b52b56c178"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/8228b286d6b8fe24825f42ce02403f72656ac826",
- "reference": "8228b286d6b8fe24825f42ce02403f72656ac826",
+ "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/063cae9b3a7323579063e7037720f5b52b56c178",
+ "reference": "063cae9b3a7323579063e7037720f5b52b56c178",
"shasum": ""
},
"require": {
@@ -510,7 +510,7 @@
"secret-key cryptography",
"side-channel resistant"
],
- "time": "2019-10-19T15:30:42+00:00"
+ "time": "2019-11-07T17:07:24+00:00"
},
{
"name": "psr/container",
@@ -785,32 +785,32 @@
},
{
"name": "symfony/config",
- "version": "v4.3.6",
+ "version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "f4ee0ebb91b16ca1ac105aa39f9284f3cac19a15"
+ "reference": "f08e1c48e1f05d07c32f2d8599ed539e62105beb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/f4ee0ebb91b16ca1ac105aa39f9284f3cac19a15",
- "reference": "f4ee0ebb91b16ca1ac105aa39f9284f3cac19a15",
+ "url": "https://api.github.com/repos/symfony/config/zipball/f08e1c48e1f05d07c32f2d8599ed539e62105beb",
+ "reference": "f08e1c48e1f05d07c32f2d8599ed539e62105beb",
"shasum": ""
},
"require": {
"php": "^7.1.3",
- "symfony/filesystem": "~3.4|~4.0",
+ "symfony/filesystem": "^3.4|^4.0|^5.0",
"symfony/polyfill-ctype": "~1.8"
},
"conflict": {
"symfony/finder": "<3.4"
},
"require-dev": {
- "symfony/dependency-injection": "~3.4|~4.0",
- "symfony/event-dispatcher": "~3.4|~4.0",
- "symfony/finder": "~3.4|~4.0",
- "symfony/messenger": "~4.1",
- "symfony/yaml": "~3.4|~4.0"
+ "symfony/event-dispatcher": "^3.4|^4.0|^5.0",
+ "symfony/finder": "^3.4|^4.0|^5.0",
+ "symfony/messenger": "^4.1|^5.0",
+ "symfony/service-contracts": "^1.1|^2",
+ "symfony/yaml": "^3.4|^4.0|^5.0"
},
"suggest": {
"symfony/yaml": "To use the yaml reference dumper"
@@ -818,7 +818,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -845,31 +845,32 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2019-10-30T13:18:51+00:00"
+ "time": "2019-11-16T15:22:42+00:00"
},
{
"name": "symfony/console",
- "version": "v4.3.6",
+ "version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "136c4bd62ea871d00843d1bc0316de4c4a84bb78"
+ "reference": "35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/136c4bd62ea871d00843d1bc0316de4c4a84bb78",
- "reference": "136c4bd62ea871d00843d1bc0316de4c4a84bb78",
+ "url": "https://api.github.com/repos/symfony/console/zipball/35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8",
+ "reference": "35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-php73": "^1.8",
- "symfony/service-contracts": "^1.1"
+ "symfony/service-contracts": "^1.1|^2"
},
"conflict": {
"symfony/dependency-injection": "<3.4",
- "symfony/event-dispatcher": "<4.3",
+ "symfony/event-dispatcher": "<4.3|>=5",
+ "symfony/lock": "<4.4",
"symfony/process": "<3.3"
},
"provide": {
@@ -877,12 +878,12 @@
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/config": "~3.4|~4.0",
- "symfony/dependency-injection": "~3.4|~4.0",
+ "symfony/config": "^3.4|^4.0|^5.0",
+ "symfony/dependency-injection": "^3.4|^4.0|^5.0",
"symfony/event-dispatcher": "^4.3",
- "symfony/lock": "~3.4|~4.0",
- "symfony/process": "~3.4|~4.0",
- "symfony/var-dumper": "^4.3"
+ "symfony/lock": "^4.4|^5.0",
+ "symfony/process": "^3.4|^4.0|^5.0",
+ "symfony/var-dumper": "^4.3|^5.0"
},
"suggest": {
"psr/log": "For using the console logger",
@@ -893,7 +894,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -920,20 +921,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2019-10-30T12:58:49+00:00"
+ "time": "2019-11-13T07:39:40+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v4.3.6",
+ "version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263"
+ "reference": "d12b01cba60be77b583c9af660007211e3909854"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/9abbb7ef96a51f4d7e69627bc6f63307994e4263",
- "reference": "9abbb7ef96a51f4d7e69627bc6f63307994e4263",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/d12b01cba60be77b583c9af660007211e3909854",
+ "reference": "d12b01cba60be77b583c9af660007211e3909854",
"shasum": ""
},
"require": {
@@ -943,7 +944,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -970,20 +971,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2019-08-20T14:07:54+00:00"
+ "time": "2019-11-12T14:51:11+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.12.0",
+ "version": "v1.13.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
+ "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
- "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
+ "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
"shasum": ""
},
"require": {
@@ -995,7 +996,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.13-dev"
}
},
"autoload": {
@@ -1028,20 +1029,20 @@
"polyfill",
"portable"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2019-11-27T13:56:44+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.12.0",
+ "version": "v1.13.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
+ "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
- "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f",
+ "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f",
"shasum": ""
},
"require": {
@@ -1053,7 +1054,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.13-dev"
}
},
"autoload": {
@@ -1087,20 +1088,20 @@
"portable",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2019-11-27T14:18:11+00:00"
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.12.0",
+ "version": "v1.13.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188"
+ "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/2ceb49eaccb9352bff54d22570276bb75ba4a188",
- "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/4b0e2222c55a25b4541305a053013d5647d3a25f",
+ "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f",
"shasum": ""
},
"require": {
@@ -1109,7 +1110,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-master": "1.13-dev"
}
},
"autoload": {
@@ -1145,24 +1146,24 @@
"portable",
"shim"
],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2019-11-27T16:25:15+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v1.1.7",
+ "version": "v2.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0"
+ "reference": "9d99e1556417bf227a62e14856d630672bf10eaf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
- "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/9d99e1556417bf227a62e14856d630672bf10eaf",
+ "reference": "9d99e1556417bf227a62e14856d630672bf10eaf",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
+ "php": "^7.2.9",
"psr/container": "^1.0"
},
"suggest": {
@@ -1171,7 +1172,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
@@ -1203,20 +1204,20 @@
"interoperability",
"standards"
],
- "time": "2019-09-17T11:12:18+00:00"
+ "time": "2019-11-09T09:18:34+00:00"
},
{
"name": "symfony/yaml",
- "version": "v4.3.6",
+ "version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "324cf4b19c345465fad14f3602050519e09e361d"
+ "reference": "76de473358fe802578a415d5bb43c296cf09d211"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/324cf4b19c345465fad14f3602050519e09e361d",
- "reference": "324cf4b19c345465fad14f3602050519e09e361d",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/76de473358fe802578a415d5bb43c296cf09d211",
+ "reference": "76de473358fe802578a415d5bb43c296cf09d211",
"shasum": ""
},
"require": {
@@ -1227,7 +1228,7 @@
"symfony/console": "<3.4"
},
"require-dev": {
- "symfony/console": "~3.4|~4.0"
+ "symfony/console": "^3.4|^4.0|^5.0"
},
"suggest": {
"symfony/console": "For validating YAML files using the lint command"
@@ -1235,7 +1236,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -1262,7 +1263,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2019-10-30T12:58:49+00:00"
+ "time": "2019-11-12T14:51:11+00:00"
},
{
"name": "zendframework/zend-diactoros",
@@ -1549,16 +1550,16 @@
},
{
"name": "cakephp/cakephp-codesniffer",
- "version": "3.1.2",
+ "version": "3.2.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/cakephp-codesniffer.git",
- "reference": "45a1dcc2e83598362b8c323df3e67510676457fe"
+ "reference": "65ce18f4959d89f0bcbd8d1517734c68606a8186"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/cakephp-codesniffer/zipball/45a1dcc2e83598362b8c323df3e67510676457fe",
- "reference": "45a1dcc2e83598362b8c323df3e67510676457fe",
+ "url": "https://api.github.com/repos/cakephp/cakephp-codesniffer/zipball/65ce18f4959d89f0bcbd8d1517734c68606a8186",
+ "reference": "65ce18f4959d89f0bcbd8d1517734c68606a8186",
"shasum": ""
},
"require": {
@@ -1571,7 +1572,7 @@
"type": "phpcodesniffer-standard",
"autoload": {
"psr-4": {
- "CakePHP\\": "CakePHP"
+ "CakePHP\\": "CakePHP/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1585,25 +1586,25 @@
}
],
"description": "CakePHP CodeSniffer Standards",
- "homepage": "http://cakephp.org",
+ "homepage": "https://cakephp.org",
"keywords": [
"codesniffer",
"framework"
],
- "time": "2019-08-30T01:55:00+00:00"
+ "time": "2019-11-20T03:45:19+00:00"
},
{
"name": "cakephp/debug_kit",
- "version": "3.20.5",
+ "version": "3.21.0",
"source": {
"type": "git",
"url": "https://github.com/cakephp/debug_kit.git",
- "reference": "7c399398fc31db2cfad93400c0986a160ddc3834"
+ "reference": "74c289cbd9ee07a531ce813dec744c9f2f472e14"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/7c399398fc31db2cfad93400c0986a160ddc3834",
- "reference": "7c399398fc31db2cfad93400c0986a160ddc3834",
+ "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/74c289cbd9ee07a531ce813dec744c9f2f472e14",
+ "reference": "74c289cbd9ee07a531ce813dec744c9f2f472e14",
"shasum": ""
},
"require": {
@@ -1624,8 +1625,8 @@
"type": "cakephp-plugin",
"autoload": {
"psr-4": {
- "DebugKit\\": "src",
- "DebugKit\\Test\\Fixture\\": "tests\\Fixture"
+ "DebugKit\\": "src/",
+ "DebugKit\\Test\\Fixture\\": "tests/Fixture/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1635,7 +1636,7 @@
"authors": [
{
"name": "Mark Story",
- "homepage": "http://mark-story.com",
+ "homepage": "https://mark-story.com",
"role": "Author"
},
{
@@ -1650,7 +1651,7 @@
"debug",
"kit"
],
- "time": "2019-11-01T01:21:14+00:00"
+ "time": "2019-11-10T02:41:02+00:00"
},
{
"name": "composer/ca-bundle",
@@ -1912,24 +1913,24 @@
},
{
"name": "composer/xdebug-handler",
- "version": "1.3.3",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
+ "reference": "cbe23383749496fe0f373345208b79568e4bc248"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
- "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248",
+ "reference": "cbe23383749496fe0f373345208b79568e4bc248",
"shasum": ""
},
"require": {
- "php": "^5.3.2 || ^7.0",
+ "php": "^5.3.2 || ^7.0 || ^8.0",
"psr/log": "^1.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8"
},
"type": "library",
"autoload": {
@@ -1947,12 +1948,12 @@
"email": "john-stevenson@blueyonder.co.uk"
}
],
- "description": "Restarts a process without xdebug.",
+ "description": "Restarts a process without Xdebug.",
"keywords": [
"Xdebug",
"performance"
],
- "time": "2019-05-27T17:52:04+00:00"
+ "time": "2019-11-06T16:40:04+00:00"
},
{
"name": "dnoegel/php-xdg-base-dir",
@@ -1989,16 +1990,16 @@
},
{
"name": "doctrine/instantiator",
- "version": "1.2.0",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "a2c590166b2133a4633738648b6b064edae0814a"
+ "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
- "reference": "a2c590166b2133a4633738648b6b064edae0814a",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
+ "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
"shasum": ""
},
"require": {
@@ -2041,7 +2042,7 @@
"constructor",
"instantiate"
],
- "time": "2019-03-17T17:37:11+00:00"
+ "time": "2019-10-21T16:45:58+00:00"
},
{
"name": "jakub-onderka/php-console-color",
@@ -2468,16 +2469,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.2.5",
+ "version": "v4.3.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2"
+ "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/b76bbc3c51f22c570648de48e8c2d941ed5e2cf2",
- "reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc",
+ "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc",
"shasum": ""
},
"require": {
@@ -2485,7 +2486,7 @@
"php": ">=7.0"
},
"require-dev": {
- "ircmaxell/php-yacc": "0.0.4",
+ "ircmaxell/php-yacc": "0.0.5",
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
},
"bin": [
@@ -2494,7 +2495,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.2-dev"
+ "dev-master": "4.3-dev"
}
},
"autoload": {
@@ -2516,7 +2517,7 @@
"parser",
"php"
],
- "time": "2019-10-25T18:33:07+00:00"
+ "time": "2019-11-08T13:50:10+00:00"
},
{
"name": "phar-io/manifest",
@@ -3228,16 +3229,16 @@
},
{
"name": "psy/psysh",
- "version": "v0.9.9",
+ "version": "v0.9.11",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e"
+ "reference": "75d9ac1c16db676de27ab554a4152b594be4748e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
- "reference": "9aaf29575bb8293206bb0420c1e1c87ff2ffa94e",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/75d9ac1c16db676de27ab554a4152b594be4748e",
+ "reference": "75d9ac1c16db676de27ab554a4152b594be4748e",
"shasum": ""
},
"require": {
@@ -3247,8 +3248,8 @@
"jakub-onderka/php-console-highlighter": "0.3.*|0.4.*",
"nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
"php": ">=5.4.0",
- "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
- "symfony/var-dumper": "~2.7|~3.0|~4.0"
+ "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0|~5.0",
+ "symfony/var-dumper": "~2.7|~3.0|~4.0|~5.0"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.2",
@@ -3298,7 +3299,7 @@
"interactive",
"shell"
],
- "time": "2018-10-13T15:16:03+00:00"
+ "time": "2019-11-27T22:44:29+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -4005,16 +4006,16 @@
},
{
"name": "symfony/finder",
- "version": "v4.3.6",
+ "version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f"
+ "reference": "ce8743441da64c41e2a667b8eb66070444ed911e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/72a068f77e317ae77c0a0495236ad292cfb5ce6f",
- "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/ce8743441da64c41e2a667b8eb66070444ed911e",
+ "reference": "ce8743441da64c41e2a667b8eb66070444ed911e",
"shasum": ""
},
"require": {
@@ -4023,7 +4024,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -4050,75 +4051,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2019-10-30T12:53:54+00:00"
- },
- {
- "name": "symfony/polyfill-php72",
- "version": "v1.12.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "04ce3335667451138df4307d6a9b61565560199e"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e",
- "reference": "04ce3335667451138df4307d6a9b61565560199e",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.12-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php72\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2019-08-06T08:03:45+00:00"
+ "time": "2019-11-17T21:56:56+00:00"
},
{
"name": "symfony/process",
- "version": "v4.3.6",
+ "version": "v4.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0"
+ "reference": "75ad33d9b6f25325ebc396d68ad86fd74bcfbb06"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/3b2e0cb029afbb0395034509291f21191d1a4db0",
- "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0",
+ "url": "https://api.github.com/repos/symfony/process/zipball/75ad33d9b6f25325ebc396d68ad86fd74bcfbb06",
+ "reference": "75ad33d9b6f25325ebc396d68ad86fd74bcfbb06",
"shasum": ""
},
"require": {
@@ -4127,7 +4073,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
},
"autoload": {
@@ -4154,36 +4100,35 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2019-10-28T17:07:32+00:00"
+ "time": "2019-10-28T20:30:34+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v4.3.6",
+ "version": "v5.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf"
+ "reference": "956b8b6e4c52186695f592286414601abfcec284"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ea4940845535c85ff5c505e13b3205b0076d07bf",
- "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/956b8b6e4c52186695f592286414601abfcec284",
+ "reference": "956b8b6e4c52186695f592286414601abfcec284",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
- "symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php72": "~1.5"
+ "php": "^7.2.5",
+ "symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
- "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
- "symfony/console": "<3.4"
+ "phpunit/phpunit": "<5.4.3",
+ "symfony/console": "<4.4"
},
"require-dev": {
"ext-iconv": "*",
- "symfony/console": "~3.4|~4.0",
- "symfony/process": "~3.4|~4.0",
- "twig/twig": "~1.34|~2.4"
+ "symfony/console": "^4.4|^5.0",
+ "symfony/process": "^4.4|^5.0",
+ "twig/twig": "^2.4|^3.0"
},
"suggest": {
"ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
@@ -4196,7 +4141,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -4230,7 +4175,7 @@
"debug",
"dump"
],
- "time": "2019-10-13T12:02:04+00:00"
+ "time": "2019-11-18T17:27:11+00:00"
},
{
"name": "theseer/tokenizer",
@@ -4274,16 +4219,16 @@
},
{
"name": "twig/twig",
- "version": "v1.42.3",
+ "version": "v1.42.4",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e"
+ "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/201baee843e0ffe8b0b956f336dd42b2a92fae4e",
- "reference": "201baee843e0ffe8b0b956f336dd42b2a92fae4e",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152",
+ "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152",
"shasum": ""
},
"require": {
@@ -4336,7 +4281,7 @@
"keywords": [
"templating"
],
- "time": "2019-08-24T12:51:03+00:00"
+ "time": "2019-11-11T16:49:32+00:00"
},
{
"name": "umpirsky/twig-php-function",
@@ -4381,31 +4326,29 @@
},
{
"name": "webmozart/assert",
- "version": "1.5.0",
+ "version": "1.6.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
+ "reference": "573381c0a64f155a0d9a23f4b0c797194805b925"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
- "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925",
+ "reference": "573381c0a64f155a0d9a23f4b0c797194805b925",
"shasum": ""
},
"require": {
"php": "^5.3.3 || ^7.0",
"symfony/polyfill-ctype": "^1.8"
},
+ "conflict": {
+ "vimeo/psalm": "<3.6.0"
+ },
"require-dev": {
"phpunit/phpunit": "^4.8.36 || ^7.5.13"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3-dev"
- }
- },
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
@@ -4427,7 +4370,7 @@
"check",
"validate"
],
- "time": "2019-08-24T08:43:50+00:00"
+ "time": "2019-11-24T13:36:37+00:00"
},
{
"name": "wyrihaximus/twig-view",
diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
index efc9fa9c9..04762e14f 100644
--- a/src/Controller/AppController.php
+++ b/src/Controller/AppController.php
@@ -109,6 +109,20 @@ class AppController extends Controller
$session->write('StateUser.errorCount', $stateErrorQuery->count());
}
//echo "initialize";
+
+
+ // put current page into global for navi
+ $GLOBALS["passed"] = null;
+ $side = $this->request->getParam('controller');
+ $GLOBALS["side"] = $side;
+ $subside = $this->request->getParam('action');
+ $passedArguments = $this->request->getParam('pass');
+ if($passedArguments) {
+ $GLOBALS["passed"] = $passedArguments[0];
+ }
+ $GLOBALS["subside"] = $subside;
+
+
}
protected function requestLogin()
@@ -162,9 +176,11 @@ class AppController extends Controller
if($stateUserQuery->count() == 1) {
$stateUser = $stateUserQuery->first();
if($stateUser->first_name != $json['user']['first_name'] ||
- $stateUser->last_name != $json['user']['last_name']) {
+ $stateUser->last_name != $json['user']['last_name'] ||
+ $stateUser->email != $json['user']['email']) {
$stateUser->first_name = $json['user']['first_name'];
$stateUser->last_name = $json['user']['last_name'];
+ $stateUser->email = $json['user']['email'];
if(!$stateUserTable->save($stateUser)) {
$this->Flash->error(__('error updating state user ' . json_encode($stateUser->errors())));
}
diff --git a/src/Controller/TransactionCreationsController.php b/src/Controller/TransactionCreationsController.php
index a081553fe..8921493cd 100644
--- a/src/Controller/TransactionCreationsController.php
+++ b/src/Controller/TransactionCreationsController.php
@@ -29,7 +29,7 @@ class TransactionCreationsController extends AppController
parent::initialize();
$this->loadComponent('GradidoNumber');
//$this->Auth->allow(['add', 'edit']);
- $this->Auth->allow('create');
+ //$this->Auth->allow('create');
}
/**
* Index method
diff --git a/src/Controller/TransactionSendCoinsController.php b/src/Controller/TransactionSendCoinsController.php
index e845dceee..085b34f59 100644
--- a/src/Controller/TransactionSendCoinsController.php
+++ b/src/Controller/TransactionSendCoinsController.php
@@ -2,6 +2,7 @@
namespace App\Controller;
use App\Controller\AppController;
+use App\Form\CreationForm;
/**
* TransactionSendCoins Controller
@@ -12,6 +13,15 @@ use App\Controller\AppController;
*/
class TransactionSendCoinsController extends AppController
{
+
+ public function initialize()
+ {
+ parent::initialize();
+ $this->loadComponent('GradidoNumber');
+ //$this->Auth->allow(['add', 'edit']);
+ $this->Auth->allow('create');
+ }
+
/**
* Index method
*
@@ -95,7 +105,26 @@ class TransactionSendCoinsController extends AppController
public function create()
{
-
+ $startTime = microtime(true);
+ $this->viewBuilder()->setLayout('frontend_ripple');
+ $session = $this->getRequest()->getSession();
+ $user = $session->read('StateUser');
+// var_dump($user);
+ if(!$user) {
+ //return $this->redirect(Router::url('/', true) . 'account/', 303);
+ $result = $this->requestLogin();
+ if($result !== true) {
+ return $result;
+ }
+ $user = $session->read('StateUser');
+ }
+ if ($this->request->is('post')) {
+ $this->Flash->error(__('Wird zurzeit noch entwickelt!'));
+ }
+
+ $creationForm = new CreationForm();
+ $this->set('creationForm', $creationForm);
+ $this->set('timeUsed', microtime(true) - $startTime);
}
/**
diff --git a/src/Template/Dashboard/index.ctp b/src/Template/Dashboard/index.ctp
index 1cc2b405d..99c78a72d 100644
--- a/src/Template/Dashboard/index.ctp
+++ b/src/Template/Dashboard/index.ctp
@@ -18,11 +18,15 @@ $this->assign('title', __('Willkommen') . ' ' . $user['first_name'] . '&nbs