Make testing work on recent PHP versions

.github/workflows/code-quality.yml

@@ -0,0 +1,12 @@
+name: Code Quality Checks
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - master
+
+jobs:
+  code-quality:
+    uses: brightnucleus/.github/.github/workflows/reusable-code-quality.yml@main

.github/workflows/testing.yml

@@ -0,0 +1,15 @@
+name: Testing
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron:  '17 1 * * *' # Run every day on a seemly random time.
+
+jobs:
+  test:
+    uses: brightnucleus/.github/.github/workflows/reusable-testing.yml@main
+    with:
+        minimum-php: '7.4'

composer.json

@@ -4,8 +4,10 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "require-dev": {
-    "phpunit/phpunit": "~5",
-    "squizlabs/php_codesniffer": "~2.5"
+    "malukenho/docheader": "^1",
+    "yoast/phpunit-polyfills": "^3",
+    "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5 || ^10",
+    "squizlabs/php_codesniffer": "^3"
   },
   "license": "MIT",
   "authors": [
@@ -15,10 +17,11 @@
     }
   ],
   "require": {
+    "php": ">=7.4",
     "brightnucleus/exceptions": ">=0.2",
     "brightnucleus/config": ">=0.4",
-    "doctrine/collections": "^1.3",
-    "symfony/finder": "^3.1"
+    "doctrine/collections": ">=1.3",
+    "symfony/finder": ">=3.1"
   },
   "autoload": {
     "psr-4": {
@@ -27,7 +30,20 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "BrightNucleus\\View\\Tests\\": "tests/fixtures/classes/"
+      "BrightNucleus\\View\\Tests\\Fixtures\\": "tests/fixtures/classes/",
+      "BrightNucleus\\View\\Tests\\": "tests/"
     }
+  },
+  "scripts": {
+    "check": [
+      "@cs-check",
+      "@test"
+    ],
+    "upload-coverage": "vendor/bin/coveralls -v --coverage_clover clover.xml",
+    "cs-check": "vendor/bin/phpcs -ps --colors",
+    "cs-fix": "vendor/bin/phpcbf -ps --colors",
+    "test": "vendor/bin/phpunit --colors",
+    "test-coverage": "vendor/bin/phpunit --colors --coverage-clover clover.xml",
+    "license-check": "vendor/bin/docheader --ansi check src/"
   }
 }

phpcs.xml.dist

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<ruleset name="Bright Nucleus View">
+ <description>The coding standard for the Bright Nucleus View package.</description>
+
+ <file>src</file>
+ <file>tests</file>
+
+ <rule ref="PSR2"/>
+</ruleset>

phpunit.xml

@@ -1,25 +1,18 @@
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTestSize="true"
-         beStrictAboutChangesToGlobalState="false">
-    <testsuites>
-        <testsuite name="view">
-            <file>tests/ViewTest.php</file>
-            <file>tests/ViewBuilderTest.php</file>
-            <file>tests/ViewFacadeTest.php</file>
-        </testsuite>
-        <testsuite name="location">
-            <file>tests/FilesystemLocationTest.php</file>
-            <file>tests/LocationCollectionTest.php</file>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+	bootstrap="vendor/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php"
+	verbose="true"
+    colors="true">
+	<testsuites>
+		<testsuite name="unit">
+			<directory suffix="Test.php">tests</directory>
+		</testsuite>
+	</testsuites>
+	<coverage processUncoveredFiles="true">
+		<include>
+			<directory suffix=".php">src</directory>
+		</include>
+	</coverage>
 </phpunit>

src/View/Engine/NullEngine.php

@@ -50,6 +50,8 @@ public function canHandle($criterion): bool
      */
     public function getRenderCallback(string $uri, array $context = []): callable
     {
-        return function () { return ''; };
+        return function () {
+            return '';
+        };
     }
 }

src/View/Location/FilesystemLocation.php

@@ -130,12 +130,12 @@ protected function getNamePattern(array $criteria, string $extension): string
                 $extension = ltrim($extension, '.');
 
                 if ($uriExtension === $extension) {
-                    $criterion = substr($criterion,0,-strlen(".{$extension}"));
+                    $criterion = substr($criterion, 0, -strlen(".{$extension}"));
                 }
             } else {
                 $extension = URIHelper::containsExtension($criterion);
                 if (!empty($extension)) {
-                    $criterion = substr($criterion,0,-strlen(".{$extension}"));
+                    $criterion = substr($criterion, 0, -strlen(".{$extension}"));
                 }
             }
 
@@ -164,7 +164,7 @@ protected function getPathPattern(string $relativePath): string
             return $this->path;
         }
 
-        return rtrim($this->path,'/') . '/' . ltrim($relativePath, '/');
+        return rtrim($this->path, '/') . '/' . ltrim($relativePath, '/');
     }
 
     /**

src/View/Location/Locations.php

@@ -37,7 +37,9 @@ public function add($location): bool
             return false;
         }
 
-        return parent::add($location);
+        parent::add($location);
+
+        return true;
     }
 
     /**

src/View/Support/Findables.php

@@ -25,4 +25,3 @@ class Findables extends ArrayCollection
 {
 
 }
-

src/View/View.php

@@ -24,11 +24,11 @@
 interface View extends Findable
 {
 
-	const MERGE        = 'merge';
-	const REPLACE      = 'replace';
-	const ADD_ONLY     = 'add-only';
-	const REPLACE_ONLY = 'replace-only';
-	const MERGE_ONLY   = 'merge-only';
+    const MERGE        = 'merge';
+    const REPLACE      = 'replace';
+    const ADD_ONLY     = 'add-only';
+    const REPLACE_ONLY = 'replace-only';
+    const MERGE_ONLY   = 'merge-only';
 
     /**
      * Check whether the Findable can handle an individual criterion.
@@ -74,15 +74,15 @@ public function section(string $view, array $context = [], $type = null): string
      */
     public function getContext(): array;
 
-	/**
-	 * Add information to the context.
-	 *
-	 * @param string $key      Context key to add.
-	 * @param mixed  $value    Value to add under the given key.
-	 * @param string $behavior Behavior to use for adapting the context.
-	 * @return View
-	 */
-	public function addToContext( string $key, $value, string $behavior ): View;
+    /**
+     * Add information to the context.
+     *
+     * @param string $key      Context key to add.
+     * @param mixed  $value    Value to add under the given key.
+     * @param string $behavior Behavior to use for adapting the context.
+     * @return View
+     */
+    public function addToContext(string $key, $value, string $behavior): View;
 
     /**
      * Associate a view builder with this view.

src/View/View/AbstractView.php

@@ -167,14 +167,14 @@ public function getContext(): array
      * @param string $behavior Behavior to use for adapting the context.
      * @return View
      */
-    public function addToContext( string $key, $value, string $behavior ): View
+    public function addToContext(string $key, $value, string $behavior): View
     {
         switch ($behavior) {
             case View::REPLACE:
                 $this->_context_[$key] = $value;
                 return $this;
             case View::MERGE:
-                if(array_key_exists($key, $this->_context_)) {
+                if (array_key_exists($key, $this->_context_)) {
                     $this->_context_ = array_merge_recursive($this->_context_, [$key => $value]);
                     return $this;
                 }
@@ -247,8 +247,9 @@ protected function assimilateContext(array $context = [])
      * @param array  $arguments Array of arguments that were used.
      * @return mixed Return value of the invokable object.
      */
-    public function __call($method, $arguments) {
-        if ( ! property_exists($this, $method)
+    public function __call($method, $arguments)
+    {
+        if (! property_exists($this, $method)
              || ! is_callable($this->$method)) {
             trigger_error(
                 "Call to undefined method {$method} on a view.",

src/View/View/NullView.php

@@ -91,7 +91,8 @@ public function getContext(): array
      * @param string $behavior Behavior to use for adapting the context.
      * @return View
      */
-    public function addToContext( string $key, $value, string $behavior ): View {
+    public function addToContext(string $key, $value, string $behavior): View
+    {
         return $this;
     }
 

src/View/ViewBuilder.php

@@ -169,7 +169,7 @@ public function getView(string $uri, Engine $engine, $type = null): View
     {
         if (null === $type) {
             $view = $this->getViewFinder()->find([$uri], $engine);
-            return $view->setBuilder( $this );
+            return $view->setBuilder($this);
         }
 
         return $this->resolveType($type, $uri, $engine);
@@ -212,7 +212,7 @@ public function addLocation(Location $location)
     {
         $this->locations->add($location);
 
-        unset( $this->viewPathCache );
+        unset($this->viewPathCache);
         $this->viewPathCache = [];
 
         return $this;
@@ -327,7 +327,7 @@ protected function resolveType($type, string $uri, Engine $engine = null): View
      */
     protected function getConfig($config = []): ConfigInterface
     {
-        $defaults = ConfigFactory::create(dirname(__DIR__, 2) . '/config/defaults.php', $config);
+        $defaults = ConfigFactory::create(dirname(__DIR__, 2) . '/config/defaults.php');
         $config   = $config
             ? ConfigFactory::createFromArray(array_merge_recursive($defaults->getArrayCopy(), $config->getArrayCopy()))
             : $defaults;

tests/FilesystemLocationTest.php

@@ -9,10 +9,11 @@
  * @copyright 2016-2017 Alain Schlesser, Bright Nucleus
  */
 
-namespace BrightNucleus\View;
+namespace BrightNucleus\View\Tests;
 
 use BrightNucleus\View\Location\FilesystemLocation;
 use BrightNucleus\View\Location\URIs;
+use BrightNucleus\View\Tests\TestCase;
 
 /**
  * Class FilesystemLocationTest.
@@ -22,7 +23,7 @@
  * @package BrightNucleus\View
  * @author  Alain Schlesser <[email protected]>
  */
-class FilesystemLocationTest extends \PHPUnit_Framework_TestCase
+class FilesystemLocationTest extends TestCase
 {
 
     /**

tests/LocationCollectionTest.php

@@ -9,10 +9,11 @@
  * @copyright 2016-2017 Alain Schlesser, Bright Nucleus
  */
 
-namespace BrightNucleus\View;
+namespace BrightNucleus\View\Tests;
 
 use BrightNucleus\View\Location\FilesystemLocation;
 use BrightNucleus\View\Location\Locations;
+use BrightNucleus\View\Tests\TestCase;
 
 /**
  * Class LocationCollectionTest.
@@ -22,7 +23,7 @@
  * @package BrightNucleus\View
  * @author  Alain Schlesser <[email protected]>
  */
-class LocationCollectionTest extends \PHPUnit_Framework_TestCase
+class LocationCollectionTest extends TestCase
 {
 
     public function testAddingKnownLocations()

tests/TestCase.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Bright Nucleus Config Component.
+ *
+ * @package   BrightNucleus\Config
+ * @author    Alain Schlesser <[email protected]>
+ * @license   MIT
+ * @link      http://www.brightnucleus.com/
+ * @copyright 2016 Alain Schlesser, Bright Nucleus
+ */
+
+namespace BrightNucleus\View\Tests;
+
+use Yoast\PHPUnitPolyfills\TestCases\TestCase as PolyfilledTestCase;
+
+class TestCase extends PolyfilledTestCase
+{
+
+}