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

Jump to bottom

Add in an 'options' property for the PrintJob #12

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

Add in an 'options' property for the PrintJob #12

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
a951a8d
remove string from parameter class
n3o77 May 10, 2016
9493f4f
fix typo
n3o77 May 10, 2016
e0efed3
proper DateTime reference
n3o77 May 10, 2016
a245277
[REF] InvalidArgumentException namespace
n3o77 May 16, 2016
a64c576
Fixed typo
benlipp Jun 28, 2016
aa76f22
Merge pull request #9 from obiwanakin/patch-1
Jul 8, 2016
85d0b8e
Merge pull request #8 from unlooped/master
Jul 8, 2016
711713c
Add options property to a printjob
brettd3r Sep 20, 2016
12d3d3c
set options as property
brettd3r Sep 20, 2016
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: 1 addition & 1 deletion src/PrintNode/Credentials.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function setEmailPassword($email, $password)
"ApiKey already set."
);
}
$this->emailpassword = $email.': '.$password;
$this->emailPassword = $email.': '.$password;
return $this;
}

Expand Down
2 changes: 2 additions & 0 deletions src/PrintNode/PrintJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* @property-read int $filesize
* @property-read DateTime $createTimestamp
* @property-read string $state
* @property array $options
*/
class PrintJob extends Entity
{
Expand All @@ -29,6 +30,7 @@ class PrintJob extends Entity
protected $createTimestamp;
protected $state;
protected $expireAt;
protected $options;

public function foreignKeyEntityMap()
{
Expand Down
12 changes: 6 additions & 6 deletions src/PrintNode/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ public function getPrintJobsByPrinters()
* @param string $computerId id of computer to find scales
* @return Entity[]
* */
public function getScales(string $computerId)
public function getScales($computerId)
{
$endPointUrl = $this->apiurl."/computer/";
$endPointUrl.= $computerId;
Expand Down Expand Up @@ -522,7 +522,7 @@ public function getPrintersByComputers()
$arguments = func_get_args();

if (count($arguments) > 2) {
throw new InvalidArgumentException(
throw new \InvalidArgumentException(
sprintf(
'Too many arguments given to getPrintersByComputers.'
)
Expand Down Expand Up @@ -570,7 +570,7 @@ public function __call($methodName, $arguments)
$arguments = array_shift($arguments);

if (!is_string($arguments)) {
throw new InvalidArgumentException(
throw new \InvalidArgumentException(
sprintf(
'Invalid argument type passed to %s. Expecting a string got %s',
$methodName,
Expand Down Expand Up @@ -614,7 +614,7 @@ public function __call($methodName, $arguments)
public function patch(Entity $entity)
{
if (!($entity instanceof Entity)) {
throw new InvalidArgumentException(
throw new \InvalidArgumentException(
sprintf(
'Invalid argument type passed to patch. Expecting Entity got %s',
gettype($entity)
Expand Down Expand Up @@ -644,7 +644,7 @@ public function patch(Entity $entity)
public function post(Entity $entity)
{
if (!($entity instanceof Entity)) {
throw new InvalidArgumentException(
throw new \InvalidArgumentException(
sprintf(
'Invalid argument type passed to patch. Expecting Entity got %s',
gettype($entity)
Expand Down Expand Up @@ -677,7 +677,7 @@ public function put()
$entity = array_shift($arguments);

if (!($entity instanceof Entity)) {
throw new InvalidArgumentException(
throw new \InvalidArgumentException(
sprintf(
'Invalid argument type passed to patch. Expecting Entity got %s',
gettype($entity)
Expand Down
4 changes: 2 additions & 2 deletions src/PrintNode/Scale.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* @property-read string $port
* @property-read int $count
* @property-read int[string] $measurement
* @property-read DateTime $clientReportedCreateTimestamp
* @property-read \DateTime $clientReportedCreateTimestamp
* @property-read string $ntpOffset
* @property-read int $ageOfData
* @property-read int $computerId
Expand All @@ -29,7 +29,7 @@ class Scale extends Entity
protected $port;
protected $count;
protected $measurement;
protected $clientReprotedCreateTimestamp;
protected $clientReportedCreateTimestamp;
protected $ntpOffset;
protected $ageOfData;
protected $computerId;
Expand Down