Merge branch '3.0' into 3.0-model

cakephp · Jun 12, 2013 · 48bb198 · 48bb198
2 parents 4860ed3 + a163e32
commit 48bb198
Show file tree

Hide file tree

Showing 16 changed files with 71 additions and 39 deletions.
diff --git a/lib/Cake/Database/Exception.php b/lib/Cake/Database/Exception.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * PHP Version 5.4
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         CakePHP(tm) v 3.0.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+namespace Cake\Database;
+
+/**
+ * Exception for the database package.
+ */
+class Exception extends \Cake\Error\Exception {
+
+}
diff --git a/lib/Cake/Database/Schema/Table.php b/lib/Cake/Database/Schema/Table.php
@@ -16,8 +16,8 @@
  */
 namespace Cake\Database\Schema;
 
-use Cake\Database\Exception;
 use Cake\Database\Connection;
+use Cake\Database\Exception;
 
 /**
  * Represents a single table in a database schema.
@@ -331,6 +331,7 @@ public function addConstraint($name, $attrs) {
  *
  * @param array $attrs Attributes to set.
  * @return array
+ * @throw Cake\Database\Exception When foreign key definition is not valid.
  */
 	protected function _checkForeignKey($attrs) {
 		if (count($attrs['references']) < 2) {

diff --git a/lib/Cake/Network/Email/Email.php b/lib/Cake/Network/Email/Email.php
@@ -20,6 +20,7 @@
 use Cake\Error;
 use Cake\Log\Log;
 use Cake\Network\Http\FormData\Part;
+use Cake\Utility\File;
 use Cake\Utility\Hash;
 use Cake\Utility\String;
 use Cake\Utility\Validation;
@@ -1251,7 +1252,7 @@ protected function _wrap($message, $wrapLength = Email::LINE_LENGTH_MUST) {
 		$message = str_replace(array("\r\n", "\r"), "\n", $message);
 		$lines = explode("\n", $message);
 		$formatted = array();
-		$cut = ($wrapLength == CakeEmail::LINE_LENGTH_MUST) ? true : false;
+		$cut = ($wrapLength == Email::LINE_LENGTH_MUST) ? true : false;
 
 		foreach ($lines as $line) {
 			if (empty($line)) {

diff --git a/lib/Cake/Routing/Route/RedirectRoute.php b/lib/Cake/Routing/Route/RedirectRoute.php
@@ -16,8 +16,8 @@
 namespace Cake\Routing\Route;
 
 use Cake\Network\Response;
-use Cake\Routing\Route\Route;
 use Cake\Routing\Router;
+use Cake\Routing\Route\Route;
 
 /**
  * Redirect route will perform an immediate redirect. Redirect routes

diff --git a/lib/Cake/Test/TestApp/View/Emails/html/html.ctp b/lib/Cake/Test/TestApp/View/Emails/html/html.ctp
@@ -0,0 +1,15 @@
+<?php
+use Cake\Network\Email\Email;
+?>
+<h1>HTML Ipsum Presents</h1><p><strong>Pellentesque habitant morbi tristique</strong> senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. <em>Aenean ultricies mi vitae est.</em> Mauris placerat eleifend leo. Quisque sit amet est et sapien ullamcorper pharetra. Vestibulum erat wisi, condimentum sed, <code>commodo vitae</code>, ornare sit amet, wisi. Aenean fermentum, elit eget tincidunt condimentum, eros ipsum rutrum orci, sagittis tempus lacus enim ac dui. <a href="#">Donec non enim</a> in turpis pulvinar facilisis. Ut felis.</p><h2>Header Level 2</h2><ol><li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li><li>Aliquam tincidunt mauris eu risus.</li></ol><blockquote><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus magna. Cras in mi at felis aliquet congue. Ut a est eget ligula molestie gravida. Curabitur massa. Donec eleifend, libero at sagittis mollis, tellus est malesuada tellus, at luctus turpis elit sit amet quam. Vivamus pretium ornare est.</p></blockquote><h3>Header Level 3</h3><ul><li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</li><li>Aliquam tincidunt mauris eu risus.</li></ul>
+<pre><code>
+#header h1 a {
+	display: block;
+	width: 300px;
+	height: 80px;
+}</code></pre>
+<table>
+<th align="right" valign="top"
+        style="font-weight: bold">The tag is across multiple lines - <?php echo str_repeat('x', Email::LINE_LENGTH_MUST); ?></th>
+</table>
+<p>Some more <?php echo str_repeat('x', Email::LINE_LENGTH_MUST); ?> <b>Bold</b> test.</p>
diff --git a/lib/Cake/Test/TestCase/Controller/PagesControllerTest.php b/lib/Cake/Test/TestCase/Controller/PagesControllerTest.php
@@ -19,7 +19,7 @@
  */
 namespace Cake\Test\TestCase\Controller;
 
-use \App\Controller\PagesController;
+use App\Controller\PagesController;
 use Cake\Core\App;
 use Cake\Network\Request;
 use Cake\Network\Response;

diff --git a/lib/Cake/Test/TestCase/Database/Schema/CollectionTest.php b/lib/Cake/Test/TestCase/Database/Schema/CollectionTest.php
@@ -18,8 +18,8 @@
 
 use Cake\Core\Configure;
 use Cake\Database\Connection;
-use Cake\Database\Schema\Table;
 use Cake\Database\Schema\Collection;
+use Cake\Database\Schema\Table;
 use Cake\TestSuite\TestCase;
 
 /**

diff --git a/lib/Cake/Test/TestCase/Database/Schema/MysqlSchemaTest.php b/lib/Cake/Test/TestCase/Database/Schema/MysqlSchemaTest.php
@@ -23,7 +23,6 @@
 use Cake\Database\Schema\Table;
 use Cake\TestSuite\TestCase;
 
-
 /**
  * Test case for Mysql Schema Dialect.
  */

diff --git a/lib/Cake/Test/TestCase/Database/Schema/SqliteSchemaTest.php b/lib/Cake/Test/TestCase/Database/Schema/SqliteSchemaTest.php
@@ -23,7 +23,6 @@
 use Cake\Database\Schema\Table;
 use Cake\TestSuite\TestCase;
 
-
 /**
  * Test case for Sqlite Schema Dialect.
  */
@@ -606,7 +605,6 @@ public function testCreateSql() {
 		);
 	}
 
-
 /**
  * test dropSql
  *

diff --git a/lib/Cake/Test/TestCase/Database/Schema/TableTest.php b/lib/Cake/Test/TestCase/Database/Schema/TableTest.php
@@ -250,8 +250,7 @@ public function testAddConstraintForeignKey() {
  *
  * @return array
  */
-	public static function badForeignKeyProvider()
-	{
+	public static function badForeignKeyProvider() {
 		return [
 			'references is bad' => [[
 				'type' => Table::CONSTRAINT_FOREIGN,

diff --git a/lib/Cake/Test/TestCase/Network/Email/EmailTest.php b/lib/Cake/Test/TestCase/Network/Email/EmailTest.php
@@ -42,7 +42,7 @@ public function formatAddress($address) {
  * Wrap to protected method
  *
  */
-	public function wrap($text, $length = CakeEmail::LINE_LENGTH_MUST) {
+	public function wrap($text, $length = Email::LINE_LENGTH_MUST) {
 		return parent::_wrap($text, $length);
 	}
 
@@ -1037,27 +1037,25 @@ public function testSendWithLog() {
  * @return void
  */
 	public function testSendWithLogAndScope() {
-		CakeLog::config('email', array(
+		Configure::write('Log.email', array(
 			'engine' => 'FileLog',
 			'path' => TMP,
-			'types' => array('cake_test_emails'),
+			'file' => 'cake_test_emails',
 			'scopes' => array('email')
 		));
-		CakeLog::drop('default');
+		Log::reset();
 		$this->CakeEmail->transport('Debug');
 		$this->CakeEmail->to('me@cakephp.org');
 		$this->CakeEmail->from('cake@cakephp.org');
 		$this->CakeEmail->subject('My title');
-		$this->CakeEmail->config(array('log' => array('level' => 'cake_test_emails', 'scope' => 'email')));
+		$this->CakeEmail->config(array('log' => array('scope' => 'email')));
 		$result = $this->CakeEmail->send("Logging This");
 
-		App::uses('File', 'Utility');
 		$File = new File(TMP . 'cake_test_emails.log');
 		$log = $File->read();
 		$this->assertTrue(strpos($log, $result['headers']) !== false);
 		$this->assertTrue(strpos($log, $result['message']) !== false);
 		$File->delete();
-		CakeLog::drop('email');
 	}
 
 /**
@@ -1920,7 +1918,7 @@ protected function _getEmailByNewStyleCharset($charset, $headerCharset) {
 	}
 
 	public function testWrapLongLine() {
-		$message = '<a href="http://cakephp.org">' . str_repeat('x', CakeEmail::LINE_LENGTH_MUST) . "</a>";
+		$message = '<a href="http://cakephp.org">' . str_repeat('x', Email::LINE_LENGTH_MUST) . "</a>";
 
 		$this->CakeEmail->reset();
 		$this->CakeEmail->transport('Debug');
@@ -1929,32 +1927,32 @@ public function testWrapLongLine() {
 		$this->CakeEmail->subject('Wordwrap Test');
 		$this->CakeEmail->config(array('empty'));
 		$result = $this->CakeEmail->send($message);
-		$expected = "<a\r\n" . 'href="http://cakephp.org">' . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - 26) . "\r\n" .
+		$expected = "<a\r\n" . 'href="http://cakephp.org">' . str_repeat('x', Email::LINE_LENGTH_MUST - 26) . "\r\n" .
 			str_repeat('x', 26) . "\r\n</a>\r\n\r\n";
 		$this->assertEquals($expected, $result['message']);
 		$this->assertLineLengths($result['message']);
 
 		$str1 = "a ";
 		$str2 = " b";
 		$length = strlen($str1) + strlen($str2);
-		$message = $str1 . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length - 1) . $str2;
+		$message = $str1 . str_repeat('x', Email::LINE_LENGTH_MUST - $length - 1) . $str2;
 
 		$result = $this->CakeEmail->send($message);
 		$expected = "{$message}\r\n\r\n";
 		$this->assertEquals($expected, $result['message']);
 		$this->assertLineLengths($result['message']);
 
-		$message = $str1 . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length) . $str2;
+		$message = $str1 . str_repeat('x', Email::LINE_LENGTH_MUST - $length) . $str2;
 
 		$result = $this->CakeEmail->send($message);
 		$expected = "{$message}\r\n\r\n";
 		$this->assertEquals($expected, $result['message']);
 		$this->assertLineLengths($result['message']);
 
-		$message = $str1 . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length + 1) . $str2;
+		$message = $str1 . str_repeat('x', Email::LINE_LENGTH_MUST - $length + 1) . $str2;
 
 		$result = $this->CakeEmail->send($message);
-		$expected = $str1 . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length + 1) . sprintf("\r\n%s\r\n\r\n", trim($str2));
+		$expected = $str1 . str_repeat('x', Email::LINE_LENGTH_MUST - $length + 1) . sprintf("\r\n%s\r\n\r\n", trim($str2));
 		$this->assertEquals($expected, $result['message']);
 		$this->assertLineLengths($result['message']);
 	}
@@ -1967,7 +1965,7 @@ public function testWrapWithTagsAcrossLines() {
 </table>
 HTML;
 		$length = strlen($str);
-		$message = $str . str_repeat('x', CakeEmail::LINE_LENGTH_MUST + 1);
+		$message = $str . str_repeat('x', Email::LINE_LENGTH_MUST + 1);
 
 		$this->CakeEmail->reset();
 		$this->CakeEmail->transport('Debug');
@@ -1986,7 +1984,7 @@ public function testWrapWithTagsAcrossLines() {
 	public function testWrapIncludeLessThanSign() {
 		$str = 'foo<bar';
 		$length = strlen($str);
-		$message = $str . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length + 1);
+		$message = $str . str_repeat('x', Email::LINE_LENGTH_MUST - $length + 1);
 
 		$this->CakeEmail->reset();
 		$this->CakeEmail->transport('Debug');
@@ -2028,8 +2026,8 @@ public function testWrapForJapaneseEncoding() {
 	public function assertLineLengths($message) {
 		$lines = explode("\r\n", $message);
 		foreach ($lines as $line) {
-			$this->assertTrue(strlen($line) <= CakeEmail::LINE_LENGTH_MUST,
-				'Line length exceeds the max. limit of CakeEmail::LINE_LENGTH_MUST');
+			$this->assertTrue(strlen($line) <= Email::LINE_LENGTH_MUST,
+				'Line length exceeds the max. limit of Email::LINE_LENGTH_MUST');
 		}
 	}
 

diff --git a/lib/Cake/Test/TestCase/Network/SocketTest.php b/lib/Cake/Test/TestCase/Network/SocketTest.php
@@ -136,7 +136,7 @@ public function testInvalidConnection($data) {
  */
 	public function testSocketHost() {
 		try {
-			$this->Socket = new CakeSocket();
+			$this->Socket = new Socket();
 			$this->Socket->connect();
 			$this->assertEquals('127.0.0.1', $this->Socket->address());
 			$this->assertEquals(gethostbyaddr('127.0.0.1'), $this->Socket->host());
@@ -180,7 +180,7 @@ public function testSocketReading() {
 			$this->assertEquals(null, $this->Socket->read(26));
 
 			$config = array('host' => 'google.com', 'port' => 80, 'timeout' => 1);
-			$this->Socket = new CakeSocket($config);
+			$this->Socket = new Socket($config);
 			$this->assertTrue($this->Socket->connect());
 			$this->assertEquals(null, $this->Socket->read(26));
 			$this->assertEquals('2: ' . __d('cake_dev', 'Connection timed out'), $this->Socket->lastError());
@@ -201,7 +201,7 @@ public function testTimeOutConnection() {
 			$this->assertTrue($this->Socket->connect());
 
 			$config = array('host' => '127.0.0.1', 'timeout' => 0.00001);
-			$this->Socket = new CakeSocket($config);
+			$this->Socket = new Socket($config);
 			$this->assertFalse($this->Socket->read(1024 * 1024));
 			$this->assertEquals('2: ' . __d('cake_dev', 'Connection timed out'), $this->Socket->lastError());
 		} catch (Error\SocketException $e) {

diff --git a/lib/Cake/Test/TestCase/Routing/Route/PluginShortRouteTest.php b/lib/Cake/Test/TestCase/Routing/Route/PluginShortRouteTest.php
@@ -21,8 +21,8 @@
 
 use Cake\Core\App;
 use Cake\Core\Configure;
-use Cake\Routing\Route\PluginShortRoute;
 use Cake\Routing\Router;
+use Cake\Routing\Route\PluginShortRoute;
 use Cake\TestSuite\TestCase;
 
 /**

diff --git a/lib/Cake/Test/TestCase/Routing/Route/RedirectRouteTest.php b/lib/Cake/Test/TestCase/Routing/Route/RedirectRouteTest.php
@@ -22,8 +22,8 @@
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Network\Response;
-use Cake\Routing\Route\RedirectRoute;
 use Cake\Routing\Router;
+use Cake\Routing\Route\RedirectRoute;
 use Cake\TestSuite\TestCase;
 
 /**

diff --git a/lib/Cake/Test/TestCase/Routing/RouterTest.php b/lib/Cake/Test/TestCase/Routing/RouterTest.php
@@ -27,10 +27,6 @@
 use Cake\Routing\Route\Route;
 use Cake\TestSuite\TestCase;
 
-if (!defined('FULL_BASE_URL')) {
-	define('FULL_BASE_URL', 'http://cakephp.org');
-}
-
 /**
  * RouterTest class
  *
@@ -47,6 +43,8 @@ public function setUp() {
 		parent::setUp();
 		Configure::write('Routing', array('admin' => null, 'prefixes' => array()));
 		Router::reload();
+		Router::baseURL('');
+		Configure::write('App.fullBaseURL', 'http://localhost');
 	}
 
 /**
@@ -70,7 +68,6 @@ public function testFullBaseURL() {
 		$this->assertRegExp('/^http(s)?:\/\//', Router::url('/', true));
 		$this->assertRegExp('/^http(s)?:\/\//', Router::url(null, true));
 		$this->assertRegExp('/^http(s)?:\/\//', Router::url(array('_full' => true)));
-		$this->assertSame(FULL_BASE_URL . '/', Router::url(array('_full' => true)));
 	}
 
 /**
@@ -79,7 +76,6 @@ public function testFullBaseURL() {
  * @return void
  */
 	public function testBaseURL() {
-		$this->assertEquals(FULL_BASE_URL, Router::baseUrl());
 		Router::baseURL('http://example.com');
 		$this->assertEquals('http://example.com/', Router::url('/', true));
 		$this->assertEquals('http://example.com', Configure::read('App.fullBaseURL'));
@@ -2438,7 +2434,7 @@ public function testUrlProtocol() {
 		$this->assertEquals($url, Router::url($url));
 		$url = '/posts/index#here';
 
-		$expected = FULL_BASE_URL . '/posts/index#here';
+		$expected = Configure::read('App.fullBaseURL') . '/posts/index#here';
 		$this->assertEquals($expected, Router::url($url, true));
 	}
 

diff --git a/lib/Cake/TestSuite/Fixture/TestFixture.php b/lib/Cake/TestSuite/Fixture/TestFixture.php
@@ -178,6 +178,7 @@ protected function _schemaFromFields() {
  * Build fixture schema from a table in another datasource.
  *
  * @return void
+ * @throws Cake\Error\Exception when trying to import from an empty table.
  */
 	protected function _schemaFromImport() {
 		if (!is_array($this->import)) {