Skip to content

Add php-7.4 test and replace array syntax #34

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

Open
peter279k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add php-7.4 test and replace array syntax #34

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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ branches:
- /v[0-9]+\.[0-9]+\.[0-9]+(-.*)?$/

php:
- '7.4'
- '7.3'
- '7.2'

Expand Down
12 changes: 6 additions & 6 deletions tests/integration/data/form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/GettextExtractor/Filters/AFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
];
}
}
52 changes: 26 additions & 26 deletions tests/unit/GettextExtractor/Filters/LatteFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
}

/**
Expand All @@ -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);
}
}
74 changes: 37 additions & 37 deletions tests/unit/GettextExtractor/Filters/PHPFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand All @@ -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);
}

/**
Expand All @@ -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 {
Expand All @@ -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);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/data/php/arrayAsParameter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?php
$dialog->addConfirmer('delete', array($this, 'delete'), "Really delete?");
$dialog->addConfirmer('delete', [$this, 'delete'], "Really delete?");
4 changes: 2 additions & 2 deletions tests/unit/data/php/arrayWithTranslationsAsParameter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
$form->addSelect('name', 'label', array(
$form->addSelect('name', 'label', [
'item 1',
'item 2'
));
]);
4 changes: 2 additions & 2 deletions tests/unit/data/php/bug11.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
translateArray(array(
translateArray([
$foo,
$bar
));
]);