Merge remote-tracking branch 'origin/2.6' into 3.0

Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	src/Cache/Engine/RedisEngine.php
	src/TestSuite/TestCase.php
	tests/TestCase/Cache/Engine/MemcachedEngineTest.php
	tests/TestCase/Cache/Engine/RedisEngineTest.php
	tests/TestCase/TestSuite/TestCaseTest.php

src/Cache/Engine/RedisEngine.php

@@ -57,7 +57,7 @@ class RedisEngine extends CacheEngine {
 		'password' => false,
 		'persistent' => true,
 		'port' => 6379,
-		'prefix' => null,
+		'prefix' => 'cake_',
 		'probability' => 100,
 		'server' => '127.0.0.1',
 		'timeout' => 0,

tests/TestCase/Cache/Engine/MemcachedEngineTest.php

@@ -360,16 +360,8 @@ class MemcachedEngineTest extends TestCase {
 			'password' => 'password'
 		);
 
-		$Memcached = new Memcached();
-		$this->skipIf(
-			method_exists($Memcached, 'setSaslAuthData'),
-			'Memcached extension is installed with SASL support'
-		);
-
-		$this->setExpectedException(
-			'InvalidArgumentException', 'Memcached extension is not build with SASL support'
-		);
-		$MemcachedEngine->init($config);
+		$this->setExpectedException('PHPUnit_Framework_Error_Warning');
+		$MemcachedEngine->init($settings);
 	}
 
 /**
@@ -796,6 +788,8 @@ class MemcachedEngineTest extends TestCase {
  * @return void
  */
 	public function testLongDurationEqualToZero() {
+		$this->markTestSkipped('Cannot run as Memcached cannot be reflected');
+
 		$memcached = new TestMemcachedEngine();
 		$memcached->init(['prefix' => 'Foo_', 'compress' => false, 'duration' => 50 * DAY]);
 

tests/TestCase/Cache/Engine/RedisEngineTest.php

@@ -87,7 +87,7 @@ class RedisEngineTest extends TestCase {
 			'persistent' => true,
 			'password' => false,
 			'database' => 0,
-			'unix_socket' => false
+			'unix_socket' => false,
 		);
 		$this->assertEquals($expecting, $config);
 	}

tests/TestCase/TestSuite/TestCaseTest.php

@@ -18,12 +18,28 @@ use Cake\Controller\Controller;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
+use Cake\Datasource\ConnectionManager;
+use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 use Cake\Test\Fixture\AssertHtmlTestCase;
 use Cake\Test\Fixture\FixturizedTestCase;
 
 /**
+ * Testing stub.
+ */
+class SecondaryPostsTable extends Table {
+
+/**
+ * @return string
+ */
+	public static function defaultConnectionName() {
+		return 'secondary';
+	}
+
+}
+
+/**
  * TestCaseTest
  *
  */
@@ -330,6 +346,18 @@ class TestCaseTest extends TestCase {
 	}
 
 /**
+ * Test getMockForModel on secondary datasources.
+ *
+ * @return void
+ */
+	public function testGetMockForModelSecondaryDatasource() {
+		ConnectionManager::alias('test', 'secondary');
+
+		$post = $this->getMockForModel(__NAMESPACE__ . '\SecondaryPostsTable', array('save'));
+		$this->assertEquals('test', $post->connection()->configName());
+	}
+
+/**
  * test getMockForModel() with plugin models
  *
  * @return void