Merge pull request #26 from ArthurHoaro/fix/phpunit-compat

ArthurHoaro · Sep 29, 2020 · 4f9307f · 4f9307f
2 parents cb5aaa9 + ca8544f
commit 4f9307f
Show file tree

Hide file tree

Showing 19 changed files with 75 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -11,10 +11,10 @@
   ],
   "require": {
     "php": ">=7.1",
-    "phpunit/php-text-template": "^1.2"
+    "phpunit/php-text-template": "^1.2 || ^2.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0 || ^8.0",
+    "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
     "php-coveralls/php-coveralls": "^2.0",
     "squizlabs/php_codesniffer": "^3.0",
     "gskema/phpcs-type-sniff": "^0.13.1",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
-        colors="true"
-        bootstrap="./tests/bootstrap.php">
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src/WebThumbnailer/</directory>
-            <directory suffix=".php">tests/WebThumbnailer/</directory>
-        </whitelist>
-    </filter>
-    <testsuites>
-        <testsuite name="AllTests">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <logging>
-        <log type="coverage-html" target="coverage" lowUpperBound="30" highLowerBound="80"/>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
-        <log type="coverage-clover" target="coverage/logs/clover.xml"/>
-    </logging>
-    <php>
-        <const name="WEB_SERVER_HOST" value="localhost" />
-        <const name="WEB_SERVER_PORT" value="8081" />
-        <const name="WEB_SERVER_DOCROOT" value="./tests/public" />
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" colors="true" bootstrap="./tests/bootstrap.php">
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src/WebThumbnailer/</directory>
+      <directory suffix=".php">tests/WebThumbnailer/</directory>
+    </include>
+    <report>
+      <clover outputFile="coverage/logs/clover.xml"/>
+      <html outputDirectory="coverage" lowUpperBound="30" highLowerBound="80"/>
+      <text outputFile="php://stdout" showUncoveredFiles="true"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="AllTests">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
+  <php>
+    <const name="WEB_SERVER_HOST" value="localhost"/>
+    <const name="WEB_SERVER_PORT" value="8081"/>
+    <const name="WEB_SERVER_DOCROOT" value="./tests/public"/>
+  </php>
 </phpunit>
diff --git a/src/WebThumbnailer/Application/CacheManager.php b/src/WebThumbnailer/Application/CacheManager.php
@@ -8,6 +8,7 @@
 use WebThumbnailer\Exception\CacheException;
 use WebThumbnailer\Exception\IOException;
 use WebThumbnailer\Utils\FileUtils;
+use WebThumbnailer\Utils\TemplatePolyfill;
 
 /**
  * Handles file caching using static methods.
@@ -176,7 +177,7 @@ protected static function createHtaccessFile(string $path, bool $allowed = false
         $templateFile = file_exists(FileUtils::RESOURCES_PATH . 'htaccess' . $apacheVersion . '_template')
             ? FileUtils::RESOURCES_PATH . 'htaccess' . $apacheVersion . '_template'
             : FileUtils::RESOURCES_PATH . 'htaccess_template';
-        $template = new \Text_Template($templateFile);
+        $template = TemplatePolyfill::get($templateFile);
         $template->setVar([
             'new_all' => $allowed ? 'granted' : 'denied',
             'old_allow' => $allowed ? 'all' : 'none',

diff --git a/src/WebThumbnailer/Utils/TemplatePolyfill.php b/src/WebThumbnailer/Utils/TemplatePolyfill.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace WebThumbnailer\Utils;
+
+class TemplatePolyfill
+{
+    /** @return \Text_Template|\SebastianBergmann\Template\Template */
+    public static function get(string $file)
+    {
+        if (class_exists('Text_Template')) {
+            return new \Text_Template($file);
+        }
+
+        return new \SebastianBergmann\Template\Template($file);
+    }
+}
diff --git a/tests/WebThumbnailer/Application/CacheManagerTest.php b/tests/WebThumbnailer/Application/CacheManagerTest.php
@@ -2,7 +2,7 @@
 
 namespace WebThumbnailer\Application;
 
-use PHPUnit\Framework\TestCase;
+use WebThumbnailer\TestCase;
 use WebThumbnailer\Utils\FileUtils;
 
 /**

diff --git a/tests/WebThumbnailer/Application/ThumbnailerTest.php b/tests/WebThumbnailer/Application/ThumbnailerTest.php
@@ -2,8 +2,8 @@
 
 namespace WebThumbnailer\Application;
 
-use PHPUnit\Framework\TestCase;
 use WebThumbnailer\Exception\BadRulesException;
+use WebThumbnailer\TestCase;
 use WebThumbnailer\Utils\FileUtils;
 use WebThumbnailer\Utils\SizeUtils;
 use WebThumbnailer\WebThumbnailer;

diff --git a/tests/WebThumbnailer/Finder/DefaultFinderTest.php b/tests/WebThumbnailer/Finder/DefaultFinderTest.php
@@ -2,7 +2,7 @@
 
 namespace WebThumbnailer\Finder;
 
-use PHPUnit\Framework\TestCase;
+use WebThumbnailer\TestCase;
 
 /**
  * Class DefaultFinderTest

diff --git a/tests/WebThumbnailer/Finder/FinderFactoryTest.php b/tests/WebThumbnailer/Finder/FinderFactoryTest.php
@@ -2,8 +2,8 @@
 
 namespace WebThumbnailer\Finder;
 
-use PHPUnit\Framework\TestCase;
 use WebThumbnailer\Exception\BadRulesException;
+use WebThumbnailer\TestCase;
 
 /**
  * Class FinderFactoryTest

diff --git a/tests/WebThumbnailer/Finder/FlickRFinderTest.php b/tests/WebThumbnailer/Finder/FlickRFinderTest.php
@@ -2,7 +2,7 @@
 
 namespace WebThumbnailer\Finder;
 
-use PHPUnit\Framework\TestCase;
+use WebThumbnailer\TestCase;
 
 /**
  * Class FlickRFinderTest

diff --git a/tests/WebThumbnailer/Finder/QueryRegexFinderTest.php b/tests/WebThumbnailer/Finder/QueryRegexFinderTest.php
@@ -2,8 +2,8 @@
 
 namespace WebThumbnailer\Finder;
 
-use PHPUnit\Framework\TestCase;
 use WebThumbnailer\Exception\BadRulesException;
+use WebThumbnailer\TestCase;
 use WebThumbnailer\Utils\DataUtils;
 use WebThumbnailer\Utils\FileUtils;
 

diff --git a/tests/WebThumbnailer/Finder/UrlRegexFinderTest.php b/tests/WebThumbnailer/Finder/UrlRegexFinderTest.php
@@ -2,8 +2,8 @@
 
 namespace WebThumbnailer\Finder;
 
-use PHPUnit\Framework\TestCase;
 use WebThumbnailer\Exception\BadRulesException;
+use WebThumbnailer\TestCase;
 use WebThumbnailer\Utils\DataUtils;
 use WebThumbnailer\Utils\FileUtils;
 use WebThumbnailer\WebThumbnailer;

diff --git a/tests/WebThumbnailer/TestCase.php b/tests/WebThumbnailer/TestCase.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace WebThumbnailer;
+
+class TestCase extends \PHPUnit\Framework\TestCase
+{
+    public function expectExceptionMessageRegExp(string $regularExpression): void
+    {
+        if (method_exists($this, 'expectExceptionMessageMatches')) {
+            $this->expectExceptionMessageMatches($regularExpression);
+        } else {
+            parent::expectExceptionMessageRegExp($regularExpression);
+        }
+    }
+}
diff --git a/tests/WebThumbnailer/Utils/DataUtilsTest.php b/tests/WebThumbnailer/Utils/DataUtilsTest.php
@@ -2,7 +2,7 @@
 
 namespace WebThumbnailer\Utils;
 
-use PHPUnit\Framework\TestCase;
+use WebThumbnailer\TestCase;
 
 /**
  * Class DataUtilsTest

diff --git a/tests/WebThumbnailer/Utils/FileUtilsTests.php b/tests/WebThumbnailer/Utils/FileUtilsTests.php
@@ -2,7 +2,7 @@
 
 namespace WebThumbnailer\Utils;
 
-use PHPUnit\Framework\TestCase;
+use WebThumbnailer\TestCase;
 
 /**
  * Class FileUtilsTests

diff --git a/tests/WebThumbnailer/Utils/FinderUtilsTest.php b/tests/WebThumbnailer/Utils/FinderUtilsTest.php
@@ -2,7 +2,7 @@
 
 namespace WebThumbnailer\Utils;
 
-use PHPUnit\Framework\TestCase;
+use WebThumbnailer\TestCase;
 
 /**
  * Class FinderUtilsTest

diff --git a/tests/WebThumbnailer/Utils/ImageUtilsTest.php b/tests/WebThumbnailer/Utils/ImageUtilsTest.php
@@ -2,8 +2,8 @@
 
 namespace WebThumbnailer\Utils;
 
-use PHPUnit\Framework\TestCase;
 use WebThumbnailer\Exception\NotAnImageException;
+use WebThumbnailer\TestCase;
 
 /**
  * Class ImageUtilsTest

diff --git a/tests/WebThumbnailer/Utils/UrlUtilsTest.php b/tests/WebThumbnailer/Utils/UrlUtilsTest.php
@@ -2,7 +2,7 @@
 
 namespace WebThumbnailer\Utils;
 
-use PHPUnit\Framework\TestCase;
+use WebThumbnailer\TestCase;
 
 /**
  * Class UrlUtilsTest

diff --git a/tests/WebThumbnailer/WebThumbnailerTest.php b/tests/WebThumbnailer/WebThumbnailerTest.php
@@ -94,7 +94,7 @@ public function testDirectImageWithoutExtension()
      */
     public function testOpenGraphImage()
     {
-        $image = 'default/le-monde.png';
+        $image = 'default/le-monde.jpg';
         $this->regenerate($image);
         $expected = self::$regenerated . $image;
         $url = self::LOCAL_SERVER . 'default/le-monde.html';

diff --git a/tests/WebThumbnailer/resources/expected-thumbs/default/le-monde.jpg b/tests/WebThumbnailer/resources/expected-thumbs/default/le-monde.jpg