Add Smarty php8.4 support

This patch is from a currently open PR smarty-php/smarty#1043 I think we can merge this to see our 8.4 start running & be relaxed if we lose it temporarily if we update Smarty again now before it is merged (which seems unlikely but we can hopefully hustle the merge)
eileenmcnaughton · Aug 6, 2024 · 852ce9a · 852ce9a
1 parent f5a36f9
commit 852ce9a
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 22 deletions.
diff --git a/smarty5/vendor/smarty/smarty/run-tests-for-all-php-versions.sh b/smarty5/vendor/smarty/smarty/run-tests-for-all-php-versions.sh
@@ -14,3 +14,4 @@ $COMPOSE_CMD run --rm php80 ./run-tests.sh $@ && \
 $COMPOSE_CMD run --rm php81 ./run-tests.sh $@ && \
 $COMPOSE_CMD run --rm php82 ./run-tests.sh $@
 $COMPOSE_CMD run --rm php83 ./run-tests.sh $@
+$COMPOSE_CMD run --rm php84 ./run-tests.sh $@
diff --git a/smarty5/vendor/smarty/smarty/src/Cacheresource/Base.php b/smarty5/vendor/smarty/smarty/src/Cacheresource/Base.php
@@ -44,7 +44,7 @@ abstract public function populateTimestamp(Cached $cached);
 	 */
     abstract public function process(
 	    Template $_template,
-	    Cached   $cached = null,
+	    ?Cached  $cached = null,
 	             $update = false
     );
 

diff --git a/smarty5/vendor/smarty/smarty/src/Cacheresource/Custom.php b/smarty5/vendor/smarty/smarty/src/Cacheresource/Custom.php
@@ -139,7 +139,7 @@ public function populateTimestamp(\Smarty\Template\Cached $cached)
 	 */
     public function process(
 	    Template               $_smarty_tpl,
-	    \Smarty\Template\Cached $cached = null,
+	    ?\Smarty\Template\Cached $cached = null,
 	                           $update = false
     ) {
         if (!$cached) {

diff --git a/smarty5/vendor/smarty/smarty/src/Cacheresource/File.php b/smarty5/vendor/smarty/smarty/src/Cacheresource/File.php
@@ -99,7 +99,7 @@ public function populateTimestamp(Cached $cached)
 	 */
     public function process(
 	    Template $_smarty_tpl,
-	    Cached   $cached = null,
+	    ?Cached  $cached = null,
 	             $update = false
     ) {
         $_smarty_tpl->getCached()->setValid(false);

diff --git a/smarty5/vendor/smarty/smarty/src/Cacheresource/KeyValueStore.php b/smarty5/vendor/smarty/smarty/src/Cacheresource/KeyValueStore.php
@@ -103,7 +103,7 @@ public function populateTimestamp(Cached $cached)
 	 */
     public function process(
 	    Template $_smarty_tpl,
-	    Cached   $cached = null,
+	    ?Cached  $cached = null,
 	             $update = false
     ) {
         if (!$cached) {

diff --git a/smarty5/vendor/smarty/smarty/src/Compiler/CodeFrame.php b/smarty5/vendor/smarty/smarty/src/Compiler/CodeFrame.php
@@ -41,7 +41,7 @@ public function create(
         $content = '',
         $functions = '',
         $cache = false,
-        \Smarty\Compiler\Template $compiler = null
+        ?\Smarty\Compiler\Template $compiler = null
     ) {
         // build property code
         $properties[ 'version' ] = \Smarty\Smarty::SMARTY_VERSION;

diff --git a/smarty5/vendor/smarty/smarty/src/Compiler/Template.php b/smarty5/vendor/smarty/smarty/src/Compiler/Template.php
@@ -368,7 +368,7 @@ public function compileTemplate(\Smarty\Template $template) {
 	 * @throws CompilerException
 	 * @throws Exception
 	 */
-	public function compileTemplateSource(\Smarty\Template $template, \Smarty\Compiler\Template $parent_compiler = null) {
+	public function compileTemplateSource(\Smarty\Template $template, ?\Smarty\Compiler\Template $parent_compiler = null) {
 		try {
 			// save template object in compiler class
 			$this->template = $template;

diff --git a/smarty5/vendor/smarty/smarty/src/CompilerException.php b/smarty5/vendor/smarty/smarty/src/CompilerException.php
@@ -16,14 +16,14 @@ class CompilerException extends Exception {
 	 * @param int $code The Exception code.
 	 * @param string|null $filename The filename where the exception is thrown.
 	 * @param int|null $line The line number where the exception is thrown.
-	 * @param Throwable|null $previous The previous exception used for the exception chaining.
+	 * @param \Throwable|null $previous The previous exception used for the exception chaining.
 	 */
 	public function __construct(
 		string    $message = "",
 		int       $code = 0,
 		?string   $filename = null,
 		?int      $line = null,
-		Throwable $previous = null
+		?\Throwable $previous = null
 	) {
 		parent::__construct($message, $code, $previous);
 

diff --git a/smarty5/vendor/smarty/smarty/src/Resource/BasePlugin.php b/smarty5/vendor/smarty/smarty/src/Resource/BasePlugin.php
@@ -112,7 +112,7 @@ abstract public function getContent(Source $source);
 	 * @param Source $source source object
 	 * @param Template|null $_template template object
 	 */
-    abstract public function populate(Source $source, \Smarty\Template $_template = null);
+    abstract public function populate(Source $source, ?\Smarty\Template $_template = null);
 
     /**
      * populate Source Object with timestamp and exists from Resource

diff --git a/smarty5/vendor/smarty/smarty/src/Resource/CustomPlugin.php b/smarty5/vendor/smarty/smarty/src/Resource/CustomPlugin.php
@@ -50,7 +50,7 @@ protected function fetchTimestamp($name) {
 	 * @param Source $source source object
 	 * @param Template|null $_template template object
 	 */
-	public function populate(Source $source, Template $_template = null) {
+	public function populate(Source $source, ?Template $_template = null) {
 		$source->uid = sha1($source->type . ':' . $source->name);
 		$mtime = $this->fetchTimestamp($source->name);
 		if ($mtime !== null) {

diff --git a/smarty5/vendor/smarty/smarty/src/Resource/ExtendsPlugin.php b/smarty5/vendor/smarty/smarty/src/Resource/ExtendsPlugin.php
@@ -23,7 +23,7 @@ class ExtendsPlugin extends BasePlugin
      *
      * @throws Exception
      */
-    public function populate(Source $source, Template $_template = null)
+    public function populate(Source $source, ?Template $_template = null)
     {
         $uid = '';
         $sources = array();

diff --git a/smarty5/vendor/smarty/smarty/src/Resource/FilePlugin.php b/smarty5/vendor/smarty/smarty/src/Resource/FilePlugin.php
@@ -32,7 +32,7 @@ class FilePlugin extends BasePlugin {
 	 *
 	 * @throws Exception
 	 */
-	public function populate(Source $source, Template $_template = null) {
+	public function populate(Source $source, ?Template $_template = null) {
 
 		$source->uid = sha1(
 			$source->name . ($source->isConfig ? $source->getSmarty()->_joined_config_dir :

diff --git a/smarty5/vendor/smarty/smarty/src/Resource/StreamPlugin.php b/smarty5/vendor/smarty/smarty/src/Resource/StreamPlugin.php
@@ -33,7 +33,7 @@ class StreamPlugin extends RecompiledPlugin {
 	 *
 	 * @return void
 	 */
-	public function populate(Source $source, Template $_template = null) {
+	public function populate(Source $source, ?Template $_template = null) {
 		$source->uid = false;
 		$source->content = $this->getContent($source);
 		$source->timestamp = $source->exists = !!$source->content;

diff --git a/smarty5/vendor/smarty/smarty/src/Resource/StringPlugin.php b/smarty5/vendor/smarty/smarty/src/Resource/StringPlugin.php
@@ -31,7 +31,7 @@ class StringPlugin extends BasePlugin {
 	 *
 	 * @return void
 	 */
-	public function populate(Source $source, Template $_template = null) {
+	public function populate(Source $source, ?Template $_template = null) {
 		$source->uid = sha1($source->name);
 		$source->timestamp = $source->exists = true;
 	}

diff --git a/smarty5/vendor/smarty/smarty/src/Runtime/InheritanceRuntime.php b/smarty5/vendor/smarty/smarty/src/Runtime/InheritanceRuntime.php
@@ -162,7 +162,7 @@ public function instanceBlock(Template $tpl, $className, $name, $tplIndex = null
 	private function processBlock(
 		Template              $tpl,
 		\Smarty\Runtime\Block $block,
-		\Smarty\Runtime\Block $parent = null
+		?\Smarty\Runtime\Block $parent = null
 	) {
 		if ($block->hide && !isset($block->child)) {
 			return;

diff --git a/smarty5/vendor/smarty/smarty/src/Template.php b/smarty5/vendor/smarty/smarty/src/Template.php
@@ -115,7 +115,7 @@ class Template extends TemplateBase {
 	public function __construct(
 		$template_resource,
 		Smarty $smarty,
-		\Smarty\Data $_parent = null,
+		?\Smarty\Data $_parent = null,
 		$_cache_id = null,
 		$_compile_id = null,
 		$_caching = null,
@@ -248,7 +248,7 @@ public function renderSubTemplate(
 		$caching,
 		$cache_lifetime,
 		array $extra_vars = [],
-		int $scope = null,
+		?int $scope = null,
 		?string $currentDir = null
 	) {
 
@@ -462,7 +462,7 @@ public function getCompiler() {
 	 * @return string
 	 * @throws Exception
 	 */
-	public function createCodeFrame($content = '', $functions = '', $cache = false, \Smarty\Compiler\Template $compiler = null) {
+	public function createCodeFrame($content = '', $functions = '', $cache = false, ?\Smarty\Compiler\Template $compiler = null) {
 		return $this->getCodeFrameCompiler()->create($content, $functions, $cache, $compiler);
 	}
 

diff --git a/smarty5/vendor/smarty/smarty/src/Template/Source.php b/smarty5/vendor/smarty/smarty/src/Template/Source.php
@@ -134,9 +134,9 @@ public function __construct(Smarty $smarty, $type, $name) {
 	 * @throws Exception
 	 */
 	public static function load(
-		Template $_template = null,
-		Smarty   $smarty = null,
-		         $template_resource = null
+		?Template $_template = null,
+		?Smarty   $smarty = null,
+		          $template_resource = null
 	) {
 		if ($_template) {
 			$smarty = $_template->getSmarty();

diff --git a/smarty5/vendor/smarty/smarty/src/TemplateBase.php b/smarty5/vendor/smarty/smarty/src/TemplateBase.php
@@ -179,7 +179,7 @@ public function setCacheId($cache_id) {
 	 * @api  Smarty::createData()
 	 *
 	 */
-	public function createData(Data $parent = null, $name = null) {
+	public function createData(?Data $parent = null, $name = null) {
 		/* @var Smarty $smarty */
 		$smarty = $this->getSmarty();
 		$dataObj = new Data($parent, $smarty, $name);