Merge pull request #6 from LExpress/remove-deprecated

Remove deprecated doctrine init and form file

Author: jeromemacias

lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php

@@ -103,19 +103,6 @@ public function initialize($parameters = array())
       $this->_doctrineConnection->addListener($this->profiler, 'symfony_profiler');
     }
 
-    // Invoke the configuration methods for the connection if they exist (deprecated in favor of the "doctrine.configure_connection" event)
-    $method = sprintf('configureDoctrineConnection%s', ucwords($this->_doctrineConnection->getName()));
-
-    if (method_exists($configuration, 'configureDoctrineConnection') && ! method_exists($configuration, $method))
-    {
-      $configuration->configureDoctrineConnection($this->_doctrineConnection);
-    }
-
-    if (method_exists($configuration, $method))
-    {
-      $configuration->$method($this->_doctrineConnection);
-    }
-
     $dispatcher->notify(new sfEvent($manager, 'doctrine.configure_connection', array('connection' => $this->_doctrineConnection, 'database' => $this)));
   }
 
@@ -131,7 +118,7 @@ public function getDoctrineConnection()
 
   /**
    * Returns the connection profiler.
-   * 
+   *
    * @return sfDoctrineConnectionProfiler|null
    */
   public function getProfiler()
@@ -160,9 +147,9 @@ public function shutdown()
     {
       $this->connection = null;
     }
-    if ($this->_doctrineConnection !== null) 
-    { 
-      $this->_doctrineConnection->getManager()->closeConnection($this->_doctrineConnection); 
+    if ($this->_doctrineConnection !== null)
+    {
+      $this->_doctrineConnection->getManager()->closeConnection($this->_doctrineConnection);
     }
   }
-}
+}

lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php

@@ -395,11 +395,6 @@ protected function saveFile($field, $filename = null, sfValidatedFile $file = nu
     {
       return $file->save($this->getObject()->$method($file));
     }
-    else if (method_exists($this->getObject(), $method = sprintf('generate%sFilename', $field)))
-    {
-      // this non-camelized method name has been deprecated
-      return $file->save($this->getObject()->$method($file));
-    }
     else
     {
       return $file->save();

lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php

@@ -8,6 +8,9 @@ class ProjectConfiguration extends sfProjectConfiguration
   public function setup()
   {
     $this->enableAllPluginsExcept();
+
+    $this->dispatcher->connect('doctrine.configure', array($this, 'configureDoctrineEvent'));
+    $this->dispatcher->connect('doctrine.configure_connection', array($this, 'configureDoctrineConnectionEvent'));
   }
 
   public function initializeDoctrine()
@@ -37,20 +40,22 @@ public function loadFixtures($fixtures)
     $task->run(array($path));
   }
 
-  public function configureDoctrine(Doctrine_Manager $manager)
+  public function configureDoctrineEvent(sfEvent $event)
   {
+    $manager = $event->getSubject();
     $manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, true);
 
     $options = array('baseClassName' => 'myDoctrineRecord');
     sfConfig::set('doctrine_model_builder_options', $options);
   }
 
-  public function configureDoctrineConnection(Doctrine_Connection $connection)
+  public function configureDoctrineConnectionEvent(sfEvent $event)
   {
-  }
+    $parameters = $event->getParameters();
 
-  public function configureDoctrineConnectionDoctrine2(Doctrine_Connection $connection)
-  {
-    $connection->setAttribute(Doctrine_Core::ATTR_VALIDATE, false);
+    if ('doctrine2' === $parameters['connection']->getName())
+    {
+      $parameters['connection']->setAttribute(Doctrine_Core::ATTR_VALIDATE, false);
+    }
   }
 }