From a8adc73db8f4e1628cf1ec99b2159839d64d3209 Mon Sep 17 00:00:00 2001 From: peter279k Date: Sat, 15 Aug 2020 02:00:57 +0800 Subject: [PATCH] Add php-7.4 test and replace array syntax --- .travis.yml | 1 + tests/integration/data/form.php | 12 +-- .../GettextExtractor/Filters/AFilterTest.php | 12 +-- .../Filters/LatteFilterTest.php | 52 ++++++------- .../Filters/PHPFilterTest.php | 74 +++++++++---------- tests/unit/data/php/arrayAsParameter.php | 2 +- .../php/arrayWithTranslationsAsParameter.php | 4 +- tests/unit/data/php/bug11.php | 4 +- 8 files changed, 81 insertions(+), 80 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a17e11..b1b3f35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ branches: - /v[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/ php: + - '7.4' - '7.3' - '7.2' diff --git a/tests/integration/data/form.php b/tests/integration/data/form.php index 032c764..e04b13d 100644 --- a/tests/integration/data/form.php +++ b/tests/integration/data/form.php @@ -6,21 +6,21 @@ $form->addTextArea('textarea', "Textarea label"); $form->addUpload('upload', "Upload label"); $form->addCheckbox('checkbox', "Checkbox label"); -$form->addRadioList('radio', "Radio label", array( +$form->addRadioList('radio', "Radio label", [ "1. radio item", "2. radio item", "3. radio item", -)); -$form->addSelect('select', "Select label", array( +]); +$form->addSelect('select', "Select label", [ "1. select item", "2. select item", "3. select item", -)); -$form->addMultiSelect('multiselect', "MultiSelect label", array( +]); +$form->addMultiSelect('multiselect', "MultiSelect label", [ "1. multi-select item", "2. multi-select item", "3. multi-select item", -)); +]); $form->addSubmit('submit', "Submit label"); $form->addButton('button', "Button label"); $form->addImage('image', '/path/to/file', "Image alt"); diff --git a/tests/unit/GettextExtractor/Filters/AFilterTest.php b/tests/unit/GettextExtractor/Filters/AFilterTest.php index 2278f01..0a9233d 100644 --- a/tests/unit/GettextExtractor/Filters/AFilterTest.php +++ b/tests/unit/GettextExtractor/Filters/AFilterTest.php @@ -26,11 +26,11 @@ public function testAddingFunctionWithInvalidParameter(int $s, ?int $p, ?int $c) } public static function dataProvider_AddingFunctionWithInvalidParameter(): array { - return array( - array(0, null, null), - array(1, 0, null), - array(1, 2, 0), - array(-2, null, null) - ); + return [ + [0, null, null], + [1, 0, null], + [1, 2, 0], + [-2, null, null] + ]; } } diff --git a/tests/unit/GettextExtractor/Filters/LatteFilterTest.php b/tests/unit/GettextExtractor/Filters/LatteFilterTest.php index 1f9d267..9400aa5 100644 --- a/tests/unit/GettextExtractor/Filters/LatteFilterTest.php +++ b/tests/unit/GettextExtractor/Filters/LatteFilterTest.php @@ -18,53 +18,53 @@ protected function setUp(): void { public function testExtract(): void { $messages = $this->object->extract(__DIR__ . '/../../data/latte/default.latte'); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => 'A message!' - ), $messages); + ], $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 3, GE\Extractor::SINGULAR => 'Another message!', GE\Extractor::CONTEXT => 'context' - ), $messages); + ], $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 4, GE\Extractor::SINGULAR => 'I see %d little indian!', GE\Extractor::PLURAL => 'I see %d little indians!' - ), $messages); + ], $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 5, GE\Extractor::SINGULAR => 'I see %d little indian!', GE\Extractor::PLURAL => 'I see %d little indians!', GE\Extractor::CONTEXT => 'context' - ), $messages); + ], $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 8, GE\Extractor::SINGULAR => 'A message!' - ), $messages); + ], $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 9, GE\Extractor::SINGULAR => 'Another message!', GE\Extractor::CONTEXT => 'context' - ), $messages); + ], $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 10, GE\Extractor::SINGULAR => 'I see %d little indian!', GE\Extractor::PLURAL => 'I see %d little indians!' - ), $messages); + ], $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 11, GE\Extractor::SINGULAR => 'I see %d little indian!', GE\Extractor::PLURAL => 'I see %d little indians!', GE\Extractor::CONTEXT => 'context' - ), $messages); + ], $messages); } public function testCustomMacros(): void { @@ -73,32 +73,32 @@ public function testCustomMacros(): void { $messages = $this->object->extract(__DIR__ . '/../../data/latte/custom.latte'); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 1, GE\Extractor::SINGULAR => 'A custom message!' - ), $messages); + ], $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => 'An unescaped custom message!' - ), $messages); + ], $messages); } public function testNoValidMessages(): void { $messages = $this->object->extract(__DIR__ . '/../../data/latte/noMessages.latte'); - self::assertSame(array(), $messages); + self::assertSame([], $messages); } public function testConstantsArrayMethodsAndFunctions(): void { $messages = $this->object->extract(__DIR__ . '/../../data/latte/test.latte'); self::assertCount(1, $messages); - $expected = array( + $expected = [ GE\Extractor::LINE => 1, GE\Extractor::SINGULAR => 'Message' - ); + ]; ksort($messages[0]); ksort($expected); - self::assertSame(array($expected), $messages); + self::assertSame([$expected], $messages); } /** @@ -107,9 +107,9 @@ public function testConstantsArrayMethodsAndFunctions(): void { public function testExtractMultilineMessage(): void { $messages = $this->object->extract(__DIR__ . '/../../data/latte/bug6.latte'); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 1, GE\Extractor::SINGULAR => "A\nmultiline\nmessage!" - ), $messages); + ], $messages); } } diff --git a/tests/unit/GettextExtractor/Filters/PHPFilterTest.php b/tests/unit/GettextExtractor/Filters/PHPFilterTest.php index 8da6857..18010be 100644 --- a/tests/unit/GettextExtractor/Filters/PHPFilterTest.php +++ b/tests/unit/GettextExtractor/Filters/PHPFilterTest.php @@ -19,101 +19,101 @@ protected function setUp(): void { public function testExtract(): void { $messages = $this->object->extract(__DIR__ . '/../../data/php/default.php'); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => 'A message!' - ), $messages); + ], $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 3, GE\Extractor::SINGULAR => 'Another message!', GE\Extractor::CONTEXT => 'context' - ), $messages); + ], $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 4, GE\Extractor::SINGULAR => 'I see %d little indian!', GE\Extractor::PLURAL => 'I see %d little indians!' - ), $messages); + ], $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 5, GE\Extractor::SINGULAR => 'I see %d little indian!', GE\Extractor::PLURAL => 'I see %d little indians!', GE\Extractor::CONTEXT => 'context' - ), $messages); + ], $messages); } public function testNoValidMessages(): void { $messages = $this->object->extract(__DIR__ . '/../../data/php/noMessages.php'); - self::assertSame(array(), $messages); + self::assertSame([], $messages); } public function testNestedFunctions(): void { $messages = $this->object->extract(__DIR__ . '/../../data/php/nestedFunctions.php'); self::assertCount(5, $messages); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 4, GE\Extractor::SINGULAR => 'Nested function.' - ), $messages); - self::assertContains(array( + ], $messages); + self::assertContains([ GE\Extractor::LINE => 5, GE\Extractor::SINGULAR => 'Nested function 2.', GE\Extractor::CONTEXT => 'context' - ), $messages); - self::assertContains(array( + ], $messages); + self::assertContains([ GE\Extractor::LINE => 6, GE\Extractor::SINGULAR => "%d meeting wasn't imported.", GE\Extractor::PLURAL => "%d meetings weren't imported." - ), $messages); - self::assertContains(array( + ], $messages); + self::assertContains([ GE\Extractor::LINE => 8, GE\Extractor::SINGULAR => 'Please provide a text 2.' - ), $messages); - self::assertContains(array( + ], $messages); + self::assertContains([ GE\Extractor::LINE => 9, GE\Extractor::SINGULAR => 'Please provide a text 3.' - ), $messages); + ], $messages); } public function testConstantAsParameter(): void { $messages = $this->object->extract(__DIR__ . '/../../data/php/constantAsParameter.php'); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => 'Please provide a text.' - ), $messages); + ], $messages); } public function testMessageWithNewlines(): void { $messages = $this->object->extract(__DIR__ . '/../../data/php/messageWithNewlines.php'); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => "A\nmessage!" - ), $messages); + ], $messages); } public function testArrayAsParameter(): void { $this->object->addFunction('addConfirmer', 3); $messages = $this->object->extract(__DIR__ . '/../../data/php/arrayAsParameter.php'); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => 'Really delete?' - ), $messages); + ], $messages); } public function testSingularAndPluralMessageFromOneParameter(): void { $this->object->addFunction('plural', 1, 1); $messages = $this->object->extract(__DIR__ . '/../../data/php/singularAndPluralMessageFromOneParameter.php'); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => '%d weeks ago', GE\Extractor::PLURAL => '%d weeks ago', - ), $messages); + ], $messages); } /** @@ -123,14 +123,14 @@ public function testArrayWithTranslationsAsParameter(): void { $this->object->addFunction('addSelect', 3); $messages = $this->object->extract(__DIR__ . '/../../data/php/arrayWithTranslationsAsParameter.php'); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => 'item 1' - ), $messages); - self::assertContains(array( + ], $messages); + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => 'item 2' - ), $messages); + ], $messages); } /** @@ -141,14 +141,14 @@ public function testMultipleMessagesFromSingleFunction(): void { $this->object->addFunction('bar', 2); $messages = $this->object->extract(__DIR__ . '/../../data/php/multipleMessagesFromSingleFunction.php'); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => 'Value A' - ), $messages); - self::assertContains(array( + ], $messages); + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => 'Value B' - ), $messages); + ], $messages); } public function testCallable(): void { @@ -159,10 +159,10 @@ public function testCallable(): void { public function testStaticFunctions(): void { $messages = $this->object->extract(__DIR__ . '/../../data/php/staticFunctions.php'); - self::assertContains(array( + self::assertContains([ GE\Extractor::LINE => 2, GE\Extractor::SINGULAR => 'Static function' - ), $messages); + ], $messages); } /** diff --git a/tests/unit/data/php/arrayAsParameter.php b/tests/unit/data/php/arrayAsParameter.php index 9db8e37..3910497 100644 --- a/tests/unit/data/php/arrayAsParameter.php +++ b/tests/unit/data/php/arrayAsParameter.php @@ -1,2 +1,2 @@ addConfirmer('delete', array($this, 'delete'), "Really delete?"); +$dialog->addConfirmer('delete', [$this, 'delete'], "Really delete?"); diff --git a/tests/unit/data/php/arrayWithTranslationsAsParameter.php b/tests/unit/data/php/arrayWithTranslationsAsParameter.php index da032d1..51ea8f3 100644 --- a/tests/unit/data/php/arrayWithTranslationsAsParameter.php +++ b/tests/unit/data/php/arrayWithTranslationsAsParameter.php @@ -1,5 +1,5 @@ addSelect('name', 'label', array( +$form->addSelect('name', 'label', [ 'item 1', 'item 2' -)); +]); diff --git a/tests/unit/data/php/bug11.php b/tests/unit/data/php/bug11.php index aaf336e..690c1e2 100644 --- a/tests/unit/data/php/bug11.php +++ b/tests/unit/data/php/bug11.php @@ -1,5 +1,5 @@