From 8072e5833d8a857f556298b2515b9b4056a90abb Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 31 Mar 2017 22:22:16 +0200 Subject: [PATCH 1/3] catch exeptions in geLanguages --- .../com_installer/models/languages.php | 21 +++++++++++++++---- .../language/en-GB/en-GB.com_installer.ini | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/administrator/components/com_installer/models/languages.php b/administrator/components/com_installer/models/languages.php index d395a73db3f17..97e4e3b54399c 100644 --- a/administrator/components/com_installer/models/languages.php +++ b/administrator/components/com_installer/models/languages.php @@ -114,13 +114,26 @@ protected function getLanguages() $updateSite = $this->getUpdateSite(); $jhttp = new JHttp; - $response = $jhttp->get($updateSite); - $updateSiteXML = simplexml_load_string($response->body); + try + { + $response = $jhttp->get($updateSite); + } + catch (RuntimeException $e) + { + $response = null; + } - $languages = array(); + if ($response === null || $response->code !== 200) + { + JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_MSG_WARNING_NO_LANGUAGE_UPDATESERVER_FOUND'), 'warning'); - $search = strtolower($this->getState('filter.search')); + return; + } + + $updateSiteXML = simplexml_load_string($response->body); + $languages = array(); + $search = strtolower($this->getState('filter.search')); foreach ($updateSiteXML->extension as $extension) { diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini index 557aa1de0d80d..451fa732e1b8a 100644 --- a/administrator/language/en-GB/en-GB.com_installer.ini +++ b/administrator/language/en-GB/en-GB.com_installer.ini @@ -154,6 +154,7 @@ COM_INSTALLER_MSG_UPDATESITES_REBUILD_WARNING="Update sites have been rebuilt. N COM_INSTALLER_MSG_UPDATESITES_REBUILD_SUCCESS="Update sites have been rebuilt from manifest files." COM_INSTALLER_MSG_WARNINGFURTHERINFO="Further information on warnings" COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information on warnings, see the Joomla! Documentation Site." +COM_INSTALLER_MSG_WARNING_NO_LANGUAGE_UPDATESERVER_FOUND="The Updatesite for the core languages was not found so we can\'t offer the backend install. Please install the languages manually." COM_INSTALLER_MSG_WARNINGS_FILEUPLOADISDISABLEDDESC="File uploads are required to upload extensions into the installer." COM_INSTALLER_MSG_WARNINGS_FILEUPLOADSDISABLED="File uploads disabled." COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The Joomla temporary folder is not set." From dd418c302901e0e1e3fcb3fe0bf0bed20171c07c Mon Sep 17 00:00:00 2001 From: zero-24 Date: Fri, 31 Mar 2017 22:23:31 +0200 Subject: [PATCH 2/3] Revert "catch exeptions in geLanguages" This reverts commit 8072e5833d8a857f556298b2515b9b4056a90abb. --- .../com_installer/models/languages.php | 21 ++++--------------- .../language/en-GB/en-GB.com_installer.ini | 1 - 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/administrator/components/com_installer/models/languages.php b/administrator/components/com_installer/models/languages.php index 97e4e3b54399c..d395a73db3f17 100644 --- a/administrator/components/com_installer/models/languages.php +++ b/administrator/components/com_installer/models/languages.php @@ -114,26 +114,13 @@ protected function getLanguages() $updateSite = $this->getUpdateSite(); $jhttp = new JHttp; + $response = $jhttp->get($updateSite); - try - { - $response = $jhttp->get($updateSite); - } - catch (RuntimeException $e) - { - $response = null; - } + $updateSiteXML = simplexml_load_string($response->body); - if ($response === null || $response->code !== 200) - { - JFactory::getApplication()->enqueueMessage(JText::_('COM_INSTALLER_MSG_WARNING_NO_LANGUAGE_UPDATESERVER_FOUND'), 'warning'); + $languages = array(); - return; - } - - $updateSiteXML = simplexml_load_string($response->body); - $languages = array(); - $search = strtolower($this->getState('filter.search')); + $search = strtolower($this->getState('filter.search')); foreach ($updateSiteXML->extension as $extension) { diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini index 451fa732e1b8a..557aa1de0d80d 100644 --- a/administrator/language/en-GB/en-GB.com_installer.ini +++ b/administrator/language/en-GB/en-GB.com_installer.ini @@ -154,7 +154,6 @@ COM_INSTALLER_MSG_UPDATESITES_REBUILD_WARNING="Update sites have been rebuilt. N COM_INSTALLER_MSG_UPDATESITES_REBUILD_SUCCESS="Update sites have been rebuilt from manifest files." COM_INSTALLER_MSG_WARNINGFURTHERINFO="Further information on warnings" COM_INSTALLER_MSG_WARNINGFURTHERINFODESC="For more information on warnings, see the Joomla! Documentation Site." -COM_INSTALLER_MSG_WARNING_NO_LANGUAGE_UPDATESERVER_FOUND="The Updatesite for the core languages was not found so we can\'t offer the backend install. Please install the languages manually." COM_INSTALLER_MSG_WARNINGS_FILEUPLOADISDISABLEDDESC="File uploads are required to upload extensions into the installer." COM_INSTALLER_MSG_WARNINGS_FILEUPLOADSDISABLED="File uploads disabled." COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The Joomla temporary folder is not set." From 5c6f5f8482ad8154c0e3808ef579c2e78efb44ad Mon Sep 17 00:00:00 2001 From: zero-24 Date: Sun, 2 Apr 2017 12:50:11 +0200 Subject: [PATCH 3/3] fix tests https://travis-ci.org/joomla/joomla-cms/jobs/217739385 --- tests/unit/suites/libraries/cms/toolbar/JToolbarButtonTest.php | 2 +- .../libraries/cms/toolbar/button/JToolbarButtonConfirmTest.php | 2 +- .../libraries/cms/toolbar/button/JToolbarButtonLinkTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/suites/libraries/cms/toolbar/JToolbarButtonTest.php b/tests/unit/suites/libraries/cms/toolbar/JToolbarButtonTest.php index 8de6ed83b1c82..c68bc65eb1a54 100644 --- a/tests/unit/suites/libraries/cms/toolbar/JToolbarButtonTest.php +++ b/tests/unit/suites/libraries/cms/toolbar/JToolbarButtonTest.php @@ -125,7 +125,7 @@ public function testRender() $expected = "
\n" . "\t\n" . "
\n"; diff --git a/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonConfirmTest.php b/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonConfirmTest.php index cef861b3d1b0e..de7688dd5583c 100644 --- a/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonConfirmTest.php +++ b/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonConfirmTest.php @@ -93,7 +93,7 @@ protected function tearDown() public function testFetchButton() { $html = "\n"; $this->assertEquals( diff --git a/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonLinkTest.php b/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonLinkTest.php index b9353f4d9a16d..0723d885d7544 100644 --- a/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonLinkTest.php +++ b/tests/unit/suites/libraries/cms/toolbar/button/JToolbarButtonLinkTest.php @@ -84,7 +84,7 @@ public function testFetchButton() $this->assertRegExp( '#\s*#', $this->object->fetchButton('Link', $name, $text, $url) );