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

Fix code smells #94

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

Fix code smells #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3694e7a
Change implicit return of null to explicit.
pondermatic Nov 12, 2017
55be839
Fix method calls with mismatched number of parameters.
pondermatic Nov 12, 2017
4db0107
Fix JWS->setPayload() calls with mismatched number of parameters.
pondermatic Nov 12, 2017
889dada
Change PHPUnit_Framework_TestCase to PHPUnit\Framework\TestCase.
pondermatic Nov 13, 2017
a916e3d
Change PHPUnit version.
pondermatic Nov 13, 2017
f203ab3
Update "too few arguments" tests for PHP 7.1.
pondermatic Nov 13, 2017
ddd2f0a
Fix HHVM array to string issue.
pondermatic Nov 13, 2017
83327a3
Merge branch 'PHPUnit' into code_smell
pondermatic Nov 13, 2017
cc09e74
Revert "Merge branch 'PHPUnit' into code_smell"
pondermatic Nov 19, 2017
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/Agent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ public function getMbox_sha1sum() {
if (isset($this->mbox)) {
return sha1($this->mbox);
}

return null;
}
public function setOpenid($value) { $this->openid = $value; return $this; }
public function getOpenid() { return $this->openid; }
Expand Down
4 changes: 1 addition & 3 deletions src/Map.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ public function __construct() {
}

public function asVersion($version = null) {
if (! $this->isEmpty()) {
return $this->_map;
}
return $this->isEmpty() ? null : $this->_map;
}

public function set($code, $value) {
Expand Down
2 changes: 1 addition & 1 deletion src/RemoteLRS.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ function ($errno, $errstr, $errfile, $errline, array $errcontext) {
$metadata = stream_get_meta_data($fp);
$content = stream_get_contents($fp);

$response = $this->_parseMetadata($metadata, $options);
$response = $this->_parseMetadata($metadata);

//
// keep a copy of the raw content, the methods expecting
Expand Down
2 changes: 1 addition & 1 deletion src/Statement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public function sign($privateKeyFile, $privateKeyPass, $options = array()) {
}
$jws = new JWS($jwsHeader);

$jws->setPayload($serialization, false);
$jws->setPayload($serialization);
$jws->sign($privateKey);

$attachment = array(
Expand Down
8 changes: 4 additions & 4 deletions tests/StatementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ public function testVerifyInvalidX5cErrorToException() {
'x5c' => ['notAValidCertificate']
]
);
$content->setPayload(['prop' => 'val'], false);
$content->setPayload(['prop' => 'val']);
$content->sign(openssl_pkey_get_private('file://' . $GLOBALS['KEYs']['private'], $GLOBALS['KEYs']['password']));

$obj = new Statement(
Expand Down Expand Up @@ -833,7 +833,7 @@ public function testVerifyInvalidX5cNoError() {
'x5c' => ['notAValidCertificate']
]
);
$content->setPayload(['prop' => 'val'], false);
$content->setPayload(['prop' => 'val']);
$content->sign(openssl_pkey_get_private('file://' . $GLOBALS['KEYs']['private'], $GLOBALS['KEYs']['password']));

$obj = new Statement(
Expand Down Expand Up @@ -865,7 +865,7 @@ public function testVerifyNoPubKey() {
'alg' => 'RS256'
]
);
$content->setPayload(['prop' => 'val'], false);
$content->setPayload(['prop' => 'val']);
$content->sign(openssl_pkey_get_private('file://' . $GLOBALS['KEYs']['private'], $GLOBALS['KEYs']['password']));

$obj = new Statement(
Expand Down Expand Up @@ -897,7 +897,7 @@ public function testVerifyIncorrectPubKey() {
'alg' => 'RS256'
]
);
$content->setPayload(['prop' => 'val'], false);
$content->setPayload(['prop' => 'val']);
$content->sign(openssl_pkey_get_private('file://' . $GLOBALS['KEYs']['private'], $GLOBALS['KEYs']['password']));

$obj = new Statement(
Expand Down