Merge pull request #1 from phug-php/feature/github-actions

Drop Phug < 1

Author: kylekatarnls

.github/workflows/coverage.yml

@@ -0,0 +1,62 @@
+name: Coverage
+
+on:
+  push:
+    branches: [ '**' ]
+  pull_request:
+    branches: [ '**' ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['7.4']
+        setup: ['stable']
+
+    name: PHP
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        tools: composer:v2
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-${{ matrix.setup }}-v2-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.setup }}-v2-php-${{ matrix.php }}-
+
+    - name: Code Climate Test Reporter Preparation
+      if: matrix.php == '7.4' && matrix.setup == 'stable'
+      run: |
+        curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+        chmod +x ./cc-test-reporter
+        ./cc-test-reporter before-build
+      env:
+        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+
+    - name: Install dependencies
+      if: steps.composer-cache.outputs.cache-hit != 'true'
+      run: composer update --prefer-dist --prefer-${{ matrix.setup }} --no-progress --no-interaction
+
+    - name: Run test suite
+      run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml
+
+    - name: Code Climate Test Reporter
+      if: ${{ matrix.php == '7.4' && matrix.setup == 'stable' && env.CC_TEST_REPORTER_ID != '' }}
+      run: |
+        cp coverage.xml clover.xml
+        bash <(curl -s https://codecov.io/bash)
+        ./cc-test-reporter after-build --coverage-input-type clover --exit-code 0
+      env:
+        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}

.github/workflows/tests.yml

@@ -0,0 +1,46 @@
+name: Tests
+
+on:
+  push:
+    branches: [ '**' ]
+  pull_request:
+    branches: [ '**' ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
+        setup: ['lowest', 'stable']
+
+    name: PHP ${{ matrix.php }} - ${{ matrix.setup }}
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        tools: composer:v2
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-${{ matrix.setup }}-v2-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-${{ matrix.setup }}-v2-php-${{ matrix.php }}-
+
+    - name: Install dependencies
+      if: steps.composer-cache.outputs.cache-hit != 'true'
+      run: |
+        ${{ matrix.php >= 8.1 && 'composer require --no-update phpunit/phpunit:^8.5.15 --no-interaction;' || '' }}
+        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

.travis.yml

@@ -11,13 +11,12 @@
   ],
   "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",
-    "phpunit/phpunit": ">=4.8.35 <6.0",
-    "codeclimate/php-test-reporter": "dev-master",
+    "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"
   },

composer.json

@@ -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;

src/PhugBemto/PhugBemto.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;
     }