Drop Phug < 1

Author: kylekatarnls

.github/workflows/tests.yml

@@ -38,7 +38,7 @@ jobs:
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer update --prefer-dist --prefer-${{ matrix.setup }} --no-progress --no-interaction
+      run: composer update --prefer-dist --prefer-${{ matrix.setup }} --no-progress --no-interaction ${{ matrix.php >= 8.1 && '--ignore-platform-req=php' || '' }}
 
     - name: Run test suite
       run: vendor/bin/phpunit --no-coverage --verbose

composer.json

@@ -11,11 +11,11 @@
   ],
   "require": {
     "php": ">=7.0",
-    "phug/compiler": "^0.5.0 || ^1.0.0",
-    "phug/formatter": "^0.5.42 || ^1.0.0"
+    "phug/compiler": "^1.0.0",
+    "phug/formatter": "^1.0.0"
   },
   "require-dev": {
-    "phug/phug": "^0.3.2 || ^1.0.0",
+    "phug/phug": "^1.0.0",
     "phpunit/phpunit": "^6.5 || ^7.5 || ^8.5",
     "machy8/xhtml-formatter": "^1.0",
     "js-phpize/js-phpize-phug": "^2.1"

src/PhugBemto/PhugBemto.php

@@ -12,7 +12,7 @@ public function __construct(ModuleContainerInterface $container)
         parent::__construct($container);
 
         $file = realpath(__DIR__ . '/../../bemto.pug');
-        $includes = $container->getOption('includes');
+        $includes = $container->getOption('includes') ?? [];
 
         if (!in_array($file, $includes)) {
             $includes[] = $file;

tests/AbstractTestCase.php

@@ -22,16 +22,19 @@ abstract class AbstractTestCase extends TestCase
     /**
      * @throws \Phug\RendererException
      */
-    protected function setUp()
+    protected function getRenderer(): Renderer
     {
-        parent::setUp();
-        $this->renderer = new Renderer([
-            'debug' => true,
-            'execution_max_time' => 180000,
-            'modules' => array_merge([
-                PhugBemto::class,
-            ], $this->modules),
-        ]);
+        if (!isset($this->renderer)) {
+            $this->renderer = new Renderer([
+                'debug'              => true,
+                'execution_max_time' => 180000,
+                'modules'            => array_merge([
+                    PhugBemto::class,
+                ], $this->modules),
+            ]);
+        }
+
+        return $this->renderer;
     }
 
     protected function renderFile($sourceFile)
@@ -40,13 +43,13 @@ protected function renderFile($sourceFile)
         $actualOutput = null;
 
         try {
-            $actualOutput = $this->renderer->renderFile($sourceFile);
+            $actualOutput = $this->getRenderer()->renderFile($sourceFile);
         } catch (\Throwable $exception) {
             $error = $exception;
 
             try {
                 $debugFile = __DIR__ . '/../debug.php';
-                file_put_contents($debugFile, $this->renderer->compileFile($sourceFile));
+                file_put_contents($debugFile, $this->getRenderer()->compileFile($sourceFile));
                 include $debugFile;
             } catch (\Throwable $exception) {
                 throw new \Exception('Error in ' . $sourceFile . "\n" . $exception->getMessage(), 0, $exception);
@@ -72,6 +75,10 @@ protected static function htmlStandardize($html)
         $html = preg_replace('/([a-z"\'])\/>/', '$1 />', $html);
         $html = preg_replace('/(<[a-z][^>]*)\s\/>/', '$1>', $html);
 
+        if (version_compare(PHP_VERSION, '8.1.0-dev', '>=')) {
+            $html = str_replace('&#039;', "'", $html);
+        }
+
         return $html;
     }