Merge pull request #274 from vemaeg/feature/php-8.2-changes

thePanz · web-flow · commit 6f50a315ddd0 · 2023-01-09T14:19:20.000+01:00
Add support for PHP v8.2
diff --git a/.docker/php74_82/Dockerfile b/.docker/php74_82/Dockerfile
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -20,6 +20,7 @@ jobs:
                     - "7.4"
                     - "8.0"
                     - "8.1"
+                    - "8.2"
                 memcached-version:
                     - "1.6"
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -129,7 +129,7 @@ services:
   php74:
     <<: *services_php54
     build:
-      context: .docker/php74_81
+      context: .docker/php74_82
       args:
         PHP_VERSION: '7.4'
         MEMCACHE_VERSION: '4.0.5.2'
@@ -139,7 +139,7 @@ services:
   php80:
     <<: *services_php54
     build:
-      context: .docker/php74_81
+      context: .docker/php74_82
       args:
         PHP_VERSION: '8.0'
         MEMCACHE_VERSION: '8.0'
@@ -149,12 +149,21 @@ services:
   php81:
     <<: *services_php54
     build:
-      context: .docker/php74_81
+      context: .docker/php74_82
       args:
         PHP_VERSION: '8.1'
         MEMCACHE_VERSION: '8.0'
         APCU_VERSION: ''
 
+  php82:
+    <<: *services_php54
+    build:
+      context: .docker/php74_82
+      args:
+        PHP_VERSION: '8.2'
+        MEMCACHE_VERSION: '8.0'
+        APCU_VERSION: ''
+
 
   db:
     image: mysql:5.5.62
diff --git a/lib/command/sfAnsiColorFormatter.class.php b/lib/command/sfAnsiColorFormatter.class.php
@@ -100,7 +100,7 @@ public function formatSection($section, $text, $size = null, $style = 'INFO')
     $style = array_key_exists($style, $this->styles) ? $style : 'INFO';
     $width = 9 + strlen($this->format('', $style));
 
-    return sprintf(">> %-${width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
+    return sprintf(">> %-{$width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
   }
 
   /**
diff --git a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
@@ -20,6 +20,10 @@
  */
 class sfDoctrineConnectionListener extends Doctrine_EventListener
 {
+  protected
+    $connection,
+    $encoding;
+
   public function __construct($connection, $encoding)
   {
     $this->connection = $connection;
diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php
@@ -15,9 +15,6 @@
  * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id$
- *
- * @property $firstOptional int
- * @property $segments array
  */
 class sfRoute implements Serializable
 {
@@ -37,7 +34,9 @@ class sfRoute implements Serializable
     $defaults          = array(),
     $requirements      = array(),
     $tokens            = array(),
-    $customToken       = false;
+    $customToken       = false,
+    $firstOptional     = null,
+    $segments          = array();
 
   /**
    * Constructor.
diff --git a/lib/task/help/sfHelpTask.class.php b/lib/task/help/sfHelpTask.class.php
@@ -96,7 +96,7 @@ protected function outputAsText(sfTask $task)
       foreach ($task->getArguments() as $argument)
       {
         $default = null !== $argument->getDefault() && (!is_array($argument->getDefault()) || count($argument->getDefault())) ? $this->formatter->format(sprintf(' (default: %s)', is_array($argument->getDefault()) ? str_replace("\n", '', print_r($argument->getDefault(), true)): $argument->getDefault()), 'COMMENT') : '';
-        $messages[] = sprintf(" %-${max}s %s%s", $this->formatter->format($argument->getName(), 'INFO'), $argument->getHelp(), $default);
+        $messages[] = sprintf(" %-{$max}s %s%s", $this->formatter->format($argument->getName(), 'INFO'), $argument->getHelp(), $default);
       }
 
       $messages[] = '';
diff --git a/lib/task/help/sfListTask.class.php b/lib/task/help/sfListTask.class.php
@@ -120,7 +120,7 @@ protected function outputAsText($namespace, $tasks)
 
       $aliases = $task->getAliases() ? $this->formatter->format(' ('.implode(', ', $task->getAliases()).')', 'COMMENT') : '';
 
-      $messages[] = sprintf("  %-${width}s %s%s", $this->formatter->format(':'.$task->getName(), 'INFO'), $task->getBriefDescription(), $aliases);
+      $messages[] = sprintf("  %-{$width}s %s%s", $this->formatter->format(':'.$task->getName(), 'INFO'), $task->getBriefDescription(), $aliases);
     }
 
     $this->log($messages);
diff --git a/lib/task/project/sfProjectPermissionsTask.class.php b/lib/task/project/sfProjectPermissionsTask.class.php
@@ -112,7 +112,7 @@ protected function chmod($file, $mode, $umask = 0000)
    *
    * @see http://www.php.net/set_error_handler
    */
-  public function handleError($no, $string, $file, $line, $context)
+  public function handleError($no, $string, $file, $line, $context = null)
   {
     $this->failed[] = $this->current;
   }
diff --git a/lib/task/sfBaseTask.class.php b/lib/task/sfBaseTask.class.php
@@ -21,7 +21,9 @@ abstract class sfBaseTask extends sfCommandApplicationTask
   protected
     $configuration   = null,
     $pluginManager   = null,
-    $statusStartTime = null;
+    $statusStartTime = null,
+    $filesystem      = null,
+    $tokens          = array();
 
   /**
    * @see sfTask
diff --git a/lib/util/sfBrowser.class.php b/lib/util/sfBrowser.class.php
@@ -21,7 +21,8 @@ class sfBrowser extends sfBrowserBase
   protected
     $listeners        = array(),
     $context          = null,
-    $currentException = null;
+    $currentException = null,
+    $rawConfiguration = array();
 
   /**
    * Calls a request to a uri.
diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php
@@ -168,7 +168,7 @@ static protected function dumpArray($value)
    */
   static public function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true)
   {
-    if (in_array($scalar[$i], $stringDelimiters))
+    if (is_string($scalar) && in_array($scalar[$i], $stringDelimiters))
     {
       // quoted scalar
       $output = self::parseQuotedScalar($scalar, $i);
@@ -272,7 +272,7 @@ static protected function parseSequence($sequence, &$i = 0)
           $isQuoted = in_array($sequence[$i], array('"', "'"));
           $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i);
 
-          if (!$isQuoted && false !== strpos($value, ': '))
+          if (!$isQuoted && false !== strpos((string) $value, ': '))
           {
             // embedded mapping?
             try

-Original file line number
+Diff line change
                     - "7.4"
                     - "8.0"
                     - "8.1"
 +                    - "8.2"
                 memcached-version:
                     - "1.6"
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function formatSection($section, $text, $size = null, $style = 'INFO')`
`100`	`100`	`$style = array_key_exists($style, $this->styles) ? $style : 'INFO';`
`101`	`101`	`$width = 9 + strlen($this->format('', $style));`
`102`	`102`
`103`		`- return sprintf(">> %-${width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));`
	`103`	`+ return sprintf(">> %-{$width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@`
`20`	`20`	`*/`
`21`	`21`	`class sfDoctrineConnectionListener extends Doctrine_EventListener`
`22`	`22`	`{`
	`23`	`+ protected`
	`24`	`+ $connection,`
	`25`	`+ $encoding;`
	`26`	`+`
`23`	`27`	`public function __construct($connection, $encoding)`
`24`	`28`	`{`
`25`	`29`	`$this->connection = $connection;`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ protected function outputAsText(sfTask $task)`
`96`	`96`	`foreach ($task->getArguments() as $argument)`
`97`	`97`	`{`
`98`	`98`	`$default = null !== $argument->getDefault() && (!is_array($argument->getDefault()) \|\| count($argument->getDefault())) ? $this->formatter->format(sprintf(' (default: %s)', is_array($argument->getDefault()) ? str_replace("\n", '', print_r($argument->getDefault(), true)): $argument->getDefault()), 'COMMENT') : '';`
`99`		`- $messages[] = sprintf(" %-${max}s %s%s", $this->formatter->format($argument->getName(), 'INFO'), $argument->getHelp(), $default);`
	`99`	`+ $messages[] = sprintf(" %-{$max}s %s%s", $this->formatter->format($argument->getName(), 'INFO'), $argument->getHelp(), $default);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`$messages[] = '';`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ protected function outputAsText($namespace, $tasks)`
`120`	`120`
`121`	`121`	`$aliases = $task->getAliases() ? $this->formatter->format(' ('.implode(', ', $task->getAliases()).')', 'COMMENT') : '';`
`122`	`122`
`123`		`- $messages[] = sprintf(" %-${width}s %s%s", $this->formatter->format(':'.$task->getName(), 'INFO'), $task->getBriefDescription(), $aliases);`
	`123`	`+ $messages[] = sprintf(" %-{$width}s %s%s", $this->formatter->format(':'.$task->getName(), 'INFO'), $task->getBriefDescription(), $aliases);`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`$this->log($messages);`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ protected function chmod($file, $mode, $umask = 0000)`
`112`	`112`	`*`
`113`	`113`	`* @see http://www.php.net/set_error_handler`
`114`	`114`	`*/`
`115`		`- public function handleError($no, $string, $file, $line, $context)`
	`115`	`+ public function handleError($no, $string, $file, $line, $context = null)`
`116`	`116`	`{`
`117`	`117`	`$this->failed[] = $this->current;`
`118`	`118`	`}`