Skip to content

Test PHP 8.1 #2295

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

Merged
merged 5 commits into from
Sep 15, 2022
Merged

Test PHP 8.1 #2295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26532b5
Test PHP 8.1
PowerKiKi Sep 15, 2022
54415c1
Fix code style
PowerKiKi Sep 15, 2022
301e481
loadConfig returns config that was actually applied
PowerKiKi Sep 15, 2022
ecee833
Don't use teamcity format in CI
PowerKiKi Sep 15, 2022
f853b9f
Tolerate small imprecisions
PowerKiKi Sep 15, 2022
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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
- "7.3"
- "7.4"
- "8.0"
- "8.1"

name: PHP ${{ matrix.php-version }}

Expand Down Expand Up @@ -72,7 +73,7 @@ jobs:
uses: mheap/phpunit-matcher-action@v1

- name: Test with PHPUnit
run: ./vendor/bin/phpunit --teamcity --no-coverage -c ./
run: ./vendor/bin/phpunit --no-coverage

php-cs-fixer:
runs-on: ubuntu-latest
Expand Down
6 changes: 4 additions & 2 deletions src/PhpWord/Settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,19 +424,21 @@ public static function loadConfig($filename = null)
if ($configFile !== null) {
$config = @parse_ini_file($configFile);
if ($config === false) {
return $config;
return array();
}
}

// Set config value
$appliedConfig = array();
foreach ($config as $key => $value) {
$method = "set{$key}";
if (method_exists(__CLASS__, $method)) {
self::$method($value);
$appliedConfig[$key] = $value;
}
}

return $config;
return $appliedConfig;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Shared/XMLWriter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public function writeAttributeIf($condition, $attribute, $value)
* @param mixed $value
* @return bool
*/
#[\ReturnTypeWillChange]
#[\ReturnTypeWillChange]
public function writeAttribute($name, $value)
{
if (is_float($value)) {
Expand Down
40 changes: 20 additions & 20 deletions tests/PhpWord/Shared/ConverterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,70 +36,70 @@ public function testUnitConversions()

foreach ($values as $value) {
$result = Converter::cmToTwip($value);
$this->assertEquals($value / 2.54 * 1440, $result);
$this->assertEquals($value / 2.54 * 1440, $result, '', 0.00001);

$result = Converter::cmToInch($value);
$this->assertEquals($value / 2.54, $result);
$this->assertEquals($value / 2.54, $result, '', 0.00001);

$result = Converter::cmToPixel($value);
$this->assertEquals($value / 2.54 * 96, $result);
$this->assertEquals($value / 2.54 * 96, $result, '', 0.00001);

$result = Converter::cmToPoint($value);
$this->assertEquals($value / 2.54 * 72, $result);
$this->assertEquals($value / 2.54 * 72, $result, '', 0.00001);

$result = Converter::cmToEmu($value);
$this->assertEquals(round($value / 2.54 * 96 * 9525), $result);
$this->assertEquals(round($value / 2.54 * 96 * 9525), $result, '', 0.00001);

$result = Converter::inchToTwip($value);
$this->assertEquals($value * 1440, $result);
$this->assertEquals($value * 1440, $result, '', 0.00001);

$result = Converter::inchToCm($value);
$this->assertEquals($value * 2.54, $result);
$this->assertEquals($value * 2.54, $result, '', 0.00001);

$result = Converter::inchToPixel($value);
$this->assertEquals($value * 96, $result);
$this->assertEquals($value * 96, $result, '', 0.00001);

$result = Converter::inchToPoint($value);
$this->assertEquals($value * 72, $result);
$this->assertEquals($value * 72, $result, '', 0.00001);

$result = Converter::inchToEmu($value);
$this->assertEquals(round($value * 96 * 9525), $result);
$this->assertEquals(round($value * 96 * 9525), $result, '', 0.00001);

$result = Converter::pixelToTwip($value);
$this->assertEquals($value / 96 * 1440, $result);
$this->assertEquals($value / 96 * 1440, $result, '', 0.00001);

$result = Converter::pixelToCm($value);
$this->assertEquals($value / 96 * 2.54, $result);
$this->assertEquals($value / 96 * 2.54, $result, '', 0.00001);

$result = Converter::pixelToPoint($value);
$this->assertEquals($value / 96 * 72, $result);
$this->assertEquals($value / 96 * 72, $result, '', 0.00001);

$result = Converter::pixelToEmu($value);
$this->assertEquals(round($value * 9525), $result);
$this->assertEquals(round($value * 9525), $result, '', 0.00001);

$result = Converter::pointToTwip($value);
$this->assertEquals($value * 20, $result);
$this->assertEquals($value * 20, $result, '', 0.00001);

$result = Converter::pointToCm($value);
$this->assertEquals($value * 0.035277778, $result, '', 0.00001);

$result = Converter::pointToPixel($value);
$this->assertEquals($value / 72 * 96, $result);
$this->assertEquals($value / 72 * 96, $result, '', 0.00001);

$result = Converter::pointToEmu($value);
$this->assertEquals(round($value / 72 * 96 * 9525), $result);
$this->assertEquals(round($value / 72 * 96 * 9525), $result, '', 0.00001);

$result = Converter::emuToPixel($value);
$this->assertEquals(round($value / 9525), $result);
$this->assertEquals(round($value / 9525), $result, '', 0.00001);

$result = Converter::picaToPoint($value);
$this->assertEquals($value / 6 * 72, $result, '', 0.00001);

$result = Converter::degreeToAngle($value);
$this->assertEquals((int) round($value * 60000), $result);
$this->assertEquals((int) round($value * 60000), $result, '', 0.00001);

$result = Converter::angleToDegree($value);
$this->assertEquals(round($value / 60000), $result);
$this->assertEquals(round($value / 60000), $result, '', 0.00001);
}
}

Expand Down