Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit 771d220

Browse files
mgrauerStyleCIBot
mgrauer
authored andcommitted
Apply fixes from StyleCI
1 parent 2dc32c2 commit 771d220

File tree

13 files changed

+6
-16
lines changed

13 files changed

+6
-16
lines changed

core/controllers/ImportController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ private function _recursiveParseDirectory($path, $currentdir)
143143
}
144144

145145
if ($fileInfo->isDir()) { // we have a directory
146-
147146
// If the the directory actually doesn't exist at this point,
148147
// skip it.
149148
if (!file_exists($fileInfo->getPathName())) {

core/controllers/components/ApihelperComponent.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ public function setMetadata($item, $type, $element, $qualifier, $value, $revisio
224224
);
225225
foreach ($modules as $retval) {
226226
if ($retval['status'] === true) { // module has handled the event, so we don't have to
227-
228227
return;
229228
}
230229
}

core/controllers/components/DownloadBitstreamComponent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function download($bitstream, $offset = 0, $incrementDownload = false)
159159
*
160160
* @param string $key Environment variable name
161161
* @return string Environment variable setting
162-
* @link http://book.cakephp.org/view/1130/env
162+
* @see http://book.cakephp.org/view/1130/env
163163
*/
164164
function env($key)
165165
{

core/database/upgrade/3.2.6.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ private function _moveThumbnailToAssetstore($thumbnail)
8383

8484
$oldpath = BASE_PATH.'/'.$thumbnail;
8585
if (!file_exists($oldpath)) { //thumbnail file no longer exists, so we remove its reference
86-
8786
return;
8887
}
8988

core/models/base/ItemModelBase.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ public function copyItemPolicies($itemdao, $referenceItemdao, $feeddao = null)
143143
}
144144

145145
if ($feeddao != null && $feeddao instanceof FeedDao) {
146-
147146
/** @var FeedpolicygroupModel $FeedpolicygroupModel */
148147
$FeedpolicygroupModel = MidasLoader::loadModel('Feedpolicygroup');
149148
foreach ($groupPolicies as $key => $policy) {

core/tests/models/base/FeedModelTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ public function testCreateFeed()
7373
$itemFile = $this->loadData('Item', 'default');
7474
$feed = $this->Feed->createFeed($usersFile[0], MIDAS_FEED_CREATE_COMMUNITY, $communityFile[0]);
7575
$this->assertEquals(true, $feed->saved);
76-
$feed = $this->Feed->createFeed($usersFile [0], MIDAS_FEED_CREATE_FOLDER, $folderFile[0]);
76+
$feed = $this->Feed->createFeed($usersFile[0], MIDAS_FEED_CREATE_FOLDER, $folderFile[0]);
7777
$this->assertEquals(true, $feed->saved);
78-
$feed = $this->Feed->createFeed($usersFile [0], MIDAS_FEED_CREATE_ITEM, $itemFile[0]);
78+
$feed = $this->Feed->createFeed($usersFile[0], MIDAS_FEED_CREATE_ITEM, $itemFile[0]);
7979
$this->assertEquals(true, $feed->saved);
80-
$feed = $this->Feed->createFeed($usersFile [0], MIDAS_FEED_CREATE_USER, $usersFile[0]);
80+
$feed = $this->Feed->createFeed($usersFile[0], MIDAS_FEED_CREATE_USER, $usersFile[0]);
8181
$this->assertEquals(true, $feed->saved);
82-
$this->Feed->addCommunity($feed, $communityFile [0]);
82+
$this->Feed->addCommunity($feed, $communityFile[0]);
8383
$communities = $feed->getCommunities();
8484
if (($communities[0]->getKey() != $communityFile[0]->getKey())) {
8585
$this->fail('Unable to add dao');

modules/pvw/controllers/components/ParaviewComponent.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ private function _getNextOpenPort()
208208
}
209209
} elseif (!UtilityComponent::isPortListening($portEntry)
210210
) { // single port check
211-
212211
return $portEntry;
213212
}
214213
}

modules/pvw/models/pdo/InstanceModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getAll()
3131
$rows = $this->database->fetchAll($this->database->select()->setIntegrityCheck(false));
3232
$daos = array();
3333
foreach ($rows as $row) {
34-
$daos [] = $this->initDao('Instance', $row, $this->moduleName);
34+
$daos[] = $this->initDao('Instance', $row, $this->moduleName);
3535
}
3636

3737
return $daos;

modules/scheduler/models/pdo/JobModel.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public function getJobsToRun($limit = 1000)
7777
$minPriority = MIDAS_EVENT_PRIORITY_LOW;
7878
if (!empty($load)) {
7979
if ($load[0] > 80 || $load[1] > 80) { // don't run anything
80-
8180
return array();
8281
}
8382
$minPriority = MIDAS_EVENT_PRIORITY_HIGH;

modules/thumbnailcreator/database/upgrade/1.0.2.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ private function _moveThumbnailToAssetstore($thumbnail)
7575

7676
$oldpath = BASE_PATH.'/'.$thumbnail;
7777
if (!file_exists($oldpath)) { //thumbnail file no longer exists, so we remove its reference
78-
7978
return;
8079
}
8180

modules/tracker/controllers/ProducerController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ public function viewAction()
133133
'text' => $producerDao->getDisplayName(),
134134
'icon' => $this->view->baseUrl('core/public/images/icons/cog_go.png'),
135135
),
136-
137136
);
138137
$this->Component->Breadcrumb->setBreadcrumbHeader($breadcrumbs, $this->view);
139138
}

modules/tracker/models/base/ScalarModelBase.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ abstract public function getOtherScalarsFromSubmission($scalarDao);
8989
*/
9090
public function addToTrend($trendDao, $submissionDao, $value)
9191
{
92-
9392
/** @var Tracker_ScalarDao $scalarDao */
9493
$scalarDao = MidasLoader::newDao('ScalarDao', $this->moduleName);
9594

modules/tracker/models/base/TrendModelBase.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ public function createIfNeeded($producerId, $metricName, $configItemId, $testDat
134134
$trendDao = $this->getMatch($producerId, $metricName, $configItemId, $testDatasetId, $truthDatasetId);
135135

136136
if ($trendDao === false) {
137-
138137
/** @var Tracker_TrendGroupModel $trendGroupModel */
139138
$trendGroupModel = MidasLoader::loadModel('Trendgroup', $this->moduleName);
140139

0 commit comments

Comments
 (0)