add PHP 8.5 support

Author: mentalstring

.github/workflows/continuous-integration.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - php-85
   pull_request:
 
 env:
@@ -22,6 +23,7 @@ jobs:
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
         memcached-version:
           - "1.6"
 

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()));
         }
 

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']) ?>
   }

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;
     }