From 0b6fa7c64dff91209a618a5f975471898d294616 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Thu, 15 Oct 2015 21:24:05 -0500 Subject: [PATCH] Inspector cleanup --- indefero/scripts/bootstrap.php | 3 +-- indefero/src/IDF/Plugin/SyncMonotone.php | 3 ++- pluf/src/Pluf/DB/MySQL.php | 2 +- pluf/src/Pluf/DB/SQLite.php | 3 ++- pluf/src/Pluf/Form/Field/Datetime.php | 2 +- pluf/src/Pluf/Form/Widget/SelectMultipleInput/Checkbox.php | 2 +- pluf/src/Pluf/Log.php | 2 +- pluf/src/Pluf/Middleware/GoogleAnalytics.php | 2 +- pluf/src/Pluf/Template.php | 1 - pluf/src/Pluf/Text/MarkDown.php | 1 - pluf/src/Pluf/Translation/TemplateExtractor.php | 2 +- pluf/src/Pluf/thirdparty/ccurl.php | 3 +-- pluf/src/packager.php | 3 +-- 13 files changed, 13 insertions(+), 16 deletions(-) diff --git a/indefero/scripts/bootstrap.php b/indefero/scripts/bootstrap.php index 3b3dfe9..215bc5f 100644 --- a/indefero/scripts/bootstrap.php +++ b/indefero/scripts/bootstrap.php @@ -14,5 +14,4 @@ $user->password = 'admin'; // the password is salted/hashed $user->administrator = true; $user->active = true; $user->create(); -print "Bootstrap ok\n"; -?> \ No newline at end of file +print "Bootstrap ok\n"; \ No newline at end of file diff --git a/indefero/src/IDF/Plugin/SyncMonotone.php b/indefero/src/IDF/Plugin/SyncMonotone.php index c9243e4..7132a04 100644 --- a/indefero/src/IDF/Plugin/SyncMonotone.php +++ b/indefero/src/IDF/Plugin/SyncMonotone.php @@ -568,6 +568,7 @@ class IDF_Plugin_SyncMonotone $keyGuard = new IDF_Plugin_SyncMonotone_ModelGuard($key); foreach (Pluf::factory('IDF_Project')->getList() as $project) { + /** @var \IDF_Project $project */ $conf = new IDF_Conf(); $conf->setProject($project); $scm = $conf->getVal('scm', 'mtn'); @@ -641,7 +642,7 @@ class IDF_Plugin_SyncMonotone $read_perms, LOCK_EX) === false) { $this->_diagnoseProblem(sprintf( __('Could not write read-permissions for project "%s"'), - $shortname + $project->shortname )); } } diff --git a/pluf/src/Pluf/DB/MySQL.php b/pluf/src/Pluf/DB/MySQL.php index 197b697..2ce1788 100644 --- a/pluf/src/Pluf/DB/MySQL.php +++ b/pluf/src/Pluf/DB/MySQL.php @@ -195,7 +195,7 @@ class Pluf_DB_MySQL function __toString() { - return 'con_id.')>'; + return 'con_id->info.')>'; } } diff --git a/pluf/src/Pluf/DB/SQLite.php b/pluf/src/Pluf/DB/SQLite.php index 9804906..8aebc43 100644 --- a/pluf/src/Pluf/DB/SQLite.php +++ b/pluf/src/Pluf/DB/SQLite.php @@ -163,7 +163,8 @@ class Pluf_DB_SQLite function __toString() { - return 'con_id.')>'; + // According to PHPStorm \PDO does not define __toString + return ''; } } diff --git a/pluf/src/Pluf/Form/Field/Datetime.php b/pluf/src/Pluf/Form/Field/Datetime.php index 04a0139..5b3f2a0 100644 --- a/pluf/src/Pluf/Form/Field/Datetime.php +++ b/pluf/src/Pluf/Form/Field/Datetime.php @@ -56,7 +56,7 @@ class Pluf_Form_Field_Datetime extends Pluf_Form_Field str_pad($day, 2, '0', STR_PAD_LEFT).' '. str_pad($date['tm_hour'], 2, '0', STR_PAD_LEFT).':'. str_pad($date['tm_min'], 2, '0', STR_PAD_LEFT).':'; - str_pad($date['tm_sec'], 2, '0', STD_PAD_LEFT); + str_pad($date['tm_sec'], 2, '0', STR_PAD_LEFT); // we internally use GMT, so we convert it to a GMT date. return gmdate('Y-m-d H:i:s', strtotime($date)); diff --git a/pluf/src/Pluf/Form/Widget/SelectMultipleInput/Checkbox.php b/pluf/src/Pluf/Form/Widget/SelectMultipleInput/Checkbox.php index db522cb..33d1e16 100644 --- a/pluf/src/Pluf/Form/Widget/SelectMultipleInput/Checkbox.php +++ b/pluf/src/Pluf/Form/Widget/SelectMultipleInput/Checkbox.php @@ -65,7 +65,7 @@ class Pluf_Form_Widget_SelectMultipleInput_Checkbox extends Pluf_Form_Widget_Sel public function idForLabel($id) { if ($id) { - $id += '_0'; + $id .= '_0'; } return $id; } diff --git a/pluf/src/Pluf/Log.php b/pluf/src/Pluf/Log.php index 7afb0b0..f73b0e4 100644 --- a/pluf/src/Pluf/Log.php +++ b/pluf/src/Pluf/Log.php @@ -147,7 +147,7 @@ class Pluf_Log */ public static function log($message) { - return self::_log(self::ALL, $message); + self::_log(self::ALL, $message); } /** diff --git a/pluf/src/Pluf/Middleware/GoogleAnalytics.php b/pluf/src/Pluf/Middleware/GoogleAnalytics.php index 2770a02..f980a4f 100644 --- a/pluf/src/Pluf/Middleware/GoogleAnalytics.php +++ b/pluf/src/Pluf/Middleware/GoogleAnalytics.php @@ -42,7 +42,7 @@ class Pluf_Middleware_GoogleAnalytics { if (isset($response) && !isset($response->status_code)) return $response; - + if (!Pluf::f('google_analytics_id', false)) { return $response; } diff --git a/pluf/src/Pluf/Template.php b/pluf/src/Pluf/Template.php index f0e97be..dee341c 100644 --- a/pluf/src/Pluf/Template.php +++ b/pluf/src/Pluf/Template.php @@ -153,7 +153,6 @@ public static function render($c) {$t = $c; ?>'.$this->template_content.'compiled_template)); } - return false; } public static function markSafe($string) diff --git a/pluf/src/Pluf/Text/MarkDown.php b/pluf/src/Pluf/Text/MarkDown.php index 93724dd..d2585f6 100644 --- a/pluf/src/Pluf/Text/MarkDown.php +++ b/pluf/src/Pluf/Text/MarkDown.php @@ -3335,4 +3335,3 @@ negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage. */ -?> diff --git a/pluf/src/Pluf/Translation/TemplateExtractor.php b/pluf/src/Pluf/Translation/TemplateExtractor.php index e278d01..2189c18 100644 --- a/pluf/src/Pluf/Translation/TemplateExtractor.php +++ b/pluf/src/Pluf/Translation/TemplateExtractor.php @@ -402,7 +402,7 @@ class Pluf_Translation_TemplateExtractor $result.=$tok; } elseif ($tok ==']') { $result.=$tok; - } elseif ($getAsArray && $tok == ',') { + } elseif ($tok == ',') { // $getAsArray not defined anywhere... $results[]=$result; $result=''; } else { diff --git a/pluf/src/Pluf/thirdparty/ccurl.php b/pluf/src/Pluf/thirdparty/ccurl.php index 596abe7..61929a7 100644 --- a/pluf/src/Pluf/thirdparty/ccurl.php +++ b/pluf/src/Pluf/thirdparty/ccurl.php @@ -142,5 +142,4 @@ class ccurl { public function __tostring(){ return $this->_webpage; } -} -?> \ No newline at end of file +} \ No newline at end of file diff --git a/pluf/src/packager.php b/pluf/src/packager.php index 5cfe73e..20e2d86 100644 --- a/pluf/src/packager.php +++ b/pluf/src/packager.php @@ -88,5 +88,4 @@ foreach ($files as $file) { echo "\n"; echo 'Compiled files: '.count($files)."\n"; file_put_contents($output_file, ''); -echo('Final size: '.(int)(100*filesize($output_file)/$size).'%'."\n"); -?> \ No newline at end of file +echo('Final size: '.(int)(100*filesize($output_file)/$size).'%'."\n"); \ No newline at end of file