diff --git a/tests/ParserTest.php b/tests/ParserTest.php index 5f71850..ae815e4 100644 --- a/tests/ParserTest.php +++ b/tests/ParserTest.php @@ -24,7 +24,6 @@ public static function setUpBeforeClass() { /** * @dataProvider testData - * @test */ public function testParse($input, $output) { $res = $this->tsmarty2c($input); @@ -43,7 +42,7 @@ public function testData() { /** * @dataProvider testContextData - * @test that tsmarty2c is able to parse {t context} properly + * test that tsmarty2c is able to parse {t context} properly */ public function testContext($input, $output) { $res = $this->tsmarty2c($input); @@ -70,9 +69,8 @@ private function getFiles($number) { private function getFileName($number, $ext) { $datadir = __DIR__ . '/data'; - $file = $datadir . "/$number.$ext"; - return $file; + return $datadir . "/$number.$ext"; } private function getFile($number, $ext) { diff --git a/tests/TestCase.php b/tests/TestCase.php index ada6d0c..af058d5 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -124,11 +124,11 @@ protected function tsmarty2c($input) { $cmd[] = escapeshellcmd(self::$tsmarty2c); $cmd[] = escapeshellarg($input); - exec(join(' ', $cmd), $lines, $rc); + exec(implode(' ', $cmd), $lines, $rc); $this->assertEquals(0, $rc, "command ran okay"); $this->assertNotEmpty($lines); - $res = join("\n", $lines); + $res = implode("\n", $lines); $this->assertNotEmpty($res); return $res;