alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop PHPSPREADSHEET_ROOT constant

This commit is contained in:
Adrien Crivelli 2017-01-23 15:34:49 +09:00
parent 909353ea39
commit fe73b2d402
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
2 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/PhpSpreadsheet/Calculation.php
View File

@ -2039,7 +2039,7 @@ class Calculation
private static function loadLocales() private static function loadLocales()
{ {
$localeFileDirectory = PHPSPREADSHEET_ROOT . 'PhpSpreadsheet/locale/'; $localeFileDirectory = __DIR__ . '/locale/';
foreach (glob($localeFileDirectory . '/*', GLOB_ONLYDIR) as $filename) { foreach (glob($localeFileDirectory . '/*', GLOB_ONLYDIR) as $filename) {
$filename = substr($filename, strlen($localeFileDirectory) + 1); $filename = substr($filename, strlen($localeFileDirectory) + 1);
if ($filename != 'en') { if ($filename != 'en') {
@ -2269,10 +2269,10 @@ class Calculation
// Default is English, if user isn't requesting english, then read the necessary data from the locale files // Default is English, if user isn't requesting english, then read the necessary data from the locale files
if ($locale != 'en_us') { if ($locale != 'en_us') {
// Search for a file with a list of function names for locale // Search for a file with a list of function names for locale
$functionNamesFile = PHPSPREADSHEET_ROOT . 'PhpSpreadsheet' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $locale) . DIRECTORY_SEPARATOR . 'functions'; $functionNamesFile = __DIR__ . '/locale/' . str_replace('_', DIRECTORY_SEPARATOR, $locale) . DIRECTORY_SEPARATOR . 'functions';
if (!file_exists($functionNamesFile)) { if (!file_exists($functionNamesFile)) {
// If there isn't a locale specific function file, look for a language specific function file // If there isn't a locale specific function file, look for a language specific function file
$functionNamesFile = PHPSPREADSHEET_ROOT . 'PhpSpreadsheet' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR . $language . DIRECTORY_SEPARATOR . 'functions'; $functionNamesFile = __DIR__ . '/locale/' . $language . DIRECTORY_SEPARATOR . 'functions';
if (!file_exists($functionNamesFile)) { if (!file_exists($functionNamesFile)) {
return false; return false;
} }
@ -2298,9 +2298,9 @@ class Calculation
self::$localeBoolean['FALSE'] = self::$localeFunctions['FALSE']; self::$localeBoolean['FALSE'] = self::$localeFunctions['FALSE'];
} }
$configFile = PHPSPREADSHEET_ROOT . 'PhpSpreadsheet' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $locale) . DIRECTORY_SEPARATOR . 'config'; $configFile = __DIR__ . '/locale/' . str_replace('_', DIRECTORY_SEPARATOR, $locale) . DIRECTORY_SEPARATOR . 'config';
if (!file_exists($configFile)) { if (!file_exists($configFile)) {
$configFile = PHPSPREADSHEET_ROOT . 'PhpSpreadsheet' . DIRECTORY_SEPARATOR . 'locale' . DIRECTORY_SEPARATOR . $language . DIRECTORY_SEPARATOR . 'config'; $configFile = __DIR__ . '/locale/' . $language . DIRECTORY_SEPARATOR . 'config';
} }
if (file_exists($configFile)) { if (file_exists($configFile)) {
$localeSettings = file($configFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); $localeSettings = file($configFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);

41
tests/PhpSpreadsheetTests/CalculationTest.php
View File

@ -38,9 +38,9 @@ class CalculationTest extends \PHPUnit_Framework_TestCase
/** /**
* @dataProvider providerGetFunctions * @dataProvider providerGetFunctions
* *
* @param mixed $category * @param string $category
* @param mixed $functionCall * @param array|string $functionCall
* @param mixed $argumentCount * @param string $argumentCount
*/ */
public function testGetFunctions($category, $functionCall, $argumentCount) public function testGetFunctions($category, $functionCall, $argumentCount)
{ {
@ -60,4 +60,39 @@ class CalculationTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($calculation->isImplemented('coUNt')); $this->assertTrue($calculation->isImplemented('coUNt'));
$this->assertTrue($calculation->isImplemented('abs')); $this->assertTrue($calculation->isImplemented('abs'));
} }
/**
* @dataProvider providerCanLoadAllSupportedLocales
*
* @param string $locale
*/
public function testCanLoadAllSupportedLocales($locale)
{
$calculation = Calculation::getInstance();
$this->assertTrue($calculation->setLocale($locale));
}
public function providerCanLoadAllSupportedLocales()
{
return [
['bg'],
['cs'],
['da'],
['de'],
['en_us'],
['es'],
['fi'],
['fr'],
['hu'],
['it'],
['nl'],
['no'],
['pl'],
['pt'],
['pt_br'],
['ru'],
['sv'],
['tr'],
];
}
} }