Also mute php7 notices for undefined array indexes when muteUndefinedOrNullWarnings is activated.

Fixes #736

CHANGELOG.md

@@ -8,8 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - `$smarty->muteUndefinedOrNullWarnings()` now also mutes PHP7 notices for undefined array indexes [#736](https://github.com/smarty-php/smarty/issues/736)
-- `$smarty->muteUndefinedOrNullWarnings()` now treats undefined vars and array access of a null or false variables 
-  equivalent across all supported PHP versions
 
 ## [4.3.0] - 2022-11-22
 
@@ -19,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Include docs and demo in the releases [#799](https://github.com/smarty-php/smarty/issues/799)
 - Using PHP functions as modifiers now triggers a deprecation notice because we will drop support for this in the next major release [#813](https://github.com/smarty-php/smarty/issues/813) 
-- Dropped remaining references to removed PHP-support in Smarty 4 from docs, lexer and security class. [#816](https://github.com/smarty-php/smarty/issues/816)
+-  Dropped remaining references to removed PHP-support in Smarty 4 from docs, lexer and security class. [#816](https://github.com/smarty-php/smarty/issues/816)
 - Support umask when writing (template) files and set dir permissions to 777 [#548](https://github.com/smarty-php/smarty/issues/548) [#819](https://github.com/smarty-php/smarty/issues/819) 
  
 ### Fixed

docker-compose.yml

@@ -7,6 +7,7 @@ services:
     volumes:
       - .:/app
     working_dir: /app
+    entrypoint: sh ./run-tests.sh
   php71:
     extends:
       service: base

libs/sysplugins/smarty_internal_errorhandler.php

@@ -66,15 +66,12 @@ class Smarty_Internal_ErrorHandler
      */
     public function handleError($errno, $errstr, $errfile, $errline, $errcontext = [])
     {
-        if ($this->allowUndefinedVars && preg_match(
-                '/^(Attempt to read property ".+?" on null|Trying to get property (\'.+?\' )?of non-object)/',
-                $errstr
-            )) {
+        if ($this->allowUndefinedVars && $errstr == 'Attempt to read property "value" on null') {
             return; // suppresses this error
         }
 
         if ($this->allowUndefinedArrayKeys && preg_match(
-            '/^(Undefined index|Undefined array key|Trying to access array offset on value of type (null|bool))/',
+            '/^(Undefined index|Undefined array key|Trying to access array offset on value of type null)/',
             $errstr
         )) {
             return; // suppresses this error

run-tests-for-all-php-versions.sh

@@ -1,13 +1,44 @@
 #!/bin/bash
+Help()
+{
+   # Display Help
+   echo "Runs PHPUnit tests for all PHP versions supported by this version of Smarty."
+   echo
+   echo "Syntax: $0 [-e|h]"
+   echo "options:"
+   echo "e     Exclude a group of unit tests, e.g. -e 'slow'"
+   echo "h     Print this Help."
+   echo
+}
+
+Exclude=""
+
+# Get the options
+while getopts ":he:" option; do
+   case $option in
+      e) # Exclude
+        echo $OPTARG
+         Exclude=$OPTARG;;
+      h) # display Help
+         Help
+         exit;;
+     \?) # Invalid option
+         echo "Error: Invalid option"
+         exit;;
+   esac
+done
+
+if [ -z $Exclude ];
+then
+  Entrypoint="./run-tests.sh"
+else
+   Entrypoint="./run-tests.sh $Exclude"
+fi
 
 # Runs tests for all supported PHP versions
-# Usage examples:
-# - ./run-tests-for-all-php-versions.sh --group 20221124
-# - ./run-tests-for-all-php-versions.sh --exclude-group slow
-
-docker-compose run php71 ./run-tests.sh $@ && \
-docker-compose run php72 ./run-tests.sh $@ && \
-docker-compose run php73 ./run-tests.sh $@ && \
-docker-compose run php74 ./run-tests.sh $@ && \
-docker-compose run php80 ./run-tests.sh $@ && \
-docker-compose run php81 ./run-tests.sh $@
+docker-compose run --entrypoint "$Entrypoint" php71 && \
+docker-compose run --entrypoint "$Entrypoint" php72 && \
+docker-compose run --entrypoint "$Entrypoint" php73 && \
+docker-compose run --entrypoint "$Entrypoint" php74 && \
+docker-compose run --entrypoint "$Entrypoint" php80 && \
+docker-compose run --entrypoint "$Entrypoint" php81

run-tests.sh

@@ -1,10 +1,13 @@
 #!/bin/sh
+composer update
 
-# Runs composer update, echoes php version and runs PHPUnit
-# Usage examples:
-# - ./run-tests.sh --group 20221124
-# - ./run-tests.sh --exclude-group slow
+php -r 'echo "\nPHP version " . phpversion() . ". ";';
 
-composer update --quiet
-#php -r 'echo "\nPHP version " . phpversion() . ". ";'
-php ./vendor/phpunit/phpunit/phpunit $@
+if [ -z $1 ];
+then
+  echo "Running all unit tests.\n"
+  php ./vendor/phpunit/phpunit/phpunit
+else
+  echo "Running all unit tests, except tests marked with @group $1.\n"
+  php ./vendor/phpunit/phpunit/phpunit --exclude-group $1
+fi

tests/UnitTests/A_2/UndefinedTemplateVar/UndefinedTemplateVarTest.php

@@ -88,12 +88,14 @@ class UndefinedTemplateVarTest extends PHPUnit_Smarty
     }
 
     public function testUndefinedSimpleVar() {
+        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
         $this->smarty->muteUndefinedOrNullWarnings();
         $tpl = $this->smarty->createTemplate('string:a{if $undef}def{/if}b');
         $this->assertEquals("ab", $this->smarty->fetch($tpl));
     }
 
     public function testUndefinedArrayIndex() {
+        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
         $this->smarty->muteUndefinedOrNullWarnings();
         $tpl = $this->smarty->createTemplate('string:a{if $ar.undef}def{/if}b');
         $tpl->assign('ar', []);
@@ -101,6 +103,7 @@ class UndefinedTemplateVarTest extends PHPUnit_Smarty
     }
 
     public function testUndefinedArrayIndexDeep() {
+        $this->smarty->setErrorReporting(E_ALL & ~E_NOTICE);
         $this->smarty->muteUndefinedOrNullWarnings();
         $tpl = $this->smarty->createTemplate('string:a{if $ar.undef.nope.neither}def{/if}b');
         $tpl->assign('ar', []);
@@ -130,19 +133,5 @@ class UndefinedTemplateVarTest extends PHPUnit_Smarty
         $this->assertTrue($exceptionThrown);
     }
 
-    public function testUsingNullAsAnArrayIsMuted() {
-        $this->smarty->setErrorReporting(E_ALL);
-        $this->smarty->muteUndefinedOrNullWarnings();
-        $tpl = $this->smarty->createTemplate('string:a{if $undef.k}def{/if}b');
-        $this->assertEquals("ab", $this->smarty->fetch($tpl));
-    }
-
-    public function testUsingFalseAsAnArrayIsMuted() {
-        $this->smarty->setErrorReporting(E_ALL);
-        $this->smarty->muteUndefinedOrNullWarnings();
-        $tpl = $this->smarty->createTemplate('string:a{if $nottrue.k}def{/if}b');
-        $this->smarty->assign('nottrue', false);
-        $this->assertEquals("ab", $this->smarty->fetch($tpl));
-    }
 
 }