Skip to content

Commit

Permalink
Merge branch '4.0-dev' into cpanel-ajax
Browse files Browse the repository at this point in the history
  • Loading branch information
infograf768 committed Mar 11, 2019
2 parents a1b150b + d8c082f commit 52fb2cb
Show file tree
Hide file tree
Showing 39 changed files with 7,797 additions and 786 deletions.
3 changes: 1 addition & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ install:
- appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
- cd C:\projects\joomla-cms
- appveyor-retry composer install --no-progress --profile
- appveyor-retry composer update joomla/test-unit --no-progress --profile
before_test:
# Database setup for MySQL via PowerShell tools
- >
Expand All @@ -113,4 +112,4 @@ before_test:

test_script:
- cd C:\projects\joomla-cms
- libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
- libraries/vendor/bin/phpunit
8 changes: 3 additions & 5 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ pipeline:
image: joomlaprojects/docker-tools:develop
commands:
- composer install --no-progress --no-suggest
# needed for unit testing
- composer update joomla/test-unit --no-progress --no-suggest
# needed for system testing
- composer update joomla/test-system --no-progress --no-suggest
- composer update joomla/test-api --no-progress --no-suggest
Expand All @@ -45,19 +43,19 @@ pipeline:
group: unit
image: joomlaprojects/docker-php70:develop
commands:
- ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
- ./libraries/vendor/bin/phpunit

php71-unit:
group: unit
image: joomlaprojects/docker-php71:develop
commands:
- ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
- ./libraries/vendor/bin/phpunit

php72-unit:
group: unit
image: joomlaprojects/docker-php72:develop
commands:
- ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
- ./libraries/vendor/bin/phpunit

javascript-cs:
image: joomlaprojects/docker-systemtests:develop
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ before_script:
- composer install --ignore-platform-reqs

script:
- libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
- libraries/vendor/bin/phpunit

branches:
except:
Expand Down
6 changes: 5 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
"Joomla\\CMS\\": "libraries/src/"
}
},
"autoload-dev": {
"psr-4": {
"Joomla\\Tests\\": "tests"
}
},
"require": {
"php": ">=7.0",
"joomla/application": "~2.0@dev",
Expand Down Expand Up @@ -101,7 +106,6 @@
"joomla-projects/joomla-browser": "~4.0@dev",
"joomla-projects/robo-joomla": "dev-develop",
"joomla/test-system": "dev-4.0-dev",
"joomla/test-unit": "dev-4.0-dev",
"joomla/test-api": "dev-4.0-dev"
}
}
12 changes: 12 additions & 0 deletions libraries/src/Feed/FeedFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,18 @@ public function registerParser($tagName, $className, $overwrite = false)
return $this;
}

/**
* Method to get the registered Parsers
*
* @return array
*
* @since 4.0
*/
public function getParsers()
{
return $this->parsers;
}

/**
* Method to return a new JFeedParser object based on the registered parsers and a given type.
*
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Mail/Mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ protected function add($recipient, $name = '', $method = 'addAddress')
$recipientName = MailHelper::cleanLine($recipientName);

// Check for boolean false return if exception handling is disabled
if (call_user_func('parent' . $method, $recipientEmail, $recipientName) === false)
if (call_user_func('parent::' . $method, $recipientEmail, $recipientName) === false)
{
return false;
}
Expand Down

0 comments on commit 52fb2cb

Please sign in to comment.