From 97bfbb2cac2d76ecdd868fa58d19b13768f870ab Mon Sep 17 00:00:00 2001 From: jsconan Date: Fri, 21 May 2021 11:07:44 +0200 Subject: [PATCH 1/3] feature: update tao-core to branch hotfix/TR-1207/support-locale-format-datetime-in-utc --- composer.json | 2 +- composer.lock | 29 +++++++++++++++++++---------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 144a7ba0d18..056942fda28 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "homepage": "http://www.taotesting.com", "require": { "oat-sa/generis": "13.10.1", - "oat-sa/tao-core": "46.8.4", + "oat-sa/tao-core": "dev-hotfix/TR-1207/support-locale-format-datetime-in-utc as 46.8.5-dev", "oat-sa/extension-tao-community": "9.1.0", "oat-sa/extension-tao-funcacl": "6.0.1", "oat-sa/extension-tao-dac-simple": "6.8.3", diff --git a/composer.lock b/composer.lock index 6f0b4d2977e..8541943cb26 100644 --- a/composer.lock +++ b/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": "1b64543da77690777750f2cc2d831933", + "content-hash": "4fad6caa9239e516fd019462ca93e322", "packages": [ { "name": "cebe/php-openapi", @@ -4530,16 +4530,16 @@ }, { "name": "oat-sa/tao-core", - "version": "v46.8.4", + "version": "dev-hotfix/TR-1207/support-locale-format-datetime-in-utc", "source": { "type": "git", "url": "https://github.com/oat-sa/tao-core.git", - "reference": "8018f5f6b7345e9906bbae8f26e615d57399937c" + "reference": "32c40cae7ecb35325ef3db9935393214a7aa8612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/oat-sa/tao-core/zipball/8018f5f6b7345e9906bbae8f26e615d57399937c", - "reference": "8018f5f6b7345e9906bbae8f26e615d57399937c", + "url": "https://api.github.com/repos/oat-sa/tao-core/zipball/32c40cae7ecb35325ef3db9935393214a7aa8612", + "reference": "32c40cae7ecb35325ef3db9935393214a7aa8612", "shasum": "" }, "require": { @@ -4632,7 +4632,7 @@ "TAO", "computer-based-assessment" ], - "time": "2020-12-15T13:24:16+00:00" + "time": "2021-05-21T08:41:36+00:00" }, { "name": "ocramius/package-versions", @@ -7205,12 +7205,12 @@ "version": "1.9.1", "source": { "type": "git", - "url": "https://github.com/webmozart/assert.git", + "url": "https://github.com/webmozarts/assert.git", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", "shasum": "" }, @@ -7415,9 +7415,18 @@ } ], "packages-dev": [], - "aliases": [], + "aliases": [ + { + "alias": "46.8.5-dev", + "alias_normalized": "46.8.5.0-dev", + "version": "dev-hotfix/TR-1207/support-locale-format-datetime-in-utc", + "package": "oat-sa/tao-core" + } + ], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "oat-sa/tao-core": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": [], From eea55afe77c0d65e1da6ac26d508fba80d60efeb Mon Sep 17 00:00:00 2001 From: jsconan Date: Fri, 21 May 2021 12:28:49 +0200 Subject: [PATCH 2/3] fix: alias in composer for tao-core --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 056942fda28..6fd1ecae95f 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "homepage": "http://www.taotesting.com", "require": { "oat-sa/generis": "13.10.1", - "oat-sa/tao-core": "dev-hotfix/TR-1207/support-locale-format-datetime-in-utc as 46.8.5-dev", + "oat-sa/tao-core": "dev-hotfix/TR-1207/support-locale-format-datetime-in-utc as 46.8.5", "oat-sa/extension-tao-community": "9.1.0", "oat-sa/extension-tao-funcacl": "6.0.1", "oat-sa/extension-tao-dac-simple": "6.8.3", diff --git a/composer.lock b/composer.lock index 8541943cb26..a8374a6273a 100644 --- a/composer.lock +++ b/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": "4fad6caa9239e516fd019462ca93e322", + "content-hash": "290a896f100fa21331025a1fd991f1e9", "packages": [ { "name": "cebe/php-openapi", @@ -4534,12 +4534,12 @@ "source": { "type": "git", "url": "https://github.com/oat-sa/tao-core.git", - "reference": "32c40cae7ecb35325ef3db9935393214a7aa8612" + "reference": "1868802b3b0c6d0a99e9ec0804c37f6409c5fa10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/oat-sa/tao-core/zipball/32c40cae7ecb35325ef3db9935393214a7aa8612", - "reference": "32c40cae7ecb35325ef3db9935393214a7aa8612", + "url": "https://api.github.com/repos/oat-sa/tao-core/zipball/1868802b3b0c6d0a99e9ec0804c37f6409c5fa10", + "reference": "1868802b3b0c6d0a99e9ec0804c37f6409c5fa10", "shasum": "" }, "require": { @@ -4632,7 +4632,7 @@ "TAO", "computer-based-assessment" ], - "time": "2021-05-21T08:41:36+00:00" + "time": "2021-05-21T09:02:10+00:00" }, { "name": "ocramius/package-versions", @@ -7417,8 +7417,8 @@ "packages-dev": [], "aliases": [ { - "alias": "46.8.5-dev", - "alias_normalized": "46.8.5.0-dev", + "alias": "46.8.5", + "alias_normalized": "46.8.5.0", "version": "dev-hotfix/TR-1207/support-locale-format-datetime-in-utc", "package": "oat-sa/tao-core" } From 716f449de2783560c27816a38409d29df7b78bad Mon Sep 17 00:00:00 2001 From: jsconan Date: Thu, 3 Jun 2021 14:49:41 +0200 Subject: [PATCH 3/3] feat: update tao-core version 46.8.5 --- composer.json | 2 +- composer.lock | 25 ++++++++----------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 6fd1ecae95f..59860111ad5 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "homepage": "http://www.taotesting.com", "require": { "oat-sa/generis": "13.10.1", - "oat-sa/tao-core": "dev-hotfix/TR-1207/support-locale-format-datetime-in-utc as 46.8.5", + "oat-sa/tao-core": "46.8.5", "oat-sa/extension-tao-community": "9.1.0", "oat-sa/extension-tao-funcacl": "6.0.1", "oat-sa/extension-tao-dac-simple": "6.8.3", diff --git a/composer.lock b/composer.lock index a8374a6273a..ce63a1894f9 100644 --- a/composer.lock +++ b/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": "290a896f100fa21331025a1fd991f1e9", + "content-hash": "22573fcb9216a78a3f20cc1c69a17648", "packages": [ { "name": "cebe/php-openapi", @@ -4530,16 +4530,16 @@ }, { "name": "oat-sa/tao-core", - "version": "dev-hotfix/TR-1207/support-locale-format-datetime-in-utc", + "version": "v46.8.5", "source": { "type": "git", "url": "https://github.com/oat-sa/tao-core.git", - "reference": "1868802b3b0c6d0a99e9ec0804c37f6409c5fa10" + "reference": "a405c25e01eff4c112b31a266be9e2301cf3daf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/oat-sa/tao-core/zipball/1868802b3b0c6d0a99e9ec0804c37f6409c5fa10", - "reference": "1868802b3b0c6d0a99e9ec0804c37f6409c5fa10", + "url": "https://api.github.com/repos/oat-sa/tao-core/zipball/a405c25e01eff4c112b31a266be9e2301cf3daf8", + "reference": "a405c25e01eff4c112b31a266be9e2301cf3daf8", "shasum": "" }, "require": { @@ -4632,7 +4632,7 @@ "TAO", "computer-based-assessment" ], - "time": "2021-05-21T09:02:10+00:00" + "time": "2021-06-03T11:49:50+00:00" }, { "name": "ocramius/package-versions", @@ -7415,18 +7415,9 @@ } ], "packages-dev": [], - "aliases": [ - { - "alias": "46.8.5", - "alias_normalized": "46.8.5.0", - "version": "dev-hotfix/TR-1207/support-locale-format-datetime-in-utc", - "package": "oat-sa/tao-core" - } - ], + "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "oat-sa/tao-core": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [],