Skip to content

Start experiment with 'literal-string' type #1788

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

Merged
dereuromark merged 4 commits into from
Oct 11, 2021
Merged

Start experiment with 'literal-string' type #1788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00da6a5
Start experiment with 'literal-string' type
craigfrancis Oct 9, 2021
7253921
Only use 'literal-string' for PHPStan and Psalm (for now)
craigfrancis Oct 11, 2021
230169c
Correct order, to match other instances of '@phpstan-' and '@psalm-'
craigfrancis Oct 11, 2021
c0c8ccb
Correct formatting for phpcs
craigfrancis Oct 11, 2021
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
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"ext-pdo": "*",
"ext-json": "*",
"monolog/monolog": "^1.3",
"phpstan/phpstan": "^0.12.4",
"phpstan/phpstan": "^0.12.97",
"phpunit/phpunit": "^8.0.0||^9.0.0",
"spryker/code-sniffer": "^0.15.6",
"psalm/phar": "4.2.1",
"psalm/phar": "4.9.3",
"mikey179/vfsstream": "^1.6"
},
"suggest": {
Expand Down
6 changes: 5 additions & 1 deletion src/Propel/Runtime/ActiveQuery/ModelCriteria.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,13 @@ public function filterByArray($conditions)
* $c->where(array('cond1', 'cond2'), Criteria::LOGICAL_OR);
* </code>
*
* @phpstan-param literal-string|array $clause
*
* @psalm-param literal-string|array $clause
*
* @see Criteria::add()
*
* @param mixed $clause A string representing the pseudo SQL clause, e.g. 'Book.AuthorId = ?'
* @param string|array $clause A string representing the pseudo SQL clause, e.g. 'Book.AuthorId = ?'
* Or an array of condition names
* @param mixed $value A value for the condition
* @param int|null $bindingType
Expand Down