Merge branch '2.0'

Command/AbstractPropelCommand.php

@@ -388,7 +388,12 @@ EOT;
     {
         preg_match('#dbname=([a-zA-Z0-9\_]+)#', $dsn, $matches);
 
-        return $matches[1];
+        if (isset($matches[1])) {
+            return $matches[1];
+        }
+
+        // e.g. SQLite
+        return null;
     }
 
     /**

Command/DatabaseCreateCommand.php

@@ -45,7 +45,12 @@ class DatabaseCreateCommand extends AbstractPropelCommand
 
         list($name, $config) = $this->getConnection($input, $output);
         $dbName = $this->parseDbName($config['connection']['dsn']);
-        $query  = 'CREATE DATABASE '. $dbName .';';
+
+        if (null === $dbName) {
+            return $output->writeln('<error>No database name found.</error>');
+        } else {
+            $query  = 'CREATE DATABASE '. $dbName .';';
+        }
 
         try {
             \Propel::setConfiguration($this->getTemporaryConfiguration($name, $config));

Command/DatabaseDropCommand.php

@@ -67,7 +67,12 @@ EOT
 
             list($name, $config) = $this->getConnection($input, $output);
             $dbName = $this->parseDbName($config['connection']['dsn']);
-            $query  = 'DROP DATABASE '. $dbName .';';
+
+            if (null === $dbName) {
+                return $output->writeln('<error>No database name found.</error>');
+            } else {
+                $query  = 'DROP DATABASE '. $dbName .';';
+            }
 
             try {
                 $connection = \Propel::getConnection($name);

Tests/Command/AbstractPropelCommandTest.php

@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of the PropelBundle package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license    MIT License
+ */
+
+namespace Tests\Command;
+
+use Propel\PropelBundle\Tests\TestCase;
+use Propel\PropelBundle\Command\AbstractPropelCommand;
+
+/**
+ * @author William Durand <william.durand1@gmail.com>
+ */
+class AbstractPropelCommandTest extends TestCase
+{
+    protected $command;
+
+    public function setUp()
+    {
+        $this->command = new TestableAbstractPropelCommand('testable-command');
+    }
+
+    public function testParseDbName()
+    {
+        $dsn = 'mydsn#dbname=foo';
+        $this->assertEquals('foo', $this->command->parseDbName($dsn));
+    }
+
+    public function testParseDbNameWithoutDbName()
+    {
+        $this->assertNull($this->command->parseDbName('foo'));
+    }
+}
+
+class TestableAbstractPropelCommand extends AbstractPropelCommand
+{
+    public function parseDbName($dsn)
+    {
+        return parent::parseDbName($dsn);
+    }
+}

Validator/Constraints/UniqueObjectValidator.php

@@ -45,7 +45,7 @@ class UniqueObjectValidator extends ConstraintValidator
         $classFields = $peerClass::getFieldNames(\BasePeer::TYPE_FIELDNAME);
 
         foreach ($fields as $fieldName) {
-            if(!array_search($fieldName, $classFields)) {
+            if(false === array_search($fieldName, $classFields)) {
                 throw new ConstraintDefinitionException('The field "' . $fieldName .'" doesn\'t exist in the "' . $class . '" class.');
             }
         }