From 1dabe6fe9d0a4030ea91e28cc02ca6383a103084 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 20 Jul 2023 07:36:05 +0200
Subject: update to 1.6.4

---
 composer.json    | 16 ++++++++++++----
 php-mockery.spec | 16 ++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 5870ef6..66b9572 100644
--- a/composer.json
+++ b/composer.json
@@ -51,6 +51,7 @@
     "require-dev": {
         "phpunit/phpunit": "^8.5 || ^9.3",
         "psalm/plugin-phpunit": "^0.18.4",
+        "symplify/easy-coding-standard": "^11.5.0",
         "vimeo/psalm": "^5.13.1"
     },
     "conflict": {
@@ -58,11 +59,11 @@
     },
     "autoload": {
         "psr-4": {
-            "Mockery\\": "src/Mockery"
+            "Mockery\\": "library/Mockery"
         },
         "files": [
-            "src/helpers.php",
-            "src/Mockery.php"
+          "library/helpers.php",
+          "library/Mockery.php"
         ]
     },
     "autoload-dev": {
@@ -85,9 +86,16 @@
     "scripts": {
         "check": [
             "@composer validate",
+            "@ecs",
             "@test"
         ],
-        "docs": "vendor/bin/phpdoc -d src -t docs/api",
+        "docs": "vendor/bin/phpdoc -d library -t docs/api",
+        "ecs": [
+            "@ecs:fix",
+            "@ecs:check"
+        ],
+        "ecs:check": "ecs check --clear-cache || true",
+        "ecs:fix": "ecs check --clear-cache --fix",
         "phpunit": "vendor/bin/phpunit --colors=always --testdox --stop-on-failure",
         "phpunit:coverage": "vendor/bin/phpunit --colors=always --testdox --stop-on-failure --coverage-clover=coverage.xml",
         "psalm": [
diff --git a/php-mockery.spec b/php-mockery.spec
index 7b5d369..c1b6e28 100644
--- a/php-mockery.spec
+++ b/php-mockery.spec
@@ -9,7 +9,7 @@
 #
 %bcond_without       tests
 
-%global gh_commit    b1be135c1ba7632f0248e07ee5e6e412576a309d
+%global gh_commit    d1413755e26fe56a63455f7753221c86cbb88f66
 %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.3
+Version:        1.6.4
 Release:        1%{?dist}
 Summary:        Mockery is a simple but flexible PHP mock object framework
 
@@ -35,6 +35,7 @@ BuildRequires:  php(language) >= 7.4
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "^8.5|^9.3",
 #        "psalm/plugin-phpunit": "^0.18.4",
+#        "symplify/easy-coding-standard": "^11.5.0",
 #        "vimeo/psalm": "^5.13.1"
 %global phpunit %{_bindir}/phpunit9
 BuildRequires: phpunit9 >= 9.3
@@ -83,10 +84,10 @@ Autoloader: %{_datadir}/php/%{ns_project}%{major}/autoload.php
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-mv src/*.php src/%{ns_project}/
-phpab --template fedora --output src/%{ns_project}/autoload.php src
+mv library/*.php library/%{ns_project}/
+phpab --template fedora --output library/%{ns_project}/autoload.php library
 
-cat << 'EOF' | tee -a src/%{ns_project}/autoload.php
+cat << 'EOF' | tee -a library/%{ns_project}/autoload.php
 
 \Fedora\Autoloader\Dependencies::required([
     '/usr/share/php/Hamcrest2/autoload.php',
@@ -105,7 +106,7 @@ rm -f docs/.gitignore
 
 %install
 mkdir -p %{buildroot}/%{_datadir}/php
-cp -rp src/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major}
+cp -rp library/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major}
 
 
 %check
@@ -142,6 +143,9 @@ exit $ret
 
 
 %changelog
+* Thu Jul 20 2023 Remi Collet <remi@remirepo.net> - 1.6.4-1
+- update to 1.6.4
+
 * Wed Jul 19 2023 Remi Collet <remi@remirepo.net> - 1.6.3-1
 - update to 1.6.3
 
-- 
cgit