Merge 'bendmorris/patch-1' into old-pulls

danhunsaker · danhunsaker · commit 5253e0857853 · 2018-12-11T00:13:46.000-07:00
Closes chrisboulton/php-resque#360
diff --git a/lib/Resque/Job.php b/lib/Resque/Job.php
@@ -190,13 +190,13 @@ public function perform()
 			Resque_Event::trigger('beforePerform', $this);
 
 			$instance = $this->getInstance();
-			if(method_exists($instance, 'setUp')) {
+			if(is_callable([$instance, 'setUp'])) {
 				$instance->setUp();
 			}
 
 			$result = $instance->perform();
 
-			if(method_exists($instance, 'tearDown')) {
+			if(is_callable([$instance, 'tearDown'])) {
 				$instance->tearDown();
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -190,13 +190,13 @@ public function perform()`
`190`	`190`	`Resque_Event::trigger('beforePerform', $this);`
`191`	`191`
`192`	`192`	`$instance = $this->getInstance();`
`193`		`- if(method_exists($instance, 'setUp')) {`
	`193`	`+ if(is_callable([$instance, 'setUp'])) {`
`194`	`194`	`$instance->setUp();`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`$result = $instance->perform();`
`198`	`198`
`199`		`- if(method_exists($instance, 'tearDown')) {`
	`199`	`+ if(is_callable([$instance, 'tearDown'])) {`
`200`	`200`	`$instance->tearDown();`
`201`	`201`	`}`
`202`	`202`