summaryrefslogtreecommitdiffstats
path: root/pts-core
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-03 12:30:54 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-03 12:30:54 -0500
commitde14942ecb71235e69a5bd24f7dad0720d9538fc (patch)
tree1f4fad820767747d5ec79793760e78974816246b /pts-core
parentaa7e35761d587712779a87c0ba034d87d57f16aa (diff)
downloadphoronix-test-suite-upstream-de14942ecb71235e69a5bd24f7dad0720d9538fc.tar.gz
phoronix-test-suite-upstream-de14942ecb71235e69a5bd24f7dad0720d9538fc.tar.xz
phoronix-test-suite-upstream-de14942ecb71235e69a5bd24f7dad0720d9538fc.zip
pts-core: Various PHP notice fixes
Diffstat (limited to 'pts-core')
-rw-r--r--pts-core/functions/pts.php3
-rw-r--r--pts-core/objects/bilde_renderer/bilde_png_renderer.php4
-rw-r--r--pts-core/objects/pts_test_results_details.php2
-rw-r--r--pts-core/options/list_saved_results.php2
4 files changed, 6 insertions, 5 deletions
diff --git a/pts-core/functions/pts.php b/pts-core/functions/pts.php
index f4d78ac..5537e56 100644
--- a/pts-core/functions/pts.php
+++ b/pts-core/functions/pts.php
@@ -20,7 +20,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-error_reporting(E_ALL | E_NOTICE);
+
+//error_reporting(E_ALL | E_NOTICE);
define("PTS_VERSION", "1.6.0a2");
define("PTS_CODENAME", "TYDAL");
diff --git a/pts-core/objects/bilde_renderer/bilde_png_renderer.php b/pts-core/objects/bilde_renderer/bilde_png_renderer.php
index acc913e..e35f13f 100644
--- a/pts-core/objects/bilde_renderer/bilde_png_renderer.php
+++ b/pts-core/objects/bilde_renderer/bilde_png_renderer.php
@@ -93,10 +93,10 @@ class bilde_png_renderer extends bilde_renderer
}
}
- $text_dimensions = $this->text_string_dimensions(strtoupper($text_string), $font_type, $font_size, $big_type);
+ $text_dimensions = $this->text_string_dimensions(strtoupper($text_string), $font_type, $font_size);
$text_height = $text_dimensions[1];
- $text_dimensions = $this->text_string_dimensions($text_string, $font_type, $font_size, $big_type);
+ $text_dimensions = $this->text_string_dimensions($text_string, $font_type, $font_size);
$text_width = $text_dimensions[0];
if($rotate_text == false)
diff --git a/pts-core/objects/pts_test_results_details.php b/pts-core/objects/pts_test_results_details.php
index 1c2ffb5..534156b 100644
--- a/pts-core/objects/pts_test_results_details.php
+++ b/pts-core/objects/pts_test_results_details.php
@@ -45,7 +45,7 @@ class pts_test_results_details
if(!empty($this->title))
{
- $str .= $title . "\n";
+ $str .= $this->title . "\n";
$str .= sprintf("Saved Name: %-18ls Test: %-18ls \n", $this->saved_identifier, $this->suite);
foreach($this->identifiers_r as $id)
diff --git a/pts-core/options/list_saved_results.php b/pts-core/options/list_saved_results.php
index e65dd7f..dbbf2c8 100644
--- a/pts-core/options/list_saved_results.php
+++ b/pts-core/options/list_saved_results.php
@@ -27,7 +27,7 @@ class list_saved_results implements pts_option_interface
echo pts_string_header("Phoronix Test Suite - Saved Results");
foreach(glob(SAVE_RESULTS_DIR . "*/composite.xml") as $saved_results_file)
{
- echo new pts_test_results_details($saved_results_file);
+ echo new pts_test_results_details($saved_results_file) . "\n";
}
echo "\n";
}