Merge pull request #16298 from phalcon/5.0.x

5.2.1 Release
phalcon · Feb 28, 2023 · fc183e1 · fc183e1
2 parents 35431ac + b5e7a64
commit fc183e1
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ on:
 
 env:
   # All versions should be declared here
-  PHALCON_VERSION: 5.2.0
+  PHALCON_VERSION: 5.2.1
   ZEPHIR_PARSER_VERSION: 1.5.3
   ZEPHIR_VERSION: 0.17.0
 

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [5.2.1](https://github.com/phalcon/cphalcon/releases/tag/v5.2.1) (2023-02-28)
+
+### Fixed
+
+- Fixed compilation under PHP 8.2 [#16293](https://github.com/phalcon/cphalcon/issues/16293), [#16295](https://github.com/phalcon/cphalcon/issues/16295) 
+
 ## [5.2.0](https://github.com/phalcon/cphalcon/releases/tag/v5.2.0) (2023-02-26)
 
 ### Fixed

diff --git a/build/config/phalcon_c_header.php b/build/config/phalcon_c_header.php
@@ -56,6 +56,10 @@
 #include <ext/spl/spl_iterators.h>
 #include <ext/spl/spl_array.h>
 
+#if defined ZEPHIR_USE_PHP_PCRE && ZEPHIR_USE_PHP_PCRE
+#include <ext/pcre/php_pcre.h>
+#endif
+
 #include <ext/pdo/php_pdo_driver.h>
 #include <ext/hash/php_hash.h>
 #include <ext/date/php_date.h>

diff --git a/build/phalcon/phalcon.zep.c b/build/phalcon/phalcon.zep.c
diff --git a/build/phalcon/php_phalcon.h b/build/phalcon/php_phalcon.h
@@ -103,7 +103,7 @@ typedef zend_function zephir_fcall_cache_entry;
 
 
 #define PHP_PHALCON_NAME        "phalcon"
-#define PHP_PHALCON_VERSION     "5.2.0"
+#define PHP_PHALCON_VERSION     "5.2.1"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
 #define PHP_PHALCON_ZEPVERSION  "0.17.0-9f99da6"

diff --git a/config.json b/config.json
@@ -3,7 +3,7 @@
   "name": "phalcon",
   "description": "Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance.",
   "author": "Phalcon Team and contributors",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "verbose": false,
   "stubs": {
     "path": "ide\/%version%\/%namespace%\/",

diff --git a/ext/phalcon/support/version.zep.c b/ext/phalcon/support/version.zep.c
diff --git a/ext/php_phalcon.h b/ext/php_phalcon.h
@@ -11,7 +11,7 @@
 #include "kernel/globals.h"
 
 #define PHP_PHALCON_NAME        "phalcon"
-#define PHP_PHALCON_VERSION     "5.2.0"
+#define PHP_PHALCON_VERSION     "5.2.1"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
 #define PHP_PHALCON_ZEPVERSION  "0.17.0-9f99da6"

diff --git a/package.xml b/package.xml
@@ -22,11 +22,11 @@
     <email>nikos@phalcon.io</email>
     <active>yes</active>
   </lead>
-  <date>2023-02-26</date>
+  <date>2023-02-28</date>
   <time>17:00:00</time>
   <version>
-    <release>5.2.0</release>
-    <api>5.2.0</api>
+    <release>5.2.1</release>
+    <api>5.2.1</api>
   </version>
   <stability>
     <release>stable</release>
@@ -37,10 +37,7 @@
     Full changelog can be found at: https://github.com/phalcon/cphalcon/blob/master/CHANGELOG-5.0.md
 
     ### Fixed
-    - Fixed `Phalcon\Html\Helper\Title::prepend` to correctly prepend text in subsequent calls [#16283](https://github.com/phalcon/cphalcon/issues/16283)
-
-    ### Added
-    - Added support for PHP 8.2 [#15973](https://github.com/phalcon/cphalcon/issues/15973)
+    - Fixed compilation under PHP 8.2 [#16293](https://github.com/phalcon/cphalcon/issues/16293), [#16295](https://github.com/phalcon/cphalcon/issues/16295)
 
   </notes>
   <contents>

diff --git a/phalcon/Support/Version.zep b/phalcon/Support/Version.zep
@@ -77,7 +77,7 @@ class Version
      */
     protected function getVersion() -> array
     {
-        return [5, 2, 0, 4, 0];
+        return [5, 2, 1, 4, 0];
     }
 
     /**