Skip to content

Declare previously dynamic variables #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mentalstring wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Declare previously dynamic variables #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edd2e2a
Declare previously dynamic variables
mentalstring Mar 19, 2024
ccb7e64
Fix deprecation: implicitly nullable parameters
mentalstring Nov 20, 2025
77d774e
Upgrade to symfony1-installer-plugin
mentalstring Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"keywords": ["symfony", "propel", "orm", "active record", "mapping", "database", "persistence"],
"homepage": "http://www.propelorm.org/",
"require": {
"composer/installers": "^v1.12.0",
"friendsofsymfony1/symfony1-installer-plugin": "^1.0",
"propel/propel1": "~1.6"
},
"extra": {
Expand Down
4 changes: 2 additions & 2 deletions lib/form/sfFormPropel.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public function embedI18n($cultures, $decorator = null)
* @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->addOptionalForms($taintedValues);
return parent::bind($taintedValues, $taintedFiles);
Expand Down Expand Up @@ -466,7 +466,7 @@ public function getPeer()
*
* @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)
{
Expand Down
6 changes: 6 additions & 0 deletions lib/generator/sfPropelFormGenerator.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ class sfPropelFormGenerator extends sfGenerator
protected
$dbMap = null;

public
$params = null;

public
$table = null;

/**
* Initializes the current sfGenerator instance.
*
Expand Down
2 changes: 1 addition & 1 deletion lib/log/sfPropelLogger.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class sfPropelLogger implements BasicLogger
*
* @param sfEventDispatcher $dispatcher
*/
public function __construct(sfEventDispatcher $dispatcher = null)
public function __construct(?sfEventDispatcher $dispatcher = null)
{
if (null === $dispatcher)
{
Expand Down
2 changes: 2 additions & 0 deletions lib/task/sfPropelGenerateModuleTask.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
*/
class sfPropelGenerateModuleTask extends sfPropelBaseTask
{
protected $constants;

/**
* @see sfTask
*/
Expand Down