Merge branch 'master' into virtualcondition

cakephp · Nov 2, 2012 · 6a98695 · 6a98695
2 parents babd714 + 118dd8c
commit 6a98695
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/lib/Cake/Controller/CakeErrorController.php b/lib/Cake/Controller/CakeErrorController.php
@@ -19,6 +19,8 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+App::uses('AppController', 'Controller');
+
 /**
  * Error Handling Controller
  *

diff --git a/lib/Cake/Error/ExceptionRenderer.php b/lib/Cake/Error/ExceptionRenderer.php
@@ -142,15 +142,14 @@ public function __construct(Exception $exception) {
  * @return Controller
  */
 	protected function _getController($exception) {
+		App::uses('AppController', 'Controller');
 		App::uses('CakeErrorController', 'Controller');
 		if (!$request = Router::getRequest(true)) {
 			$request = new CakeRequest();
 		}
 		$response = new CakeResponse(array('charset' => Configure::read('App.encoding')));
 		try {
-			if (class_exists('AppController')) {
-				$controller = new CakeErrorController($request, $response);
-			}
+			$controller = new CakeErrorController($request, $response);
 		} catch (Exception $e) {
 		}
 		if (empty($controller)) {

diff --git a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
@@ -19,7 +19,6 @@
 
 App::uses('ExceptionRenderer', 'Error');
 App::uses('Controller', 'Controller');
-App::uses('AppController', 'Controller');
 App::uses('Component', 'Controller');
 App::uses('Router', 'Routing');
 

diff --git a/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php b/lib/Cake/Test/Case/Model/Behavior/TreeBehaviorScopedTest.php
@@ -175,6 +175,7 @@ public function testTranslatingTree() {
 		$this->Tree->locale = 'eng';
 		$data = array('FlagTree' => array(
 			'title' => 'name #1',
+			'name' => 'test',
 			'locale' => 'eng',
 			'parent_id' => null,
 		));
@@ -183,7 +184,7 @@ public function testTranslatingTree() {
 		$expected = array(array('FlagTree' => array(
 			'id' => 1,
 			'title' => 'name #1',
-			'name' => '',
+			'name' => 'test',
 			'parent_id' => null,
 			'lft' => 1,
 			'rght' => 2,
@@ -201,7 +202,7 @@ public function testTranslatingTree() {
 		$expected = array(array('FlagTree' => array(
 			'id' => 1,
 			'title' => 'Named 2',
-			'name' => '',
+			'name' => 'test',
 			'parent_id' => null,
 			'lft' => 1,
 			'rght' => 2,
@@ -218,6 +219,7 @@ public function testTranslatingTree() {
 			'id' => 1,
 			'parent_id' => null,
 			'title' => 'namen #1',
+			'name' => 'test',
 			'locale' => 'deu',
 		));
 		$this->Tree->save($data);
@@ -229,7 +231,7 @@ public function testTranslatingTree() {
 				'FlagTree' => array(
 					'id' => 1,
 					'title' => 'namen #1',
-					'name' => '',
+					'name' => 'test',
 					'parent_id' => null,
 					'lft' => 1,
 					'rght' => 2,
@@ -244,6 +246,7 @@ public function testTranslatingTree() {
 		$this->Tree->locale = 'eng';
 		$data = array(
 			'title' => array('eng' => 'New title', 'spa' => 'Nuevo leyenda'),
+			'name' => 'test',
 			'parent_id' => null
 		);
 		$this->Tree->create($data);
@@ -260,7 +263,7 @@ public function testTranslatingTree() {
 				'id' => 2,
 				'parent_id' => null,
 				'locale' => 'eng',
-				'name' => '',
+				'name' => 'test',
 				'title' => 'New title',
 				'flag' => 0,
 				'lft' => 3,

diff --git a/lib/Cake/Test/Case/View/MediaViewTest.php b/lib/Cake/Test/Case/View/MediaViewTest.php
@@ -132,11 +132,14 @@ public function testRenderWithUnknownFileTypeGeneric() {
 
 		$this->MediaView->response->expects($this->at(1))
 			->method('header')
-			->with(array(
-				'Date' => gmdate('D, d M Y H:i:s', time()) . ' GMT',
-				'Expires' => '0',
-				'Cache-Control' => 'private, must-revalidate, post-check=0, pre-check=0',
-				'Pragma' => 'no-cache'
+			->with($this->logicalAnd(
+				$this->arrayHasKey('Date'),
+				$this->arrayHasKey('Expires'),
+				$this->arrayHasKey('Cache-Control'),
+				$this->arrayHasKey('Pragma'),
+				$this->contains('0'),
+				$this->contains('private, must-revalidate, post-check=0, pre-check=0'),
+				$this->contains('no-cache')
 			));
 
 		$this->MediaView->response->expects($this->once())

diff --git a/lib/Cake/Utility/Inflector.php b/lib/Cake/Utility/Inflector.php
@@ -177,7 +177,7 @@ class Inflector {
 		'/Ä/' => 'Ae',
 		'/Ü/' => 'Ue',
 		'/Ö/' => 'Oe',
-		'/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ/' => 'A',
+		'/À|Á|Â|Ã|Å|Ǻ|Ā|Ă|Ą|Ǎ/' => 'A',
 		'/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª/' => 'a',
 		'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
 		'/ç|ć|ĉ|ċ|č/' => 'c',