@@ -12,32 +12,32 @@ |
||
| 12 | 12 | class EE_Button_Display_Strategy extends EE_Display_Strategy_Base |
| 13 | 13 | { |
| 14 | 14 | |
| 15 | - /** |
|
| 16 | - * @return string of html to display the input |
|
| 17 | - */ |
|
| 18 | - public function display() |
|
| 19 | - { |
|
| 20 | - $default_value = $this->_input->get_default(); |
|
| 21 | - if ($this->_input->get_normalization_strategy() instanceof EE_Normalization_Strategy_Base) { |
|
| 22 | - $default_value = $this->_input->get_normalization_strategy()->unnormalize($default_value); |
|
| 23 | - } |
|
| 24 | - $html = $this->_opening_tag('button'); |
|
| 25 | - $html .= $this->_attributes_string( |
|
| 26 | - array_merge( |
|
| 27 | - $this->_standard_attributes_array(), |
|
| 28 | - array( |
|
| 29 | - 'value' => $default_value, |
|
| 30 | - ) |
|
| 31 | - ) |
|
| 32 | - ); |
|
| 33 | - if ($this->_input instanceof EE_Button_Input) { |
|
| 34 | - $button_content = $this->_input->button_content(); |
|
| 35 | - } else { |
|
| 36 | - $button_content = $this->_input->get_default(); |
|
| 37 | - } |
|
| 38 | - $html .= '>'; |
|
| 39 | - $html .= $button_content; |
|
| 40 | - $html .= $this->_closing_tag(); |
|
| 41 | - return $html; |
|
| 42 | - } |
|
| 15 | + /** |
|
| 16 | + * @return string of html to display the input |
|
| 17 | + */ |
|
| 18 | + public function display() |
|
| 19 | + { |
|
| 20 | + $default_value = $this->_input->get_default(); |
|
| 21 | + if ($this->_input->get_normalization_strategy() instanceof EE_Normalization_Strategy_Base) { |
|
| 22 | + $default_value = $this->_input->get_normalization_strategy()->unnormalize($default_value); |
|
| 23 | + } |
|
| 24 | + $html = $this->_opening_tag('button'); |
|
| 25 | + $html .= $this->_attributes_string( |
|
| 26 | + array_merge( |
|
| 27 | + $this->_standard_attributes_array(), |
|
| 28 | + array( |
|
| 29 | + 'value' => $default_value, |
|
| 30 | + ) |
|
| 31 | + ) |
|
| 32 | + ); |
|
| 33 | + if ($this->_input instanceof EE_Button_Input) { |
|
| 34 | + $button_content = $this->_input->button_content(); |
|
| 35 | + } else { |
|
| 36 | + $button_content = $this->_input->get_default(); |
|
| 37 | + } |
|
| 38 | + $html .= '>'; |
|
| 39 | + $html .= $button_content; |
|
| 40 | + $html .= $this->_closing_tag(); |
|
| 41 | + return $html; |
|
| 42 | + } |
|
| 43 | 43 | } |
@@ -20,42 +20,42 @@ |
||
| 20 | 20 | class FilePath |
| 21 | 21 | { |
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * @var string file_path |
|
| 25 | - */ |
|
| 26 | - private $file_path; |
|
| 27 | - |
|
| 28 | - |
|
| 29 | - /** |
|
| 30 | - * FilePath constructor. |
|
| 31 | - * |
|
| 32 | - * @param string $file_path |
|
| 33 | - * @throws InvalidDataTypeException |
|
| 34 | - * @throws InvalidFilePathException |
|
| 35 | - */ |
|
| 36 | - public function __construct($file_path) |
|
| 37 | - { |
|
| 38 | - if (! is_string($file_path)) { |
|
| 39 | - throw new InvalidDataTypeException( |
|
| 40 | - '$file_path', |
|
| 41 | - $file_path, |
|
| 42 | - 'string' |
|
| 43 | - ); |
|
| 44 | - } |
|
| 45 | - if (! is_readable($file_path)) { |
|
| 46 | - throw new InvalidFilePathException($file_path); |
|
| 47 | - } |
|
| 48 | - $this->file_path = $file_path; |
|
| 49 | - } |
|
| 50 | - |
|
| 51 | - |
|
| 52 | - /** |
|
| 53 | - * @return string |
|
| 54 | - */ |
|
| 55 | - public function __toString() |
|
| 56 | - { |
|
| 57 | - return $this->file_path; |
|
| 58 | - } |
|
| 23 | + /** |
|
| 24 | + * @var string file_path |
|
| 25 | + */ |
|
| 26 | + private $file_path; |
|
| 27 | + |
|
| 28 | + |
|
| 29 | + /** |
|
| 30 | + * FilePath constructor. |
|
| 31 | + * |
|
| 32 | + * @param string $file_path |
|
| 33 | + * @throws InvalidDataTypeException |
|
| 34 | + * @throws InvalidFilePathException |
|
| 35 | + */ |
|
| 36 | + public function __construct($file_path) |
|
| 37 | + { |
|
| 38 | + if (! is_string($file_path)) { |
|
| 39 | + throw new InvalidDataTypeException( |
|
| 40 | + '$file_path', |
|
| 41 | + $file_path, |
|
| 42 | + 'string' |
|
| 43 | + ); |
|
| 44 | + } |
|
| 45 | + if (! is_readable($file_path)) { |
|
| 46 | + throw new InvalidFilePathException($file_path); |
|
| 47 | + } |
|
| 48 | + $this->file_path = $file_path; |
|
| 49 | + } |
|
| 50 | + |
|
| 51 | + |
|
| 52 | + /** |
|
| 53 | + * @return string |
|
| 54 | + */ |
|
| 55 | + public function __toString() |
|
| 56 | + { |
|
| 57 | + return $this->file_path; |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | 60 | |
| 61 | 61 | } |
@@ -35,14 +35,14 @@ |
||
| 35 | 35 | */ |
| 36 | 36 | public function __construct($file_path) |
| 37 | 37 | { |
| 38 | - if (! is_string($file_path)) { |
|
| 38 | + if ( ! is_string($file_path)) { |
|
| 39 | 39 | throw new InvalidDataTypeException( |
| 40 | 40 | '$file_path', |
| 41 | 41 | $file_path, |
| 42 | 42 | 'string' |
| 43 | 43 | ); |
| 44 | 44 | } |
| 45 | - if (! is_readable($file_path)) { |
|
| 45 | + if ( ! is_readable($file_path)) { |
|
| 46 | 46 | throw new InvalidFilePathException($file_path); |
| 47 | 47 | } |
| 48 | 48 | $this->file_path = $file_path; |
@@ -37,14 +37,14 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | public function __construct($fully_qualified_name) |
| 39 | 39 | { |
| 40 | - if (! is_string($fully_qualified_name)) { |
|
| 40 | + if ( ! is_string($fully_qualified_name)) { |
|
| 41 | 41 | throw new InvalidDataTypeException( |
| 42 | 42 | '$fully_qualified_name', |
| 43 | 43 | $fully_qualified_name, |
| 44 | 44 | 'string' |
| 45 | 45 | ); |
| 46 | 46 | } |
| 47 | - if (! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) { |
|
| 47 | + if ( ! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) { |
|
| 48 | 48 | if (strpos($fully_qualified_name, 'Interface') !== false) { |
| 49 | 49 | throw new InvalidInterfaceException($fully_qualified_name); |
| 50 | 50 | } |
@@ -21,54 +21,54 @@ |
||
| 21 | 21 | class FullyQualifiedName |
| 22 | 22 | { |
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * @var string $fully_qualified_name |
|
| 26 | - */ |
|
| 27 | - private $fully_qualified_name; |
|
| 24 | + /** |
|
| 25 | + * @var string $fully_qualified_name |
|
| 26 | + */ |
|
| 27 | + private $fully_qualified_name; |
|
| 28 | 28 | |
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * FullyQualifiedName constructor. |
|
| 32 | - * |
|
| 33 | - * @param string $fully_qualified_name |
|
| 34 | - * @throws InvalidClassException |
|
| 35 | - * @throws InvalidInterfaceException |
|
| 36 | - * @throws InvalidDataTypeException |
|
| 37 | - */ |
|
| 38 | - public function __construct($fully_qualified_name) |
|
| 39 | - { |
|
| 40 | - if (! is_string($fully_qualified_name)) { |
|
| 41 | - throw new InvalidDataTypeException( |
|
| 42 | - '$fully_qualified_name', |
|
| 43 | - $fully_qualified_name, |
|
| 44 | - 'string' |
|
| 45 | - ); |
|
| 46 | - } |
|
| 47 | - if (! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) { |
|
| 48 | - if (strpos($fully_qualified_name, 'Interface') !== false) { |
|
| 49 | - throw new InvalidInterfaceException($fully_qualified_name); |
|
| 50 | - } |
|
| 51 | - throw new InvalidClassException($fully_qualified_name); |
|
| 52 | - } |
|
| 53 | - $this->fully_qualified_name = $fully_qualified_name; |
|
| 54 | - } |
|
| 30 | + /** |
|
| 31 | + * FullyQualifiedName constructor. |
|
| 32 | + * |
|
| 33 | + * @param string $fully_qualified_name |
|
| 34 | + * @throws InvalidClassException |
|
| 35 | + * @throws InvalidInterfaceException |
|
| 36 | + * @throws InvalidDataTypeException |
|
| 37 | + */ |
|
| 38 | + public function __construct($fully_qualified_name) |
|
| 39 | + { |
|
| 40 | + if (! is_string($fully_qualified_name)) { |
|
| 41 | + throw new InvalidDataTypeException( |
|
| 42 | + '$fully_qualified_name', |
|
| 43 | + $fully_qualified_name, |
|
| 44 | + 'string' |
|
| 45 | + ); |
|
| 46 | + } |
|
| 47 | + if (! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) { |
|
| 48 | + if (strpos($fully_qualified_name, 'Interface') !== false) { |
|
| 49 | + throw new InvalidInterfaceException($fully_qualified_name); |
|
| 50 | + } |
|
| 51 | + throw new InvalidClassException($fully_qualified_name); |
|
| 52 | + } |
|
| 53 | + $this->fully_qualified_name = $fully_qualified_name; |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * @return string |
|
| 59 | - */ |
|
| 60 | - public function string() |
|
| 61 | - { |
|
| 62 | - return $this->fully_qualified_name; |
|
| 63 | - } |
|
| 57 | + /** |
|
| 58 | + * @return string |
|
| 59 | + */ |
|
| 60 | + public function string() |
|
| 61 | + { |
|
| 62 | + return $this->fully_qualified_name; |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | 65 | |
| 66 | - /** |
|
| 67 | - * @return string |
|
| 68 | - */ |
|
| 69 | - public function __toString() |
|
| 70 | - { |
|
| 71 | - return $this->fully_qualified_name; |
|
| 72 | - } |
|
| 66 | + /** |
|
| 67 | + * @return string |
|
| 68 | + */ |
|
| 69 | + public function __toString() |
|
| 70 | + { |
|
| 71 | + return $this->fully_qualified_name; |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | 74 | } |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | public function __construct($slug, $description) |
| 92 | 92 | { |
| 93 | 93 | parent::__construct($slug, $description); |
| 94 | - if (! in_array($this->slug(), $this->validRequestTypes(), true)) { |
|
| 94 | + if ( ! in_array($this->slug(), $this->validRequestTypes(), true)) { |
|
| 95 | 95 | throw new InvalidArgumentException( |
| 96 | 96 | sprintf( |
| 97 | 97 | esc_html__( |
@@ -16,155 +16,155 @@ |
||
| 16 | 16 | class RequestTypeContext extends Context |
| 17 | 17 | { |
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * indicates that the current request involves some form of activation |
|
| 21 | - */ |
|
| 22 | - const ACTIVATION = 'activation-request'; |
|
| 23 | - |
|
| 24 | - /** |
|
| 25 | - * indicates that the current request is for the admin but is not being made via AJAX |
|
| 26 | - */ |
|
| 27 | - const ADMIN = 'non-ajax-admin-request'; |
|
| 28 | - |
|
| 29 | - /** |
|
| 30 | - * indicates that the current request is for the admin AND is being made via AJAX |
|
| 31 | - */ |
|
| 32 | - const AJAX_ADMIN = 'admin-ajax-request'; |
|
| 33 | - |
|
| 34 | - /** |
|
| 35 | - * indicates that the current request is for the frontend AND is being made via AJAX |
|
| 36 | - */ |
|
| 37 | - const AJAX_FRONT = 'frontend-ajax-request'; |
|
| 38 | - |
|
| 39 | - /** |
|
| 40 | - * indicates that the current request is for the WP Heartbeat |
|
| 41 | - */ |
|
| 42 | - const AJAX_HEARTBEAT = 'admin-ajax-heartbeat'; |
|
| 43 | - |
|
| 44 | - /** |
|
| 45 | - * indicates that the current request is being made via AJAX, but is NOT for EE |
|
| 46 | - */ |
|
| 47 | - const AJAX_OTHER = 'other-ajax-request'; |
|
| 48 | - |
|
| 49 | - /** |
|
| 50 | - * indicates that the current request is for the EE REST API |
|
| 51 | - */ |
|
| 52 | - const API = 'rest-api'; |
|
| 53 | - |
|
| 54 | - /** |
|
| 55 | - * indicates that the current request is from the command line |
|
| 56 | - */ |
|
| 57 | - const CLI = 'command-line'; |
|
| 58 | - |
|
| 59 | - /** |
|
| 60 | - * indicates that the current request is for a WP_Cron |
|
| 61 | - */ |
|
| 62 | - const CRON = 'wp-cron'; |
|
| 63 | - |
|
| 64 | - /** |
|
| 65 | - * indicates that the current request is for a feed (ie: RSS) |
|
| 66 | - */ |
|
| 67 | - const FEED = 'feed-request'; |
|
| 68 | - |
|
| 69 | - /** |
|
| 70 | - * indicates that the current request is for the frontend but is not being made via AJAX |
|
| 71 | - */ |
|
| 72 | - const FRONTEND = 'non-ajax-frontend-request'; |
|
| 73 | - |
|
| 74 | - /** |
|
| 75 | - * indicates that the current request is for content that is to be displayed within an iframe |
|
| 76 | - */ |
|
| 77 | - const IFRAME = 'iframe-request'; |
|
| 78 | - |
|
| 79 | - /** |
|
| 80 | - * indicates that the current request is for the WP REST API |
|
| 81 | - */ |
|
| 82 | - const WP_API = 'wp-rest-api'; |
|
| 83 | - |
|
| 84 | - /** |
|
| 85 | - * indicates that the current request is a loopback sent from WP core to test for errors |
|
| 86 | - */ |
|
| 87 | - const WP_SCRAPE = 'wordpress-scrape'; |
|
| 88 | - |
|
| 89 | - /** |
|
| 90 | - * @var boolean $is_activation |
|
| 91 | - */ |
|
| 92 | - private $is_activation = false; |
|
| 93 | - |
|
| 94 | - /** |
|
| 95 | - * @var array $valid_request_types |
|
| 96 | - */ |
|
| 97 | - private $valid_request_types = array(); |
|
| 98 | - |
|
| 99 | - |
|
| 100 | - /** |
|
| 101 | - * RequestTypeContext constructor. |
|
| 102 | - * |
|
| 103 | - * @param string $slug |
|
| 104 | - * @param string $description |
|
| 105 | - * @throws InvalidArgumentException |
|
| 106 | - */ |
|
| 107 | - public function __construct($slug, $description) |
|
| 108 | - { |
|
| 109 | - parent::__construct($slug, $description); |
|
| 110 | - if (! in_array($this->slug(), $this->validRequestTypes(), true)) { |
|
| 111 | - throw new InvalidArgumentException( |
|
| 112 | - sprintf( |
|
| 113 | - esc_html__( |
|
| 114 | - 'The RequestTypeContext slug must be one of the following values: %1$s %2$s', |
|
| 115 | - 'event_espresso' |
|
| 116 | - ), |
|
| 117 | - var_export($this->validRequestTypes(), true) |
|
| 118 | - ) |
|
| 119 | - ); |
|
| 120 | - } |
|
| 121 | - } |
|
| 122 | - |
|
| 123 | - |
|
| 124 | - /** |
|
| 125 | - * @return array |
|
| 126 | - */ |
|
| 127 | - public function validRequestTypes() |
|
| 128 | - { |
|
| 129 | - if (empty($this->valid_request_types)) { |
|
| 130 | - $this->valid_request_types = apply_filters( |
|
| 131 | - 'FHEE__EventEspresso_core_domain_entities_contexts_RequestTypeContext__validRequestTypes', |
|
| 132 | - array( |
|
| 133 | - RequestTypeContext::ACTIVATION, |
|
| 134 | - RequestTypeContext::ADMIN, |
|
| 135 | - RequestTypeContext::AJAX_ADMIN, |
|
| 136 | - RequestTypeContext::AJAX_FRONT, |
|
| 137 | - RequestTypeContext::AJAX_HEARTBEAT, |
|
| 138 | - RequestTypeContext::AJAX_OTHER, |
|
| 139 | - RequestTypeContext::API, |
|
| 140 | - RequestTypeContext::CLI, |
|
| 141 | - RequestTypeContext::CRON, |
|
| 142 | - RequestTypeContext::FEED, |
|
| 143 | - RequestTypeContext::FRONTEND, |
|
| 144 | - RequestTypeContext::IFRAME, |
|
| 145 | - RequestTypeContext::WP_API, |
|
| 146 | - RequestTypeContext::WP_SCRAPE, |
|
| 147 | - ) |
|
| 148 | - ); |
|
| 149 | - } |
|
| 150 | - return $this->valid_request_types; |
|
| 151 | - } |
|
| 152 | - |
|
| 153 | - |
|
| 154 | - /** |
|
| 155 | - * @return bool |
|
| 156 | - */ |
|
| 157 | - public function isActivation() |
|
| 158 | - { |
|
| 159 | - return $this->is_activation; |
|
| 160 | - } |
|
| 161 | - |
|
| 162 | - |
|
| 163 | - /** |
|
| 164 | - * @param bool $is_activation |
|
| 165 | - */ |
|
| 166 | - public function setIsActivation($is_activation) |
|
| 167 | - { |
|
| 168 | - $this->is_activation = filter_var($is_activation, FILTER_VALIDATE_BOOLEAN); |
|
| 169 | - } |
|
| 19 | + /** |
|
| 20 | + * indicates that the current request involves some form of activation |
|
| 21 | + */ |
|
| 22 | + const ACTIVATION = 'activation-request'; |
|
| 23 | + |
|
| 24 | + /** |
|
| 25 | + * indicates that the current request is for the admin but is not being made via AJAX |
|
| 26 | + */ |
|
| 27 | + const ADMIN = 'non-ajax-admin-request'; |
|
| 28 | + |
|
| 29 | + /** |
|
| 30 | + * indicates that the current request is for the admin AND is being made via AJAX |
|
| 31 | + */ |
|
| 32 | + const AJAX_ADMIN = 'admin-ajax-request'; |
|
| 33 | + |
|
| 34 | + /** |
|
| 35 | + * indicates that the current request is for the frontend AND is being made via AJAX |
|
| 36 | + */ |
|
| 37 | + const AJAX_FRONT = 'frontend-ajax-request'; |
|
| 38 | + |
|
| 39 | + /** |
|
| 40 | + * indicates that the current request is for the WP Heartbeat |
|
| 41 | + */ |
|
| 42 | + const AJAX_HEARTBEAT = 'admin-ajax-heartbeat'; |
|
| 43 | + |
|
| 44 | + /** |
|
| 45 | + * indicates that the current request is being made via AJAX, but is NOT for EE |
|
| 46 | + */ |
|
| 47 | + const AJAX_OTHER = 'other-ajax-request'; |
|
| 48 | + |
|
| 49 | + /** |
|
| 50 | + * indicates that the current request is for the EE REST API |
|
| 51 | + */ |
|
| 52 | + const API = 'rest-api'; |
|
| 53 | + |
|
| 54 | + /** |
|
| 55 | + * indicates that the current request is from the command line |
|
| 56 | + */ |
|
| 57 | + const CLI = 'command-line'; |
|
| 58 | + |
|
| 59 | + /** |
|
| 60 | + * indicates that the current request is for a WP_Cron |
|
| 61 | + */ |
|
| 62 | + const CRON = 'wp-cron'; |
|
| 63 | + |
|
| 64 | + /** |
|
| 65 | + * indicates that the current request is for a feed (ie: RSS) |
|
| 66 | + */ |
|
| 67 | + const FEED = 'feed-request'; |
|
| 68 | + |
|
| 69 | + /** |
|
| 70 | + * indicates that the current request is for the frontend but is not being made via AJAX |
|
| 71 | + */ |
|
| 72 | + const FRONTEND = 'non-ajax-frontend-request'; |
|
| 73 | + |
|
| 74 | + /** |
|
| 75 | + * indicates that the current request is for content that is to be displayed within an iframe |
|
| 76 | + */ |
|
| 77 | + const IFRAME = 'iframe-request'; |
|
| 78 | + |
|
| 79 | + /** |
|
| 80 | + * indicates that the current request is for the WP REST API |
|
| 81 | + */ |
|
| 82 | + const WP_API = 'wp-rest-api'; |
|
| 83 | + |
|
| 84 | + /** |
|
| 85 | + * indicates that the current request is a loopback sent from WP core to test for errors |
|
| 86 | + */ |
|
| 87 | + const WP_SCRAPE = 'wordpress-scrape'; |
|
| 88 | + |
|
| 89 | + /** |
|
| 90 | + * @var boolean $is_activation |
|
| 91 | + */ |
|
| 92 | + private $is_activation = false; |
|
| 93 | + |
|
| 94 | + /** |
|
| 95 | + * @var array $valid_request_types |
|
| 96 | + */ |
|
| 97 | + private $valid_request_types = array(); |
|
| 98 | + |
|
| 99 | + |
|
| 100 | + /** |
|
| 101 | + * RequestTypeContext constructor. |
|
| 102 | + * |
|
| 103 | + * @param string $slug |
|
| 104 | + * @param string $description |
|
| 105 | + * @throws InvalidArgumentException |
|
| 106 | + */ |
|
| 107 | + public function __construct($slug, $description) |
|
| 108 | + { |
|
| 109 | + parent::__construct($slug, $description); |
|
| 110 | + if (! in_array($this->slug(), $this->validRequestTypes(), true)) { |
|
| 111 | + throw new InvalidArgumentException( |
|
| 112 | + sprintf( |
|
| 113 | + esc_html__( |
|
| 114 | + 'The RequestTypeContext slug must be one of the following values: %1$s %2$s', |
|
| 115 | + 'event_espresso' |
|
| 116 | + ), |
|
| 117 | + var_export($this->validRequestTypes(), true) |
|
| 118 | + ) |
|
| 119 | + ); |
|
| 120 | + } |
|
| 121 | + } |
|
| 122 | + |
|
| 123 | + |
|
| 124 | + /** |
|
| 125 | + * @return array |
|
| 126 | + */ |
|
| 127 | + public function validRequestTypes() |
|
| 128 | + { |
|
| 129 | + if (empty($this->valid_request_types)) { |
|
| 130 | + $this->valid_request_types = apply_filters( |
|
| 131 | + 'FHEE__EventEspresso_core_domain_entities_contexts_RequestTypeContext__validRequestTypes', |
|
| 132 | + array( |
|
| 133 | + RequestTypeContext::ACTIVATION, |
|
| 134 | + RequestTypeContext::ADMIN, |
|
| 135 | + RequestTypeContext::AJAX_ADMIN, |
|
| 136 | + RequestTypeContext::AJAX_FRONT, |
|
| 137 | + RequestTypeContext::AJAX_HEARTBEAT, |
|
| 138 | + RequestTypeContext::AJAX_OTHER, |
|
| 139 | + RequestTypeContext::API, |
|
| 140 | + RequestTypeContext::CLI, |
|
| 141 | + RequestTypeContext::CRON, |
|
| 142 | + RequestTypeContext::FEED, |
|
| 143 | + RequestTypeContext::FRONTEND, |
|
| 144 | + RequestTypeContext::IFRAME, |
|
| 145 | + RequestTypeContext::WP_API, |
|
| 146 | + RequestTypeContext::WP_SCRAPE, |
|
| 147 | + ) |
|
| 148 | + ); |
|
| 149 | + } |
|
| 150 | + return $this->valid_request_types; |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + |
|
| 154 | + /** |
|
| 155 | + * @return bool |
|
| 156 | + */ |
|
| 157 | + public function isActivation() |
|
| 158 | + { |
|
| 159 | + return $this->is_activation; |
|
| 160 | + } |
|
| 161 | + |
|
| 162 | + |
|
| 163 | + /** |
|
| 164 | + * @param bool $is_activation |
|
| 165 | + */ |
|
| 166 | + public function setIsActivation($is_activation) |
|
| 167 | + { |
|
| 168 | + $this->is_activation = filter_var($is_activation, FILTER_VALIDATE_BOOLEAN); |
|
| 169 | + } |
|
| 170 | 170 | } |
@@ -11,14 +11,14 @@ |
||
| 11 | 11 | |
| 12 | 12 | |
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * removes all tags which a WP Post wouldn't allow in its content normally |
|
| 16 | - * |
|
| 17 | - * @param string $value |
|
| 18 | - * @return string |
|
| 19 | - */ |
|
| 20 | - public function prepare_for_set($value) |
|
| 21 | - { |
|
| 22 | - return parent::prepare_for_set(wp_kses("$value", EEH_HTML::get_simple_tags())); |
|
| 23 | - } |
|
| 14 | + /** |
|
| 15 | + * removes all tags which a WP Post wouldn't allow in its content normally |
|
| 16 | + * |
|
| 17 | + * @param string $value |
|
| 18 | + * @return string |
|
| 19 | + */ |
|
| 20 | + public function prepare_for_set($value) |
|
| 21 | + { |
|
| 22 | + return parent::prepare_for_set(wp_kses("$value", EEH_HTML::get_simple_tags())); |
|
| 23 | + } |
|
| 24 | 24 | } |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | */ |
| 52 | 52 | public function wp_user_obj() |
| 53 | 53 | { |
| 54 | - if (! $this->_wp_user_obj) { |
|
| 54 | + if ( ! $this->_wp_user_obj) { |
|
| 55 | 55 | $this->_wp_user_obj = get_user_by('ID', $this->ID()); |
| 56 | 56 | } |
| 57 | 57 | return $this->_wp_user_obj; |
@@ -13,111 +13,111 @@ |
||
| 13 | 13 | class EE_WP_User extends EE_Base_Class implements EEI_Admin_Links |
| 14 | 14 | { |
| 15 | 15 | |
| 16 | - /** |
|
| 17 | - * @var WP_User |
|
| 18 | - */ |
|
| 19 | - protected $_wp_user_obj; |
|
| 20 | - |
|
| 21 | - |
|
| 22 | - /** |
|
| 23 | - * @param array $props_n_values |
|
| 24 | - * @return EE_WP_User|mixed |
|
| 25 | - * @throws EE_Error |
|
| 26 | - * @throws ReflectionException |
|
| 27 | - */ |
|
| 28 | - public static function new_instance($props_n_values = []) |
|
| 29 | - { |
|
| 30 | - $has_object = parent::_check_for_object($props_n_values, __CLASS__); |
|
| 31 | - return $has_object ?: new self($props_n_values); |
|
| 32 | - } |
|
| 33 | - |
|
| 34 | - |
|
| 35 | - /** |
|
| 36 | - * @param array $props_n_values |
|
| 37 | - * @return EE_WP_User |
|
| 38 | - * @throws EE_Error |
|
| 39 | - * @throws ReflectionException |
|
| 40 | - */ |
|
| 41 | - public static function new_instance_from_db($props_n_values = []) |
|
| 42 | - { |
|
| 43 | - return new self($props_n_values, true); |
|
| 44 | - } |
|
| 45 | - |
|
| 46 | - |
|
| 47 | - /** |
|
| 48 | - * Return a normal WP_User object (caches the object for future calls) |
|
| 49 | - * |
|
| 50 | - * @return WP_User |
|
| 51 | - * @throws EE_Error |
|
| 52 | - * @throws ReflectionException |
|
| 53 | - */ |
|
| 54 | - public function wp_user_obj() |
|
| 55 | - { |
|
| 56 | - if (! $this->_wp_user_obj) { |
|
| 57 | - $this->_wp_user_obj = get_user_by('ID', $this->ID()); |
|
| 58 | - } |
|
| 59 | - return $this->_wp_user_obj; |
|
| 60 | - } |
|
| 61 | - |
|
| 62 | - |
|
| 63 | - /** |
|
| 64 | - * Return the link to the admin details for the object. |
|
| 65 | - * |
|
| 66 | - * @return string |
|
| 67 | - * @throws EE_Error |
|
| 68 | - * @throws ReflectionException |
|
| 69 | - */ |
|
| 70 | - public function get_admin_details_link() |
|
| 71 | - { |
|
| 72 | - return $this->get_admin_edit_link(); |
|
| 73 | - } |
|
| 74 | - |
|
| 75 | - |
|
| 76 | - /** |
|
| 77 | - * Returns the link to the editor for the object. Sometimes this is the same as the details. |
|
| 78 | - * |
|
| 79 | - * @return string |
|
| 80 | - * @throws EE_Error |
|
| 81 | - * @throws ReflectionException |
|
| 82 | - */ |
|
| 83 | - public function get_admin_edit_link() |
|
| 84 | - { |
|
| 85 | - /** @var RequestInterface $request */ |
|
| 86 | - $request = LoaderFactory::getLoader()->getShared(RequestInterface::class); |
|
| 87 | - return esc_url( |
|
| 88 | - add_query_arg( |
|
| 89 | - 'wp_http_referer', |
|
| 90 | - urlencode( |
|
| 91 | - wp_unslash( |
|
| 92 | - $request->getServerParam('REQUEST_URI') |
|
| 93 | - ) |
|
| 94 | - ), |
|
| 95 | - get_edit_user_link($this->ID()) |
|
| 96 | - ) |
|
| 97 | - ); |
|
| 98 | - } |
|
| 99 | - |
|
| 100 | - |
|
| 101 | - /** |
|
| 102 | - * Returns the link to a settings page for the object. |
|
| 103 | - * |
|
| 104 | - * @return string |
|
| 105 | - * @throws EE_Error |
|
| 106 | - * @throws ReflectionException |
|
| 107 | - */ |
|
| 108 | - public function get_admin_settings_link() |
|
| 109 | - { |
|
| 110 | - return $this->get_admin_edit_link(); |
|
| 111 | - } |
|
| 112 | - |
|
| 113 | - |
|
| 114 | - /** |
|
| 115 | - * Returns the link to the "overview" for the object (typically the "list table" view). |
|
| 116 | - * |
|
| 117 | - * @return string |
|
| 118 | - */ |
|
| 119 | - public function get_admin_overview_link() |
|
| 120 | - { |
|
| 121 | - return admin_url('users.php'); |
|
| 122 | - } |
|
| 16 | + /** |
|
| 17 | + * @var WP_User |
|
| 18 | + */ |
|
| 19 | + protected $_wp_user_obj; |
|
| 20 | + |
|
| 21 | + |
|
| 22 | + /** |
|
| 23 | + * @param array $props_n_values |
|
| 24 | + * @return EE_WP_User|mixed |
|
| 25 | + * @throws EE_Error |
|
| 26 | + * @throws ReflectionException |
|
| 27 | + */ |
|
| 28 | + public static function new_instance($props_n_values = []) |
|
| 29 | + { |
|
| 30 | + $has_object = parent::_check_for_object($props_n_values, __CLASS__); |
|
| 31 | + return $has_object ?: new self($props_n_values); |
|
| 32 | + } |
|
| 33 | + |
|
| 34 | + |
|
| 35 | + /** |
|
| 36 | + * @param array $props_n_values |
|
| 37 | + * @return EE_WP_User |
|
| 38 | + * @throws EE_Error |
|
| 39 | + * @throws ReflectionException |
|
| 40 | + */ |
|
| 41 | + public static function new_instance_from_db($props_n_values = []) |
|
| 42 | + { |
|
| 43 | + return new self($props_n_values, true); |
|
| 44 | + } |
|
| 45 | + |
|
| 46 | + |
|
| 47 | + /** |
|
| 48 | + * Return a normal WP_User object (caches the object for future calls) |
|
| 49 | + * |
|
| 50 | + * @return WP_User |
|
| 51 | + * @throws EE_Error |
|
| 52 | + * @throws ReflectionException |
|
| 53 | + */ |
|
| 54 | + public function wp_user_obj() |
|
| 55 | + { |
|
| 56 | + if (! $this->_wp_user_obj) { |
|
| 57 | + $this->_wp_user_obj = get_user_by('ID', $this->ID()); |
|
| 58 | + } |
|
| 59 | + return $this->_wp_user_obj; |
|
| 60 | + } |
|
| 61 | + |
|
| 62 | + |
|
| 63 | + /** |
|
| 64 | + * Return the link to the admin details for the object. |
|
| 65 | + * |
|
| 66 | + * @return string |
|
| 67 | + * @throws EE_Error |
|
| 68 | + * @throws ReflectionException |
|
| 69 | + */ |
|
| 70 | + public function get_admin_details_link() |
|
| 71 | + { |
|
| 72 | + return $this->get_admin_edit_link(); |
|
| 73 | + } |
|
| 74 | + |
|
| 75 | + |
|
| 76 | + /** |
|
| 77 | + * Returns the link to the editor for the object. Sometimes this is the same as the details. |
|
| 78 | + * |
|
| 79 | + * @return string |
|
| 80 | + * @throws EE_Error |
|
| 81 | + * @throws ReflectionException |
|
| 82 | + */ |
|
| 83 | + public function get_admin_edit_link() |
|
| 84 | + { |
|
| 85 | + /** @var RequestInterface $request */ |
|
| 86 | + $request = LoaderFactory::getLoader()->getShared(RequestInterface::class); |
|
| 87 | + return esc_url( |
|
| 88 | + add_query_arg( |
|
| 89 | + 'wp_http_referer', |
|
| 90 | + urlencode( |
|
| 91 | + wp_unslash( |
|
| 92 | + $request->getServerParam('REQUEST_URI') |
|
| 93 | + ) |
|
| 94 | + ), |
|
| 95 | + get_edit_user_link($this->ID()) |
|
| 96 | + ) |
|
| 97 | + ); |
|
| 98 | + } |
|
| 99 | + |
|
| 100 | + |
|
| 101 | + /** |
|
| 102 | + * Returns the link to a settings page for the object. |
|
| 103 | + * |
|
| 104 | + * @return string |
|
| 105 | + * @throws EE_Error |
|
| 106 | + * @throws ReflectionException |
|
| 107 | + */ |
|
| 108 | + public function get_admin_settings_link() |
|
| 109 | + { |
|
| 110 | + return $this->get_admin_edit_link(); |
|
| 111 | + } |
|
| 112 | + |
|
| 113 | + |
|
| 114 | + /** |
|
| 115 | + * Returns the link to the "overview" for the object (typically the "list table" view). |
|
| 116 | + * |
|
| 117 | + * @return string |
|
| 118 | + */ |
|
| 119 | + public function get_admin_overview_link() |
|
| 120 | + { |
|
| 121 | + return admin_url('users.php'); |
|
| 122 | + } |
|
| 123 | 123 | } |
@@ -9,24 +9,24 @@ |
||
| 9 | 9 | interface EEI_Request_Decorator |
| 10 | 10 | { |
| 11 | 11 | |
| 12 | - /** |
|
| 13 | - * converts a Request to a Response |
|
| 14 | - * can perform their logic either before or after the core application has run like so: |
|
| 15 | - * public function handle_request( EE_Request $request, EE_Response $response ) { |
|
| 16 | - * $this->request = $request; |
|
| 17 | - * $this->response = $response; |
|
| 18 | - * // logic performed BEFORE core app has run |
|
| 19 | - * $this->process_request_stack( $this->request, $this->response ); |
|
| 20 | - * // logic performed AFTER core app has run |
|
| 21 | - * return $response; |
|
| 22 | - * } |
|
| 23 | - * |
|
| 24 | - * @deprecated 4.9.53 |
|
| 25 | - * @param EE_Request $request |
|
| 26 | - * @param EE_Response $response |
|
| 27 | - * @return EE_Response |
|
| 28 | - */ |
|
| 29 | - public function handle_request(EE_Request $request, EE_Response $response); |
|
| 12 | + /** |
|
| 13 | + * converts a Request to a Response |
|
| 14 | + * can perform their logic either before or after the core application has run like so: |
|
| 15 | + * public function handle_request( EE_Request $request, EE_Response $response ) { |
|
| 16 | + * $this->request = $request; |
|
| 17 | + * $this->response = $response; |
|
| 18 | + * // logic performed BEFORE core app has run |
|
| 19 | + * $this->process_request_stack( $this->request, $this->response ); |
|
| 20 | + * // logic performed AFTER core app has run |
|
| 21 | + * return $response; |
|
| 22 | + * } |
|
| 23 | + * |
|
| 24 | + * @deprecated 4.9.53 |
|
| 25 | + * @param EE_Request $request |
|
| 26 | + * @param EE_Response $response |
|
| 27 | + * @return EE_Response |
|
| 28 | + */ |
|
| 29 | + public function handle_request(EE_Request $request, EE_Response $response); |
|
| 30 | 30 | |
| 31 | 31 | |
| 32 | 32 | } |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | public function preProductionVersionAdminNotice() |
| 79 | 79 | { |
| 80 | 80 | new PersistentAdminNotice( |
| 81 | - 'preProductionVersionAdminNotice_' . EVENT_ESPRESSO_VERSION, |
|
| 81 | + 'preProductionVersionAdminNotice_'.EVENT_ESPRESSO_VERSION, |
|
| 82 | 82 | $this->warningNotice() |
| 83 | 83 | ); |
| 84 | 84 | } |
@@ -18,91 +18,91 @@ |
||
| 18 | 18 | class PreProductionVersionWarning extends Middleware |
| 19 | 19 | { |
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * converts a Request to a Response |
|
| 23 | - * |
|
| 24 | - * @param RequestInterface $request |
|
| 25 | - * @param ResponseInterface $response |
|
| 26 | - * @return ResponseInterface |
|
| 27 | - */ |
|
| 28 | - public function handleRequest(RequestInterface $request, ResponseInterface $response) |
|
| 29 | - { |
|
| 30 | - $this->request = $request; |
|
| 31 | - $this->response = $response; |
|
| 32 | - $this->displayPreProductionVersionWarning(); |
|
| 33 | - $this->response = $this->processRequestStack($this->request, $this->response); |
|
| 34 | - return $this->response; |
|
| 35 | - } |
|
| 21 | + /** |
|
| 22 | + * converts a Request to a Response |
|
| 23 | + * |
|
| 24 | + * @param RequestInterface $request |
|
| 25 | + * @param ResponseInterface $response |
|
| 26 | + * @return ResponseInterface |
|
| 27 | + */ |
|
| 28 | + public function handleRequest(RequestInterface $request, ResponseInterface $response) |
|
| 29 | + { |
|
| 30 | + $this->request = $request; |
|
| 31 | + $this->response = $response; |
|
| 32 | + $this->displayPreProductionVersionWarning(); |
|
| 33 | + $this->response = $this->processRequestStack($this->request, $this->response); |
|
| 34 | + return $this->response; |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * displays message on frontend of site notifying admin that EE has been temporarily placed into maintenance mode |
|
| 40 | - * |
|
| 41 | - * @return void |
|
| 42 | - */ |
|
| 43 | - public function displayPreProductionVersionWarning() |
|
| 44 | - { |
|
| 45 | - // skip AJAX requests |
|
| 46 | - if ($this->request->isAjax()) { |
|
| 47 | - return; |
|
| 48 | - } |
|
| 49 | - // skip stable releases |
|
| 50 | - if (substr(EVENT_ESPRESSO_VERSION, -5) !== '.beta') { |
|
| 51 | - return; |
|
| 52 | - } |
|
| 53 | - // site admin has authorized use of non-stable release candidate for production |
|
| 54 | - if (defined('ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE') && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE) { |
|
| 55 | - return; |
|
| 56 | - } |
|
| 57 | - // post release candidate warning |
|
| 58 | - if ($this->request->isAdmin()) { |
|
| 59 | - add_action('admin_notices', array($this, 'preProductionVersionAdminNotice'), -999); |
|
| 60 | - } else { |
|
| 61 | - add_action('shutdown', array($this, 'preProductionVersionWarningNotice'), 10); |
|
| 62 | - } |
|
| 63 | - } |
|
| 38 | + /** |
|
| 39 | + * displays message on frontend of site notifying admin that EE has been temporarily placed into maintenance mode |
|
| 40 | + * |
|
| 41 | + * @return void |
|
| 42 | + */ |
|
| 43 | + public function displayPreProductionVersionWarning() |
|
| 44 | + { |
|
| 45 | + // skip AJAX requests |
|
| 46 | + if ($this->request->isAjax()) { |
|
| 47 | + return; |
|
| 48 | + } |
|
| 49 | + // skip stable releases |
|
| 50 | + if (substr(EVENT_ESPRESSO_VERSION, -5) !== '.beta') { |
|
| 51 | + return; |
|
| 52 | + } |
|
| 53 | + // site admin has authorized use of non-stable release candidate for production |
|
| 54 | + if (defined('ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE') && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE) { |
|
| 55 | + return; |
|
| 56 | + } |
|
| 57 | + // post release candidate warning |
|
| 58 | + if ($this->request->isAdmin()) { |
|
| 59 | + add_action('admin_notices', array($this, 'preProductionVersionAdminNotice'), -999); |
|
| 60 | + } else { |
|
| 61 | + add_action('shutdown', array($this, 'preProductionVersionWarningNotice'), 10); |
|
| 62 | + } |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | 65 | |
| 66 | - /** |
|
| 67 | - * displays admin notice that current version of EE is not a stable release |
|
| 68 | - * |
|
| 69 | - * @return void |
|
| 70 | - * @throws InvalidDataTypeException |
|
| 71 | - */ |
|
| 72 | - public function preProductionVersionAdminNotice() |
|
| 73 | - { |
|
| 74 | - new PersistentAdminNotice( |
|
| 75 | - 'preProductionVersionAdminNotice_' . EVENT_ESPRESSO_VERSION, |
|
| 76 | - $this->warningNotice() |
|
| 77 | - ); |
|
| 78 | - } |
|
| 66 | + /** |
|
| 67 | + * displays admin notice that current version of EE is not a stable release |
|
| 68 | + * |
|
| 69 | + * @return void |
|
| 70 | + * @throws InvalidDataTypeException |
|
| 71 | + */ |
|
| 72 | + public function preProductionVersionAdminNotice() |
|
| 73 | + { |
|
| 74 | + new PersistentAdminNotice( |
|
| 75 | + 'preProductionVersionAdminNotice_' . EVENT_ESPRESSO_VERSION, |
|
| 76 | + $this->warningNotice() |
|
| 77 | + ); |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | 80 | |
| 81 | - /** |
|
| 82 | - * displays message on frontend of site notifying admin that current version of EE is not a stable release |
|
| 83 | - * |
|
| 84 | - * @return void |
|
| 85 | - */ |
|
| 86 | - public function preProductionVersionWarningNotice() |
|
| 87 | - { |
|
| 88 | - echo '<div id="ee-release-candidate-notice-dv" class="ee-really-important-notice-dv"><p>'; |
|
| 89 | - echo $this->warningNotice(); // already escaped |
|
| 90 | - echo '</p></div>'; |
|
| 91 | - } |
|
| 81 | + /** |
|
| 82 | + * displays message on frontend of site notifying admin that current version of EE is not a stable release |
|
| 83 | + * |
|
| 84 | + * @return void |
|
| 85 | + */ |
|
| 86 | + public function preProductionVersionWarningNotice() |
|
| 87 | + { |
|
| 88 | + echo '<div id="ee-release-candidate-notice-dv" class="ee-really-important-notice-dv"><p>'; |
|
| 89 | + echo $this->warningNotice(); // already escaped |
|
| 90 | + echo '</p></div>'; |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | 93 | |
| 94 | - /** |
|
| 95 | - * @return string |
|
| 96 | - */ |
|
| 97 | - private function warningNotice() |
|
| 98 | - { |
|
| 99 | - return sprintf( |
|
| 100 | - esc_html__( |
|
| 101 | - 'This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', |
|
| 102 | - 'event_espresso' |
|
| 103 | - ), |
|
| 104 | - '<strong>', |
|
| 105 | - '</strong>' |
|
| 106 | - ); |
|
| 107 | - } |
|
| 94 | + /** |
|
| 95 | + * @return string |
|
| 96 | + */ |
|
| 97 | + private function warningNotice() |
|
| 98 | + { |
|
| 99 | + return sprintf( |
|
| 100 | + esc_html__( |
|
| 101 | + 'This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.', |
|
| 102 | + 'event_espresso' |
|
| 103 | + ), |
|
| 104 | + '<strong>', |
|
| 105 | + '</strong>' |
|
| 106 | + ); |
|
| 107 | + } |
|
| 108 | 108 | } |
@@ -19,59 +19,59 @@ |
||
| 19 | 19 | class RequestStack |
| 20 | 20 | { |
| 21 | 21 | |
| 22 | - /** |
|
| 23 | - * @var RequestDecoratorInterface $request_stack_app |
|
| 24 | - */ |
|
| 25 | - protected $request_stack_app; |
|
| 22 | + /** |
|
| 23 | + * @var RequestDecoratorInterface $request_stack_app |
|
| 24 | + */ |
|
| 25 | + protected $request_stack_app; |
|
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * @var RequestStackCoreAppInterface $core_app |
|
| 29 | - */ |
|
| 30 | - protected $core_app; |
|
| 27 | + /** |
|
| 28 | + * @var RequestStackCoreAppInterface $core_app |
|
| 29 | + */ |
|
| 30 | + protected $core_app; |
|
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @var RequestInterface $request |
|
| 34 | - */ |
|
| 35 | - protected $request; |
|
| 32 | + /** |
|
| 33 | + * @var RequestInterface $request |
|
| 34 | + */ |
|
| 35 | + protected $request; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * @var ResponseInterface $response |
|
| 39 | - */ |
|
| 40 | - protected $response; |
|
| 37 | + /** |
|
| 38 | + * @var ResponseInterface $response |
|
| 39 | + */ |
|
| 40 | + protected $response; |
|
| 41 | 41 | |
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @param RequestDecoratorInterface $request_stack_app |
|
| 45 | - * @param RequestStackCoreAppInterface $core_app |
|
| 46 | - */ |
|
| 47 | - public function __construct(RequestDecoratorInterface $request_stack_app, RequestStackCoreAppInterface $core_app) |
|
| 48 | - { |
|
| 49 | - $this->request_stack_app = $request_stack_app; |
|
| 50 | - $this->core_app = $core_app; |
|
| 51 | - } |
|
| 43 | + /** |
|
| 44 | + * @param RequestDecoratorInterface $request_stack_app |
|
| 45 | + * @param RequestStackCoreAppInterface $core_app |
|
| 46 | + */ |
|
| 47 | + public function __construct(RequestDecoratorInterface $request_stack_app, RequestStackCoreAppInterface $core_app) |
|
| 48 | + { |
|
| 49 | + $this->request_stack_app = $request_stack_app; |
|
| 50 | + $this->core_app = $core_app; |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * @param RequestInterface $request |
|
| 56 | - * @param ResponseInterface $response |
|
| 57 | - * @return ResponseInterface |
|
| 58 | - */ |
|
| 59 | - public function handleRequest(RequestInterface $request, ResponseInterface $response) |
|
| 60 | - { |
|
| 61 | - $this->request = $request; |
|
| 62 | - $this->response = $response; |
|
| 63 | - return $this->request_stack_app->handleRequest($request, $response); |
|
| 64 | - } |
|
| 54 | + /** |
|
| 55 | + * @param RequestInterface $request |
|
| 56 | + * @param ResponseInterface $response |
|
| 57 | + * @return ResponseInterface |
|
| 58 | + */ |
|
| 59 | + public function handleRequest(RequestInterface $request, ResponseInterface $response) |
|
| 60 | + { |
|
| 61 | + $this->request = $request; |
|
| 62 | + $this->response = $response; |
|
| 63 | + return $this->request_stack_app->handleRequest($request, $response); |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * handle_response |
|
| 69 | - * executes the handle_response() method on the RequestStackCoreAppInterface object |
|
| 70 | - * after the request stack has been fully processed |
|
| 71 | - */ |
|
| 72 | - public function handleResponse() |
|
| 73 | - { |
|
| 74 | - $this->core_app->handleResponse($this->request, $this->response); |
|
| 75 | - } |
|
| 67 | + /** |
|
| 68 | + * handle_response |
|
| 69 | + * executes the handle_response() method on the RequestStackCoreAppInterface object |
|
| 70 | + * after the request stack has been fully processed |
|
| 71 | + */ |
|
| 72 | + public function handleResponse() |
|
| 73 | + { |
|
| 74 | + $this->core_app->handleResponse($this->request, $this->response); |
|
| 75 | + } |
|
| 76 | 76 | } |
| 77 | 77 | // Location: RequestStack.php |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | public function __construct(RequestDecoratorInterface $request_stack_app, RequestStackCoreAppInterface $core_app) |
| 48 | 48 | { |
| 49 | 49 | $this->request_stack_app = $request_stack_app; |
| 50 | - $this->core_app = $core_app; |
|
| 50 | + $this->core_app = $core_app; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |