Skip to content

Commit

Permalink
Merge pull request #433 from infinum/release/9.2.1
Browse files Browse the repository at this point in the history
9.2.1
  • Loading branch information
goranalkovic-infinum authored Oct 3, 2024
2 parents 965f23b + ce0e7ae commit 888d6c6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.

This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a CHANGELOG](https://keepachangelog.com/).

## [9.2.1]

### Fixed
- Bug with `combinations` output in `tailwindClasses` helper.

## [9.2.0]

### Added
Expand Down Expand Up @@ -672,6 +677,7 @@ Init setup

[Unreleased]: https://github.com/infinum/eightshift-libs/compare/main...HEAD

[9.2.1]: https://github.com/infinum/eightshift-libs/compare/9.2.0...9.2.1
[9.2.0]: https://github.com/infinum/eightshift-libs/compare/9.1.6...9.2.0
[9.1.6]: https://github.com/infinum/eightshift-libs/compare/9.1.5...9.1.6
[9.1.5]: https://github.com/infinum/eightshift-libs/compare/9.1.4...9.1.5
Expand Down
8 changes: 4 additions & 4 deletions src/Helpers/TailwindTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,12 @@ private static function processCombination($partName, $combo, $attributes, $mani
$optionValue = $optionValue ? 'true' : 'false';
}

if (\is_array($allowedValue) && !\in_array($optionValue, $allowedValue, true)) {
$isArrayCondition = \is_array($allowedValue);

if ($isArrayCondition && !\in_array($optionValue, $allowedValue, true)) {
$matches = false;
break;
}

if ($optionValue !== $allowedValue) {
} elseif (!$isArrayCondition && $optionValue !== $allowedValue) {
$matches = false;
break;
}
Expand Down

0 comments on commit 888d6c6

Please sign in to comment.