Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Support for Joomla5 builds #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Support for Joomla5 builds #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/CiviDistManagerBundle/Controller/CheckController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ protected function getLatestStable() {
self::STABLE_DOWNLOAD_URL, $rev, $rev),
'Joomla' => sprintf('%s/%s/civicrm-%s-joomla.zip',
self::STABLE_DOWNLOAD_URL, $rev, $rev),
'Joomla5' => sprintf('%s/%s/civicrm-%s-joomla5.zip',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the changes in civicrm/civicrm-core#31325 this become ... '-joomla5bc.zip'

self::STABLE_DOWNLOAD_URL, $rev, $rev),
// 'Joomla-Alt' => 'https://download.civicrm.org/civicrm-4.7.12-joomla-alt.zip',
'L10n' => sprintf('%s/%s/civicrm-%s-l10n.tar.gz',
self::STABLE_DOWNLOAD_URL, $rev, $rev),
Expand Down
3 changes: 2 additions & 1 deletion src/CiviDistManagerBundle/RevDocRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public function createRevDocs() {
* Ex: 'Drupal' or 'Drupal6'.
*/
protected function getTarName($file) {
if (!preg_match(';^civicrm-(.*)-(backdrop|drupal|drupal6|joomla|joomla-alt|standalone|starterkit|wordpress|wporg|l10n)(-[0-9]+)?\.(zip|tar.gz|tgz)$;i', $file['basename'], $matches)) {
if (!preg_match(';^civicrm-(.*)-(backdrop|drupal|drupal6|joomla|joomla5|joomla-alt|standalone|starterkit|wordpress|wporg|l10n)(-[0-9]+)?\.(zip|tar.gz|tgz)$;i', $file['basename'], $matches)) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

joomla5 -> joomla5bc

return NULL;
}
$cms = $matches[2];
Expand All @@ -155,6 +155,7 @@ protected function getTarName($file) {
'drupal' => 'Drupal',
'drupal6' => 'Drupal6',
'joomla' => 'Joomla',
'joomla5' => 'Joomla5',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'joomla5bc' -> 'Joomla5bc'

'joomla-alt' => 'JoomlaAlt',
'standalone' => 'Standalone',
'starterkit' => 'StarterKit',
Expand Down
1 change: 1 addition & 0 deletions src/CiviDistManagerBundle/Tests/Controller/CheckControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public function getDownloadExamples() {
$cases[7] = array('civicrm-RC-wordpress.zip', ';/civicrm-(\d|\.|alpha|beta)+-wordpress-?\d*.zip;');
$cases[8] = array('civicrm-RC-joomla.zip', ';/civicrm-(\d|\.|alpha|beta)+-joomla-?\d*.zip;');
$cases[9] = array('civicrm-RC-backdrop.tar.gz', ';/civicrm-(\d|\.|alpha|beta)+-backdrop-\d*.tar.gz;');
$cases[10] = array('civicrm-RC-joomla5.zip', ';/civicrm-(\d|\.|alpha|beta)+-joomla5-?\d*.zip;');
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

joomla5 -> joomla5bc

// $cases[10] = array('civicrm-46NIGHTLY-drupal.tar.gz', ';/civicrm-build/4.6/civicrm-[\d\.]+-drupal-\d+.tar.gz;');

return $cases;
Expand Down