Merge branch '2.x' into 2.next

cakephp · Sep 5, 2016 · e8d6372 · e8d6372
2 parents 61b3fbd + c303a92
commit e8d6372
Show file tree

Hide file tree

Showing 157 changed files with 343 additions and 187 deletions.
diff --git a/lib/Cake/Cache/Engine/MemcachedEngine.php b/lib/Cake/Cache/Engine/MemcachedEngine.php
@@ -23,6 +23,8 @@
  * (if memcached extension compiled with --enable-igbinary)
  * Compressed keys can also be incremented/decremented
  *
+ * This cache engine requires at least ext/memcached version 2.0
+ *
  * @package       Cake.Cache.Engine
  */
 class MemcachedEngine extends CacheEngine {

diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php
@@ -748,13 +748,12 @@ public function here($base = true) {
  * @return mixed Either false on no header being set or the value of the header.
  */
 	public static function header($name) {
-		$name = strtoupper(str_replace('-', '_', $name));
-		$httpName = 'HTTP_' . $name;
+		$httpName = 'HTTP_' . strtoupper(str_replace('-', '_', $name));
 		if (isset($_SERVER[$httpName])) {
 			return $_SERVER[$httpName];
 		}
-		// Work around Apache issues where 'Authorization' is not
-		// passed to PHP.
+		// Use the provided value, in some configurations apache will
+		// pass Authorization with no prefix and in Titlecase.
 		if (isset($_SERVER[$name])) {
 			return $_SERVER[$name];
 		}

diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcacheEngineTest.php
@@ -20,7 +20,7 @@
 App::uses('MemcacheEngine', 'Cache/Engine');
 
 /**
- * Class TestMemcacheEngine
+ * TestMemcacheEngine
  *
  * @package       Cake.Test.Case.Cache.Engine
  */

diff --git a/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
@@ -22,7 +22,7 @@
 App::uses('MemcachedEngine', 'Cache/Engine');
 
 /**
- * Class TestMemcachedEngine
+ * TestMemcachedEngine
  *
  * @package       Cake.Test.Case.Cache.Engine
  */

diff --git a/lib/Cake/Test/Case/Configure/IniReaderTest.php b/lib/Cake/Test/Case/Configure/IniReaderTest.php
@@ -19,7 +19,7 @@
 App::uses('IniReader', 'Configure');
 
 /**
- * Class IniReaderTest
+ * IniReaderTest
  *
  * @package       Cake.Test.Case.Configure
  */

diff --git a/lib/Cake/Test/Case/Configure/PhpReaderTest.php b/lib/Cake/Test/Case/Configure/PhpReaderTest.php
@@ -19,7 +19,7 @@
 App::uses('PhpReader', 'Configure');
 
 /**
- * Class PhpReaderTest
+ * PhpReaderTest
  *
  * @package       Cake.Test.Case.Configure
  */

diff --git a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
@@ -23,7 +23,7 @@
 App::uses('CommandTask', 'Console/Command/Task');
 
 /**
- * Class TestStringOutput
+ * TestStringOutput
  *
  * @package       Cake.Test.Case.Console.Command
  */
@@ -38,7 +38,7 @@ protected function _write($message) {
 }
 
 /**
- * Class CommandListShellTest
+ * CommandListShellTest
  *
  * @package       Cake.Test.Case.Console.Command
  */

diff --git a/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php b/lib/Cake/Test/Case/Console/Command/CompletionShellTest.php
@@ -25,7 +25,7 @@
 App::uses('CommandTask', 'Console/Command/Task');
 
 /**
- * Class TestCompletionStringOutput
+ * TestCompletionStringOutput
  *
  * @package       Cake.Test.Case.Console.Command
  */
@@ -40,7 +40,7 @@ protected function _write($message) {
 }
 
 /**
- * Class CompletionShellTest
+ * CompletionShellTest
  *
  * @package       Cake.Test.Case.Console.Command
  */

diff --git a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php
@@ -39,7 +39,7 @@
 	define('ARTICLE_MODEL_CREATED', true);
 
 /**
- * Class BakeArticle
+ * BakeArticle
  */
 	class BakeArticle extends Model {
 

diff --git a/lib/Cake/Test/Case/Console/Command/TestShellTest.php b/lib/Cake/Test/Case/Console/Command/TestShellTest.php
@@ -20,7 +20,7 @@
 App::uses('TestShell', 'Console/Command');
 
 /**
- * Class TestTestShell
+ * TestTestShell
  *
  * @package       Cake.Test.Case.Console.Command
  */
@@ -37,7 +37,7 @@ public function mapFileToCategory($file) {
 }
 
 /**
- * Class TestShellTest
+ * TestShellTest
  *
  * @package       Cake.Test.Case.Console.Command
  */

diff --git a/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php b/lib/Cake/Test/Case/Console/ConsoleOptionParserTest.php
@@ -19,7 +19,7 @@
 App::uses('ConsoleOptionParser', 'Console');
 
 /**
- * Class ConsoleOptionParserTest
+ * ConsoleOptionParserTest
  *
  * @package       Cake.Test.Case.Console
  */

diff --git a/lib/Cake/Test/Case/Console/ConsoleOutputTest.php b/lib/Cake/Test/Case/Console/ConsoleOutputTest.php
@@ -19,7 +19,7 @@
 App::uses('ConsoleOutput', 'Console');
 
 /**
- * Class ConsoleOutputTest
+ * ConsoleOutputTest
  *
  * @package       Cake.Test.Case.Console
  */

diff --git a/lib/Cake/Test/Case/Console/HelpFormatterTest.php b/lib/Cake/Test/Case/Console/HelpFormatterTest.php
@@ -20,7 +20,7 @@
 App::uses('HelpFormatter', 'Console');
 
 /**
- * Class HelpFormatterTest
+ * HelpFormatterTest
  *
  * @package       Cake.Test.Case.Console
  */

diff --git a/lib/Cake/Test/Case/Console/TaskCollectionTest.php b/lib/Cake/Test/Case/Console/TaskCollectionTest.php
@@ -26,7 +26,7 @@ class DbConfigAliasedTask extends Shell {
 }
 
 /**
- * Class TaskCollectionTest
+ * TaskCollectionTest
  *
  * @package       Cake.Test.Case.Console
  */

diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php
@@ -23,7 +23,7 @@
 App::uses('CakeResponse', 'Network');
 
 /**
- * Class ActionsAuthorizeTest
+ * ActionsAuthorizeTest
  *
  * @package       Cake.Test.Case.Controller.Component.Auth
  */

diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ControllerAuthorizeTest.php
@@ -22,7 +22,7 @@
 App::uses('CakeResponse', 'Network');
 
 /**
- * Class ControllerAuthorizeTest
+ * ControllerAuthorizeTest
  *
  * @package       Cake.Test.Case.Controller.Component.Auth
  */

diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php
@@ -23,7 +23,7 @@
 App::uses('CakeResponse', 'Network');
 
 /**
- * Class CrudAuthorizeTest
+ * CrudAuthorizeTest
  *
  * @package       Cake.Test.Case.Controller.Component.Auth
  */

diff --git a/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php b/lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
@@ -19,7 +19,7 @@
 App::uses('ConsoleLog', 'Log/Engine');
 
 /**
- * Class TestConsoleLog
+ * TestConsoleLog
  *
  * @package       Cake.Test.Case.Log.Engine
  */
@@ -28,7 +28,7 @@ class TestConsoleLog extends ConsoleLog {
 }
 
 /**
- * Class TestCakeLog
+ * TestCakeLog
  *
  * @package       Cake.Test.Case.Log.Engine
  */

diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
@@ -21,7 +21,7 @@
 App::uses('CacheSession', 'Model/Datasource/Session');
 
 /**
- * Class TestCakeSession
+ * TestCakeSession
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
@@ -38,7 +38,7 @@ public static function setHost($host) {
 }
 
 /**
- * Class TestCacheSession
+ * TestCacheSession
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
@@ -51,7 +51,7 @@ protected function _writeSession() {
 }
 
 /**
- * Class TestDatabaseSession
+ * TestDatabaseSession
  *
  * @package       Cake.Test.Case.Model.Datasource
  */

diff --git a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
@@ -27,7 +27,7 @@
 require_once dirname(dirname(__FILE__)) . DS . 'models.php';
 
 /**
- * Class MockPDO
+ * MockPDO
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
@@ -42,15 +42,15 @@ public function __construct() {
 }
 
 /**
- * Class MockDataSource
+ * MockDataSource
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
 class MockDataSource extends DataSource {
 }
 
 /**
- * Class DboTestSource
+ * DboTestSource
  *
  * @package       Cake.Test.Case.Model.Datasource
  */
@@ -81,7 +81,7 @@ public function nestedTransactionSupported() {
 }
 
 /**
- * Class DboSecondTestSource
+ * DboSecondTestSource
  *
  * @package       Cake.Test.Case.Model.Datasource
  */

diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php
@@ -21,7 +21,7 @@
 class_exists('CakeSession');
 
 /**
- * Class CacheSessionTest
+ * CacheSessionTest
  *
  * @package       Cake.Test.Case.Model.Datasource.Session
  */

diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php
@@ -22,7 +22,7 @@
 class_exists('CakeSession');
 
 /**
- * Class SessionTestModel
+ * SessionTestModel
  *
  * @package       Cake.Test.Case.Model.Datasource.Session
  */

diff --git a/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php b/lib/Cake/Test/Case/Model/ModelCrossSchemaHabtmTest.php
@@ -21,7 +21,7 @@
 require_once dirname(__FILE__) . DS . 'ModelTestBase.php';
 
 /**
- * Class ModelCrossSchemaHabtmTest
+ * ModelCrossSchemaHabtmTest
  *
  * @package       Cake.Test.Case.Model
  */

diff --git a/lib/Cake/Test/Case/Model/ModelDeleteTest.php b/lib/Cake/Test/Case/Model/ModelDeleteTest.php
@@ -421,6 +421,20 @@ public function testDeleteAll() {
 		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
 	}
 
+/**
+ * testDeleteAll diamond operator method
+ *
+ * @return void
+ */
+	public function testDeleteAllDiamondOperator() {
+		$this->loadFixtures('Article');
+		$article = new Article();
+
+		$result = $article->deleteAll(array('Article.id <>' => 1));
+		$this->assertTrue($result);
+		$this->assertFalse($article->exists(2));
+	}
+
 /**
  * testDeleteAllUnknownColumn method
  *

diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php
@@ -21,7 +21,7 @@
 App::uses('CakeRequest', 'Network');
 
 /**
- * Class TestCakeRequest
+ * TestCakeRequest
  *
  * @package       Cake.Test.Case.Network
  */
@@ -55,7 +55,7 @@ public function reConstruct($url = 'some/path', $parseEnvironment = true) {
 }
 
 /**
- * Class CakeRequestTest
+ * CakeRequestTest
  */
 class CakeRequestTest extends CakeTestCase {
 
@@ -1147,13 +1147,14 @@ public function testHeader() {
 		$_SERVER['HTTP_X_THING'] = '';
 		$_SERVER['HTTP_HOST'] = 'localhost';
 		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-ca) AppleWebKit/534.8+ (KHTML, like Gecko) Version/5.0 Safari/533.16';
-		$_SERVER['AUTHORIZATION'] = 'foobar';
+		$_SERVER['Authorization'] = 'foobar';
 		$request = new CakeRequest('/', false);
 
 		$this->assertEquals($_SERVER['HTTP_HOST'], $request->header('host'));
 		$this->assertEquals($_SERVER['HTTP_USER_AGENT'], $request->header('User-Agent'));
 		$this->assertSame('', $request->header('X-thing'));
-		$this->assertEquals($_SERVER['AUTHORIZATION'], $request->header('Authorization'));
+		$this->assertEquals($_SERVER['Authorization'], $request->header('Authorization'));
+		$this->assertFalse($request->header('authorization'));
 	}
 
 /**

diff --git a/lib/Cake/Test/Case/Network/CakeResponseTest.php b/lib/Cake/Test/Case/Network/CakeResponseTest.php
@@ -18,7 +18,7 @@
 App::uses('CakeRequest', 'Network');
 
 /**
- * Class CakeResponseTest
+ * CakeResponseTest
  *
  * @package       Cake.Test.Case.Network
  */

diff --git a/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php b/lib/Cake/Test/Case/Network/Http/BasicAuthenticationTest.php
@@ -20,7 +20,7 @@
 App::uses('BasicAuthentication', 'Network/Http');
 
 /**
- * class TestSslHttpSocket
+ * TestSslHttpSocket
  *
  * @package       Cake.Test.Case.Network.Http
  */

diff --git a/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php b/lib/Cake/Test/Case/Network/Http/DigestAuthenticationTest.php
@@ -20,7 +20,7 @@
 App::uses('DigestAuthentication', 'Network/Http');
 
 /**
- * Class DigestHttpSocket
+ * DigestHttpSocket
  *
  * @package       Cake.Test.Case.Network.Http
  */

diff --git a/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php b/lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
@@ -19,7 +19,7 @@
 App::uses('CakeResponse', 'Network');
 
 /**
- * Class AssetDispatcherTest
+ * AssetDispatcherTest
  *
  * @package       Cake.Test.Case.Routing.Filter
  */

diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
@@ -65,7 +65,7 @@ class AppController extends Controller {
 if (!class_exists('PostsController')) {
 
 /**
- * Class PostsController
+ * PostsController
  *
  * @package       Cake.Test.Case.TestSuite
  */