Merge pull request #13 from mirko-bukilic/master

Updated package and dependencies to php 8.3

Author: ppavlovic

.gitignore

@@ -17,6 +17,7 @@ composer.phar
 composer.lock
 vendor
 test/coverage
+tests/unit/.phpunit.result.cache
 
 # Compiled source #
 ###################

composer.json

@@ -25,21 +25,20 @@
         "psr-4": {"G4\\Runner\\": "src/"}
     },
     "require": {
-        "php"            : ">=8.2",
+        "php"            : ">=8.3",
         "aura/accept"    : "4.*",
         "g4/clean-core"  : "*",
         "g4/http"        : "*",
         "g4/di"          : "*",
         "g4/profiler"    : ">=1.12.0",
         "g4/factory"     : "1.*",
-        "twig/twig"      : "1.*",
-        "twig/extensions": "^1.2",
-        "g4/version": "^0.0.2"
+        "twig/twig"      : "*",
+        "g4/version": "0.0.*"
     },
     "require-dev": {
-        "phpunit/phpunit"           : "10.*",
+        "phpunit/phpunit"           : "9.*",
         "squizlabs/php_codesniffer" : "3.*",
-        "g4/code-coverage"          : "1.*"
+        "g4/code-coverage"          : "2.*"
     },
     "scripts": {
         "unit-test": [

src/Presenter/View/Twig/Template.php

@@ -2,6 +2,10 @@
 
 namespace G4\Runner\Presenter\View\Twig;
 
+use G4\Runner\Presenter\DataTransfer;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
+
 class Template
 {
 
@@ -12,7 +16,7 @@ class Template
 
     /**
      *
-     * @var \Twig_Environment
+     * @var Environment
      */
     private $templateEngine;
 
@@ -42,37 +46,34 @@ public function render($data, $templateName)
         }
 
         return $this->getTemplateEngine()
-            ->loadTemplate($templateName)
-            ->render($data);
+            ->render($templateName, $data);
     }
 
     /**
-     * @return \Twig_Loader_Filesystem
+     * @return FilesystemLoader
      */
     private function getFilesystemLoader()
     {
-        return new \Twig_Loader_Filesystem([$this->templatesPath, $this->templatesRootPath]);
+        return new FilesystemLoader([$this->templatesPath, $this->templatesRootPath]);
     }
 
     /**
-     * @return \Twig_Environment
+     * @return Environment
      */
     private function getTemplateEngine()
     {
-        if(!$this->templateEngine instanceof \Twig_Environment) {
+        if(!$this->templateEngine instanceof Environment) {
             if(is_callable(['\App\DI', 'templateEngine'])) {
                 $this->templateEngine = \App\DI::templateEngine();
-                if(!$this->templateEngine instanceof \Twig_Environment) {
+                if(!$this->templateEngine instanceof Environment) {
                     throw new \Exception("Template engine class is invalid");
                 }
             } else {
-                $this->templateEngine = new \Twig_Environment($this->getFilesystemLoader(), [
+                $this->templateEngine = new Environment($this->getFilesystemLoader(), [
                     'cache'       => realpath(PATH_CACHE),
                     'auto_reload' => true,
                     'debug'       => true,
                 ]);
-                $this->templateEngine->addExtension(new \Twig_Extensions_Extension_I18n());
-                $this->templateEngine->addExtension(new \Twig_Extension_Debug());
             }
         }
 

tests/unit/phpunit.xml

@@ -1,13 +1,11 @@
-<phpunit bootstrap="bootstrap.php" colors="true">
-
-    <testsuite name="Test Suite">
-        <directory>./src</directory>
-    </testsuite>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">../../src/</directory>
-        </whitelist>
-    </filter>
-
-</phpunit>
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">../../src/</directory>
+    </include>
+  </coverage>
+  <testsuite name="Test Suite">
+    <directory>./src</directory>
+  </testsuite>
+</phpunit>

tests/unit/src/Presenter/ContentTypeTest.php

@@ -4,8 +4,9 @@
 use G4\Runner\Presenter\HeaderAccept;
 use G4\Runner\Presenter\ContentType;
 use G4\CleanCore\Response\Response;
+use PHPUnit\Framework\TestCase;
 
-class ContentTypeTest extends PHPUnit_Framework_TestCase
+class ContentTypeTest extends TestCase
 {
     /**
      * @dataProvider validDataProvider

tests/unit/src/Presenter/HeaderAcceptTest.php

@@ -2,9 +2,10 @@
 
 
 use G4\Runner\Presenter\HeaderAccept;
+use PHPUnit\Framework\TestCase;
 
 
-class HeaderAcceptTest extends PHPUnit_Framework_TestCase
+class HeaderAcceptTest extends TestCase
 {
 
     public function testDefault()

tests/unit/src/Presenter/View/ImageTest.php

@@ -3,8 +3,9 @@
 use G4\Runner\Presenter\DataTransfer;
 use G4\Runner\Presenter\View\Image;
 use G4\CleanCore\Response\Response;
+use PHPUnit\Framework\TestCase;
 
-class ImageTest extends PHPUnit_Framework_TestCase
+class ImageTest extends TestCase
 {
     /**
      * @var Image
@@ -31,7 +32,7 @@ class ImageTest extends PHPUnit_Framework_TestCase
     /**
      * Set up method
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->dataTransfer = $this->createMock(DataTransfer::class);
         $this->response = $this->createMock(Response::class);

tests/unit/src/Presenter/ViewTest.php

@@ -4,8 +4,9 @@
 use G4\Runner\Presenter\View;
 use G4\Runner\Presenter\ContentType;
 use G4\CleanCore\Response\Response;
+use PHPUnit\Framework\TestCase;
 
-class ViewTest extends PHPUnit_Framework_TestCase
+class ViewTest extends TestCase
 {
     /**
      * @var View
@@ -32,7 +33,7 @@ class ViewTest extends PHPUnit_Framework_TestCase
     /**
      * Set up method
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->contentType = $this->createMock(ContentType::class);
         $this->dataTransfer = $this->createMock(DataTransfer::class);

tests/unit/src/Route/RouteFactoryTest.php

@@ -2,7 +2,9 @@
 
 namespace G4\Runner\Route;
 
-class RouteFactoryTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class RouteFactoryTest extends TestCase
 {
     public function testReconstitute()
     {

tests/unit/src/Route/RouteFormatterTest.php

@@ -3,8 +3,9 @@
 namespace G4\Runner\Route;
 
 use G4\ValueObject\StringLiteral;
+use PHPUnit\Framework\TestCase;
 
-class RouteFormatterTest extends \PHPUnit_Framework_TestCase
+class RouteFormatterTest extends TestCase
 {
     public function testFormat()
     {