joomla/patchtester
33
0
Fork 0
mirror of https://github.com/joomla-extensions/patchtester.git synced 2025-01-10 17:24:39 +00:00
Code Issues Releases Activity

Merge pull request #170 from zero-24/supportnoncmslikestructurs2

Browse Source 
Support non CMS like Repo Struktures
This commit is contained in:
Michael Babker 2016-07-31 11:14:01 -05:00 committed by GitHub
commit 2d03b2ecde
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
administrator/components/com_patchtester/PatchTester/Model/PullModel.php
View File

@ -26,7 +26,13 @@ class PullModel extends \JModelDatabase
* @var array * @var array
* @since 2.0 * @since 2.0
*/ */
protected $nonProductionFolders = array('build', 'docs', 'installation', 'tests', '.github'); protected $nonProductionFolders = array(
'build',
'docs',
'installation',
'tests',
'.github',
);
/** /**
* Array containing non-production files * Array containing non-production files
@ -44,6 +50,14 @@ class PullModel extends \JModelDatabase
'phpunit.xml.dist', 'phpunit.xml.dist',
'robots.txt.dist', 'robots.txt.dist',
'travisci-phpunit.xml', 'travisci-phpunit.xml',
'LICENSE',
'RoboFile.dist.ini',
'RoboFile.php',
'codeception.yml',
'jorobo.dist.ini',
'manifest.xml',
'crowdin.yaml',
'travis-lang-update.sh',
); );
/** /**
@ -80,10 +94,21 @@ class PullModel extends \JModelDatabase
} }
} }
// Sometimes the repo filename is not the production file name
$prodFileName = $file->filename;
$filePath = explode('/', $prodFileName);
// Remove the `src` here to match the CMS paths if needed
if ($filePath[0] === 'src')
{
$prodFileName = str_replace('src/', '', $prodFileName);
}
$parsedFiles[] = (object) array( $parsedFiles[] = (object) array(
'action' => $file->status, 'action' => $file->status,
'filename' => $file->filename, 'filename' => $prodFileName,
'fileurl' => $file->contents_url, 'repofilename' => $file->filename,
'fileurl' => $file->contents_url,
); );
} }
@ -178,7 +203,7 @@ class PullModel extends \JModelDatabase
try try
{ {
$contentsResponse = $github->getFileContents( $contentsResponse = $github->getFileContents(
$pull->head->user->login, $this->getState()->get('github_repo'), $file->filename, urlencode($pull->head->ref) $pull->head->user->login, $this->getState()->get('github_repo'), $file->repofilename, urlencode($pull->head->ref)
); );
$contents = json_decode($contentsResponse->body); $contents = json_decode($contentsResponse->body);

1
administrator/components/com_patchtester/config.xml
View File

@ -18,6 +18,7 @@
<option value="joomla:joomla-cms">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_JOOMLA_CMS</option> <option value="joomla:joomla-cms">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_JOOMLA_CMS</option>
<option value="joomla-extensions:patchtester">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_PATCHTESTER</option> <option value="joomla-extensions:patchtester">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_PATCHTESTER</option>
<option value="joomla-extensions:install-from-web-client">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_INSTALL_FROM_WEB</option> <option value="joomla-extensions:install-from-web-client">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_INSTALL_FROM_WEB</option>
<option value="joomla-extensions:weblinks">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_WEBLINKS</option>
<option value="custom">COM_PATCHTESTER_FIELD_REPOSITORY_CUSTOM</option> <option value="custom">COM_PATCHTESTER_FIELD_REPOSITORY_CUSTOM</option>
</field> </field>

1
administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
View File

@ -53,6 +53,7 @@ COM_PATCHTESTER_FIELD_REPOSITORY_LABEL="GitHub Repository"
COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_JOOMLA_CMS="Joomla! CMS" COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_JOOMLA_CMS="Joomla! CMS"
COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_PATCHTESTER="Joomla! Patch Tester Component" COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_PATCHTESTER="Joomla! Patch Tester Component"
COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_INSTALL_FROM_WEB="Joomla! Install From Web Plugin" COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_INSTALL_FROM_WEB="Joomla! Install From Web Plugin"
COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_WEBLINKS="Joomla! Weblinks Package"
COM_PATCHTESTER_FIELD_REPOSITORY_CUSTOM="Custom" COM_PATCHTESTER_FIELD_REPOSITORY_CUSTOM="Custom"
COM_PATCHTESTER_FIELDSET_REPOSITORIES_DESC="Configuration Values for GitHub Repository" COM_PATCHTESTER_FIELDSET_REPOSITORIES_DESC="Configuration Values for GitHub Repository"
COM_PATCHTESTER_FIELDSET_REPOSITORIES_LABEL="GitHub Repository" COM_PATCHTESTER_FIELDSET_REPOSITORIES_LABEL="GitHub Repository"