From f722f21e708b43bd9e533a51f0fe1ff6474e8604 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 14 Jan 2025 13:54:31 +0100
Subject: update to 0.1.1

drop patch merged upstream
---
 2.patch                   | 35 -----------------------------------
 PHPINFO                   |  2 +-
 REFLECTION                |  2 +-
 php-solidworx-aspect.spec | 15 +++++++++------
 4 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 2.patch

diff --git a/2.patch b/2.patch
deleted file mode 100644
index f21bd76..0000000
--- a/2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 15ec253f8eab6c2fb3bd7c0b75c990acf478995c Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 14 Jan 2025 12:31:49 +0100
-Subject: [PATCH] Fix #1 PHP 8.0 build
-
----
- aspect.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/aspect.c b/aspect.c
-index e301cf1..9e8e3e7 100644
---- a/aspect.c
-+++ b/aspect.c
-@@ -28,7 +28,7 @@ ZEND_DECLARE_MODULE_GLOBALS(aspect)
- 
- static void (*original_zend_execute_ex)(zend_execute_data *execute_data);
- 
--ZEND_API static void aspect_execute_ex(zend_execute_data *execute_data);
-+static void aspect_execute_ex(zend_execute_data *execute_data);
- 
- static void handle_memoize_functions(zend_execute_data *execute_data);
- 
-@@ -111,7 +111,11 @@ static void aspect_execute_ex(zend_execute_data *execute_data) {
-                     zend_type return_type = ret_info->type;
-                     uint32_t type_mask = return_type.type_mask;
- 
--                    if (type_mask & ((uint32_t)1 << IS_VOID) || type_mask & ((uint32_t)1 << IS_NEVER)) {
-+                    if (type_mask & ((uint32_t)1 << IS_VOID)
-+#if PHP_VERSION_ID >= 80100
-+                        || type_mask & ((uint32_t)1 << IS_NEVER)
-+#endif
-+                    ) {
-                         // cannot memoize functions with void or never return types
-                         // @TODO: Should this be an error/exception?
-                         original_zend_execute_ex(execute_data);
diff --git a/PHPINFO b/PHPINFO
index cd86c7f..5788b13 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,4 +2,4 @@
 aspect
 
 aspect support => enabled
-Version => 0.1.0
+Version => 0.1.1
diff --git a/REFLECTION b/REFLECTION
index a35bcea..8668bbf 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #68 aspect version 0.1.0 ] {
+Extension [ <persistent> extension #68 aspect version 0.1.1 ] {
 
   - Classes [1] {
     Class [ <internal:aspect> final class Memoize ] {
diff --git a/php-solidworx-aspect.spec b/php-solidworx-aspect.spec
index 9738ebc..9db7f97 100644
--- a/php-solidworx-aspect.spec
+++ b/php-solidworx-aspect.spec
@@ -14,7 +14,7 @@
 # Extension
 %global ext_name         aspect
 %global ini_name         40-%{ext_name}.ini
-%global upstream_version 0.1.0
+%global upstream_version 0.1.1
 #global upstream_prever  RC1
 # PIE / packagist
 %global pie_vend         solidworx
@@ -23,20 +23,18 @@
 %global gh_vend          SolidWorx
 %global gh_proj          aspect
 %global forgeurl         https://github.com/%{gh_vend}/%{gh_proj}
-#global commit           f199ab98496db0d040545ca10d1b7fdc166186e3
+#global commit           b3ae87353da524f33374ee0418ad48f704bb6af1
 %global tag              %{upstream_version}%{?upstream_prever}
 %forgemeta
 
 Summary:        PHP Aspect Extension
 Name:           %{?scl_prefix}php-%{pie_vend}-%{pie_proj}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        MIT
 URL:            %{forgeurl}
 Source0:        %{forgesource}
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/SolidWorx/aspect/pull/2.patch
-
 BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 8.0
@@ -61,7 +59,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %forgesetup
-%patch -P0 -p1
+
+sed -e '/PHP_ASPECT_VERSION/s/0.1.0/%{upstream_version}%{?upstream_prever}/' -i php_aspect.h
 
 : Sanity check, really often broken
 extver=$(sed -n '/# define PHP_ASPECT_VERSION/{s/.* "//;s/".*$//;p}' php_aspect.h)
@@ -118,6 +117,10 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_extdir}/%{ext_name}.so" \
 
 
 %changelog
+* Tue Jan 14 2025 Remi Collet <remi@remirepo.net> - 0.1.1-1
+- update to 0.1.1
+- drop patch merged upstream
+
 * Tue Jan 14 2025 Remi Collet <remi@remirepo.net> - 0.1.0-2
 - fix build with PHP 8.0 using patch from
   https://github.com/SolidWorx/aspect/pull/2
-- 
cgit