Merge pull request #104 from BKWLD/feature/allow-phug-2

Allow Phug 2

Author: kylekatarnls

.github/workflows/coverage.yml

@@ -13,13 +13,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.2']
+        php: ['8.4']
         setup: ['stable']
 
     name: PHP
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -30,36 +30,28 @@ jobs:
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: vendor
         key: ${{ runner.os }}-${{ matrix.setup }}-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
           ${{ runner.os }}-${{ matrix.setup }}-php-${{ matrix.php }}-
 
-    - name: Code Climate Test Reporter Preparation
-      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: |
-        ${{ matrix.php >= 8 && 'composer require --no-update phpunit/phpunit:^9.5.10 --no-interaction;' || '' }}
         composer update --prefer-dist --no-interaction ${{ format('--prefer-{0}', matrix.setup) || '' }}
 
     - name: Run test suite
       run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml
 
-    - name: Code Climate Test Reporter
-      if: ${{ 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 }}
-        CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
+    - name: Coverage - Qltysh
+      uses: qltysh/qlty-action/coverage@v2
+      with:
+        token: ${{ secrets.QLTY_COVERAGE_TOKEN }}
+        files: clover.xml
+
+    - name: Coverage - Codecov
+      uses: codecov/codecov-action@v5
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/tests.yml

@@ -13,13 +13,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['7.2', '7.4', '8.0', '8.2', '8.4', '8.5']
         setup: ['lowest', 'stable', 'next']
 
     name: PHP ${{ matrix.php }} - ${{ matrix.setup }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -29,7 +29,7 @@ jobs:
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: vendor
         key: ${{ runner.os }}-${{ matrix.setup }}-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
@@ -39,7 +39,6 @@ jobs:
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'
       run: |
-        ${{ matrix.php >= 8 && 'composer require --no-update phpunit/phpunit:^9.5.10 --no-interaction;' || '' }}
         composer update --prefer-dist --no-interaction ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }}
       env:
         MULTI_TESTER_LABELS: install

composer.json

@@ -6,15 +6,16 @@
         "php": "^7.2 || ^8.0",
         "illuminate/support": ">=6",
         "illuminate/view": ">=6",
-        "phug/component": "^1.1.3",
+        "phug/component": "^1.1.3 || ^2.0.0",
         "pug-php/pug": "^3.3.1",
         "pug-php/pug-assets": "^1.0.1",
         "pug/installer": "^1.0.0",
         "composer-plugin-api": "^1.0 || ^2.0"
     },
     "require-dev": {
         "composer/composer": "^1.2 || ^2.0",
-        "phpunit/phpunit": "^8.5"
+        "phpunit/phpunit": "^8.5.52 || ^9.6.34",
+        "illuminate/queue": ">=6"
     },
     "minimum-stability": "dev",
     "license": "MIT",

src/PugHandlerInterface.php

@@ -83,5 +83,5 @@ public function getCompiler(): PhugCompiler;
      *
      * @return void
      */
-    public function compileWith($path, callable $callback = null): void;
+    public function compileWith($path, ?callable $callback = null): void;
 }

src/PugHandlerTrait.php

@@ -202,7 +202,7 @@ public function getCompiler(): CompilerInterface
      *
      * @return void
      */
-    public function compileWith($path, callable $callback = null): void
+    public function compileWith($path, ?callable $callback = null): void
     {
         $path = $this->extractPath($path);