diff --git a/public_html/composer.json b/public_html/composer.json
index 94dab3a0..2fcfe11c 100644
--- a/public_html/composer.json
+++ b/public_html/composer.json
@@ -6,7 +6,7 @@
"license": "MIT",
"require": {
"php": ">=7.1.1",
- "cakephp/cakephp": "3.3.*",
+ "cakephp/cakephp": "3.5.*",
"cakephp/migrations": "~1.0",
"cakephp/plugin-installer": "*",
"cakephp/localized": "3.0.0",
diff --git a/public_html/composer.lock b/public_html/composer.lock
index 8843c49e..6ba7728f 100644
--- a/public_html/composer.lock
+++ b/public_html/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "97d87ce2976444aa4195d8aedd92b90c",
+ "content-hash": "38b897ccb723b2b13bebcfac487241c4",
"packages": [
{
"name": "admad/cakephp-hybridauth",
@@ -46,114 +46,41 @@
],
"time": "2018-07-11T14:16:05+00:00"
},
- {
- "name": "aura/installer-default",
- "version": "1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/auraphp/installer-default.git",
- "reference": "52f8de3670cc1ef45a916f40f732937436d028c8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/auraphp/installer-default/zipball/52f8de3670cc1ef45a916f40f732937436d028c8",
- "reference": "52f8de3670cc1ef45a916f40f732937436d028c8",
- "shasum": ""
- },
- "type": "composer-installer",
- "extra": {
- "class": "Aura\\Composer\\DefaultInstaller"
- },
- "autoload": {
- "psr-0": {
- "Aura\\Composer\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-2-Clause"
- ],
- "authors": [
- {
- "name": "Paul M. Jones",
- "email": "pmjones88@gmail.com",
- "homepage": "http://paul-m-jones.com"
- }
- ],
- "description": "Installs Aura packages using the Composer defaults.",
- "keywords": [
- "aura",
- "installer"
- ],
- "time": "2012-11-26T21:35:57+00:00"
- },
{
"name": "aura/intl",
- "version": "1.1.1",
+ "version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/auraphp/Aura.Intl.git",
- "reference": "c5fe620167550ad6fa77dd3570fba2efc77a2a21"
+ "reference": "7fce228980b19bf4dee2d7bbd6202a69b0dde926"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/auraphp/Aura.Intl/zipball/c5fe620167550ad6fa77dd3570fba2efc77a2a21",
- "reference": "c5fe620167550ad6fa77dd3570fba2efc77a2a21",
+ "url": "https://api.github.com/repos/auraphp/Aura.Intl/zipball/7fce228980b19bf4dee2d7bbd6202a69b0dde926",
+ "reference": "7fce228980b19bf4dee2d7bbd6202a69b0dde926",
"shasum": ""
},
"require": {
- "aura/installer-default": "1.0.*",
- "php": ">=5.4.0"
- },
- "type": "aura-package",
- "extra": {
- "aura": {
- "type": "library",
- "config": {
- "common": "Aura\\Intl\\_Config\\Common"
- }
- },
- "branch-alias": {
- "dev-develop": "1.1.x-dev"
- }
+ "php": "^5.6|^7.0"
},
+ "type": "library",
"autoload": {
- "psr-0": {
- "Aura\\Intl": "src/"
- },
"psr-4": {
- "Aura\\Intl\\_Config\\": "config/"
+ "Aura\\Intl\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "BSD-2-Clause"
+ "MIT"
],
"authors": [
- {
- "name": "Paul M. Jones",
- "email": "pmjones88@gmail.com",
- "homepage": "http://paul-m-jones.com"
- },
{
"name": "Aura.Intl Contributors",
"homepage": "https://github.com/auraphp/Aura.Intl/contributors"
- },
- {
- "name": "Pascal Borreli",
- "email": "pascal@borreli.com"
- },
- {
- "name": "Mapthegod",
- "email": "mapthegod@gmail.com"
- },
- {
- "name": "Jose Lorenzo Rodriguez",
- "email": "jose.zap@gmail.com"
}
],
- "description": "The Aura.Intl package provides internationalization (I18N) tools, specifically\npackage-oriented per-locale message translation.",
- "homepage": "http://auraphp.com/Aura.Intl",
+ "description": "The Aura Intl package provides internationalization tools, specifically message translation.",
+ "homepage": "https://github.com/auraphp/Aura.Intl",
"keywords": [
"g11n",
"globalization",
@@ -163,30 +90,33 @@
"l10n",
"localization"
],
- "time": "2014-08-24T00:00:00+00:00"
+ "time": "2017-01-20T05:00:11+00:00"
},
{
"name": "cakephp/cakephp",
- "version": "3.3.16",
+ "version": "3.5.18",
"source": {
"type": "git",
"url": "https://github.com/cakephp/cakephp.git",
- "reference": "11a5ae91ef03e3ff8a9c6d410fdb1cc98e0f57f3"
+ "reference": "46ead510e101a6c89e18eeb2504fcdd48fdf039e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/cakephp/zipball/11a5ae91ef03e3ff8a9c6d410fdb1cc98e0f57f3",
- "reference": "11a5ae91ef03e3ff8a9c6d410fdb1cc98e0f57f3",
+ "url": "https://api.github.com/repos/cakephp/cakephp/zipball/46ead510e101a6c89e18eeb2504fcdd48fdf039e",
+ "reference": "46ead510e101a6c89e18eeb2504fcdd48fdf039e",
"shasum": ""
},
"require": {
- "aura/intl": "1.1.*",
- "cakephp/chronos": "~1.0",
+ "aura/intl": "^3.0.0",
+ "cakephp/chronos": "^1.0.1",
"ext-intl": "*",
"ext-mbstring": "*",
- "php": ">=5.5.9",
- "psr/log": "^1.0",
- "zendframework/zend-diactoros": "^1.4"
+ "php": ">=5.6.0",
+ "psr/log": "^1.0.0",
+ "zendframework/zend-diactoros": "^1.4.0"
+ },
+ "conflict": {
+ "phpunit/phpunit": "<5.7"
},
"replace": {
"cakephp/cache": "self.version",
@@ -204,16 +134,17 @@
"cakephp/validation": "self.version"
},
"require-dev": {
- "cakephp/cakephp-codesniffer": "~2.1",
- "phpunit/phpunit": "<6.0"
+ "cakephp/cakephp-codesniffer": "^3.0",
+ "phpunit/phpunit": "^5.7.14|^6.0"
},
"suggest": {
- "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation."
+ "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.",
+ "lib-ICU": "The intl PHP library, to use Text::transliterate() or Text::slug()"
},
"type": "library",
"autoload": {
"psr-4": {
- "Cake\\": "src"
+ "Cake\\": "src/"
},
"files": [
"src/Core/functions.php",
@@ -233,34 +164,41 @@
}
],
"description": "The CakePHP framework",
- "homepage": "http://cakephp.org",
+ "homepage": "https://cakephp.org",
"keywords": [
- "framework"
+ "conventions over configuration",
+ "dry",
+ "form",
+ "framework",
+ "mvc",
+ "orm",
+ "psr-7",
+ "rapid-development",
+ "validation"
],
- "time": "2017-04-07T02:04:27+00:00"
+ "time": "2019-04-24T02:05:09+00:00"
},
{
"name": "cakephp/chronos",
- "version": "1.2.7",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/cakephp/chronos.git",
- "reference": "c981a911149151d5eceefccf1980f4554fc42619"
+ "reference": "ba2bab98849e7bf29b02dd634ada49ab36472959"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/cakephp/chronos/zipball/c981a911149151d5eceefccf1980f4554fc42619",
- "reference": "c981a911149151d5eceefccf1980f4554fc42619",
+ "url": "https://api.github.com/repos/cakephp/chronos/zipball/ba2bab98849e7bf29b02dd634ada49ab36472959",
+ "reference": "ba2bab98849e7bf29b02dd634ada49ab36472959",
"shasum": ""
},
"require": {
- "php": "^5.5.9|^7"
+ "php": ">=5.6"
},
"require-dev": {
"athletic/athletic": "~0.1",
"cakephp/cakephp-codesniffer": "^3.0",
"phpbench/phpbench": "@dev",
- "phpstan/phpstan": "^0.6.4",
"phpunit/phpunit": "<6.0 || ^7.0"
},
"type": "library",
@@ -294,7 +232,7 @@
"datetime",
"time"
],
- "time": "2019-06-06T07:08:18+00:00"
+ "time": "2019-11-30T02:33:19+00:00"
},
{
"name": "cakephp/localized",
@@ -1336,16 +1274,16 @@
},
{
"name": "psr/log",
- "version": "1.1.0",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
+ "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
- "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
+ "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
"shasum": ""
},
"require": {
@@ -1354,7 +1292,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.1.x-dev"
}
},
"autoload": {
@@ -1379,7 +1317,7 @@
"psr",
"psr-3"
],
- "time": "2018-11-20T15:27:04+00:00"
+ "time": "2019-11-01T11:05:21+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -1950,16 +1888,16 @@
},
{
"name": "zendframework/zend-diactoros",
- "version": "1.8.6",
+ "version": "1.8.7",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "20da13beba0dde8fb648be3cc19765732790f46e"
+ "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e",
- "reference": "20da13beba0dde8fb648be3cc19765732790f46e",
+ "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
+ "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
"shasum": ""
},
"require": {
@@ -1979,9 +1917,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.8.x-dev",
- "dev-develop": "1.9.x-dev",
- "dev-release-2.0": "2.0.x-dev"
+ "dev-release-1.8": "1.8.x-dev"
}
},
"autoload": {
@@ -2010,7 +1946,8 @@
"psr",
"psr-7"
],
- "time": "2018-09-05T19:29:37+00:00"
+ "abandoned": "laminas/laminas-diactoros",
+ "time": "2019-08-06T17:53:53+00:00"
}
],
"packages-dev": [