Skip to content
Permalink
Browse files

Remov newline from error message.

  • Loading branch information...
ADmad committed Feb 28, 2016
1 parent be4eeef commit 06d1c4a0388b731a9cdfe4ef2e76910565fa6626
Showing with 2 additions and 1 deletion.
  1. +1 −1 src/ORM/Association.php
  2. +1 −0 tests/TestCase/ORM/AssociationTest.php
@@ -439,7 +439,7 @@ public function property($name = null)
$this->_propertyName = $this->_propertyName();
if (in_array($this->_propertyName, $this->_sourceTable->schema()->columns())) {
$msg = 'Association property name "%s" clashes with field of same name of table "%s".' .
"\n" . 'You should explicitly specify the "propertyName" option.';
' You should explicitly specify the "propertyName" option.';
trigger_error(
sprintf($msg, $this->_propertyName, $this->_sourceTable->table()),
E_USER_WARNING
@@ -334,6 +334,7 @@ public function testProperty()
*
* @return void
* @expectedException PHPUnit_Framework_Error_Warning
* @expectedExceptionMessageRegExp /^Association property name "foo" clashes with field of same name of table "test"/
*/
public function testPropertyNameClash()
{

0 comments on commit 06d1c4a

Please sign in to comment.
You can’t perform that action at this time.