Remov newline from error message.

cakephp · Feb 28, 2016 · 06d1c4a · 06d1c4a
1 parent be4eeef
commit 06d1c4a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/ORM/Association.php b/src/ORM/Association.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

diff --git a/tests/TestCase/ORM/AssociationTest.php b/tests/TestCase/ORM/AssociationTest.php
@@ -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()
     {