mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-24 13:52:56 +02:00
Code Issues Releases Wiki Activity

fix(core): fix date formats for 0.9.4 release

Browse Source
This commit is contained in:
Awilum
2019-09-11 21:44:11 +03:00
parent 80021bc58c
commit 3953c22ea9
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flextype/core/Forms.php
View File

@@ -14,10 +14,12 @@ use Flextype\Component\Form\Form;
use Psr\Http\Message\ResponseInterface as Response;
use Psr\Http\Message\ServerRequestInterface as Request;
use function count;
use function date;
use function Flextype\Component\I18n\__;
use function str_replace;
use function strlen;
use function strpos;
use function strtotime;
use function substr_replace;
class Forms
@@ -367,8 +369,8 @@ class Forms
/**
* Tags field
*
* @param string $name Field name
* @param string $value Field value
* @param string $name Field name
* @param string $value Field value
*
* @return string Returns field
*

16
flextype/twig/DateTwigExtension.php
View File

@@ -11,6 +11,7 @@ namespace Flextype;
use Twig_Extension;
use Twig_SimpleFunction;
use function strlen;
class DateTwigExtension extends Twig_Extension
{
@@ -28,7 +29,7 @@ class DateTwigExtension extends Twig_Extension
public function dateformatToMomentJS($php_format)
{
$SYMBOLS_MATCHING = [
$symbols_matching = [
// Day
'd' => 'DD',
'D' => 'ddd',
@@ -72,15 +73,14 @@ class DateTwigExtension extends Twig_Extension
// Full Date/Time
'c' => '',
'r' => 'llll ZZ',
'U' => 'X'
'U' => 'X',
];
$js_format = '';
$escaping = false;
$len = strlen($php_format);
$len = strlen($php_format);
for ($i = 0; $i < $len; $i++) {
$char = $php_format[$i];
if ($char === '\\') // PHP date format escaping character
{
if ($char === '\\') { // PHP date format escaping character
$i++;
if ($escaping) {
$js_format .= $php_format[$i];
@@ -91,10 +91,10 @@ class DateTwigExtension extends Twig_Extension
} else {
if ($escaping) {
$js_format .= "'";
$escaping = false;
$escaping = false;
}
if (isset($SYMBOLS_MATCHING[$char])) {
$js_format .= $SYMBOLS_MATCHING[$char];
if (isset($symbols_matching[$char])) {
$js_format .= $symbols_matching[$char];
} else {
$js_format .= $char;
}