mirror of
https://github.com/brmlab/brmsklad.git
synced 2025-08-03 14:43:49 +02:00
Upgrade CakePHP from 2.2.5 to 2.9.5
This commit is contained in:
Brm Ko
parent
5a580df460
commit
235a541597
793 changed files with 60746 additions and 23753 deletions
|
|
@ -2,19 +2,18 @@
|
|||
/**
|
||||
* SocketTest file
|
||||
*
|
||||
* PHP 5
|
||||
*
|
||||
* CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
|
||||
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
*
|
||||
* Licensed under The MIT License
|
||||
* For full copyright and license information, please see the LICENSE.txt
|
||||
* Redistributions of files must retain the above copyright notice
|
||||
*
|
||||
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
|
||||
* @link http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
|
||||
* @package Cake.Test.Case.Network
|
||||
* @since CakePHP(tm) v 1.2.0.4206
|
||||
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
|
||||
* @license http://www.opensource.org/licenses/mit-license.php MIT License
|
||||
*/
|
||||
|
||||
App::uses('CakeSocket', 'Network');
|
||||
|
|
@ -57,7 +56,7 @@ class CakeSocketTest extends CakeTestCase {
|
|||
$this->assertSame($config, array(
|
||||
'persistent' => false,
|
||||
'host' => 'localhost',
|
||||
'protocol' => getprotobyname('tcp'),
|
||||
'protocol' => 'tcp',
|
||||
'port' => 80,
|
||||
'timeout' => 30
|
||||
));
|
||||
|
|
@ -72,7 +71,7 @@ class CakeSocketTest extends CakeTestCase {
|
|||
|
||||
$config['host'] = 'www.cakephp.org';
|
||||
$config['port'] = 23;
|
||||
$config['protocol'] = 17;
|
||||
$config['protocol'] = 'udp';
|
||||
|
||||
$this->assertSame($this->Socket->config, $config);
|
||||
}
|
||||
|
|
@ -86,16 +85,20 @@ class CakeSocketTest extends CakeTestCase {
|
|||
$this->assertFalse($this->Socket->connected);
|
||||
$this->Socket->disconnect();
|
||||
$this->assertFalse($this->Socket->connected);
|
||||
$this->Socket->connect();
|
||||
$this->assertTrue($this->Socket->connected);
|
||||
$this->Socket->connect();
|
||||
$this->assertTrue($this->Socket->connected);
|
||||
try {
|
||||
$this->Socket->connect();
|
||||
$this->assertTrue($this->Socket->connected);
|
||||
$this->Socket->connect();
|
||||
$this->assertTrue($this->Socket->connected);
|
||||
|
||||
$this->Socket->disconnect();
|
||||
$config = array('persistent' => true);
|
||||
$this->Socket = new CakeSocket($config);
|
||||
$this->Socket->connect();
|
||||
$this->assertTrue($this->Socket->connected);
|
||||
$this->Socket->disconnect();
|
||||
$config = array('persistent' => true);
|
||||
$this->Socket = new CakeSocket($config);
|
||||
$this->Socket->connect();
|
||||
$this->assertTrue($this->Socket->connected);
|
||||
} catch (SocketException $e) {
|
||||
$this->markTestSkipped('Cannot test network, skipping.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -115,7 +118,7 @@ class CakeSocketTest extends CakeTestCase {
|
|||
*
|
||||
* @dataProvider invalidConnections
|
||||
* @expectedException SocketException
|
||||
* return void
|
||||
* @return void
|
||||
*/
|
||||
public function testInvalidConnection($data) {
|
||||
$this->Socket->config = array_merge($this->Socket->config, $data);
|
||||
|
|
@ -128,19 +131,23 @@ class CakeSocketTest extends CakeTestCase {
|
|||
* @return void
|
||||
*/
|
||||
public function testSocketHost() {
|
||||
$this->Socket = new CakeSocket();
|
||||
$this->Socket->connect();
|
||||
$this->assertEquals('127.0.0.1', $this->Socket->address());
|
||||
$this->assertEquals(gethostbyaddr('127.0.0.1'), $this->Socket->host());
|
||||
$this->assertEquals(null, $this->Socket->lastError());
|
||||
$this->assertTrue(in_array('127.0.0.1', $this->Socket->addresses()));
|
||||
try {
|
||||
$this->Socket = new CakeSocket();
|
||||
$this->Socket->connect();
|
||||
$this->assertEquals('127.0.0.1', $this->Socket->address());
|
||||
$this->assertEquals(gethostbyaddr('127.0.0.1'), $this->Socket->host());
|
||||
$this->assertEquals(null, $this->Socket->lastError());
|
||||
$this->assertTrue(in_array('127.0.0.1', $this->Socket->addresses()));
|
||||
|
||||
$this->Socket = new CakeSocket(array('host' => '127.0.0.1'));
|
||||
$this->Socket->connect();
|
||||
$this->assertEquals('127.0.0.1', $this->Socket->address());
|
||||
$this->assertEquals(gethostbyaddr('127.0.0.1'), $this->Socket->host());
|
||||
$this->assertEquals(null, $this->Socket->lastError());
|
||||
$this->assertTrue(in_array('127.0.0.1', $this->Socket->addresses()));
|
||||
$this->Socket = new CakeSocket(array('host' => '127.0.0.1'));
|
||||
$this->Socket->connect();
|
||||
$this->assertEquals('127.0.0.1', $this->Socket->address());
|
||||
$this->assertEquals(gethostbyaddr('127.0.0.1'), $this->Socket->host());
|
||||
$this->assertEquals(null, $this->Socket->lastError());
|
||||
$this->assertTrue(in_array('127.0.0.1', $this->Socket->addresses()));
|
||||
} catch (SocketException $e) {
|
||||
$this->markTestSkipped('Cannot test network, skipping.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -149,8 +156,12 @@ class CakeSocketTest extends CakeTestCase {
|
|||
* @return void
|
||||
*/
|
||||
public function testSocketWriting() {
|
||||
$request = "GET / HTTP/1.1\r\nConnection: close\r\n\r\n";
|
||||
$this->assertTrue((bool)$this->Socket->write($request));
|
||||
try {
|
||||
$request = "GET / HTTP/1.1\r\nConnection: close\r\n\r\n";
|
||||
$this->assertTrue((bool)$this->Socket->write($request));
|
||||
} catch (SocketException $e) {
|
||||
$this->markTestSkipped('Cannot test network, skipping.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -160,14 +171,18 @@ class CakeSocketTest extends CakeTestCase {
|
|||
*/
|
||||
public function testSocketReading() {
|
||||
$this->Socket = new CakeSocket(array('timeout' => 5));
|
||||
$this->Socket->connect();
|
||||
$this->assertEquals(null, $this->Socket->read(26));
|
||||
try {
|
||||
$this->Socket->connect();
|
||||
$this->assertEquals(null, $this->Socket->read(26));
|
||||
|
||||
$config = array('host' => 'google.com', 'port' => 80, 'timeout' => 1);
|
||||
$this->Socket = new CakeSocket($config);
|
||||
$this->assertTrue($this->Socket->connect());
|
||||
$this->assertEquals(null, $this->Socket->read(26));
|
||||
$this->assertEquals('2: ' . __d('cake_dev', 'Connection timed out'), $this->Socket->lastError());
|
||||
$config = array('host' => 'google.com', 'port' => 80, 'timeout' => 1);
|
||||
$this->Socket = new CakeSocket($config);
|
||||
$this->assertTrue($this->Socket->connect());
|
||||
$this->assertEquals(null, $this->Socket->read(26));
|
||||
$this->assertEquals('2: ' . __d('cake_dev', 'Connection timed out'), $this->Socket->lastError());
|
||||
} catch (SocketException $e) {
|
||||
$this->markTestSkipped('Cannot test network, skipping.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -178,12 +193,16 @@ class CakeSocketTest extends CakeTestCase {
|
|||
public function testTimeOutConnection() {
|
||||
$config = array('host' => '127.0.0.1', 'timeout' => 0.5);
|
||||
$this->Socket = new CakeSocket($config);
|
||||
$this->assertTrue($this->Socket->connect());
|
||||
try {
|
||||
$this->assertTrue($this->Socket->connect());
|
||||
|
||||
$config = array('host' => '127.0.0.1', 'timeout' => 0.00001);
|
||||
$this->Socket = new CakeSocket($config);
|
||||
$this->assertFalse($this->Socket->read(1024 * 1024));
|
||||
$this->assertEquals('2: ' . __d('cake_dev', 'Connection timed out'), $this->Socket->lastError());
|
||||
$config = array('host' => '127.0.0.1', 'timeout' => 0.00001);
|
||||
$this->Socket = new CakeSocket($config);
|
||||
$this->assertFalse($this->Socket->read(1024 * 1024));
|
||||
$this->assertEquals('2: ' . __d('cake_dev', 'Connection timed out'), $this->Socket->lastError());
|
||||
} catch (SocketException $e) {
|
||||
$this->markTestSkipped('Cannot test network, skipping.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -204,14 +223,194 @@ class CakeSocketTest extends CakeTestCase {
|
|||
*/
|
||||
public function testReset() {
|
||||
$config = array(
|
||||
'persistent' => true,
|
||||
'host' => '127.0.0.1',
|
||||
'protocol' => 'udp',
|
||||
'port' => 80,
|
||||
'timeout' => 20
|
||||
'persistent' => true,
|
||||
'host' => '127.0.0.1',
|
||||
'protocol' => 'udp',
|
||||
'port' => 80,
|
||||
'timeout' => 20
|
||||
);
|
||||
$anotherSocket = new CakeSocket($config);
|
||||
$anotherSocket->reset();
|
||||
$this->assertEquals(array(), $anotherSocket->config);
|
||||
}
|
||||
|
||||
/**
|
||||
* testEncrypt
|
||||
*
|
||||
* @expectedException SocketException
|
||||
* @return void
|
||||
*/
|
||||
public function testEnableCryptoSocketExceptionNoSsl() {
|
||||
$this->skipIf(!extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
|
||||
$configNoSslOrTls = array('host' => 'localhost', 'port' => 80, 'timeout' => 0.1);
|
||||
|
||||
// testing exception on no ssl socket server for ssl and tls methods
|
||||
$this->Socket = new CakeSocket($configNoSslOrTls);
|
||||
$this->Socket->connect();
|
||||
$this->Socket->enableCrypto('sslv3', 'client');
|
||||
}
|
||||
|
||||
/**
|
||||
* testEnableCryptoSocketExceptionNoTls
|
||||
*
|
||||
* @expectedException SocketException
|
||||
* @return void
|
||||
*/
|
||||
public function testEnableCryptoSocketExceptionNoTls() {
|
||||
$configNoSslOrTls = array('host' => 'localhost', 'port' => 80, 'timeout' => 0.1);
|
||||
|
||||
// testing exception on no ssl socket server for ssl and tls methods
|
||||
$this->Socket = new CakeSocket($configNoSslOrTls);
|
||||
$this->Socket->connect();
|
||||
$this->Socket->enableCrypto('tls', 'client');
|
||||
}
|
||||
|
||||
/**
|
||||
* Test that protocol in the host doesn't cause cert errors.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testConnectProtocolInHost() {
|
||||
$this->skipIf(!extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
|
||||
$configSslTls = array('host' => 'ssl://smtp.gmail.com', 'port' => 465, 'timeout' => 5);
|
||||
$socket = new CakeSocket($configSslTls);
|
||||
try {
|
||||
$socket->connect();
|
||||
$this->assertEquals('smtp.gmail.com', $socket->config['host']);
|
||||
$this->assertEquals('ssl', $socket->config['protocol']);
|
||||
} catch (SocketException $e) {
|
||||
$this->markTestSkipped('Cannot test network, skipping.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* _connectSocketToSslTls
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function _connectSocketToSslTls() {
|
||||
$this->skipIf(!extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
|
||||
$configSslTls = array('host' => 'smtp.gmail.com', 'port' => 465, 'timeout' => 5);
|
||||
$this->Socket = new CakeSocket($configSslTls);
|
||||
try {
|
||||
$this->Socket->connect();
|
||||
} catch (SocketException $e) {
|
||||
$this->markTestSkipped('Cannot test network, skipping.');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* testEnableCryptoBadMode
|
||||
*
|
||||
* @expectedException InvalidArgumentException
|
||||
* @return void
|
||||
*/
|
||||
public function testEnableCryptoBadMode() {
|
||||
// testing wrong encryption mode
|
||||
$this->_connectSocketToSslTls();
|
||||
$this->Socket->enableCrypto('doesntExistMode', 'server');
|
||||
$this->Socket->disconnect();
|
||||
}
|
||||
|
||||
/**
|
||||
* testEnableCrypto
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testEnableCrypto() {
|
||||
// testing on tls server
|
||||
$this->_connectSocketToSslTls();
|
||||
$this->assertTrue($this->Socket->enableCrypto('tls', 'client'));
|
||||
$this->Socket->disconnect();
|
||||
}
|
||||
|
||||
/**
|
||||
* testEnableCryptoExceptionEnableTwice
|
||||
*
|
||||
* @expectedException SocketException
|
||||
* @return void
|
||||
*/
|
||||
public function testEnableCryptoExceptionEnableTwice() {
|
||||
// testing on tls server
|
||||
$this->_connectSocketToSslTls();
|
||||
$this->Socket->enableCrypto('tls', 'client');
|
||||
$this->Socket->enableCrypto('tls', 'client');
|
||||
}
|
||||
|
||||
/**
|
||||
* testEnableCryptoExceptionDisableTwice
|
||||
*
|
||||
* @expectedException SocketException
|
||||
* @return void
|
||||
*/
|
||||
public function testEnableCryptoExceptionDisableTwice() {
|
||||
// testing on tls server
|
||||
$this->_connectSocketToSslTls();
|
||||
$this->Socket->enableCrypto('tls', 'client', false);
|
||||
}
|
||||
|
||||
/**
|
||||
* testEnableCryptoEnableStatus
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testEnableCryptoEnableStatus() {
|
||||
// testing on tls server
|
||||
$this->_connectSocketToSslTls();
|
||||
$this->assertFalse($this->Socket->encrypted);
|
||||
$this->Socket->enableCrypto('tls', 'client', true);
|
||||
$this->assertTrue($this->Socket->encrypted);
|
||||
}
|
||||
|
||||
/**
|
||||
* test getting the context for a socket.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testGetContext() {
|
||||
$this->skipIf(!extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
|
||||
$config = array(
|
||||
'host' => 'smtp.gmail.com',
|
||||
'port' => 465,
|
||||
'timeout' => 5,
|
||||
'context' => array(
|
||||
'ssl' => array('capture_peer' => true)
|
||||
)
|
||||
);
|
||||
$this->Socket = new CakeSocket($config);
|
||||
$this->Socket->connect();
|
||||
$result = $this->Socket->context();
|
||||
$this->assertSame($config['context']['ssl']['capture_peer'], $result['ssl']['capture_peer']);
|
||||
}
|
||||
|
||||
/**
|
||||
* test configuring the context from the flat keys.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testConfigContext() {
|
||||
$this->skipIf(!extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
|
||||
$config = array(
|
||||
'host' => 'smtp.gmail.com',
|
||||
'port' => 465,
|
||||
'timeout' => 5,
|
||||
'ssl_verify_peer' => true,
|
||||
'ssl_allow_self_signed' => false,
|
||||
'ssl_verify_depth' => 5,
|
||||
'ssl_verify_host' => true,
|
||||
);
|
||||
$this->Socket = new CakeSocket($config);
|
||||
|
||||
$this->Socket->connect();
|
||||
$result = $this->Socket->context();
|
||||
|
||||
$this->assertTrue($result['ssl']['verify_peer']);
|
||||
$this->assertFalse($result['ssl']['allow_self_signed']);
|
||||
$this->assertEquals(5, $result['ssl']['verify_depth']);
|
||||
$this->assertEquals('smtp.gmail.com', $result['ssl']['CN_match']);
|
||||
$this->assertArrayNotHasKey('ssl_verify_peer', $this->Socket->config);
|
||||
$this->assertArrayNotHasKey('ssl_allow_self_signed', $this->Socket->config);
|
||||
$this->assertArrayNotHasKey('ssl_verify_host', $this->Socket->config);
|
||||
$this->assertArrayNotHasKey('ssl_verify_depth', $this->Socket->config);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue