Skip to content

Declare controller property to silence PHP warning #121

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

Draft
berkod wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Declare controller property to silence PHP warning #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions src/zoninator_rest/controller/class-zoninator-rest-controller-action.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,28 @@
* Class Zoninator_REST_Controller_Action
*/
class Zoninator_REST_Controller_Action {
public $controller;

/**
* The controller name
*
* @var Zoninator_REST_Controller
*/
public Zoninator_REST_Controller $controller;


/**
* Permitted actions
*
* @var array
*/
private $actions_to_http_methods = array(
private $actions_to_http_methods = [
'index' => WP_REST_Server::READABLE,
'show' => WP_REST_Server::READABLE,
'create' => WP_REST_Server::CREATABLE,
'update' => WP_REST_Server::EDITABLE,
'delete' => WP_REST_Server::DELETABLE,
'any' => WP_REST_Server::ALLMETHODS,
);
];

/**
* The action name
Expand Down Expand Up @@ -61,14 +68,17 @@ class Zoninator_REST_Controller_Action {
* Zoninator_REST_Controller_Action constructor.
*
* @param Zoninator_REST_Controller $controller Controller.
* @param string $action_name The action Name.
* @param string $action_name The action Name.
*/
public function __construct( $controller, $action_name ) {
$is_known_action = in_array( $action_name, array_keys( $this->actions_to_http_methods ), true );
Zoninator_REST_Expect::that( $is_known_action, 'Unknown method: ' . $action_name );

$this->controller = $controller;
$this->action_name = $action_name;
$this->controller = $controller;
$this->action_name = $action_name;
$this->handler = null;
$this->args = null;
$this->permission_callback = null;
}

/**
Expand Down Expand Up @@ -156,10 +166,8 @@ private function expect_callable( $callable_func ) {
if ( is_string( $callable_func ) && method_exists( $this->controller, $callable_func ) ) {
return array( $this->controller, $callable_func );
}

Zoninator_REST_Expect::that( is_callable( $callable_func ), 'Callable Expected: $callable_func' );
}

return $callable_func;
}
}