Fix typo in method name.

It should be 'marshal' not 'marshall'.
cakephp · Mar 18, 2014 · 41fbdc4 · 41fbdc4
1 parent 2ab9feb
commit 41fbdc4
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/src/Database/Type.php b/src/Database/Type.php
@@ -246,7 +246,7 @@ public function newId() {
  * @param mixed $value The value to convert.
  * @return mixed Converted value.
  */
-	public function marshall($value) {
+	public function marshal($value) {
 		return $value;
 	}
 

diff --git a/src/Database/Type/DateTimeType.php b/src/Database/Type/DateTimeType.php
@@ -61,7 +61,7 @@ public function toPHP($value, Driver $driver) {
  * @param mixed $value Request data
  * @return \DateTime
  */
-	public function marshall($value) {
+	public function marshal($value) {
 		try {
 			if ($value === '' || $value === null || $value === false || $value === true) {
 				return $value;

diff --git a/src/Database/Type/DateType.php b/src/Database/Type/DateType.php
@@ -55,7 +55,7 @@ public function toPHP($value, Driver $driver) {
  * @param mixed $value Request data
  * @return \DateTime
  */
-	public function marshall($value) {
+	public function marshal($value) {
 		try {
 			if ($value === '' || $value === null || $value === false || $value === true) {
 				return $value;

diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
@@ -113,7 +113,7 @@ public function one(array $data, $include = []) {
 				$value = $this->_marshalAssociation($assoc, $value, $nested);
 			} elseif ($columnType) {
 				$converter = Type::build($columnType);
-				$value = $converter->marshall($value);
+				$value = $converter->marshal($value);
 			}
 			$properties[$key] = $value;
 		}

diff --git a/tests/TestCase/Database/Type/DateTimeTypeTest.php b/tests/TestCase/Database/Type/DateTimeTypeTest.php
@@ -70,11 +70,11 @@ public function testToDatabase() {
 	}
 
 /**
- * Data provider for marshall()
+ * Data provider for marshal()
  *
  * @return array
  */
-	public function marshallProvider() {
+	public function marshalProvider() {
 		return [
 			// invalid types.
 			[null, null],
@@ -140,11 +140,11 @@ public function marshallProvider() {
 /**
  * test marshalling data.
  *
- * @dataProvider marshallProvider
+ * @dataProvider marshalProvider
  * @return void
  */
-	public function testMarshall($value, $expected) {
-		$result = $this->type->marshall($value);
+	public function testMarshal($value, $expected) {
+		$result = $this->type->marshal($value);
 		$this->assertEquals($expected, $result);
 	}
 

diff --git a/tests/TestCase/Database/Type/DateTypeTest.php b/tests/TestCase/Database/Type/DateTypeTest.php
@@ -74,11 +74,11 @@ public function testToDatabase() {
 	}
 
 /**
- * Data provider for marshall()
+ * Data provider for marshal()
  *
  * @return array
  */
-	public function marshallProvider() {
+	public function marshalProvider() {
 		$date = new \DateTime('@1392387900');
 		$date->setTime(0, 0, 0);
 
@@ -145,13 +145,13 @@ public function marshallProvider() {
 	}
 
 /**
- * test marshalling data.
+ * test marshaling data.
  *
- * @dataProvider marshallProvider
+ * @dataProvider marshalProvider
  * @return void
  */
-	public function testMarshall($value, $expected) {
-		$result = $this->type->marshall($value);
+	public function testMarshal($value, $expected) {
+		$result = $this->type->marshal($value);
 		$this->assertEquals($expected, $result);
 	}