Update: Update php-cs-fixer to v3.51

thePanz · thePanz · commit ccbef0191602 · 2024-03-18T18:10:18.000+01:00
Apply rule fixes
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: 8.2
-          tools: php-cs-fixer:3.45, cs2pr
+          tools: php-cs-fixer:3.51, cs2pr
 
       - uses: actions/cache@v4
         with:
diff --git a/lib/cache/sfFileCache.class.php b/lib/cache/sfFileCache.class.php
@@ -262,7 +262,7 @@ protected function write($path, $data, $timeout)
 
         $cacheDir = dirname($path);
         if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
-            throw new \sfCacheException(sprintf('Cache was not able to create a directory "%s".', $cacheDir));
+            throw new sfCacheException(sprintf('Cache was not able to create a directory "%s".', $cacheDir));
         }
 
         $tmpFile = tempnam($cacheDir, basename($path));
diff --git a/lib/command/sfCommandApplication.class.php b/lib/command/sfCommandApplication.class.php
@@ -60,7 +60,7 @@ abstract class sfCommandApplication
      * @param sfFormatter       $formatter  A sfFormatter instance
      * @param array             $options    An array of options
      */
-    public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatter = null, $options = array())
+    public function __construct(sfEventDispatcher $dispatcher, ?sfFormatter $formatter = null, $options = array())
     {
         $this->dispatcher = $dispatcher;
         $this->formatter = null === $formatter ? $this->guessBestFormatter(STDOUT) : $formatter;
diff --git a/lib/command/sfCommandManager.class.php b/lib/command/sfCommandManager.class.php
@@ -42,7 +42,7 @@ class sfCommandManager
      * @param sfCommandArgumentSet $argumentSet A sfCommandArgumentSet object
      * @param sfCommandOptionSet   $optionSet   A setOptionSet object
      */
-    public function __construct(sfCommandArgumentSet $argumentSet = null, sfCommandOptionSet $optionSet = null)
+    public function __construct(?sfCommandArgumentSet $argumentSet = null, ?sfCommandOptionSet $optionSet = null)
     {
         if (null === $argumentSet) {
             $argumentSet = new sfCommandArgumentSet();
diff --git a/lib/config/sfApplicationConfiguration.class.php b/lib/config/sfApplicationConfiguration.class.php
@@ -33,7 +33,7 @@ abstract class sfApplicationConfiguration extends ProjectConfiguration
      * @param string            $rootDir     The project root directory
      * @param sfEventDispatcher $dispatcher  An event dispatcher
      */
-    public function __construct($environment, $debug, $rootDir = null, sfEventDispatcher $dispatcher = null)
+    public function __construct($environment, $debug, $rootDir = null, ?sfEventDispatcher $dispatcher = null)
     {
         $this->environment = $environment;
         $this->debug = (bool) $debug;
diff --git a/lib/config/sfConfigCache.class.php b/lib/config/sfConfigCache.class.php
@@ -313,7 +313,7 @@ protected function writeCacheFile($config, $cache, $data)
         $current_umask = umask(0000);
         $cacheDir = dirname($cache);
         if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
-            throw new \sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', $cacheDir, $config));
+            throw new sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', $cacheDir, $config));
         }
 
         $tmpFile = tempnam($cacheDir, basename($cache));
diff --git a/lib/config/sfProjectConfiguration.class.php b/lib/config/sfProjectConfiguration.class.php
@@ -48,7 +48,7 @@ class sfProjectConfiguration
      * @param string            $rootDir    The project root directory
      * @param sfEventDispatcher $dispatcher The event dispatcher
      */
-    public function __construct($rootDir = null, sfEventDispatcher $dispatcher = null)
+    public function __construct($rootDir = null, ?sfEventDispatcher $dispatcher = null)
     {
         if (null === self::$active || $this instanceof sfApplicationConfiguration) {
             self::$active = $this;
@@ -589,7 +589,7 @@ public static function guessRootDir()
      *
      * @return sfApplicationConfiguration A sfApplicationConfiguration instance
      */
-    public static function getApplicationConfiguration($application, $environment, $debug, $rootDir = null, sfEventDispatcher $dispatcher = null)
+    public static function getApplicationConfiguration($application, $environment, $debug, $rootDir = null, ?sfEventDispatcher $dispatcher = null)
     {
         $class = $application.'Configuration';
 
diff --git a/lib/debug/sfDebug.class.php b/lib/debug/sfDebug.class.php
@@ -99,7 +99,7 @@ public static function settingsAsArray()
      *
      * @return array The request parameter holders
      */
-    public static function requestAsArray(sfRequest $request = null)
+    public static function requestAsArray(?sfRequest $request = null)
     {
         if (!$request) {
             return array();
@@ -119,7 +119,7 @@ public static function requestAsArray(sfRequest $request = null)
      *
      * @return array The response parameters
      */
-    public static function responseAsArray(sfResponse $response = null)
+    public static function responseAsArray(?sfResponse $response = null)
     {
         if (!$response) {
             return array();
@@ -144,7 +144,7 @@ public static function responseAsArray(sfResponse $response = null)
      *
      * @return array The user parameters
      */
-    public static function userAsArray(sfUser $user = null)
+    public static function userAsArray(?sfUser $user = null)
     {
         if (!$user) {
             return array();
diff --git a/lib/form/addon/sfFormSymfony.class.php b/lib/form/addon/sfFormSymfony.class.php
@@ -61,7 +61,7 @@ public function __call($method, $arguments)
     /**
      * Sets the event dispatcher to be used by all forms.
      */
-    public static function setEventDispatcher(sfEventDispatcher $dispatcher = null)
+    public static function setEventDispatcher(?sfEventDispatcher $dispatcher = null)
     {
         self::$dispatcher = $dispatcher;
     }
diff --git a/lib/form/sfForm.class.php b/lib/form/sfForm.class.php
@@ -214,7 +214,7 @@ public function getGlobalErrors()
      * @param array $taintedValues An array of input values
      * @param array $taintedFiles  An array of uploaded files (in the $_FILES or $_GET format)
      */
-    public function bind(array $taintedValues = null, array $taintedFiles = null)
+    public function bind(?array $taintedValues = null, ?array $taintedFiles = null)
     {
         $this->taintedValues = $taintedValues;
         $this->taintedFiles = $taintedFiles;
@@ -254,7 +254,7 @@ public function bind(array $taintedValues = null, array $taintedFiles = null)
     /**
      * Bind embedded forms (recursivly).
      */
-    public function bindEmbeddedForms(array $taintedValues = null, array $taintedFiles = null)
+    public function bindEmbeddedForms(?array $taintedValues = null, ?array $taintedFiles = null)
     {
         foreach ($this->embeddedForms as $name => $form) {
             // remove CSRF token
@@ -519,7 +519,7 @@ public function mergeForm(sfForm $form)
      *
      * @param sfValidatorBase $validator A validator to be merged
      */
-    public function mergePreValidator(sfValidatorBase $validator = null)
+    public function mergePreValidator(?sfValidatorBase $validator = null)
     {
         if (null === $validator) {
             return;
@@ -540,7 +540,7 @@ public function mergePreValidator(sfValidatorBase $validator = null)
      *
      * @param sfValidatorBase $validator A validator to be merged
      */
-    public function mergePostValidator(sfValidatorBase $validator = null)
+    public function mergePostValidator(?sfValidatorBase $validator = null)
     {
         if (null === $validator) {
             return;
diff --git a/lib/form/sfFormField.class.php b/lib/form/sfFormField.class.php
@@ -41,7 +41,7 @@ class sfFormField
      * @param string           $value  The field value
      * @param sfValidatorError $error  A sfValidatorError instance
      */
-    public function __construct(sfWidgetForm $widget, sfFormField $parent = null, $name, $value, sfValidatorError $error = null)
+    public function __construct(sfWidgetForm $widget, ?sfFormField $parent = null, $name, $value, ?sfValidatorError $error = null)
     {
         $this->widget = $widget;
         $this->parent = $parent;
diff --git a/lib/form/sfFormFieldSchema.class.php b/lib/form/sfFormFieldSchema.class.php
@@ -28,7 +28,7 @@ class sfFormFieldSchema extends sfFormField implements ArrayAccess, Iterator, Co
      * @param string             $value  The field value
      * @param sfValidatorError   $error  A sfValidatorError instance
      */
-    public function __construct(sfWidgetFormSchema $widget, sfFormField $parent = null, $name, $value, sfValidatorError $error = null)
+    public function __construct(sfWidgetFormSchema $widget, ?sfFormField $parent = null, $name, $value, ?sfValidatorError $error = null)
     {
         parent::__construct($widget, $parent, $name, $value, $error);
 
diff --git a/lib/generator/sfGeneratorManager.class.php b/lib/generator/sfGeneratorManager.class.php
@@ -83,7 +83,7 @@ public function save($path, $content)
         if (!is_dir($cacheDir)) {
             $current_umask = umask(0000);
             if (!@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {
-                throw new \sfCacheException(sprintf('Failed to make cache directory "%s".', $cacheDir));
+                throw new sfCacheException(sprintf('Failed to make cache directory "%s".', $cacheDir));
             }
             umask($current_umask);
         }
diff --git a/lib/i18n/sfI18N.class.php b/lib/i18n/sfI18N.class.php
@@ -28,7 +28,7 @@ class sfI18N
      *
      * @see initialize()
      */
-    public function __construct(sfApplicationConfiguration $configuration, sfCache $cache = null, $options = array())
+    public function __construct(sfApplicationConfiguration $configuration, ?sfCache $cache = null, $options = array())
     {
         $this->initialize($configuration, $cache, $options);
     }
@@ -63,7 +63,7 @@ public function __($string, $args = array(), $catalogue = 'messages')
      * @param sfCache                    $cache         A sfCache instance
      * @param array                      $options       An array of options
      */
-    public function initialize(sfApplicationConfiguration $configuration, sfCache $cache = null, $options = array())
+    public function initialize(sfApplicationConfiguration $configuration, ?sfCache $cache = null, $options = array())
     {
         $this->configuration = $configuration;
         $this->dispatcher = $configuration->getEventDispatcher();
diff --git a/lib/log/sfFileLogger.class.php b/lib/log/sfFileLogger.class.php
@@ -59,7 +59,7 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
         $dir = dirname($options['file']);
         $dirMode = isset($options['dir_mode']) ? $options['dir_mode'] : 0777;
         if (!is_dir($dir) && !@mkdir($dir, $dirMode, true) && !is_dir($dir)) {
-            throw new \RuntimeException(sprintf('Logger was not able to create a directory "%s"', $dir));
+            throw new RuntimeException(sprintf('Logger was not able to create a directory "%s"', $dir));
         }
 
         $fileExists = file_exists($options['file']);
diff --git a/lib/plugin/sfPearEnvironment.class.php b/lib/plugin/sfPearEnvironment.class.php
@@ -80,7 +80,7 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
         }
 
         if (!is_dir($options['cache_dir']) && !@mkdir($options['cache_dir'], 0777, true) && !is_dir($options['cache_dir'])) {
-            throw new \RuntimeException(sprintf('Pear was not able to create a directory "%s"', $options['cache_dir']));
+            throw new RuntimeException(sprintf('Pear was not able to create a directory "%s"', $options['cache_dir']));
         }
 
         if (!isset($options['rest_base_class'])) {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php b/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
@@ -340,7 +340,7 @@ protected function removeFile($field)
      *
      * @return string The filename used to save the file
      */
-    protected function saveFile($field, $filename = null, sfValidatedFile $file = null)
+    protected function saveFile($field, $filename = null, ?sfValidatedFile $file = null)
     {
         if (!$this->validatorSchema[$field] instanceof sfValidatorFile) {
             throw new LogicException(sprintf('You cannot save the current file for field "%s" as the field is not a file.', $field));
diff --git a/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php b/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php
@@ -221,7 +221,7 @@ public function getDateTimeObject($dateFieldName)
      *
      * @throws sfException if the field is not one of date, datetime, or timestamp types
      */
-    public function setDateTimeObject($dateFieldName, DateTime $dateTimeObject = null)
+    public function setDateTimeObject($dateFieldName, ?DateTime $dateTimeObject = null)
     {
         $type = $this->getTable()->getTypeOf($dateFieldName);
         if ('date' == $type || 'timestamp' == $type || 'datetime' == $type) {
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
@@ -66,7 +66,7 @@ public function callDoctrineCli($task, $args = array())
      *
      * @throws InvalidArgumentException If a requested database is not a Doctrine database
      */
-    protected function getDoctrineDatabases(sfDatabaseManager $databaseManager, array $names = null)
+    protected function getDoctrineDatabases(sfDatabaseManager $databaseManager, ?array $names = null)
     {
         $databases = array();
 
diff --git a/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ArticleTable.class.php b/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ArticleTable.class.php
@@ -57,7 +57,7 @@ public function getNewQuery()
         return $this->createQuery()->select('title, body');
     }
 
-    public function addOnHomepage(Doctrine_Query $q = null)
+    public function addOnHomepage(?Doctrine_Query $q = null)
     {
         if (is_null($q)) {
             $q = $this->createQuery('a');
diff --git a/lib/request/sfWebRequest.class.php b/lib/request/sfWebRequest.class.php
@@ -398,7 +398,7 @@ public function isMethod($method)
      *
      * @return string The preferred culture
      */
-    public function getPreferredCulture(array $cultures = null)
+    public function getPreferredCulture(?array $cultures = null)
     {
         $preferredCultures = $this->getLanguages();
 
diff --git a/lib/routing/sfPatternRouting.class.php b/lib/routing/sfPatternRouting.class.php
@@ -43,7 +43,7 @@ class sfPatternRouting extends sfRouting
      *
      * @see sfRouting
      */
-    public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
+    public function initialize(sfEventDispatcher $dispatcher, ?sfCache $cache = null, $options = array())
     {
         $options = array_merge(array(
             'variable_prefixes' => array(':'),
diff --git a/lib/routing/sfRouting.class.php b/lib/routing/sfRouting.class.php
@@ -30,7 +30,7 @@ abstract class sfRouting
      *
      * @param array $options
      */
-    public function __construct(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
+    public function __construct(sfEventDispatcher $dispatcher, ?sfCache $cache = null, $options = array())
     {
         $this->initialize($dispatcher, $cache, $options);
 
@@ -64,7 +64,7 @@ public function getCache()
      * @param sfCache           $cache      An sfCache instance
      * @param array             $options    an associative array of initialization options
      */
-    public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
+    public function initialize(sfEventDispatcher $dispatcher, ?sfCache $cache = null, $options = array())
     {
         $this->dispatcher = $dispatcher;
 
diff --git a/lib/service/sfServiceContainerLoader.class.php b/lib/service/sfServiceContainerLoader.class.php
@@ -22,7 +22,7 @@ abstract class sfServiceContainerLoader implements sfServiceContainerLoaderInter
      *
      * @param sfServiceContainerBuilder $container A sfServiceContainerBuilder instance
      */
-    public function __construct(sfServiceContainerBuilder $container = null)
+    public function __construct(?sfServiceContainerBuilder $container = null)
     {
         $this->container = $container;
     }
diff --git a/lib/storage/sfSessionTestStorage.class.php b/lib/storage/sfSessionTestStorage.class.php
@@ -146,7 +146,7 @@ public function shutdown()
             $current_umask = umask(0000);
             $sessionsDir = $this->options['session_path'];
             if (!is_dir($sessionsDir) && !@mkdir($sessionsDir, 0777, true) && !is_dir($sessionsDir)) {
-                throw new \RuntimeException(sprintf('Logger was not able to create a directory "%s"', $sessionsDir));
+                throw new RuntimeException(sprintf('Logger was not able to create a directory "%s"', $sessionsDir));
             }
             umask($current_umask);
             file_put_contents($sessionsDir.DIRECTORY_SEPARATOR.$this->sessionId.'.session', serialize($this->sessionData));
diff --git a/lib/task/sfBaseTask.class.php b/lib/task/sfBaseTask.class.php
@@ -24,7 +24,7 @@ abstract class sfBaseTask extends sfCommandApplicationTask
     /**
      * Sets the current task's configuration.
      */
-    public function setConfiguration(sfProjectConfiguration $configuration = null)
+    public function setConfiguration(?sfProjectConfiguration $configuration = null)
     {
         $this->configuration = $configuration;
     }
diff --git a/lib/task/sfCommandApplicationTask.class.php b/lib/task/sfCommandApplicationTask.class.php
@@ -35,7 +35,7 @@ abstract class sfCommandApplicationTask extends sfTask
      *
      * @param sfCommandApplication $commandApplication A sfCommandApplication instance
      */
-    public function setCommandApplication(sfCommandApplication $commandApplication = null)
+    public function setCommandApplication(?sfCommandApplication $commandApplication = null)
     {
         $this->commandApplication = $commandApplication;
     }
diff --git a/lib/task/sfFilesystem.class.php b/lib/task/sfFilesystem.class.php
@@ -24,7 +24,7 @@ class sfFilesystem
      * @param sfEventDispatcher $dispatcher An sfEventDispatcher instance
      * @param sfFormatter       $formatter  An sfFormatter instance
      */
-    public function __construct(sfEventDispatcher $dispatcher = null, sfFormatter $formatter = null)
+    public function __construct(?sfEventDispatcher $dispatcher = null, ?sfFormatter $formatter = null)
     {
         $this->dispatcher = $dispatcher;
         $this->formatter = $formatter;
diff --git a/lib/test/sfTestFunctional.class.php b/lib/test/sfTestFunctional.class.php
@@ -21,7 +21,7 @@ class sfTestFunctional extends sfTestFunctionalBase
      * @param sfBrowserBase $browser A sfBrowserBase instance
      * @param lime_test     $lime    A lime instance
      */
-    public function __construct(sfBrowserBase $browser, lime_test $lime = null, $testers = array())
+    public function __construct(sfBrowserBase $browser, ?lime_test $lime = null, $testers = array())
     {
         $testers = array_merge(array(
             'view_cache' => 'sfTesterViewCache',
diff --git a/lib/test/sfTestFunctionalBase.class.php b/lib/test/sfTestFunctionalBase.class.php
@@ -30,7 +30,7 @@ abstract class sfTestFunctionalBase
      * @param sfBrowserBase $browser A sfBrowserBase instance
      * @param lime_test     $lime    A lime instance
      */
-    public function __construct(sfBrowserBase $browser, lime_test $lime = null, $testers = array())
+    public function __construct(sfBrowserBase $browser, ?lime_test $lime = null, $testers = array())
     {
         $this->browser = $browser;
 
diff --git a/lib/validator/sfValidatedFile.class.php b/lib/validator/sfValidatedFile.class.php
@@ -85,7 +85,7 @@ public function save($file = null, $fileMode = 0666, $create = true, $dirMode =
         if (!is_readable($directory)) {
             if ($create && !@mkdir($directory, $dirMode, true) && !is_dir($directory)) {
                 // failed to create the directory
-                throw new \Exception(sprintf('Failed to create file upload directory "%s".', $directory));
+                throw new Exception(sprintf('Failed to create file upload directory "%s".', $directory));
             }
 
             // chmod the directory since it doesn't seem to work on recursive paths
diff --git a/lib/widget/sfWidgetForm.class.php b/lib/widget/sfWidgetForm.class.php
@@ -236,7 +236,7 @@ public function generateId($name, $value = null)
      *
      * @return sfWidgetForm The current widget instance
      */
-    public function setParent(sfWidgetFormSchema $widgetSchema = null)
+    public function setParent(?sfWidgetFormSchema $widgetSchema = null)
     {
         $this->parent = $widgetSchema;
 
diff --git a/lib/widget/sfWidgetFormSchemaDecorator.class.php b/lib/widget/sfWidgetFormSchemaDecorator.class.php
@@ -281,7 +281,7 @@ public function getParent()
     /**
      * @see sfWidgetFormSchema
      */
-    public function setParent(sfWidgetFormSchema $parent = null)
+    public function setParent(?sfWidgetFormSchema $parent = null)
     {
         $this->widget->setParent($parent);
 
diff --git a/test/unit/routing/sfPatternRoutingTest.php b/test/unit/routing/sfPatternRoutingTest.php
@@ -19,7 +19,7 @@
  */
 class sfPatternRoutingTest extends sfPatternRouting
 {
-    public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null, $options = array())
+    public function initialize(sfEventDispatcher $dispatcher, ?sfCache $cache = null, $options = array())
     {
         parent::initialize($dispatcher, $cache, $options);
 

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ protected function write($path, $data, $timeout)`
`262`	`262`
`263`	`263`	`$cacheDir = dirname($path);`
`264`	`264`	`if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {`
`265`		`- throw new \sfCacheException(sprintf('Cache was not able to create a directory "%s".', $cacheDir));`
	`265`	`+ throw new sfCacheException(sprintf('Cache was not able to create a directory "%s".', $cacheDir));`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`$tmpFile = tempnam($cacheDir, basename($path));`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ abstract class sfCommandApplication`
`60`	`60`	`* @param sfFormatter $formatter A sfFormatter instance`
`61`	`61`	`* @param array $options An array of options`
`62`	`62`	`*/`
`63`		`- public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatter = null, $options = array())`
	`63`	`+ public function __construct(sfEventDispatcher $dispatcher, ?sfFormatter $formatter = null, $options = array())`
`64`	`64`	`{`
`65`	`65`	`$this->dispatcher = $dispatcher;`
`66`	`66`	`$this->formatter = null === $formatter ? $this->guessBestFormatter(STDOUT) : $formatter;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class sfCommandManager`
`42`	`42`	`* @param sfCommandArgumentSet $argumentSet A sfCommandArgumentSet object`
`43`	`43`	`* @param sfCommandOptionSet $optionSet A setOptionSet object`
`44`	`44`	`*/`
`45`		`- public function __construct(sfCommandArgumentSet $argumentSet = null, sfCommandOptionSet $optionSet = null)`
	`45`	`+ public function __construct(?sfCommandArgumentSet $argumentSet = null, ?sfCommandOptionSet $optionSet = null)`
`46`	`46`	`{`
`47`	`47`	`if (null === $argumentSet) {`
`48`	`48`	`$argumentSet = new sfCommandArgumentSet();`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ abstract class sfApplicationConfiguration extends ProjectConfiguration`
`33`	`33`	`* @param string $rootDir The project root directory`
`34`	`34`	`* @param sfEventDispatcher $dispatcher An event dispatcher`
`35`	`35`	`*/`
`36`		`- public function __construct($environment, $debug, $rootDir = null, sfEventDispatcher $dispatcher = null)`
	`36`	`+ public function __construct($environment, $debug, $rootDir = null, ?sfEventDispatcher $dispatcher = null)`
`37`	`37`	`{`
`38`	`38`	`$this->environment = $environment;`
`39`	`39`	`$this->debug = (bool) $debug;`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ protected function writeCacheFile($config, $cache, $data)`
`313`	`313`	`$current_umask = umask(0000);`
`314`	`314`	`$cacheDir = dirname($cache);`
`315`	`315`	`if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir)) {`
`316`		`- throw new \sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', $cacheDir, $config));`
	`316`	`+ throw new sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', $cacheDir, $config));`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`$tmpFile = tempnam($cacheDir, basename($cache));`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class sfProjectConfiguration`
`48`	`48`	`* @param string $rootDir The project root directory`
`49`	`49`	`* @param sfEventDispatcher $dispatcher The event dispatcher`
`50`	`50`	`*/`
`51`		`- public function __construct($rootDir = null, sfEventDispatcher $dispatcher = null)`
	`51`	`+ public function __construct($rootDir = null, ?sfEventDispatcher $dispatcher = null)`
`52`	`52`	`{`
`53`	`53`	`if (null === self::$active \|\| $this instanceof sfApplicationConfiguration) {`
`54`	`54`	`self::$active = $this;`
`@@ -589,7 +589,7 @@ public static function guessRootDir()`
`589`	`589`	`*`
`590`	`590`	`* @return sfApplicationConfiguration A sfApplicationConfiguration instance`
`591`	`591`	`*/`
`592`		`- public static function getApplicationConfiguration($application, $environment, $debug, $rootDir = null, sfEventDispatcher $dispatcher = null)`
	`592`	`+ public static function getApplicationConfiguration($application, $environment, $debug, $rootDir = null, ?sfEventDispatcher $dispatcher = null)`
`593`	`593`	`{`
`594`	`594`	`$class = $application.'Configuration';`
`595`	`595`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public static function settingsAsArray()`
`99`	`99`	`*`
`100`	`100`	`* @return array The request parameter holders`
`101`	`101`	`*/`
`102`		`- public static function requestAsArray(sfRequest $request = null)`
	`102`	`+ public static function requestAsArray(?sfRequest $request = null)`
`103`	`103`	`{`
`104`	`104`	`if (!$request) {`
`105`	`105`	`return array();`
`@@ -119,7 +119,7 @@ public static function requestAsArray(sfRequest $request = null)`
`119`	`119`	`*`
`120`	`120`	`* @return array The response parameters`
`121`	`121`	`*/`
`122`		`- public static function responseAsArray(sfResponse $response = null)`
	`122`	`+ public static function responseAsArray(?sfResponse $response = null)`
`123`	`123`	`{`
`124`	`124`	`if (!$response) {`
`125`	`125`	`return array();`
`@@ -144,7 +144,7 @@ public static function responseAsArray(sfResponse $response = null)`
`144`	`144`	`*`
`145`	`145`	`* @return array The user parameters`
`146`	`146`	`*/`
`147`		`- public static function userAsArray(sfUser $user = null)`
	`147`	`+ public static function userAsArray(?sfUser $user = null)`
`148`	`148`	`{`
`149`	`149`	`if (!$user) {`
`150`	`150`	`return array();`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function __call($method, $arguments)`
`61`	`61`	`/**`
`62`	`62`	`* Sets the event dispatcher to be used by all forms.`
`63`	`63`	`*/`
`64`		`- public static function setEventDispatcher(sfEventDispatcher $dispatcher = null)`
	`64`	`+ public static function setEventDispatcher(?sfEventDispatcher $dispatcher = null)`
`65`	`65`	`{`
`66`	`66`	`self::$dispatcher = $dispatcher;`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public function getGlobalErrors()`
`214`	`214`	`* @param array $taintedValues An array of input values`
`215`	`215`	`* @param array $taintedFiles An array of uploaded files (in the $_FILES or $_GET format)`
`216`	`216`	`*/`
`217`		`- public function bind(array $taintedValues = null, array $taintedFiles = null)`
	`217`	`+ public function bind(?array $taintedValues = null, ?array $taintedFiles = null)`
`218`	`218`	`{`
`219`	`219`	`$this->taintedValues = $taintedValues;`
`220`	`220`	`$this->taintedFiles = $taintedFiles;`
`@@ -254,7 +254,7 @@ public function bind(array $taintedValues = null, array $taintedFiles = null)`
`254`	`254`	`/**`
`255`	`255`	`* Bind embedded forms (recursivly).`
`256`	`256`	`*/`
`257`		`- public function bindEmbeddedForms(array $taintedValues = null, array $taintedFiles = null)`
	`257`	`+ public function bindEmbeddedForms(?array $taintedValues = null, ?array $taintedFiles = null)`
`258`	`258`	`{`
`259`	`259`	`foreach ($this->embeddedForms as $name => $form) {`
`260`	`260`	`// remove CSRF token`
`@@ -519,7 +519,7 @@ public function mergeForm(sfForm $form)`
`519`	`519`	`*`
`520`	`520`	`* @param sfValidatorBase $validator A validator to be merged`
`521`	`521`	`*/`
`522`		`- public function mergePreValidator(sfValidatorBase $validator = null)`
	`522`	`+ public function mergePreValidator(?sfValidatorBase $validator = null)`
`523`	`523`	`{`
`524`	`524`	`if (null === $validator) {`
`525`	`525`	`return;`
`@@ -540,7 +540,7 @@ public function mergePreValidator(sfValidatorBase $validator = null)`
`540`	`540`	`*`
`541`	`541`	`* @param sfValidatorBase $validator A validator to be merged`
`542`	`542`	`*/`
`543`		`- public function mergePostValidator(sfValidatorBase $validator = null)`
	`543`	`+ public function mergePostValidator(?sfValidatorBase $validator = null)`
`544`	`544`	`{`
`545`	`545`	`if (null === $validator) {`
`546`	`546`	`return;`