Skip to content

Commit

Permalink
Merge pull request #13 from gdsmith/updated-enqueue
Browse files Browse the repository at this point in the history
Update to enqueue ^0.9
  • Loading branch information
makasim authored Apr 3, 2019
2 parents ba10251 + e0232dc commit 681ed2f
Show file tree
Hide file tree
Showing 18 changed files with 75 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .php_cs.cache
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"php":"7.2.7","version":"2.13.1:v2.13.1#54814c62d5beef3ba55297b9b3186ed8b8a1b161","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"binary_operator_spaces":{"align_double_arrow":false,"align_equals":false},"blank_line_after_opening_tag":true,"blank_line_before_return":true,"cast_spaces":true,"combine_consecutive_unsets":true,"declare_strict_types":true,"function_typehint_space":true,"hash_to_slash_comment":true,"header_comment":{"commentType":"PHPDoc","header":"This file is part of prooph\/psb-enqueue-producer.\n(c) 2017-2018 prooph software GmbH <contact@prooph.de>\n(c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>\n(c) 2017-2018 Formapro <opensource@forma-pro.com>\n\nFor the full copyright and license information, please view the LICENSE\nfile that was distributed with this source code.","location":"after_open","separate":"both"},"include":true,"linebreak_after_opening_tag":true,"method_separation":true,"modernize_types_casting":true,"native_function_casing":true,"native_function_invocation":true,"new_with_braces":true,"no_alias_functions":true,"no_blank_lines_after_class_opening":true,"no_empty_statement":true,"no_extra_consecutive_blank_lines":true,"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_multiline_whitespace_around_double_arrow":true,"no_multiline_whitespace_before_semicolons":true,"no_short_bool_cast":true,"no_short_echo_tag":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unreachable_default_argument_value":true,"no_unused_imports":true,"no_useless_else":true,"no_useless_return":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"not_operator_with_successor_space":true,"object_operator_without_whitespace":true,"ordered_imports":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"psr4":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_quote":true,"standardize_not_equals":true,"strict_comparison":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true},"hashes":{"tests\/EnqueueMessageProcessorTest.php":3815662491,"tests\/Container\/EnqueueMessageProducerFactoryTest.php":782766176,"tests\/Container\/SimpleClientFactoryTest.php":126322988,"tests\/Container\/EnqueueMessageProcessorFactoryTest.php":3095212297,"tests\/Container\/EnqueueSerializerFactoryTest.php":799520594,"tests\/EnqueueMessageProducerTest.php":1209135651,"tests\/EnqueueSerializerTest.php":3701389502,"tests\/Functional\/EnqueueMessageProducerTest.php":3742305548,"src\/EnqueueMessageProcessor.php":2204242335,"src\/Container\/EnqueueMessageProcessorFactory.php":1085689222,"src\/Container\/SimpleClientFactory.php":1732585029,"src\/Container\/EnqueueMessageProducerFactory.php":2781803735,"src\/Container\/EnqueueSerializerFactory.php":1499720732,"src\/DelayedMessage.php":3076412878,"src\/EnqueueMessageProducer.php":2706937046,"src\/EnqueueSerializer.php":467468541}}
{"php":"7.2.13","version":"2.14.2:v2.14.2#ff401e58261ffc5934a58f795b3f95b355e276cb","rules":{"blank_line_after_namespace":true,"braces":true,"class_definition":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_constants":true,"lowercase_keywords":true,"method_argument_space":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":true,"single_import_per_statement":true,"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"binary_operator_spaces":{"align_double_arrow":false,"align_equals":false},"blank_line_after_opening_tag":true,"blank_line_before_return":true,"cast_spaces":true,"combine_consecutive_unsets":true,"declare_strict_types":true,"function_typehint_space":true,"hash_to_slash_comment":true,"header_comment":{"commentType":"PHPDoc","header":"This file is part of prooph\/psb-enqueue-producer.\n(c) 2017-2019 prooph software GmbH <contact@prooph.de>\n(c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>\n(c) 2017-2019 Formapro <opensource@forma-pro.com>\n\nFor the full copyright and license information, please view the LICENSE\nfile that was distributed with this source code.","location":"after_open","separate":"both"},"include":true,"linebreak_after_opening_tag":true,"method_separation":true,"modernize_types_casting":true,"native_function_casing":true,"native_function_invocation":true,"new_with_braces":true,"no_alias_functions":true,"no_blank_lines_after_class_opening":true,"no_empty_statement":true,"no_extra_consecutive_blank_lines":true,"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_multiline_whitespace_around_double_arrow":true,"no_multiline_whitespace_before_semicolons":true,"no_short_bool_cast":true,"no_short_echo_tag":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unreachable_default_argument_value":true,"no_unused_imports":true,"no_useless_else":true,"no_useless_return":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"not_operator_with_successor_space":true,"object_operator_without_whitespace":true,"ordered_imports":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"psr4":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_quote":true,"standardize_not_equals":true,"strict_comparison":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true},"hashes":{"tests\/Container\/SimpleClientFactoryTest.php":3266788591,"tests\/Container\/EnqueueMessageProducerFactoryTest.php":827777560,"tests\/Container\/EnqueueSerializerFactoryTest.php":124930093,"tests\/Container\/EnqueueMessageProcessorFactoryTest.php":2154445455,"tests\/EnqueueMessageProducerTest.php":2907365961,"tests\/Functional\/EnqueueMessageProducerTest.php":3993810552,"tests\/EnqueueSerializerTest.php":2890420046,"tests\/EnqueueMessageProcessorTest.php":2056475553,"src\/EnqueueMessageProducer.php":1615870662,"src\/EnqueueMessageProcessor.php":3750928404,"src\/Container\/EnqueueMessageProcessorFactory.php":112754104,"src\/Container\/EnqueueMessageProducerFactory.php":1559467916,"src\/Container\/EnqueueSerializerFactory.php":2517922701,"src\/Container\/SimpleClientFactory.php":577065568,"src\/DelayedMessage.php":2426004538,"src\/EnqueueSerializer.php":3455235056}}
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@
],
"require": {
"php": "^7.1",
"enqueue/enqueue": "^0.7|^0.8",
"enqueue/enqueue": "^0.9",
"prooph/common" : "^4.1",
"prooph/service-bus" : "^6.0",
"queue-interop/queue-interop": "^0.6.1"
"queue-interop/queue-interop": "^0.8"
},
"require-dev": {
"react/promise": "^2.4.1",
"enqueue/simple-client": "^0.7|^0.8",
"enqueue/simple-client": "^0.9.3",
"symfony/filesystem": "^2.1|^3",
"enqueue/fs": "^0.7|^0.8",
"enqueue/null": "^0.7|^0.8",
"enqueue/fs": "^0.9",
"enqueue/null": "^0.9",
"psr/container": "^1.0",
"sandrokeil/interop-config": "^2.0.1",
"phpspec/prophecy": "^1.7",
"prooph/php-cs-fixer-config": "^0.3",
"phpunit/phpunit": "^6.0",
"enqueue/amqp-tools": "^0.7|^0.8"
"enqueue/amqp-tools": "^0.9"
},
"suggest" : {
"psr/container": "^1.0 for usage of provided factories",
Expand Down
6 changes: 3 additions & 3 deletions src/Container/EnqueueMessageProcessorFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
6 changes: 3 additions & 3 deletions src/Container/EnqueueMessageProducerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
6 changes: 3 additions & 3 deletions src/Container/EnqueueSerializerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
6 changes: 3 additions & 3 deletions src/Container/SimpleClientFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
6 changes: 3 additions & 3 deletions src/DelayedMessage.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
14 changes: 7 additions & 7 deletions src/EnqueueMessageProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -16,9 +16,9 @@

use Enqueue\Consumption\Result;
use Enqueue\Util\JSON;
use Interop\Queue\PsrContext;
use Interop\Queue\PsrMessage;
use Interop\Queue\PsrProcessor;
use Interop\Queue\Context as PsrContext;
use Interop\Queue\Message as PsrMessage;
use Interop\Queue\Processor as PsrProcessor;
use Prooph\Common\Messaging\Message;
use Prooph\ServiceBus\CommandBus;
use Prooph\ServiceBus\EventBus;
Expand Down Expand Up @@ -73,7 +73,7 @@ public function process(PsrMessage $psrMessage, PsrContext $psrContext): Result
case Message::TYPE_QUERY:
$promise = $this->queryBus->dispatch($message);

$body = null;
$body = '';
$promise->then(function ($value) use (&$body) {
$body = JSON::encode($value);
});
Expand Down
6 changes: 3 additions & 3 deletions src/EnqueueMessageProducer.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
6 changes: 3 additions & 3 deletions src/EnqueueSerializer.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
6 changes: 3 additions & 3 deletions tests/Container/EnqueueMessageProcessorFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
6 changes: 3 additions & 3 deletions tests/Container/EnqueueMessageProducerFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
6 changes: 3 additions & 3 deletions tests/Container/EnqueueSerializerFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
6 changes: 3 additions & 3 deletions tests/Container/SimpleClientFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
10 changes: 5 additions & 5 deletions tests/EnqueueMessageProcessorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -17,8 +17,8 @@
use Enqueue\Consumption\Result;
use Enqueue\Null\NullContext;
use Enqueue\Null\NullMessage;
use Interop\Queue\PsrMessage;
use Interop\Queue\PsrProcessor;
use Interop\Queue\Message as PsrMessage;
use Interop\Queue\Processor as PsrProcessor;
use PHPUnit\Framework\TestCase;
use Prooph\Common\Messaging\DomainMessage;
use Prooph\Common\Messaging\PayloadTrait;
Expand Down
6 changes: 3 additions & 3 deletions tests/EnqueueMessageProducerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
6 changes: 3 additions & 3 deletions tests/EnqueueSerializerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

/**
* This file is part of prooph/psb-enqueue-producer.
* (c) 2017-2018 prooph software GmbH <contact@prooph.de>
* (c) 2017-2018 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2018 Formapro <opensource@forma-pro.com>
* (c) 2017-2019 prooph software GmbH <contact@prooph.de>
* (c) 2017-2019 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
* (c) 2017-2019 Formapro <opensource@forma-pro.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand Down
Loading

0 comments on commit 681ed2f

Please sign in to comment.