From 0b40982fb422e5942f119c25b89ddf64d665788c Mon Sep 17 00:00:00 2001
From: Paulo Magalhaes <mentalstring@gmail.com>
Date: Sun, 30 Nov 2025 18:36:12 +0000
Subject: [PATCH] Add PHP 8.5 support

---
 .github/workflows/continuous-integration.yml                    | 1 +
 README.md                                                       | 2 +-
 lib/command/sfCommandOptionSet.class.php                        | 2 +-
 .../sfDoctrineModule/admin/parts/paginationConfiguration.php    | 2 +-
 lib/vendor/lime/lime.php                                        | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 16a675bf1..5df86a9fe 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -22,6 +22,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         memcached-version:
           - "1.6"
 
diff --git a/README.md b/README.md
index 645635cac..569a00646 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ All the enhancements and BC breaks are listed in the [WHATS_NEW](https://github.
 
 - [DIC](https://github.com/FriendsOfSymfony1/symfony1/wiki/ServiceContainer)
 - Composer support
-- PHP 8.4 support
+- PHP 8.5 support
 - performance boost
 - new widgets & validators
 - some tickets fixed from the symfony trac
diff --git a/lib/command/sfCommandOptionSet.class.php b/lib/command/sfCommandOptionSet.class.php
index e8e00cb57..15f18c73b 100644
--- a/lib/command/sfCommandOptionSet.class.php
+++ b/lib/command/sfCommandOptionSet.class.php
@@ -64,7 +64,7 @@ public function addOption(sfCommandOption $option)
         if (isset($this->options[$option->getName()])) {
             throw new sfCommandException(sprintf('An option named "%s" already exist.', $option->getName()));
         }
-        if (isset($this->shortcuts[$option->getShortcut()])) {
+        if (!empty($option->getShortcut()) && isset($this->shortcuts[$option->getShortcut()])) {
             throw new sfCommandException(sprintf('An option with shortcut "%s" already exist.', $option->getShortcut()));
         }
 
diff --git a/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/paginationConfiguration.php b/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/paginationConfiguration.php
index 5f84cef6a..511c7507c 100644
--- a/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/paginationConfiguration.php
+++ b/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/paginationConfiguration.php
@@ -6,6 +6,6 @@ public function getPagerClass()
 
   public function getPagerMaxPerPage()
   {
-    return <?php echo isset($this->config['list']['max_per_page']) ? (integer) $this->config['list']['max_per_page'] : 20 ?>;
+    return <?php echo isset($this->config['list']['max_per_page']) ? (int) $this->config['list']['max_per_page'] : 20 ?>;
 <?php unset($this->config['list']['max_per_page']) ?>
   }
diff --git a/lib/vendor/lime/lime.php b/lib/vendor/lime/lime.php
index c09016fb2..922ad2be2 100644
--- a/lib/vendor/lime/lime.php
+++ b/lib/vendor/lime/lime.php
@@ -169,7 +169,7 @@ public function ok($exp, $message = '')
   {
     $this->update_stats();
 
-    if ($result = (boolean) $exp)
+    if ($result = (bool) $exp)
     {
       $this->results['stats']['passed'][] = $this->test_nb;
     }