Skip to content

Commit e9dbc8e

Browse files
committed
drop deprecated things
1 parent 627a362 commit e9dbc8e

12 files changed

+2
-126
lines changed

PhpAmqpLib/Connection/AMQPConnection.php

Lines changed: 0 additions & 14 deletions
This file was deleted.

PhpAmqpLib/Connection/AMQPLazyConnection.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@
44

55
class AMQPLazyConnection extends AMQPStreamConnection
66
{
7-
/**
8-
* Gets socket from current connection
9-
*
10-
* @deprecated
11-
*/
12-
public function getSocket()
13-
{
14-
$this->connect();
15-
16-
return parent::getSocket();
17-
}
18-
197
/**
208
* {@inheritdoc}
219
*/

PhpAmqpLib/Connection/AMQPLazySocketConnection.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,6 @@
77
*/
88
class AMQPLazySocketConnection extends AMQPSocketConnection
99
{
10-
/**
11-
* Gets socket from current connection
12-
*
13-
* @deprecated
14-
*/
15-
public function getSocket()
16-
{
17-
$this->connect();
18-
19-
return parent::getSocket();
20-
}
21-
2210
/**
2311
* {@inheritdoc}
2412
*/

PhpAmqpLib/Connection/AbstractConnection.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -936,15 +936,6 @@ protected function x_tune_ok($channel_max, $frame_max, $heartbeat)
936936
$this->wait_tune_ok = false;
937937
}
938938

939-
/**
940-
* @return resource
941-
* @deprecated No direct access to communication socket should be available.
942-
*/
943-
public function getSocket()
944-
{
945-
return $this->io->getSocket();
946-
}
947-
948939
/**
949940
* @return \PhpAmqpLib\Wire\IO\AbstractIO
950941
* @deprecated

PhpAmqpLib/Exception/AMQPChannelException.php

Lines changed: 0 additions & 10 deletions
This file was deleted.

PhpAmqpLib/Exception/AMQPConnectionException.php

Lines changed: 0 additions & 10 deletions
This file was deleted.

PhpAmqpLib/Exception/AMQPException.php

Lines changed: 0 additions & 37 deletions
This file was deleted.

PhpAmqpLib/Exception/AMQPProtocolConnectionException.php

Lines changed: 0 additions & 10 deletions
This file was deleted.

PhpAmqpLib/Wire/AMQPAbstractCollection.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
abstract class AMQPAbstractCollection implements \Iterator, \ArrayAccess
1313
{
1414
//protocol defines available field types and their corresponding symbols
15-
/** @deprecated */
16-
const PROTOCOL_080 = Wire\Constants080::VERSION;
17-
/** @deprecated */
18-
const PROTOCOL_091 = Wire\Constants091::VERSION;
1915
const PROTOCOL_RBT = 'rabbit'; //pseudo proto
2016

2117
//Abstract data types

PhpAmqpLib/Wire/IO/AbstractIO.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@ abstract protected function do_select($sec, $usec);
118118
*/
119119
abstract public function connect();
120120

121-
/**
122-
* @return resource
123-
*/
124-
abstract public function getSocket();
125-
126121
/**
127122
* Heartbeat logic: check connection health here
128123
* @return void

tests/Functional/AbstractConnectionTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ protected function assertConnectionClosed(AbstractConnection $connection)
141141
{
142142
$this->assertFalse($connection->isConnected());
143143
$this->assertNotNull($connection->getIO());
144-
$this->assertNull($connection->getIO()->getSocket());
145144
// all channels must be closed
146145
foreach ($connection->channels as $ch) {
147146
if ($ch instanceof AMQPChannel) {

tests/Functional/FileTransferTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace PhpAmqpLib\Tests\Functional;
44

5-
use PhpAmqpLib\Connection\AMQPConnection;
5+
use PhpAmqpLib\Connection\AMQPStreamConnection;
66
use PhpAmqpLib\Message\AMQPMessage;
77
use PhpAmqpLib\Tests\TestCaseCompat;
88

@@ -23,7 +23,7 @@ class FileTransferTest extends TestCaseCompat
2323

2424
protected function setUpCompat()
2525
{
26-
$this->connection = new AMQPConnection(HOST, PORT, USER, PASS, VHOST);
26+
$this->connection = new AMQPStreamConnection(HOST, PORT, USER, PASS, VHOST);
2727
$this->channel = $this->connection->channel();
2828
$this->channel->exchange_declare($this->exchangeName, 'direct', false, false, false);
2929
list($this->queueName, ,) = $this->channel->queue_declare();

0 commit comments

Comments
 (0)