Adjusted code with new deprecations in PHP 8.1

Author: anzin

app/code/Magento/Config/Model/Config/Source/Date/Short.php

@@ -5,23 +5,49 @@
  */
 namespace Magento\Config\Model\Config\Source\Date;
 
+use IntlDateFormatter;
+
 /**
  * @api
  * @since 100.0.2
  */
 class Short implements \Magento\Framework\Option\ArrayInterface
 {
+    /**
+     * @var IntlDateFormatter
+     */
+    private $dateFormatter;
+
     /**
      * @return array
      */
     public function toOptionArray()
     {
         $arr = [];
         $arr[] = ['label' => '', 'value' => ''];
-        $arr[] = ['label' => strftime('MM/DD/YY (%m/%d/%y)'), 'value' => '%m/%d/%y'];
-        $arr[] = ['label' => strftime('MM/DD/YYYY (%m/%d/%Y)'), 'value' => '%m/%d/%Y'];
-        $arr[] = ['label' => strftime('DD/MM/YY (%d/%m/%y)'), 'value' => '%d/%m/%y'];
-        $arr[] = ['label' => strftime('DD/MM/YYYY (%d/%m/%Y)'), 'value' => '%d/%m/%Y'];
+        $arr[] = ['label' => 'MM/DD/YY ' . $this->getTimeFormat(time(), '(M/d/y)'), 'value' => 'M/d/y'];
+        $arr[] = ['label' => 'MM/DD/YYYY '. $this->getTimeFormat(time(), '(M/d/Y)'), 'value' => 'M/d/Y'];
+        $arr[] = ['label' => 'DD/MM/YY ' . $this->getTimeFormat(time(), '(d/m/y)'), 'value' => 'd/M/y'];
+        $arr[] = ['label' => 'DD/MM/YYYY ' . $this->getTimeFormat(time(), '(d/m/Y)'), 'value' => 'd/M/Y'];
         return $arr;
     }
+
+    /**
+     * This method format timestamp value.
+     *
+     * @param int $datetime
+     * @param string $format
+     *
+     * @return string
+     */
+    private function getTimeFormat(int $datetime, string $format = 'Y/M/d'): string
+    {
+        if (!$this->dateFormatter) {
+            $locale = \Locale::getDefault();
+            $this->dateFormatter = new \IntlDateFormatter($locale, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+        }
+        $this->dateFormatter->setPattern($format);
+
+        return $this->dateFormatter->format($datetime);
+    }
 }

dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Cron\Model;
 
+use IntlDateFormatter;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use \Magento\TestFramework\Helper\Bootstrap;
 
@@ -25,6 +26,14 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
      */
     protected $dateTime;
 
+    /**
+     * @var IntlDateFormatter
+     */
+    private $dateFormatter;
+
+    /**
+     * @ingeritdoc
+     */
     protected function setUp(): void
     {
         $this->dateTime = Bootstrap::getObjectManager()->create(DateTime::class);
@@ -60,14 +69,15 @@ public function testTryLockJobAlreadyLockedFails()
     public function testTryLockJobAlreadyLockedSucceeds()
     {
         $offsetInThePast = 2*24*60*60;
+        $gmtTimestamp = $this->dateTime->gmtTimestamp();
 
         $oldSchedule = $this->scheduleFactory->create()
             ->setCronExpr("* * * * *")
             ->setJobCode("test_job")
             ->setStatus(Schedule::STATUS_RUNNING)
-            ->setCreatedAt(strftime('%Y-%m-%d %H:%M:%S', $this->dateTime->gmtTimestamp() - $offsetInThePast))
-            ->setScheduledAt(strftime('%Y-%m-%d %H:%M', $this->dateTime->gmtTimestamp() - $offsetInThePast + 60))
-            ->setExecutedAt(strftime('%Y-%m-%d %H:%M', $this->dateTime->gmtTimestamp() - $offsetInThePast + 61));
+            ->setCreatedAt($this->getTimeFormat($gmtTimestamp - $offsetInThePast))
+            ->setScheduledAt($this->getTimeFormat($gmtTimestamp - $offsetInThePast + 60, 'Y-M-d H:m'))
+            ->setExecutedAt($this->getTimeFormat($gmtTimestamp - $offsetInThePast + 61, 'Y-M-d H:m'));
         $oldSchedule->save();
 
         $schedule = $this->createSchedule("test_job", Schedule::STATUS_PENDING);
@@ -107,14 +117,35 @@ public function testTryLockJobDifferentJobLocked()
      */
     private function createSchedule($jobCode, $status, $timeOffset = 0)
     {
+        $gmtTimestamp  = $this->dateTime->gmtTimestamp();
+
         $schedule = $this->scheduleFactory->create()
             ->setCronExpr("* * * * *")
             ->setJobCode($jobCode)
             ->setStatus($status)
-            ->setCreatedAt(strftime('%Y-%m-%d %H:%M:%S', $this->dateTime->gmtTimestamp()))
-            ->setScheduledAt(strftime('%Y-%m-%d %H:%M', $this->dateTime->gmtTimestamp() + $timeOffset));
+            ->setCreatedAt($this->getTimeFormat($gmtTimestamp))
+            ->setScheduledAt($this->getTimeFormat($gmtTimestamp + $timeOffset, 'Y-M-d H:m'));
         $schedule->save();
 
         return $schedule;
     }
+
+    /**
+     * This method format timestamp value.
+     *
+     * @param int $datetime
+     * @param string $format
+     *
+     * @return string
+     */
+    private function getTimeFormat(int $datetime, string $format = 'Y-M-d H:m:s'): string
+    {
+        if (!$this->dateFormatter) {
+            $locale = \Locale::getDefault();
+            $this->dateFormatter = new IntlDateFormatter($locale, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+        }
+        $this->dateFormatter->setPattern($format);
+
+        return $this->dateFormatter->format($datetime);
+    }
 }

dev/tests/utils/phpunitGroupConfig.php

@@ -89,7 +89,7 @@
         $generateConfig = false;
     } else {
         assertUsage(
-            (empty($options['get-group']) || !ctype_digit($options['get-group']))
+            (empty($options['get-group']) || !(is_string($options['get-group']) && ctype_digit($options['get-group'])))
             && strtolower($options['get-group']) != 'all',
             "Option --get-group: must be a positive integer or 'all'\n"
         );

lib/internal/Magento/Framework/Escaper.php

@@ -309,7 +309,7 @@ public function escapeJs($string)
             $string = (string) $string;
         }
 
-        if ($string === '' || ctype_digit($string)) {
+        if ($string === '' || (is_string($string) && ctype_digit($string))) {
             return $string;
         }
 

lib/internal/Magento/Framework/View/Element/Html/Date.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\View\Element\Html;
 
+use IntlDateFormatter;
+
 /**
  * Date element block
  */
@@ -76,7 +78,11 @@ protected function _toHtml()
     public function getEscapedValue()
     {
         if ($this->getFormat() && $this->getValue()) {
-            return strftime($this->getFormat(), strtotime($this->getValue()));
+            $locale = \Locale::getDefault();
+            $dateFormatter = new IntlDateFormatter($locale, IntlDateFormatter::SHORT, IntlDateFormatter::SHORT);
+            $dateFormatter->setPattern($this->getFormat());
+
+            return $dateFormatter->format(strtotime($this->getValue()));
         }
         return $this->escapeHtml($this->getValue());
     }