From ce5bd2ed54b252f06055c04669afbe6aa63b16fa Mon Sep 17 00:00:00 2001 From: llaakkkk Date: Sat, 18 Nov 2017 14:57:23 +0200 Subject: [PATCH 1/3] add Symfony 4 support because there is problem in other bundles which use this one --- .travis.yml | 1 + composer.json | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 566e0af..6754fd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ language: php php: - '5.6' - '7.0' + - '7.1' cache: directories: diff --git a/composer.json b/composer.json index a3b69ee..9cd59c6 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": ">=5.6", - "symfony/framework-bundle": "^2.8|^3", + "symfony/framework-bundle": "^2.8|^3|^4.0", "enqueue/enqueue": "^0.8@dev", "enqueue/null": "^0.8@dev", "enqueue/async-event-dispatcher": "^0.8@dev" @@ -27,9 +27,9 @@ "enqueue/gps": "^0.8@dev", "enqueue/test": "^0.8@dev", "doctrine/doctrine-bundle": "~1.2", - "symfony/monolog-bundle": "^2.8|^3", - "symfony/browser-kit": "^2.8|^3", - "symfony/expression-language": "^2.8|^3" + "symfony/monolog-bundle": "^2.8|^3|^4.0", + "symfony/browser-kit": "^2.8|^3|^4.0", + "symfony/expression-language": "^2.8|^3|^4.0" }, "autoload": { "psr-4": { "Enqueue\\Bundle\\": "" }, From ce7e188300bfd850be85bf02d386b17cb0cc3837 Mon Sep 17 00:00:00 2001 From: llaakkkk Date: Sat, 18 Nov 2017 15:27:44 +0200 Subject: [PATCH 2/3] add changes to .travis.yml for test Symfony 4 beta version --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6754fd6..70ba6c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,19 @@ php: - '7.0' - '7.1' +matrix: + fast_finish: true + include: + - php: 7.1 + env: DEPENDENCIES=beta + cache: directories: - $HOME/.composer/cache +before_install: + - if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi; + install: - php Tests/fix_composer_json.php - composer self-update From c923591defc669d3cac6f2ce3bf5255ce7f60541 Mon Sep 17 00:00:00 2001 From: llaakkkk Date: Sat, 18 Nov 2017 15:52:56 +0200 Subject: [PATCH 3/3] add new reset method from Symfony 4 to MessageQueueCollector --- Profiler/MessageQueueCollector.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Profiler/MessageQueueCollector.php b/Profiler/MessageQueueCollector.php index b3e2b5f..86bdd74 100644 --- a/Profiler/MessageQueueCollector.php +++ b/Profiler/MessageQueueCollector.php @@ -82,4 +82,12 @@ public function getName() { return 'enqueue.message_queue'; } + + /** + * {@inheritdoc} + */ + public function reset() + { + $this->data = []; + } }