From 587396c9bedd5a6ea169646a97c25f3b6d7ff54d Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Sat, 21 May 2016 07:56:13 -0500
Subject: [PATCH] lint: Fix testing regressions
---
include/class.config.php | 2 +-
include/class.forms.php | 3 ---
include/class.organization.php | 1 +
include/class.orm.php | 2 +-
include/class.queue.php | 4 ++--
include/class.user.php | 1 +
scp/tickets.php | 4 ++--
setup/test/run-tests.php | 3 +++
8 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/include/class.config.php b/include/class.config.php
index 1a37d3e0b..09d58c8ec 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -1253,7 +1253,7 @@ class OsticketConfig extends Config {
return false;
// Sort ticket queues
- $queues = CustomQueue::queues()->all();
+ $queues = CustomQueue::queues()->getIterator();
foreach ($vars['qsort'] as $queue_id => $sort) {
if ($q = $queues->findFirst(array('id' => $queue_id))) {
$q->sort = $sort;
diff --git a/include/class.forms.php b/include/class.forms.php
index f085a6746..7ec38ab92 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -4197,9 +4197,6 @@ class ColorPickerWidget extends Widget {
function render($options=array()) {
?><input type="color"
id="<?php echo $this->id; ?>"
- <?php echo implode(' ', array_filter(array(
- $classes
- ))); ?>
name="<?php echo $this->name; ?>"
value="<?php echo Format::htmlchars($this->value); ?>"/><?php
}
diff --git a/include/class.organization.php b/include/class.organization.php
index eb572ed11..b0b811f4f 100644
--- a/include/class.organization.php
+++ b/include/class.organization.php
@@ -351,6 +351,7 @@ implements TemplateVariable, Searchable {
static function getSearchableFields() {
$uform = OrganizationForm::objects()->one();
+ $base = array();
foreach ($uform->getFields() as $F) {
$fname = $F->get('name') ?: ('field_'.$F->get('id'));
if (!$F->hasData() || $F->isPresentationOnly())
diff --git a/include/class.orm.php b/include/class.orm.php
index 53970b9d6..63510fade 100644
--- a/include/class.orm.php
+++ b/include/class.orm.php
@@ -1323,7 +1323,7 @@ class QuerySet implements IteratorAggregate, ArrayAccess, Serializable, Countabl
* If no such model or multiple models exist, an exception is thrown.
*/
function one() {
- $list = $this->all()->asArray();
+ $list = $this->all();
if (count($list) == 0)
throw new DoesNotExist();
elseif (count($list) > 1)
diff --git a/include/class.queue.php b/include/class.queue.php
index 7326bc628..1606e99f1 100644
--- a/include/class.queue.php
+++ b/include/class.queue.php
@@ -680,7 +680,7 @@ class CustomQueue extends VerySimpleModel {
$name = @static::getOrmPath($name, $qs);
if (preg_match('/__answers!\d+__/', $name)) {
- $qs->annotate(array($name2 => SqlAggregate::MAX($name)));
+ $qs->annotate(array($name => SqlAggregate::MAX($name)));
}
// Fetch a criteria Q for the query
@@ -1681,7 +1681,7 @@ extends VerySimpleModel {
}
function applySort($query, $reverse=false) {
- $fields = CustomQueue::getSearchableFields($root ?: $this->getQueue()->getRoot());
+ $fields = CustomQueue::getSearchableFields($this->getQueue()->getRoot());
if ($primary = $fields[$this->primary]) {
list(,$field) = $primary;
$query = $field->applyOrderBy($query, $reverse,
diff --git a/include/class.user.php b/include/class.user.php
index b8f000af5..dbabea18d 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -365,6 +365,7 @@ implements TemplateVariable, Searchable {
static function getSearchableFields() {
$uform = UserForm::getUserForm();
+ $base = array();
foreach ($uform->getFields() as $F) {
$fname = $F->get('name') ?: ('field_'.$F->get('id'));
if (!$F->hasData() || $F->isPresentationOnly())
diff --git a/scp/tickets.php b/scp/tickets.php
index 23475ee9f..5564c226e 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -437,7 +437,7 @@ $queues = CustomQueue::queues()
'flags__hasbit' => CustomQueue::FLAG_PUBLIC,
'staff_id' => $thisstaff->getId(),
)))
- ->all();
+ ->getIterator();
// Start with all the top-level (container) queues
foreach ($queues->findAll(array('parent_id' => 0))
@@ -457,7 +457,7 @@ $nav->addSubMenu(function() use ($queue) {
// A queue is selected if it is the one being displayed. It is
// "child" selected if its ID is in the path of the one selected
$child_selected = $queue instanceof SavedSearch;
- $searches = SavedSearch::forStaff($thisstaff)->all();
+ $searches = SavedSearch::forStaff($thisstaff)->getIterator();
include STAFFINC_DIR . 'templates/queue-savedsearches-nav.tmpl.php';
});
diff --git a/setup/test/run-tests.php b/setup/test/run-tests.php
index 30d81e225..fe55e681e 100644
--- a/setup/test/run-tests.php
+++ b/setup/test/run-tests.php
@@ -14,6 +14,9 @@ $fails = array();
require_once INCLUDE_DIR . 'class.i18n.php';
Internationalization::bootstrap();
+require_once INCLUDE_DIR . 'class.signal.php';
+require_once INCLUDE_DIR . 'class.search.php';
+
function show_fails() {
global $fails, $root;
if ($fails) {
--
GitLab