diff --git a/indefero/src/IDF/Migrations/22ProjectTagRelationTable.php b/indefero/src/IDF/Migrations/22ProjectTagRelationTable.php index 5113af1..41132e2 100644 --- a/indefero/src/IDF/Migrations/22ProjectTagRelationTable.php +++ b/indefero/src/IDF/Migrations/22ProjectTagRelationTable.php @@ -26,7 +26,7 @@ function IDF_Migrations_22ProjectTagRelationTable_up($params=null) $db = Pluf::db(); $table = $db->pfx.'idf_project_idf_tag_assoc'; if (!in_array($db->engine, array('MySQL', 'PostgreSQL'))) { - throw new Exception('unsupported engine '.$engine); + throw new Exception('unsupported engine '.$db->engine); } $intro = new Pluf_DB_Introspect($db); @@ -45,7 +45,7 @@ function IDF_Migrations_22ProjectTagRelationTable_down($params=null) $db = Pluf::db(); $table = $db->pfx.'idf_project_idf_tag_assoc'; if (!in_array($db->engine, array('MySQL', 'PostgreSQL'))) { - throw new Exception('unsupported engine '.$engine); + throw new Exception('unsupported engine '.$db->engine); } $intro = new Pluf_DB_Introspect($db); diff --git a/indefero/src/IDF/Plugin/SyncMonotone.php b/indefero/src/IDF/Plugin/SyncMonotone.php index d8e273b..c9243e4 100644 --- a/indefero/src/IDF/Plugin/SyncMonotone.php +++ b/indefero/src/IDF/Plugin/SyncMonotone.php @@ -597,7 +597,7 @@ class IDF_Plugin_SyncMonotone catch (Exception $e) { $this->_diagnoseProblem(sprintf( __('Could not parse read-permissions for project "%1$s": %2$s'), - $shortname, $e->getMessage() + $project->shortname, $e->getMessage() )); } @@ -716,7 +716,7 @@ class IDF_Plugin_SyncMonotone catch (Exception $e) { $this->_diagnoseProblem(sprintf( __('Could not parse read-permissions for project "%1$s": %2$s'), - $shortname, $e->getMessage() + $project->shortname, $e->getMessage() )); } @@ -789,7 +789,7 @@ class IDF_Plugin_SyncMonotone Pluf_Log::event(array( 'IDF_Plugin_SyncMonotone::processSyncTimeline', 'Project not found.', - array($project_name, $params) + array($project_name) )); return false; // Project not found } diff --git a/pluf/src/Pluf/DB/SQLite.php b/pluf/src/Pluf/DB/SQLite.php index 214ca70..9804906 100644 --- a/pluf/src/Pluf/DB/SQLite.php +++ b/pluf/src/Pluf/DB/SQLite.php @@ -106,7 +106,7 @@ class Pluf_DB_SQLite function getLastID() { $this->debug('* GET LAST ID'); - return (int) $this->con_id->lastInsertId();; + return (int) $this->con_id->lastInsertId(); } /** diff --git a/pluf/src/Pluf/Tests/TemplateTags/Cycle.php b/pluf/src/Pluf/Tests/TemplateTags/Cycle.php index f2540df..a0870ae 100644 --- a/pluf/src/Pluf/Tests/TemplateTags/Cycle.php +++ b/pluf/src/Pluf/Tests/TemplateTags/Cycle.php @@ -156,11 +156,11 @@ class Pluf_Tests_Templatetags_Cycle extends Pluf_Test_TemplatetagsUnitTestCase $this->skip('Pluf has no support for applying filters to a variable of array'); return; - $context = new Pluf_Template_Context(array('one' => 'A', + /*$context = new Pluf_Template_Context(array('one' => 'A', 'two' => '2')); $to_parse = '{cycle array($one|lower, $two), "counter"}{cycle $counter}'; $expected = 'a2'; $tpl = $this->getNewTemplate($to_parse); - $this->assertEqual($expected, $tpl->render($context)); + $this->assertEqual($expected, $tpl->render($context));*/ } }