Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
composer.phar
.phpunit.result.cache
/vendor/

# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
# composer.lock
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
],
"license": "MIT",
"require-dev": {
"phpunit/phpunit": "7.0.2",
"squizlabs/php_codesniffer": "3.2.3",
"php-coveralls/php-coveralls": "~2.1.0"
"phpunit/phpunit": "^9.5.4",
"squizlabs/php_codesniffer": "^3.5.8",
"php-coveralls/php-coveralls": "^2.4.3"
},
"require": {
"phpugph/components": "~2.2.0"
"phpugph/components": "^1.0.0"
},
"autoload": {
"psr-4": {
Expand Down
39 changes: 19 additions & 20 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit backupGlobals="false"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="test/bootstrap.php"
<phpunit
backupGlobals="false"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
bootstrap="test/bootstrap.php"
>
<testsuites>
<testsuite name="Handlebars Test Suite">
Expand All @@ -22,14 +21,14 @@
</testsuite>
</testsuites>

<filter>
<whitelist>
<coverage>
<include>
<directory suffix=".php">./src</directory>
<exclude>
<directory>./vendor</directory>
<directory>./test</directory>
<file>src/helpers.php</file>
</exclude>
</whitelist>
</filter>
</include>
<exclude>
<directory>./vendor</directory>
<directory>./test</directory>
<file>src/helpers.php</file>
</exclude>
</coverage>
</phpunit>
4 changes: 2 additions & 2 deletions test/HandlebarsCompiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Handlebars_HandlebarsCompiler_Test extends TestCase
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
protected function setUp(): void
{
$handler = new HandlebarsHandler;
$this->source = file_get_contents(__DIR__.'/assets/tokenizer.html');
Expand All @@ -55,7 +55,7 @@ protected function setUp()
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
protected function tearDown(): void
{
}

Expand Down
4 changes: 2 additions & 2 deletions test/HandlebarsData.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Handlebars_HandlebarsData_Test extends TestCase
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
protected function setUp(): void
{
$this->object = new HandlebarsData([
'product_id' => 123,
Expand All @@ -41,7 +41,7 @@ protected function setUp()
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
protected function tearDown(): void
{
}

Expand Down
4 changes: 2 additions & 2 deletions test/HandlebarsException.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class Handlebars_HandlebarsException_Test extends TestCase
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
protected function setUp(): void
{
$this->object = new HandlebarsException;
}
Expand All @@ -33,7 +33,7 @@ protected function setUp()
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
protected function tearDown(): void
{
}

Expand Down
4 changes: 2 additions & 2 deletions test/HandlebarsHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Handlebars_HandlebarsHandler_Test extends TestCase
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
protected function setUp(): void
{
$this->object = new HandlebarsHandler;
}
Expand All @@ -35,7 +35,7 @@ protected function setUp()
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
protected function tearDown(): void
{
}

Expand Down
4 changes: 2 additions & 2 deletions test/HandlebarsRuntime.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Handlebars_HandlebarsRuntime_Test extends TestCase
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
protected function setUp(): void
{
//reset the helpers and partials after every test
HandlebarsHandler::i()->reset();
Expand All @@ -29,7 +29,7 @@ protected function setUp()
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
protected function tearDown(): void
{
}

Expand Down
4 changes: 2 additions & 2 deletions test/HandlebarsTokenizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Handlebars_HandlebarsTokenizer_Test extends TestCase
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
protected function setUp()
protected function setUp(): void
{
$this->source = file_get_contents(__DIR__.'/assets/tokenizer.html');
$this->object = new HandlebarsTokenizer($this->source);
Expand All @@ -39,7 +39,7 @@ protected function setUp()
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
protected function tearDown()
protected function tearDown(): void
{
}

Expand Down