CakePlugin updates

Console/Command/CcShell.php

@@ -358,7 +358,7 @@ class CcShell extends AppShell {
 		}
 
 		if (!isset($this->plugins)) {
-			$this->plugins = App::objects('plugin');
+			$this->plugins = CakePlugin::loaded();
 		}
 
 		if (!empty($this->plugins)) {

Console/Command/CodeShell.php

@@ -28,7 +28,7 @@ class CodeShell extends AppShell {
 		if ($customPath = $this->params['custom']) {
 			$this->_paths = array($customPath);
 		} elseif (!empty($this->params['plugin'])) {
-			$this->_paths = array(App::pluginPath($this->params['plugin']));
+			$this->_paths = array(CakePlugin::path($this->params['plugin']));
 		} else {
 			$this->_paths = array(APP);
 		}

Test/Case/View/Helper/MyHelperUrlCacheTest.php

@@ -17,6 +17,7 @@ class MyHelperUrlCacheTest extends CakeTestCase {
 		Configure::write('UrlCache.pageFiles', true);
 		Configure::write('UrlCache.verbosePrefixes', true);
 		Configure::write('Routing.prefixes', array('admin'));
+		Router::reload();
 
 		$this->HtmlHelper = new MyHelper(new View(new Controller(new CakeRequest('/test', false))));
 		$this->HtmlHelper->beforeRender('foo');
@@ -41,23 +42,23 @@ class MyHelperUrlCacheTest extends CakeTestCase {
 
 	public function testUrlRelative() {
 		$url = $this->HtmlHelper->url(array('controller' => 'posts'));
-		$this->assertEqual($url, '/posts');
-		$this->assertEqual(array('779e416667ffd33e75ac19e0952abb47' => '/posts'), UrlCacheManager::$cache);
+		$this->assertEquals($url, '/posts');
+		$this->assertEquals(array('779e416667ffd33e75ac19e0952abb47' => '/posts'), UrlCacheManager::$cache);
 
 		$this->HtmlHelper->afterLayout('foo');
 		$cache = Cache::read(UrlCacheManager::$cacheKey, '_cake_core_');
-		$this->assertEqual(array('779e416667ffd33e75ac19e0952abb47' => '/posts'), $cache);
+		$this->assertEquals(array('779e416667ffd33e75ac19e0952abb47' => '/posts'), $cache);
 	}
 
 	public function testUrlFull() {
 		$url = $this->HtmlHelper->url(array('controller' => 'posts'), true);
 		$this->assertPattern('/http:\/\/(.*)\/posts/', $url);
-		$this->assertEqual(array('8f45f5c31d138d700742b01ccb673e1e'), array_keys(UrlCacheManager::$cache));
+		$this->assertEquals(array('8f45f5c31d138d700742b01ccb673e1e'), array_keys(UrlCacheManager::$cache));
 		$this->assertPattern('/http:\/\/(.*)\/posts/', UrlCacheManager::$cache['8f45f5c31d138d700742b01ccb673e1e']);
 
 		$this->HtmlHelper->afterLayout('foo');
 		$cache = Cache::read(UrlCacheManager::$cacheKey, '_cake_core_');
-		$this->assertEqual(array('8f45f5c31d138d700742b01ccb673e1e'), array_keys($cache));
+		$this->assertEquals(array('8f45f5c31d138d700742b01ccb673e1e'), array_keys($cache));
 		$this->assertPattern('/http:\/\/(.*)\/posts/', $cache['8f45f5c31d138d700742b01ccb673e1e']);
 	}
 
@@ -65,59 +66,59 @@ class MyHelperUrlCacheTest extends CakeTestCase {
 		$this->HtmlHelper->url(array('controller' => 'posts'));
 		$this->HtmlHelper->url(array('controller' => 'posts'), true);
 
-		$this->assertEqual(array('779e416667ffd33e75ac19e0952abb47', '8f45f5c31d138d700742b01ccb673e1e'), array_keys(UrlCacheManager::$cache));
+		$this->assertEquals(array('779e416667ffd33e75ac19e0952abb47', '8f45f5c31d138d700742b01ccb673e1e'), array_keys(UrlCacheManager::$cache));
 
 		$this->HtmlHelper->afterLayout('foo');
 		$cache = Cache::read(UrlCacheManager::$cacheKey, '_cake_core_');
-		$this->assertEqual(array('779e416667ffd33e75ac19e0952abb47', '8f45f5c31d138d700742b01ccb673e1e'), array_keys($cache));
+		$this->assertEquals(array('779e416667ffd33e75ac19e0952abb47', '8f45f5c31d138d700742b01ccb673e1e'), array_keys($cache));
 	}
 
 	public function testUrlWithParams() {
 		$this->HtmlHelper->url(array('controller' => 'posts'), true);
 		$this->HtmlHelper->url(array('controller' => 'posts', 'action' => 'view', '3'));
 
-		$this->assertEqual(array('8f45f5c31d138d700742b01ccb673e1e'), array_keys(UrlCacheManager::$cache));
-		$this->assertEqual(array('e2ff5470228f80f98b2be7ddbcab340d'), array_keys(UrlCacheManager::$cachePage));
+		$this->assertEquals(array('8f45f5c31d138d700742b01ccb673e1e'), array_keys(UrlCacheManager::$cache));
+		$this->assertEquals(array('e2ff5470228f80f98b2be7ddbcab340d'), array_keys(UrlCacheManager::$cachePage));
 
 		$this->HtmlHelper->afterLayout('foo');
 		$cache = Cache::read(UrlCacheManager::$cacheKey, '_cake_core_');
-		$this->assertEqual(array('8f45f5c31d138d700742b01ccb673e1e'), array_keys($cache));
+		$this->assertEquals(array('8f45f5c31d138d700742b01ccb673e1e'), array_keys($cache));
 		$cache = Cache::read(UrlCacheManager::$cachePageKey, '_cake_core_');
-		$this->assertEqual(array('e2ff5470228f80f98b2be7ddbcab340d'), array_keys($cache));
+		$this->assertEquals(array('e2ff5470228f80f98b2be7ddbcab340d'), array_keys($cache));
 	}
 
 	public function testUrlWithDifferentOrders() {
 		$this->HtmlHelper->url(array('plugin' => 'tools', 'controller' => 'posts', 'action' => 'view'));
 		$this->HtmlHelper->url(array('action' => 'view', 'controller' => 'posts', 'plugin' => 'tools'));
-		$this->assertEqual(array('0ba1e9d8ab27a564450be9aa93bd4a1c'), array_keys(UrlCacheManager::$cache));
+		$this->assertEquals(array('0ba1e9d8ab27a564450be9aa93bd4a1c'), array_keys(UrlCacheManager::$cache));
 
 		$this->HtmlHelper->url(array('plugin' => 'tools', 'controller' => 'posts', 'action' => 'view', '3'));
 		$this->HtmlHelper->url(array('action' => 'view', 'controller' => 'posts', 'plugin' => 'tools', '3'));
-		$this->assertEqual(array('f5509ea5e31562b541948d89b4d65700'), array_keys(UrlCacheManager::$cachePage));
+		$this->assertEquals(array('f5509ea5e31562b541948d89b4d65700'), array_keys(UrlCacheManager::$cachePage));
 
 		$this->HtmlHelper->afterLayout('foo');
 		$cache = Cache::read(UrlCacheManager::$cacheKey, '_cake_core_');
-		$this->assertEqual(array('0ba1e9d8ab27a564450be9aa93bd4a1c'), array_keys($cache));
+		$this->assertEquals(array('0ba1e9d8ab27a564450be9aa93bd4a1c'), array_keys($cache));
 		$cache = Cache::read(UrlCacheManager::$cachePageKey, '_cake_core_');
-		$this->assertEqual(array('f5509ea5e31562b541948d89b4d65700'), array_keys($cache));
+		$this->assertEquals(array('f5509ea5e31562b541948d89b4d65700'), array_keys($cache));
 	}
 
 	public function testUrlWithDifferentValues() {
 		$url = $this->HtmlHelper->url(array('plugin' => false, 'controller' => 'posts', 'action' => 'details', 1));
 		$url2 = $this->HtmlHelper->url(array('plugin' => null, 'controller' => 'posts', 'action' => 'details', '1'));
 		$url3 = $this->HtmlHelper->url(array('plugin' => '', 'controller' => 'posts', 'action' => 'details', true));
-		$this->assertEqual($url, $url2);
-		$this->assertEqual($url2, $url3);
-		$this->assertEqual(array('f0fdde123fe5958781cfad4284ee59c4'), array_keys(UrlCacheManager::$cachePage));
+		$this->assertEquals($url, $url2);
+		$this->assertEquals($url2, $url3);
+		$this->assertEquals(array('f0fdde123fe5958781cfad4284ee59c4'), array_keys(UrlCacheManager::$cachePage));
 
 		$this->HtmlHelper->afterLayout('foo');
 		$cache = Cache::read(UrlCacheManager::$cachePageKey, '_cake_core_');
-		$this->assertEqual(array('f0fdde123fe5958781cfad4284ee59c4'), array_keys($cache));
+		$this->assertEquals(array('f0fdde123fe5958781cfad4284ee59c4'), array_keys($cache));
 	}
 
 	public function testGlobalCache() {
 		$res = UrlCacheManager::get(array('controller' => 'posts', 'action' => 'index'), false);
-		$this->assertEqual(false, $res);
+		$this->assertEquals(false, $res);
 
 		$url = $this->HtmlHelper->url(array('controller' => 'posts', 'action' => 'index'));
 		$this->HtmlHelper->afterLayout('foo');
@@ -125,7 +126,7 @@ class MyHelperUrlCacheTest extends CakeTestCase {
 		# on second page the same url will not trigger a miss but a hit
 		$this->HtmlHelper->beforeRender('foo');
 		$res = UrlCacheManager::get(array('controller' => 'posts', 'action' => 'index'), false);
-		$this->assertEqual($url, $res);
+		$this->assertEquals($url, $res);
 
 		$this->HtmlHelper->afterLayout('foo');
 	}
@@ -133,13 +134,13 @@ class MyHelperUrlCacheTest extends CakeTestCase {
 	public function testUrlWithVerbosePrefixes() {
 		$url = $this->HtmlHelper->url(array('plugin' => 'tools', 'controller' => 'posts', 'action' => 'view', 'admin' => true));
 		$url2 = $this->HtmlHelper->url(array('action' => 'view', 'controller' => 'posts', 'plugin' => 'tools', 'admin' => true));
-		$this->assertEqual(array('3016e3546edf1c2152905da5a42ea13f'), array_keys(UrlCacheManager::$cache));
-		$this->assertEqual('/admin/tools/posts/view', $url);
-		$this->assertEqual($url, $url2);
+		$this->assertEquals(array('3016e3546edf1c2152905da5a42ea13f'), array_keys(UrlCacheManager::$cache));
+		$this->assertEquals('/admin/tools/posts/view', $url);
+		$this->assertEquals($url, $url2);
 
 		$this->HtmlHelper->url(array('plugin' => 'tools', 'controller' => 'posts', 'action' => 'view', 'admin' => true, 'some' => 'param'));
 		$this->HtmlHelper->url(array('action' => 'view', 'controller' => 'posts', 'plugin' => 'tools', 'some' => 'param', 'admin' => true));
-		$this->assertEqual(array('25a924190d6e0ed09127d1904a286a95'), array_keys(UrlCacheManager::$cachePage));
+		$this->assertEquals(array('25a924190d6e0ed09127d1904a286a95'), array_keys(UrlCacheManager::$cachePage));
 
 		$this->HtmlHelper->afterLayout('foo');
 	}
@@ -155,13 +156,13 @@ class MyHelperUrlCacheTest extends CakeTestCase {
 		$this->HtmlHelper->beforeRender('foo');
 
 		$url = $this->HtmlHelper->url(array('plugin' => 'tools', 'controller' => 'posts', 'action' => 'view', 'prefix' => 'admin'));
-		$this->assertEqual(array('41d5d7eb9442adbe76e6c7ebbb02ecc7'), array_keys(UrlCacheManager::$cache));
-		$this->assertEqual('/admin/tools/posts/view', $url);
+		$this->assertEquals(array('41d5d7eb9442adbe76e6c7ebbb02ecc7'), array_keys(UrlCacheManager::$cache));
+		$this->assertEquals('/admin/tools/posts/view', $url);
 
 		$url = $this->HtmlHelper->url(array('plugin' => 'tools', 'controller' => 'posts', 'action' => 'view', 'prefix' => 'admin', 'some' => 'param'));
 		$this->HtmlHelper->url(array('action' => 'view', 'controller' => 'posts', 'plugin' => 'tools', 'some' => 'param', 'prefix' => 'admin'));
-		$this->assertEqual('/admin/tools/posts/view/some:param', $url);
-		$this->assertEqual(array('6a7091b88c8132ebb5461851808d318a'), array_keys(UrlCacheManager::$cachePage));
+		$this->assertEquals('/admin/tools/posts/view/some:param', $url);
+		$this->assertEquals(array('6a7091b88c8132ebb5461851808d318a'), array_keys(UrlCacheManager::$cachePage));
 
 		$this->HtmlHelper->afterLayout('foo');
 	}

View/Helper/FormatHelper.php

@@ -684,8 +684,8 @@ class FormatHelper extends TextHelper {
 	 * @return image:Yes/No or text:Yes/No
 	 */
 	public function yesNo($v, $ontitle = null, $offtitle = null, $on = 1, $text = false, $notitle = false) {
-		$ontitle = (!empty($ontitle) ? $ontitle : __('Ja'));
-		$offtitle = (!empty($offtitle) ? $offtitle : __('Nein'));
+		$ontitle = (!empty($ontitle) ? $ontitle : __('Yes'));
+		$offtitle = (!empty($offtitle) ? $offtitle : __('No'));
 		$sbez = array('0' => @substr($offtitle, 0, 1), '1' => @substr($ontitle, 0, 1));
 		$bez = array('0' => $offtitle, '1' => $ontitle);