1
0
mirror of https://github.com/danog/psalm.git synced 2024-12-11 08:49:52 +01:00
Commit Graph

10406 Commits

Author SHA1 Message Date
Bruce Weirdan
9b488e673f
Merge pull request #7300 from weirdan/dead-code-phpversion 2022-01-05 12:31:12 +02:00
Matthew Brown
f5d6d2380f Remove now-unnecessary code
Originally added in 8bc17e47be
2022-01-05 01:54:00 +00:00
Matthew Brown
7595a3c579 Make treatment of interfaces and classes more symmetrical 2022-01-05 01:10:57 +00:00
Matthew Brown
31dd30f3d1 Reduce by-ref args 2022-01-05 00:50:09 +00:00
Matthew Brown
26de4faa51 Unify names with intersection creation 2022-01-05 00:38:40 +00:00
Bruce Weirdan
c81c5faa83
Drop dead code based on PHP_VERSION_ID
Psalm now requires PHP 7.4, so this test is never skipped.
2022-01-05 01:49:27 +02:00
Matthew Brown
0a78b320da Remove commas for now 2022-01-04 23:15:16 +00:00
Matthew Brown
9e64375e25 Break up two intersection methods
At some later date it may be worth seeing whether these can be consolidated into a single intersection method
2022-01-04 23:09:02 +00:00
Bruce Weirdan
0cbce3977d
Merge pull request #7294 from weirdan/indent-heredoc 2022-01-04 21:57:14 +02:00
Bruce Weirdan
0c13d8e719
Indent heredoc
PHP 7.3 allows indenting of heredoc / nowdoc strings.
2022-01-04 19:57:41 +02:00
Bruce Weirdan
f5dc2ee964
Merge branch '4.x' into upstream-master 2022-01-04 19:42:08 +02:00
Matthew Brown
63f3460df7 Make clear that class string check for trait $this key only applies to certain assertions 2022-01-04 17:08:34 +00:00
orklah
e41fc678d3
Merge pull request #7293 from villfa/fix/7078
Fix parse_url() return type
2022-01-04 17:56:51 +01:00
Matthew Brown
4e81d0c5ab Remove an untested chunk of issue-triggering code that has only ever caused anguish 2022-01-04 16:36:33 +00:00
Matthew Brown
0fffb55a83 Simplify some logic around negations to prevent unecessary looping 2022-01-04 16:08:06 +00:00
Matthew Brown
2c6d4f8687 Fix erroneous intersection
Found during a line-for-line port. We’re using this value in two different places, and it only makes sense to use it in one
2022-01-04 16:04:36 +00:00
Fabien Villepinte
c42f3d51bd
Fix typo 2022-01-04 16:27:06 +01:00
Fabien Villepinte
2f3af4a5bc
Remove unused import 2022-01-04 16:13:48 +01:00
Fabien Villepinte
1fa6b612b1
Fix parse_url() return type 2022-01-04 16:09:18 +01:00
Bruce Weirdan
f40e6df6fb
Merge pull request #7292 from weirdan/replace-webmozart-pathutils 2022-01-04 15:25:52 +02:00
Bruce Weirdan
02b91cc54e
Replaced deprecated webmozart/path-util 2022-01-04 15:15:34 +02:00
Bruce Weirdan
c8440796ce
Merge pull request #7291 from weirdan/bump-php-version 2022-01-04 15:05:19 +02:00
Bruce Weirdan
d227cb5fe2
Tighten dependency ranges 2022-01-04 12:43:12 +02:00
Bruce Weirdan
cf962eebc2
Promote conditional tests to always-running 2022-01-04 11:40:55 +02:00
Bruce Weirdan
20567ff720
Remove the polyfill we no longer need 2022-01-04 11:29:00 +02:00
Bruce Weirdan
fa33632958
Bump PHP version to 7.4
Also exclude 8.2+ for now - we don't know if current Psalm version would
be compatible with that.
2022-01-04 10:25:00 +02:00
Bruce Weirdan
3869d83931
Merge pull request #7290 from weirdan/drop-mysql-escaped-string 2022-01-04 10:19:18 +02:00
Bruce Weirdan
30013cb81a
Drop orphaned token
Refs vimeo/psalm#7285
2022-01-04 10:13:44 +02:00
Bruce Weirdan
ff9b214f65
Merge branch '4.x' into upstream-master 2022-01-04 10:07:18 +02:00
orklah
68e50f56c0
Merge pull request #7288 from orklah/classconst4
resolve type alias and class const on UnionTypeComparator
2022-01-04 00:22:06 +01:00
orklah
6f9cbc698b resolve type alias and class const on UnionTypeComparator 2022-01-04 00:14:08 +01:00
orklah
4d5098fc32
Merge pull request #7287 from orklah/classconst3
Identify ints from TClassConstant when checking for LiteralEquality
2022-01-03 23:59:37 +01:00
orklah
a53b5215b8 add missing phpdoc 2022-01-03 23:52:48 +01:00
orklah
e3bb251757 handle cases where the classconst contains a compatible int type 2022-01-03 23:45:23 +01:00
orklah
6ea950c2eb Identify ints from TClassConstant when checking for LiteralEquality 2022-01-03 23:40:39 +01:00
orklah
72270078be
Merge pull request #7286 from orklah/classconstinparamout
resolve ClassConstant for both sides in isContainedBy
2022-01-03 23:37:51 +01:00
orklah
6905daedd7 handle the case where the expansion was not successful 2022-01-03 23:30:36 +01:00
orklah
60732d00ba resolve ClassConstant for both sides in isContainedBy 2022-01-03 23:21:59 +01:00
Bruce Weirdan
c2c3247a68
Merge pull request #7285 from weirdan/drop-html-escaped-string 2022-01-03 22:54:33 +02:00
Bruce Weirdan
f09814ac17
Documented THtmlEscapedString removal 2022-01-03 22:48:59 +02:00
Bruce Weirdan
afa6497051
Dropped THtmlEscapedString 2022-01-03 22:48:59 +02:00
Bruce Weirdan
c1acab4606
Merge branch '4.x' into upstream-master 2022-01-03 22:06:12 +02:00
Bruce Weirdan
13980b583b
Merge pull request #7284 from weirdan/deprecate-html-escaped-string 2022-01-03 22:04:54 +02:00
Bruce Weirdan
bb2fa7905d
Deprecate THtmlEscapedString
Refs vimeo/psalm#7281
2022-01-03 21:58:23 +02:00
Bruce Weirdan
87977e419c
Merge pull request #7281 from weirdan/drop-htl-escaped-string-docs 2022-01-03 21:25:41 +02:00
Bruce Weirdan
e6472deddb
Dropped html-escaped-string docs 2022-01-03 20:54:22 +02:00
Bruce Weirdan
7d6324a03e
Merge pull request #7280 from weirdan/move-help-text 2022-01-03 20:53:33 +02:00
Bruce Weirdan
dbee118812
Moved getPsalmHelpText() to Cli\Psalm 2022-01-03 20:46:24 +02:00
Bruce Weirdan
4c8474573b
Merge pull request #7279 from weirdan/trim-existing-issue-selections 2022-01-03 20:42:04 +02:00
Bruce Weirdan
988ae9496a
Trim baseline selection
Refs vimeo/psalm#6000
2022-01-03 20:33:01 +02:00