Merged pull request #6

Author: derickr

.github/workflows/ci.yml

@@ -0,0 +1,14 @@
+name: CI
+
+on:
+  # Run on all pushes to master and on all pull requests.
+  push:
+    branches:
+      master
+  pull_request:
+  # Allow manually triggering the workflow.
+  workflow_dispatch:
+
+jobs:
+  test:
+    uses: "zetacomponents/.github/.github/workflows/ci.yml@master"

composer.json

@@ -34,6 +34,7 @@
         "zetacomponents/template": "~1.4"
     },
     "require-dev": {
-        "zetacomponents/unit-test": "*"
+        "zetacomponents/unit-test": "*",
+        "phpunit/phpunit": "^9.0"
     }
 }

phpunit.xml.dist

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php" colors="true">
-    <testsuites>
-        <testsuite name="Zeta Components MvcTemplateTiein">
-            <directory suffix="_test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" convertDeprecationsToExceptions="true">
+  <coverage>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Zeta Components MvcTemplateTiein">
+      <directory suffix="_test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>

tests/views/template.php renamed to tests/views/template-tiein_test.php

@@ -8,9 +8,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -24,7 +24,7 @@
  * @package MvcTemplateTiein
  * @subpackage Tests
  */
-require_once 'MvcTemplateTiein/tests/testfiles/testclasses.php';
+require_once __DIR__ . '/../testfiles/testclasses.php';
 
 /**
  * Test the handler classes.
@@ -34,7 +34,7 @@
  */
 class ezcMvcTemplateViewTest extends ezcTestCase
 {
-    function setUp()
+    function setUp() : void
     {
         $this->baseDir = dirname( __FILE__ ) . '/../testfiles/views/template/';
     }
@@ -106,7 +106,7 @@ public function testNonExistingFile()
 
     public static function suite()
     {
-         return new PHPUnit_Framework_TestSuite( "ezcMvcTemplateViewTest" );
+         return new PHPUnit\Framework\TestSuite( "ezcMvcTemplateViewTest" );
     }
 }
 ?>