diff --git a/composer.json b/composer.json
index 00de9de32..de2b91320 100644
--- a/composer.json
+++ b/composer.json
@@ -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": {
diff --git a/lib/form/sfFormPropel.class.php b/lib/form/sfFormPropel.class.php
index 3ed268361..54fbb3e91 100755
--- a/lib/form/sfFormPropel.class.php
+++ b/lib/form/sfFormPropel.class.php
@@ -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);
@@ -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)
     {
diff --git a/lib/generator/sfPropelFormGenerator.class.php b/lib/generator/sfPropelFormGenerator.class.php
index ec690c0ef..38774df76 100644
--- a/lib/generator/sfPropelFormGenerator.class.php
+++ b/lib/generator/sfPropelFormGenerator.class.php
@@ -23,6 +23,12 @@ class sfPropelFormGenerator extends sfGenerator
   protected
     $dbMap = null;
 
+  public
+    $params = null;
+
+  public
+    $table = null;
+
   /**
    * Initializes the current sfGenerator instance.
    *
diff --git a/lib/log/sfPropelLogger.class.php b/lib/log/sfPropelLogger.class.php
index 6d7b7e2fc..277dae04e 100644
--- a/lib/log/sfPropelLogger.class.php
+++ b/lib/log/sfPropelLogger.class.php
@@ -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)
     {
diff --git a/lib/task/sfPropelGenerateModuleTask.class.php b/lib/task/sfPropelGenerateModuleTask.class.php
index 7d21c232e..6df035e96 100644
--- a/lib/task/sfPropelGenerateModuleTask.class.php
+++ b/lib/task/sfPropelGenerateModuleTask.class.php
@@ -20,6 +20,8 @@
  */
 class sfPropelGenerateModuleTask extends sfPropelBaseTask
 {
+  protected $constants;
+
   /**
    * @see sfTask
    */