From 36b231ac3053407194751b748c2ba73e53bfe108 Mon Sep 17 00:00:00 2001 From: Ruslan Baidan Date: Fri, 27 Nov 2020 14:02:35 +0100 Subject: [PATCH] Updated the frontoffice version and collect stats scripts. --- composer.lock | 65 +++++++++++++----------- scripts/collect-stats-for-all-clients.sh | 4 +- 2 files changed, 38 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index f5344ac..5d8df55 100644 --- a/composer.lock +++ b/composer.lock @@ -4497,12 +4497,12 @@ "source": { "type": "git", "url": "https://github.com/monarc-project/zm-client.git", - "reference": "0c234248f3ccd535ed5c43150e459715ff39e505" + "reference": "60367dd7a8f7af65f630bee4775d2002cf90aa75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/0c234248f3ccd535ed5c43150e459715ff39e505", - "reference": "0c234248f3ccd535ed5c43150e459715ff39e505", + "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/60367dd7a8f7af65f630bee4775d2002cf90aa75", + "reference": "60367dd7a8f7af65f630bee4775d2002cf90aa75", "shasum": "" }, "require": { @@ -4581,7 +4581,7 @@ "issues": "https://github.com/monarc-project/zm-client/issues", "source": "https://github.com/monarc-project/zm-client/tree/v2.9.20" }, - "time": "2020-11-18T10:28:25+00:00" + "time": "2020-11-26T22:59:49+00:00" }, { "name": "monarc/phpword", @@ -7299,16 +7299,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "7.0.10", + "version": "7.0.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf" + "reference": "52f55786aa2e52c26cd9e2db20aff2981e0f7399" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f1884187926fbb755a9aaf0b3836ad3165b478bf", - "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/52f55786aa2e52c26cd9e2db20aff2981e0f7399", + "reference": "52f55786aa2e52c26cd9e2db20aff2981e0f7399", "shasum": "" }, "require": { @@ -7360,9 +7360,15 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.10" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.12" }, - "time": "2019-11-20T13:55:58+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-27T06:08:35+00:00" }, { "name": "phpunit/php-file-iterator", @@ -7572,16 +7578,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.9", + "version": "8.5.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6" + "reference": "3123601e3b29339b20129acc3f989cfec3274566" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6", - "reference": "f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3123601e3b29339b20129acc3f989cfec3274566", + "reference": "3123601e3b29339b20129acc3f989cfec3274566", "shasum": "" }, "require": { @@ -7597,7 +7603,7 @@ "phar-io/version": "^2.0.1", "php": "^7.2", "phpspec/prophecy": "^1.10.3", - "phpunit/php-code-coverage": "^7.0.10", + "phpunit/php-code-coverage": "^7.0.12", "phpunit/php-file-iterator": "^2.0.2", "phpunit/php-text-template": "^1.2.1", "phpunit/php-timer": "^2.1.2", @@ -7653,7 +7659,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.9" + "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.11" }, "funding": [ { @@ -7665,7 +7671,7 @@ "type": "github" } ], - "time": "2020-11-10T12:51:38+00:00" + "time": "2020-11-27T12:46:45+00:00" }, { "name": "roave/security-advisories", @@ -7673,12 +7679,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "d005bbc89959d3f2ecfbdf2ea8125198c6f873f5" + "reference": "fa05999280434eacf621cc78ab9179d9394c7998" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/d005bbc89959d3f2ecfbdf2ea8125198c6f873f5", - "reference": "d005bbc89959d3f2ecfbdf2ea8125198c6f873f5", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/fa05999280434eacf621cc78ab9179d9394c7998", + "reference": "fa05999280434eacf621cc78ab9179d9394c7998", "shasum": "" }, "conflict": { @@ -7724,8 +7730,8 @@ "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1", "dolibarr/dolibarr": "<11.0.4", "dompdf/dompdf": ">=0.6,<0.6.2", - "drupal/core": ">=7,<7.73|>=8,<8.8.10|>=8.9,<8.9.6|>=9,<9.0.6", - "drupal/drupal": ">=7,<7.73|>=8,<8.8.10|>=8.9,<8.9.6|>=9,<9.0.6", + "drupal/core": ">=7,<7.74|>=8,<8.8.11|>=8.9,<8.9.9|>=9,<9.0.8", + "drupal/drupal": ">=7,<7.74|>=8,<8.8.11|>=8.9,<8.9.9|>=9,<9.0.8", "endroid/qr-code-bundle": "<3.4.2", "enshrined/svg-sanitize": "<0.13.1", "erusev/parsedown": "<1.7.2", @@ -7786,8 +7792,8 @@ "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", "nystudio107/craft-seomatic": "<3.3", "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", - "october/backend": ">=1.0.319,<1.0.467", - "october/cms": ">=1.0.319,<1.0.466", + "october/backend": ">=1.0.319,<1.0.470", + "october/cms": "= 1.0.469|>=1.0.319,<1.0.469", "october/october": ">=1.0.319,<1.0.466", "october/rain": ">=1.0.319,<1.0.468", "onelogin/php-saml": "<2.10.4", @@ -7800,13 +7806,14 @@ "padraic/humbug_get_contents": "<1.1.2", "pagarme/pagarme-php": ">=0,<3", "paragonie/random_compat": "<2", + "passbolt/passbolt_api": "<2.11", "paypal/merchant-sdk-php": "<3.12", - "pear/archive_tar": "<1.4.4", + "pear/archive_tar": "<1.4.11", "personnummer/personnummer": "<3.0.2", "phpfastcache/phpfastcache": ">=5,<5.0.13", "phpmailer/phpmailer": "<6.1.6", "phpmussel/phpmussel": ">=1,<1.6", - "phpmyadmin/phpmyadmin": "<4.9.2", + "phpmyadmin/phpmyadmin": "<4.9.6|>=5,<5.0.3", "phpoffice/phpexcel": "<1.8.2", "phpoffice/phpspreadsheet": "<1.8", "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", @@ -7903,8 +7910,8 @@ "titon/framework": ">=0,<9.9.99", "truckersmp/phpwhois": "<=4.3.1", "twig/twig": "<1.38|>=2,<2.7", - "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.30|>=9,<9.5.20|>=10,<10.4.6", - "typo3/cms-core": ">=8,<8.7.30|>=9,<9.5.20|>=10,<10.4.6", + "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.23|>=10,<10.4.10", + "typo3/cms-core": ">=8,<8.7.38|>=9,<9.5.23|>=10,<10.4.10", "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5", "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4", "typo3/phar-stream-wrapper": ">=1,<2.1.1|>=3,<3.1.1", @@ -7982,7 +7989,7 @@ "type": "tidelift" } ], - "time": "2020-11-19T06:02:10+00:00" + "time": "2020-11-26T07:02:13+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", diff --git a/scripts/collect-stats-for-all-clients.sh b/scripts/collect-stats-for-all-clients.sh index 492dbf4..b12668b 100644 --- a/scripts/collect-stats-for-all-clients.sh +++ b/scripts/collect-stats-for-all-clients.sh @@ -11,9 +11,9 @@ do echo "[$(date)] Collecting stats for client: $config_path." # local use: - #/home/vagrant/monarc/bin/console monarc:collect-stats >> "$config_path"/collect_stats.log + #/home/vagrant/monarc/bin/console monarc:collect-stats >> "$config_path"/data/collect_stats.log - /var/lib/monarc/fo/bin/console monarc:collect-stats >> "$config_path"/collect_stats.log + /var/lib/monarc/fo/bin/console monarc:collect-stats >> "$config_path"/data/collect_stats.log echo "[$(date)] Finished." done