Applied fixes from StyleCI

midasplatform · Aug 4, 2015 · 067197d · 067197d
1 parent d32faa6
commit 067197d
Show file tree

Hide file tree

Showing 43 changed files with 90 additions and 92 deletions.
diff --git a/core/ApiController.php b/core/ApiController.php
@@ -102,8 +102,7 @@ protected function _exceptionHandler(Exception $exception)
      * @param null|string $moduleName module from which to get the ApiComponent
      * @param bool $rpcStyle wrap data in RPC-style "data" and "msg" fields
      *
-     * {@example
-     * _genericAction(array('id' => 2), 'get', $apiFunctionArray) is called and
+     * {@example * _genericAction(array('id' => 2), 'get', $apiFunctionArray) is called and
      * $apiFunctionArray is $apiFunctions = array('default' => 'itemMove',
      *                                            'move' => 'itemMove',
      *                                            'duplicate' => 'itemDuplicate');

diff --git a/core/controllers/AdminController.php b/core/controllers/AdminController.php
@@ -249,9 +249,9 @@ public function indexAction()
             }
             $modulesList[$category][$k] = $module;
             if ($module->dbOk && $module->dependenciesExist) {
-                $countModules[$category]['visible']++;
+                ++$countModules[$category]['visible'];
             } else {
-                $countModules[$category]['hidden']++;
+                ++$countModules[$category]['hidden'];
             }
         }
 
@@ -396,7 +396,7 @@ public function serversidefilechooserAction()
         $files = array();
         if (strpos(strtolower(PHP_OS), 'win') === 0) {
             $files = array();
-            for ($c = 'A'; $c <= 'Z'; $c++) {
+            for ($c = 'A'; $c <= 'Z'; ++$c) {
                 if (is_dir($c.':')) {
                     $files[] = $c.':';
                 }

diff --git a/core/controllers/BrowseController.php b/core/controllers/BrowseController.php
@@ -343,7 +343,7 @@ public function getfolderscontentAction()
             $itemCount = count($items);
             if ($limit > 0 && $itemCount > $itemLimit) {
                 array_pop($items);
-                $itemCount--;
+                --$itemCount;
                 $showMoreLink = true;
             }
             $itemOffset += min($limit, $itemCount);

diff --git a/core/controllers/ImportController.php b/core/controllers/ImportController.php
@@ -93,7 +93,7 @@ private function _recursiveCountFiles($path)
             if ($fileInfo->isDir()) {
                 $initialcount += $this->_recursiveCountFiles($fileInfo->getPathName());
             } else {
-                $initialcount++;
+                ++$initialcount;
             }
         }
 
@@ -114,7 +114,7 @@ private function _checkStopImport()
     /** Increment the number of files processed and write the progress if needed */
     private function _incrementFileProcessed()
     {
-        $this->nfilesprocessed++;
+        ++$this->nfilesprocessed;
         $percent = ($this->nfilesprocessed / $this->ntotalfiles) * 100;
         $count = 2; // every 2%
         if ($percent % $count == 0) {

diff --git a/core/controllers/ItemController.php b/core/controllers/ItemController.php
@@ -181,7 +181,7 @@ public function viewAction()
                     unset($tmp[$key]);
                     continue;
                 }
-                $i++;
+                ++$i;
                 if ($i > 4) {
                     unset($tmp[$key]);
                 }

diff --git a/core/controllers/SearchController.php b/core/controllers/SearchController.php
@@ -199,8 +199,8 @@ public function liveAction()
             if (!isset($folderDao->count) || $folderDao->count == 1) {
                 $result['folderid'] = $folderDao->getFolderId();
             }
-            $id++;
-            $n++;
+            ++$id;
+            ++$n;
             $results[] = $result;
         }
 
@@ -224,8 +224,8 @@ public function liveAction()
             if (!isset($itemDao->count) || $itemDao->count == 1) {
                 $result['itemid'] = $itemDao->getItemId();
             }
-            $id++;
-            $n++;
+            ++$id;
+            ++$n;
             $results[] = $result;
         }
         // Groups
@@ -242,8 +242,8 @@ public function liveAction()
                 'groupid' => $groupDao->getKey(),
                 'category' => $this->t('Groups'),
             );
-            $id++;
-            $n++;
+            ++$id;
+            ++$n;
         }
 
         // Community
@@ -266,8 +266,8 @@ public function liveAction()
             if (!isset($communityDao->count) || $communityDao->count == 1) {
                 $result['communityid'] = $communityDao->getKey();
             }
-            $id++;
-            $n++;
+            ++$id;
+            ++$n;
             $results[] = $result;
         }
 
@@ -287,8 +287,8 @@ public function liveAction()
             if (!isset($userDao->count) || $userDao->count == 1) {
                 $result['userid'] = $userDao->getKey();
             }
-            $id++;
-            $n++;
+            ++$id;
+            ++$n;
             $results[] = $result;
         }
         // Other live search options

diff --git a/core/controllers/components/DateComponent.php b/core/controllers/components/DateComponent.php
@@ -61,7 +61,7 @@ public static function ago($timestamp, $onlyTime = false)
         $periods = array('second', 'minute', 'hour', 'day', 'week', 'month', 'year', 'decade');
         $periodsFr = array('seconde', 'minute', 'heure', 'jour', 'semaine', 'mois', 'annee', 'decades');
         $lengths = array('60', '60', '24', '7', '4.35', '12', '10');
-        for ($j = 0; $difference >= $lengths[$j]; $j++) {
+        for ($j = 0; $difference >= $lengths[$j]; ++$j) {
             $difference /= $lengths[$j];
         }
         $difference = round($difference);
@@ -106,7 +106,7 @@ public static function duration($timestamp)
         $periods = array('second', 'minute', 'hour', 'day', 'week', 'month', 'year', 'decade');
         $periodsFr = array('seconde', 'minute', 'heure', 'jour', 'semaine', 'mois', 'annee', 'decades');
         $lengths = array('60', '60', '24', '7', '4.35', '12', '10');
-        for ($j = 0; $difference >= $lengths[$j]; $j++) {
+        for ($j = 0; $difference >= $lengths[$j]; ++$j) {
             $difference /= $lengths[$j];
         }
         $difference = round($difference);

diff --git a/core/controllers/components/ExportComponent.php b/core/controllers/components/ExportComponent.php
@@ -79,7 +79,7 @@ public function exportBitstreams($userDao, $targetDir, $itemIds, $shouldSymLink)
         // Get items
         $revisions = array();
         if (!is_array($itemIds)) {
-            throw new Zend_Exception("Input parameter \$itemIds should be an array.");
+            throw new Zend_Exception('Input parameter $itemIds should be an array.');
         }
         if (!empty($itemIds)) {
             foreach ($itemIds as $itemId) {

diff --git a/core/controllers/components/PolicyComponent.php b/core/controllers/components/PolicyComponent.php
@@ -58,7 +58,7 @@ public function applyPoliciesRecursive(
             }
             if (!$this->Folder->policyCheck($subfolder, $user, MIDAS_POLICY_ADMIN)
             ) {
-                $results['failure']++;
+                ++$results['failure'];
                 continue;
             }
             // delete all existing policies on the subfolder
@@ -84,7 +84,7 @@ public function applyPoliciesRecursive(
                     $folderPolicyUser->getPolicy()
                 );
             }
-            $results['success']++;
+            ++$results['success'];
             $results = $this->applyPoliciesRecursive($subfolder, $user, $progress, $results);
         }
 
@@ -95,7 +95,7 @@ public function applyPoliciesRecursive(
                 $this->Progress->updateProgress($progress, $current, $message);
             }
             if (!$this->Item->policyCheck($item, $user, MIDAS_POLICY_ADMIN)) {
-                $results['failure']++;
+                ++$results['failure'];
                 continue;
             }
             // delete all existing policies on the item
@@ -121,7 +121,7 @@ public function applyPoliciesRecursive(
                     $folderPolicyUser->getPolicy()
                 );
             }
-            $results['success']++;
+            ++$results['success'];
         }
 
         return $results;

diff --git a/core/controllers/components/UtilityComponent.php b/core/controllers/components/UtilityComponent.php
@@ -106,16 +106,16 @@ public static function extractPathParams()
         $tokens = array();
         $i = 0;
         if ($request->getModuleName() != 'default') {
-            $i++;
+            ++$i;
         }
         if ($request->getControllerName() != 'index') {
-            $i++;
+            ++$i;
         }
         if ($request->getActionName() != 'index') {
-            $i++;
+            ++$i;
         }
         $max = count($allTokens);
-        for (; $i < $max; $i++) {
+        for (; $i < $max; ++$i) {
             $tokens[] = $allTokens[$i];
         }
 

diff --git a/core/models/base/CommunityModelBase.php b/core/models/base/CommunityModelBase.php
@@ -133,7 +133,7 @@ public function incrementViewCount($communityDao)
                 $user->viewedCommunities[$communityDao->getKey()] = true;
             }
         }
-        $communityDao->view++;
+        ++$communityDao->view;
         $this->save($communityDao);
     }
 

diff --git a/core/models/base/FolderModelBase.php b/core/models/base/FolderModelBase.php
@@ -208,7 +208,7 @@ public function incrementViewCount($folder)
                 $user->viewedFolder[$folder->getKey()] = true;
             }
         }
-        $folder->view++;
+        ++$folder->view;
         parent::save($folder);
     }
 

diff --git a/core/models/base/ItemModelBase.php b/core/models/base/ItemModelBase.php
@@ -388,7 +388,7 @@ public function incrementViewCount($itemdao)
                 $user->viewedItems[$itemdao->getKey()] = true;
             }
         }
-        $itemdao->view++;
+        ++$itemdao->view;
         parent::save($itemdao);
     }
 
@@ -398,7 +398,7 @@ public function incrementDownloadCount($itemdao)
         if (!$itemdao instanceof ItemDao) {
             throw new Zend_Exception('Error in param itemdao when incrementing download count.');
         }
-        $itemdao->download++;
+        ++$itemdao->download;
         parent::save($itemdao);
         Zend_Registry::get('notifier')->callback('CALLBACK_CORE_PLUS_ONE_DOWNLOAD', array('item' => $itemdao));
     }
@@ -537,7 +537,7 @@ public function countBitstreams($itemDao)
         if ($rev) {
             $bitstreams = $rev->getBitstreams();
             foreach ($bitstreams as $bitstream) {
-                $totalCount++;
+                ++$totalCount;
                 $totalSize += $bitstream->getSizebytes();
             }
         }
@@ -570,7 +570,7 @@ public function mergeItems($itemIds, $name, $userSessionDao, $progress = null)
                         ).' due to insufficient '.'permissions.'
                     );
                     if ($progress) {
-                        $current++;
+                        ++$current;
                         $message = 'Merging items: '.$current.' of '.$progress->getMaximum();
                         $progressModel->updateProgress($progress, $current, $message);
                     }
@@ -580,7 +580,7 @@ public function mergeItems($itemIds, $name, $userSessionDao, $progress = null)
                     __METHOD__.' User unable to merge item '.$item.' because it does not exist.'
                 );
                 if ($progress) {
-                    $current++;
+                    ++$current;
                     $message = 'Merging items: '.$current.' of '.$progress->getMaximum();
                     $progressModel->updateProgress($progress, $current, $message);
                 }
@@ -610,7 +610,7 @@ public function mergeItems($itemIds, $name, $userSessionDao, $progress = null)
                 $this->delete($item);
             }
             if ($progress) {
-                $current++;
+                ++$current;
                 $message = 'Merging items: '.$current.' of '.$progress->getMaximum();
                 $progressModel->updateProgress($progress, $current, $message);
             }

diff --git a/core/models/base/UserModelBase.php b/core/models/base/UserModelBase.php
@@ -244,7 +244,7 @@ public function incrementViewCount($userDao)
                 $user->viewedUsers[$userDao->getKey()] = true;
             }
         }
-        $userDao->view++;
+        ++$userDao->view;
         $this->save($userDao);
     }
 

diff --git a/core/models/pdo/AssetstoreModel.php b/core/models/pdo/AssetstoreModel.php
@@ -63,7 +63,7 @@ public function moveBitstreams($srcAssetstore, $dstAssetstore, $progressDao = nu
         foreach ($rows as $row) {
             $bitstream = $this->initDao('Bitstream', $row);
             if ($progressDao) {
-                $current++;
+                ++$current;
                 $message = $current.' / '.$progressDao->getMaximum().': Moving '.$bitstream->getName(
                     ).' ('.UtilityComponent::formatSize($bitstream->getSizebytes()).')';
                 $progressModel->updateProgress($progressDao, $current, $message);

diff --git a/core/models/pdo/BitstreamModel.php b/core/models/pdo/BitstreamModel.php
@@ -131,7 +131,7 @@ public function removeOrphans($progressDao = null)
         $itr = 0;
         foreach ($ids as $id) {
             if ($progressDao) {
-                $itr++;
+                ++$itr;
                 $message = 'Removing orphaned bitstreams ('.$itr.'/'.$max.')';
                 $this->Progress->updateProgress($progressDao, $itr, $message);
             }

diff --git a/core/models/pdo/FolderModel.php b/core/models/pdo/FolderModel.php
@@ -1286,7 +1286,7 @@ public function getFoldersFromSearch($search, $userDao, $limit = 14, $group = tr
                 $folder->score = $result['score'];
                 $results[] = $folder;
                 unset($folder);
-                $i++;
+                ++$i;
                 if ($i >= $limit) {
                     break;
                 }
@@ -1490,7 +1490,7 @@ public function removeOrphans($progressDao = null)
         $itr = 0;
         foreach ($ids as $id) {
             if ($progressDao) {
-                $itr++;
+                ++$itr;
                 $message = 'Removing orphaned folders ('.$itr.'/'.$max.')';
                 $this->Progress->updateProgress($progressDao, $itr, $message);
             }
@@ -1531,7 +1531,7 @@ public function removeOrphans($progressDao = null)
      */
     protected function _recomputeSubtree($folder, &$count, $max, $progressDao = null)
     {
-        $count++;
+        ++$count;
         if ($progressDao && $count % 10 == 0) { // only update progress every 10 folders
             $message = 'Rebuilding entire folder tree index ('.$count.'/'.$max.')';
             $this->Progress->updateProgress($progressDao, $count, $message);

diff --git a/core/models/pdo/ItemModel.php b/core/models/pdo/ItemModel.php
@@ -87,7 +87,7 @@ public function getItemsFromSearch($searchterm, $userDao, $limit = 14, $group =
                 $item->score = $result['score'];
                 $results[] = $item;
                 unset($item);
-                $i++;
+                ++$i;
                 if ($i >= $limit) {
                     break;
                 }
@@ -761,7 +761,7 @@ public function removeOrphans($progressDao = null)
         $itr = 0;
         foreach ($ids as $id) {
             if ($progressDao) {
-                $itr++;
+                ++$itr;
                 $message = 'Removing orphaned items ('.$itr.'/'.$max.')';
                 $this->Progress->updateProgress($progressDao, $itr, $message);
             }
@@ -823,7 +823,7 @@ public function updateItemName($name, $parent)
             if ($curRow == null) {
                 break;
             } else {
-                $count++;
+                ++$count;
                 $curName = $name.' ('.$count.')';
             }
         }

diff --git a/core/models/pdo/ItemRevisionModel.php b/core/models/pdo/ItemRevisionModel.php
@@ -264,7 +264,7 @@ public function removeOrphans($progressDao = null)
         $itr = 0;
         foreach ($ids as $id) {
             if ($progressDao) {
-                $itr++;
+                ++$itr;
                 $message = 'Removing orphaned revisions ('.$itr.'/'.$max.')';
                 $this->Progress->updateProgress($progressDao, $itr, $message);
             }

diff --git a/core/tests/models/base/ItemModelTest.php b/core/tests/models/base/ItemModelTest.php
@@ -215,7 +215,7 @@ public function testDuplicate()
         $this->assertTrue($rcount > 0);
         $this->assertEquals($rcount, count($newRevs));
 
-        for ($i = 0; $i < $rcount; $i++) {
+        for ($i = 0; $i < $rcount; ++$i) {
             $this->assertNotEquals($oldRevs[$i]->getKey(), $newRevs[$i]->getKey());
             $this->assertNotEquals($oldRevs[$i]->getUuid(), $newRevs[$i]->getUuid());
             $this->assertEquals($oldRevs[$i]->getDate(), $newRevs[$i]->getDate());
@@ -229,7 +229,7 @@ public function testDuplicate()
             $newBitstreams = $newRevs[$i]->getBitstreams();
             $bcount = count($oldBitstreams);
             $this->assertEquals($bcount, count($newBitstreams));
-            for ($b = 0; $b < $bcount; $b++) {
+            for ($b = 0; $b < $bcount; ++$b) {
                 $this->assertNotEquals($oldBitstreams[$b]->getKey(), $newBitstreams[$b]->getKey());
                 $this->assertNotEquals(
                     $oldBitstreams[$b]->getItemrevisionId(),