Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moved optional parameter to the end #23

Merged
merged 2 commits into from
Nov 17, 2024
Merged

moved optional parameter to the end #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7ef9f3
moved optional parameter to the end
niden Nov 17, 2024
3a6cfe2
Removed qodana analysis
niden Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 0 additions & 58 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,57 +140,6 @@ jobs:
name: "unit-${{ matrix.php }}.coverage"
path: "tests/support/coverage.xml"

qodana-analysis:
permissions:
contents: read

name: "Qodana Analysis"
runs-on: "ubuntu-22.04"
needs:
- "unit-tests"

steps:
- name: "Checkout"
uses: "actions/checkout@v3"
with:
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
fetch-depth: 0 # a full history is required for pull request analysis

- name: 'Qodana Scan'
uses: JetBrains/qodana-action@v2023.2
env:
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
with:
args: --baseline,qodana.sarif.json

upload-coverage:
permissions:
contents: read

name: "Upload coverage"
runs-on: "ubuntu-22.04"
needs:
- "unit-tests"

steps:
- name: "Checkout"
uses: "actions/checkout@v4"
with:
fetch-depth: 2

- name: "Display structure of downloaded files"
run: |
mkdir -p reports

- name: "Download coverage files"
uses: "actions/download-artifact@v4"
with:
path: "reports"

- name: "Display structure of downloaded files"
run: ls -R
working-directory: reports

# - name: "Upload to Codacy"
# run: |
# bash <(curl -Ls https://coverage.codacy.com/get.sh) report \
Expand All @@ -214,10 +163,3 @@ jobs:
# fail_ci_if_error: true
# verbose: true
#
- name: "Upload to Qodana"
run: |
docker run \
-v $(pwd):/data/project/ \
-v ./reports/:/data/coverage \
-e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
jetbrains/qodana-php
6 changes: 3 additions & 3 deletions files/parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2747,7 +2747,7 @@ private function yy_reduce(int $yyruleno): void
case 70:
#line 462 "parser.php.lemon"
{
phvolt_ret_cache_statement($this->output, $this->yystack[$this->yyidx + -5]->minor, null, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
phvolt_ret_cache_statement($this->output, $this->yystack[$this->yyidx + -5]->minor, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
$this->yy_destructor(1, $this->yystack[$this->yyidx + -7]->minor);
$this->yy_destructor(66, $this->yystack[$this->yyidx + -6]->minor);
$this->yy_destructor(32, $this->yystack[$this->yyidx + -4]->minor);
Expand All @@ -2760,7 +2760,7 @@ private function yy_reduce(int $yyruleno): void
case 71:
#line 466 "parser.php.lemon"
{
phvolt_ret_cache_statement($this->output, $this->yystack[$this->yyidx + -6]->minor, $this->yystack[$this->yyidx + -5]->minor, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState());
phvolt_ret_cache_statement($this->output, $this->yystack[$this->yyidx + -6]->minor, $this->yystack[$this->yyidx + -3]->minor, $this->status->getState(), $this->yystack[$this->yyidx + -5]->minor);
$this->yy_destructor(1, $this->yystack[$this->yyidx + -8]->minor);
$this->yy_destructor(66, $this->yystack[$this->yyidx + -7]->minor);
$this->yy_destructor(32, $this->yystack[$this->yyidx + -4]->minor);
Expand Down Expand Up @@ -3796,7 +3796,7 @@ function phvolt_ret_block_statement(array &$ret, Token $name, ?array $block_stat
$ret['line'] = $state->getActiveLine();
}

function phvolt_ret_cache_statement(array &$ret, mixed $expr, mixed $lifetime = null, mixed $block_statements, State $state): void
function phvolt_ret_cache_statement(array &$ret, mixed $expr, mixed $block_statements, State $state, mixed $lifetime = null): void
{
$ret = [];
$ret['type'] = Compiler::PHVOLT_T_CACHE;
Expand Down
Loading