Merge remote-tracking branch '39581/phpdoc/adapter-interface-quote-column-as' into commpr-21755-2209

Author: harshityadav90

lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Framework\DB\Adapter;
@@ -16,66 +16,66 @@
  */
 interface AdapterInterface
 {
-    const INDEX_TYPE_PRIMARY = 'primary';
+    public const INDEX_TYPE_PRIMARY = 'primary';
 
-    const INDEX_TYPE_UNIQUE = 'unique';
+    public const INDEX_TYPE_UNIQUE = 'unique';
 
-    const INDEX_TYPE_INDEX = 'index';
+    public const INDEX_TYPE_INDEX = 'index';
 
-    const INDEX_TYPE_FULLTEXT = 'fulltext';
+    public const INDEX_TYPE_FULLTEXT = 'fulltext';
 
-    const FK_ACTION_CASCADE = 'CASCADE';
+    public const FK_ACTION_CASCADE = 'CASCADE';
 
-    const FK_ACTION_SET_NULL = 'SET NULL';
+    public const FK_ACTION_SET_NULL = 'SET NULL';
 
-    const FK_ACTION_NO_ACTION = 'NO ACTION';
+    public const FK_ACTION_NO_ACTION = 'NO ACTION';
 
-    const FK_ACTION_RESTRICT = 'RESTRICT';
+    public const FK_ACTION_RESTRICT = 'RESTRICT';
 
-    const FK_ACTION_SET_DEFAULT = 'SET DEFAULT';
+    public const FK_ACTION_SET_DEFAULT = 'SET DEFAULT';
 
-    const INSERT_ON_DUPLICATE = 1;
+    public const INSERT_ON_DUPLICATE = 1;
 
-    const INSERT_IGNORE = 2;
+    public const INSERT_IGNORE = 2;
 
     /** Strategy for updating data in table. See https://dev.mysql.com/doc/refman/5.7/en/replace.html */
-    const REPLACE = 4;
+    public const REPLACE = 4;
 
-    const ISO_DATE_FORMAT = 'yyyy-MM-dd';
+    public const ISO_DATE_FORMAT = 'yyyy-MM-dd';
 
-    const ISO_DATETIME_FORMAT = 'yyyy-MM-dd HH-mm-ss';
+    public const ISO_DATETIME_FORMAT = 'yyyy-MM-dd HH-mm-ss';
 
-    const INTERVAL_SECOND = 'SECOND';
+    public const INTERVAL_SECOND = 'SECOND';
 
-    const INTERVAL_MINUTE = 'MINUTES';
+    public const INTERVAL_MINUTE = 'MINUTES';
 
-    const INTERVAL_HOUR = 'HOURS';
+    public const INTERVAL_HOUR = 'HOURS';
 
-    const INTERVAL_DAY = 'DAYS';
+    public const INTERVAL_DAY = 'DAYS';
 
-    const INTERVAL_MONTH = 'MONTHS';
+    public const INTERVAL_MONTH = 'MONTHS';
 
-    const INTERVAL_YEAR = 'YEARS';
+    public const INTERVAL_YEAR = 'YEARS';
 
     /**
      * Error message for DDL query in transactions
      */
-    const ERROR_DDL_MESSAGE = 'DDL statements are not allowed in transactions';
+    public const ERROR_DDL_MESSAGE = 'DDL statements are not allowed in transactions';
 
     /**
      * Error message for unfinished rollBack transaction
      */
-    const ERROR_ROLLBACK_INCOMPLETE_MESSAGE = 'Rolled back transaction has not been completed correctly.';
+    public const ERROR_ROLLBACK_INCOMPLETE_MESSAGE = 'Rolled back transaction has not been completed correctly.';
 
     /**
      * Error message for asymmetric transaction rollback
      */
-    const ERROR_ASYMMETRIC_ROLLBACK_MESSAGE = 'Asymmetric transaction rollback.';
+    public const ERROR_ASYMMETRIC_ROLLBACK_MESSAGE = 'Asymmetric transaction rollback.';
 
     /**
      * Error message for asymmetric transaction commit
      */
-    const ERROR_ASYMMETRIC_COMMIT_MESSAGE = 'Asymmetric transaction commit.';
+    public const ERROR_ASYMMETRIC_COMMIT_MESSAGE = 'Asymmetric transaction commit.';
 
     /**
      * Begin new DB transaction for connection
@@ -663,7 +663,7 @@ public function quoteIdentifier($ident, $auto = false);
      * Quote a column identifier and alias.
      *
      * @param string|array|\Zend_Db_Expr $ident The identifier or expression.
-     * @param string $alias An alias for the column.
+     * @param string|null $alias An alias for the column.
      * @param boolean $auto If true, heed the AUTO_QUOTE_IDENTIFIERS config option.
      * @return string The quoted identifier and alias.
      */