From 5be552a7f42fbd764c85d29d23f9529be2aa5efe Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 16 May 2024 07:37:16 +0200
Subject: update to 1.6.12

---
 composer.json    | 16 +++++++++-------
 php-mockery.spec |  7 +++++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index ca84c58..6f03cf2 100644
--- a/composer.json
+++ b/composer.json
@@ -97,16 +97,18 @@
         "ecs:check": "ecs check --clear-cache || true",
         "ecs:fix": "ecs check --clear-cache --fix",
         "phive": [
-            ".phive/tools/phive update --force-accept-unsigned",
-            ".phive/tools/phive purge"
+            "tools/phive update --force-accept-unsigned",
+            "tools/phive purge"
         ],
         "phpunit": "vendor/bin/phpunit --do-not-cache-result --colors=always",
         "phpunit:coverage": "@phpunit --coverage-clover=coverage.xml",
-        "psalm": ".phive/tools/psalm --no-diff --no-cache",
-        "psalm:baseline": "@psalm --set-baseline=psalm-baseline.xml",
-        "psalm:dry-run": "@psalm --alter --issues=all --dry-run",
-        "psalm:security": "@psalm --taint-analysis",
-        "psalm:shepherd": "@psalm --stats --shepherd --output-format=github",
+        "psalm": "tools/psalm --no-cache --show-info=true",
+        "psalm:alter": "tools/psalm --no-cache --alter --allow-backwards-incompatible-changes=false --safe-types",
+        "psalm:baseline": "@psalm --no-diff --set-baseline=psalm-baseline.xml",
+        "psalm:dry-run": "@psalm:alter --issues=all --dry-run",
+        "psalm:fix": "@psalm:alter --issues=UnnecessaryVarAnnotation,MissingPureAnnotation,MissingImmutableAnnotation",
+        "psalm:security": "@psalm --no-diff --taint-analysis",
+        "psalm:shepherd": "@psalm --no-diff --shepherd --stats --output-format=github",
         "test": [
             "@phpunit --stop-on-defect",
             "@psalm",
diff --git a/php-mockery.spec b/php-mockery.spec
index 28db6fc..0884132 100644
--- a/php-mockery.spec
+++ b/php-mockery.spec
@@ -9,7 +9,7 @@
 #
 %bcond_without       tests
 
-%global gh_commit    81a161d0b135df89951abd52296adf97deb0723d
+%global gh_commit    1f4efdd7d3beafe9807b08156dfcb176d18f1699
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     mockery
 %global gh_project   mockery
@@ -17,7 +17,7 @@
 %global major        1
 
 Name:           php-mockery
-Version:        1.6.11
+Version:        1.6.12
 Release:        1%{?dist}
 Summary:        Mockery is a simple but flexible PHP mock object framework
 
@@ -141,6 +141,9 @@ exit $ret
 
 
 %changelog
+* Thu May 16 2024 Remi Collet <remi@remirepo.net> - 1.6.12-1
+- update to 1.6.12
+
 * Fri Mar 22 2024 Remi Collet <remi@remirepo.net> - 1.6.11-1
 - update to 1.6.11
 
-- 
cgit