updated-packages

vendor/doctrine/dbal/lib/Doctrine/DBAL/Schema/Column.php

@@ -3,12 +3,11 @@
 namespace Doctrine\DBAL\Schema;
 
 use Doctrine\DBAL\Types\Type;
-use const E_USER_DEPRECATED;
+use Doctrine\Deprecations\Deprecation;
+
 use function array_merge;
 use function is_numeric;
 use function method_exists;
-use function sprintf;
-use function trigger_error;
 
 /**
  * Object representation of a database column.
@@ -19,7 +18,7 @@ class Column extends AbstractAsset
     protected $_type;
 
     /** @var int|null */
-    protected $_length = null;
+    protected $_length;
 
     /** @var int */
     protected $_precision = 10;
@@ -37,7 +36,7 @@ class Column extends AbstractAsset
     protected $_notnull = true;
 
     /** @var string|null */
-    protected $_default = null;
+    protected $_default;
 
     /** @var bool */
     protected $_autoincrement = false;
@@ -46,10 +45,10 @@ class Column extends AbstractAsset
     protected $_platformOptions = [];
 
     /** @var string|null */
-    protected $_columnDefinition = null;
+    protected $_columnDefinition;
 
     /** @var string|null */
-    protected $_comment = null;
+    protected $_comment;
 
     /** @var mixed[] */
     protected $_customSchemaOptions = [];
@@ -57,12 +56,12 @@ class Column extends AbstractAsset
     /**
      * Creates a new Column.
      *
-     * @param string  $columnName
+     * @param string  $name
      * @param mixed[] $options
      */
-    public function __construct($columnName, Type $type, array $options = [])
+    public function __construct($name, Type $type, array $options = [])
     {
-        $this->_setName($columnName);
+        $this->_setName($name);
         $this->setType($type);
         $this->setOptions($options);
     }
@@ -78,14 +77,17 @@ class Column extends AbstractAsset
             $method = 'set' . $name;
             if (! method_exists($this, $method)) {
                 // next major: throw an exception
-                @trigger_error(sprintf(
+                Deprecation::trigger(
+                    'doctrine/dbal',
+                    'https://github.com/doctrine/dbal/pull/2846',
                     'The "%s" column option is not supported,' .
-                    ' setting it is deprecated and will cause an error in Doctrine 3.0',
+                    ' setting unknown options is deprecated and will cause an error in Doctrine DBAL 3.0',
                     $name
-                ), E_USER_DEPRECATED);
+                );
 
                 continue;
             }
+
             $this->$method($value);
         }
 
@@ -356,7 +358,7 @@ class Column extends AbstractAsset
     }
 
     /**
-     * @param string $comment
+     * @param string|null $comment
      *
      * @return Column
      */