Merge branch 'bpo/2.7/doctrine#3089' into 2.7

Backporting doctrine#3089 into 2.7
Majkl578 · Apr 6, 2018 · 2f64799 · 2f64799
2 parents 62be858 + 1bf8e3a
commit 2f64799
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/Doctrine/DBAL/Schema/Column.php b/lib/Doctrine/DBAL/Schema/Column.php
@@ -132,7 +132,7 @@ public function setOptions(array $options)
                     $name
                 ), E_USER_DEPRECATED);
 
-                return $this;
+                continue;
             }
             $this->$method($value);
         }

diff --git a/tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php b/tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php
@@ -65,6 +65,19 @@ public function testSettingUnknownOptionIsStillSupported() : void
         new Column('foo', $this->createMock(Type::class), ['unknown_option' => 'bar']);
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation The "unknown_option" column option is not supported, setting it is deprecated and will cause an error in Doctrine 3.0
+     */
+    public function testOptionsShouldNotBeIgnored() : void
+    {
+        $col1 = new Column('bar', Type::getType(Type::INTEGER), ['unknown_option' => 'bar', 'notnull' => true]);
+        self::assertTrue($col1->getNotnull());
+
+        $col2 = new Column('bar', Type::getType(Type::INTEGER), ['unknown_option' => 'bar', 'notnull' => false]);
+        self::assertFalse($col2->getNotnull());
+    }
+
     /**
      * @return Column
      */