Merge branch '3.x' of https://github.com/pdepend/pdepend into drop-ph…

…p-versions

src/test/php/PDepend/Source/Language/PHP/PHPParserVersion53Test.php
src/test/php/PDepend/Source/Language/PHP/PHPParserVersion54Test.php
src/test/php/PDepend/Source/Language/PHP/PHPParserVersion55Test.php
src/test/php/PDepend/Source/Language/PHP/PHPParserVersion56Test.php
src/test/php/PDepend/Source/Language/PHP/PHPParserVersion70Test.php
src/test/php/PDepend/Source/Language/PHP/PHPParserVersion71Test.php

.github/workflows/coverage.yml

@@ -34,25 +34,19 @@ jobs:
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: vendor
-        key: ${{ runner.os }}-coverage-php-${{ matrix.php }}-${{ matrix.setup }}-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-coverage-php-${{ matrix.php }}-${{ matrix.setup }}-
+        key: ${{ runner.os }}-coverage-php-${{ matrix.php }}-${{ matrix.setup }}-${{ hashFiles('**/composer.json') }}
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'
       run: |
-        composer require phpunit/phpunit:^5.7.27 --no-update --no-interaction --dev
-        composer update --prefer-dist --no-progress --prefer-${{ matrix.setup }} --ignore-platform-req=php
-
-    - name: Fix PHP compatibility
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: php src/test/php/PDepend/fix-php-compatibility.php
+        composer require symfony/config:^5 symfony/dependency-injection:^5 symfony/filesystem:^5 --no-update --no-interaction
+        composer update --prefer-dist --no-progress --prefer-${{ matrix.setup }}
 
     - name: Coverage
-      run: vendor/bin/phpunit -v --coverage-clover=coverage.xml --coverage-text --coverage-html=coverage
+      run: vendor/bin/paratest --coverage-clover=coverage.xml --coverage-text --coverage-html=coverage
       env:
         XDEBUG_MODE: coverage
 

.github/workflows/phar.yml

@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.4]
+        php: [8.1]
         setup: [prefer-stable]
 
     name: Release phar
@@ -36,26 +36,25 @@ jobs:
 
       - name: Cache Composer packages
         id: composer-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor
           key: ${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.setup }}-${{ hashFiles('**/composer.json') }}
           restore-keys: |
             ${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.setup }}
 
       - name: Install dependencies
-        run: composer install --prefer-dist --no-progress
+        run: composer install --prefer-dist --no-progress --no-dev -o -a
 
-      - name: Git submodules
-        run: git submodule update --init
-
-      - name: Ant
+      - name: Build
         run: |
-          php src/conf/prepare-phar.php
-          ant package -D-phar:filename=./pdepend.phar;
+          php scripts/update-version.php;
+          php -d phar.readonly=0 scripts/build.php;
+          chmod +x ./pdepend.phar;
           ./pdepend.phar --version;
 
       - name: Sign phar
+        if: github.repository == 'pdepend/pdepend' && github.event_name == 'release'
         env:
           PASSPHRASE: ${{ secrets.PASSPHRASE }}
           SECRET_KEY: ${{ secrets.SECRET_KEY }}

.github/workflows/tests.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '8.1', '8.2', '8.3', '8.4' ]
         setup: [ 'lowest', 'stable' ]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.setup }}
@@ -39,38 +39,26 @@ jobs:
 
       - name: Cache library packages
         id: composer-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor
-          key: ${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.setup }}-${{ hashFiles('composer.lock') }}
-          restore-keys: ${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.setup }}-
-
-      - name: Cache test packages
-        id: composer-test-cache
-        uses: actions/cache@v3
-        with:
-          path: src/test/vendor
-          key: ${{ runner.os }}-php-test-${{ matrix.php }}-${{ matrix.setup }}-${{ hashFiles('src/test/composer.lock') }}
-          restore-keys: ${{ runner.os }}-php-test-${{ matrix.php }}-${{ matrix.setup }}-
+          key: ${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.setup }}-${{ hashFiles('composer.json') }}
 
       - name: Install dependencies
-        if: steps.composer-cache.outputs.cache-hit != 'true'
+        if: steps.composer-cache.outputs.cache-hit != 'true' && matrix.php != '8.4'
         run: composer update --prefer-dist --no-progress --prefer-${{ matrix.setup }}
 
-      - name: Upgrade PHPUnit
-        if: matrix.php >= 7.2
-        run: cd src/test && composer require phpunit/phpunit:^5.7.27 --no-update --no-interaction --dev
-
-      - name: Install test dependencies
-        if: steps.composer-test-cache.outputs.cache-hit != 'true'
-        run: cd src/test && composer update --prefer-dist --no-progress --prefer-stable --ignore-platform-req=php+
-
-      - name: Fix PHP compatibility
-        if: steps.composer-test-cache.outputs.cache-hit != 'true'
-        run: php src/test/php/PDepend/fix-php-compatibility.php
+      # For now we need to overwrite the PHP version check on the 8.4 beta as paratest has not been releasd for it yet
+      - name: Install dependencies (PHP 8.4 beta)
+        if: steps.composer-cache.outputs.cache-hit != 'true' && matrix.php == '8.4'
+        run: composer update --prefer-dist --no-progress --prefer-${{ matrix.setup }} --ignore-platform-req=php
 
       - name: Check Symfony version
         run: php src/test/symfony-version.php
 
       - name: Run test suite
-        run: src/test/vendor/bin/phpunit -v
+        run: composer test
+
+      - name: Run PHPStan
+        if: matrix.php != '8.4'
+        run: vendor/bin/phpstan

.github/workflows/website.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.4]
+        php: [8.1]
         setup: [prefer-stable]
 
     name: Build website
@@ -32,7 +32,7 @@ jobs:
 
       - name: Cache Composer packages
         id: composer-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: vendor
           key: ${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.setup }}-${{ hashFiles('**/composer.json') }}
@@ -43,7 +43,9 @@ jobs:
         run: composer install --prefer-dist --no-progress
 
       - name: Build website
-        run: composer build-website
+        run: |
+          cp -r src/site/rst/schema src/site/resources/web/
+          composer build-website
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CNAME: pdepend.org

.gitignore

@@ -12,3 +12,6 @@ composer.phar
 composer.lock
 dist
 /clover.xml
+.phpunit.cache
+coverage.xml
+coverage

CHANGELOG.md

@@ -1,3 +1,8 @@
+pdepend-2.16.2 (2023/12/17)
+==========================
+
+- Fixed [#705](https://github.com/pdepend/pdepend/pull/705): Fix throw-expression parsing inside array access
+
 pdepend-2.16.1 (2023/12/10)
 ==========================
 

build.properties

@@ -1,19 +1 @@
-project.dir       =
-project.uri       = pdepend.org
-project.name      = pdepend
-project.version   = 2.16.1
-project.stability = stable
-
-project.pear.uri = pear.example.com
-
-vendor.dir.includes = symfony/**/*,composer/**/*,autoload.php
-vendor.dir.excludes = symfony/**/Tests/**/*
-
-codesniffer.standard = PSR2
-
-codesniffer.fail.on.violation = true
-
-project.scm.uri = github.com/${project.name}/${project.name}/commit
-
-phpunit.package.name = phpunit-4.8.36
-phpunit.enabled = false
+project.version = 2.16.2