fixed testcases

Author: wachterjohannes

.travis.yml

@@ -14,6 +14,7 @@ sudo: false
 matrix:
   include:
     - php: 5.3
+      dist: precise
       env: PACKAGE_VERSION=low
 
 before_script:

src/PHPCR/Util/QOM/Sql2Scanner.php

@@ -159,7 +159,7 @@ protected function scan($sql2)
             $token = strtok(" \n\t");
         }
 
-        $regexp = '';
+        $regexp = array();
         foreach ($tokens as $token) {
             $regexp[] = preg_quote($token, '/');
         }

tests/PHPCR/Tests/Util/Console/Command/NodesUpdateCommandTest.php

@@ -88,7 +88,7 @@ public function testNodeUpdate($options)
         $this->setupQueryManager($options);
 
         $args = array(
-            '--query-language' => null,
+            '--query-language' => 'jcr-sql2',
             '--query' => $options['query'],
             '--no-interaction' => true,
             '--set-prop' => array(),

tests/PHPCR/Tests/Util/QOM/Sql2ToQomQueryConverterTest.php

@@ -2,13 +2,27 @@
 
 namespace PHPCR\Tests\Util\QOM;
 
+use PHPCR\Query\QOM\QueryObjectModelFactoryInterface;
 use PHPCR\Util\QOM\Sql2ToQomQueryConverter;
+use PHPCR\Util\ValueConverter;
 
 class Sql2ToQomQueryConverterTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var QueryObjectModelFactoryInterface
+     */
     protected $qomFactory;
+
+    /**
+     * @var ValueConverter
+     */
     protected $valueConverter;
 
+    /**
+     * @var Sql2ToQomQueryConverter
+     */
+    protected $converter;
+
     public function setUp()
     {
         $this->qomFactory = $this->getMock('PHPCR\Query\QOM\QueryObjectModelFactoryInterface');