From fa161a1e93e8ec52064d7023861727d5a8168c46 Mon Sep 17 00:00:00 2001 From: "Thomas A. Hirsch" Date: Tue, 13 Dec 2022 19:52:34 +0100 Subject: [PATCH 1/6] test environment for php 8.2 --- .docker/{php74_81 => php74_82}/Dockerfile | 0 .github/workflows/continuous-integration.yml | 1 + docker-compose.yml | 15 ++++++++++++--- 3 files changed, 13 insertions(+), 3 deletions(-) rename .docker/{php74_81 => php74_82}/Dockerfile (100%) diff --git a/.docker/php74_81/Dockerfile b/.docker/php74_82/Dockerfile similarity index 100% rename from .docker/php74_81/Dockerfile rename to .docker/php74_82/Dockerfile diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 78e07a5d0..b27f75493 100644 --- 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 index b18e91032..373560b09 100644 --- 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 From f6d779cc48d2295722366209dcaf4f956ad55ec9 Mon Sep 17 00:00:00 2001 From: "Thomas A. Hirsch" Date: Tue, 13 Dec 2022 19:54:03 +0100 Subject: [PATCH 2/6] PHP 8.2 > Using ${var} in strings is deprecated, use {$var} instead. --- lib/command/sfAnsiColorFormatter.class.php | 2 +- lib/task/help/sfHelpTask.class.php | 2 +- lib/task/help/sfListTask.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/command/sfAnsiColorFormatter.class.php b/lib/command/sfAnsiColorFormatter.class.php index 904da78b2..2f6c29e14 100644 --- 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/task/help/sfHelpTask.class.php b/lib/task/help/sfHelpTask.class.php index 1f4ac9e21..b386bd3f7 100644 --- 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 index c167ae807..38354c33f 100644 --- 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); From d89618fc27b3efa2a758a10a9f3ffd312300f583 Mon Sep 17 00:00:00 2001 From: "Thomas A. Hirsch" Date: Tue, 13 Dec 2022 19:57:10 +0100 Subject: [PATCH 3/6] PHP 8.2 > Creation of dynamic property Class::$property is deprecated --- .../lib/database/sfDoctrineConnectionListener.class.php | 4 ++++ lib/routing/sfRoute.class.php | 7 +++---- lib/task/sfBaseTask.class.php | 4 +++- lib/util/sfBrowser.class.php | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php b/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php index ad39b2aae..5129020ad 100644 --- 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 index fd2ac0319..f8a6ea7a5 100644 --- a/lib/routing/sfRoute.class.php +++ b/lib/routing/sfRoute.class.php @@ -15,9 +15,6 @@ * @subpackage routing * @author Fabien Potencier * @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/sfBaseTask.class.php b/lib/task/sfBaseTask.class.php index 564a0be6c..247576054 100644 --- 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 index ad45e1225..ec13e4460 100644 --- 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. From 89c24cf5cc518f13193b8940b40ccb5ed906fb9a Mon Sep 17 00:00:00 2001 From: "Thomas A. Hirsch" Date: Tue, 13 Dec 2022 20:03:00 +0100 Subject: [PATCH 4/6] PHP 8.0 > Uncaught ArgumentCountError: Too few arguments to function --- lib/task/project/sfProjectPermissionsTask.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/task/project/sfProjectPermissionsTask.class.php b/lib/task/project/sfProjectPermissionsTask.class.php index 72b3b7620..c5b5d9b0c 100644 --- 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; } From 754c940232355aaed6f96f3d4bfb316a092d6294 Mon Sep 17 00:00:00 2001 From: "Thomas A. Hirsch" Date: Tue, 13 Dec 2022 20:09:26 +0100 Subject: [PATCH 5/6] PHP 8.0 > Trying to access array offset on value of type bool --- lib/yaml/sfYamlInline.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php index 840f3fa7a..0957595ac 100644 --- 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); From 13bfee2aa0bc140870159274ad5a7f2d42aa6115 Mon Sep 17 00:00:00 2001 From: "Thomas A. Hirsch" Date: Tue, 13 Dec 2022 20:10:13 +0100 Subject: [PATCH 6/6] PHP 8.0 > Passing null to parameter #1 ($haystack) of type string is deprecated --- lib/yaml/sfYamlInline.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/yaml/sfYamlInline.class.php b/lib/yaml/sfYamlInline.class.php index 0957595ac..97d8c5b03 100644 --- a/lib/yaml/sfYamlInline.class.php +++ b/lib/yaml/sfYamlInline.class.php @@ -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