Merge branch 'release/2.2.0'

CHANGELOG.md

@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## v2.2.0 - 2024.03.28
+
+### Added
+
+- Add utility functions to test the current environment ([#31](https://github.com/studiometa/wp-toolkit/pull/31))
+- Add a `FacetsManager` to easily filter content with `pre_get_posts` ([#32](https://github.com/studiometa/wp-toolkit/pull/32))
+- Add a `facets_get('key')` Twig function to easily get the value of a facets filter from the query string ([#32](https://github.com/studiometa/wp-toolkit/pull/32))
+
+### Fixed
+
+- Fix dependency conflict ([#32](https://github.com/studiometa/wp-toolkit/pull/32))
+
 ## v2.1.0 - 2024.03.12
 
 ### Added

composer.json

@@ -6,20 +6,22 @@
   "require": {
     "php": "^8.1",
     "monolog/monolog": "^2.9|^3.0",
-    "psr/log": "^1.1",
+    "psr/log": "^1.1|^2.0|^3.0",
     "sentry/sentry": "^4.6",
     "studiometa/webpack-config": "^5.0",
     "symfony/http-foundation": "^6.4|^7.0",
     "symfony/yaml": "^6.4|^7.0",
+    "timber/timber": "^1.0|^2.0",
     "wecodemore/wordpress-early-hook": "^1.2"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "^3.4",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-    "szepeviktor/phpstan-wordpress": "^1.1",
     "php-stubs/wordpress-stubs": "^5.5",
     "phpunit/phpunit": "^9.0",
-    "yoast/phpunit-polyfills": "^1.0"
+    "squizlabs/php_codesniffer": "^3.4",
+    "szepeviktor/phpstan-wordpress": "^1.1",
+    "wp-phpunit/wp-phpunit": "^6.4",
+    "yoast/phpunit-polyfills": "^2.0"
   },
   "autoload": {
     "psr-4": {
@@ -40,14 +42,15 @@
       "@fix:style"
     ],
     "fix:style": "phpcbf",
-    "test": "phpunit"
+    "test": "XDEBUG_MODE=coverage phpunit"
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
   "config": {
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true,
-      "phpstan/extension-installer": true
+      "phpstan/extension-installer": true,
+      "composer/installers": true
     },
     "sort-packages": true
   }