Renaming socket.php to cake_socket.php . Changing associated App::imp…

…ort calls.
cakephp · Mar 15, 2009 · b22ddc1 · b22ddc1
1 parent 6cb8b3d
commit b22ddc1
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/cake/libs/socket.php → cake/libs/cake_socket.php b/cake/libs/socket.php → cake/libs/cake_socket.php
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
@@ -662,7 +662,7 @@ function __mail() {
  * @access private
  */
 	function __smtp() {
-		App::import('Core', array('Socket'));
+		App::import('Core', array('CakeSocket'));
 
 		$this->__smtpConnection =& new CakeSocket(array_merge(array('protocol'=>'smtp'), $this->smtpOptions));
 

diff --git a/cake/libs/http_socket.php b/cake/libs/http_socket.php
@@ -22,7 +22,7 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-App::import('Core', array('Socket', 'Set', 'Router'));
+App::import('Core', array('CakeSocket', 'Set', 'Router'));
 /**
  * Cake network socket connection class.
  *

diff --git a/cake/tests/cases/libs/socket.test.php → cake/tests/cases/libs/cake_socket.test.php b/cake/tests/cases/libs/socket.test.php → cake/tests/cases/libs/cake_socket.test.php
@@ -24,14 +24,14 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
  */
-App::import('Core', 'Socket');
+App::import('Core', 'CakeSocket');
 /**
  * Short description for class.
  *
  * @package       cake.tests
  * @subpackage    cake.tests.cases.libs
  */
-class SocketTest extends CakeTestCase {
+class CakeSocketTest extends CakeTestCase {
 /**
  * setUp method
  *

diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
@@ -440,11 +440,11 @@ function testLoadingWithSearchArray () {
  * @return void
  */
 	function testMultipleLoading() {
-		$toLoad = array('I18n', 'Socket');
+		$toLoad = array('I18n', 'CakeSocket');
 
 		$classes = array_flip(get_declared_classes());
 		$this->assertFalse(isset($classes['i18n']));
-		$this->assertFalse(isset($classes['Socket']));
+		$this->assertFalse(isset($classes['CakeSocket']));
 
 		$load = App::import($toLoad);
 		$this->assertTrue($load);
@@ -457,7 +457,7 @@ function testMultipleLoading() {
 			$this->assertTrue(isset($classes['i18n']));
 		}
 
-		$load = App::import(array('I18n', 'SomeNotFoundClass', 'Socket'));
+		$load = App::import(array('I18n', 'SomeNotFoundClass', 'CakeSocket'));
 		$this->assertFalse($load);
 
 		$load = App::import($toLoad);

diff --git a/cake/tests/groups/no_database.group.php b/cake/tests/groups/no_database.group.php
@@ -57,7 +57,7 @@ function AllCoreWithOutDatabaseGroupTest() {
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'inflector');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'validation');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'session');
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'socket');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_socket');
 		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view');
 	}
 }

diff --git a/cake/tests/groups/socket.group.php b/cake/tests/groups/socket.group.php
@@ -44,15 +44,15 @@ class SocketGroupTest extends GroupTest {
  * @var string 'Socket and HttpSocket tests'
  * @access public
  */
-	var $label = 'Socket and HttpSocket tests';
+	var $label = 'CakeSocket and HttpSocket tests';
 /**
  * SocketGroupTest method
  *
  * @access public
  * @return void
  */
 	function SocketGroupTest() {
-		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'socket');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_socket');
 		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'http_socket');
 	}
 }