diff --git a/app/composer.lock b/app/composer.lock
index 421397053..ad3a97de8 100644
--- a/app/composer.lock
+++ b/app/composer.lock
@@ -8,16 +8,16 @@
"packages": [
{
"name": "adodb/adodb-php",
- "version": "v5.20.9",
+ "version": "v5.20.13",
"source": {
"type": "git",
"url": "https://github.com/ADOdb/ADOdb.git",
- "reference": "f601748cca1ccb86dfd427620a1692a70e681075"
+ "reference": "1141326db4b5092cee95841a1c056f876b9b4c83"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/f601748cca1ccb86dfd427620a1692a70e681075",
- "reference": "f601748cca1ccb86dfd427620a1692a70e681075",
+ "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/1141326db4b5092cee95841a1c056f876b9b4c83",
+ "reference": "1141326db4b5092cee95841a1c056f876b9b4c83",
"shasum": ""
},
"require": {
@@ -32,7 +32,7 @@
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause",
- "LGPL-2.1"
+ "LGPL-2.1-or-later"
],
"authors": [
{
@@ -58,7 +58,7 @@
"library",
"php"
],
- "time": "2016-12-21T17:19:42+00:00"
+ "time": "2018-08-06T16:04:33+00:00"
},
{
"name": "aura/intl",
@@ -108,16 +108,16 @@
},
{
"name": "cakephp/cakephp",
- "version": "3.6.7",
+ "version": "3.6.11",
"source": {
"type": "git",
"url": "https://github.com/cakephp/cakephp.git",
- "reference": "9a67c9d7158d5e299418f9956d1a8af39128cf57"
+ "reference": "ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/cakephp/zipball/9a67c9d7158d5e299418f9956d1a8af39128cf57",
- "reference": "9a67c9d7158d5e299418f9956d1a8af39128cf57",
+ "url": "https://api.github.com/repos/cakephp/cakephp/zipball/ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d",
+ "reference": "ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d",
"shasum": ""
},
"require": {
@@ -190,7 +190,7 @@
"rapid-development",
"validation"
],
- "time": "2018-07-08T18:02:23+00:00"
+ "time": "2018-09-03T01:33:56+00:00"
},
{
"name": "cakephp/chronos",
@@ -251,29 +251,29 @@
},
{
"name": "cakephp/migrations",
- "version": "1.7.2",
+ "version": "1.8.1",
"source": {
"type": "git",
"url": "https://github.com/cakephp/migrations.git",
- "reference": "a5612adfd2efa8c90d29cb3b0c969de872a99eda"
+ "reference": "cd65daa9fae933bc0ccc69d5b5d92460375da9e2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/migrations/zipball/a5612adfd2efa8c90d29cb3b0c969de872a99eda",
- "reference": "a5612adfd2efa8c90d29cb3b0c969de872a99eda",
+ "url": "https://api.github.com/repos/cakephp/migrations/zipball/cd65daa9fae933bc0ccc69d5b5d92460375da9e2",
+ "reference": "cd65daa9fae933bc0ccc69d5b5d92460375da9e2",
"shasum": ""
},
"require": {
- "cakephp/cache": "~3.2",
- "cakephp/orm": "~3.2",
- "php": ">=5.5.9",
+ "cakephp/cache": "^3.6.0",
+ "cakephp/orm": "^3.6.0",
+ "php": ">=5.6.0",
"robmorgan/phinx": "0.8.1"
},
"require-dev": {
- "cakephp/bake": "@stable",
- "cakephp/cakephp": "~3.2",
+ "cakephp/bake": "^1.7.0",
+ "cakephp/cakephp": "^3.6.0",
"cakephp/cakephp-codesniffer": "^3.0",
- "phpunit/phpunit": "~4.1"
+ "phpunit/phpunit": "^5.7.14"
},
"suggest": {
"cakephp/bake": "Required if you want to generate migrations."
@@ -300,7 +300,7 @@
"cakephp",
"migrations"
],
- "time": "2017-12-12T21:01:38+00:00"
+ "time": "2018-04-16T01:35:59+00:00"
},
{
"name": "cakephp/plugin-installer",
@@ -397,16 +397,16 @@
},
{
"name": "m1/env",
- "version": "2.1.0",
+ "version": "2.1.2",
"source": {
"type": "git",
"url": "https://github.com/m1/Env.git",
- "reference": "d87eddd031f2aa5450fa04bb1325de8a489b3cd0"
+ "reference": "294addeedf15e1149eeb96ec829f2029d2017d39"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/m1/Env/zipball/d87eddd031f2aa5450fa04bb1325de8a489b3cd0",
- "reference": "d87eddd031f2aa5450fa04bb1325de8a489b3cd0",
+ "url": "https://api.github.com/repos/m1/Env/zipball/294addeedf15e1149eeb96ec829f2029d2017d39",
+ "reference": "294addeedf15e1149eeb96ec829f2029d2017d39",
"shasum": ""
},
"require": {
@@ -451,20 +451,20 @@
"parser",
"support"
],
- "time": "2016-10-06T19:31:28+00:00"
+ "time": "2018-06-19T18:55:08+00:00"
},
{
"name": "mobiledetect/mobiledetectlib",
- "version": "2.8.30",
+ "version": "2.8.33",
"source": {
"type": "git",
"url": "https://github.com/serbanghita/Mobile-Detect.git",
- "reference": "5500bbbf312fe77ef0c7223858dad84fe49ee0c3"
+ "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/5500bbbf312fe77ef0c7223858dad84fe49ee0c3",
- "reference": "5500bbbf312fe77ef0c7223858dad84fe49ee0c3",
+ "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/cd385290f9a0d609d2eddd165a1e44ec1bf12102",
+ "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102",
"shasum": ""
},
"require": {
@@ -503,7 +503,7 @@
"mobile detector",
"php mobile detect"
],
- "time": "2017-12-18T10:38:51+00:00"
+ "time": "2018-09-01T15:05:15+00:00"
},
{
"name": "psr/http-message",
@@ -670,21 +670,22 @@
},
{
"name": "symfony/config",
- "version": "v3.4.4",
+ "version": "v3.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "72689b934d6c6ecf73eca874e98933bf055313c9"
+ "reference": "e5389132dc6320682de3643091121c048ff796b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/72689b934d6c6ecf73eca874e98933bf055313c9",
- "reference": "72689b934d6c6ecf73eca874e98933bf055313c9",
+ "url": "https://api.github.com/repos/symfony/config/zipball/e5389132dc6320682de3643091121c048ff796b3",
+ "reference": "e5389132dc6320682de3643091121c048ff796b3",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8",
- "symfony/filesystem": "~2.8|~3.0|~4.0"
+ "symfony/filesystem": "~2.8|~3.0|~4.0",
+ "symfony/polyfill-ctype": "~1.8"
},
"conflict": {
"symfony/dependency-injection": "<3.3",
@@ -692,6 +693,7 @@
},
"require-dev": {
"symfony/dependency-injection": "~3.3|~4.0",
+ "symfony/event-dispatcher": "~3.3|~4.0",
"symfony/finder": "~3.3|~4.0",
"symfony/yaml": "~3.0|~4.0"
},
@@ -728,20 +730,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2018-01-21T19:05:02+00:00"
+ "time": "2018-09-08T13:15:14+00:00"
},
{
"name": "symfony/console",
- "version": "v3.4.12",
+ "version": "v3.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "1b97071a26d028c9bd4588264e101e14f6e7cd00"
+ "reference": "1cbaac35024c9dfc9612b7e2310e82677bf85709"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/1b97071a26d028c9bd4588264e101e14f6e7cd00",
- "reference": "1b97071a26d028c9bd4588264e101e14f6e7cd00",
+ "url": "https://api.github.com/repos/symfony/console/zipball/1cbaac35024c9dfc9612b7e2310e82677bf85709",
+ "reference": "1cbaac35024c9dfc9612b7e2310e82677bf85709",
"shasum": ""
},
"require": {
@@ -797,36 +799,36 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2018-05-23T05:02:55+00:00"
+ "time": "2018-09-30T03:37:36+00:00"
},
{
"name": "symfony/debug",
- "version": "v4.1.1",
+ "version": "v3.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d"
+ "reference": "b70cfaae39009ecde3164bb8cba4d029220d27b1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
- "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/b70cfaae39009ecde3164bb8cba4d029220d27b1",
+ "reference": "b70cfaae39009ecde3164bb8cba4d029220d27b1",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
+ "php": "^5.5.9|>=7.0.8",
"psr/log": "~1.0"
},
"conflict": {
- "symfony/http-kernel": "<3.4"
+ "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
},
"require-dev": {
- "symfony/http-kernel": "~3.4|~4.0"
+ "symfony/http-kernel": "~2.8|~3.0|~4.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.1-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -853,30 +855,30 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2018-06-08T09:39:36+00:00"
+ "time": "2018-09-22T18:25:03+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v4.1.1",
+ "version": "v3.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c"
+ "reference": "f89ab242d915d188fca95ee3291c72c5a094a195"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/562bf7005b55fd80d26b582d28e3e10f2dd5ae9c",
- "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/f89ab242d915d188fca95ee3291c72c5a094a195",
+ "reference": "f89ab242d915d188fca95ee3291c72c5a094a195",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
+ "php": "^5.5.9|>=7.0.8",
"symfony/polyfill-ctype": "~1.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.1-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -903,29 +905,32 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2018-05-30T07:26:09+00:00"
+ "time": "2018-09-30T03:32:28+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.8.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
- "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
+ "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
+ "suggest": {
+ "ext-ctype": "For best performance"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -958,20 +963,20 @@
"polyfill",
"portable"
],
- "time": "2018-04-30T19:57:29+00:00"
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.8.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "3296adf6a6454a050679cde90f95350ad604b171"
+ "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
- "reference": "3296adf6a6454a050679cde90f95350ad604b171",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
+ "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
"shasum": ""
},
"require": {
@@ -983,7 +988,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8-dev"
+ "dev-master": "1.9-dev"
}
},
"autoload": {
@@ -1017,24 +1022,25 @@
"portable",
"shim"
],
- "time": "2018-04-26T10:06:28+00:00"
+ "time": "2018-08-06T14:22:27+00:00"
},
{
"name": "symfony/yaml",
- "version": "v3.4.4",
+ "version": "v3.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "eab73b6c21d27ae4cd037c417618dfd4befb0bfe"
+ "reference": "61973ecda60e9f3561e929e19c07d4878b960fc1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/eab73b6c21d27ae4cd037c417618dfd4befb0bfe",
- "reference": "eab73b6c21d27ae4cd037c417618dfd4befb0bfe",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/61973ecda60e9f3561e929e19c07d4878b960fc1",
+ "reference": "61973ecda60e9f3561e929e19c07d4878b960fc1",
"shasum": ""
},
"require": {
- "php": "^5.5.9|>=7.0.8"
+ "php": "^5.5.9|>=7.0.8",
+ "symfony/polyfill-ctype": "~1.8"
},
"conflict": {
"symfony/console": "<3.4"
@@ -1075,20 +1081,20 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2018-01-21T19:05:02+00:00"
+ "time": "2018-09-24T08:15:45+00:00"
},
{
"name": "zendframework/zend-diactoros",
- "version": "1.8.1",
+ "version": "1.8.6",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "63d920d1c9ebc009d860c3666593a66298727dd6"
+ "reference": "20da13beba0dde8fb648be3cc19765732790f46e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/63d920d1c9ebc009d860c3666593a66298727dd6",
- "reference": "63d920d1c9ebc009d860c3666593a66298727dd6",
+ "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e",
+ "reference": "20da13beba0dde8fb648be3cc19765732790f46e",
"shasum": ""
},
"require": {
@@ -1101,7 +1107,8 @@
"require-dev": {
"ext-dom": "*",
"ext-libxml": "*",
- "phpunit/phpunit": "^5.7.16 || ^6.0.8",
+ "php-http/psr7-integration-tests": "dev-master",
+ "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
"zendframework/zend-coding-standard": "~1.0"
},
"type": "library",
@@ -1138,7 +1145,7 @@
"psr",
"psr-7"
],
- "time": "2018-07-09T21:17:27+00:00"
+ "time": "2018-09-05T19:29:37+00:00"
}
],
"packages-dev": [
@@ -1315,27 +1322,27 @@
},
{
"name": "cakephp/bake",
- "version": "1.6.1",
+ "version": "1.8.4",
"source": {
"type": "git",
"url": "https://github.com/cakephp/bake.git",
- "reference": "6c2d86bf7d39262b63716c150dedcb02d56e53c1"
+ "reference": "7356656e236bb62733f4fdd4894ce1f26f9e14f6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/bake/zipball/6c2d86bf7d39262b63716c150dedcb02d56e53c1",
- "reference": "6c2d86bf7d39262b63716c150dedcb02d56e53c1",
+ "url": "https://api.github.com/repos/cakephp/bake/zipball/7356656e236bb62733f4fdd4894ce1f26f9e14f6",
+ "reference": "7356656e236bb62733f4fdd4894ce1f26f9e14f6",
"shasum": ""
},
"require": {
- "cakephp/cakephp": "^3.5.10",
+ "cakephp/cakephp": "^3.6.0",
"cakephp/plugin-installer": "^1.0",
"php": ">=5.6.0",
- "wyrihaximus/twig-view": "^4.2.1"
+ "wyrihaximus/twig-view": "^4.3.4"
},
"require-dev": {
"cakephp/cakephp-codesniffer": "^3.0",
- "phpunit/phpunit": "^5.7 | ^6.0"
+ "phpunit/phpunit": "^5.7.14|^6.0"
},
"type": "cakephp-plugin",
"autoload": {
@@ -1359,20 +1366,20 @@
"bake",
"cakephp"
],
- "time": "2018-02-07T17:03:13+00:00"
+ "time": "2018-08-21T01:28:47+00:00"
},
{
"name": "cakephp/cakephp-codesniffer",
- "version": "3.0.3",
+ "version": "3.0.5",
"source": {
"type": "git",
"url": "https://github.com/cakephp/cakephp-codesniffer.git",
- "reference": "d77ac81199f2f1e5a8d8ebf96a5d6d7cd4e0542b"
+ "reference": "7f467fee00fd016b62cf8c85a57750ab2a895e81"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/cakephp-codesniffer/zipball/d77ac81199f2f1e5a8d8ebf96a5d6d7cd4e0542b",
- "reference": "d77ac81199f2f1e5a8d8ebf96a5d6d7cd4e0542b",
+ "url": "https://api.github.com/repos/cakephp/cakephp-codesniffer/zipball/7f467fee00fd016b62cf8c85a57750ab2a895e81",
+ "reference": "7f467fee00fd016b62cf8c85a57750ab2a895e81",
"shasum": ""
},
"require": {
@@ -1404,20 +1411,20 @@
"codesniffer",
"framework"
],
- "time": "2017-12-21T20:01:35+00:00"
+ "time": "2018-06-09T16:01:01+00:00"
},
{
"name": "cakephp/debug_kit",
- "version": "3.16.3",
+ "version": "3.16.4",
"source": {
"type": "git",
"url": "https://github.com/cakephp/debug_kit.git",
- "reference": "aabaecb032f7e91d2c4df9c79806992cf60e07ee"
+ "reference": "d5cd81818b65da0849089a66316744e4cc453d70"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/aabaecb032f7e91d2c4df9c79806992cf60e07ee",
- "reference": "aabaecb032f7e91d2c4df9c79806992cf60e07ee",
+ "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/d5cd81818b65da0849089a66316744e4cc453d70",
+ "reference": "d5cd81818b65da0849089a66316744e4cc453d70",
"shasum": ""
},
"require": {
@@ -1464,20 +1471,20 @@
"debug",
"kit"
],
- "time": "2018-06-11T02:33:52+00:00"
+ "time": "2018-08-03T13:57:51+00:00"
},
{
"name": "composer/ca-bundle",
- "version": "1.1.1",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
- "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169"
+ "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/ca-bundle/zipball/d2c0a83b7533d6912e8d516756ebd34f893e9169",
- "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0",
+ "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0",
"shasum": ""
},
"require": {
@@ -1520,30 +1527,30 @@
"ssl",
"tls"
],
- "time": "2018-03-29T19:57:20+00:00"
+ "time": "2018-08-08T08:57:40+00:00"
},
{
"name": "composer/composer",
- "version": "1.6.5",
+ "version": "1.7.2",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
- "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9"
+ "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/composer/zipball/b184a92419cc9a9c4c6a09db555a94d441cb11c9",
- "reference": "b184a92419cc9a9c4c6a09db555a94d441cb11c9",
+ "url": "https://api.github.com/repos/composer/composer/zipball/576aab9b5abb2ed11a1c52353a759363216a4ad2",
+ "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2",
"shasum": ""
},
"require": {
"composer/ca-bundle": "^1.0",
"composer/semver": "^1.0",
"composer/spdx-licenses": "^1.2",
+ "composer/xdebug-handler": "^1.1",
"justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
"php": "^5.3.2 || ^7.0",
"psr/log": "^1.0",
- "seld/cli-prompt": "^1.0",
"seld/jsonlint": "^1.4",
"seld/phar-utils": "^1.0",
"symfony/console": "^2.7 || ^3.0 || ^4.0",
@@ -1569,7 +1576,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6-dev"
+ "dev-master": "1.7-dev"
}
},
"autoload": {
@@ -1600,7 +1607,7 @@
"dependency",
"package"
],
- "time": "2018-05-04T09:44:59+00:00"
+ "time": "2018-08-16T14:57:12+00:00"
},
{
"name": "composer/semver",
@@ -1725,6 +1732,50 @@
],
"time": "2018-04-30T10:33:04+00:00"
},
+ {
+ "name": "composer/xdebug-handler",
+ "version": "1.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/xdebug-handler.git",
+ "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/b8e9745fb9b06ea6664d8872c4505fb16df4611c",
+ "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3.2 || ^7.0",
+ "psr/log": "^1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Composer\\XdebugHandler\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "John Stevenson",
+ "email": "john-stevenson@blueyonder.co.uk"
+ }
+ ],
+ "description": "Restarts a process without xdebug.",
+ "keywords": [
+ "Xdebug",
+ "performance"
+ ],
+ "time": "2018-08-31T19:07:57+00:00"
+ },
{
"name": "dnoegel/php-xdg-base-dir",
"version": "0.1",
@@ -1760,32 +1811,32 @@
},
{
"name": "jakub-onderka/php-console-color",
- "version": "0.1",
+ "version": "v0.2",
"source": {
"type": "git",
"url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1"
+ "reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1",
- "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1",
+ "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
+ "reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": ">=5.4.0"
},
"require-dev": {
"jakub-onderka/php-code-style": "1.0",
- "jakub-onderka/php-parallel-lint": "0.*",
+ "jakub-onderka/php-parallel-lint": "1.0",
"jakub-onderka/php-var-dump-check": "0.*",
- "phpunit/phpunit": "3.7.*",
+ "phpunit/phpunit": "~4.3",
"squizlabs/php_codesniffer": "1.*"
},
"type": "library",
"autoload": {
- "psr-0": {
- "JakubOnderka\\PhpConsoleColor": "src/"
+ "psr-4": {
+ "JakubOnderka\\PhpConsoleColor\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1795,11 +1846,10 @@
"authors": [
{
"name": "Jakub Onderka",
- "email": "jakub.onderka@gmail.com",
- "homepage": "http://www.acci.cz"
+ "email": "jakub.onderka@gmail.com"
}
],
- "time": "2014-04-08T15:00:19+00:00"
+ "time": "2018-09-29T17:23:10+00:00"
},
{
"name": "jakub-onderka/php-console-highlighter",
@@ -2023,24 +2073,24 @@
},
{
"name": "nikic/php-parser",
- "version": "v3.1.4",
+ "version": "v4.0.4",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "e57b3a09784f846411aa7ed664eedb73e3399078"
+ "reference": "fa6ee28600d21d49b2b4e1006b48426cec8e579c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e57b3a09784f846411aa7ed664eedb73e3399078",
- "reference": "e57b3a09784f846411aa7ed664eedb73e3399078",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/fa6ee28600d21d49b2b4e1006b48426cec8e579c",
+ "reference": "fa6ee28600d21d49b2b4e1006b48426cec8e579c",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
- "php": ">=5.5"
+ "php": ">=7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0|~5.0"
+ "phpunit/phpunit": "^6.5 || ^7.0"
},
"bin": [
"bin/php-parse"
@@ -2048,7 +2098,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -2070,34 +2120,36 @@
"parser",
"php"
],
- "time": "2018-01-25T21:31:33+00:00"
+ "time": "2018-09-18T07:03:24+00:00"
},
{
"name": "psy/psysh",
- "version": "v0.8.17",
+ "version": "v0.9.8",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec"
+ "reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5069b70e8c4ea492c2b5939b6eddc78bfe41cfec",
- "reference": "5069b70e8c4ea492c2b5939b6eddc78bfe41cfec",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/ed3c32c4304e1a678a6e0f9dc11dd2d927d89555",
+ "reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555",
"shasum": ""
},
"require": {
"dnoegel/php-xdg-base-dir": "0.1",
+ "ext-json": "*",
+ "ext-tokenizer": "*",
"jakub-onderka/php-console-highlighter": "0.3.*",
- "nikic/php-parser": "~1.3|~2.0|~3.0",
- "php": ">=5.3.9",
+ "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"
},
"require-dev": {
- "hoa/console": "~3.16|~1.14",
- "phpunit/phpunit": "^4.8.35|^5.4.3",
- "symfony/finder": "~2.1|~3.0|~4.0"
+ "bamarni/composer-bin-plugin": "^1.2",
+ "hoa/console": "~2.15|~3.16",
+ "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0"
},
"suggest": {
"ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
@@ -2112,15 +2164,15 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-develop": "0.8.x-dev"
+ "dev-develop": "0.9.x-dev"
}
},
"autoload": {
"files": [
- "src/Psy/functions.php"
+ "src/functions.php"
],
"psr-4": {
- "Psy\\": "src/Psy/"
+ "Psy\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2142,55 +2194,7 @@
"interactive",
"shell"
],
- "time": "2017-12-28T16:14:16+00:00"
- },
- {
- "name": "seld/cli-prompt",
- "version": "1.0.3",
- "source": {
- "type": "git",
- "url": "https://github.com/Seldaek/cli-prompt.git",
- "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd",
- "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Seld\\CliPrompt\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jordi Boggiano",
- "email": "j.boggiano@seld.be"
- }
- ],
- "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type",
- "keywords": [
- "cli",
- "console",
- "hidden",
- "input",
- "prompt"
- ],
- "time": "2017-03-18T11:32:45+00:00"
+ "time": "2018-09-05T11:40:09+00:00"
},
{
"name": "seld/jsonlint",
@@ -2287,16 +2291,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.2.2",
+ "version": "3.3.2",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1"
+ "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7c00c3000ac0ce79c96fcbfef86b49a71158cd1",
- "reference": "d7c00c3000ac0ce79c96fcbfef86b49a71158cd1",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6ad28354c04b364c3c71a34e4a18b629cc3b231e",
+ "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e",
"shasum": ""
},
"require": {
@@ -2306,7 +2310,7 @@
"php": ">=5.4.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0"
+ "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
},
"bin": [
"bin/phpcs",
@@ -2334,29 +2338,29 @@
"phpcs",
"standards"
],
- "time": "2017-12-19T21:44:46+00:00"
+ "time": "2018-09-23T23:08:17+00:00"
},
{
"name": "symfony/finder",
- "version": "v4.1.1",
+ "version": "v3.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb"
+ "reference": "e8db87d755e14271e920e31ba834a4ae99483232"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/84714b8417d19e4ba02ea78a41a975b3efaafddb",
- "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/e8db87d755e14271e920e31ba834a4ae99483232",
+ "reference": "e8db87d755e14271e920e31ba834a4ae99483232",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": "^5.5.9|>=7.0.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.1-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2383,84 +2387,29 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2018-06-19T21:38:16+00:00"
- },
- {
- "name": "symfony/polyfill-php72",
- "version": "v1.7.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "8eca20c8a369e069d4f4c2ac9895144112867422"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422",
- "reference": "8eca20c8a369e069d4f4c2ac9895144112867422",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.7-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": "2018-01-31T17:43:24+00:00"
+ "time": "2018-09-21T12:47:54+00:00"
},
{
"name": "symfony/process",
- "version": "v4.1.1",
+ "version": "v3.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a"
+ "reference": "8b87aca97f341d65dee430c60863f2442605c88b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
- "reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
+ "url": "https://api.github.com/repos/symfony/process/zipball/8b87aca97f341d65dee430c60863f2442605c88b",
+ "reference": "8b87aca97f341d65dee430c60863f2442605c88b",
"shasum": ""
},
"require": {
- "php": "^7.1.3"
+ "php": "^5.5.9|>=7.0.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.1-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2487,26 +2436,25 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2018-05-31T10:17:53+00:00"
+ "time": "2018-09-08T13:15:14+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v4.0.4",
+ "version": "v3.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "6d63cc74f3e2d4961411ccb77389a00332653104"
+ "reference": "e57a24dc13accad1d5f90d232c5564910c5eb7b0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6d63cc74f3e2d4961411ccb77389a00332653104",
- "reference": "6d63cc74f3e2d4961411ccb77389a00332653104",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e57a24dc13accad1d5f90d232c5564910c5eb7b0",
+ "reference": "e57a24dc13accad1d5f90d232c5564910c5eb7b0",
"shasum": ""
},
"require": {
- "php": "^7.1.3",
- "symfony/polyfill-mbstring": "~1.0",
- "symfony/polyfill-php72": "~1.5"
+ "php": "^5.5.9|>=7.0.8",
+ "symfony/polyfill-mbstring": "~1.0"
},
"conflict": {
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
@@ -2517,12 +2465,13 @@
},
"suggest": {
"ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
- "ext-intl": "To show region name in time zone dump"
+ "ext-intl": "To show region name in time zone dump",
+ "ext-symfony_debug": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -2556,29 +2505,30 @@
"debug",
"dump"
],
- "time": "2018-01-29T09:06:29+00:00"
+ "time": "2018-09-18T08:05:59+00:00"
},
{
"name": "twig/twig",
- "version": "v1.35.0",
+ "version": "v1.35.4",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f"
+ "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/daa657073e55b0a78cce8fdd22682fddecc6385f",
- "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
+ "reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.3",
+ "symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"psr/container": "^1.0",
- "symfony/debug": "~2.7",
- "symfony/phpunit-bridge": "~3.3@dev"
+ "symfony/debug": "^2.7",
+ "symfony/phpunit-bridge": "^3.3"
},
"type": "library",
"extra": {
@@ -2612,16 +2562,16 @@
},
{
"name": "Twig Team",
- "homepage": "http://twig.sensiolabs.org/contributors",
+ "homepage": "https://twig.symfony.com/contributors",
"role": "Contributors"
}
],
"description": "Twig, the flexible, fast, and secure template language for PHP",
- "homepage": "http://twig.sensiolabs.org",
+ "homepage": "https://twig.symfony.com",
"keywords": [
"templating"
],
- "time": "2017-09-27T18:06:46+00:00"
+ "time": "2018-07-13T07:12:17+00:00"
},
{
"name": "umpirsky/twig-php-function",
@@ -2666,16 +2616,16 @@
},
{
"name": "wyrihaximus/twig-view",
- "version": "4.3.1",
+ "version": "4.3.5",
"source": {
"type": "git",
"url": "https://github.com/WyriHaximus/TwigView.git",
- "reference": "0bdce795bbf7f667209a9ed4a2d4b4db485e110c"
+ "reference": "ec2771e6a1fe799f9b16eff19da424cd04d593b7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/0bdce795bbf7f667209a9ed4a2d4b4db485e110c",
- "reference": "0bdce795bbf7f667209a9ed4a2d4b4db485e110c",
+ "url": "https://api.github.com/repos/WyriHaximus/TwigView/zipball/ec2771e6a1fe799f9b16eff19da424cd04d593b7",
+ "reference": "ec2771e6a1fe799f9b16eff19da424cd04d593b7",
"shasum": ""
},
"require": {
@@ -2685,7 +2635,7 @@
"cakephp/cakephp": "^3.5",
"jasny/twig-extensions": "^1.0",
"php": "^5.6 || ^7.0",
- "twig/twig": "^1.18",
+ "twig/twig": "^1.27",
"umpirsky/twig-php-function": "0.1"
},
"require-dev": {
@@ -2720,7 +2670,7 @@
"twig",
"view"
],
- "time": "2018-01-28T22:18:29+00:00"
+ "time": "2018-07-03T15:46:29+00:00"
}
],
"aliases": [],
diff --git a/app/src/Locale/en_US/default.po b/app/src/Locale/en_US/default.po
index e3ed51c44..c4d67ad0f 100644
--- a/app/src/Locale/en_US/default.po
+++ b/app/src/Locale/en_US/default.po
@@ -26,6 +26,9 @@
msgid "match.meta.lang"
msgstr "en"
+msgid "match.meta.logo"
+msgstr "COmanage Logo"
+
msgid "match.meta.match"
msgstr "COmanage Match"
@@ -357,6 +360,9 @@ msgstr "Assign This Reference ID"
msgid "match.op.save"
msgstr "Save"
+msgid "match.op.skip_to_content"
+msgstr "Skip to main content"
+
### Results
msgid "match.rs.build"
msgstr "Matchgrid schema successfully applied"
diff --git a/app/src/Template/Element/Flash/default.ctp b/app/src/Template/Element/Flash/default.ctp
index 736b27db6..5386cb904 100644
--- a/app/src/Template/Element/Flash/default.ctp
+++ b/app/src/Template/Element/Flash/default.ctp
@@ -1,10 +1,23 @@
+" onclick="this.classList.add('hidden');">= $message ?>
+*/ ?>
+
+', $filteredMessage);
+ print "";
+ }
+?>
+
diff --git a/app/src/Template/Element/Flash/error.ctp b/app/src/Template/Element/Flash/error.ctp
index e7c4af102..2eaa58c20 100644
--- a/app/src/Template/Element/Flash/error.ctp
+++ b/app/src/Template/Element/Flash/error.ctp
@@ -1,6 +1,20 @@
+= $message ?>
+*/ ?>
+
+
+', $filteredMessage);
+ print "";
+ }
+?>
+
diff --git a/app/src/Template/Element/Flash/success.ctp b/app/src/Template/Element/Flash/success.ctp
index becd5a1fd..402186144 100644
--- a/app/src/Template/Element/Flash/success.ctp
+++ b/app/src/Template/Element/Flash/success.ctp
@@ -3,4 +3,16 @@ if (!isset($params['escape']) || $params['escape'] !== false) {
$message = h($message);
}
?>
+= $message ?>
+*/ ?>
+
+', $filteredMessage);
+ print "";
+ }
+?>
diff --git a/app/src/Template/Element/menuMain.ctp b/app/src/Template/Element/menuMain.ctp
index 650e6bca2..78f1ecbfc 100644
--- a/app/src/Template/Element/menuMain.ctp
+++ b/app/src/Template/Element/menuMain.ctp
@@ -28,8 +28,6 @@
// XXX we're using the same cookie as registry to determine collapsing of the menu,
// we should probably have our own cookie (note other cookies already use "match" prefix)
?>
-XXX PLACEHOLDER BECAUSE
-MENU DOESNT ALIGN