Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
08582e2
Improved logging, enumerations and more
kleisauke Oct 20, 2016
593c24a
Merge pull request #15 from kleisauke/logging-enumerations
jcupitt Oct 22, 2016
ef0d885
pass PSR2, README updates
jcupitt Oct 22, 2016
a1e2e6e
remove Enum from enum names, version bump
jcupitt Oct 22, 2016
d1727aa
Override __toString() + remove enums import
kleisauke Oct 22, 2016
cc2a01d
add notes on scope to the README
jcupitt Oct 25, 2016
22d2277
add formatted docs to repro
jcupitt Oct 25, 2016
d582081
make tests run in less RAM
jcupitt Oct 25, 2016
02d3c39
better write to file exception test
jcupitt Oct 26, 2016
d91b499
add sig.php example
jcupitt Oct 26, 2016
ff4e79f
move logger
jcupitt Oct 26, 2016
95888ac
all seems to work
jcupitt Oct 26, 2016
e9bee8f
fix sig.php
jcupitt Oct 26, 2016
efd538f
fix some phpcs warnings
jcupitt Oct 26, 2016
706072b
make a separate Logger class
jcupitt Oct 27, 2016
1b44116
move debug/error logging convenience into Main
jcupitt Oct 27, 2016
d0efc5f
fix Logger image->string conversion
jcupitt Oct 27, 2016
a1ad5e3
Merge branch 'add-default-logger' of github.com:jcupitt/php-vips into…
jcupitt Oct 27, 2016
cb42841
remove @version tags
jcupitt Oct 27, 2016
eeb8483
update docs
jcupitt Oct 27, 2016
f4d4fb5
avoid AND/OR member names
jcupitt Oct 27, 2016
6e99cdd
regen docs, again
jcupitt Oct 27, 2016
44c805e
incorporate review comments
jcupitt Oct 27, 2016
e6bd0e5
Merge branch 'dev' into add-default-logger
jcupitt Oct 28, 2016
2e5cc1b
ready to merge to dev
jcupitt Oct 28, 2016
c3ac43d
rename error() and debug()
jcupitt Nov 2, 2016
d63c9da
remove :void return
jcupitt Nov 2, 2016
420b9f4
regen docs
jcupitt Nov 2, 2016
e79da93
update docs without cache files
jcupitt Nov 2, 2016
c00f6af
remove left-over debugLog() etc.
jcupitt Nov 2, 2016
2d7fb28
update docs
jcupitt Nov 2, 2016
d80e827
remove formatted docs, bump to 1.0.0
jcupitt Nov 3, 2016
e0c521b
fixes for review comments
jcupitt Nov 4, 2016
7fd21be
revise README for 1.0
jcupitt Nov 4, 2016
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
avoid AND/OR member names
helps phpdoc not flop about horribly on the Image class
  • Loading branch information
jcupitt committed Oct 27, 2016
commit f4d4fb531e1f1bab68a144d3bfff381fac5e6842
12 changes: 8 additions & 4 deletions src/Image.php
Original file line number Diff line number Diff line change
Expand Up @@ -1229,7 +1229,8 @@ public function rshift($other, array $options = []): Image
*/
public function andimage($other, array $options = []): Image
{
return self::callEnum($other, "boolean", OperationBoolean::AND, $options);
// phpdoc hates OperationBoolean::AND, so use the string form here
return self::callEnum($other, "boolean", "and", $options);
}

/**
Expand All @@ -1242,7 +1243,8 @@ public function andimage($other, array $options = []): Image
*/
public function orimage($other, array $options = []): Image
{
return self::callEnum($other, "boolean", OperationBoolean::OR, $options);
// phpdoc hates OperationBoolean::OR, so use the string form here
return self::callEnum($other, "boolean", "or", $options);
}

/**
Expand Down Expand Up @@ -1524,7 +1526,8 @@ public function rint(): Image
*/
public function bandand(): Image
{
return $this->bandbool(OperationBoolean::AND);
// phpdoc hates OperationBoolean::AND, so use the string form here
return $this->bandbool("and");
}

/**
Expand All @@ -1534,7 +1537,8 @@ public function bandand(): Image
*/
public function bandor(): Image
{
return $this->bandbool(OperationBoolean::OR);
// phpdoc hates OperationBoolean::OR, so use the string form here
Copy link

Choose a reason for hiding this comment

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

These kind of exceptions can't be made in phpcs configuration instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think so, phpcs says that OperationBoolean::OR is a syntax error and stops parsing.

return $this->bandbool("or");
}

/**
Expand Down