Merge pull request #79 from nbayramberdiyev/feat/drop_php7.3

Drop Support for PHP 7.3 & Travis CI

Author: l0gicgate

.github/workflows/tests.yml

@@ -6,17 +6,13 @@ jobs:
     tests:
         name: Tests PHP ${{ matrix.php }}
         runs-on: ubuntu-latest
-        continue-on-error: ${{ matrix.experimental }}
         strategy:
             fail-fast: false
             matrix:
-                php: [7.3, 7.4, 8.0]
-                experimental: [false]
+                php: [7.4, 8.0, 8.1]
                 include:
-                    - php: 8.0
-                      analysis: true
                     - php: 8.1
-                      experimental: true
+                      analysis: true
 
         steps:
             - name: Checkout
@@ -29,7 +25,7 @@ jobs:
                   coverage: xdebug
 
             - name: Install dependencies with Composer
-              uses: ramsey/composer-install@v1
+              uses: ramsey/composer-install@v2
 
             - name: Coding standards
               if: matrix.analysis

.travis.yml

@@ -19,21 +19,29 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "psr/http-message": "^1.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5",
+        "slim/psr7": "^1.5",
+        "squizlabs/php_codesniffer": "^3.6"
+    },
     "autoload": {
         "psr-4": {
             "Slim\\Views\\": "src"
         }
     },
-    "require-dev": {
-        "phpunit/phpunit": "^9.5.11",
-        "slim/psr7": "^1.5",
-        "squizlabs/php_codesniffer": "^3.6"
+    "autoload-dev": {
+        "psr-4": {
+            "Slim\\Tests\\": "tests"
+        }
     },
     "scripts": {
         "test": "phpunit --configuration phpunit.xml.dist",
         "test:coverage": "phpunit --configuration phpunit.xml.dist --coverage-clover build/logs/clover.xml --coverage-html build/coverage"
+    },
+    "config": {
+        "sort-packages": true
     }
 }

composer.json

@@ -8,7 +8,7 @@
     <arg name="colors"/>
 
     <!-- inherit rules from: -->
-    <rule ref="PSR2"/>
+    <rule ref="PSR12"/>
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
 
     <!-- Paths to check -->

phpcs.xml

@@ -1,29 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.7/phpunit.xsd"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          beStrictAboutChangesToGlobalState="true"
          beStrictAboutOutputDuringTests="true"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
          bootstrap="tests/bootstrap.php"
 >
     <testsuites>
         <testsuite name="PHP-View Test Suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src/</directory>
+        </include>
+    </coverage>
+</phpunit>

phpunit.xml.dist

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *

src/Exception/PhpTemplateNotFoundException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -16,19 +17,13 @@
 
 class PhpRenderer
 {
+    protected string $templatePath;
+
+    protected array $attributes;
+
+    protected string $layout;
+
     /**
-     * @var string
-     */
-    protected $templatePath;
-/**
-     * @var array
-     */
-    protected $attributes;
-/**
-     * @var string
-     */
-    protected $layout;
-/**
      * @param string $templatePath
      * @param array  $attributes
      * @param string $layout
@@ -67,16 +62,21 @@ public function getLayout(): string
     /**
      * @param string $layout
      */
+
+    /**
+     * @param string $layout
+     *
+     * @return void
+     *
+     * @throws PhpTemplateNotFoundException
+     */
     public function setLayout(string $layout): void
     {
-        if ($layout === '' || $layout === null) {
-            $this->layout = null;
-        } else {
-            if (!$this->templateExists($layout)) {
-                throw new PhpTemplateNotFoundException('Layout template "' . $layout . '" does not exist');
-            }
-            $this->layout = $layout;
+        if ($layout && !$this->templateExists($layout)) {
+            throw new PhpTemplateNotFoundException('Layout template "' . $layout . '" does not exist');
         }
+
+        $this->layout = $layout;
     }
 
     /**
@@ -150,7 +150,7 @@ public function setTemplatePath(string $templatePath): void
     public function fetch(string $template, array $data = [], bool $useLayout = false): string
     {
         $output = $this->fetchTemplate($template, $data);
-        if ($this->layout !== null && $useLayout) {
+        if ($this->layout && $useLayout) {
             $data['content'] = $output;
             $output = $this->fetchTemplate($this->layout, $data);
         }
@@ -193,11 +193,11 @@ public function fetchTemplate(string $template, array $data = []): string
     /**
      * Returns true is template exists, false if not
      *
-     * @param $template
+     * @param string $template
      *
      * @return bool
      */
-    public function templateExists(string $template) : bool
+    public function templateExists(string $template): bool
     {
         $path = $this->templatePath . $template;
         return is_file($path) && is_readable($path);

src/PhpRenderer.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -7,7 +8,7 @@
 
 declare(strict_types=1);
 
-namespace Slim\ViewsTest;
+namespace Slim\Tests;
 
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;

tests/PhpRendererTest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Slim Framework (https://slimframework.com)
  *
@@ -7,4 +8,4 @@
 
 declare(strict_types=1);
 
-include "vendor/autoload.php";
+include 'vendor/autoload.php';