Skip to content

Commit

Permalink
Merge branch '2.3.x' of github.com:SolidInvoice/SolidInvoice into mer…
Browse files Browse the repository at this point in the history
…ge-up/2.2.x-in-2.3.x

* '2.3.x' of github.com:SolidInvoice/SolidInvoice: (120 commits)
  Suppress zip output
  Fix workflow syntax
  Run build against milestone version
  Save archives directly to dist dir
  Remove test user details from full build
  Bump symfony/mailgun-mailer from 5.4.21 to 6.2.10
  Bump webpack from 5.81.0 to 5.82.0
  Bump twig/extra-bundle from 3.5.1 to 3.6.0
  Bump mpociot/vat-calculator from 3.1.1 to 3.3.0
  Bump sass from 1.62.0 to 1.62.1
  Bump zenstruck/foundry from 1.23.0 to 1.31.0
  Bump laminas/laminas-zendframework-bridge from 1.6.1 to 1.7.0
  Bump cloudinary from 1.36.2 to 1.36.4
  Bump @babel/eslint-parser from 7.21.3 to 7.21.8
  Bump @babel/preset-env from 7.21.4 to 7.21.5
  Bump step-security/harden-runner from 2.3.1 to 2.4.0
  Bump github/codeql-action from 2.3.2 to 2.3.3
  Remove phpstan-ignore annotation since debugging is enabled in GH actions
  Fix TimestampableListener service config
  Fix CS
  ...
  • Loading branch information
pierredup committed May 15, 2023
2 parents 2a4f544 + 66c2922 commit 2ac915b
Show file tree
Hide file tree
Showing 560 changed files with 7,159 additions and 7,302 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/automatic-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@1f99358870fe1c846a3ccba386cc2b2246836776
uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: "actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f"
uses: "actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab"

- name: Setup PHP
uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
with:
php-version: 8.1
php-version: 8.2
extensions: intl, gd, opcache, mysql, pdo_mysql, soap, zip, :xdebug
coverage: none

Expand All @@ -37,7 +37,7 @@ jobs:
uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c

- name: Release
uses: laminas/automatic-releases@1b61a5fcf90ba3223c85130b7bc2a7f95311e79c
uses: laminas/automatic-releases@12dde9b998d13e6721e5d000cf0c6a513ebdb98b
with:
command-name: laminas:automatic-releases:release
env:
Expand All @@ -47,7 +47,7 @@ jobs:
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

- name: Build Release Artifact
run: "./scripts/build_dist.sh $(git rev-parse --abbrev-ref HEAD) ${{ github.event.milestone.title }}"
run: "./scripts/build_dist.sh ${{ github.event.milestone.title }} ${{ github.event.milestone.title }}"

- name: Upload Release Artifact
uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
solidinvoice/solidinvoice:${{ github.event.milestone.title }}-full
- name: Create Merge-Up Pull Request
uses: laminas/automatic-releases@1b61a5fcf90ba3223c85130b7bc2a7f95311e79c
uses: laminas/automatic-releases@12dde9b998d13e6721e5d000cf0c6a513ebdb98b
with:
command-name: laminas:automatic-releases:create-merge-up-pull-request
env:
Expand All @@ -97,7 +97,7 @@ jobs:
"GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}

- name: Create new milestones
uses: laminas/automatic-releases@1b61a5fcf90ba3223c85130b7bc2a7f95311e79c
uses: laminas/automatic-releases@12dde9b998d13e6721e5d000cf0c6a513ebdb98b
with:
command-name: laminas:automatic-releases:create-milestones
env:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,23 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@1f99358870fe1c846a3ccba386cc2b2246836776
uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout repository
uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab

- name: Initialize CodeQL
uses: github/codeql-action/init@67a35a08586135a9573f4327e904ecbf517a882d
uses: github/codeql-action/init@29b1f65c5e92e24fe6b6647da1eaabe529cec70f
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@67a35a08586135a9573f4327e904ecbf517a882d
uses: github/codeql-action/autobuild@29b1f65c5e92e24fe6b6647da1eaabe529cec70f

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@67a35a08586135a9573f4327e904ecbf517a882d
uses: github/codeql-action/analyze@29b1f65c5e92e24fe6b6647da1eaabe529cec70f

qodana:
permissions:
Expand All @@ -57,12 +57,12 @@ jobs:
steps:

- name: Harden Runner
uses: step-security/harden-runner@1f99358870fe1c846a3ccba386cc2b2246836776
uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout repository
uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab

- name: 'Qodana Scan'
uses: JetBrains/qodana-action@main
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/cs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@1f99358870fe1c846a3ccba386cc2b2246836776
uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab

- name: Setup PHP
uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
with:
php-version: 7.4
php-version: 8.1
extensions: intl, gd, opcache, mysql, pdo_mysql

- name: Get composer cache directory
Expand Down Expand Up @@ -50,14 +50,14 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@1f99358870fe1c846a3ccba386cc2b2246836776
uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab

- name: Setup PHP
uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
with:
php-version: 8.1

Expand All @@ -80,12 +80,12 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@1f99358870fe1c846a3ccba386cc2b2246836776
uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout Code
uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
with:
fetch-depth: 0

Expand All @@ -96,7 +96,7 @@ jobs:
- run: yarn install

- name: Super-Linter
uses: github/super-linter/slim@454ba4482ce2cd0c505bc592e83c06e1e37ade61
uses: github/super-linter/slim@45fc0d88288beee4701c62761281edfee85655d7
env:
VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: 2.1.x
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@1f99358870fe1c846a3ccba386cc2b2246836776
uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: FranzDiebold/github-env-vars-action@5be1a823971b42aea2115f6d742484ab9a314bb6

- name: Checkout code
uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
with:
path: solidinvoice

- name: Install PHP
uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
with:
coverage: none
extensions: curl, gd, intl, opcache, json, openssl, pdo, soap, xsl, :xdebug
ini-values: memory_limit=-1
php-version: 7.4
php-version: 8.1

- name: Install PHP dependencies
run: composer install --ansi --no-interaction --no-progress --no-suggest --prefer-dist --no-dev -o -a
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/security-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@1f99358870fe1c846a3ccba386cc2b2246836776
uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- uses: symfonycorp/security-checker-action@258311ef7ac571f1310780ef3d79fc5abef642b5

16 changes: 8 additions & 8 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@1f99358870fe1c846a3ccba386cc2b2246836776
uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab

- name: Setup PHP
uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
with:
php-version: 7.4
php-version: 8.1
ini-values: date.timezone=Europe/Paris, opcache.enable=1, opcache.enable_cli=1, opcache.memory_consumption=256, opcache.max_accelerated_files=32531, opcache.interned_strings_buffer=8, opcache.validate_timestamps=0, opcache.save_comments=1, opcache.fast_shutdown=0
extensions: intl, gd, opcache, mysql, pdo_mysql

Expand Down Expand Up @@ -56,15 +56,15 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@1f99358870fe1c846a3ccba386cc2b2246836776
uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab

- name: 'Qodana Scan'
uses: JetBrains/qodana-action@7afb26c0c2f325c0d5c21ea1f617c79c7f899337
uses: JetBrains/qodana-action@61b94e7e3a716dcb9e2030cfd79cd46149d56c26

- uses: github/codeql-action/upload-sarif@67a35a08586135a9573f4327e904ecbf517a882d
- uses: github/codeql-action/upload-sarif@29b1f65c5e92e24fe6b6647da1eaabe529cec70f
with:
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
12 changes: 6 additions & 6 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:

strategy:
matrix:
php: [ '8.0', '8.1' ]
php: [ '8.2' ]
coverage: [ false ]
include:
- php: '7.4'
- php: '8.1'
coverage: true
fail-fast: false

Expand Down Expand Up @@ -46,12 +46,12 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@1f99358870fe1c846a3ccba386cc2b2246836776
uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab

- uses: haya14busa/action-cond@1d6e8a12b20cdb4f1954feef9aa475b9c390cab5
id: coverage_driver
Expand All @@ -61,7 +61,7 @@ jobs:
if_false: none

- name: Setup PHP
uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d
uses: shivammathur/setup-php@cb8f453143149404c7fd670b5f37c91d395b3054
with:
php-version: ${{ matrix.php }}
ini-values: date.timezone=Africa/Johannesburg, opcache.enable=1, opcache.enable_cli=1, opcache.memory_consumption=256, opcache.max_accelerated_files=32531, opcache.interned_strings_buffer=8, opcache.validate_timestamps=0, opcache.save_comments=1, opcache.fast_shutdown=0, memory_limit=-1
Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
verbose: true # optional (default = false)

- name: Add comment to PR with failure screenshots
uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410
if: ${{ failure() }}
env:
CLOUDINARY_URL: cloudinary://${{ secrets.CLOUDINARY_API_KEY }}:${{ secrets.CLOUDINARY_API_SECRET }}@${{ secrets.CLOUDINARY_CLOUD_NAME }}
Expand Down
1 change: 1 addition & 0 deletions .php-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8.1
14 changes: 4 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,9 @@ It's a feature rich elegant online application to ensure that you can always get
* Receive Notifications either via text message, email or through HipChat
* More to come

## Demo

<img src="https://dopd56xbeo74f.cloudfront.net/images/banner.png" />

[https://demo.solidinvoice.co/](https://demo.solidinvoice.co/)

## Requirements

PHP >= 7.4.15 is required. Use the latest version of PHP for best experience.
PHP >= 8.1 is required. Use the latest version of PHP for best experience.

## Installation

Expand Down Expand Up @@ -75,16 +69,16 @@ php composer.phar install
The final step is to install the Node packages, and compile all the assets

```bash
npm install
npm run dev
yarn install
yarn dev
```

Now you should have a fully working copy of SolidInvoice.

If you want to run SolidInvoice in production mode, some additional steps is required:

```bash
npm run build
yarn build
```

## Contributing
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
],
"homepage": "https://solidinvoice.co",
"require": {
"php": ">=7.4",
"php": ">=8.1",
"ext-curl": "*",
"ext-gd": "*",
"ext-intl": "*",
Expand Down Expand Up @@ -69,7 +69,7 @@
"symfony/amazon-mailer": "^5.4",
"symfony/config": "^5.4",
"symfony/console": "^5.4",
"symfony/contracts": "^2.5",
"symfony/contracts": "*",
"symfony/dependency-injection": "^5.4",
"symfony/doctrine-bridge": "^5.4",
"symfony/dotenv": "^5.4",
Expand All @@ -87,7 +87,7 @@
"symfony/intl": "^5.4",
"symfony/mailchimp-mailer": "^5.4",
"symfony/mailer": "^5.4",
"symfony/mailgun-mailer": "^5.4",
"symfony/mailgun-mailer": "^6.2",
"symfony/messenger": "^5.4",
"symfony/mime": "^5.4",
"symfony/monolog-bundle": "^3.7",
Expand Down Expand Up @@ -161,13 +161,13 @@
},
"bin-dir": "bin",
"platform": {
"php": "7.4.15"
"php": "8.1"
},
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
"dev-master": "2.3-dev"
},
"symfony": {
"allow-contrib": true
Expand Down
Loading

0 comments on commit 2ac915b

Please sign in to comment.