Prevent object creation for the DatabaseTableColumn factory classes

Resolves #4563

diff --git a/wcfsetup/install/files/lib/system/database/table/column/DefaultFalseBooleanDatabaseTableColumn.class.php b/wcfsetup/install/files/lib/system/database/table/column/DefaultFalseBooleanDatabaseTableColumn.class.php
index 5be53e1bc6a2282faddeaed5864ecb6c8cf79517..1aed91c838e5db5082ebe1d9409d93ded7a60a7a 100644 (file)
--- a/wcfsetup/install/files/lib/system/database/table/column/DefaultFalseBooleanDatabaseTableColumn.class.php
+++ b/wcfsetup/install/files/lib/system/database/table/column/DefaultFalseBooleanDatabaseTableColumn.class.php
@@ -12,19 +12,17 @@ namespace wcf\system\database\table\column;
  * @package WoltLabSuite\Core\System\Database\Table\Column
  * @since   5.2
  */
-class DefaultFalseBooleanDatabaseTableColumn extends TinyintDatabaseTableColumn
+final class DefaultFalseBooleanDatabaseTableColumn
 {
-    /**
-     * @inheritDoc
-     */
     public static function create($name)
     {
-        /** @var TinyintDatabaseTableColumn $column */
-        $column = parent::create($name);
-
-        return $column
+        return TinyintDatabaseTableColumn::create($name)
             ->length(1)
             ->notNull()
             ->defaultValue(0);
     }
+
+    private function __construct()
+    {
+    }
 }

diff --git a/wcfsetup/install/files/lib/system/database/table/column/DefaultTrueBooleanDatabaseTableColumn.class.php b/wcfsetup/install/files/lib/system/database/table/column/DefaultTrueBooleanDatabaseTableColumn.class.php
index 3c28ebd43dfdaeefd5ab76a717489d063240bb53..fd269768170fd9b94159952b643d8d8518fbe254 100644 (file)
--- a/wcfsetup/install/files/lib/system/database/table/column/DefaultTrueBooleanDatabaseTableColumn.class.php
+++ b/wcfsetup/install/files/lib/system/database/table/column/DefaultTrueBooleanDatabaseTableColumn.class.php
@@ -12,19 +12,17 @@ namespace wcf\system\database\table\column;
  * @package WoltLabSuite\Core\System\Database\Table\Column
  * @since   5.2
  */
-class DefaultTrueBooleanDatabaseTableColumn extends TinyintDatabaseTableColumn
+final class DefaultTrueBooleanDatabaseTableColumn
 {
-    /**
-     * @inheritDoc
-     */
     public static function create($name)
     {
-        /** @var TinyintDatabaseTableColumn $column */
-        $column = parent::create($name);
-
-        return $column
+        return TinyintDatabaseTableColumn::create($name)
             ->length(1)
             ->notNull()
             ->defaultValue(1);
     }
+
+    private function __construct()
+    {
+    }
 }

diff --git a/wcfsetup/install/files/lib/system/database/table/column/NotNullInt10DatabaseTableColumn.class.php b/wcfsetup/install/files/lib/system/database/table/column/NotNullInt10DatabaseTableColumn.class.php
index 78aace36866dd40c7515fb7131bee962b29bfe99..0fe91517d58732fd961a0173dd8ae0735af90c7f 100644 (file)
--- a/wcfsetup/install/files/lib/system/database/table/column/NotNullInt10DatabaseTableColumn.class.php
+++ b/wcfsetup/install/files/lib/system/database/table/column/NotNullInt10DatabaseTableColumn.class.php
@@ -11,15 +11,19 @@ namespace wcf\system\database\table\column;
  * @package WoltLabSuite\Core\System\Database\Table\Column
  * @since   5.2
  */
-class NotNullInt10DatabaseTableColumn extends IntDatabaseTableColumn
+final class NotNullInt10DatabaseTableColumn
 {
     /**
      * @inheritDoc
      */
     public static function create($name)
     {
-        return parent::create($name)
+        return IntDatabaseTableColumn::create($name)
             ->notNull()
             ->length(10);
     }
+
+    private function __construct()
+    {
+    }
 }

diff --git a/wcfsetup/install/files/lib/system/database/table/column/NotNullVarchar191DatabaseTableColumn.class.php b/wcfsetup/install/files/lib/system/database/table/column/NotNullVarchar191DatabaseTableColumn.class.php
index 19d54c1807b86c8ea93af704b5b93fdef16ae0c4..0c9b0a7ee1b14cd39610c77399cb7c86810b31d6 100644 (file)
--- a/wcfsetup/install/files/lib/system/database/table/column/NotNullVarchar191DatabaseTableColumn.class.php
+++ b/wcfsetup/install/files/lib/system/database/table/column/NotNullVarchar191DatabaseTableColumn.class.php
@@ -11,15 +11,19 @@ namespace wcf\system\database\table\column;
  * @package WoltLabSuite\Core\System\Database\Table\Column
  * @since   5.2
  */
-class NotNullVarchar191DatabaseTableColumn extends VarcharDatabaseTableColumn
+final class NotNullVarchar191DatabaseTableColumn
 {
     /**
      * @inheritDoc
      */
     public static function create($name)
     {
-        return parent::create($name)
+        return VarcharDatabaseTableColumn::create($name)
             ->notNull()
             ->length(191);
     }
+
+    private function __construct()
+    {
+    }
 }

diff --git a/wcfsetup/install/files/lib/system/database/table/column/NotNullVarchar255DatabaseTableColumn.class.php b/wcfsetup/install/files/lib/system/database/table/column/NotNullVarchar255DatabaseTableColumn.class.php
index 24b565e9de884d0229a0bf8b7070c9605100c915..874b89994a43692f431d3a7f2b0b509728c7474b 100644 (file)
--- a/wcfsetup/install/files/lib/system/database/table/column/NotNullVarchar255DatabaseTableColumn.class.php
+++ b/wcfsetup/install/files/lib/system/database/table/column/NotNullVarchar255DatabaseTableColumn.class.php
@@ -11,15 +11,19 @@ namespace wcf\system\database\table\column;
  * @package WoltLabSuite\Core\System\Database\Table\Column
  * @since   5.2
  */
-class NotNullVarchar255DatabaseTableColumn extends VarcharDatabaseTableColumn
+final class NotNullVarchar255DatabaseTableColumn
 {
     /**
      * @inheritDoc
      */
     public static function create($name)
     {
-        return parent::create($name)
+        return VarcharDatabaseTableColumn::create($name)
             ->notNull()
             ->length(255);
     }
+
+    private function __construct()
+    {
+    }
 }

diff --git a/wcfsetup/install/files/lib/system/database/table/column/ObjectIdDatabaseTableColumn.class.php b/wcfsetup/install/files/lib/system/database/table/column/ObjectIdDatabaseTableColumn.class.php
index 33bd990abd54b954a8c786fa2a8c46e3cb28bceb..3f3eb8adb6d21546764f4daca73099b7070283b3 100644 (file)
--- a/wcfsetup/install/files/lib/system/database/table/column/ObjectIdDatabaseTableColumn.class.php
+++ b/wcfsetup/install/files/lib/system/database/table/column/ObjectIdDatabaseTableColumn.class.php
@@ -14,14 +14,18 @@ namespace wcf\system\database\table\column;
  * @package WoltLabSuite\Core\System\Database\Table\Column
  * @since   5.2
  */
-class ObjectIdDatabaseTableColumn extends NotNullInt10DatabaseTableColumn
+final class ObjectIdDatabaseTableColumn
 {
     /**
      * @inheritDoc
      */
     public static function create($name)
     {
-        return parent::create($name)
+        return NotNullInt10DatabaseTableColumn::create($name)
             ->autoIncrement();
     }
+
+    private function __construct()
+    {
+    }
 }