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

Jump to bottom

implemented str_contains FunctionTypeSpecifyingExtension #1067

Closed
wants to merge 7 commits into from
Closed

implemented str_contains FunctionTypeSpecifyingExtension #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ecfc69
Allow null as a return value when resolving return types
matthiasnoback Mar 10, 2022
931537f
Open 1.5-dev
ondrejmirtes Mar 10, 2022
9f69817
Output elapsed time per file in debug mode
janedbal Mar 10, 2022
646465e
Update PHP 8 stubs
phpstan-bot Mar 11, 2022
91de0ea
Fix workflow config
ondrejmirtes Mar 12, 2022
1911a92
No need for an alias
ondrejmirtes Mar 12, 2022
a6a4fed
implemented str_contains FunctionTypeSpecifyingExtension
clxmstaab Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/backward-compatibility.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ on:
pull_request:
push:
branches:
- "master"
- "**"

env:
COMPOSER_ROOT_VERSION: "1.4.x-dev"
COMPOSER_ROOT_VERSION: "1.5.x-dev"

jobs:
backward-compatibility:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/compiler-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ on:
pull_request:
push:
branches:
- "master"
- "**"

env:
COMPOSER_ROOT_VERSION: "1.4.x-dev"
COMPOSER_ROOT_VERSION: "1.5.x-dev"

jobs:
compiler-tests:
Expand Down Expand Up @@ -48,20 +48,20 @@ jobs:
integration-tests:
if: github.event_name == 'pull_request'
needs: compiler-tests
uses: phpstan/phpstan/.github/workflows/integration-tests.yml@master
uses: phpstan/phpstan/.github/workflows/integration-tests.yml@1.5.x
with:
ref: master
ref: 1.5.x

extension-tests:
if: github.event_name == 'pull_request'
needs: compiler-tests
uses: phpstan/phpstan/.github/workflows/extension-tests.yml@master
uses: phpstan/phpstan/.github/workflows/extension-tests.yml@1.5.x
with:
ref: master
ref: 1.5.x

other-tests:
if: github.event_name == 'pull_request'
needs: compiler-tests
uses: phpstan/phpstan/.github/workflows/other-tests.yml@master
uses: phpstan/phpstan/.github/workflows/other-tests.yml@1.5.x
with:
ref: master
ref: 1.5.x
4 changes: 2 additions & 2 deletions .github/workflows/e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
- 'compiler/**'
push:
branches:
- "master"
- "**"
paths-ignore:
- 'compiler/**'

env:
COMPOSER_ROOT_VERSION: "1.4.x-dev"
COMPOSER_ROOT_VERSION: "1.5.x-dev"

jobs:
result-cache-e2e-tests:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ on:
pull_request:
push:
branches:
- "master"
- "**"

env:
COMPOSER_ROOT_VERSION: "1.4.x-dev"
COMPOSER_ROOT_VERSION: "1.5.x-dev"

jobs:
lint:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/phar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: "Compile PHAR"
on:
push:
branches:
- "master"
- "1.5.x"
tags:
- '1.*'

Expand Down Expand Up @@ -79,20 +79,20 @@ jobs:
git config user.email "ondrej@mirtes.cz" && \
git config user.name "Ondrej Mirtes"

- name: "Commit PHAR - master"
- name: "Commit PHAR - development"
working-directory: phpstan-dist
if: "!startsWith(github.ref, 'refs/tags/')"
run: |
git add phpstan.phar phpstan.phar.asc && \
git commit -S -m "Updated PHPStan to commit ${{ github.event.after }}" -m "${{ steps.git-log.outputs.log }}" && \
git push --quiet origin master
git push --quiet origin 1.5.x

- name: "Commit PHAR - tag"
working-directory: phpstan-dist
if: "startsWith(github.ref, 'refs/tags/')"
run: |
git add phpstan.phar phpstan.phar.asc && \
git commit -S -m "PHPStan ${GITHUB_REF#refs/tags/}" -m "${{ steps.git-log.outputs.log }}" && \
git push --quiet origin master && \
git push --quiet origin 1.5.x && \
git tag -s ${GITHUB_REF#refs/tags/} -m "${GITHUB_REF#refs/tags/}" && \
git push --quiet origin ${GITHUB_REF#refs/tags/}
4 changes: 2 additions & 2 deletions .github/workflows/static-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
- 'compiler/**'
push:
branches:
- "master"
- "**"
paths-ignore:
- 'compiler/**'

env:
COMPOSER_ROOT_VERSION: "1.4.x-dev"
COMPOSER_ROOT_VERSION: "1.5.x-dev"

jobs:
static-analysis:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
- 'compiler/**'
push:
branches:
- "master"
- "**"
paths-ignore:
- 'compiler/**'

env:
COMPOSER_ROOT_VERSION: "1.4.x-dev"
COMPOSER_ROOT_VERSION: "1.5.x-dev"

jobs:
tests:
Expand Down
5 changes: 1 addition & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"nikic/php-parser": "^4.13.2",
"ondram/ci-detector": "^3.4.0",
"ondrejmirtes/better-reflection": "5.0.7.2",
"phpstan/php-8-stubs": "0.1.48",
"phpstan/php-8-stubs": "0.1.49",
"phpstan/phpdoc-parser": "^1.2.0",
"react/child-process": "^0.6.4",
"react/event-loop": "^1.2",
Expand Down Expand Up @@ -73,9 +73,6 @@
}
},
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
},
"patcher": {
"search": "patches"
}
Expand Down