Merge branch 'master' of github.com:joomla-extensions/weblinks into m…

…ove_language

RoboFile.php

@@ -104,7 +104,7 @@ private function getExecutableExtension()
 	 * @param   array  $opts  Array of configuration options:
 	 *          - 'use-htaccess': renames and enable embedded Joomla .htaccess file
 	 *          - 'env': set a specific environment to get configuration from
-	 * 
+	 *
 	 * @return mixed
 	 */
 	public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
@@ -124,7 +124,7 @@ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
 			->arg('--steps')
 			->arg('--debug')
 			->arg('--fail-fast')
-			->arg('--env ' . $opts['env'])
+			->env($opts['env'])
 			->arg('tests/acceptance/install/')
 			->run()
 			->stopOnFail();
@@ -133,7 +133,7 @@ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
 			->arg('--steps')
 			->arg('--debug')
 			->arg('--fail-fast')
-			->arg('--env ' . $opts['env'])
+			->env($opts['env'])
 			->arg('tests/acceptance/administrator/')
 			->run()
 			->stopOnFail();
@@ -142,7 +142,7 @@ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
 			->arg('--steps')
 			->arg('--debug')
 			->arg('--fail-fast')
-			->arg('--env ' . $opts['env'])
+			->env($opts['env'])
 			->arg('tests/acceptance/frontend/')
 			->run()
 			->stopOnFail();
@@ -301,7 +301,7 @@ public function runChecker($tool = null)
 	 * Creates a testing Joomla site for running the tests (use it before run:test)
 	 *
 	 * @param   bool  $use_htaccess  (1/0) Rename and enable embedded Joomla .htaccess file
-	 * 
+	 *
 	 * @return  bool
 	 */
 	public function createTestingSite($use_htaccess = false)
@@ -492,7 +492,7 @@ private function getComposer()
 	 *
 	 * @param   string  $host  Web host of the remote server.
 	 * @param   string  $port  Server port.
-	 * 
+	 *
 	 * @return  void
 	 */
 	public function killSelenium($host = 'localhost', $port = '4444')
@@ -503,7 +503,7 @@ public function killSelenium($host = 'localhost', $port = '4444')
 
 	/**
 	 * Run the phpmd tool
-	 * 
+	 *
 	 * @return  void
 	 */
 	private function runPhpmd()
@@ -513,7 +513,7 @@ private function runPhpmd()
 
 	/**
 	 * Run the phpcs tool
-	 * 
+	 *
 	 * @return  void
 	 */
 	private function runPhpcs()
@@ -523,7 +523,7 @@ private function runPhpcs()
 
 	/**
 	 * Run the phpcpd tool
-	 * 
+	 *
 	 * @return  void
 	 */
 	private function runPhpcpd()
@@ -550,7 +550,7 @@ public function build($params = ['dev' => false])
 
 	/**
 	 * Executes all unit tests
-	 * 
+	 *
 	 * @return  void
 	 */
 	public function runUnit()

composer.json

@@ -13,9 +13,9 @@
     "require-dev": {
         "codeception/codeception": "^2.2",
         "joomla-projects/joomla-browser": "v3.6.5.1",
-        "composition/robo": "~1",
+        "consolidation/robo": "^1.0.0",
         "joomla-projects/robo": "~0",
-        "joomla-projects/selenium-server-standalone": "v3.0.1.2",
+        "joomla-projects/selenium-server-standalone": "v3.1.0",
         "fzaninotto/faker": "^1.6",
         "joomla-projects/jorobo": "~0.6",
         "Behat/Gherkin": "^4.4.1"

src/administrator/language/en-GB/en-GB.com_weblinks.ini

@@ -81,7 +81,7 @@ COM_WEBLINKS_FIELD_WIDTH_LABEL="Width"
 COM_WEBLINKS_FIELDSET_IMAGES="Images"
 COM_WEBLINKS_FIELDSET_OPTIONS="Options"
 COM_WEBLINKS_FILTER_CATEGORY="Filter Category"
-COM_WEBLINKS_FILTER_SEARCH_DESC="Search in web link title and alias. Prefix with id: to search for an web link ID."
+COM_WEBLINKS_FILTER_SEARCH_DESC="Search in web link title and alias. Prefix with ID: to search for an web link ID."
 COM_WEBLINKS_FILTER_SEARCH_LABEL="Search Web Links"
 COM_WEBLINKS_FILTER_STATE="Filter State"
 COM_WEBLINKS_FLOAT_DESC="Controls placement of the image."