Step 1 of merge from upstream

Author: mahills

.gitattributes

@@ -1,11 +1,17 @@
 /.github export-ignore
 /doc export-ignore
+/grammar export-ignore
 /test export-ignore
 /test_old export-ignore
+/tools export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
+.php-cs-fixer.dist.php export-ignore
+Makefile export-ignore
 CHANGELOG.md export-ignore
 CONTRIBUTING.md export-ignore
+phpstan-baseline.neon export-ignore
+phpstan.neon.dist export-ignore
 phpunit.xml.dist export-ignore
 UPGRADE-*.md export-ignore

.github/workflows/main.yml

@@ -7,20 +7,20 @@ on:
 jobs:
  tests_coverage:
  runs-on: "ubuntu-latest"
- name: "PHP 7.1 Unit Tests (with coverage)"
+ name: "PHP 7.4 Unit Tests (with coverage)"
  steps:
  - name: "Checkout"
- uses: "actions/checkout@v2"
+ uses: "actions/checkout@v4"
  - name: "Install PHP"
  uses: "shivammathur/setup-php@v2"
  with:
  coverage: "xdebug"
- php-version: "7.1"
+ php-version: "7.4"
  tools: composer:v2
  - name: "Install dependencies"
  run: |
  composer require php-coveralls/php-coveralls:^2.2 --dev --no-update
- composer update --no-progress --prefer-dist
+ COMPOSER_ROOT_VERSION=dev-master composer update --no-progress --prefer-dist
  - name: "Tests"
  run: "php vendor/bin/phpunit --coverage-clover build/logs/clover.xml"
  - name: Coveralls
@@ -34,75 +34,91 @@ jobs:
  strategy:
  matrix:
  php-version:
- - "7.2"
- - "7.3"
- - "7.4"
  - "8.0"
  - "8.1"
  - "8.2"
+ - "8.3"
+ - "8.4"
+ fail-fast: false
  steps:
  - name: "Checkout"
- uses: "actions/checkout@v2"
+ uses: "actions/checkout@v4"
  - name: "Install PHP"
  uses: "shivammathur/setup-php@v2"
  with:
  coverage: "none"
  php-version: "${{ matrix.php-version }}"
+ ini-file: "development"
  tools: composer:v2
  - name: "Install dependencies"
- run: "composer update --no-progress --prefer-dist ${{ matrix.flags }}"
+ run: "COMPOSER_ROOT_VERSION=dev-master composer update --no-progress --prefer-dist ${{ matrix.flags }}"
  - name: "PHPUnit"
  run: "php vendor/bin/phpunit"
  test_old_73_80:
  runs-on: "ubuntu-latest"
- name: "PHP 7.3 Code on PHP 8.0 Integration Tests"
+ name: "PHP 7.4 Code on PHP 8.4 Integration Tests"
  steps:
  - name: "Checkout"
- uses: "actions/checkout@v2"
+ uses: "actions/checkout@v4"
  - name: "Install PHP"
  uses: "shivammathur/setup-php@v2"
  with:
  coverage: "none"
- php-version: "8.0"
+ php-version: "8.4"
+ ini-file: "development"
  tools: composer:v2
  - name: "Install PHP 8 dependencies"
- run: "composer update --no-progress --prefer-dist"
+ run: "COMPOSER_ROOT_VERSION=dev-master composer update --no-progress --prefer-dist"
  - name: "Tests"
- run: "test_old/run-php-src.sh 7.3.21"
+ run: "test_old/run-php-src.sh 7.4.33"
  test_old_80_70:
  runs-on: "ubuntu-latest"
- name: "PHP 8.1 Code on PHP 7.1 Integration Tests"
+ name: "PHP 8.4 Code on PHP 7.4 Integration Tests"
  steps:
  - name: "Checkout"
- uses: "actions/checkout@v2"
+ uses: "actions/checkout@v4"
  - name: "Install PHP"
  uses: "shivammathur/setup-php@v2"
  with:
  coverage: "none"
- php-version: "7.1"
+ php-version: "7.4"
+ ini-file: "development"
  tools: composer:v2
  - name: "Install PHP 8 dependencies"
- run: "composer update --no-progress --prefer-dist"
+ run: "COMPOSER_ROOT_VERSION=dev-master composer update --no-progress --prefer-dist"
  - name: "Tests"
- run: "test_old/run-php-src.sh 8.1.6"
+ run: "test_old/run-php-src.sh 8.4.0beta5"
  phpstan:
  runs-on: "ubuntu-latest"
- name: "PHP ${{ matrix.php-version }} PHPStan"
- strategy:
- matrix:
- php-version:
- - "8.2"
+ name: "PHPStan"
  steps:
  - name: "Checkout"
- uses: "actions/checkout@v2"
+ uses: "actions/checkout@v4"
  - name: "Install PHP"
  uses: "shivammathur/setup-php@v2"
  with:
  coverage: "none"
- php-version: "${{ matrix.php-version }}"
+ php-version: "8.3"
  tools: composer:v2
  - name: "Install dependencies"
- run: | 
+ run: |
  cd tools && composer install
  - name: "PHPStan"
  run: "php tools/vendor/bin/phpstan"
+ php-cs-fixer:
+ runs-on: "ubuntu-latest"
+ name: "PHP-CS-Fixer"
+ steps:
+ - name: "Checkout"
+ uses: "actions/checkout@v4"
+ - name: "Install PHP"
+ uses: "shivammathur/setup-php@v2"
+ with:
+ coverage: "none"
+ php-version: "8.3"
+ tools: composer:v2
+ - name: "Install dependencies"
+ run: |
+ cd tools && composer install
+ - name: "php-cs-fixer"
+ run: "php tools/vendor/bin/php-cs-fixer fix --dry-run"

.gitignore

@@ -1,8 +1,10 @@
 .project
 .idea
 sandbox
+tmp
 vendor/
 composer.lock
 grammar/kmyacc.exe
 grammar/y.output
 .phpunit.result.cache
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -21,6 +21,11 @@
  'declare_strict_types' => true,
  // Keep argument formatting for now.
  'method_argument_space' => ['on_multiline' => 'ignore'],
+ 'phpdoc_align' => ['align' => 'left'],
+ 'phpdoc_trim' => true,
+ 'no_empty_phpdoc' => true,
+ 'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
+ 'no_extra_blank_lines' => true,
  ])
  ->setFinder($finder)
 ;