Pug-php 3 compatibility

.travis.yml

@@ -1,36 +1,50 @@
 language: php
-
-dist: trusty
-
-sudo: required
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
-  - hhvm
-
 matrix:
-    include:
-        - php: 5.3
-          dist: precise
-
+  include:
+    - php: 5.3
+      env: PUG_VERSION='2.7.1'
+      dist: precise
+      sudo: required
+    - php: 5.4
+      env: PUG_VERSION='2.7.1'
+    - php: 5.5
+      env: PUG_VERSION='2.7.1'
+    - php: 5.5
+      env: PUG_VERSION='^3.0@alpha'
+    - php: 5.6
+      env: PUG_VERSION='2.7.1'
+    - php: 5.6
+      env: PUG_VERSION='^3.0@alpha'
+    - php: 7.0
+      env: PUG_VERSION='2.7.1'
+    - php: 7.0
+      env: PUG_VERSION='^3.0@alpha'
+    - php: 7.1
+      env: PUG_VERSION='2.7.1'
+    - php: 7.1
+      env: PUG_VERSION='^3.0@alpha'
+    - php: 7.2
+      env: PUG_VERSION='2.7.1'
+    - php: 7.2
+      env: PUG_VERSION='^3.0@alpha'
+    - php: hhvm
+      env: PUG_VERSION='2.7.1'
+      dist: trusty
+      sudo: required
+    - php: hhvm
+      env: PUG_VERSION='^3.0@alpha'
+      dist: trusty
+      sudo: required
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer install --no-interaction --prefer-source --dev
-
+  - if [ "$PUG_VERSION" != "" ]; then travis_retry composer require "pug-php/pug:${PUG_VERSION}" --no-update; fi;
+  - travis_retry composer update --no-interaction
 script:
   - vendor/bin/phpunit --verbose --coverage-text --coverage-clover=coverage.xml
-
 after_script:
   - vendor/bin/test-reporter --coverage-report coverage.xml
-
 after_success:
   - bash <(curl -s https://codecov.io/bash)
-
 addons:
   code_climate:
     repo_token: 0a31b541cee9f52242db2fc659c6e7a91987bc80d860736d87ae88962fc10eaf

composer.json

@@ -11,7 +11,7 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "pug-php/pug": "^2.0.2",
+        "pug-php/pug": "^2.0 || ^3.0",
         "nodejs-php-fallback/react": "^1.3.0"
     },
     "require-dev": {

tests/examples.php

@@ -21,22 +21,23 @@ public function caseProvider()
     /**
      * @dataProvider caseProvider
      */
-    public function testJadeGeneration($htmlFile, $jadeFile)
+    public function testPugGeneration($htmlFile, $pugFile)
     {
-        $jade = new Pug();
-        $renderedHtml = $jade->render($jadeFile, array(
-            'color' => 'yellow',
-        ));
+        $pug = new Pug();
+        $renderFile = method_exists($pug, 'renderFile')
+            ? array($pug, 'renderFile')
+            : array($pug, 'render');
+        $renderedHtml = call_user_func($renderFile, $pugFile);
         $htmlFileContents = file_get_contents($htmlFile);
 
         $actual = trim(preg_replace('`[\s_]+`', '', $renderedHtml));
         $expected = trim(preg_replace('`[\s_]+`', '', $htmlFileContents));
 
-        $this->assertSame($expected, $actual, $jadeFile . ' should match ' . $htmlFile . ' as html');
+        $this->assertSame($expected, $actual, $pugFile . ' should match ' . $htmlFile . ' as html');
 
         $actual = trim(preg_replace('`[\s_]+`', ' ', strip_tags($renderedHtml)));
         $expected = trim(preg_replace('`[\s_]+`', ' ', strip_tags($htmlFileContents)));
 
-        $this->assertSame($expected, $actual, $jadeFile . ' should match ' . $htmlFile . ' as text');
+        $this->assertSame($expected, $actual, $pugFile . ' should match ' . $htmlFile . ' as text');
     }
 }