Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Console/Commands/QueueSubmissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use App\Utils\AuthTokenUtil;
use CDash\Model\Project;
use Illuminate\Console\Command;
use Storage;
use Illuminate\Support\Facades\Storage;

class QueueSubmissions extends Command
{
Expand Down
2 changes: 1 addition & 1 deletion app/cdash/app/Lib/Repository/GitHub.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public function authenticate(bool $required = true): bool
try {
$token = $this->apiClient->api('apps')->createInstallationToken($this->installationId);
} catch (Exception $e) {
\Log::error($e->getMessage());
Log::error($e->getMessage());
return false;
}
if ($token) {
Expand Down
6 changes: 2 additions & 4 deletions app/cdash/app/Model/Build.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class Build
public string $BeginningOfDay;
public string $EndOfDay;

private $TestCollection;
private Collection $TestCollection;
private $PDO;
private $Site;
private $BuildUpdate;
Expand Down Expand Up @@ -2192,10 +2192,8 @@ public function AddTest(Test $buildtest): self

/**
* Return the current Build's TestCollection.
*
* @return TestCollection
*/
public function GetTestCollection()
public function GetTestCollection(): Collection
{
return $this->TestCollection;
}
Expand Down
2 changes: 1 addition & 1 deletion app/cdash/app/Model/BuildConfigure.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class BuildConfigure
public $BuildId;
public $NumberOfWarnings;
public $NumberOfErrors;
public $LabelCollection;
public Collection $LabelCollection;
private $Crc32;

private $PDO;
Expand Down
19 changes: 10 additions & 9 deletions app/cdash/include/Messaging/Topic/MissingTestTopic.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,20 @@

use App\Models\Test;
use CDash\Model\Build;
use Illuminate\Support\Collection;

class MissingTestTopic extends Topic
{
use IssueTemplateTrait;

/** @var Illuminate\Support\Collection */
private $collection;
private Collection $collection;

public function __construct(?TopicInterface $topic = null)
{
parent::__construct($topic);

$this->collection = collect();
}

/**
* This method queries the build to check for missing tests
Expand Down Expand Up @@ -53,14 +60,8 @@ public function setTopicData(Build $build)
}
}

/**
* @return Illuminate\Support\Collection
*/
public function getTopicCollection()
public function getTopicCollection(): Collection
{
if (!$this->collection) {
$this->collection = collect();
}
return $this->collection;
}

Expand Down
1 change: 1 addition & 0 deletions app/cdash/include/common.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use League\Flysystem\UnableToReadFile;
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;

Expand Down
3 changes: 1 addition & 2 deletions app/cdash/tests/case/CDash/TestUseCaseTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

use App\Http\Submission\Handlers\TestingHandler;
use App\Models\Test;
use CDash\Collection\BuildCollection;
use CDash\Model\Build;
use CDash\Test\CDashUseCaseTestCase;
Expand Down Expand Up @@ -173,11 +174,9 @@ public function testTestUseCaseCreatesTestPassed()

/** @var TestingHandler $handler */
$handler = $sut->build();
/** @var BuildCollection $builds */
$builds = $handler->GetBuildCollection();
/** @var Build $build */
$build = $builds->current();
/** @var Collection $tests */
$tests = $build->GetTestCollection();
/** @var Test $test */
$test = $tests->get('some.test.name');
Expand Down
1 change: 1 addition & 0 deletions app/cdash/tests/test_branchcoverage.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use CDash\Model\Build;
use CDash\Model\PendingSubmissions;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage;

class BranchCoverageTestCase extends KWWebTestCase
{
Expand Down
2 changes: 2 additions & 0 deletions app/cdash/tests/test_deferredsubmissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
use App\Models\AuthToken;
use App\Utils\DatabaseCleanupUtils;
use CDash\Model\Project;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage;

class DeferredSubmissionsTestCase extends BranchCoverageTestCase
{
Expand Down
1 change: 1 addition & 0 deletions app/cdash/tests/test_parallelsubmissions.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

use App\Utils\DatabaseCleanupUtils;
use CDash\Model\Project;
use Illuminate\Support\Facades\DB;

class ParallelSubmissionsTestCase extends TrilinosSubmissionTestCase
{
Expand Down
1 change: 1 addition & 0 deletions app/cdash/tests/test_unparsedsubmissionshonorbuildid.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
require_once 'tests/test_branchcoverage.php';

use App\Utils\DatabaseCleanupUtils;
use Illuminate\Support\Facades\DB;

class UnparsedSubmissionsHonorBuildIdTestCase extends BranchCoverageTestCase
{
Expand Down
Loading