Skip to content

Commit 0edb55a

Browse files
committed
MAGETWO-34390: Stabilization of replacing Zend_Locale with Native PHP Implementation
1 parent 0cbba63 commit 0edb55a

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,25 @@ public function getValueDataProvider()
4444
return [
4545
[
4646
[
47-
'date_format' => 'n/j/y',
48-
'time_format' => 'g:i A',
47+
'date_format' => 'M/d/yy',
48+
'time_format' => 'h:mm a',
4949
'value' => $testTimestamp,
5050
],
51-
date('n/j/y g:i A', $testTimestamp),
51+
date('m/j/y g:i a', $testTimestamp),
5252
],
5353
[
5454
[
55-
'time_format' => 'g:i A',
55+
'time_format' => 'h:mm a',
5656
'value' => $testTimestamp,
5757
],
58-
date('g:i A', $testTimestamp)
58+
date('g:i a', $testTimestamp)
5959
],
6060
[
6161
[
62-
'date_format' => 'n/j/y',
62+
'date_format' => 'M/d/yy',
6363
'value' => $testTimestamp,
6464
],
65-
date('n/j/y', $testTimestamp)
65+
date('m/j/y', $testTimestamp)
6666
]
6767
];
6868
}

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3108,4 +3108,5 @@
31083108
['Magento\Framework\Locale', '\Locale, \ResourceBundle'],
31093109
['Magento\LocaleFactory'],
31103110
['Magento\Framework\LocaleFactory'],
3111+
['Magento\Core\Helper\Data', 'Magento\Framework\Json\Helper\Data'],
31113112
];

dev/tests/unit/testsuite/Magento/Framework/Module/Setup/MigrationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function _getModelDependencies($tableRowsCount = 0, $tableData = [], $
8585
'base_dir' => 'not_used',
8686
'path_to_map_file' => 'not_used',
8787
'connection' => $adapterMock,
88-
'core_helper' => $this->getMock('Magento\Core\Helper\Data', [], [], '', false, false),
88+
'core_helper' => $this->getMock('Magento\Framework\Json\Helper\Data', [], [], '', false, false),
8989
'aliases_map' => $aliasesMap
9090
];
9191
}

lib/internal/Magento/Framework/Validator/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ protected function _extractConstraintOptions(\DOMElement $constraint)
235235
* Read constraint configurator callback
236236
*
237237
* <constraint class="Constraint">
238-
* <callback class="Magento\Core\Helper\Data" method="configureValidator"/>
238+
* <callback class="Magento\Framework\Json\Helper\Data" method="configureValidator"/>
239239
* </constraint>
240240
*/
241241
$callback = $this->_readCallback($children);

0 commit comments

Comments
 (0)