Merge pull request #16447 from misantron/redis-timeout-option

Do not use lifetime option as Redis connection timeout
phalcon · Jan 11, 2024 · 8900039 · 8900039
2 parents a88f446 + f6135d4
commit 8900039
Show file tree

Hide file tree

Showing 32 changed files with 731 additions and 250 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,7 +38,7 @@ services:
 env:
   global:
     - CC="gcc"
-    - ZEPHIR_VERSION="0.12.19"
+    - ZEPHIR_VERSION="0.12.21"
     - ZEPHIR_PARSER_VERSION="v1.3.6"
     - REPORT_COVERAGE=0
     - PATH="${HOME}/.composer/vendor/bin:${PATH}"

diff --git a/CHANGELOG-4.1.md b/CHANGELOG-4.1.md
@@ -1,4 +1,21 @@
-# [4.1.1](https://github.com/phalcon/cphalcon/releases/tag/v4.1.0) (xxxx-xx-xx)
+# [4.1.4](https://github.com/phalcon/cphalcon/releases/tag/v4.1.3) (xxxx-xx-xx)
+
+# [4.1.3](https://github.com/phalcon/cphalcon/releases/tag/v4.1.3) (2022-01-06)
+
+## Fixed
+
+- Fixed `Phalcon\Mvc\Model::getRelated()` to correctly return relationships (cached or not) when the foreign key has changed [#15649](https://github.com/phalcon/cphalcon/issues/15649)
+
+
+# [4.1.2](https://github.com/phalcon/cphalcon/releases/tag/v4.1.2) (2021-04-22)
+
+## Changed
+- Corrected version in package.xml
+
+# [4.1.1](https://github.com/phalcon/cphalcon/releases/tag/v4.1.1) (2021-04-21)
+
+## Changed
+- Corrected max PHP version for PECL
 
 ## Fixed
 - Fixed `Logger\Log::log()` `log` to recognize all log levels [#15214](https://github.com/phalcon/cphalcon/issues/15214)

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,7 +5,7 @@
 # For the full copyright and license information, please view
 # the LICENSE.txt file that was distributed with this source code.
 
-version: 4.1.0+{build}
+version: 4.1.2+{build}
 
 environment:
   matrix:
@@ -29,22 +29,12 @@ environment:
       BUILD_TYPE: nts-Win32
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
-    - PHP_VERSION: '7.2'
-      VC_VERSION: '15'
-      BUILD_TYPE: Win32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-    - PHP_VERSION: '7.2'
-      VC_VERSION: '15'
-      BUILD_TYPE: nts-Win32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
   PHP_AVM: https://raw.githubusercontent.com/sergeyklay/php-appveyor/master/php-appveyor.psm1
 
   PHP_SDK_VERSION: 2.1.9
   ZEPHIR_PARSER_VERSION: 1.3.4
   ZEPHIR_PARSER_RELEASE: 526
-  ZEPHIR_VERSION: 0.12.19
+  ZEPHIR_VERSION: 0.12.21
 
   TEST_PHP_EXECUTABLE: C:\php\php.exe
   NO_INTERACTION: 1

diff --git a/boxfile.7.4.yml b/boxfile.7.4.yml
@@ -0,0 +1,159 @@
+run.config:
+  engine: php
+  engine.config:
+    runtime: php-7.4
+    extensions:
+      - apcu
+      - ctype
+      - curl
+      - dom
+      - fileinfo
+      - gd
+      - gmp
+      - gettext
+      - imagick
+      - iconv
+      - intl
+      - json
+      - mbstring
+      - memcached
+      - phar
+      - pdo
+      - pdo_mysql
+      - pdo_pgsql
+      - pdo_sqlite
+      - session
+      - simplexml
+      - sqlite3
+      - tokenizer
+      - yaml
+      - xml
+      - xmlwriter
+      - zip
+      - zlib
+      - mongodb
+      - redis
+    zend_extensions:
+      - opcache
+    dev_zend_extensions:
+      # Removed xdebug (will be back when Xdebug 2.7.0 is stable)
+      #      add:
+      #        - xdebug
+      rm:
+        - opcache
+  extra_packages:
+    - autoconf
+    - freefonts
+    - freetype2
+    - fontconfig
+    - mysql-client
+    #    - postgresql94-client
+    - re2c
+    - sqlite3
+  extra_steps:
+    #===========================================================================
+    # PSR extension compilation
+    - |
+      (
+        CURRENT_FOLDER=$(pwd)
+        rm -fR $CURRENT_FOLDER/build/php-psr
+        cd $CURRENT_FOLDER/build
+        git clone --depth=1 https://github.com/jbboehr/php-psr.git
+        cd php-psr
+        set -e
+        phpize
+        ./configure --with-php-config=$(which php-config)
+        make -j"$(getconf _NPROCESSORS_ONLN)"
+        make install
+        cd $CURRENT_FOLDER
+        rm -fR $CURRENT_FOLDER/build/php-psr
+        unset CURRENT_FOLDER
+      )
+    - echo -e 'extension=psr.so' >> "/data/etc/php/dev_php.ini"
+    #===========================================================================
+    # Msgpack extension compilation
+    - |
+      (
+        CURRENT_FOLDER=$(pwd)
+        rm -fR $CURRENT_FOLDER/build/msgpack-php
+        cd $CURRENT_FOLDER/build
+        git clone --depth=1 https://github.com/msgpack/msgpack-php.git
+        cd msgpack-php
+        set -e
+        phpize
+        ./configure --with-php-config=$(which php-config)
+        make -j"$(getconf _NPROCESSORS_ONLN)"
+        make install
+        cd $CURRENT_FOLDER
+        rm -fR $CURRENT_FOLDER/build/msgpack-php
+        unset CURRENT_FOLDER
+      )
+    - echo -e 'extension=msgpack.so' >> "/data/etc/php/dev_php.ini"
+    #===========================================================================
+    # Igbinary extension compilation
+    - |
+      (
+        CURRENT_FOLDER=$(pwd)
+        rm -fR $CURRENT_FOLDER/build/igbinary
+        cd $CURRENT_FOLDER/build
+        git clone --depth=1 https://github.com/igbinary/igbinary.git
+        cd igbinary
+        set -e
+        phpize
+        ./configure --with-php-config=$(which php-config)
+        make -j"$(getconf _NPROCESSORS_ONLN)"
+        make install
+        cd $CURRENT_FOLDER
+        rm -fR $CURRENT_FOLDER/build/igbinary
+        unset CURRENT_FOLDER
+      )
+    - echo -e 'extension=igbinary.so' >> "/data/etc/php/dev_php.ini"
+    #===========================================================================
+    # Zephir Parser
+    - |
+      (
+        CURRENT_FOLDER=$(pwd)
+        rm -fR $CURRENT_FOLDER/build/php-zephir-parser
+        cd $CURRENT_FOLDER/build
+        git clone --depth=1 https://github.com/phalcon/php-zephir-parser.git
+        cd php-zephir-parser
+        set -e
+        phpize
+        ./configure --with-php-config=$(which php-config)
+        make -j"$(getconf _NPROCESSORS_ONLN)"
+        make install
+        cd $CURRENT_FOLDER
+        rm -fR $CURRENT_FOLDER/build/php-zephir-parser
+        unset CURRENT_FOLDER
+      )
+    - echo -e 'extension=zephir_parser.so' >> "/data/etc/php/dev_php.ini"
+    #===========================================================================
+    # This is here so that Phalcon can be used right after compilation
+    - echo -e 'extension=phalcon.so' >> "/data/etc/php/dev_php.ini"
+    #===========================================================================
+    # Options for session, opcache and apcu
+    - echo -e 'session.save_path="/tmp"' >> "/data/etc/php/dev_php.ini"
+    - echo -e 'opcache.enable_cli=1' >> "/data/etc/php/dev_php.ini"
+    - echo -e 'apcu.enabled=1' >> "/data/etc/php/dev_php.ini"
+    - echo -e 'apcu.enable_cli=1' >> "/data/etc/php/dev_php.ini"
+    - echo -e 'apc.enabled=1' >> "/data/etc/php/dev_php.ini"
+    - echo -e 'apc.enable_cli=1' >> "/data/etc/php/dev_php.ini"
+    #===========================================================================
+    # Get the Zephir phar
+    - wget --no-clobber -O /data/bin/zephir https://github.com/phalcon/zephir/releases/download/0.12.21/zephir.phar
+    - chmod +x /data/bin/zephir
+
+data.memcached:
+  image: nanobox/memcached:1.4
+
+data.mongodb:
+  image: mongo:4.0
+
+data.mysql:
+  image: nanobox/mysql:5.7
+
+data.postgres:
+  image: nanobox/postgresql:9.5
+
+data.redis:
+  image: nanobox/redis:3.2
diff --git a/build/php7/32bits/phalcon.zep.c b/build/php7/32bits/phalcon.zep.c
diff --git a/build/php7/32bits/phalcon.zep.h b/build/php7/32bits/phalcon.zep.h
diff --git a/build/php7/32bits/php_phalcon.h b/build/php7/32bits/php_phalcon.h
@@ -112,7 +112,7 @@ typedef zend_function zephir_fcall_cache_entry;
 
 
 #define PHP_PHALCON_NAME        "phalcon"
-#define PHP_PHALCON_VERSION     "4.1.0"
+#define PHP_PHALCON_VERSION     "4.1.2"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
 #define PHP_PHALCON_ZEPVERSION  "0.12.20-5d0f025"

diff --git a/build/php7/64bits/phalcon.zep.c b/build/php7/64bits/phalcon.zep.c
diff --git a/build/php7/64bits/phalcon.zep.h b/build/php7/64bits/phalcon.zep.h
diff --git a/build/php7/64bits/php_phalcon.h b/build/php7/64bits/php_phalcon.h
@@ -112,7 +112,7 @@ typedef zend_function zephir_fcall_cache_entry;
 
 
 #define PHP_PHALCON_NAME        "phalcon"
-#define PHP_PHALCON_VERSION     "4.1.0"
+#define PHP_PHALCON_VERSION     "4.1.2"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
 #define PHP_PHALCON_ZEPVERSION  "0.12.20-5d0f025"

diff --git a/build/php7/safe/phalcon.zep.c b/build/php7/safe/phalcon.zep.c
diff --git a/build/php7/safe/phalcon.zep.h b/build/php7/safe/phalcon.zep.h
diff --git a/build/php7/safe/php_phalcon.h b/build/php7/safe/php_phalcon.h
@@ -112,7 +112,7 @@ typedef zend_function zephir_fcall_cache_entry;
 
 
 #define PHP_PHALCON_NAME        "phalcon"
-#define PHP_PHALCON_VERSION     "4.1.0"
+#define PHP_PHALCON_VERSION     "4.1.2"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
 #define PHP_PHALCON_ZEPVERSION  "0.12.20-5d0f025"

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": "4.1.0",
+  "version": "4.1.2",
   "verbose": false,
   "stubs": {
     "path": "ide\/%version%\/%namespace%\/",

diff --git a/ext/phalcon/security/jwt/builder.zep.h b/ext/phalcon/security/jwt/builder.zep.h
diff --git a/ext/phalcon/version.zep.c b/ext/phalcon/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     "4.1.0"
+#define PHP_PHALCON_VERSION     "4.1.2"
 #define PHP_PHALCON_EXTNAME     "phalcon"
 #define PHP_PHALCON_AUTHOR      "Phalcon Team and contributors"
 #define PHP_PHALCON_ZEPVERSION  "0.12.21-5bd5677e"