Skip to content

Commit

Permalink
Release 2.3.2 (#201)
Browse files Browse the repository at this point in the history
* Removed name from datasource, updated GravityFormsDataSource with all formatted values.

* PHPStan fixes

* Remove need for inner composer.json

* Fix PHPStan issues

* Fix typecast of title

* Fix Github Action

* Exclude PHPStan check in CI

* Revert "Remove need for inner composer.json"

This reverts commit abb1c41.

* Fix PHPStan for survey add-on

* Update GitHub cache action version

* Update GitHub checkout action version

* Update CircleCI machine image

* Add polyfills for iconv and mbstring

* Update composer.lock

* Bump version to 2.3.2 & update changelog

* Make sure Fields class is loaded

* Ignore error messages on rendering

* Update Version tags

---------

Co-authored-by: Doeke Norg <[email protected]>
Co-authored-by: Zack Katz <[email protected]>
  • Loading branch information
3 people authored Oct 14, 2024
1 parent e32706a commit 714d36a
Show file tree
Hide file tree
Showing 32 changed files with 526 additions and 310 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ anchors:
default_job_config: &default_job_config
working_directory: /home/circleci/plugin
machine:
image: ubuntu-2004:202201-02
image: default

jobs:
build_package_release:
Expand Down
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ phpunit.xml.dist export-ignore
README.md export-ignore
strauss.phar export-ignore
build export-ignore
tests
tests export-ignore
phpstan-stubs export-ignore

/.circleci export-ignore
/.github export-ignore
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
matrix:
php-versions: ['7.3', '7.4', '7.2']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install PHP
uses: shivammathur/setup-php@v2
with:
Expand All @@ -24,13 +24,15 @@ jobs:
run: composer validate
- name: Cache dependencies
id: cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: vendor
key: ${{ runner.os }}-build-${{ matrix.php-versions }}-${{ hashFiles('composer.json') }}
restore-keys: |
${{ runner.os }}-build-${{ matrix.php-versions }}-
- name: Install dependencies
env:
COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{secrets.COMPOSER_AUTH}}"} }'
if: steps.cache.outputs.cache-hit != 'true'
# We run `--no-scripts` to avoid using Strauss during unit tests
run: composer install --prefer-dist --no-progress --no-scripts
Expand All @@ -40,5 +42,8 @@ jobs:
- name: Run linter
run: composer run-script linter

- name: Run PHPStan
run: composer run-script analyse

- name: Run test suite
run: composer run-script test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ vendor_prefixed
!vendor_prefixed/.gitkeep
!build/strauss.phar
!build/vendor_prefixed/.gitkeep
phpstan.neon
31 changes: 27 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
"ext-json": "*",
"php": "^7.2",
"gravitykit/gravityexport-base": "dev-master",
"phpoffice/phpspreadsheet": "1.19.*"
"phpoffice/phpspreadsheet": "1.19.*",
"symfony/polyfill-iconv": "^1.31",
"symfony/polyfill-mbstring": "^1.31"
},
"autoload": {
"classmap": [
Expand All @@ -37,20 +39,40 @@
"GFExcel\\": "src/"
}
},
"repositories": [
{
"type": "vcs",
"url": "[email protected]:gravityforms/gravityforms.git"
},
{
"type": "package",
"package": {
"name": "gravityforms/gravitysurvey",
"version": "dev-master",
"source": {
"type": "git",
"url": "[email protected]:gravityforms/gravityformssurvey.git",
"reference": "HEAD"
}
}
}
],
"autoload-dev": {
"psr-4": {
"GFExcel\\Tests\\": "tests/"
}
},
"require-dev": {
"gravityforms/gravityforms": "dev-master",
"gravityforms/gravitysurvey": "dev-master",
"phpunit/phpunit": "7.5.*",
"10up/wp_mock": "0.4.*",
"szepeviktor/phpstan-wordpress": "^0.6.2",
"phpstan/phpstan-mockery": "^0.12.5",
"szepeviktor/phpstan-wordpress": "^1.0",
"phpstan/phpstan-mockery": "^1.1",
"overtrue/phplint": "^2.1"
},
"scripts": {
"unbuild": "rm -rf build/composer.* build/vendor build/src",
"unbuild": "rm -rf build/composer.* build/vendor*/* build/src",
"build": [
"@unbuild",
"cp composer.json build/composer.json",
Expand All @@ -62,6 +84,7 @@
],
"linter": "vendor/bin/phplint --no-cache",
"test": "vendor/bin/phpunit",
"analyse": "vendor/bin/phpstan",
"post-install-cmd": [
"composer dump-autoload -o"
],
Expand Down
Loading

0 comments on commit 714d36a

Please sign in to comment.