Remove more unnecessary dir args

This commit is contained in:
Christian Sciberras 2022-02-23 09:16:58 +01:00 committed by Ivan Fedorov
parent a64f089caf
commit 18f458f79d
6 changed files with 15 additions and 15 deletions

View File

@ -20,12 +20,12 @@ jobs:
PHP_VERSION: ${{matrix.php}}
- name: Composer Install
run: docker-compose -f docker-compose.yml run -e PHP_VERSION=${{matrix.php}} test_runner composer update -d /opt/project/phpstorm-stubs
run: docker-compose -f docker-compose.yml run -e PHP_VERSION=${{matrix.php}} test_runner composer update
env:
PHP_VERSION: ${{matrix.php}}
- name: Dump Reflection To File
run: docker-compose -f docker-compose.yml run -e PHP_VERSION=${{matrix.php}} php_under_test /usr/local/bin/php /opt/project/phpstorm-stubs/tests/Tools/dump-reflection-to-file.php ReflectionData.json
run: docker-compose -f docker-compose.yml run -e PHP_VERSION=${{matrix.php}} php_under_test /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionData.json
env:
PHP_VERSION: ${{matrix.php}}
@ -41,10 +41,10 @@ jobs:
uses: actions/checkout@v2
- name: Composer Install
run: docker-compose -f docker-compose.yml run test_runner composer install -d /opt/project/phpstorm-stubs
run: docker-compose -f docker-compose.yml run test_runner composer install
- name: Test Stubs Map
run: ./tests/Tools/check-stub-map
- name: run cs fixer
run: docker-compose -f docker-compose.yml run test_runner composer cs -d /opt/project/phpstorm-stubs
run: docker-compose -f docker-compose.yml run test_runner composer cs

View File

@ -13,7 +13,7 @@ jobs:
uses: actions/checkout@v2
- name: Composer Install
run: docker-compose -f docker-compose.yml run test_runner composer install -d /opt/project/phpstorm-stubs
run: docker-compose -f docker-compose.yml run test_runner composer install
env:
PHP_VERSION: '8.0'

View File

@ -18,18 +18,18 @@ jobs:
PHP_VERSION: '8.0'
- name: Composer Install
run: docker-compose -f docker-compose.yml run test_runner composer install -d /opt/project/phpstorm-stubs
run: docker-compose -f docker-compose.yml run test_runner composer install
- name: Dump Reflection With Pecl To File
run: docker-compose -f docker-compose.yml run pecl_extensions /usr/local/bin/php /opt/project/phpstorm-stubs/tests/Tools/dump-reflection-to-file.php ReflectionDataPecl.json
run: docker-compose -f docker-compose.yml run pecl_extensions /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionDataPecl.json
- name: Dump Reflection Without Pecl To File
run: docker-compose -f docker-compose.yml run php_under_test /usr/local/bin/php /opt/project/phpstorm-stubs/tests/Tools/dump-reflection-to-file.php ReflectionData.json
run: docker-compose -f docker-compose.yml run php_under_test /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionData.json
- name: Build Reflection Data With Pecl Only
run: docker-compose -f docker-compose.yml run php_under_test /usr/local/bin/php /opt/project/phpstorm-stubs/tests/Tools/dump-pecl-to-file.php
run: docker-compose -f docker-compose.yml run php_under_test /usr/local/bin/php tests/Tools/dump-pecl-to-file.php
- name: Run Tests
run: docker-compose -f docker-compose.yml run -e PHP_VERSION='8.0' test_runner /opt/project/phpstorm-stubs/vendor/bin/phpunit /opt/project/phpstorm-stubs/tests/
run: docker-compose -f docker-compose.yml run -e PHP_VERSION='8.0' test_runner vendor/bin/phpunit tests/
env:
PHP_VERSION: '8.0'

View File

@ -9,7 +9,7 @@ Please check our [issue tracker] for issues corresponding to the problem you're
* Please avoid any unnecessary changes e.g., spacing, line endings, HTML formatting. Remember, these files are NOT for human consumption. We want to preserve meaningful history.
* Please try to match existing style for any particular file - formatting, spacing, naming conventions.
* Please add corresponding @since tags
* Please run `docker-compose -f docker-compose.yml run test_runner composer cs -d /opt/project/phpstorm-stubs` to check the code style and `docker-compose -f docker-compose.yml run test_runner composer cs-fix -d /opt/project/phpstorm-stubs` to fix it
* Please run `docker-compose -f docker-compose.yml run test_runner composer cs` to check the code style and `docker-compose -f docker-compose.yml run test_runner composer cs-fix` to fix it
## Typehints In Signature
* Please ensure that typehints in signature match types returned by reflection. If reflection doesn't return any type please add such typehints via PhpDoc

View File

@ -30,11 +30,11 @@ Have a full copy of the .git repo within an IDE and provide its path in `Setting
The set of extensions enabled by default in PhpStorm can change anytime without prior notice. To learn how to view the enabled extensions, look [here](https://blog.jetbrains.com/phpstorm/2017/03/per-project-php-extension-settings-in-phpstorm-2017-1/).
### How to run tests
1. Execute `docker-compose -f docker-compose.yml run test_runner composer install -d /opt/project/phpstorm-stubs --ignore-platform-reqs`
1. Execute `docker-compose -f docker-compose.yml run test_runner composer install --ignore-platform-reqs`
2. Execute `docker-compose -f docker-compose.yml run -e PHP_VERSION=8.0 test_runner vendor/bin/phpunit --testsuite PHP_8.0`
### How to update stub map
Execute `docker-compose -f docker-compose.yml run test_runner /usr/local/bin/php /opt/project/phpstorm-stubs/tests/Tools/generate-stub-map` and commit the resulting `PhpStormStubsMap.php`
Execute `docker-compose -f docker-compose.yml run test_runner /usr/local/bin/php tests/Tools/generate-stub-map` and commit the resulting `PhpStormStubsMap.php`
### License
[Apache 2]

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
echo "Installing composer packages..."
docker-compose -f docker-compose.yml run test_runner composer install -d /opt/project/phpstorm-stubs --ignore-platform-reqs
docker-compose -f docker-compose.yml run test_runner composer install --ignore-platform-reqs
phpVersions=("7.1" "7.2" "7.3" "7.4" "8.0" "8.1")
for i in "${phpVersions[@]}"
do
@ -10,7 +10,7 @@ do
echo "Building docker container for PHP_$i..."
docker-compose -f docker-compose.yml build
echo "Dumping reflection data to file $SCRIPT_DIR/ReflectionData.json for PHP_$i..."
docker-compose -f docker-compose.yml run -e PHP_VERSION="$i" php_under_test /usr/local/bin/php /opt/project/phpstorm-stubs/tests/Tools/dump-reflection-to-file.php ReflectionData.json
docker-compose -f docker-compose.yml run -e PHP_VERSION="$i" php_under_test /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionData.json
echo "Running tests agains PHP_$i..."
docker-compose -f docker-compose.yml run -e PHP_VERSION="$i" test_runner vendor/bin/phpunit --testsuite PHP_"$i"
echo "Removing file $SCRIPT_DIR/ReflectionData.json with reflection data for PHP_$i..."