Skip to content

Commit a4ee19f

Browse files
committed
Update TravisCI settings
1 parent 4f99a28 commit a4ee19f

File tree

6 files changed

+14
-6
lines changed

6 files changed

+14
-6
lines changed

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
language: php
22

3+
dist: trusty
4+
5+
sudo: required
6+
37
php:
48
- 5.3
59
- 5.4
@@ -8,12 +12,12 @@ php:
812
- 7.0
913
- 7.1
1014
- 7.2
15+
- hhvm
1116

1217
matrix:
1318
include:
14-
- php: hhvm
15-
dist: trusty
16-
sudo: required
19+
- php: 5.3
20+
dist: precise
1721

1822
before_script:
1923
- travis_retry composer self-update

src/JsPhpize/JsPhpize.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ public function render($input, $filename = null, array $variables = array())
175175
}
176176

177177
extract(array_merge($this->sharedVariables, $variables));
178+
178179
try {
179180
return include $this->stream . '://data;<?php ' . $this->compile($input, $filename);
180181
} catch (\JsPhpize\Compiler\Exception $exception) {

src/JsPhpize/Lexer/Lexer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ protected function scan($pattern, $method)
100100
}
101101

102102
/**
103-
104103
* @throws Exception
105104
*
106105
* @return Token|false

src/JsPhpize/Parser/Parser.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ protected function parseParentheses()
7676
$parentheses = new Parenthesis();
7777
$exceptionInfos = $this->exceptionInfos();
7878
$expectComma = false;
79+
7980
while ($token = $this->next()) {
8081
if ($token->is(')')) {
8182
$next = $this->get(0);
@@ -122,6 +123,7 @@ protected function parseHooksArray()
122123
$array = new HooksArray();
123124
$exceptionInfos = $this->exceptionInfos();
124125
$expectComma = false;
126+
125127
while ($token = $this->next()) {
126128
if ($token->is(']')) {
127129
return $array;
@@ -155,6 +157,7 @@ protected function parseBracketsArray()
155157
$array = new BracketsArray();
156158
$exceptionInfos = $this->exceptionInfos();
157159
$expectComma = false;
160+
158161
while ($token = $this->next()) {
159162
if ($token->is('}')) {
160163
return $array;
@@ -200,8 +203,6 @@ protected function parseFunctionCallChildren($function, $applicant = null)
200203
return $this->parseFunctionCallChildren(
201204
new FunctionCall($function, $arguments, $children, $applicant)
202205
);
203-
204-
break;
205206
}
206207

207208
continue;

tests/options.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public function testDisallow()
2525
'disallow' => 'foo comment bar',
2626
));
2727
$code = null;
28+
2829
try {
2930
$jsPhpize->render('
3031
var a = 3;
@@ -36,6 +37,7 @@ public function testDisallow()
3637
} catch (\Exception $exception) {
3738
$code = $exception->getCode();
3839
}
40+
3941
$this->assertSame(3, $code);
4042
}
4143

tests/render.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public function testJsPhpizeGeneration($returnFile, $jsFile)
2727
$examples = __DIR__ . '/../examples';
2828
$jsPhpize = new JsPhpize();
2929
$expected = file_get_contents($examples . '/' . $returnFile);
30+
3031
try {
3132
$result = $jsPhpize->render($examples . '/' . $jsFile);
3233
} catch (Throwable $error) {

0 commit comments

Comments
 (0)