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.

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

Sync with 1.x branch #721

Merged
merged 28 commits into from
Jun 11, 2024
Merged

Sync with 1.x branch #721

merged 28 commits into from
Jun 11, 2024

Conversation

vjik
Copy link
Member

@vjik vjik commented Jun 11, 2024

Q A
Is bugfix?
New feature?
Breaks BC?

Arhell and others added 27 commits February 23, 2024 09:14
Co-authored-by: Alexey Rogachev <arogachev90@gmail.com>
Co-authored-by: Alexander Makarov <sam@rmcreative.ru>
Co-authored-by: Alexander Makarov <sam@rmcreative.ru>
* Add aspect ratio support to `Image` rule

* Apply fixes from StyleCI

* Code coverage, mutants

* Add detailed test cases' descriptions in data providers

* Change placeholders

* Work with options

* Work with options 2

* More configuration checks

* Fix logic, add PHPDoc

* Use value object for aspect ratio

* Actualize fix for mutant for absolute margin

* Fix error messages

* Fix new mutants

* Update src/Rule/Image/ImageAspectRatio.php

Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>

* Do not use dedicated container in tests, fix last mutant

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>
…686)

* Add `Result::add()` method for merging other results to the base one

* Apply fixes from StyleCI

* Update PR template [skip ci]

* Update src/Result.php

Co-authored-by: Alexander Makarov <sam@rmcreative.ru>

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Alexander Makarov <sam@rmcreative.ru>
* Add type rules and handlers

* Apply fixes from StyleCI

* Mention in the docs + basic tests

* Apply fixes from StyleCI

* Fix copy paste [skip ci]

* Test error message

* Update changelog [skip ci]

* Update PHPDoc [skip ci]

* More tests and descriptions

* Apply fixes from StyleCI

* Include type in error message

* Add Any rule

* Apply fixes from StyleCI

* Update changelog [skip ci]

* Note [skip ci]

* Add translations [skip ci]

* Fix tests

* Test attributes

* Extract PHP >= 8.1 specific tests

* Apply fixes from StyleCI

* Extract PHP >= 8.1 specific tests 2

* Fix mutant

* Update CHANGELOG.md

Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>

* Rename Any to AnyRule (review)

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>
* Add methods for getting first error messages to `Result`

* Bump coverage

* Update src/Result.php

Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>

* Update src/Result.php

Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>

* Apply fixes from StyleCI

* Remove newline [skip ci]

* Add changelog entry [skip ci]

---------

Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>
Co-authored-by: StyleCI Bot <bot@styleci.io>
* Add Unique rule

* Apply fixes from StyleCI

* More tests, messages [WIP]

* Apply fixes from StyleCI

* Test traslated attributes

* Test using as attribute

* Ready for review

* Apply fixes from StyleCI

* Update src/Rule/UniqueHandler.php

Co-authored-by: Dmitriy Derepko <xepozz@list.ru>

* Apply fixes from StyleCI

* Slightly different approach

* Apply fixes from StyleCI

* New test case to check strict equality

* Different approach

* Minor adjustments

* Remove comma, rename

* Update changelog [skip ci]

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>
Co-authored-by: Dmitriy Derepko <xepozz@list.ru>
Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>
Co-authored-by: Sergei Predvoditelev <sergei@predvoditelev.ru>
@vjik vjik force-pushed the merge-1.4.1 branch 2 times, most recently from 37d8e41 to a76d6ff Compare June 11, 2024 12:42
@vjik vjik changed the title Merge 1.4.1 Sync with 1.x branch Jun 11, 2024
# Conflicts:
#	composer-require-checker.json
#	docs/guide/en/creating-custom-rules.md
#	messages/ru/yii-validator.php
#	src/Rule/AnyRule.php
#	src/Rule/AnyRuleHandler.php
#	src/Rule/BooleanValue.php
#	src/Rule/Date/BaseDate.php
#	src/Rule/Date/BaseDateHandler.php
#	src/Rule/Date/Date.php
#	src/Rule/Date/DateHandler.php
#	src/Rule/Date/DateTime.php
#	src/Rule/Date/DateTimeHandler.php
#	src/Rule/Date/Time.php
#	src/Rule/Date/TimeHandler.php
#	src/Rule/Image/Image.php
#	src/Rule/Image/ImageHandler.php
#	src/Rule/NestedHandler.php
#	src/Rule/Type/BooleanType.php
#	src/Rule/Type/BooleanTypeHandler.php
#	src/Rule/Type/FloatType.php
#	src/Rule/Type/FloatTypeHandler.php
#	src/Rule/Type/IntegerType.php
#	src/Rule/Type/IntegerTypeHandler.php
#	src/Rule/Type/StringType.php
#	src/Rule/Type/StringTypeHandler.php
#	src/Rule/UniqueIterable.php
#	src/Rule/UniqueIterableHandler.php
#	tests/Rule/AnyRuleTest.php
#	tests/Rule/Date/DateTest.php
#	tests/Rule/Date/DateTimeTest.php
#	tests/Rule/Date/TimeTest.php
#	tests/Rule/Image/ImageTest.php
#	tests/Rule/Type/BooleanTypeTest.php
#	tests/Rule/Type/FloatTypeTest.php
#	tests/Rule/Type/IntegerTypeTest.php
#	tests/Rule/Type/StringTypeTest.php
#	tests/Rule/UniqueIterableTest.php
#	tests/ValidatorTest.php
@vjik vjik merged commit 1e7f33b into master Jun 11, 2024
23 of 25 checks passed
@vjik vjik deleted the merge-1.4.1 branch June 11, 2024 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants