From f37007cc501895976deced21e8fa49ee4f574ac4 Mon Sep 17 00:00:00 2001
From: Timm Friebe <thekid@thekid.de>
Date: Sun, 5 Apr 2020 20:51:15 +0200
Subject: [PATCH] Refrain from using deprecated annotation key/value pairs

---
 ChangeLog.md                                           | 5 +++++
 src/test/php/peer/stomp/unittest/MessageTest.class.php | 5 +++--
 src/test/php/peer/stomp/unittest/StompTest.class.php   | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 6203b1b..a847973 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -3,6 +3,11 @@ stomp ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 10.1.3 / 2020-04-05
+
+* Implemented RFC #335: Remove deprecated key/value pair annotation syntax
+  (@thekid)
+
 ## 10.1.2 / 2020-04-04
 
 * Made compatible with XP 10 - @thekid
diff --git a/src/test/php/peer/stomp/unittest/MessageTest.class.php b/src/test/php/peer/stomp/unittest/MessageTest.class.php
index a562283..9157e85 100644
--- a/src/test/php/peer/stomp/unittest/MessageTest.class.php
+++ b/src/test/php/peer/stomp/unittest/MessageTest.class.php
@@ -1,5 +1,6 @@
 <?php namespace peer\stomp\unittest;
 
+use lang\IllegalStateException;
 use peer\stomp\Destination;
 use peer\stomp\Message;
 use peer\stomp\ReceivedMessage;
@@ -162,13 +163,13 @@ public function nack_in_transaction() {
     );
   }
 
-  #[@test, @expect(class= 'lang.IllegalStateException', withMessage= '/Cannot ack message without connection/')]
+  #[@test, @expect(['class' => IllegalStateException::class, 'withMessage' => '/Cannot ack message without connection/'])]
   public function ack_fails_without_connection() {
     $m= new ReceivedMessage();
     $m->ack();
   }
 
-  #[@test, @expect(class= 'lang.IllegalStateException', withMessage= '/Cannot ack message without connection/')]
+  #[@test, @expect(['class' => IllegalStateException::class, 'withMessage' => '/Cannot ack message without connection/'])]
   public function nack_fails_without_connection() {
     $m= new ReceivedMessage();
     $m->nack();
diff --git a/src/test/php/peer/stomp/unittest/StompTest.class.php b/src/test/php/peer/stomp/unittest/StompTest.class.php
index 0a5919e..a37923e 100644
--- a/src/test/php/peer/stomp/unittest/StompTest.class.php
+++ b/src/test/php/peer/stomp/unittest/StompTest.class.php
@@ -1,10 +1,12 @@
 <?php namespace peer\stomp\unittest;
 
+use lang\IllegalArgumentException;
 use peer\AuthenticationException;
 use peer\ProtocolException;
 use peer\URL;
 use peer\stomp\Connection;
 use peer\stomp\Destination;
+use peer\stomp\Exception;
 use peer\stomp\frame\AbortFrame;
 use peer\stomp\frame\AckFrame;
 use peer\stomp\frame\BeginFrame;
@@ -113,7 +115,7 @@ public function connect_and_negotiate_version_but_fails() {
     );
   }
 
-  #[@test, @expect(class= 'lang.IllegalArgumentException', withMessage= '/Invalid protocol version/')]
+  #[@test, @expect(['class' => IllegalArgumentException::class, 'withMessage' => '/Invalid protocol version/'])]
   public function connect_requires_valid_version() {
     $this->newConnection(new URL('stomp://user:pass@host?versions='))->connect();
   }
@@ -206,7 +208,7 @@ public function recv_eats_any_empty_line_between_frames() {
     $this->assertInstanceOf(MessageFrame::class, $recvd[1]);
   }
 
-  #[@test, @expect(class= 'peer.stomp.Exception', withMessage= '/ACK received without/')]
+  #[@test, @expect(['class' => Exception::class, 'withMessage' => '/ACK received without/'])]
   public function receive_throws_exception_on_error_frame() {
     $this->fixture->setResponseBytes("ERROR\n".
       "message:ACK received without a subscription id for acknowledge!\n".