diff --git a/module/VuFind/src/VuFind/Account/Manager.php b/module/VuFind/src/VuFind/Account/Manager.php index 4eeb3e9d63c2ecba3c24c3fc16058e3702a23b42..68b93f4376eeac17db7edcc723f0f2c038035456 100644 --- a/module/VuFind/src/VuFind/Account/Manager.php +++ b/module/VuFind/src/VuFind/Account/Manager.php @@ -128,7 +128,7 @@ class Manager } try { $catalog = VF_Connection_Manager::connectToCatalog(); - } catch (Exception $e) { + } catch (\Exception $e) { // If we can't connect to the catalog, assume that no special // ILS-related login settings exist -- this prevents ILS errors // from triggering an exception early in initialization before @@ -247,7 +247,7 @@ class Manager } catch (VF_Exception_Auth $e) { // Pass authentication exceptions through unmodified throw $e; - } catch (Exception $e) { + } catch (\Exception $e) { // Catch other exceptions and treat them as technical difficulties throw new VF_Exception_Auth('authentication_error_technical'); } diff --git a/module/VuFind/src/VuFind/Connection/Solr.php b/module/VuFind/src/VuFind/Connection/Solr.php index e83860d0511a1fd1e5c9f3135214ffabe42f5daf..7abd24008846d343e248f40f4c5fbb69c2579988 100644 --- a/module/VuFind/src/VuFind/Connection/Solr.php +++ b/module/VuFind/src/VuFind/Connection/Solr.php @@ -1695,7 +1695,7 @@ class Solr $info[$data['terms']['id'][$i]] = $data['terms']['id'][$i+1]; } return $info; - } catch(Exception $e) { + } catch(\Exception $e) { return $result; } } diff --git a/module/VuFind/src/VuFind/Search/Base/Results.php b/module/VuFind/src/VuFind/Search/Base/Results.php index 8927e5563292f1616a965d88b46597e6346452d7..bc839e877729081a8e51aaa7fba991f35745f77b 100644 --- a/module/VuFind/src/VuFind/Search/Base/Results.php +++ b/module/VuFind/src/VuFind/Search/Base/Results.php @@ -174,7 +174,7 @@ abstract class Results foreach ($ids as $id) { try { $retVal[] = static::getRecord($id); - } catch (Exception $e) { + } catch (\Exception $e) { // Just omit missing records from the return array; calling code // in the VF_Record::loadBatch() method will deal with this. } diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/AuthorNotes.php b/module/VuFind/src/VuFind/Theme/Root/Helper/AuthorNotes.php index 7867a7173450820d1fdef3262b8f991d0e3095e4..92d2953b250dfa24a60e33620c0c7d58f5190f4d 100644 --- a/module/VuFind/src/VuFind/Theme/Root/Helper/AuthorNotes.php +++ b/module/VuFind/src/VuFind/Theme/Root/Helper/AuthorNotes.php @@ -73,7 +73,7 @@ class VuFind_Theme_Root_Helper_AuthorNotes extends Zend_View_Helper_Abstract if (empty($results[$provider])) { unset($results[$provider]); } - } catch (Exception $e) { + } catch (\Exception $e) { // Ignore exceptions: unset($results[$provider]); } diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Citation.php b/module/VuFind/src/VuFind/Theme/Root/Helper/Citation.php index a3a9dd8a80e70111b205c938d65548ba8697bd24..79396f565e894204a0ed0517a26b9974e9627c3b 100644 --- a/module/VuFind/src/VuFind/Theme/Root/Helper/Citation.php +++ b/module/VuFind/src/VuFind/Theme/Root/Helper/Citation.php @@ -685,7 +685,7 @@ class VuFind_Theme_Root_Helper_Citation extends Zend_View_Helper_Abstract return $converter->convertFromDisplayDate( 'Y', $this->details['pubDate'] ); - } catch (Exception $e) { + } catch (\Exception $e) { // Ignore date errors -- no point in dying here: return false; } diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Excerpt.php b/module/VuFind/src/VuFind/Theme/Root/Helper/Excerpt.php index fa2f6c939cc91c8b49c926a7a2c20629e2b62d05..dc8f9fbd81dcbe89f601d01a52351d4d2ad6deaa 100644 --- a/module/VuFind/src/VuFind/Theme/Root/Helper/Excerpt.php +++ b/module/VuFind/src/VuFind/Theme/Root/Helper/Excerpt.php @@ -73,7 +73,7 @@ class VuFind_Theme_Root_Helper_Excerpt extends Zend_View_Helper_Abstract if (empty($results[$provider])) { unset($results[$provider]); } - } catch (Exception $e) { + } catch (\Exception $e) { // Ignore exceptions: unset($results[$provider]); } diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/Reviews.php b/module/VuFind/src/VuFind/Theme/Root/Helper/Reviews.php index 6790567b893230cd2d2ebf6c1e38b3ca0354e871..0448c8b4d549840b2a67f4177520707795362046 100644 --- a/module/VuFind/src/VuFind/Theme/Root/Helper/Reviews.php +++ b/module/VuFind/src/VuFind/Theme/Root/Helper/Reviews.php @@ -73,7 +73,7 @@ class VuFind_Theme_Root_Helper_Reviews extends Zend_View_Helper_Abstract if (empty($results[$provider])) { unset($results[$provider]); } - } catch (Exception $e) { + } catch (\Exception $e) { // Ignore exceptions: unset($results[$provider]); } @@ -218,7 +218,7 @@ class VuFind_Theme_Root_Helper_Reviews extends Zend_View_Helper_Abstract ? $this->config->Content->amazonassociate : null ); $data = $amazon->itemLookup($this->getIsbn10(), $params); - } catch (Exception $e) { + } catch (\Exception $e) { // Something went wrong? Just return empty list. return array(); } diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/VideoClips.php b/module/VuFind/src/VuFind/Theme/Root/Helper/VideoClips.php index 7cbd0f617d889f5e47c8fcbf588c9b42d562a470..1ff5540652c04d78eddd396f610803546a26029b 100644 --- a/module/VuFind/src/VuFind/Theme/Root/Helper/VideoClips.php +++ b/module/VuFind/src/VuFind/Theme/Root/Helper/VideoClips.php @@ -73,7 +73,7 @@ class VuFind_Theme_Root_Helper_VideoClips extends Zend_View_Helper_Abstract if (empty($results[$provider])) { unset($results[$provider]); } - } catch (Exception $e) { + } catch (\Exception $e) { // Ignore exceptions: unset($results[$provider]); }