Merge pull request #111 from phug-php/feature/multi-tester-3

Use multi-tester 2.5

.codeclimate.yml

@@ -37,5 +37,7 @@ plugins:
     enabled: true
     exclude_patterns:
       - "src/Phug/Phug/Phug/Optimizer.php"
+      - "src/Phug/Util/CompatibilityUtil/TestCaseTyped.php"
+      - "src/Phug/Util/CompatibilityUtil/TestCaseUntyped.php"
 exclude_patterns:
   - "**/tests/**"

.github/workflows/coverage.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4']
+        php: ['8.2']
         setup: ['stable']
 
     name: PHP
@@ -25,17 +25,19 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
+        ini-values: memory_limit=-1, zend.enable_gc=0, xdebug.mode="coverage,develop"
         tools: composer:v2
         extensions: pcntl
+        coverage: xdebug
 
     - 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') }}
+        key: ${{ runner.os }}-${{ matrix.setup }}-coverage-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          ${{ runner.os }}-${{ matrix.setup }}-v2-php-${{ matrix.php }}-
+          ${{ runner.os }}-${{ matrix.setup }}-coverage-${{ matrix.php }}-
 
     - name: Code Climate Test Reporter Preparation
       run: |
@@ -49,11 +51,11 @@ jobs:
       if: steps.composer-cache.outputs.cache-hit != 'true'
       run: |
         composer config version 1.9.0
-        ${{ matrix.php >= 8 && 'composer require --no-update phpunit/phpunit:^8.5.14 --no-interaction;' || '' }}
-        composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress ${{ matrix.php >= 8.1 && '--ignore-platform-req=php' || '' }}
+        composer require --no-update phpunit/phpunit:^9.6.12 phpunit/php-code-coverage:^9.2.28 --dev --no-interaction
+        composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress --no-interaction
 
     - name: Run test suite
-      run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml
+      run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml --default-time-limit=3
 
     - name: Code Climate Test Reporter
       if: ${{ env.CC_TEST_REPORTER_ID != '' }}

.github/workflows/multitester.yml → .github/workflows/multi-tester.yml

@@ -1,4 +1,4 @@
-name: Multitest
+name: Multi-test
 
 on:
   push:
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['7.4', '8.0']
+        php: ['7.4', '8.2']
         setup: ['stable']
 
     name: PHP ${{ matrix.php }}
@@ -31,15 +31,15 @@ jobs:
         uses: actions/cache@v2
         with:
           path: vendor
-          key: ${{ runner.os }}-php-multi-v2-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-multi-test-v2-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-php-multi-v2-${{ matrix.php }}-
+            ${{ runner.os }}-multi-test-v2-${{ matrix.php }}-
 
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'
         run: |
           composer config version 1.9.0
-          composer require kylekatarnls/multi-tester:^2.3 --no-update --no-interaction
+          composer require kylekatarnls/multi-tester:^2.5.2 --dev --no-update --no-interaction
           composer update --prefer-dist --prefer-${{ matrix.setup }} --no-progress --no-interaction
 
       - name: Run test suites

.github/workflows/tests.yml

@@ -33,9 +33,9 @@ jobs:
       uses: actions/cache@v2
       with:
         path: vendor
-        key: ${{ runner.os }}-${{ matrix.setup }}-v2-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+        key: php-${{ matrix.php }}-${{ runner.os }}-${{ matrix.setup }}-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          ${{ runner.os }}-${{ matrix.setup }}-v2-php-${{ matrix.php }}-
+          php-${{ matrix.php }}-${{ runner.os }}-${{ matrix.setup }}-
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'

.multi-tester.yml

@@ -1,7 +1,10 @@
 pug-php/pug:
-  install:
-    - composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true
-    - composer install --no-interaction
+  source:
+    success_only: true
+    url: https://github.com/pug-php/pug.git
+    reference: master
+  install: github
+  script: github
 
 pug/bemto:
   autoload:
@@ -39,10 +42,12 @@ ci-pug/ci-pug:
     - composer install --no-interaction
 
 bkwld/laravel-pug:
-  install:
-    - composer config --no-plugins allow-plugins.pug/installer true
-    - composer config --no-plugins allow-plugins.nodejs-php-fallback/nodejs-php-fallback true
-    - composer install --no-interaction
+  source:
+    success_only: true
+    url: https://github.com/BKWLD/laravel-pug.git
+    reference: master
+  install: github
+  script: github
 
 pug/yii2:
   install:

composer.json

@@ -27,18 +27,18 @@
         "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0 || ^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.14",
-        "phpunit/php-code-coverage": "^2.2 || ^4.0 || ^5.2 || ^6.0 || ^7.0",
-        "squizlabs/php_codesniffer": "~3.4.2",
+        "cebe/markdown": "^1.1",
         "js-phpize/js-phpize-phug": "^1.2 || ^2.2.1",
-        "pug-php/pug": "^2.7.3 || ^3.4.1",
-        "pug-php/pug-filter-coffee-script": "^1.3.1",
         "nodejs-php-fallback/coffeescript": "^1.0.1",
         "nodejs-php-fallback/less": "^1.0.5",
-        "nodejs-php-fallback/uglify": "^1.0.4",
         "nodejs-php-fallback/stylus": "^1.0.4",
-        "cebe/markdown": "^1.1",
-        "kylekatarnls/multi-tester": "^2.3"
+        "nodejs-php-fallback/uglify": "^1.0.4",
+        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^8.5.34 || ^9.6.13",
+        "phpunit/php-code-coverage": "^2.2.4 || ^4.0.8 || ^5.3.2 || ^6.1.4 || ^7.0.15 || ^9.2.28",
+        "phpunit/php-invoker": "^1.1.4 || ^3.1.1",
+        "pug-php/pug": "^2.7.3 || ^3.4.1",
+        "pug-php/pug-filter-coffee-script": "^1.3.1",
+        "squizlabs/php_codesniffer": "^3.7.2"
     },
     "replace": {
         "phug/ast": "self.version",

release.php

@@ -6,7 +6,7 @@
  * php release.php minor stable message.md
  * ```.
  *
- * Put release notes in message.md as markdown format.
+ * Put release notes in message.md as Markdown format.
  */
 $settings = parse_ini_file('.env');
 

src/Phug/Formatter/Formatter/Format/XmlFormat.php

@@ -167,19 +167,23 @@ protected function formatAttributeElement(AttributeElement $element)
         $value = $element->getValue();
         $name = $element->getName();
         $nonEmptyAttribute = ($name === 'class' || $name === 'id');
+
         if ($nonEmptyAttribute && (
             !$value ||
             ($value instanceof TextElement && ((string) $value->getValue()) === '') ||
             (is_string($value) && in_array(trim($value), ['', '""', "''"], true))
         )) {
             return '';
         }
+
         if ($value instanceof ExpressionElement) {
             if ($nonEmptyAttribute && in_array(trim($value->getValue()), ['', '""', "''"], true)) {
                 return '';
             }
+
             if (strtolower($value->getValue()) === 'true') {
                 $formattedValue = null;
+
                 if ($name instanceof ExpressionElement) {
                     $bufferVariable = $this->pattern('buffer_variable');
                     $name = $this->pattern(
@@ -193,6 +197,7 @@ protected function formatAttributeElement(AttributeElement $element)
                     $value = new ExpressionElement($bufferVariable);
                     $formattedValue = $this->format($value);
                 }
+
                 $formattedName = $this->format($name);
                 $formattedValue = $formattedValue || $formattedValue === '0'
                     ? $formattedValue
@@ -204,6 +209,7 @@ protected function formatAttributeElement(AttributeElement $element)
                     $formattedValue
                 );
             }
+
             if (in_array(strtolower($value->getValue()), ['false', 'null', 'undefined'], true)) {
                 return '';
             }

src/Phug/Formatter/Formatter/Partial/MagicAccessorTrait.php

@@ -6,13 +6,7 @@ trait MagicAccessorTrait
 {
     private function getMethod($prefix, $name)
     {
-        switch ($name) {
-            case 'nodes':
-                $name = 'children';
-                break;
-        }
-
-        return $prefix.ucfirst($name);
+        return $prefix.ucfirst($name === 'nodes' ? 'children' : $name);
     }
 
     public function __get($name)

src/Phug/Renderer/Renderer/Adapter/FileAdapter.php

@@ -389,18 +389,35 @@ private function isCacheUpToDate(&$path, $input = null)
         return file_exists($path);
     }
 
-    private function getCacheDirectory()
+    private function readCacheDirectoryFromOptions()
     {
         $cacheFolder = $this->hasOption('cache_dir')
             ? $this->getOption('cache_dir')
             : null;
+
         if (!$cacheFolder && $cacheFolder !== false) {
             $cacheFolder = $this->getRenderer()->hasOption('cache_dir')
                 ? $this->getRenderer()->getOption('cache_dir')
                 : null;
         }
+
         if ($cacheFolder === true) {
-            $cacheFolder = $this->getOption('tmp_dir');
+            return $this->getOption('tmp_dir');
+        }
+
+        return $cacheFolder;
+    }
+
+    private function getCacheDirectory()
+    {
+        $cacheFolder = $this->readCacheDirectoryFromOptions();
+
+        if ($cacheFolder === null) {
+            throw new RuntimeException(
+                'You need to set "cache_dir" option to a writable location in order '.
+                'to use cache feature.',
+                7
+            );
         }
 
         if (!is_dir($cacheFolder) && !@mkdir($cacheFolder, 0777, true)) {

src/Phug/Util/CompatibilityUtil/TestCaseTyped.php

@@ -30,5 +30,38 @@ protected function tearDown(): void
     {
         $this->finishTest();
     }
+
+    public static function assertMatchesRegularExpression(string $pattern, string $string, string $message = ''): void
+    {
+        if (!method_exists(parent::class, 'assertMatchesRegularExpression')) {
+            self::assertRegExp($pattern, $string, $message);
+
+            return;
+        }
+
+        parent::assertMatchesRegularExpression($pattern, $string, $message);
+    }
+
+    public static function assertFileDoesNotExist(string $filename, string $message = ''): void
+    {
+        if (!method_exists(parent::class, 'assertFileDoesNotExist')) {
+            self::assertFileNotExists($filename, $message);
+
+            return;
+        }
+
+        parent::assertFileDoesNotExist($filename, $message);
+    }
+
+    public static function assertIsArray($actual, string $message = ''): void
+    {
+        if (!method_exists(parent::class, 'assertIsArray')) {
+            self::assertSame('array', gettype($actual));
+
+            return;
+        }
+
+        parent::assertIsArray($actual, $message);
+    }
 }
 // @codeCoverageIgnoreEnd

src/Phug/Util/CompatibilityUtil/TestCaseUntyped.php

@@ -30,5 +30,38 @@ protected function tearDown()
     {
         $this->finishTest();
     }
+
+    public static function assertMatchesRegularExpression($pattern, $string, $message = '')
+    {
+        if (!method_exists(parent::class, 'assertMatchesRegularExpression')) {
+            self::assertRegExp($pattern, $string, $message);
+
+            return;
+        }
+
+        parent::assertMatchesRegularExpression($pattern, $string, $message);
+    }
+
+    public static function assertFileDoesNotExist($filename, $message = '')
+    {
+        if (!method_exists(parent::class, 'assertFileDoesNotExist')) {
+            self::assertFileNotExists($filename, $message);
+
+            return;
+        }
+
+        parent::assertFileDoesNotExist($filename, $message);
+    }
+
+    public static function assertIsArray($actual, $message = '')
+    {
+        if (!method_exists(parent::class, 'assertIsArray')) {
+            self::assertSame('array', gettype($actual));
+
+            return;
+        }
+
+        parent::assertIsArray($actual, $message);
+    }
 }
 // @codeCoverageIgnoreEnd