Merge pull request #317 from mruz/dev

Add PHP 8.4 support
ice · Jan 26, 2025 · 9d5f86c · 9d5f86c
2 parents 775df6d + 5b4b76f
commit 9d5f86c
Show file tree

Hide file tree

Showing 120 changed files with 134 additions and 125 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2']
+        php: ['8.0', '8.1', '8.2', '8.3', '8.4']
         include:
           - name: focal
             os: ubuntu-20.04
@@ -82,7 +82,7 @@ jobs:
         shell: bash
         if: success() && github.repository_owner == 'ice' && github.ref == 'refs/heads/dev'
         run: |
-          if [[ "${{ matrix.php }}" = "8.2" ]]; then
+          if [[ "${{ matrix.php }}" = "8.4" ]]; then
             git config push.default simple
             git config user.email "[email protected]"
             git config user.name "Ice Framework"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sun Jan 26 15:03:59 UTC 2025
+
+- Ice 1.11.0
+ * PHP 7.4, dropp support
+ * PHP 8.3 and PHP 8.4, add support #314
+ * Update zephir parser to 1.7.0
+ * Update zephir-lang/zephir@c79b710
+
 -------------------------------------------------------------------
 Sun Feb 19 16:46:10 UTC 2023
 

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2023 Ice Team
+Copyright (c) 2014-2025 Ice Team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -42,4 +42,4 @@ Support us with a donation and help us continue our activities. [Become a contri
 Ice is open-sourced software licensed under the New BSD License. See the [LICENSE](http://www.iceframework.org/license) file for more information.
 
 ***
-Copyright (c) 2014-2023 Ice Team.
+Copyright (c) 2014-2025 Ice Team.
diff --git a/composer.json b/composer.json
@@ -11,12 +11,12 @@
         }
     ],
     "require": {
-        "php": ">=7.4"
+        "php": ">=8.0"
     },
     "require-dev": {
         "phpunit/phpunit": ">=8.0.0",
-        "iceframework/zephir-parser": "1.5.3",
-        "phalcon/zephir": "0.17.0",
+        "iceframework/zephir-parser": "1.7.0",
+        "phalcon/zephir": "dev-+2440-php84#c79b710cf6bae85d928da95c02d2ab8a140ce33f",
         "mongodb/mongodb": "^1.2.0"
     },
     "scripts": {

diff --git a/config.json b/config.json
@@ -1,9 +1,9 @@
 {
     "namespace": "ice",
     "name": "ice",
-    "description": "Simple and fast PHP framework frozen in C extension.<br>Copyright (c) 2014-2023 Ice Team.",
+    "description": "Simple and fast PHP framework frozen in C extension.<br>Copyright (c) 2014-2025 Ice Team.",
     "author": "Ice Team",
-    "version": "1.10.1",
+    "version": "1.11.0",
     "verbose": false,
     "info": [
         {

diff --git a/ice/arr.zep b/ice/arr.zep
@@ -9,7 +9,7 @@ use ArrayIterator;
  * @package     Ice/Arr
  * @category    Helper
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Arr implements \ArrayAccess, \Countable, \IteratorAggregate

diff --git a/ice/assets.zep b/ice/assets.zep
@@ -7,7 +7,7 @@ namespace Ice;
  * @package     Ice/Assets
  * @category    Helper
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Assets

diff --git a/ice/auth.zep b/ice/auth.zep
@@ -7,7 +7,7 @@ namespace Ice;
  * @package     Ice/Auth
  * @category    Library
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  *
  * <pre><code>

diff --git a/ice/auth/driver.zep b/ice/auth/driver.zep
@@ -9,7 +9,7 @@ use Ice\Di;
  * @package     Ice/Auth
  * @category    Library
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 abstract class Driver

diff --git a/ice/auth/driver/db.zep b/ice/auth/driver/db.zep
@@ -16,7 +16,7 @@ use Ice\Auth\Driver\Model\Users\Social as UserSocial;
  * @package     Ice/Auth
  * @category    Driver
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Db extends Driver implements DriverInterface

diff --git a/ice/auth/driver/driverinterface.zep b/ice/auth/driver/driverinterface.zep
@@ -7,7 +7,7 @@ namespace Ice\Auth\Driver;
  * @package     Ice/Auth
  * @category    Interface
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 interface DriverInterface

diff --git a/ice/auth/driver/file.zep b/ice/auth/driver/file.zep
@@ -12,7 +12,7 @@ use Ice\Auth\Driver\DriverInterface;
  * @package     Ice/Auth
  * @category    Driver
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class File extends Driver implements DriverInterface

diff --git a/ice/auth/driver/model/roles.zep b/ice/auth/driver/model/roles.zep
@@ -9,7 +9,7 @@ use Ice\Mvc\Model;
  * @package     Ice/Auth
  * @category    Model
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Roles extends Model

diff --git a/ice/auth/driver/model/roles/users.zep b/ice/auth/driver/model/roles/users.zep
@@ -10,7 +10,7 @@ use Ice\Mvc\Model;
  * @package     Ice/Auth
  * @category    Model
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Users extends Model

diff --git a/ice/auth/driver/model/users.zep b/ice/auth/driver/model/users.zep
@@ -9,7 +9,7 @@ use Ice\Mvc\Model;
  * @package     Ice/Auth
  * @category    Model
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Users extends Model

diff --git a/ice/auth/driver/model/users/social.zep b/ice/auth/driver/model/users/social.zep
@@ -9,7 +9,7 @@ use Ice\Mvc\Model;
  * @package     Ice/Auth
  * @category    Model
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Social extends Model

diff --git a/ice/auth/driver/model/users/tokens.zep b/ice/auth/driver/model/users/tokens.zep
@@ -11,7 +11,7 @@ use Ice\Validation;
  * @package     Ice/Auth
  * @category    Model
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Tokens extends Model

diff --git a/ice/auth/social.zep b/ice/auth/social.zep
@@ -9,7 +9,7 @@ use Ice\Auth\Social\SocialInterface;
  * @package     Ice/Auth
  * @category    Library
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Social

diff --git a/ice/auth/social/adapter.zep b/ice/auth/social/adapter.zep
@@ -10,7 +10,7 @@ use Ice\Exception;
  * @package     Ice/Auth
  * @category    Adapter
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 abstract class Adapter implements SocialInterface

diff --git a/ice/auth/social/facebook.zep b/ice/auth/social/facebook.zep
@@ -7,7 +7,7 @@ namespace Ice\Auth\Social;
  * @package     Ice/Auth
  * @category    Adapter
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Facebook extends Adapter

diff --git a/ice/auth/social/google.zep b/ice/auth/social/google.zep
@@ -7,7 +7,7 @@ namespace Ice\Auth\Social;
  * @package     Ice/Auth
  * @category    Adapter
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Google extends Adapter

diff --git a/ice/auth/social/socialinterface.zep b/ice/auth/social/socialinterface.zep
@@ -7,7 +7,7 @@ namespace Ice\Auth\Social;
  * @package     Ice/Auth
  * @category    Interface
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 interface SocialInterface

diff --git a/ice/auth/social/twitter.zep b/ice/auth/social/twitter.zep
@@ -7,7 +7,7 @@ namespace Ice\Auth\Social;
  * @package     Ice/Auth
  * @category    Adapter
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Twitter extends Adapter

diff --git a/ice/cli/console.zep b/ice/cli/console.zep
@@ -10,7 +10,7 @@ use Ice\Di\Access;
  * @package     Ice/Cli
  * @category    Application
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Console extends Access

diff --git a/ice/cli/dispatcher.zep b/ice/cli/dispatcher.zep
@@ -10,7 +10,7 @@ use Ice\Cli\Task;
  * @package     Ice/Dispatcher
  * @category    Component
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Dispatcher extends \Ice\Dispatcher

diff --git a/ice/cli/router.zep b/ice/cli/router.zep
@@ -10,7 +10,7 @@ use Ice\Exception;
  * @package     Ice/Router
  * @category    Component
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Router

diff --git a/ice/cli/task.zep b/ice/cli/task.zep
@@ -11,7 +11,7 @@ use Ice\Di\Access;
  * @package     Ice/Di/Access
  * @category    Handler
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Task extends Access

diff --git a/ice/cli/websocket/client.zep b/ice/cli/websocket/client.zep
@@ -9,7 +9,7 @@ use Ice\Exception;
  * @package     Ice/Cli
  * @category    Component
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Client extends Websocket

diff --git a/ice/cli/websocket/server.zep b/ice/cli/websocket/server.zep
@@ -9,7 +9,7 @@ use Ice\Exception;
  * @package     Ice/Cli
  * @category    Component
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Server extends Websocket

diff --git a/ice/cli/websocket/websocket.zep b/ice/cli/websocket/websocket.zep
@@ -11,7 +11,7 @@ use Ice\Cli\Console;
  * @package     Ice/Cli
  * @category    Component
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Websocket

diff --git a/ice/config.zep b/ice/config.zep
@@ -7,7 +7,7 @@ namespace Ice;
  * @package     Ice/Config
  * @category    Configuration
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Config extends Arr

diff --git a/ice/config/env.zep b/ice/config/env.zep
@@ -9,7 +9,7 @@ use Ice\Exception;
  * @package     Ice/Config
  * @category    Configuration
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Env extends Ini

diff --git a/ice/config/ini.zep b/ice/config/ini.zep
@@ -10,7 +10,7 @@ use Ice\Exception;
  * @package     Ice/Config
  * @category    Configuration
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Ini extends Config

diff --git a/ice/config/json.zep b/ice/config/json.zep
@@ -10,7 +10,7 @@ use Ice\Exception;
  * @package     Ice/Config
  * @category    Configuration
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Json extends Config

diff --git a/ice/cookies.zep b/ice/cookies.zep
@@ -7,7 +7,7 @@ namespace Ice;
  * @package     Ice/Cookies
  * @category    Helper
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Cookies

diff --git a/ice/crypt.zep b/ice/crypt.zep
@@ -7,7 +7,7 @@ namespace Ice;
  * @package     Ice/Crypt
  * @category    Library
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  * @uses        openSSL
  */

diff --git a/ice/db.zep b/ice/db.zep
@@ -11,7 +11,7 @@ use Ice\Db\DbInterface;
  * @package     Ice/Db
  * @category    Component
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Db

diff --git a/ice/db/dbinterface.zep b/ice/db/dbinterface.zep
@@ -7,7 +7,7 @@ namespace Ice\Db;
  * @package     Ice/Db
  * @category    Interface
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 interface DbInterface

diff --git a/ice/db/driver/mongodb.zep b/ice/db/driver/mongodb.zep
@@ -11,7 +11,7 @@ use Ice\Db\DbInterface;
  * @package     Ice/Db
  * @category    Component
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Mongodb implements DbInterface

diff --git a/ice/db/driver/pdo.zep b/ice/db/driver/pdo.zep
@@ -11,7 +11,7 @@ use Ice\Db\DbInterface;
  * @package     Ice/Db
  * @category    Component
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Pdo implements DbInterface

diff --git a/ice/di.zep b/ice/di.zep
@@ -10,7 +10,7 @@ use ReflectionParameter;
  * @package     Ice/Di
  * @category    Component
  * @author      Ice Team
- * @copyright   (c) 2014-2023 Ice Team
+ * @copyright   (c) 2014-2025 Ice Team
  * @license     http://iceframework.org/license
  */
 class Di extends Arr