Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 0 additions & 9 deletions .github/workflows/lint-and-analyse-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@ jobs:
# Allow the previous check to fail but not abort
if: always()
uses: ramsey/composer-install@v3
with:
# Ignore zip for php-webdriver/webdriver
composer-options: "--ignore-platform-req=ext-zip"

- name: Create main config.php for unit tests
run: cp config/config.dist.php config/config.php
Expand Down Expand Up @@ -109,12 +106,6 @@ jobs:

- name: Install Composer dependencies
uses: ramsey/composer-install@v3
with:
# Ignore zip for php-webdriver/webdriver
composer-options: "--ignore-platform-reqs"

- name: Update the composer.lock file
run: composer update

- name: Validate composer.json and composer.lock
run: composer validate --strict
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/vendor/*
/composer.lock

/build/*
/tools/*
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ sure your `main` branch is synced with the upstream project before creating
your feature branch.
* **Create a new branch** for your changes: `git checkout -b feature/your-feature-name` or `git checkout -b bugfix/issue-number-and-fix`.
* **Make your changes** and **add tests** if applicable.
* **Keep Composer files in sync:** If you change `composer.json`, regenerate and commit `composer.lock` in the same PR.
* **Ensure your code lints**
* **Commit your changes** with a clear and descriptive commit message.
* **Push your branch** to your fork: `git push origin feature/your-feature-name`.
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
"allow-plugins": {
"php-http/discovery": true,
"tbachert/spi": true
},
"platform": {
"php": "8.2.0"
}
}
}
Loading