PHP 8.1 > Unit Test

sfException> fileExcerpt file can be null, and PHP 8.1 do not allow null on is_readable()

sfBrowser> Move sf_test conf before getContext, because getContext can throw some sfException, which will raise some printStackTrace, hidden by another Exception "header already sent ..."

lime.php> some trace can have no "file" (internal methods call)
lime.php> handle_exception can handle Error/Throwable, not avaialble under php7.2: remove typing

sfTestFunctionalBase> can throw exception

Fix Select Unit test NewActivePendingExpired.
DomDocument on recent php return a list of values, not concatened ones.

Fix SessionStorage UnitTest.

sfSessionStorage could not be restarted.
Flag $sessionStarted as false when shutdown to avoid error during unit test which can start several sfSessionStorage

Storage need to be shutdown to avoid:
PHP Warning:  session_name(): Session name cannot be changed when a session is active

Author: Tybaze

lib/exception/sfException.class.php

@@ -366,6 +366,10 @@ static protected function formatArrayAsHtml($values)
    */
   static protected function fileExcerpt($file, $line)
   {
+    // $file can be null for RuntimeException
+    if($file === null) {
+      return '';
+    }
     if (is_readable($file))
     {
       $content = preg_split('#<br />#', preg_replace('/^<code>(.*)<\/code>$/s', '$1', highlight_file($file, true)));

lib/plugins/sfDoctrinePlugin/test/functional/AdminGenBrowser.class.php

@@ -152,7 +152,7 @@ protected function _testEnumDropdown()
     $this->
       get('/subscriptions/new')->
         with('response')->begin()->
-          checkElement('select', 'NewActivePendingExpired')->
+          checkElement('select', '/^New\R?Active\R?Pending\R?Expired\R?$/m')->
         end()
     ;
   }
@@ -237,7 +237,7 @@ protected function _runAdminGenModuleSanityCheck($model, $module)
   }
 
   protected function _generateAdminGenModule($model, $module)
-  {    
+  {
     $this->info('Generating admin gen module "' . $module . '"');
     $task = new sfDoctrineGenerateAdminTask($this->getContext()->getEventDispatcher(), new sfFormatter());
     $task->run(array('application' => 'backend', 'route_or_model' => $model));

lib/storage/sfSessionStorage.class.php

@@ -190,5 +190,6 @@ public function shutdown()
   {
     // don't need a shutdown procedure because read/write do it in real-time
     session_write_close();
+    self::$sessionStarted = false;
   }
 }

lib/test/sfTestFunctionalBase.class.php

@@ -478,7 +478,7 @@ static public function handlePhpError($errno, $errstr, $errfile, $errline)
   /**
    * Exception handler for the current test browser instance.
    *
-   * @param Exception $exception The exception
+   * @param Throwable $exception The exception
    */
   function handleException($exception)
   {

lib/util/sfBrowser.class.php

@@ -28,11 +28,12 @@ class sfBrowser extends sfBrowserBase
    */
   protected function doCall()
   {
+    // Before getContext, it can trigger some
+    sfConfig::set('sf_test', true);
+
     // recycle our context object
     $this->context = $this->getContext(true);
 
-    sfConfig::set('sf_test', true);
-
     // we register a fake rendering filter
     sfConfig::set('sf_rendering_filter', array('sfFakeRenderingFilter', null));
 

lib/vendor/lime/lime.php

@@ -520,11 +520,11 @@ public function error($message, $file = null, $line = null, array $traces = arra
   {
     $this->output->error($message, $file, $line, $traces);
 
-  	$this->results['stats']['errors'][] = array(
-  	  'message' => $message,
-  	  'file' => $file,
-  	  'line' => $line,
-  	);
+    $this->results['stats']['errors'][] = array(
+      'message' => $message,
+      'file' => $file,
+      'line' => $line,
+    );
   }
 
   protected function update_stats()
@@ -553,7 +553,8 @@ protected function find_caller($traces)
     $t = array_reverse($traces);
     foreach ($t as $trace)
     {
-      if (isset($trace['object']) && $this->is_test_object($trace['object']))
+      // In internal calls, like error_handle, 'file' will be missing
+      if (isset($trace['object']) && $this->is_test_object($trace['object']) && isset($trace['file']))
       {
         return array($trace['file'], $trace['line']);
       }
@@ -587,7 +588,11 @@ public function handle_error($code, $message, $file, $line, $context = null)
     $this->error($type.': '.$message, $file, $line, $trace);
   }
 
-  public function handle_exception(Throwable $exception)
+  /**
+   * @param Throwable $exception only available on php7
+   * @return bool
+   */
+  public function handle_exception($exception)
   {
     $this->error(get_class($exception).': '.$exception->getMessage(), $exception->getFile(), $exception->getLine(), $exception->getTrace());
 

test/unit/storage/sfSessionStorageTest.php

@@ -26,6 +26,7 @@
 {
   $storage = new sfSessionStorage();
   $t->pass('->__construct() does not throw an exception when not provided with options');
+  $storage->shutdown();
 }
 catch (InvalidArgumentException $e)
 {