Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-21591 Fix issue when generating default MaxFileSize defaults due … #11514

Merged
merged 1 commit into from
Feb 11, 2018
Merged

CRM-21591 Fix issue when generating default MaxFileSize defaults due … #11514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CRM/Core/Config/Defaults.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public function setCoreVariables() {
public static function formatUnitSize($size, $checkForPostMax = FALSE) {
if ($size) {
$last = strtolower($size{strlen($size) - 1});
$size = (int) $size;
switch ($last) {
// The 'G' modifier is available since PHP 5.1.0

Expand Down
25 changes: 25 additions & 0 deletions tests/phpunit/CRM/Core/Config/DefaultsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

/**
* Class CRM_Core_Config_DefaultsTest
*/
class CRM_Core_Config_DefaultsTest extends CiviUnitTestCase {


public function sizeCases() {
$cases = [];
$cases[] = ['20M', '20971520'];
$cases[] = ['40G', '42949672960'];
return $cases;
}

/**
* @param $size
* @param $expectedValue
* @dataProvider sizeCases
*/
public function testFormatUnitSize($size, $expectedValue) {
$this->assertEquals($expectedValue, CRM_Core_Config_Defaults::formatUnitSize($size));
}

}