Revert back code change to fix BiC

Author: bnymn

lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php

@@ -257,7 +257,13 @@ public function isScopeDateInInterval($scope, $dateFrom = null, $dateTo = null)
     }
 
     /**
-     * @inheritdoc
+     * @param string|\DateTimeInterface $date
+     * @param int $dateType
+     * @param int $timeType
+     * @param string|null $locale
+     * @param string|null $timezone
+     * @param string|null $pattern
+     * @return string
      */
     public function formatDateTime(
         $date,
@@ -293,7 +299,13 @@ public function formatDateTime(
     }
 
     /**
-     * @inheritdoc
+     * Convert date from config timezone to Utc.
+     * If pass \DateTime object as argument be sure that timezone is the same with config timezone
+     *
+     * @param string|\DateTimeInterface $date
+     * @param string $format
+     * @throws LocalizedException
+     * @return string
      */
     public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
     {

lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php

@@ -152,18 +152,4 @@ public function formatDateTime(
      * @deprecated
      */
     public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s');
-
-    /**
-     * Convert date from config timezone to Utc.
-     *
-     * If pass \DateTime object as argument be sure that timezone is the same with config timezone
-     *
-     * @param string|\DateTimeInterface $date
-     * @param string $format
-     * @param string $pattern
-     * @throws LocalizedException
-     * @return string
-     * @deprecated
-     */
-    public function convertConfigTimeToUtcWithPattern($date, $format = 'Y-m-d H:i:s', $pattern = 'Y-m-d H:i:s');
 }