From 4a81a66990f541a96e90e5d239de83be410b5414 Mon Sep 17 00:00:00 2001 From: TekkCraft Date: Thu, 7 Feb 2019 15:22:04 +0100 Subject: [PATCH 1/8] Increase version dependency from CakePHP to 3.7 Refers to #17 --- composer.json | 2 +- composer.lock | 63 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 6625d0a..3fdd889 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ }, "require": { "php": ">=7.0.0", - "cakephp/cakephp": "^3.6" + "cakephp/cakephp": "^3.7" }, "require-dev": { "phpunit/phpunit": "^5.7|^6.5", diff --git a/composer.lock b/composer.lock index 4303f44..9b1b98a 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": "9435e11e5c28bd20d18646bc0c6e0a0c", + "content-hash": "976d4a0e634329be62b877a1bbf7c799", "packages": [ { "name": "aura/intl", @@ -54,16 +54,16 @@ }, { "name": "cakephp/cakephp", - "version": "3.6.11", + "version": "3.7.3", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d" + "reference": "b0b9a3713720b30cd8e90c8b1a317a8294b2513a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d", - "reference": "ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/b0b9a3713720b30cd8e90c8b1a317a8294b2513a", + "reference": "b0b9a3713720b30cd8e90c8b1a317a8294b2513a", "shasum": "" }, "require": { @@ -73,6 +73,7 @@ "ext-mbstring": "*", "php": ">=5.6.0", "psr/log": "^1.0.0", + "psr/simple-cache": "^1.0.0", "zendframework/zend-diactoros": "^1.4.0" }, "conflict": { @@ -95,9 +96,11 @@ }, "require-dev": { "cakephp/cakephp-codesniffer": "^3.0", + "cakephp/chronos": "^1.2.1", "phpunit/phpunit": "^5.7.14|^6.0" }, "suggest": { + "ext-curl": "To enable more efficient network calls in Http\\Client.", "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()" }, @@ -136,7 +139,7 @@ "rapid-development", "validation" ], - "time": "2018-09-03T01:33:56+00:00" + "time": "2019-01-22T03:01:08+00:00" }, { "name": "cakephp/chronos", @@ -292,6 +295,54 @@ ], "time": "2016-10-10T12:19:37+00:00" }, + { + "name": "psr/simple-cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-10-23T01:57:42+00:00" + }, { "name": "zendframework/zend-diactoros", "version": "1.8.5", From ed7ae287497210705b6834752e3350c7e2a82f7b Mon Sep 17 00:00:00 2001 From: TekkCraft Date: Thu, 7 Feb 2019 15:28:17 +0100 Subject: [PATCH 2/8] Do not load Migrations plugin Depends on https://github.com/cakephp/migrations/pull/384 Refers to #17 --- src/Heartbeat/Sensor/DBUpToDate.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Heartbeat/Sensor/DBUpToDate.php b/src/Heartbeat/Sensor/DBUpToDate.php index 463d00c..1f29381 100644 --- a/src/Heartbeat/Sensor/DBUpToDate.php +++ b/src/Heartbeat/Sensor/DBUpToDate.php @@ -2,14 +2,14 @@ namespace OrcaServices\Heartbeat\Heartbeat\Sensor; -use Cake\Core\Plugin; use Migrations\Migrations; use OrcaServices\Heartbeat\Heartbeat\Sensor; /** * DB Up to Date Sensor * - * This sensor depends on the CakePHP Migrations plugin + * This sensor depends on the CakePHP Migrations plugin. + * Make sure the plugin is loaded before calling this sensor. * * @link https://github.com/cakephp/migrations/ */ @@ -25,10 +25,6 @@ class DBUpToDate extends Sensor */ protected function _getStatus() { - if (!Plugin::loaded('Migrations')) { - Plugin::load('Migrations'); - } - $dbMigrated = true; try { $migrations = new Migrations(); From 8b42bceb2a35dceeb8f1c36f58a413c0a62f3e52 Mon Sep 17 00:00:00 2001 From: TekkCraft Date: Thu, 7 Feb 2019 15:22:04 +0100 Subject: [PATCH 3/8] Increase version dependency from CakePHP to 3.7 Refers to #17 --- composer.json | 2 +- composer.lock | 63 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 6625d0a..3fdd889 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ }, "require": { "php": ">=7.0.0", - "cakephp/cakephp": "^3.6" + "cakephp/cakephp": "^3.7" }, "require-dev": { "phpunit/phpunit": "^5.7|^6.5", diff --git a/composer.lock b/composer.lock index 4303f44..9b1b98a 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": "9435e11e5c28bd20d18646bc0c6e0a0c", + "content-hash": "976d4a0e634329be62b877a1bbf7c799", "packages": [ { "name": "aura/intl", @@ -54,16 +54,16 @@ }, { "name": "cakephp/cakephp", - "version": "3.6.11", + "version": "3.7.3", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d" + "reference": "b0b9a3713720b30cd8e90c8b1a317a8294b2513a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d", - "reference": "ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/b0b9a3713720b30cd8e90c8b1a317a8294b2513a", + "reference": "b0b9a3713720b30cd8e90c8b1a317a8294b2513a", "shasum": "" }, "require": { @@ -73,6 +73,7 @@ "ext-mbstring": "*", "php": ">=5.6.0", "psr/log": "^1.0.0", + "psr/simple-cache": "^1.0.0", "zendframework/zend-diactoros": "^1.4.0" }, "conflict": { @@ -95,9 +96,11 @@ }, "require-dev": { "cakephp/cakephp-codesniffer": "^3.0", + "cakephp/chronos": "^1.2.1", "phpunit/phpunit": "^5.7.14|^6.0" }, "suggest": { + "ext-curl": "To enable more efficient network calls in Http\\Client.", "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()" }, @@ -136,7 +139,7 @@ "rapid-development", "validation" ], - "time": "2018-09-03T01:33:56+00:00" + "time": "2019-01-22T03:01:08+00:00" }, { "name": "cakephp/chronos", @@ -292,6 +295,54 @@ ], "time": "2016-10-10T12:19:37+00:00" }, + { + "name": "psr/simple-cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-10-23T01:57:42+00:00" + }, { "name": "zendframework/zend-diactoros", "version": "1.8.5", From 6af36f52f62d5be60230198151e52ccd77eb2d82 Mon Sep 17 00:00:00 2001 From: TekkCraft Date: Thu, 7 Feb 2019 15:28:17 +0100 Subject: [PATCH 4/8] Do not load Migrations plugin Depends on https://github.com/cakephp/migrations/pull/384 Refers to #17 --- src/Heartbeat/Sensor/DBUpToDate.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Heartbeat/Sensor/DBUpToDate.php b/src/Heartbeat/Sensor/DBUpToDate.php index 463d00c..1f29381 100644 --- a/src/Heartbeat/Sensor/DBUpToDate.php +++ b/src/Heartbeat/Sensor/DBUpToDate.php @@ -2,14 +2,14 @@ namespace OrcaServices\Heartbeat\Heartbeat\Sensor; -use Cake\Core\Plugin; use Migrations\Migrations; use OrcaServices\Heartbeat\Heartbeat\Sensor; /** * DB Up to Date Sensor * - * This sensor depends on the CakePHP Migrations plugin + * This sensor depends on the CakePHP Migrations plugin. + * Make sure the plugin is loaded before calling this sensor. * * @link https://github.com/cakephp/migrations/ */ @@ -25,10 +25,6 @@ class DBUpToDate extends Sensor */ protected function _getStatus() { - if (!Plugin::loaded('Migrations')) { - Plugin::load('Migrations'); - } - $dbMigrated = true; try { $migrations = new Migrations(); From 4e90ba1938e95c287345cc62d62c7b92b2c22ae3 Mon Sep 17 00:00:00 2001 From: TekkCraft Date: Thu, 7 Feb 2019 16:33:16 +0100 Subject: [PATCH 5/8] Improve documentation for DB Up to date sensor Refers to #17 --- docs/Sensors.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/Sensors.md b/docs/Sensors.md index 04cfb6a..0457c6b 100644 --- a/docs/Sensors.md +++ b/docs/Sensors.md @@ -7,6 +7,8 @@ Checks whether a connection to the database server can be established. #### DB Up to date Uses the Migrations Plugin to check whether all migrations have been run. +This sensor requires you to either load the cakephp/migrations plugin before the sensor is called or to use cakephp/migrations:^2.2 once released. + #### Debug Mode Outputs the configuration for the debug mode. From 16990295ec30c2dfd2979029ce3d11d0d806d521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Pfoster?= Date: Thu, 9 May 2019 11:07:22 +0200 Subject: [PATCH 6/8] Fixed Sensor cache reading --- src/Heartbeat/Sensor.php | 12 +++++++----- tests/TestCase/Heartbeat/SensorTest.php | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Heartbeat/Sensor.php b/src/Heartbeat/Sensor.php index 5ced42a..38eddb6 100644 --- a/src/Heartbeat/Sensor.php +++ b/src/Heartbeat/Sensor.php @@ -2,11 +2,11 @@ namespace OrcaServices\Heartbeat\Heartbeat; +use Cake\Cache\Cache; use Cake\Chronos\Chronos; use Cake\Utility\Text; use OrcaServices\Heartbeat\Heartbeat\Sensor\Config; use OrcaServices\Heartbeat\Heartbeat\Sensor\Status; -use Cake\Cache\Cache; /** * A Heartbeat Sensor @@ -68,8 +68,8 @@ protected function _getCachedStatus() } $settings = array_merge( - Cache::getConfig('default'), - ['duration' => $duration] + (array)Cache::getConfig('default'), + ['duration' => $duration, 'className' => 'File'] ); $heartbeatConfig = Cache::getConfig('heartbeat'); @@ -78,7 +78,10 @@ protected function _getCachedStatus() } if ($cached === false) { - Cache::delete($cacheKey, 'heartbeat'); + $cached = Cache::read($cacheKey, 'heartbeat'); + if (!empty($cached)) { + Cache::delete($cacheKey, 'heartbeat'); + } return false; } @@ -121,5 +124,4 @@ protected function _getNonCachedStatus(): Status * @return mixed The sensor status. */ abstract protected function _getStatus(); - } diff --git a/tests/TestCase/Heartbeat/SensorTest.php b/tests/TestCase/Heartbeat/SensorTest.php index 76ab722..7ceef20 100644 --- a/tests/TestCase/Heartbeat/SensorTest.php +++ b/tests/TestCase/Heartbeat/SensorTest.php @@ -54,7 +54,7 @@ public function testConstructor() */ public function testGetStatus() { - $this->markTestIncomplete('TODO: Fix this test. Something about cache seems broken.'); + //$this->markTestIncomplete('TODO: Fix this test. Something about cache seems broken.'); Chronos::setTestNow('2017-03-30 12:45:37'); $sensorName = 'Dummy Sensor'; From 07bc9d97ea0509075c655e95cf2ea8187d24446d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Pfoster?= Date: Thu, 9 May 2019 12:02:31 +0200 Subject: [PATCH 7/8] Dependency updates - doctrine/instantiator updated from 1.1.0 to 1.2.0 See changes: https://github.com/doctrine/instantiator/compare/1.1.0...1.2.0 Release notes: https://github.com/doctrine/instantiator/releases/tag/1.2.0 - theseer/tokenizer updated from 1.1.0 to 1.1.2 See changes: https://github.com/theseer/tokenizer/compare/1.1.0...1.1.2 Release notes: https://github.com/theseer/tokenizer/releases/tag/1.1.2 - symfony/polyfill-ctype updated from v1.9.0 to v1.11.0 See changes: https://github.com/symfony/polyfill-ctype/compare/v1.9.0...v1.11.0 Release notes: https://github.com/symfony/polyfill-ctype/releases/tag/v1.11.0 - webmozart/assert updated from 1.3.0 to 1.4.0 See changes: https://github.com/webmozart/assert/compare/1.3.0...1.4.0 Release notes: https://github.com/webmozart/assert/releases/tag/1.4.0 - phpdocumentor/reflection-docblock updated from 4.3.0 to 4.3.1 See changes: https://github.com/phpDocumentor/ReflectionDocBlock/compare/4.3.0...4.3.1 Release notes: https://github.com/phpDocumentor/ReflectionDocBlock/releases/tag/4.3.1 - myclabs/deep-copy updated from 1.8.1 to 1.9.1 See changes: https://github.com/myclabs/DeepCopy/compare/1.8.1...1.9.1 Release notes: https://github.com/myclabs/DeepCopy/releases/tag/1.9.1 - phpunit/phpunit updated from 6.5.12 to 6.5.14 See changes: https://github.com/sebastianbergmann/phpunit/compare/6.5.12...6.5.14 Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/6.5.14 - zendframework/zend-diactoros updated from 1.8.5 to 1.8.6 See changes: https://github.com/zendframework/zend-diactoros/compare/1.8.5...1.8.6 Release notes: https://github.com/zendframework/zend-diactoros/releases/tag/1.8.6 - psr/log updated from 1.0.2 to 1.1.0 See changes: https://github.com/php-fig/log/compare/1.0.2...1.1.0 Release notes: https://github.com/php-fig/log/releases/tag/1.1.0 - cakephp/chronos updated from 1.2.2 to 1.2.5 See changes: https://github.com/cakephp/chronos/compare/1.2.2...1.2.5 Release notes: https://github.com/cakephp/chronos/releases/tag/1.2.5 - cakephp/cakephp updated from 3.7.3 to 3.7.7 See changes: https://github.com/cakephp/cakephp/compare/3.7.3...3.7.7 Release notes: https://github.com/cakephp/cakephp/releases/tag/3.7.7 - symfony/yaml downgraded from v4.1.4 to v3.4.27 See changes: https://github.com/symfony/yaml/compare/v4.1.4...v3.4.27 Release notes: https://github.com/symfony/yaml/releases/tag/v3.4.27 - symfony/polyfill-mbstring updated from v1.9.0 to v1.11.0 See changes: https://github.com/symfony/polyfill-mbstring/compare/v1.9.0...v1.11.0 Release notes: https://github.com/symfony/polyfill-mbstring/releases/tag/v1.11.0 - symfony/debug installed in version v3.4.27 Release notes: https://github.com/symfony/debug/releases/tag/v3.4.27 - symfony/console downgraded from v4.1.4 to v3.4.27 See changes: https://github.com/symfony/console/compare/v4.1.4...v3.4.27 Release notes: https://github.com/symfony/console/releases/tag/v3.4.27 - symfony/filesystem downgraded from v4.1.4 to v3.4.27 See changes: https://github.com/symfony/filesystem/compare/v4.1.4...v3.4.27 Release notes: https://github.com/symfony/filesystem/releases/tag/v3.4.27 - symfony/config downgraded from v4.1.4 to v3.4.27 See changes: https://github.com/symfony/config/compare/v4.1.4...v3.4.27 Release notes: https://github.com/symfony/config/releases/tag/v3.4.27 - robmorgan/phinx updated from 0.10.6 to 0.10.7 See changes: https://github.com/cakephp/phinx/compare/0.10.6...0.10.7 Release notes: https://github.com/cakephp/phinx/releases/tag/0.10.7 - cakephp/migrations updated from 2.0.0 to 2.1.1 See changes: https://github.com/cakephp/migrations/compare/2.0.0...2.1.1 Release notes: https://github.com/cakephp/migrations/releases/tag/2.1.1 --- CHANGELOG.md | 19 ++++ composer.lock | 297 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 200 insertions(+), 116 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2dfb2d..ca8d802 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,25 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Added documentation about built-in sensors ### Changed +- doctrine/instantiator updated from 1.1.0 to 1.2.0 +- theseer/tokenizer updated from 1.1.0 to 1.1.2 +- symfony/polyfill-ctype updated from v1.9.0 to v1.11.0 +- webmozart/assert updated from 1.3.0 to 1.4.0 +- phpdocumentor/reflection-docblock updated from 4.3.0 to 4.3.1 +- myclabs/deep-copy updated from 1.8.1 to 1.9.1 +- phpunit/phpunit updated from 6.5.12 to 6.5.14 +- zendframework/zend-diactoros updated from 1.8.5 to 1.8.6 +- psr/log updated from 1.0.2 to 1.1.0 +- cakephp/chronos updated from 1.2.2 to 1.2.5 +- cakephp/cakephp updated from 3.7.3 to 3.7.7 +- symfony/yaml downgraded from v4.1.4 to v3.4.27 +- symfony/polyfill-mbstring updated from v1.9.0 to v1.11.0 +- symfony/debug installed in version v3.4.27 +- symfony/console downgraded from v4.1.4 to v3.4.27 +- symfony/filesystem downgraded from v4.1.4 to v3.4.27 +- symfony/config downgraded from v4.1.4 to v3.4.27 +- robmorgan/phinx updated from 0.10.6 to 0.10.7 +- cakephp/migrations updated from 2.0.0 to 2.1.1 ### Fixed - Fixed DB Connection Sensor diff --git a/composer.lock b/composer.lock index 9b1b98a..4cbdf64 100644 --- a/composer.lock +++ b/composer.lock @@ -54,16 +54,16 @@ }, { "name": "cakephp/cakephp", - "version": "3.7.3", + "version": "3.7.7", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "b0b9a3713720b30cd8e90c8b1a317a8294b2513a" + "reference": "b0aeff37f78e6cca7ed35bc0e49dedd6cf5fb3d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/b0b9a3713720b30cd8e90c8b1a317a8294b2513a", - "reference": "b0b9a3713720b30cd8e90c8b1a317a8294b2513a", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/b0aeff37f78e6cca7ed35bc0e49dedd6cf5fb3d6", + "reference": "b0aeff37f78e6cca7ed35bc0e49dedd6cf5fb3d6", "shasum": "" }, "require": { @@ -139,20 +139,20 @@ "rapid-development", "validation" ], - "time": "2019-01-22T03:01:08+00:00" + "time": "2019-04-24T01:30:19+00:00" }, { "name": "cakephp/chronos", - "version": "1.2.2", + "version": "1.2.5", "source": { "type": "git", "url": "https://github.com/cakephp/chronos.git", - "reference": "30f5b26bcf76a5e53ecc274700ad1ec49dc05567" + "reference": "8a2b005a2db173e1b5493002afb8e1e13c71a62a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/chronos/zipball/30f5b26bcf76a5e53ecc274700ad1ec49dc05567", - "reference": "30f5b26bcf76a5e53ecc274700ad1ec49dc05567", + "url": "https://api.github.com/repos/cakephp/chronos/zipball/8a2b005a2db173e1b5493002afb8e1e13c71a62a", + "reference": "8a2b005a2db173e1b5493002afb8e1e13c71a62a", "shasum": "" }, "require": { @@ -196,7 +196,7 @@ "datetime", "time" ], - "time": "2018-07-11T18:51:56+00:00" + "time": "2019-04-23T19:00:57+00:00" }, { "name": "psr/http-message", @@ -250,16 +250,16 @@ }, { "name": "psr/log", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "shasum": "" }, "require": { @@ -293,7 +293,7 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2018-11-20T15:27:04+00:00" }, { "name": "psr/simple-cache", @@ -345,16 +345,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.8.5", + "version": "1.8.6", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87" + "reference": "20da13beba0dde8fb648be3cc19765732790f46e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/3e4edb822c942f37ade0d09579cfbab11e2fee87", - "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e", + "reference": "20da13beba0dde8fb648be3cc19765732790f46e", "shasum": "" }, "require": { @@ -367,6 +367,7 @@ "require-dev": { "ext-dom": "*", "ext-libxml": "*", + "php-http/psr7-integration-tests": "dev-master", "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7", "zendframework/zend-coding-standard": "~1.0" }, @@ -404,22 +405,22 @@ "psr", "psr-7" ], - "time": "2018-08-10T14:16:32+00:00" + "time": "2018-09-05T19:29:37+00:00" } ], "packages-dev": [ { "name": "cakephp/migrations", - "version": "2.0.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/cakephp/migrations.git", - "reference": "928389e10edd16bae834f4d56336e1e66deb525a" + "reference": "96e3cc00ede11f28bb8bcefcab95f07c487177cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/migrations/zipball/928389e10edd16bae834f4d56336e1e66deb525a", - "reference": "928389e10edd16bae834f4d56336e1e66deb525a", + "url": "https://api.github.com/repos/cakephp/migrations/zipball/96e3cc00ede11f28bb8bcefcab95f07c487177cf", + "reference": "96e3cc00ede11f28bb8bcefcab95f07c487177cf", "shasum": "" }, "require": { @@ -459,31 +460,33 @@ "cakephp", "migrations" ], - "time": "2018-06-22T13:22:45+00:00" + "time": "2019-02-07T15:20:33+00:00" }, { "name": "doctrine/instantiator", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" + "reference": "a2c590166b2133a4633738648b6b064edae0814a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", - "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a", + "reference": "a2c590166b2133a4633738648b6b064edae0814a", "shasum": "" }, "require": { "php": "^7.1" }, "require-dev": { - "athletic/athletic": "~0.1.8", + "doctrine/coding-standard": "^6.0", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "^6.2.3", - "squizlabs/php_codesniffer": "^3.0.2" + "phpbench/phpbench": "^0.13", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-shim": "^0.11", + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { @@ -508,25 +511,25 @@ } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", "keywords": [ "constructor", "instantiate" ], - "time": "2017-07-22T11:58:36+00:00" + "time": "2019-03-17T17:37:11+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.8.1", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8" + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", - "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", + "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", "shasum": "" }, "require": { @@ -561,7 +564,7 @@ "object", "object graph" ], - "time": "2018-06-11T23:09:50+00:00" + "time": "2019-04-07T13:18:21+00:00" }, { "name": "phar-io/manifest", @@ -721,16 +724,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.0", + "version": "4.3.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "94fd0001232e47129dd3504189fa1c7225010d08" + "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", - "reference": "94fd0001232e47129dd3504189fa1c7225010d08", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", + "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", "shasum": "" }, "require": { @@ -768,7 +771,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-30T07:14:17+00:00" + "time": "2019-04-30T17:48:53+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -1131,16 +1134,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.5.12", + "version": "6.5.14", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "24da433d7384824d65ea93fbb462e2f31bbb494e" + "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/24da433d7384824d65ea93fbb462e2f31bbb494e", - "reference": "24da433d7384824d65ea93fbb462e2f31bbb494e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7", + "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7", "shasum": "" }, "require": { @@ -1211,7 +1214,7 @@ "testing", "xunit" ], - "time": "2018-08-22T06:32:48+00:00" + "time": "2019-02-01T05:22:47+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -1274,16 +1277,16 @@ }, { "name": "robmorgan/phinx", - "version": "0.10.6", + "version": "0.10.7", "source": { "type": "git", "url": "https://github.com/cakephp/phinx.git", - "reference": "f28a1c6ab1fa1f0295cddade9aea05eeb303bd2b" + "reference": "ba2dae98bb69d39531311e8fd72dd51e8e06ff32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/phinx/zipball/f28a1c6ab1fa1f0295cddade9aea05eeb303bd2b", - "reference": "f28a1c6ab1fa1f0295cddade9aea05eeb303bd2b", + "url": "https://api.github.com/repos/cakephp/phinx/zipball/ba2dae98bb69d39531311e8fd72dd51e8e06ff32", + "reference": "ba2dae98bb69d39531311e8fd72dd51e8e06ff32", "shasum": "" }, "require": { @@ -1296,7 +1299,7 @@ }, "require-dev": { "cakephp/cakephp-codesniffer": "^3.0", - "phpunit/phpunit": ">=5.7", + "phpunit/phpunit": ">=5.7,<7.0", "sebastian/comparator": ">=1.2.3" }, "bin": [ @@ -1344,7 +1347,7 @@ "migrations", "phinx" ], - "time": "2018-08-12T17:22:43+00:00" + "time": "2019-04-25T09:12:16+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -1907,31 +1910,32 @@ }, { "name": "symfony/config", - "version": "v4.1.4", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "76015a3cc372b14d00040ff58e18e29f69eba717" + "reference": "177a276c01575253c95cefe0866e3d1b57637fe0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/76015a3cc372b14d00040ff58e18e29f69eba717", - "reference": "76015a3cc372b14d00040ff58e18e29f69eba717", + "url": "https://api.github.com/repos/symfony/config/zipball/177a276c01575253c95cefe0866e3d1b57637fe0", + "reference": "177a276c01575253c95cefe0866e3d1b57637fe0", "shasum": "" }, "require": { - "php": "^7.1.3", - "symfony/filesystem": "~3.4|~4.0", + "php": "^5.5.9|>=7.0.8", + "symfony/filesystem": "~2.8|~3.0|~4.0", "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/finder": "<3.4" + "symfony/dependency-injection": "<3.3", + "symfony/finder": "<3.3" }, "require-dev": { - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~3.4|~4.0", - "symfony/finder": "~3.4|~4.0", - "symfony/yaml": "~3.4|~4.0" + "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" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -1939,7 +1943,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1966,40 +1970,44 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-08-08T06:37:38+00:00" + "time": "2019-02-23T15:06:07+00:00" }, { "name": "symfony/console", - "version": "v4.1.4", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f" + "reference": "15a9104356436cb26e08adab97706654799d31d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/ca80b8ced97cf07390078b29773dc384c39eee1f", - "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f", + "url": "https://api.github.com/repos/symfony/console/zipball/15a9104356436cb26e08adab97706654799d31d8", + "reference": "15a9104356436cb26e08adab97706654799d31d8", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": "^5.5.9|>=7.0.8", + "symfony/debug": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { "symfony/dependency-injection": "<3.4", "symfony/process": "<3.3" }, + "provide": { + "psr/log-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", + "symfony/config": "~3.3|~4.0", "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.4|~4.0" + "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log-implementation": "For using the console logger", + "psr/log": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -2007,7 +2015,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2034,30 +2042,86 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2019-04-08T09:29:13+00:00" + }, + { + "name": "symfony/debug", + "version": "v3.4.27", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "681afbb26488903c5ac15e63734f1d8ac430c9b9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/681afbb26488903c5ac15e63734f1d8ac430c9b9", + "reference": "681afbb26488903c5ac15e63734f1d8ac430c9b9", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", + "psr/log": "~1.0" + }, + "conflict": { + "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": "~2.8|~3.0|~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Debug Component", + "homepage": "https://symfony.com", + "time": "2019-04-11T09:48:14+00:00" }, { "name": "symfony/filesystem", - "version": "v4.1.4", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e" + "reference": "acf99758b1df8e9295e6b85aa69f294565c9fedb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", - "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/acf99758b1df8e9295e6b85aa69f294565c9fedb", + "reference": "acf99758b1df8e9295e6b85aa69f294565c9fedb", "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": { @@ -2084,20 +2148,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-08-18T16:52:46+00:00" + "time": "2019-02-04T21:34:32+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.9.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + "reference": "82ebae02209c21113908c229e9883c419720738a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", + "reference": "82ebae02209c21113908c229e9883c419720738a", "shasum": "" }, "require": { @@ -2109,7 +2173,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.11-dev" } }, "autoload": { @@ -2142,20 +2206,20 @@ "polyfill", "portable" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2019-02-06T07:57:58+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.9.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" + "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", + "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", "shasum": "" }, "require": { @@ -2167,7 +2231,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.11-dev" } }, "autoload": { @@ -2201,24 +2265,24 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2019-02-06T07:57:58+00:00" }, { "name": "symfony/yaml", - "version": "v4.1.4", + "version": "v3.4.27", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "b832cc289608b6d305f62149df91529a2ab3c314" + "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/b832cc289608b6d305f62149df91529a2ab3c314", - "reference": "b832cc289608b6d305f62149df91529a2ab3c314", + "url": "https://api.github.com/repos/symfony/yaml/zipball/212a27b731e5bfb735679d1ffaac82bd6a1dc996", + "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": "^5.5.9|>=7.0.8", "symfony/polyfill-ctype": "~1.8" }, "conflict": { @@ -2233,7 +2297,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2260,20 +2324,20 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-08-18T16:52:46+00:00" + "time": "2019-03-25T07:48:46+00:00" }, { "name": "theseer/tokenizer", - "version": "1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b" + "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b", - "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8", + "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8", "shasum": "" }, "require": { @@ -2300,24 +2364,25 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2017-04-07T12:08:54+00:00" + "time": "2019-04-04T09:56:43+00:00" }, { "name": "webmozart/assert", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a" + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a", + "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9", + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "phpunit/phpunit": "^4.6", @@ -2350,7 +2415,7 @@ "check", "validate" ], - "time": "2018-01-29T19:49:41+00:00" + "time": "2018-12-25T11:19:39+00:00" } ], "aliases": [], From eb8b9504a8658755d9f0b385e2595f564947eeda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=BCrth?= Date: Wed, 26 Jun 2019 14:15:33 +0200 Subject: [PATCH 8/8] Remove commented out test code --- tests/TestCase/Heartbeat/SensorTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/TestCase/Heartbeat/SensorTest.php b/tests/TestCase/Heartbeat/SensorTest.php index 7ceef20..72bab19 100644 --- a/tests/TestCase/Heartbeat/SensorTest.php +++ b/tests/TestCase/Heartbeat/SensorTest.php @@ -54,8 +54,6 @@ public function testConstructor() */ public function testGetStatus() { - //$this->markTestIncomplete('TODO: Fix this test. Something about cache seems broken.'); - Chronos::setTestNow('2017-03-30 12:45:37'); $sensorName = 'Dummy Sensor'; $sensorConfig = [