Skip to content

fix Scrutinizer bugs in Makefile #25

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fix Scrutinizer bugs in Makefile #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf97a19
fixing bugs from scrutinizer in Makefile
winmillwill Feb 6, 2015
f98d974
fix mistake about getMakeInfo guarantees
winmillwill Feb 6, 2015
340f2e4
check that makefile projects is an array
winmillwill Feb 6, 2015
d3cfd09
fixing bugs from scrutinizer in Makefile
winmillwill Feb 6, 2015
327f50e
fix mistake about getMakeInfo guarantees
winmillwill Feb 6, 2015
a93bd6e
check that makefile projects is an array
winmillwill Feb 6, 2015
4c48f85
Merge branch 'fix-makefile-scrutinizer' of github.com:drupal-composer…
winmillwill Feb 6, 2015
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
22 changes: 14 additions & 8 deletions src/Makefile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
class Makefile
{

/**
* @var array
*/
private $makeInfo;

/**
* @param string $data Content from makefile.
*/
Expand All @@ -21,7 +26,7 @@ public function __construct($data)
*
* @param string[] $path Array of keys to retrieve value from.
*
* @return array|bool
* @return string|array|false
*/
public function getMakeInfo($path = array())
{
Expand All @@ -45,8 +50,10 @@ public function getMakeInfo($path = array())
*/
public function getDrupalProjects()
{
$projects = $this->getMakeInfo('projects');
$projects = is_array($projects) ? $projects : [];
$drupalProjects = [];
foreach ($this->getMakeInfo('projects') ?: [] as $projectName => $project) {
foreach ($projects as $projectName => $project) {
$url = $this->getMakeInfo(
['projects', $projectName, 'download', 'url']
);
Expand Down Expand Up @@ -148,23 +155,22 @@ public function getConstraint($project)
*
* @param array $path Nested keys to retrieve value from.
*
* @return bool|AbstractVersion|string
* @return false|string
*
* @todo Specify return type
*/
private function getVersionFromPath(array $path)
{
if ($versionString = $this->getMakeInfo($path)) {
return $this->makeVersion($versionString, $path[1]);
if (is_string($version = $this->getMakeInfo($path))) {
return $this->makeVersion($version, $path[1]);
}

return false;
}

/**
* Creates a SemVer string
* @param string $versionString
* @param string $name
* @return AbstractVersion|string
* @return string|null
*
* @todo: Better description.
* @todo Specify return type
Expand Down
5 changes: 3 additions & 2 deletions src/VersionFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
class VersionFactory
{
/**
* Creates a version object from version information.
* Creates a version object from version information. Returns null if the
* given inforation is nonsense.
*
* @param string|array $versionInfo Either a version string or an array of
* core version and rest of version string.
* @param bool $isCore Indicator if version is core.
*
* @return AbstractVersion
* @return VersionInterface|null
*
* @todo Replace array syntax with constraint?
*/
Expand Down