Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.
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
1 change: 0 additions & 1 deletion core/controllers/ImportController.php
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ private function _recursiveParseDirectory($path, $currentdir)
}

if ($fileInfo->isDir()) { // we have a directory

// If the the directory actually doesn't exist at this point,
// skip it.
if (!file_exists($fileInfo->getPathName())) {
Expand Down
1 change: 0 additions & 1 deletion core/controllers/components/ApihelperComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ public function setMetadata($item, $type, $element, $qualifier, $value, $revisio
);
foreach ($modules as $retval) {
if ($retval['status'] === true) { // module has handled the event, so we don't have to

return;
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/controllers/components/DownloadBitstreamComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public function download($bitstream, $offset = 0, $incrementDownload = false)
*
* @param string $key Environment variable name
* @return string Environment variable setting
* @link http://book.cakephp.org/view/1130/env
* @see http://book.cakephp.org/view/1130/env
*/
function env($key)
{
Expand Down
1 change: 0 additions & 1 deletion core/database/upgrade/3.2.6.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ private function _moveThumbnailToAssetstore($thumbnail)

$oldpath = BASE_PATH.'/'.$thumbnail;
if (!file_exists($oldpath)) { //thumbnail file no longer exists, so we remove its reference

return;
}

Expand Down
1 change: 0 additions & 1 deletion core/models/base/ItemModelBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ public function copyItemPolicies($itemdao, $referenceItemdao, $feeddao = null)
}

if ($feeddao != null && $feeddao instanceof FeedDao) {

/** @var FeedpolicygroupModel $FeedpolicygroupModel */
$FeedpolicygroupModel = MidasLoader::loadModel('Feedpolicygroup');
foreach ($groupPolicies as $key => $policy) {
Expand Down
8 changes: 4 additions & 4 deletions core/tests/models/base/FeedModelTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ public function testCreateFeed()
$itemFile = $this->loadData('Item', 'default');
$feed = $this->Feed->createFeed($usersFile[0], MIDAS_FEED_CREATE_COMMUNITY, $communityFile[0]);
$this->assertEquals(true, $feed->saved);
$feed = $this->Feed->createFeed($usersFile [0], MIDAS_FEED_CREATE_FOLDER, $folderFile[0]);
$feed = $this->Feed->createFeed($usersFile[0], MIDAS_FEED_CREATE_FOLDER, $folderFile[0]);
$this->assertEquals(true, $feed->saved);
$feed = $this->Feed->createFeed($usersFile [0], MIDAS_FEED_CREATE_ITEM, $itemFile[0]);
$feed = $this->Feed->createFeed($usersFile[0], MIDAS_FEED_CREATE_ITEM, $itemFile[0]);
$this->assertEquals(true, $feed->saved);
$feed = $this->Feed->createFeed($usersFile [0], MIDAS_FEED_CREATE_USER, $usersFile[0]);
$feed = $this->Feed->createFeed($usersFile[0], MIDAS_FEED_CREATE_USER, $usersFile[0]);
$this->assertEquals(true, $feed->saved);
$this->Feed->addCommunity($feed, $communityFile [0]);
$this->Feed->addCommunity($feed, $communityFile[0]);
$communities = $feed->getCommunities();
if (($communities[0]->getKey() != $communityFile[0]->getKey())) {
$this->fail('Unable to add dao');
Expand Down
1 change: 0 additions & 1 deletion modules/pvw/controllers/components/ParaviewComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ private function _getNextOpenPort()
}
} elseif (!UtilityComponent::isPortListening($portEntry)
) { // single port check

return $portEntry;
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/pvw/models/pdo/InstanceModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function getAll()
$rows = $this->database->fetchAll($this->database->select()->setIntegrityCheck(false));
$daos = array();
foreach ($rows as $row) {
$daos [] = $this->initDao('Instance', $row, $this->moduleName);
$daos[] = $this->initDao('Instance', $row, $this->moduleName);
}

return $daos;
Expand Down
1 change: 0 additions & 1 deletion modules/scheduler/models/pdo/JobModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ public function getJobsToRun($limit = 1000)
$minPriority = MIDAS_EVENT_PRIORITY_LOW;
if (!empty($load)) {
if ($load[0] > 80 || $load[1] > 80) { // don't run anything

return array();
}
$minPriority = MIDAS_EVENT_PRIORITY_HIGH;
Expand Down
1 change: 0 additions & 1 deletion modules/thumbnailcreator/database/upgrade/1.0.2.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ private function _moveThumbnailToAssetstore($thumbnail)

$oldpath = BASE_PATH.'/'.$thumbnail;
if (!file_exists($oldpath)) { //thumbnail file no longer exists, so we remove its reference

return;
}

Expand Down
1 change: 0 additions & 1 deletion modules/tracker/controllers/ProducerController.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ public function viewAction()
'text' => $producerDao->getDisplayName(),
'icon' => $this->view->baseUrl('core/public/images/icons/cog_go.png'),
),

);
$this->Component->Breadcrumb->setBreadcrumbHeader($breadcrumbs, $this->view);
}
Expand Down
1 change: 0 additions & 1 deletion modules/tracker/models/base/ScalarModelBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ abstract public function getOtherScalarsFromSubmission($scalarDao);
*/
public function addToTrend($trendDao, $submissionDao, $value)
{

/** @var Tracker_ScalarDao $scalarDao */
$scalarDao = MidasLoader::newDao('ScalarDao', $this->moduleName);

Expand Down
1 change: 0 additions & 1 deletion modules/tracker/models/base/TrendModelBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ public function createIfNeeded($producerId, $metricName, $configItemId, $testDat
$trendDao = $this->getMatch($producerId, $metricName, $configItemId, $testDatasetId, $truthDatasetId);

if ($trendDao === false) {

/** @var Tracker_TrendGroupModel $trendGroupModel */
$trendGroupModel = MidasLoader::loadModel('Trendgroup', $this->moduleName);

Expand Down