pryley /
site-reviews
@@ -18,8 +18,8 @@ discard block |
||
| 18 | 18 | public function __construct() |
| 19 | 19 | { |
| 20 | 20 | $this->dismissValuesMap = [ |
| 21 | - 'rebusify' => glsr()->version('major'), |
|
| 22 | - 'welcome' => glsr()->version('minor'), |
|
| 21 | + 'rebusify' => glsr()->version( 'major' ), |
|
| 22 | + 'welcome' => glsr()->version( 'minor' ), |
|
| 23 | 23 | ]; |
| 24 | 24 | } |
| 25 | 25 | |
@@ -30,18 +30,18 @@ discard block |
||
| 30 | 30 | public function filterAdminNotices() |
| 31 | 31 | { |
| 32 | 32 | $screen = glsr_current_screen(); |
| 33 | - $this->renderWelcomeNotice($screen->post_type); |
|
| 34 | - $this->renderRebusifyNotice($screen->post_type); |
|
| 35 | - $this->renderAddonsNotice($screen->id); |
|
| 33 | + $this->renderWelcomeNotice( $screen->post_type ); |
|
| 34 | + $this->renderRebusifyNotice( $screen->post_type ); |
|
| 35 | + $this->renderAddonsNotice( $screen->id ); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | 39 | * @return void |
| 40 | 40 | */ |
| 41 | - public function routerDismissNotice(array $request) |
|
| 41 | + public function routerDismissNotice( array $request ) |
|
| 42 | 42 | { |
| 43 | - if ($key = Arr::get($request, 'notice')) { |
|
| 44 | - $this->dismissNotice($key); |
|
| 43 | + if( $key = Arr::get( $request, 'notice' ) ) { |
|
| 44 | + $this->dismissNotice( $key ); |
|
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | |
@@ -49,9 +49,9 @@ discard block |
||
| 49 | 49 | * @param string $key |
| 50 | 50 | * @return void |
| 51 | 51 | */ |
| 52 | - protected function dismissNotice($key) |
|
| 52 | + protected function dismissNotice( $key ) |
|
| 53 | 53 | { |
| 54 | - $this->setUserMeta($key, $this->getVersionFor($key)); |
|
| 54 | + $this->setUserMeta( $key, $this->getVersionFor( $key ) ); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | /** |
@@ -59,29 +59,29 @@ discard block |
||
| 59 | 59 | * @param mixed $fallback |
| 60 | 60 | * @return mixed |
| 61 | 61 | */ |
| 62 | - protected function getUserMeta($key, $fallback) |
|
| 62 | + protected function getUserMeta( $key, $fallback ) |
|
| 63 | 63 | { |
| 64 | - $meta = get_user_meta(get_current_user_id(), static::USER_META_KEY, true); |
|
| 65 | - return Arr::get($meta, $key, $fallback); |
|
| 64 | + $meta = get_user_meta( get_current_user_id(), static::USER_META_KEY, true ); |
|
| 65 | + return Arr::get( $meta, $key, $fallback ); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
| 69 | 69 | * @param string $noticeKey |
| 70 | 70 | * @return string |
| 71 | 71 | */ |
| 72 | - protected function getVersionFor($noticeKey) |
|
| 72 | + protected function getVersionFor( $noticeKey ) |
|
| 73 | 73 | { |
| 74 | - return Arr::get($this->dismissValuesMap, $noticeKey, glsr()->version('major')); |
|
| 74 | + return Arr::get( $this->dismissValuesMap, $noticeKey, glsr()->version( 'major' ) ); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
| 78 | 78 | * @param string $screenId |
| 79 | 79 | * @return void |
| 80 | 80 | */ |
| 81 | - protected function renderAddonsNotice($screenId) |
|
| 81 | + protected function renderAddonsNotice( $screenId ) |
|
| 82 | 82 | { |
| 83 | - if (Application::POST_TYPE.'_page_addons' == $screenId) { |
|
| 84 | - echo glsr()->render('partials/notices/addons'); |
|
| 83 | + if( Application::POST_TYPE.'_page_addons' == $screenId ) { |
|
| 84 | + echo glsr()->render( 'partials/notices/addons' ); |
|
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | |
@@ -89,12 +89,12 @@ discard block |
||
| 89 | 89 | * @param string $screenPostType |
| 90 | 90 | * @return void |
| 91 | 91 | */ |
| 92 | - protected function renderRebusifyNotice($screenPostType) |
|
| 92 | + protected function renderRebusifyNotice( $screenPostType ) |
|
| 93 | 93 | { |
| 94 | - if (Application::POST_TYPE == $screenPostType |
|
| 95 | - && version_compare($this->getVersionFor('rebusify'), $this->getUserMeta('rebusify', 0), '>') |
|
| 96 | - && !glsr(OptionManager::class)->getBool('settings.general.rebusify')) { |
|
| 97 | - echo glsr()->render('partials/notices/rebusify'); |
|
| 94 | + if( Application::POST_TYPE == $screenPostType |
|
| 95 | + && version_compare( $this->getVersionFor( 'rebusify' ), $this->getUserMeta( 'rebusify', 0 ), '>' ) |
|
| 96 | + && !glsr( OptionManager::class )->getBool( 'settings.general.rebusify' ) ) { |
|
| 97 | + echo glsr()->render( 'partials/notices/rebusify' ); |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
@@ -102,16 +102,16 @@ discard block |
||
| 102 | 102 | * @param string $screenPostType |
| 103 | 103 | * @return void |
| 104 | 104 | */ |
| 105 | - protected function renderWelcomeNotice($screenPostType) |
|
| 105 | + protected function renderWelcomeNotice( $screenPostType ) |
|
| 106 | 106 | { |
| 107 | - if (Application::POST_TYPE == $screenPostType |
|
| 108 | - && version_compare($this->getVersionFor('welcome'), $this->getUserMeta('welcome', 0), '>')) { |
|
| 109 | - $welcomeText = '0.0.0' == glsr(OptionManager::class)->get('version_upgraded_from') |
|
| 110 | - ? __('Thanks for installing Site Reviews %s, we hope you love it!', 'site-reviews') |
|
| 111 | - : __('Thanks for updating to Site Reviews %s, we hope you love the changes!', 'site-reviews'); |
|
| 112 | - echo glsr()->render('partials/notices/welcome', [ |
|
| 113 | - 'text' => sprintf($welcomeText, glsr()->version), |
|
| 114 | - ]); |
|
| 107 | + if( Application::POST_TYPE == $screenPostType |
|
| 108 | + && version_compare( $this->getVersionFor( 'welcome' ), $this->getUserMeta( 'welcome', 0 ), '>' ) ) { |
|
| 109 | + $welcomeText = '0.0.0' == glsr( OptionManager::class )->get( 'version_upgraded_from' ) |
|
| 110 | + ? __( 'Thanks for installing Site Reviews %s, we hope you love it!', 'site-reviews' ) |
|
| 111 | + : __( 'Thanks for updating to Site Reviews %s, we hope you love the changes!', 'site-reviews' ); |
|
| 112 | + echo glsr()->render( 'partials/notices/welcome', [ |
|
| 113 | + 'text' => sprintf( $welcomeText, glsr()->version ), |
|
| 114 | + ] ); |
|
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | |
@@ -120,12 +120,12 @@ discard block |
||
| 120 | 120 | * @param mixed $fallback |
| 121 | 121 | * @return mixed |
| 122 | 122 | */ |
| 123 | - protected function setUserMeta($key, $value) |
|
| 123 | + protected function setUserMeta( $key, $value ) |
|
| 124 | 124 | { |
| 125 | 125 | $userId = get_current_user_id(); |
| 126 | - $meta = (array) get_user_meta($userId, static::USER_META_KEY, true); |
|
| 127 | - $meta = array_filter(wp_parse_args($meta, [])); |
|
| 126 | + $meta = (array)get_user_meta( $userId, static::USER_META_KEY, true ); |
|
| 127 | + $meta = array_filter( wp_parse_args( $meta, [] ) ); |
|
| 128 | 128 | $meta[$key] = $value; |
| 129 | - update_user_meta($userId, static::USER_META_KEY, $meta); |
|
| 129 | + update_user_meta( $userId, static::USER_META_KEY, $meta ); |
|
| 130 | 130 | } |
| 131 | 131 | } |
@@ -21,20 +21,20 @@ discard block |
||
| 21 | 21 | public function registerMenuCount() |
| 22 | 22 | { |
| 23 | 23 | global $menu, $typenow; |
| 24 | - foreach ($menu as $key => $value) { |
|
| 25 | - if (!isset($value[2]) || $value[2] != 'edit.php?post_type='.Application::POST_TYPE) { |
|
| 24 | + foreach( $menu as $key => $value ) { |
|
| 25 | + if( !isset($value[2]) || $value[2] != 'edit.php?post_type='.Application::POST_TYPE ) { |
|
| 26 | 26 | continue; |
| 27 | 27 | } |
| 28 | - $postCount = wp_count_posts(Application::POST_TYPE); |
|
| 29 | - $pendingCount = glsr(Builder::class)->span(number_format_i18n($postCount->pending), [ |
|
| 28 | + $postCount = wp_count_posts( Application::POST_TYPE ); |
|
| 29 | + $pendingCount = glsr( Builder::class )->span( number_format_i18n( $postCount->pending ), [ |
|
| 30 | 30 | 'class' => 'unapproved-count', |
| 31 | - ]); |
|
| 32 | - $awaitingModeration = glsr(Builder::class)->span($pendingCount, [ |
|
| 31 | + ] ); |
|
| 32 | + $awaitingModeration = glsr( Builder::class )->span( $pendingCount, [ |
|
| 33 | 33 | 'class' => 'awaiting-mod count-'.$postCount->pending, |
| 34 | - ]); |
|
| 35 | - $menu[$key][0].= ' '.$awaitingModeration; |
|
| 36 | - if (Application::POST_TYPE === $typenow) { |
|
| 37 | - $menu[$key][4].= ' current'; |
|
| 34 | + ] ); |
|
| 35 | + $menu[$key][0] .= ' '.$awaitingModeration; |
|
| 36 | + if( Application::POST_TYPE === $typenow ) { |
|
| 37 | + $menu[$key][4] .= ' current'; |
|
| 38 | 38 | } |
| 39 | 39 | break; |
| 40 | 40 | } |
@@ -46,19 +46,19 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | public function registerSubMenus() |
| 48 | 48 | { |
| 49 | - $pages = $this->parseWithFilter('submenu/pages', [ |
|
| 50 | - 'settings' => __('Settings', 'site-reviews'), |
|
| 51 | - 'tools' => __('Tools', 'site-reviews'), |
|
| 52 | - 'addons' => __('Add-ons', 'site-reviews'), |
|
| 53 | - 'documentation' => __('Help', 'site-reviews'), |
|
| 54 | - ]); |
|
| 55 | - foreach ($pages as $slug => $title) { |
|
| 56 | - $method = Helper::buildMethodName('render-'.$slug.'-menu'); |
|
| 57 | - $callback = apply_filters('site-reviews/addon/submenu/callback', [$this, $method], $slug); |
|
| 58 | - if (!is_callable($callback)) { |
|
| 49 | + $pages = $this->parseWithFilter( 'submenu/pages', [ |
|
| 50 | + 'settings' => __( 'Settings', 'site-reviews' ), |
|
| 51 | + 'tools' => __( 'Tools', 'site-reviews' ), |
|
| 52 | + 'addons' => __( 'Add-ons', 'site-reviews' ), |
|
| 53 | + 'documentation' => __( 'Help', 'site-reviews' ), |
|
| 54 | + ] ); |
|
| 55 | + foreach( $pages as $slug => $title ) { |
|
| 56 | + $method = Helper::buildMethodName( 'render-'.$slug.'-menu' ); |
|
| 57 | + $callback = apply_filters( 'site-reviews/addon/submenu/callback', [$this, $method], $slug ); |
|
| 58 | + if( !is_callable( $callback ) ) { |
|
| 59 | 59 | continue; |
| 60 | 60 | } |
| 61 | - add_submenu_page('edit.php?post_type='.Application::POST_TYPE, $title, $title, glsr()->getPermission($slug), $slug, $callback); |
|
| 61 | + add_submenu_page( 'edit.php?post_type='.Application::POST_TYPE, $title, $title, glsr()->getPermission( $slug ), $slug, $callback ); |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | |
@@ -69,9 +69,9 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | public function renderAddonsMenu() |
| 71 | 71 | { |
| 72 | - $this->renderPage('addons', [ |
|
| 73 | - 'template' => glsr(Template::class), |
|
| 74 | - ]); |
|
| 72 | + $this->renderPage( 'addons', [ |
|
| 73 | + 'template' => glsr( Template::class ), |
|
| 74 | + ] ); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -81,23 +81,23 @@ discard block |
||
| 81 | 81 | */ |
| 82 | 82 | public function renderDocumentationMenu() |
| 83 | 83 | { |
| 84 | - $tabs = $this->parseWithFilter('documentation/tabs', [ |
|
| 85 | - 'support' => __('Support', 'site-reviews'), |
|
| 86 | - 'faq' => __('FAQ', 'site-reviews'), |
|
| 87 | - 'shortcodes' => __('Shortcodes', 'site-reviews'), |
|
| 88 | - 'hooks' => __('Hooks', 'site-reviews'), |
|
| 89 | - 'functions' => __('Functions', 'site-reviews'), |
|
| 90 | - 'addons' => __('Addons', 'site-reviews'), |
|
| 91 | - ]); |
|
| 92 | - $addons = apply_filters('site-reviews/addon/documentation', []); |
|
| 93 | - ksort($addons); |
|
| 94 | - if (empty($addons)) { |
|
| 84 | + $tabs = $this->parseWithFilter( 'documentation/tabs', [ |
|
| 85 | + 'support' => __( 'Support', 'site-reviews' ), |
|
| 86 | + 'faq' => __( 'FAQ', 'site-reviews' ), |
|
| 87 | + 'shortcodes' => __( 'Shortcodes', 'site-reviews' ), |
|
| 88 | + 'hooks' => __( 'Hooks', 'site-reviews' ), |
|
| 89 | + 'functions' => __( 'Functions', 'site-reviews' ), |
|
| 90 | + 'addons' => __( 'Addons', 'site-reviews' ), |
|
| 91 | + ] ); |
|
| 92 | + $addons = apply_filters( 'site-reviews/addon/documentation', [] ); |
|
| 93 | + ksort( $addons ); |
|
| 94 | + if( empty($addons) ) { |
|
| 95 | 95 | unset($tabs['addons']); |
| 96 | 96 | } |
| 97 | - $this->renderPage('documentation', [ |
|
| 97 | + $this->renderPage( 'documentation', [ |
|
| 98 | 98 | 'addons' => $addons, |
| 99 | 99 | 'tabs' => $tabs, |
| 100 | - ]); |
|
| 100 | + ] ); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | /** |
@@ -107,25 +107,25 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | public function renderSettingsMenu() |
| 109 | 109 | { |
| 110 | - $tabs = $this->parseWithFilter('settings/tabs', [ |
|
| 111 | - 'general' => __('General', 'site-reviews'), |
|
| 112 | - 'reviews' => __('Reviews', 'site-reviews'), |
|
| 113 | - 'submissions' => __('Submissions', 'site-reviews'), |
|
| 114 | - 'schema' => __('Schema', 'site-reviews'), |
|
| 115 | - 'translations' => __('Translations', 'site-reviews'), |
|
| 116 | - 'addons' => __('Addons', 'site-reviews'), |
|
| 117 | - 'licenses' => __('Licenses', 'site-reviews'), |
|
| 118 | - ]); |
|
| 119 | - if (empty(Arr::get(glsr()->defaults, 'settings.addons'))) { |
|
| 110 | + $tabs = $this->parseWithFilter( 'settings/tabs', [ |
|
| 111 | + 'general' => __( 'General', 'site-reviews' ), |
|
| 112 | + 'reviews' => __( 'Reviews', 'site-reviews' ), |
|
| 113 | + 'submissions' => __( 'Submissions', 'site-reviews' ), |
|
| 114 | + 'schema' => __( 'Schema', 'site-reviews' ), |
|
| 115 | + 'translations' => __( 'Translations', 'site-reviews' ), |
|
| 116 | + 'addons' => __( 'Addons', 'site-reviews' ), |
|
| 117 | + 'licenses' => __( 'Licenses', 'site-reviews' ), |
|
| 118 | + ] ); |
|
| 119 | + if( empty(Arr::get( glsr()->defaults, 'settings.addons' )) ) { |
|
| 120 | 120 | unset($tabs['addons']); |
| 121 | 121 | } |
| 122 | - if (empty(Arr::get(glsr()->defaults, 'settings.licenses'))) { |
|
| 122 | + if( empty(Arr::get( glsr()->defaults, 'settings.licenses' )) ) { |
|
| 123 | 123 | unset($tabs['licenses']); |
| 124 | 124 | } |
| 125 | - $this->renderPage('settings', [ |
|
| 126 | - 'settings' => glsr(Settings::class), |
|
| 125 | + $this->renderPage( 'settings', [ |
|
| 126 | + 'settings' => glsr( Settings::class ), |
|
| 127 | 127 | 'tabs' => $tabs, |
| 128 | - ]); |
|
| 128 | + ] ); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -135,28 +135,28 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | public function renderToolsMenu() |
| 137 | 137 | { |
| 138 | - $tabs = $this->parseWithFilter('tools/tabs', [ |
|
| 139 | - 'general' => __('General', 'site-reviews'), |
|
| 140 | - 'sync' => __('Sync Reviews', 'site-reviews'), |
|
| 141 | - 'console' => __('Console', 'site-reviews'), |
|
| 142 | - 'system-info' => __('System Info', 'site-reviews'), |
|
| 143 | - ]); |
|
| 144 | - if (!apply_filters('site-reviews/addon/sync/enable', false)) { |
|
| 138 | + $tabs = $this->parseWithFilter( 'tools/tabs', [ |
|
| 139 | + 'general' => __( 'General', 'site-reviews' ), |
|
| 140 | + 'sync' => __( 'Sync Reviews', 'site-reviews' ), |
|
| 141 | + 'console' => __( 'Console', 'site-reviews' ), |
|
| 142 | + 'system-info' => __( 'System Info', 'site-reviews' ), |
|
| 143 | + ] ); |
|
| 144 | + if( !apply_filters( 'site-reviews/addon/sync/enable', false ) ) { |
|
| 145 | 145 | unset($tabs['sync']); |
| 146 | 146 | } |
| 147 | - $this->renderPage('tools', [ |
|
| 147 | + $this->renderPage( 'tools', [ |
|
| 148 | 148 | 'data' => [ |
| 149 | 149 | 'context' => [ |
| 150 | - 'base_url' => admin_url('edit.php?post_type='.Application::POST_TYPE), |
|
| 151 | - 'console' => strval(glsr(Console::class)), |
|
| 150 | + 'base_url' => admin_url( 'edit.php?post_type='.Application::POST_TYPE ), |
|
| 151 | + 'console' => strval( glsr( Console::class ) ), |
|
| 152 | 152 | 'id' => Application::ID, |
| 153 | - 'system' => strval(glsr(System::class)), |
|
| 153 | + 'system' => strval( glsr( System::class ) ), |
|
| 154 | 154 | ], |
| 155 | - 'services' => apply_filters('site-reviews/addon/sync/services', []), |
|
| 155 | + 'services' => apply_filters( 'site-reviews/addon/sync/services', [] ), |
|
| 156 | 156 | ], |
| 157 | 157 | 'tabs' => $tabs, |
| 158 | - 'template' => glsr(Template::class), |
|
| 159 | - ]); |
|
| 158 | + 'template' => glsr( Template::class ), |
|
| 159 | + ] ); |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
@@ -165,8 +165,8 @@ discard block |
||
| 165 | 165 | */ |
| 166 | 166 | public function setCustomPermissions() |
| 167 | 167 | { |
| 168 | - foreach (wp_roles()->roles as $role => $value) { |
|
| 169 | - wp_roles()->remove_cap($role, 'create_'.Application::POST_TYPE); |
|
| 168 | + foreach( wp_roles()->roles as $role => $value ) { |
|
| 169 | + wp_roles()->remove_cap( $role, 'create_'.Application::POST_TYPE ); |
|
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | |
@@ -175,28 +175,28 @@ discard block |
||
| 175 | 175 | */ |
| 176 | 176 | protected function getNotices() |
| 177 | 177 | { |
| 178 | - return glsr(Builder::class)->div(glsr(Notice::class)->get(), [ |
|
| 178 | + return glsr( Builder::class )->div( glsr( Notice::class )->get(), [ |
|
| 179 | 179 | 'id' => 'glsr-notices', |
| 180 | - ]); |
|
| 180 | + ] ); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | /** |
| 184 | 184 | * @param string $hookSuffix |
| 185 | 185 | * @return array |
| 186 | 186 | */ |
| 187 | - protected function parseWithFilter($hookSuffix, array $args = []) |
|
| 187 | + protected function parseWithFilter( $hookSuffix, array $args = [] ) |
|
| 188 | 188 | { |
| 189 | - return apply_filters('site-reviews/addon/'.$hookSuffix, $args); |
|
| 189 | + return apply_filters( 'site-reviews/addon/'.$hookSuffix, $args ); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | /** |
| 193 | 193 | * @param string $page |
| 194 | 194 | * @return void |
| 195 | 195 | */ |
| 196 | - protected function renderPage($page, array $data = []) |
|
| 196 | + protected function renderPage( $page, array $data = [] ) |
|
| 197 | 197 | { |
| 198 | - $data['http_referer'] = (string) wp_get_referer(); |
|
| 198 | + $data['http_referer'] = (string)wp_get_referer(); |
|
| 199 | 199 | $data['notices'] = $this->getNotices(); |
| 200 | - glsr()->render('pages/'.$page.'/index', $data); |
|
| 200 | + glsr()->render( 'pages/'.$page.'/index', $data ); |
|
| 201 | 201 | } |
| 202 | 202 | } |
@@ -29,17 +29,17 @@ discard block |
||
| 29 | 29 | * @param string $name |
| 30 | 30 | * @return void|array |
| 31 | 31 | */ |
| 32 | - public function __call($name, array $args = []) |
|
| 32 | + public function __call( $name, array $args = [] ) |
|
| 33 | 33 | { |
| 34 | - if (!method_exists($this, $name) || !in_array($name, $this->callable)) { |
|
| 34 | + if( !method_exists( $this, $name ) || !in_array( $name, $this->callable ) ) { |
|
| 35 | 35 | return; |
| 36 | 36 | } |
| 37 | - $args[0] = $this->mapKeys(Arr::get($args, 0, [])); |
|
| 38 | - $defaults = call_user_func_array([$this, $name], $args); |
|
| 39 | - $hookName = (new ReflectionClass($this))->getShortName(); |
|
| 40 | - $hookName = str_replace('Defaults', '', $hookName); |
|
| 41 | - $hookName = Str::dashCase($hookName); |
|
| 42 | - return apply_filters('site-reviews/defaults/'.$hookName, $defaults, $name); |
|
| 37 | + $args[0] = $this->mapKeys( Arr::get( $args, 0, [] ) ); |
|
| 38 | + $defaults = call_user_func_array( [$this, $name], $args ); |
|
| 39 | + $hookName = (new ReflectionClass( $this ))->getShortName(); |
|
| 40 | + $hookName = str_replace( 'Defaults', '', $hookName ); |
|
| 41 | + $hookName = Str::dashCase( $hookName ); |
|
| 42 | + return apply_filters( 'site-reviews/defaults/'.$hookName, $defaults, $name ); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
@@ -50,38 +50,38 @@ discard block |
||
| 50 | 50 | /** |
| 51 | 51 | * @return array |
| 52 | 52 | */ |
| 53 | - protected function filter(array $values = []) |
|
| 53 | + protected function filter( array $values = [] ) |
|
| 54 | 54 | { |
| 55 | - return $this->normalize($this->merge(array_filter($values)), $values); |
|
| 55 | + return $this->normalize( $this->merge( array_filter( $values ) ), $values ); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | 59 | * @return string |
| 60 | 60 | */ |
| 61 | - protected function filteredJson(array $values = []) |
|
| 61 | + protected function filteredJson( array $values = [] ) |
|
| 62 | 62 | { |
| 63 | 63 | $defaults = $this->flattenArray( |
| 64 | - array_diff_key($this->defaults(), array_flip($this->guarded)) |
|
| 64 | + array_diff_key( $this->defaults(), array_flip( $this->guarded ) ) |
|
| 65 | 65 | ); |
| 66 | 66 | $values = $this->flattenArray( |
| 67 | - shortcode_atts($defaults, $values) |
|
| 67 | + shortcode_atts( $defaults, $values ) |
|
| 68 | 68 | ); |
| 69 | - $filtered = array_filter(array_diff_assoc($values, $defaults), function ($value) { |
|
| 70 | - return !$this->isEmpty($value); |
|
| 69 | + $filtered = array_filter( array_diff_assoc( $values, $defaults ), function( $value ) { |
|
| 70 | + return !$this->isEmpty( $value ); |
|
| 71 | 71 | }); |
| 72 | - return json_encode($filtered, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); |
|
| 72 | + return json_encode( $filtered, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | 76 | * @return array |
| 77 | 77 | */ |
| 78 | - protected function flattenArray(array $values) |
|
| 78 | + protected function flattenArray( array $values ) |
|
| 79 | 79 | { |
| 80 | - array_walk($values, function (&$value) { |
|
| 81 | - if (!is_array($value)) { |
|
| 80 | + array_walk( $values, function( &$value ) { |
|
| 81 | + if( !is_array( $value ) ) { |
|
| 82 | 82 | return; |
| 83 | 83 | } |
| 84 | - $value = implode(',', $value); |
|
| 84 | + $value = implode( ',', $value ); |
|
| 85 | 85 | }); |
| 86 | 86 | return $values; |
| 87 | 87 | } |
@@ -90,18 +90,18 @@ discard block |
||
| 90 | 90 | * @param mixed $var |
| 91 | 91 | * @return bool |
| 92 | 92 | */ |
| 93 | - protected function isEmpty($var) |
|
| 93 | + protected function isEmpty( $var ) |
|
| 94 | 94 | { |
| 95 | - return !is_numeric($var) && !is_bool($var) && empty($var); |
|
| 95 | + return !is_numeric( $var ) && !is_bool( $var ) && empty($var); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
| 99 | 99 | * @return array |
| 100 | 100 | */ |
| 101 | - protected function mapKeys(array $args) |
|
| 101 | + protected function mapKeys( array $args ) |
|
| 102 | 102 | { |
| 103 | - foreach ($this->mapped as $old => $new) { |
|
| 104 | - if (array_key_exists($old, $args)) { |
|
| 103 | + foreach( $this->mapped as $old => $new ) { |
|
| 104 | + if( array_key_exists( $old, $args ) ) { |
|
| 105 | 105 | $args[$new] = $args[$old]; |
| 106 | 106 | unset($args[$old]); |
| 107 | 107 | } |
@@ -112,26 +112,26 @@ discard block |
||
| 112 | 112 | /** |
| 113 | 113 | * @return array |
| 114 | 114 | */ |
| 115 | - protected function merge(array $values = []) |
|
| 115 | + protected function merge( array $values = [] ) |
|
| 116 | 116 | { |
| 117 | - return $this->normalize(wp_parse_args($values, $this->defaults()), $values); |
|
| 117 | + return $this->normalize( wp_parse_args( $values, $this->defaults() ), $values ); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | 121 | * @return array |
| 122 | 122 | */ |
| 123 | - protected function normalize(array $values, array $originalValues) |
|
| 123 | + protected function normalize( array $values, array $originalValues ) |
|
| 124 | 124 | { |
| 125 | - $values['json'] = $this->filteredJson($originalValues); |
|
| 125 | + $values['json'] = $this->filteredJson( $originalValues ); |
|
| 126 | 126 | return $values; |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | /** |
| 130 | 130 | * @return array |
| 131 | 131 | */ |
| 132 | - protected function restrict(array $values = []) |
|
| 132 | + protected function restrict( array $values = [] ) |
|
| 133 | 133 | { |
| 134 | - return $this->normalize(shortcode_atts($this->defaults(), $values), $values); |
|
| 134 | + return $this->normalize( shortcode_atts( $this->defaults(), $values ), $values ); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | 137 | /** |
@@ -139,6 +139,6 @@ discard block |
||
| 139 | 139 | */ |
| 140 | 140 | protected function unguarded() |
| 141 | 141 | { |
| 142 | - return array_diff_key($this->defaults(), array_flip($this->guarded)); |
|
| 142 | + return array_diff_key( $this->defaults(), array_flip( $this->guarded ) ); |
|
| 143 | 143 | } |
| 144 | 144 | } |
@@ -19,11 +19,11 @@ discard block |
||
| 19 | 19 | /** |
| 20 | 20 | * @return false|Review |
| 21 | 21 | */ |
| 22 | - public function create(CreateReview $command) |
|
| 22 | + public function create( CreateReview $command ) |
|
| 23 | 23 | { |
| 24 | - $reviewValues = glsr(CreateReviewDefaults::class)->restrict((array) $command); |
|
| 25 | - $reviewValues = apply_filters('site-reviews/create/review-values', $reviewValues, $command); |
|
| 26 | - $reviewValues = Arr::prefixArrayKeys($reviewValues); |
|
| 24 | + $reviewValues = glsr( CreateReviewDefaults::class )->restrict( (array)$command ); |
|
| 25 | + $reviewValues = apply_filters( 'site-reviews/create/review-values', $reviewValues, $command ); |
|
| 26 | + $reviewValues = Arr::prefixArrayKeys( $reviewValues ); |
|
| 27 | 27 | unset($reviewValues['json']); // @todo remove the need for this |
| 28 | 28 | $postValues = [ |
| 29 | 29 | 'comment_status' => 'closed', |
@@ -31,20 +31,20 @@ discard block |
||
| 31 | 31 | 'ping_status' => 'closed', |
| 32 | 32 | 'post_content' => $reviewValues['_content'], |
| 33 | 33 | 'post_date' => $reviewValues['_date'], |
| 34 | - 'post_date_gmt' => get_gmt_from_date($reviewValues['_date']), |
|
| 34 | + 'post_date_gmt' => get_gmt_from_date( $reviewValues['_date'] ), |
|
| 35 | 35 | 'post_name' => $reviewValues['_review_type'].'-'.$reviewValues['_review_id'], |
| 36 | - 'post_status' => $this->getNewPostStatus($reviewValues, $command->blacklisted), |
|
| 36 | + 'post_status' => $this->getNewPostStatus( $reviewValues, $command->blacklisted ), |
|
| 37 | 37 | 'post_title' => $reviewValues['_title'], |
| 38 | 38 | 'post_type' => Application::POST_TYPE, |
| 39 | 39 | ]; |
| 40 | - $postId = wp_insert_post($postValues, true); |
|
| 41 | - if (is_wp_error($postId)) { |
|
| 42 | - glsr_log()->error($postId->get_error_message())->debug($postValues); |
|
| 40 | + $postId = wp_insert_post( $postValues, true ); |
|
| 41 | + if( is_wp_error( $postId ) ) { |
|
| 42 | + glsr_log()->error( $postId->get_error_message() )->debug( $postValues ); |
|
| 43 | 43 | return false; |
| 44 | 44 | } |
| 45 | - $this->setTerms($postId, $command->category); |
|
| 46 | - $review = $this->single(get_post($postId)); |
|
| 47 | - do_action('site-reviews/review/created', $review, $command); |
|
| 45 | + $this->setTerms( $postId, $command->category ); |
|
| 46 | + $review = $this->single( get_post( $postId ) ); |
|
| 47 | + do_action( 'site-reviews/review/created', $review, $command ); |
|
| 48 | 48 | return $review; |
| 49 | 49 | } |
| 50 | 50 | |
@@ -52,29 +52,29 @@ discard block |
||
| 52 | 52 | * @param string $metaReviewId |
| 53 | 53 | * @return void |
| 54 | 54 | */ |
| 55 | - public function delete($metaReviewId) |
|
| 55 | + public function delete( $metaReviewId ) |
|
| 56 | 56 | { |
| 57 | - if ($postId = $this->getPostId($metaReviewId)) { |
|
| 58 | - wp_delete_post($postId, true); |
|
| 57 | + if( $postId = $this->getPostId( $metaReviewId ) ) { |
|
| 58 | + wp_delete_post( $postId, true ); |
|
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | 63 | * @return object |
| 64 | 64 | */ |
| 65 | - public function get(array $args = []) |
|
| 65 | + public function get( array $args = [] ) |
|
| 66 | 66 | { |
| 67 | - $args = glsr(ReviewsDefaults::class)->merge($args); |
|
| 68 | - $metaQuery = glsr(QueryBuilder::class)->buildQuery( |
|
| 67 | + $args = glsr( ReviewsDefaults::class )->merge( $args ); |
|
| 68 | + $metaQuery = glsr( QueryBuilder::class )->buildQuery( |
|
| 69 | 69 | ['assigned_to', 'email', 'ip_address', 'type', 'rating'], |
| 70 | 70 | $args |
| 71 | 71 | ); |
| 72 | - $taxQuery = glsr(QueryBuilder::class)->buildQuery( |
|
| 72 | + $taxQuery = glsr( QueryBuilder::class )->buildQuery( |
|
| 73 | 73 | ['category'], |
| 74 | - ['category' => $this->normalizeTermIds($args['category'])] |
|
| 74 | + ['category' => $this->normalizeTermIds( $args['category'] )] |
|
| 75 | 75 | ); |
| 76 | - $paged = glsr(QueryBuilder::class)->getPaged( |
|
| 77 | - wp_validate_boolean($args['pagination']) |
|
| 76 | + $paged = glsr( QueryBuilder::class )->getPaged( |
|
| 77 | + wp_validate_boolean( $args['pagination'] ) |
|
| 78 | 78 | ); |
| 79 | 79 | $parameters = [ |
| 80 | 80 | 'meta_key' => '_pinned', |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | 'offset' => $args['offset'], |
| 83 | 83 | 'order' => $args['order'], |
| 84 | 84 | 'orderby' => 'meta_value '.$args['orderby'], |
| 85 | - 'paged' => Arr::get($args, 'paged', $paged), |
|
| 85 | + 'paged' => Arr::get( $args, 'paged', $paged ), |
|
| 86 | 86 | 'post__in' => $args['post__in'], |
| 87 | 87 | 'post__not_in' => $args['post__not_in'], |
| 88 | 88 | 'post_status' => 'publish', |
@@ -90,62 +90,62 @@ discard block |
||
| 90 | 90 | 'posts_per_page' => $args['per_page'], |
| 91 | 91 | 'tax_query' => $taxQuery, |
| 92 | 92 | ]; |
| 93 | - $parameters = apply_filters('site-reviews/get/reviews/query', $parameters, $args); |
|
| 94 | - $query = new WP_Query($parameters); |
|
| 95 | - $results = array_map([$this, 'single'], $query->posts); |
|
| 96 | - $reviews = new Reviews($results, $query->max_num_pages, $args); |
|
| 97 | - return apply_filters('site-reviews/get/reviews', $reviews, $query); |
|
| 93 | + $parameters = apply_filters( 'site-reviews/get/reviews/query', $parameters, $args ); |
|
| 94 | + $query = new WP_Query( $parameters ); |
|
| 95 | + $results = array_map( [$this, 'single'], $query->posts ); |
|
| 96 | + $reviews = new Reviews( $results, $query->max_num_pages, $args ); |
|
| 97 | + return apply_filters( 'site-reviews/get/reviews', $reviews, $query ); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /** |
| 101 | 101 | * @param string $metaReviewId |
| 102 | 102 | * @return int |
| 103 | 103 | */ |
| 104 | - public function getPostId($metaReviewId) |
|
| 104 | + public function getPostId( $metaReviewId ) |
|
| 105 | 105 | { |
| 106 | - return glsr(SqlQueries::class)->getPostIdFromReviewId($metaReviewId); |
|
| 106 | + return glsr( SqlQueries::class )->getPostIdFromReviewId( $metaReviewId ); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | /** |
| 110 | 110 | * @return array |
| 111 | 111 | */ |
| 112 | - public function getRatingCounts(array $args = []) |
|
| 112 | + public function getRatingCounts( array $args = [] ) |
|
| 113 | 113 | { |
| 114 | - $args = glsr(SiteReviewsSummaryDefaults::class)->filter($args); |
|
| 115 | - $counts = glsr(CountsManager::class)->get([ |
|
| 116 | - 'post_ids' => Arr::convertStringToArray($args['assigned_to']), |
|
| 117 | - 'term_ids' => $this->normalizeTermIds($args['category']), |
|
| 114 | + $args = glsr( SiteReviewsSummaryDefaults::class )->filter( $args ); |
|
| 115 | + $counts = glsr( CountsManager::class )->get( [ |
|
| 116 | + 'post_ids' => Arr::convertStringToArray( $args['assigned_to'] ), |
|
| 117 | + 'term_ids' => $this->normalizeTermIds( $args['category'] ), |
|
| 118 | 118 | 'type' => $args['type'], |
| 119 | - ]); |
|
| 120 | - return glsr(CountsManager::class)->flatten($counts, [ |
|
| 119 | + ] ); |
|
| 120 | + return glsr( CountsManager::class )->flatten( $counts, [ |
|
| 121 | 121 | 'min' => $args['rating'], |
| 122 | - ]); |
|
| 122 | + ] ); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | /** |
| 126 | 126 | * @param string $commaSeparatedTermIds |
| 127 | 127 | * @return array |
| 128 | 128 | */ |
| 129 | - public function normalizeTermIds($commaSeparatedTermIds) |
|
| 129 | + public function normalizeTermIds( $commaSeparatedTermIds ) |
|
| 130 | 130 | { |
| 131 | - $termIds = glsr_array_column($this->normalizeTerms($commaSeparatedTermIds), 'term_id'); |
|
| 132 | - return array_unique(array_map('intval', $termIds)); |
|
| 131 | + $termIds = glsr_array_column( $this->normalizeTerms( $commaSeparatedTermIds ), 'term_id' ); |
|
| 132 | + return array_unique( array_map( 'intval', $termIds ) ); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | /** |
| 136 | 136 | * @param string $commaSeparatedTermIds |
| 137 | 137 | * @return array |
| 138 | 138 | */ |
| 139 | - public function normalizeTerms($commaSeparatedTermIds) |
|
| 139 | + public function normalizeTerms( $commaSeparatedTermIds ) |
|
| 140 | 140 | { |
| 141 | 141 | $terms = []; |
| 142 | - $termIds = Arr::convertStringToArray($commaSeparatedTermIds); |
|
| 143 | - foreach ($termIds as $termId) { |
|
| 144 | - if (is_numeric($termId)) { |
|
| 145 | - $termId = intval($termId); |
|
| 142 | + $termIds = Arr::convertStringToArray( $commaSeparatedTermIds ); |
|
| 143 | + foreach( $termIds as $termId ) { |
|
| 144 | + if( is_numeric( $termId ) ) { |
|
| 145 | + $termId = intval( $termId ); |
|
| 146 | 146 | } |
| 147 | - $term = term_exists($termId, Application::TAXONOMY); |
|
| 148 | - if (!isset($term['term_id'])) { |
|
| 147 | + $term = term_exists( $termId, Application::TAXONOMY ); |
|
| 148 | + if( !isset($term['term_id']) ) { |
|
| 149 | 149 | continue; |
| 150 | 150 | } |
| 151 | 151 | $terms[] = $term; |
@@ -157,44 +157,44 @@ discard block |
||
| 157 | 157 | * @param int $postId |
| 158 | 158 | * @return void |
| 159 | 159 | */ |
| 160 | - public function revert($postId) |
|
| 160 | + public function revert( $postId ) |
|
| 161 | 161 | { |
| 162 | - if (Application::POST_TYPE != get_post_field('post_type', $postId)) { |
|
| 162 | + if( Application::POST_TYPE != get_post_field( 'post_type', $postId ) ) { |
|
| 163 | 163 | return; |
| 164 | 164 | } |
| 165 | - delete_post_meta($postId, '_edit_last'); |
|
| 166 | - $result = wp_update_post([ |
|
| 165 | + delete_post_meta( $postId, '_edit_last' ); |
|
| 166 | + $result = wp_update_post( [ |
|
| 167 | 167 | 'ID' => $postId, |
| 168 | - 'post_content' => glsr(Database::class)->get($postId, 'content'), |
|
| 169 | - 'post_date' => glsr(Database::class)->get($postId, 'date'), |
|
| 170 | - 'post_title' => glsr(Database::class)->get($postId, 'title'), |
|
| 171 | - ]); |
|
| 172 | - if (is_wp_error($result)) { |
|
| 173 | - glsr_log()->error($result->get_error_message()); |
|
| 168 | + 'post_content' => glsr( Database::class )->get( $postId, 'content' ), |
|
| 169 | + 'post_date' => glsr( Database::class )->get( $postId, 'date' ), |
|
| 170 | + 'post_title' => glsr( Database::class )->get( $postId, 'title' ), |
|
| 171 | + ] ); |
|
| 172 | + if( is_wp_error( $result ) ) { |
|
| 173 | + glsr_log()->error( $result->get_error_message() ); |
|
| 174 | 174 | return; |
| 175 | 175 | } |
| 176 | - do_action('site-reviews/review/reverted', glsr_get_review($postId)); |
|
| 176 | + do_action( 'site-reviews/review/reverted', glsr_get_review( $postId ) ); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | /** |
| 180 | 180 | * @return Review |
| 181 | 181 | */ |
| 182 | - public function single(WP_Post $post) |
|
| 182 | + public function single( WP_Post $post ) |
|
| 183 | 183 | { |
| 184 | - if (Application::POST_TYPE != $post->post_type) { |
|
| 185 | - $post = new WP_Post((object) []); |
|
| 184 | + if( Application::POST_TYPE != $post->post_type ) { |
|
| 185 | + $post = new WP_Post( (object)[] ); |
|
| 186 | 186 | } |
| 187 | - $review = new Review($post); |
|
| 188 | - return apply_filters('site-reviews/get/review', $review, $post); |
|
| 187 | + $review = new Review( $post ); |
|
| 188 | + return apply_filters( 'site-reviews/get/review', $review, $post ); |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | /** |
| 192 | 192 | * @param bool $isBlacklisted |
| 193 | 193 | * @return string |
| 194 | 194 | */ |
| 195 | - protected function getNewPostStatus(array $reviewValues, $isBlacklisted) |
|
| 195 | + protected function getNewPostStatus( array $reviewValues, $isBlacklisted ) |
|
| 196 | 196 | { |
| 197 | - $requireApproval = glsr(OptionManager::class)->getBool('settings.general.require.approval'); |
|
| 197 | + $requireApproval = glsr( OptionManager::class )->getBool( 'settings.general.require.approval' ); |
|
| 198 | 198 | return 'local' == $reviewValues['_review_type'] && ($requireApproval || $isBlacklisted) |
| 199 | 199 | ? 'pending' |
| 200 | 200 | : 'publish'; |
@@ -205,15 +205,15 @@ discard block |
||
| 205 | 205 | * @param string $termIds |
| 206 | 206 | * @return void |
| 207 | 207 | */ |
| 208 | - protected function setTerms($postId, $termIds) |
|
| 208 | + protected function setTerms( $postId, $termIds ) |
|
| 209 | 209 | { |
| 210 | - $termIds = $this->normalizeTermIds($termIds); |
|
| 211 | - if (empty($termIds)) { |
|
| 210 | + $termIds = $this->normalizeTermIds( $termIds ); |
|
| 211 | + if( empty($termIds) ) { |
|
| 212 | 212 | return; |
| 213 | 213 | } |
| 214 | - $termTaxonomyIds = wp_set_object_terms($postId, $termIds, Application::TAXONOMY); |
|
| 215 | - if (is_wp_error($termTaxonomyIds)) { |
|
| 216 | - glsr_log()->error($termTaxonomyIds->get_error_message()); |
|
| 214 | + $termTaxonomyIds = wp_set_object_terms( $postId, $termIds, Application::TAXONOMY ); |
|
| 215 | + if( is_wp_error( $termTaxonomyIds ) ) { |
|
| 216 | + glsr_log()->error( $termTaxonomyIds->get_error_message() ); |
|
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | } |
@@ -30,13 +30,13 @@ discard block |
||
| 30 | 30 | public function __construct() |
| 31 | 31 | { |
| 32 | 32 | static::$instance = $this; |
| 33 | - $this->file = realpath(trailingslashit(dirname(__DIR__)).static::ID.'.php'); |
|
| 34 | - $plugin = get_file_data($this->file, [ |
|
| 33 | + $this->file = realpath( trailingslashit( dirname( __DIR__ ) ).static::ID.'.php' ); |
|
| 34 | + $plugin = get_file_data( $this->file, [ |
|
| 35 | 35 | 'languages' => 'Domain Path', |
| 36 | 36 | 'name' => 'Plugin Name', |
| 37 | 37 | 'version' => 'Version', |
| 38 | - ], 'plugin'); |
|
| 39 | - array_walk($plugin, function ($value, $key) { |
|
| 38 | + ], 'plugin' ); |
|
| 39 | + array_walk( $plugin, function( $value, $key ) { |
|
| 40 | 40 | $this->$key = $value; |
| 41 | 41 | }); |
| 42 | 42 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | public function activate() |
| 48 | 48 | { |
| 49 | - $this->make(DefaultsManager::class)->set(); |
|
| 49 | + $this->make( DefaultsManager::class )->set(); |
|
| 50 | 50 | $this->scheduleCronJob(); |
| 51 | 51 | $this->upgrade(); |
| 52 | 52 | } |
@@ -57,34 +57,34 @@ discard block |
||
| 57 | 57 | public function catchFatalError() |
| 58 | 58 | { |
| 59 | 59 | $error = error_get_last(); |
| 60 | - if (E_ERROR !== $error['type'] || !Str::contains($error['message'], $this->path())) { |
|
| 60 | + if( E_ERROR !== $error['type'] || !Str::contains( $error['message'], $this->path() ) ) { |
|
| 61 | 61 | return; |
| 62 | 62 | } |
| 63 | - glsr_log()->error($error['message']); |
|
| 63 | + glsr_log()->error( $error['message'] ); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | /** |
| 67 | 67 | * @param string $name |
| 68 | 68 | * @return array |
| 69 | 69 | */ |
| 70 | - public function config($name) |
|
| 70 | + public function config( $name ) |
|
| 71 | 71 | { |
| 72 | - $configFile = $this->path('config/'.$name.'.php'); |
|
| 73 | - $config = file_exists($configFile) |
|
| 72 | + $configFile = $this->path( 'config/'.$name.'.php' ); |
|
| 73 | + $config = file_exists( $configFile ) |
|
| 74 | 74 | ? include $configFile |
| 75 | 75 | : []; |
| 76 | - return apply_filters('site-reviews/config/'.$name, $config); |
|
| 76 | + return apply_filters( 'site-reviews/config/'.$name, $config ); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | 80 | * @param string $property |
| 81 | 81 | * @return string |
| 82 | 82 | */ |
| 83 | - public function constant($property, $className = 'static') |
|
| 83 | + public function constant( $property, $className = 'static' ) |
|
| 84 | 84 | { |
| 85 | 85 | $constant = $className.'::'.$property; |
| 86 | - return defined($constant) |
|
| 87 | - ? apply_filters('site-reviews/const/'.$property, constant($constant)) |
|
| 86 | + return defined( $constant ) |
|
| 87 | + ? apply_filters( 'site-reviews/const/'.$property, constant( $constant ) ) |
|
| 88 | 88 | : ''; |
| 89 | 89 | } |
| 90 | 90 | |
@@ -100,17 +100,17 @@ discard block |
||
| 100 | 100 | * @param string $view |
| 101 | 101 | * @return void|string |
| 102 | 102 | */ |
| 103 | - public function file($view) |
|
| 103 | + public function file( $view ) |
|
| 104 | 104 | { |
| 105 | - $view.= '.php'; |
|
| 105 | + $view .= '.php'; |
|
| 106 | 106 | $filePaths = []; |
| 107 | - if (Str::startsWith('templates/', $view)) { |
|
| 108 | - $filePaths[] = $this->themePath(Str::removePrefix('templates/', $view)); |
|
| 107 | + if( Str::startsWith( 'templates/', $view ) ) { |
|
| 108 | + $filePaths[] = $this->themePath( Str::removePrefix( 'templates/', $view ) ); |
|
| 109 | 109 | } |
| 110 | - $filePaths[] = $this->path($view); |
|
| 111 | - $filePaths[] = $this->path('views/'.$view); |
|
| 112 | - foreach ($filePaths as $file) { |
|
| 113 | - if (!file_exists($file)) { |
|
| 110 | + $filePaths[] = $this->path( $view ); |
|
| 111 | + $filePaths[] = $this->path( 'views/'.$view ); |
|
| 112 | + foreach( $filePaths as $file ) { |
|
| 113 | + if( !file_exists( $file ) ) { |
|
| 114 | 114 | continue; |
| 115 | 115 | } |
| 116 | 116 | return $file; |
@@ -122,33 +122,33 @@ discard block |
||
| 122 | 122 | */ |
| 123 | 123 | public function getDefaults() |
| 124 | 124 | { |
| 125 | - if (empty($this->defaults)) { |
|
| 126 | - $this->defaults = $this->make(DefaultsManager::class)->get(); |
|
| 125 | + if( empty($this->defaults) ) { |
|
| 126 | + $this->defaults = $this->make( DefaultsManager::class )->get(); |
|
| 127 | 127 | $this->upgrade(); |
| 128 | 128 | } |
| 129 | - return apply_filters('site-reviews/get/defaults', $this->defaults); |
|
| 129 | + return apply_filters( 'site-reviews/get/defaults', $this->defaults ); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | /** |
| 133 | 133 | * @return string |
| 134 | 134 | */ |
| 135 | - public function getPermission($page = '') |
|
| 135 | + public function getPermission( $page = '' ) |
|
| 136 | 136 | { |
| 137 | 137 | $permissions = [ |
| 138 | 138 | 'addons' => 'install_plugins', |
| 139 | 139 | 'settings' => 'manage_options', |
| 140 | 140 | // 'welcome' => 'activate_plugins', |
| 141 | 141 | ]; |
| 142 | - return Arr::get($permissions, $page, $this->constant('CAPABILITY')); |
|
| 142 | + return Arr::get( $permissions, $page, $this->constant( 'CAPABILITY' ) ); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | /** |
| 146 | 146 | * @return bool |
| 147 | 147 | */ |
| 148 | - public function hasPermission($page = '') |
|
| 148 | + public function hasPermission( $page = '' ) |
|
| 149 | 149 | { |
| 150 | 150 | $isAdmin = $this->isAdmin(); |
| 151 | - return !$isAdmin || ($isAdmin && current_user_can($this->getPermission($page))); |
|
| 151 | + return !$isAdmin || ($isAdmin && current_user_can( $this->getPermission( $page ) )); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | /** |
@@ -156,8 +156,8 @@ discard block |
||
| 156 | 156 | */ |
| 157 | 157 | public function init() |
| 158 | 158 | { |
| 159 | - $this->make(Actions::class)->run(); |
|
| 160 | - $this->make(Filters::class)->run(); |
|
| 159 | + $this->make( Actions::class )->run(); |
|
| 160 | + $this->make( Filters::class )->run(); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | /** |
@@ -172,14 +172,14 @@ discard block |
||
| 172 | 172 | * @param string $file |
| 173 | 173 | * @return string |
| 174 | 174 | */ |
| 175 | - public function path($file = '', $realpath = true) |
|
| 175 | + public function path( $file = '', $realpath = true ) |
|
| 176 | 176 | { |
| 177 | - $path = plugin_dir_path($this->file); |
|
| 178 | - if (!$realpath) { |
|
| 179 | - $path = trailingslashit(WP_PLUGIN_DIR).basename(dirname($this->file)); |
|
| 177 | + $path = plugin_dir_path( $this->file ); |
|
| 178 | + if( !$realpath ) { |
|
| 179 | + $path = trailingslashit( WP_PLUGIN_DIR ).basename( dirname( $this->file ) ); |
|
| 180 | 180 | } |
| 181 | - $path = trailingslashit($path).ltrim(trim($file), '/'); |
|
| 182 | - return apply_filters('site-reviews/path', $path, $file); |
|
| 181 | + $path = trailingslashit( $path ).ltrim( trim( $file ), '/' ); |
|
| 182 | + return apply_filters( 'site-reviews/path', $path, $file ); |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | /** |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | */ |
| 188 | 188 | public function registerAddons() |
| 189 | 189 | { |
| 190 | - do_action('site-reviews/addon/register', $this); |
|
| 190 | + do_action( 'site-reviews/addon/register', $this ); |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | /** |
@@ -195,8 +195,8 @@ discard block |
||
| 195 | 195 | */ |
| 196 | 196 | public function registerLanguages() |
| 197 | 197 | { |
| 198 | - load_plugin_textdomain(static::ID, false, |
|
| 199 | - trailingslashit(plugin_basename($this->path()).'/'.$this->languages) |
|
| 198 | + load_plugin_textdomain( static::ID, false, |
|
| 199 | + trailingslashit( plugin_basename( $this->path() ).'/'.$this->languages ) |
|
| 200 | 200 | ); |
| 201 | 201 | } |
| 202 | 202 | |
@@ -205,26 +205,26 @@ discard block |
||
| 205 | 205 | */ |
| 206 | 206 | public function registerReviewTypes() |
| 207 | 207 | { |
| 208 | - $types = apply_filters('site-reviews/addon/types', []); |
|
| 209 | - $this->reviewTypes = wp_parse_args($types, [ |
|
| 210 | - 'local' => __('Local', 'site-reviews'), |
|
| 211 | - ]); |
|
| 208 | + $types = apply_filters( 'site-reviews/addon/types', [] ); |
|
| 209 | + $this->reviewTypes = wp_parse_args( $types, [ |
|
| 210 | + 'local' => __( 'Local', 'site-reviews' ), |
|
| 211 | + ] ); |
|
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | /** |
| 215 | 215 | * @param string $view |
| 216 | 216 | * @return void |
| 217 | 217 | */ |
| 218 | - public function render($view, array $data = []) |
|
| 218 | + public function render( $view, array $data = [] ) |
|
| 219 | 219 | { |
| 220 | - $view = apply_filters('site-reviews/render/view', $view, $data); |
|
| 221 | - $file = apply_filters('site-reviews/views/file', $this->file($view), $view, $data); |
|
| 222 | - if (!file_exists($file)) { |
|
| 223 | - glsr_log()->error('File not found: '.$file); |
|
| 220 | + $view = apply_filters( 'site-reviews/render/view', $view, $data ); |
|
| 221 | + $file = apply_filters( 'site-reviews/views/file', $this->file( $view ), $view, $data ); |
|
| 222 | + if( !file_exists( $file ) ) { |
|
| 223 | + glsr_log()->error( 'File not found: '.$file ); |
|
| 224 | 224 | return; |
| 225 | 225 | } |
| 226 | - $data = apply_filters('site-reviews/views/data', $data, $view); |
|
| 227 | - extract($data); |
|
| 226 | + $data = apply_filters( 'site-reviews/views/data', $data, $view ); |
|
| 227 | + extract( $data ); |
|
| 228 | 228 | include $file; |
| 229 | 229 | } |
| 230 | 230 | |
@@ -233,19 +233,19 @@ discard block |
||
| 233 | 233 | */ |
| 234 | 234 | public function scheduleCronJob() |
| 235 | 235 | { |
| 236 | - if (wp_next_scheduled(static::CRON_EVENT)) { |
|
| 236 | + if( wp_next_scheduled( static::CRON_EVENT ) ) { |
|
| 237 | 237 | return; |
| 238 | 238 | } |
| 239 | - wp_schedule_event(time(), 'twicedaily', static::CRON_EVENT); |
|
| 239 | + wp_schedule_event( time(), 'twicedaily', static::CRON_EVENT ); |
|
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | /** |
| 243 | 243 | * @param string $file |
| 244 | 244 | * @return string |
| 245 | 245 | */ |
| 246 | - public function themePath($file = '') |
|
| 246 | + public function themePath( $file = '' ) |
|
| 247 | 247 | { |
| 248 | - return get_stylesheet_directory().'/'.static::ID.'/'.ltrim(trim($file), '/'); |
|
| 248 | + return get_stylesheet_directory().'/'.static::ID.'/'.ltrim( trim( $file ), '/' ); |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | /** |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | */ |
| 254 | 254 | public function unscheduleCronJob() |
| 255 | 255 | { |
| 256 | - wp_unschedule_event(intval(wp_next_scheduled(static::CRON_EVENT)), static::CRON_EVENT); |
|
| 256 | + wp_unschedule_event( intval( wp_next_scheduled( static::CRON_EVENT ) ), static::CRON_EVENT ); |
|
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | /** |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | */ |
| 262 | 262 | public function upgrade() |
| 263 | 263 | { |
| 264 | - $this->make(Upgrader::class)->run(); |
|
| 264 | + $this->make( Upgrader::class )->run(); |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | /** |
@@ -269,10 +269,10 @@ discard block |
||
| 269 | 269 | * @return void |
| 270 | 270 | * @action upgrader_process_complete |
| 271 | 271 | */ |
| 272 | - public function upgraded($upgrader, array $data) |
|
| 272 | + public function upgraded( $upgrader, array $data ) |
|
| 273 | 273 | { |
| 274 | - if (array_key_exists('plugins', $data) |
|
| 275 | - && in_array(plugin_basename($this->file), $data['plugins']) |
|
| 274 | + if( array_key_exists( 'plugins', $data ) |
|
| 275 | + && in_array( plugin_basename( $this->file ), $data['plugins'] ) |
|
| 276 | 276 | && 'update' === $data['action'] |
| 277 | 277 | && 'plugin' === $data['type'] |
| 278 | 278 | ) { |
@@ -284,29 +284,29 @@ discard block |
||
| 284 | 284 | * @param string $path |
| 285 | 285 | * @return string |
| 286 | 286 | */ |
| 287 | - public function url($path = '') |
|
| 287 | + public function url( $path = '' ) |
|
| 288 | 288 | { |
| 289 | - $url = esc_url(plugin_dir_url($this->file).ltrim(trim($path), '/')); |
|
| 290 | - return apply_filters('site-reviews/url', $url, $path); |
|
| 289 | + $url = esc_url( plugin_dir_url( $this->file ).ltrim( trim( $path ), '/' ) ); |
|
| 290 | + return apply_filters( 'site-reviews/url', $url, $path ); |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | /** |
| 294 | 294 | * @param string $versionLevel |
| 295 | 295 | * @return string |
| 296 | 296 | */ |
| 297 | - public function version($versionLevel = '') |
|
| 297 | + public function version( $versionLevel = '' ) |
|
| 298 | 298 | { |
| 299 | 299 | $pattern = '/^v?(\d{1,5})(\.\d++)?(\.\d++)?(.+)?$/i'; |
| 300 | - preg_match($pattern, $this->version, $matches); |
|
| 301 | - switch ($versionLevel) { |
|
| 300 | + preg_match( $pattern, $this->version, $matches ); |
|
| 301 | + switch( $versionLevel ) { |
|
| 302 | 302 | case 'major': |
| 303 | - $version = Arr::get($matches, 1); |
|
| 303 | + $version = Arr::get( $matches, 1 ); |
|
| 304 | 304 | break; |
| 305 | 305 | case 'minor': |
| 306 | - $version = Arr::get($matches, 1).Arr::get($matches, 2); |
|
| 306 | + $version = Arr::get( $matches, 1 ).Arr::get( $matches, 2 ); |
|
| 307 | 307 | break; |
| 308 | 308 | case 'patch': |
| 309 | - $version = Arr::get($matches, 1).Arr::get($matches, 2).Arr::get($matches, 3); |
|
| 309 | + $version = Arr::get( $matches, 1 ).Arr::get( $matches, 2 ).Arr::get( $matches, 3 ); |
|
| 310 | 310 | break; |
| 311 | 311 | } |
| 312 | 312 | return empty($version) |
@@ -20,15 +20,15 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | public function approve() |
| 22 | 22 | { |
| 23 | - if (Application::ID != filter_input(INPUT_GET, 'plugin')) { |
|
| 23 | + if( Application::ID != filter_input( INPUT_GET, 'plugin' ) ) { |
|
| 24 | 24 | return; |
| 25 | 25 | } |
| 26 | - check_admin_referer('approve-review_'.($postId = $this->getPostId())); |
|
| 27 | - wp_update_post([ |
|
| 26 | + check_admin_referer( 'approve-review_'.($postId = $this->getPostId()) ); |
|
| 27 | + wp_update_post( [ |
|
| 28 | 28 | 'ID' => $postId, |
| 29 | 29 | 'post_status' => 'publish', |
| 30 | - ]); |
|
| 31 | - wp_safe_redirect(wp_get_referer()); |
|
| 30 | + ] ); |
|
| 31 | + wp_safe_redirect( wp_get_referer() ); |
|
| 32 | 32 | exit; |
| 33 | 33 | } |
| 34 | 34 | |
@@ -37,20 +37,20 @@ discard block |
||
| 37 | 37 | * @return array |
| 38 | 38 | * @filter manage_.Application::POST_TYPE._posts_columns |
| 39 | 39 | */ |
| 40 | - public function filterColumnsForPostType($columns) |
|
| 40 | + public function filterColumnsForPostType( $columns ) |
|
| 41 | 41 | { |
| 42 | - $columns = Arr::consolidateArray($columns); |
|
| 42 | + $columns = Arr::consolidateArray( $columns ); |
|
| 43 | 43 | $postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE]; |
| 44 | - foreach ($postTypeColumns as $key => &$value) { |
|
| 45 | - if (!array_key_exists($key, $columns) || !empty($value)) { |
|
| 44 | + foreach( $postTypeColumns as $key => &$value ) { |
|
| 45 | + if( !array_key_exists( $key, $columns ) || !empty($value) ) { |
|
| 46 | 46 | continue; |
| 47 | 47 | } |
| 48 | 48 | $value = $columns[$key]; |
| 49 | 49 | } |
| 50 | - if (count(glsr(Database::class)->getReviewsMeta('review_type')) < 2) { |
|
| 50 | + if( count( glsr( Database::class )->getReviewsMeta( 'review_type' ) ) < 2 ) { |
|
| 51 | 51 | unset($postTypeColumns['review_type']); |
| 52 | 52 | } |
| 53 | - return array_filter($postTypeColumns, 'strlen'); |
|
| 53 | + return array_filter( $postTypeColumns, 'strlen' ); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | /** |
@@ -59,10 +59,10 @@ discard block |
||
| 59 | 59 | * @return string |
| 60 | 60 | * @filter post_date_column_status |
| 61 | 61 | */ |
| 62 | - public function filterDateColumnStatus($status, $post) |
|
| 62 | + public function filterDateColumnStatus( $status, $post ) |
|
| 63 | 63 | { |
| 64 | - if (Application::POST_TYPE == Arr::get($post, 'post_type')) { |
|
| 65 | - $status = __('Submitted', 'site-reviews'); |
|
| 64 | + if( Application::POST_TYPE == Arr::get( $post, 'post_type' ) ) { |
|
| 65 | + $status = __( 'Submitted', 'site-reviews' ); |
|
| 66 | 66 | } |
| 67 | 67 | return $status; |
| 68 | 68 | } |
@@ -73,13 +73,13 @@ discard block |
||
| 73 | 73 | * @return array |
| 74 | 74 | * @filter default_hidden_columns |
| 75 | 75 | */ |
| 76 | - public function filterDefaultHiddenColumns($hidden, $screen) |
|
| 76 | + public function filterDefaultHiddenColumns( $hidden, $screen ) |
|
| 77 | 77 | { |
| 78 | - if (Arr::get($screen, 'id') == 'edit-'.Application::POST_TYPE) { |
|
| 79 | - $hidden = Arr::consolidateArray($hidden); |
|
| 80 | - $hidden = array_unique(array_merge($hidden, [ |
|
| 78 | + if( Arr::get( $screen, 'id' ) == 'edit-'.Application::POST_TYPE ) { |
|
| 79 | + $hidden = Arr::consolidateArray( $hidden ); |
|
| 80 | + $hidden = array_unique( array_merge( $hidden, [ |
|
| 81 | 81 | 'email', 'ip_address', 'response', 'reviewer', |
| 82 | - ])); |
|
| 82 | + ] ) ); |
|
| 83 | 83 | } |
| 84 | 84 | return $hidden; |
| 85 | 85 | } |
@@ -90,28 +90,28 @@ discard block |
||
| 90 | 90 | * @return array |
| 91 | 91 | * @filter post_row_actions |
| 92 | 92 | */ |
| 93 | - public function filterRowActions($actions, $post) |
|
| 93 | + public function filterRowActions( $actions, $post ) |
|
| 94 | 94 | { |
| 95 | - if (Application::POST_TYPE != Arr::get($post, 'post_type') || 'trash' == $post->post_status) { |
|
| 95 | + if( Application::POST_TYPE != Arr::get( $post, 'post_type' ) || 'trash' == $post->post_status ) { |
|
| 96 | 96 | return $actions; |
| 97 | 97 | } |
| 98 | 98 | unset($actions['inline hide-if-no-js']); //Remove Quick-edit |
| 99 | 99 | $rowActions = [ |
| 100 | - 'approve' => esc_attr__('Approve', 'site-reviews'), |
|
| 101 | - 'unapprove' => esc_attr__('Unapprove', 'site-reviews'), |
|
| 100 | + 'approve' => esc_attr__( 'Approve', 'site-reviews' ), |
|
| 101 | + 'unapprove' => esc_attr__( 'Unapprove', 'site-reviews' ), |
|
| 102 | 102 | ]; |
| 103 | 103 | $newActions = []; |
| 104 | - foreach ($rowActions as $key => $text) { |
|
| 105 | - $newActions[$key] = glsr(Builder::class)->a($text, [ |
|
| 106 | - 'aria-label' => sprintf(esc_attr_x('%s this review', 'Approve the review', 'site-reviews'), $text), |
|
| 104 | + foreach( $rowActions as $key => $text ) { |
|
| 105 | + $newActions[$key] = glsr( Builder::class )->a( $text, [ |
|
| 106 | + 'aria-label' => sprintf( esc_attr_x( '%s this review', 'Approve the review', 'site-reviews' ), $text ), |
|
| 107 | 107 | 'class' => 'glsr-change-status', |
| 108 | 108 | 'href' => wp_nonce_url( |
| 109 | - admin_url('post.php?post='.$post->ID.'&action='.$key.'&plugin='.Application::ID), |
|
| 109 | + admin_url( 'post.php?post='.$post->ID.'&action='.$key.'&plugin='.Application::ID ), |
|
| 110 | 110 | $key.'-review_'.$post->ID |
| 111 | 111 | ), |
| 112 | - ]); |
|
| 112 | + ] ); |
|
| 113 | 113 | } |
| 114 | - return $newActions + Arr::consolidateArray($actions); |
|
| 114 | + return $newActions + Arr::consolidateArray( $actions ); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -119,13 +119,13 @@ discard block |
||
| 119 | 119 | * @return array |
| 120 | 120 | * @filter manage_edit-.Application::POST_TYPE._sortable_columns |
| 121 | 121 | */ |
| 122 | - public function filterSortableColumns($columns) |
|
| 122 | + public function filterSortableColumns( $columns ) |
|
| 123 | 123 | { |
| 124 | - $columns = Arr::consolidateArray($columns); |
|
| 124 | + $columns = Arr::consolidateArray( $columns ); |
|
| 125 | 125 | $postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE]; |
| 126 | 126 | unset($postTypeColumns['cb']); |
| 127 | - foreach ($postTypeColumns as $key => $value) { |
|
| 128 | - if (Str::startsWith('taxonomy', $key)) { |
|
| 127 | + foreach( $postTypeColumns as $key => $value ) { |
|
| 128 | + if( Str::startsWith( 'taxonomy', $key ) ) { |
|
| 129 | 129 | continue; |
| 130 | 130 | } |
| 131 | 131 | $columns[$key] = $key; |
@@ -139,10 +139,10 @@ discard block |
||
| 139 | 139 | * @return void |
| 140 | 140 | * @action bulk_edit_custom_box |
| 141 | 141 | */ |
| 142 | - public function renderBulkEditFields($columnName, $postType) |
|
| 142 | + public function renderBulkEditFields( $columnName, $postType ) |
|
| 143 | 143 | { |
| 144 | - if ('assigned_to' == $columnName && Application::POST_TYPE == $postType) { |
|
| 145 | - glsr()->render('partials/editor/bulk-edit-assigned-to'); |
|
| 144 | + if( 'assigned_to' == $columnName && Application::POST_TYPE == $postType ) { |
|
| 145 | + glsr()->render( 'partials/editor/bulk-edit-assigned-to' ); |
|
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | 148 | |
@@ -151,9 +151,9 @@ discard block |
||
| 151 | 151 | * @return void |
| 152 | 152 | * @action restrict_manage_posts |
| 153 | 153 | */ |
| 154 | - public function renderColumnFilters($postType) |
|
| 154 | + public function renderColumnFilters( $postType ) |
|
| 155 | 155 | { |
| 156 | - glsr(Columns::class)->renderFilters($postType); |
|
| 156 | + glsr( Columns::class )->renderFilters( $postType ); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | /** |
@@ -162,9 +162,9 @@ discard block |
||
| 162 | 162 | * @return void |
| 163 | 163 | * @action manage_posts_custom_column |
| 164 | 164 | */ |
| 165 | - public function renderColumnValues($column, $postId) |
|
| 165 | + public function renderColumnValues( $column, $postId ) |
|
| 166 | 166 | { |
| 167 | - glsr(Columns::class)->renderValues($column, $postId); |
|
| 167 | + glsr( Columns::class )->renderValues( $column, $postId ); |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | /** |
@@ -172,14 +172,14 @@ discard block |
||
| 172 | 172 | * @return void |
| 173 | 173 | * @action save_post_.Application::POST_TYPE |
| 174 | 174 | */ |
| 175 | - public function saveBulkEditFields($postId) |
|
| 175 | + public function saveBulkEditFields( $postId ) |
|
| 176 | 176 | { |
| 177 | - if (!current_user_can('edit_posts')) { |
|
| 177 | + if( !current_user_can( 'edit_posts' ) ) { |
|
| 178 | 178 | return; |
| 179 | 179 | } |
| 180 | - $assignedTo = filter_input(INPUT_GET, 'assigned_to'); |
|
| 181 | - if ($assignedTo && get_post($assignedTo)) { |
|
| 182 | - glsr(Database::class)->update($postId, 'assigned_to', $assignedTo); |
|
| 180 | + $assignedTo = filter_input( INPUT_GET, 'assigned_to' ); |
|
| 181 | + if( $assignedTo && get_post( $assignedTo ) ) { |
|
| 182 | + glsr( Database::class )->update( $postId, 'assigned_to', $assignedTo ); |
|
| 183 | 183 | } |
| 184 | 184 | } |
| 185 | 185 | |
@@ -187,15 +187,15 @@ discard block |
||
| 187 | 187 | * @return void |
| 188 | 188 | * @action pre_get_posts |
| 189 | 189 | */ |
| 190 | - public function setQueryForColumn(WP_Query $query) |
|
| 190 | + public function setQueryForColumn( WP_Query $query ) |
|
| 191 | 191 | { |
| 192 | - if (!$this->hasPermission($query)) { |
|
| 192 | + if( !$this->hasPermission( $query ) ) { |
|
| 193 | 193 | return; |
| 194 | 194 | } |
| 195 | - $this->setMetaQuery($query, [ |
|
| 195 | + $this->setMetaQuery( $query, [ |
|
| 196 | 196 | 'rating', 'review_type', |
| 197 | - ]); |
|
| 198 | - $this->setOrderby($query); |
|
| 197 | + ] ); |
|
| 198 | + $this->setOrderby( $query ); |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | /** |
@@ -204,15 +204,15 @@ discard block |
||
| 204 | 204 | */ |
| 205 | 205 | public function unapprove() |
| 206 | 206 | { |
| 207 | - if (Application::ID != filter_input(INPUT_GET, 'plugin')) { |
|
| 207 | + if( Application::ID != filter_input( INPUT_GET, 'plugin' ) ) { |
|
| 208 | 208 | return; |
| 209 | 209 | } |
| 210 | - check_admin_referer('unapprove-review_'.($postId = $this->getPostId())); |
|
| 211 | - wp_update_post([ |
|
| 210 | + check_admin_referer( 'unapprove-review_'.($postId = $this->getPostId()) ); |
|
| 211 | + wp_update_post( [ |
|
| 212 | 212 | 'ID' => $postId, |
| 213 | 213 | 'post_status' => 'pending', |
| 214 | - ]); |
|
| 215 | - wp_safe_redirect(wp_get_referer()); |
|
| 214 | + ] ); |
|
| 215 | + wp_safe_redirect( wp_get_referer() ); |
|
| 216 | 216 | exit; |
| 217 | 217 | } |
| 218 | 218 | |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | * @param string $domain |
| 222 | 222 | * @return bool |
| 223 | 223 | */ |
| 224 | - protected function canModifyTranslation($domain = 'default') |
|
| 224 | + protected function canModifyTranslation( $domain = 'default' ) |
|
| 225 | 225 | { |
| 226 | 226 | $screen = glsr_current_screen(); |
| 227 | 227 | return 'default' == $domain |
@@ -232,47 +232,47 @@ discard block |
||
| 232 | 232 | /** |
| 233 | 233 | * @return bool |
| 234 | 234 | */ |
| 235 | - protected function hasPermission(WP_Query $query) |
|
| 235 | + protected function hasPermission( WP_Query $query ) |
|
| 236 | 236 | { |
| 237 | 237 | global $pagenow; |
| 238 | 238 | return is_admin() |
| 239 | 239 | && $query->is_main_query() |
| 240 | - && Application::POST_TYPE == $query->get('post_type') |
|
| 240 | + && Application::POST_TYPE == $query->get( 'post_type' ) |
|
| 241 | 241 | && 'edit.php' == $pagenow; |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | /** |
| 245 | 245 | * @return void |
| 246 | 246 | */ |
| 247 | - protected function setMetaQuery(WP_Query $query, array $metaKeys) |
|
| 247 | + protected function setMetaQuery( WP_Query $query, array $metaKeys ) |
|
| 248 | 248 | { |
| 249 | - foreach ($metaKeys as $key) { |
|
| 250 | - if (!($value = filter_input(INPUT_GET, $key))) { |
|
| 249 | + foreach( $metaKeys as $key ) { |
|
| 250 | + if( !($value = filter_input( INPUT_GET, $key )) ) { |
|
| 251 | 251 | continue; |
| 252 | 252 | } |
| 253 | - $metaQuery = (array) $query->get('meta_query'); |
|
| 253 | + $metaQuery = (array)$query->get( 'meta_query' ); |
|
| 254 | 254 | $metaQuery[] = [ |
| 255 | - 'key' => Str::prefix('_', $key, '_'), |
|
| 255 | + 'key' => Str::prefix( '_', $key, '_' ), |
|
| 256 | 256 | 'value' => $value, |
| 257 | 257 | ]; |
| 258 | - $query->set('meta_query', $metaQuery); |
|
| 258 | + $query->set( 'meta_query', $metaQuery ); |
|
| 259 | 259 | } |
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | /** |
| 263 | 263 | * @return void |
| 264 | 264 | */ |
| 265 | - protected function setOrderby(WP_Query $query) |
|
| 265 | + protected function setOrderby( WP_Query $query ) |
|
| 266 | 266 | { |
| 267 | - $orderby = $query->get('orderby'); |
|
| 267 | + $orderby = $query->get( 'orderby' ); |
|
| 268 | 268 | $columns = glsr()->postTypeColumns[Application::POST_TYPE]; |
| 269 | 269 | unset($columns['cb'], $columns['title'], $columns['date']); |
| 270 | - if (in_array($orderby, array_keys($columns))) { |
|
| 271 | - if ('reviewer' == $orderby) { |
|
| 270 | + if( in_array( $orderby, array_keys( $columns ) ) ) { |
|
| 271 | + if( 'reviewer' == $orderby ) { |
|
| 272 | 272 | $orderby = 'author'; |
| 273 | 273 | } |
| 274 | - $query->set('meta_key', Str::prefix('_', $orderby, '_')); |
|
| 275 | - $query->set('orderby', 'meta_value'); |
|
| 274 | + $query->set( 'meta_key', Str::prefix( '_', $orderby, '_' ) ); |
|
| 275 | + $query->set( 'orderby', 'meta_value' ); |
|
| 276 | 276 | } |
| 277 | 277 | } |
| 278 | 278 | } |
@@ -12,10 +12,10 @@ discard block |
||
| 12 | 12 | * @param string $test |
| 13 | 13 | * @return string |
| 14 | 14 | */ |
| 15 | - public function filterPostStatusLabels($translation, $text) |
|
| 15 | + public function filterPostStatusLabels( $translation, $text ) |
|
| 16 | 16 | { |
| 17 | 17 | $replacements = $this->getStatusLabels(); |
| 18 | - return array_key_exists($text, $replacements) |
|
| 18 | + return array_key_exists( $text, $replacements ) |
|
| 19 | 19 | ? $replacements[$text] |
| 20 | 20 | : $translation; |
| 21 | 21 | } |
@@ -23,18 +23,18 @@ discard block |
||
| 23 | 23 | /** |
| 24 | 24 | * @return array |
| 25 | 25 | */ |
| 26 | - public function filterUpdateMessages(array $messages) |
|
| 26 | + public function filterUpdateMessages( array $messages ) |
|
| 27 | 27 | { |
| 28 | 28 | $post = get_post(); |
| 29 | - if (!($post instanceof WP_Post)) { |
|
| 29 | + if( !($post instanceof WP_Post) ) { |
|
| 30 | 30 | return; |
| 31 | 31 | } |
| 32 | 32 | $strings = $this->getReviewLabels(); |
| 33 | - $restored = filter_input(INPUT_GET, 'revision'); |
|
| 34 | - if ($revisionTitle = wp_post_revision_title(intval($restored), false)) { |
|
| 35 | - $restored = sprintf($strings['restored'], $revisionTitle); |
|
| 33 | + $restored = filter_input( INPUT_GET, 'revision' ); |
|
| 34 | + if( $revisionTitle = wp_post_revision_title( intval( $restored ), false ) ) { |
|
| 35 | + $restored = sprintf( $strings['restored'], $revisionTitle ); |
|
| 36 | 36 | } |
| 37 | - $scheduled_date = date_i18n('M j, Y @ H:i', strtotime($post->post_date)); |
|
| 37 | + $scheduled_date = date_i18n( 'M j, Y @ H:i', strtotime( $post->post_date ) ); |
|
| 38 | 38 | $messages[Application::POST_TYPE] = [ |
| 39 | 39 | 1 => $strings['updated'], |
| 40 | 40 | 4 => $strings['updated'], |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | 6 => $strings['published'], |
| 43 | 43 | 7 => $strings['saved'], |
| 44 | 44 | 8 => $strings['submitted'], |
| 45 | - 9 => sprintf($strings['scheduled'], '<strong>'.$scheduled_date.'</strong>'), |
|
| 45 | + 9 => sprintf( $strings['scheduled'], '<strong>'.$scheduled_date.'</strong>' ), |
|
| 46 | 46 | 10 => $strings['draft_updated'], |
| 47 | 47 | 50 => $strings['approved'], |
| 48 | 48 | 51 => $strings['unapproved'], |
@@ -58,13 +58,13 @@ discard block |
||
| 58 | 58 | { |
| 59 | 59 | global $wp_scripts; |
| 60 | 60 | $strings = [ |
| 61 | - 'savePending' => __('Save as Unapproved', 'site-reviews'), |
|
| 62 | - 'published' => __('Approved', 'site-reviews'), |
|
| 61 | + 'savePending' => __( 'Save as Unapproved', 'site-reviews' ), |
|
| 62 | + 'published' => __( 'Approved', 'site-reviews' ), |
|
| 63 | 63 | ]; |
| 64 | - if (isset($wp_scripts->registered['post']->extra['data'])) { |
|
| 64 | + if( isset($wp_scripts->registered['post']->extra['data']) ) { |
|
| 65 | 65 | $l10n = &$wp_scripts->registered['post']->extra['data']; |
| 66 | - foreach ($strings as $search => $replace) { |
|
| 67 | - $l10n = preg_replace('/("'.$search.'":")([^"]+)/', '$1'.$replace, $l10n); |
|
| 66 | + foreach( $strings as $search => $replace ) { |
|
| 67 | + $l10n = preg_replace( '/("'.$search.'":")([^"]+)/', '$1'.$replace, $l10n ); |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | } |
@@ -75,18 +75,18 @@ discard block |
||
| 75 | 75 | protected function getReviewLabels() |
| 76 | 76 | { |
| 77 | 77 | return [ |
| 78 | - 'approved' => __('Review has been approved and published.', 'site-reviews'), |
|
| 79 | - 'draft_updated' => __('Review draft updated.', 'site-reviews'), |
|
| 80 | - 'preview' => __('Preview review', 'site-reviews'), |
|
| 81 | - 'published' => __('Review approved and published.', 'site-reviews'), |
|
| 82 | - 'restored' => __('Review restored to revision from %s.', 'site-reviews'), |
|
| 83 | - 'reverted' => __('Review has been reverted to its original submission state (title, content, and submission date).', 'site-reviews'), |
|
| 84 | - 'saved' => __('Review saved.', 'site-reviews'), |
|
| 85 | - 'scheduled' => __('Review scheduled for: %s.', 'site-reviews'), |
|
| 86 | - 'submitted' => __('Review submitted.', 'site-reviews'), |
|
| 87 | - 'unapproved' => __('Review has been unapproved and is now pending.', 'site-reviews'), |
|
| 88 | - 'updated' => __('Review updated.', 'site-reviews'), |
|
| 89 | - 'view' => __('View review', 'site-reviews'), |
|
| 78 | + 'approved' => __( 'Review has been approved and published.', 'site-reviews' ), |
|
| 79 | + 'draft_updated' => __( 'Review draft updated.', 'site-reviews' ), |
|
| 80 | + 'preview' => __( 'Preview review', 'site-reviews' ), |
|
| 81 | + 'published' => __( 'Review approved and published.', 'site-reviews' ), |
|
| 82 | + 'restored' => __( 'Review restored to revision from %s.', 'site-reviews' ), |
|
| 83 | + 'reverted' => __( 'Review has been reverted to its original submission state (title, content, and submission date).', 'site-reviews' ), |
|
| 84 | + 'saved' => __( 'Review saved.', 'site-reviews' ), |
|
| 85 | + 'scheduled' => __( 'Review scheduled for: %s.', 'site-reviews' ), |
|
| 86 | + 'submitted' => __( 'Review submitted.', 'site-reviews' ), |
|
| 87 | + 'unapproved' => __( 'Review has been unapproved and is now pending.', 'site-reviews' ), |
|
| 88 | + 'updated' => __( 'Review updated.', 'site-reviews' ), |
|
| 89 | + 'view' => __( 'View review', 'site-reviews' ), |
|
| 90 | 90 | ]; |
| 91 | 91 | } |
| 92 | 92 | |
@@ -97,14 +97,14 @@ discard block |
||
| 97 | 97 | protected function getStatusLabels() |
| 98 | 98 | { |
| 99 | 99 | static $labels; |
| 100 | - if (empty($labels)) { |
|
| 100 | + if( empty($labels) ) { |
|
| 101 | 101 | $labels = [ |
| 102 | - 'Pending' => __('Unapproved', 'site-reviews'), |
|
| 103 | - 'Pending Review' => __('Unapproved', 'site-reviews'), |
|
| 104 | - 'Privately Published' => __('Privately Approved', 'site-reviews'), |
|
| 105 | - 'Publish' => __('Approve', 'site-reviews'), |
|
| 106 | - 'Published' => __('Approved', 'site-reviews'), |
|
| 107 | - 'Save as Pending' => __('Save as Unapproved', 'site-reviews'), |
|
| 102 | + 'Pending' => __( 'Unapproved', 'site-reviews' ), |
|
| 103 | + 'Pending Review' => __( 'Unapproved', 'site-reviews' ), |
|
| 104 | + 'Privately Published' => __( 'Privately Approved', 'site-reviews' ), |
|
| 105 | + 'Publish' => __( 'Approve', 'site-reviews' ), |
|
| 106 | + 'Published' => __( 'Approved', 'site-reviews' ), |
|
| 107 | + 'Save as Pending' => __( 'Save as Unapproved', 'site-reviews' ), |
|
| 108 | 108 | ]; |
| 109 | 109 | } |
| 110 | 110 | return $labels; |
@@ -25,10 +25,10 @@ discard block |
||
| 25 | 25 | * @return array |
| 26 | 26 | * @filter wp_editor_settings |
| 27 | 27 | */ |
| 28 | - public function filterEditorSettings($settings) |
|
| 28 | + public function filterEditorSettings( $settings ) |
|
| 29 | 29 | { |
| 30 | - return glsr(Customization::class)->filterEditorSettings( |
|
| 31 | - Arr::consolidateArray($settings) |
|
| 30 | + return glsr( Customization::class )->filterEditorSettings( |
|
| 31 | + Arr::consolidateArray( $settings ) |
|
| 32 | 32 | ); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | * @return string |
| 39 | 39 | * @filter the_editor |
| 40 | 40 | */ |
| 41 | - public function filterEditorTextarea($html) |
|
| 41 | + public function filterEditorTextarea( $html ) |
|
| 42 | 42 | { |
| 43 | - return glsr(Customization::class)->filterEditorTextarea($html); |
|
| 43 | + return glsr( Customization::class )->filterEditorTextarea( $html ); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | /** |
@@ -50,12 +50,12 @@ discard block |
||
| 50 | 50 | * @return bool |
| 51 | 51 | * @filter is_protected_meta |
| 52 | 52 | */ |
| 53 | - public function filterIsProtectedMeta($protected, $metaKey, $metaType) |
|
| 53 | + public function filterIsProtectedMeta( $protected, $metaKey, $metaType ) |
|
| 54 | 54 | { |
| 55 | - if ('post' == $metaType && Application::POST_TYPE == get_post_type()) { |
|
| 56 | - $values = glsr(CreateReviewDefaults::class)->unguarded(); |
|
| 57 | - $values = Arr::prefixArrayKeys($values); |
|
| 58 | - if (array_key_exists($metaKey, $values)) { |
|
| 55 | + if( 'post' == $metaType && Application::POST_TYPE == get_post_type() ) { |
|
| 56 | + $values = glsr( CreateReviewDefaults::class )->unguarded(); |
|
| 57 | + $values = Arr::prefixArrayKeys( $values ); |
|
| 58 | + if( array_key_exists( $metaKey, $values ) ) { |
|
| 59 | 59 | $protected = false; |
| 60 | 60 | } |
| 61 | 61 | } |
@@ -67,10 +67,10 @@ discard block |
||
| 67 | 67 | * @return array |
| 68 | 68 | * @filter post_updated_messages |
| 69 | 69 | */ |
| 70 | - public function filterUpdateMessages($messages) |
|
| 70 | + public function filterUpdateMessages( $messages ) |
|
| 71 | 71 | { |
| 72 | - return glsr(Labels::class)->filterUpdateMessages( |
|
| 73 | - Arr::consolidateArray($messages) |
|
| 72 | + return glsr( Labels::class )->filterUpdateMessages( |
|
| 73 | + Arr::consolidateArray( $messages ) |
|
| 74 | 74 | ); |
| 75 | 75 | } |
| 76 | 76 | |
@@ -78,14 +78,14 @@ discard block |
||
| 78 | 78 | * @return void |
| 79 | 79 | * @action add_meta_boxes_{Application::POST_TYPE} |
| 80 | 80 | */ |
| 81 | - public function registerMetaBoxes($post) |
|
| 81 | + public function registerMetaBoxes( $post ) |
|
| 82 | 82 | { |
| 83 | - add_meta_box(Application::ID.'_assigned_to', __('Assigned To', 'site-reviews'), [$this, 'renderAssignedToMetabox'], null, 'side'); |
|
| 84 | - add_meta_box(Application::ID.'_review', __('Details', 'site-reviews'), [$this, 'renderDetailsMetaBox'], null, 'side'); |
|
| 85 | - if ('local' != glsr(Database::class)->get($post->ID, 'review_type')) { |
|
| 83 | + add_meta_box( Application::ID.'_assigned_to', __( 'Assigned To', 'site-reviews' ), [$this, 'renderAssignedToMetabox'], null, 'side' ); |
|
| 84 | + add_meta_box( Application::ID.'_review', __( 'Details', 'site-reviews' ), [$this, 'renderDetailsMetaBox'], null, 'side' ); |
|
| 85 | + if( 'local' != glsr( Database::class )->get( $post->ID, 'review_type' ) ) { |
|
| 86 | 86 | return; |
| 87 | 87 | } |
| 88 | - add_meta_box(Application::ID.'_response', __('Respond Publicly', 'site-reviews'), [$this, 'renderResponseMetaBox'], null, 'normal'); |
|
| 88 | + add_meta_box( Application::ID.'_response', __( 'Respond Publicly', 'site-reviews' ), [$this, 'renderResponseMetaBox'], null, 'normal' ); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | /** |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | */ |
| 95 | 95 | public function removeAutosave() |
| 96 | 96 | { |
| 97 | - glsr(Customization::class)->removeAutosave(); |
|
| 97 | + glsr( Customization::class )->removeAutosave(); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /** |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | */ |
| 104 | 104 | public function removeMetaBoxes() |
| 105 | 105 | { |
| 106 | - glsr(Customization::class)->removeMetaBoxes(); |
|
| 106 | + glsr( Customization::class )->removeMetaBoxes(); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | /** |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | */ |
| 112 | 112 | public function removePostTypeSupport() |
| 113 | 113 | { |
| 114 | - glsr(Customization::class)->removePostTypeSupport(); |
|
| 114 | + glsr( Customization::class )->removePostTypeSupport(); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -119,17 +119,17 @@ discard block |
||
| 119 | 119 | * @return void |
| 120 | 120 | * @callback add_meta_box |
| 121 | 121 | */ |
| 122 | - public function renderAssignedToMetabox($post) |
|
| 122 | + public function renderAssignedToMetabox( $post ) |
|
| 123 | 123 | { |
| 124 | - if (!$this->isReviewPostType($post)) { |
|
| 124 | + if( !$this->isReviewPostType( $post ) ) { |
|
| 125 | 125 | return; |
| 126 | 126 | } |
| 127 | - $assignedTo = (string) glsr(Database::class)->get($post->ID, 'assigned_to'); |
|
| 128 | - wp_nonce_field('assigned_to', '_nonce-assigned-to', false); |
|
| 129 | - glsr()->render('partials/editor/metabox-assigned-to', [ |
|
| 127 | + $assignedTo = (string)glsr( Database::class )->get( $post->ID, 'assigned_to' ); |
|
| 128 | + wp_nonce_field( 'assigned_to', '_nonce-assigned-to', false ); |
|
| 129 | + glsr()->render( 'partials/editor/metabox-assigned-to', [ |
|
| 130 | 130 | 'id' => $assignedTo, |
| 131 | - 'template' => $this->buildAssignedToTemplate($assignedTo, $post), |
|
| 132 | - ]); |
|
| 131 | + 'template' => $this->buildAssignedToTemplate( $assignedTo, $post ), |
|
| 132 | + ] ); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | /** |
@@ -137,16 +137,16 @@ discard block |
||
| 137 | 137 | * @return void |
| 138 | 138 | * @callback add_meta_box |
| 139 | 139 | */ |
| 140 | - public function renderDetailsMetaBox($post) |
|
| 140 | + public function renderDetailsMetaBox( $post ) |
|
| 141 | 141 | { |
| 142 | - if (!$this->isReviewPostType($post)) { |
|
| 142 | + if( !$this->isReviewPostType( $post ) ) { |
|
| 143 | 143 | return; |
| 144 | 144 | } |
| 145 | - $review = glsr_get_review($post); |
|
| 146 | - glsr()->render('partials/editor/metabox-details', [ |
|
| 147 | - 'button' => $this->buildDetailsMetaBoxRevertButton($review, $post), |
|
| 148 | - 'metabox' => $this->normalizeDetailsMetaBox($review), |
|
| 149 | - ]); |
|
| 145 | + $review = glsr_get_review( $post ); |
|
| 146 | + glsr()->render( 'partials/editor/metabox-details', [ |
|
| 147 | + 'button' => $this->buildDetailsMetaBoxRevertButton( $review, $post ), |
|
| 148 | + 'metabox' => $this->normalizeDetailsMetaBox( $review ), |
|
| 149 | + ] ); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | /** |
@@ -155,16 +155,16 @@ discard block |
||
| 155 | 155 | */ |
| 156 | 156 | public function renderPinnedInPublishMetaBox() |
| 157 | 157 | { |
| 158 | - if (!$this->isReviewPostType(get_post())) { |
|
| 158 | + if( !$this->isReviewPostType( get_post() ) ) { |
|
| 159 | 159 | return; |
| 160 | 160 | } |
| 161 | - glsr(Template::class)->render('partials/editor/pinned', [ |
|
| 161 | + glsr( Template::class )->render( 'partials/editor/pinned', [ |
|
| 162 | 162 | 'context' => [ |
| 163 | - 'no' => __('No', 'site-reviews'), |
|
| 164 | - 'yes' => __('Yes', 'site-reviews'), |
|
| 163 | + 'no' => __( 'No', 'site-reviews' ), |
|
| 164 | + 'yes' => __( 'Yes', 'site-reviews' ), |
|
| 165 | 165 | ], |
| 166 | - 'pinned' => wp_validate_boolean(glsr(Database::class)->get(get_the_ID(), 'pinned')), |
|
| 167 | - ]); |
|
| 166 | + 'pinned' => wp_validate_boolean( glsr( Database::class )->get( get_the_ID(), 'pinned' ) ), |
|
| 167 | + ] ); |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | /** |
@@ -172,15 +172,15 @@ discard block |
||
| 172 | 172 | * @return void |
| 173 | 173 | * @callback add_meta_box |
| 174 | 174 | */ |
| 175 | - public function renderResponseMetaBox($post) |
|
| 175 | + public function renderResponseMetaBox( $post ) |
|
| 176 | 176 | { |
| 177 | - if (!$this->isReviewPostType($post)) { |
|
| 177 | + if( !$this->isReviewPostType( $post ) ) { |
|
| 178 | 178 | return; |
| 179 | 179 | } |
| 180 | - wp_nonce_field('response', '_nonce-response', false); |
|
| 181 | - glsr()->render('partials/editor/metabox-response', [ |
|
| 182 | - 'response' => glsr(Database::class)->get($post->ID, 'response'), |
|
| 183 | - ]); |
|
| 180 | + wp_nonce_field( 'response', '_nonce-response', false ); |
|
| 181 | + glsr()->render( 'partials/editor/metabox-response', [ |
|
| 182 | + 'response' => glsr( Database::class )->get( $post->ID, 'response' ), |
|
| 183 | + ] ); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | /** |
@@ -188,15 +188,15 @@ discard block |
||
| 188 | 188 | * @return void |
| 189 | 189 | * @action edit_form_after_title |
| 190 | 190 | */ |
| 191 | - public function renderReviewEditor($post) |
|
| 191 | + public function renderReviewEditor( $post ) |
|
| 192 | 192 | { |
| 193 | - if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) { |
|
| 193 | + if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) ) { |
|
| 194 | 194 | return; |
| 195 | 195 | } |
| 196 | - glsr()->render('partials/editor/review', [ |
|
| 196 | + glsr()->render( 'partials/editor/review', [ |
|
| 197 | 197 | 'post' => $post, |
| 198 | - 'response' => glsr(Database::class)->get($post->ID, 'response'), |
|
| 199 | - ]); |
|
| 198 | + 'response' => glsr( Database::class )->get( $post->ID, 'response' ), |
|
| 199 | + ] ); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | /** |
@@ -206,11 +206,11 @@ discard block |
||
| 206 | 206 | public function renderReviewFields() |
| 207 | 207 | { |
| 208 | 208 | $screen = glsr_current_screen(); |
| 209 | - if ('post' != $screen->base || Application::POST_TYPE != $screen->post_type) { |
|
| 209 | + if( 'post' != $screen->base || Application::POST_TYPE != $screen->post_type ) { |
|
| 210 | 210 | return; |
| 211 | 211 | } |
| 212 | - add_action('edit_form_after_title', [$this, 'renderReviewEditor']); |
|
| 213 | - add_action('edit_form_top', [$this, 'renderReviewNotice']); |
|
| 212 | + add_action( 'edit_form_after_title', [$this, 'renderReviewEditor'] ); |
|
| 213 | + add_action( 'edit_form_top', [$this, 'renderReviewNotice'] ); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | /** |
@@ -218,20 +218,20 @@ discard block |
||
| 218 | 218 | * @return void |
| 219 | 219 | * @action edit_form_top |
| 220 | 220 | */ |
| 221 | - public function renderReviewNotice($post) |
|
| 221 | + public function renderReviewNotice( $post ) |
|
| 222 | 222 | { |
| 223 | - if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) { |
|
| 223 | + if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) ) { |
|
| 224 | 224 | return; |
| 225 | 225 | } |
| 226 | - glsr(Notice::class)->addWarning(sprintf( |
|
| 227 | - __('%s reviews are read-only.', 'site-reviews'), |
|
| 228 | - glsr(Columns::class)->buildColumnReviewType($post->ID) |
|
| 229 | - )); |
|
| 230 | - glsr(Template::class)->render('partials/editor/notice', [ |
|
| 226 | + glsr( Notice::class )->addWarning( sprintf( |
|
| 227 | + __( '%s reviews are read-only.', 'site-reviews' ), |
|
| 228 | + glsr( Columns::class )->buildColumnReviewType( $post->ID ) |
|
| 229 | + ) ); |
|
| 230 | + glsr( Template::class )->render( 'partials/editor/notice', [ |
|
| 231 | 231 | 'context' => [ |
| 232 | - 'notices' => glsr(Notice::class)->get(), |
|
| 232 | + 'notices' => glsr( Notice::class )->get(), |
|
| 233 | 233 | ], |
| 234 | - ]); |
|
| 234 | + ] ); |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | /** |
@@ -240,16 +240,16 @@ discard block |
||
| 240 | 240 | * @see glsr_categories_meta_box() |
| 241 | 241 | * @callback register_taxonomy |
| 242 | 242 | */ |
| 243 | - public function renderTaxonomyMetabox($post) |
|
| 243 | + public function renderTaxonomyMetabox( $post ) |
|
| 244 | 244 | { |
| 245 | - if (!$this->isReviewPostType($post)) { |
|
| 245 | + if( !$this->isReviewPostType( $post ) ) { |
|
| 246 | 246 | return; |
| 247 | 247 | } |
| 248 | - glsr()->render('partials/editor/metabox-categories', [ |
|
| 248 | + glsr()->render( 'partials/editor/metabox-categories', [ |
|
| 249 | 249 | 'post' => $post, |
| 250 | 250 | 'tax_name' => Application::TAXONOMY, |
| 251 | - 'taxonomy' => get_taxonomy(Application::TAXONOMY), |
|
| 252 | - ]); |
|
| 251 | + 'taxonomy' => get_taxonomy( Application::TAXONOMY ), |
|
| 252 | + ] ); |
|
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | /** |
@@ -259,12 +259,12 @@ discard block |
||
| 259 | 259 | */ |
| 260 | 260 | public function revertReview() |
| 261 | 261 | { |
| 262 | - if (Application::ID != filter_input(INPUT_GET, 'plugin')) { |
|
| 262 | + if( Application::ID != filter_input( INPUT_GET, 'plugin' ) ) { |
|
| 263 | 263 | return; |
| 264 | 264 | } |
| 265 | - check_admin_referer('revert-review_'.($postId = $this->getPostId())); |
|
| 266 | - glsr(ReviewManager::class)->revert($postId); |
|
| 267 | - $this->redirect($postId, 52); |
|
| 265 | + check_admin_referer( 'revert-review_'.($postId = $this->getPostId()) ); |
|
| 266 | + glsr( ReviewManager::class )->revert( $postId ); |
|
| 267 | + $this->redirect( $postId, 52 ); |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | /** |
@@ -274,12 +274,12 @@ discard block |
||
| 274 | 274 | * @return void |
| 275 | 275 | * @action save_post_.Application::POST_TYPE |
| 276 | 276 | */ |
| 277 | - public function saveMetaboxes($postId, $post, $isUpdating) |
|
| 277 | + public function saveMetaboxes( $postId, $post, $isUpdating ) |
|
| 278 | 278 | { |
| 279 | - glsr(Metaboxes::class)->saveAssignedToMetabox($postId); |
|
| 280 | - glsr(Metaboxes::class)->saveResponseMetabox($postId); |
|
| 281 | - if ($isUpdating) { |
|
| 282 | - do_action('site-reviews/review/saved', glsr_get_review($postId)); |
|
| 279 | + glsr( Metaboxes::class )->saveAssignedToMetabox( $postId ); |
|
| 280 | + glsr( Metaboxes::class )->saveResponseMetabox( $postId ); |
|
| 281 | + if( $isUpdating ) { |
|
| 282 | + do_action( 'site-reviews/review/saved', glsr_get_review( $postId ) ); |
|
| 283 | 283 | } |
| 284 | 284 | } |
| 285 | 285 | |
@@ -287,68 +287,68 @@ discard block |
||
| 287 | 287 | * @param string $assignedTo |
| 288 | 288 | * @return string |
| 289 | 289 | */ |
| 290 | - protected function buildAssignedToTemplate($assignedTo, WP_Post $post) |
|
| 290 | + protected function buildAssignedToTemplate( $assignedTo, WP_Post $post ) |
|
| 291 | 291 | { |
| 292 | - $assignedPost = glsr(Database::class)->getAssignedToPost($post->ID, $assignedTo); |
|
| 293 | - if (!($assignedPost instanceof WP_Post)) { |
|
| 292 | + $assignedPost = glsr( Database::class )->getAssignedToPost( $post->ID, $assignedTo ); |
|
| 293 | + if( !($assignedPost instanceof WP_Post) ) { |
|
| 294 | 294 | return; |
| 295 | 295 | } |
| 296 | - return glsr(Template::class)->build('partials/editor/assigned-post', [ |
|
| 296 | + return glsr( Template::class )->build( 'partials/editor/assigned-post', [ |
|
| 297 | 297 | 'context' => [ |
| 298 | - 'data.url' => (string) get_permalink($assignedPost), |
|
| 299 | - 'data.title' => get_the_title($assignedPost), |
|
| 298 | + 'data.url' => (string)get_permalink( $assignedPost ), |
|
| 299 | + 'data.title' => get_the_title( $assignedPost ), |
|
| 300 | 300 | ], |
| 301 | - ]); |
|
| 301 | + ] ); |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | /** |
| 305 | 305 | * @return string |
| 306 | 306 | */ |
| 307 | - protected function buildDetailsMetaBoxRevertButton(Review $review, WP_Post $post) |
|
| 307 | + protected function buildDetailsMetaBoxRevertButton( Review $review, WP_Post $post ) |
|
| 308 | 308 | { |
| 309 | 309 | $isModified = !Arr::compareArrays( |
| 310 | 310 | [$review->title, $review->content, $review->date], |
| 311 | 311 | [ |
| 312 | - glsr(Database::class)->get($post->ID, 'title'), |
|
| 313 | - glsr(Database::class)->get($post->ID, 'content'), |
|
| 314 | - glsr(Database::class)->get($post->ID, 'date'), |
|
| 312 | + glsr( Database::class )->get( $post->ID, 'title' ), |
|
| 313 | + glsr( Database::class )->get( $post->ID, 'content' ), |
|
| 314 | + glsr( Database::class )->get( $post->ID, 'date' ), |
|
| 315 | 315 | ] |
| 316 | 316 | ); |
| 317 | - if ($isModified) { |
|
| 317 | + if( $isModified ) { |
|
| 318 | 318 | $revertUrl = wp_nonce_url( |
| 319 | - admin_url('post.php?post='.$post->ID.'&action=revert&plugin='.Application::ID), |
|
| 319 | + admin_url( 'post.php?post='.$post->ID.'&action=revert&plugin='.Application::ID ), |
|
| 320 | 320 | 'revert-review_'.$post->ID |
| 321 | 321 | ); |
| 322 | - return glsr(Builder::class)->a(__('Revert Changes', 'site-reviews'), [ |
|
| 322 | + return glsr( Builder::class )->a( __( 'Revert Changes', 'site-reviews' ), [ |
|
| 323 | 323 | 'class' => 'button button-large', |
| 324 | 324 | 'href' => $revertUrl, |
| 325 | 325 | 'id' => 'revert', |
| 326 | - ]); |
|
| 326 | + ] ); |
|
| 327 | 327 | } |
| 328 | - return glsr(Builder::class)->button(__('Nothing to Revert', 'site-reviews'), [ |
|
| 328 | + return glsr( Builder::class )->button( __( 'Nothing to Revert', 'site-reviews' ), [ |
|
| 329 | 329 | 'class' => 'button-large', |
| 330 | 330 | 'disabled' => true, |
| 331 | 331 | 'id' => 'revert', |
| 332 | - ]); |
|
| 332 | + ] ); |
|
| 333 | 333 | } |
| 334 | 334 | |
| 335 | 335 | /** |
| 336 | 336 | * @param object $review |
| 337 | 337 | * @return string|void |
| 338 | 338 | */ |
| 339 | - protected function getReviewType($review) |
|
| 339 | + protected function getReviewType( $review ) |
|
| 340 | 340 | { |
| 341 | - if (count(glsr()->reviewTypes) < 2) { |
|
| 341 | + if( count( glsr()->reviewTypes ) < 2 ) { |
|
| 342 | 342 | return; |
| 343 | 343 | } |
| 344 | - $reviewType = array_key_exists($review->review_type, glsr()->reviewTypes) |
|
| 344 | + $reviewType = array_key_exists( $review->review_type, glsr()->reviewTypes ) |
|
| 345 | 345 | ? glsr()->reviewTypes[$review->review_type] |
| 346 | - : __('Unknown', 'site-reviews'); |
|
| 347 | - if (!empty($review->url)) { |
|
| 348 | - $reviewType = glsr(Builder::class)->a($reviewType, [ |
|
| 346 | + : __( 'Unknown', 'site-reviews' ); |
|
| 347 | + if( !empty($review->url) ) { |
|
| 348 | + $reviewType = glsr( Builder::class )->a( $reviewType, [ |
|
| 349 | 349 | 'href' => $review->url, |
| 350 | 350 | 'target' => '_blank', |
| 351 | - ]); |
|
| 351 | + ] ); |
|
| 352 | 352 | } |
| 353 | 353 | return $reviewType; |
| 354 | 354 | } |
@@ -356,18 +356,18 @@ discard block |
||
| 356 | 356 | /** |
| 357 | 357 | * @return bool |
| 358 | 358 | */ |
| 359 | - protected function isReviewEditable($post) |
|
| 359 | + protected function isReviewEditable( $post ) |
|
| 360 | 360 | { |
| 361 | - return $this->isReviewPostType($post) |
|
| 362 | - && post_type_supports(Application::POST_TYPE, 'title') |
|
| 363 | - && 'local' == glsr(Database::class)->get($post->ID, 'review_type'); |
|
| 361 | + return $this->isReviewPostType( $post ) |
|
| 362 | + && post_type_supports( Application::POST_TYPE, 'title' ) |
|
| 363 | + && 'local' == glsr( Database::class )->get( $post->ID, 'review_type' ); |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | /** |
| 367 | 367 | * @param mixed $post |
| 368 | 368 | * @return bool |
| 369 | 369 | */ |
| 370 | - protected function isReviewPostType($post) |
|
| 370 | + protected function isReviewPostType( $post ) |
|
| 371 | 371 | { |
| 372 | 372 | return $post instanceof WP_Post && Application::POST_TYPE == $post->post_type; |
| 373 | 373 | } |
@@ -375,29 +375,29 @@ discard block |
||
| 375 | 375 | /** |
| 376 | 376 | * @return array |
| 377 | 377 | */ |
| 378 | - protected function normalizeDetailsMetaBox(Review $review) |
|
| 378 | + protected function normalizeDetailsMetaBox( Review $review ) |
|
| 379 | 379 | { |
| 380 | 380 | $user = empty($review->user_id) |
| 381 | - ? __('Unregistered user', 'site-reviews') |
|
| 382 | - : glsr(Builder::class)->a(get_the_author_meta('display_name', $review->user_id), [ |
|
| 383 | - 'href' => get_author_posts_url($review->user_id), |
|
| 384 | - ]); |
|
| 381 | + ? __( 'Unregistered user', 'site-reviews' ) |
|
| 382 | + : glsr( Builder::class )->a( get_the_author_meta( 'display_name', $review->user_id ), [ |
|
| 383 | + 'href' => get_author_posts_url( $review->user_id ), |
|
| 384 | + ] ); |
|
| 385 | 385 | $email = empty($review->email) |
| 386 | 386 | ? '—' |
| 387 | - : glsr(Builder::class)->a($review->email, [ |
|
| 388 | - 'href' => 'mailto:'.$review->email.'?subject='.esc_attr(__('RE:', 'site-reviews').' '.$review->title), |
|
| 389 | - ]); |
|
| 387 | + : glsr( Builder::class )->a( $review->email, [ |
|
| 388 | + 'href' => 'mailto:'.$review->email.'?subject='.esc_attr( __( 'RE:', 'site-reviews' ).' '.$review->title ), |
|
| 389 | + ] ); |
|
| 390 | 390 | $metabox = [ |
| 391 | - __('Rating', 'site-reviews') => glsr_star_rating($review->rating), |
|
| 392 | - __('Type', 'site-reviews') => $this->getReviewType($review), |
|
| 393 | - __('Date', 'site-reviews') => get_date_from_gmt($review->date, 'F j, Y'), |
|
| 394 | - __('Name', 'site-reviews') => $review->author, |
|
| 395 | - __('Email', 'site-reviews') => $email, |
|
| 396 | - __('User', 'site-reviews') => $user, |
|
| 397 | - __('IP Address', 'site-reviews') => $review->ip_address, |
|
| 398 | - __('Avatar', 'site-reviews') => sprintf('<img src="%s" width="96">', $review->avatar), |
|
| 391 | + __( 'Rating', 'site-reviews' ) => glsr_star_rating( $review->rating ), |
|
| 392 | + __( 'Type', 'site-reviews' ) => $this->getReviewType( $review ), |
|
| 393 | + __( 'Date', 'site-reviews' ) => get_date_from_gmt( $review->date, 'F j, Y' ), |
|
| 394 | + __( 'Name', 'site-reviews' ) => $review->author, |
|
| 395 | + __( 'Email', 'site-reviews' ) => $email, |
|
| 396 | + __( 'User', 'site-reviews' ) => $user, |
|
| 397 | + __( 'IP Address', 'site-reviews' ) => $review->ip_address, |
|
| 398 | + __( 'Avatar', 'site-reviews' ) => sprintf( '<img src="%s" width="96">', $review->avatar ), |
|
| 399 | 399 | ]; |
| 400 | - return array_filter(apply_filters('site-reviews/metabox/details', $metabox, $review)); |
|
| 400 | + return array_filter( apply_filters( 'site-reviews/metabox/details', $metabox, $review ) ); |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | /** |
@@ -405,16 +405,16 @@ discard block |
||
| 405 | 405 | * @param int $messageIndex |
| 406 | 406 | * @return void |
| 407 | 407 | */ |
| 408 | - protected function redirect($postId, $messageIndex) |
|
| 408 | + protected function redirect( $postId, $messageIndex ) |
|
| 409 | 409 | { |
| 410 | 410 | $referer = wp_get_referer(); |
| 411 | 411 | $hasReferer = !$referer |
| 412 | - || Str::contains($referer, 'post.php') |
|
| 413 | - || Str::contains($referer, 'post-new.php'); |
|
| 412 | + || Str::contains( $referer, 'post.php' ) |
|
| 413 | + || Str::contains( $referer, 'post-new.php' ); |
|
| 414 | 414 | $redirectUri = $hasReferer |
| 415 | - ? remove_query_arg(['deleted', 'ids', 'trashed', 'untrashed'], $referer) |
|
| 416 | - : get_edit_post_link($postId); |
|
| 417 | - wp_safe_redirect(add_query_arg(['message' => $messageIndex], $redirectUri)); |
|
| 415 | + ? remove_query_arg( ['deleted', 'ids', 'trashed', 'untrashed'], $referer ) |
|
| 416 | + : get_edit_post_link( $postId ); |
|
| 417 | + wp_safe_redirect( add_query_arg( ['message' => $messageIndex], $redirectUri ) ); |
|
| 418 | 418 | exit; |
| 419 | 419 | } |
| 420 | 420 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public static function load() |
| 47 | 47 | { |
| 48 | - if (empty(static::$instance)) { |
|
| 48 | + if( empty(static::$instance) ) { |
|
| 49 | 49 | static::$instance = new static(); |
| 50 | 50 | } |
| 51 | 51 | return static::$instance; |
@@ -55,16 +55,16 @@ discard block |
||
| 55 | 55 | * @param string $property |
| 56 | 56 | * @return mixed |
| 57 | 57 | */ |
| 58 | - public function __get($property) |
|
| 58 | + public function __get( $property ) |
|
| 59 | 59 | { |
| 60 | - if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) { |
|
| 60 | + if( property_exists( $this, $property ) && !in_array( $property, static::PROTECTED_PROPERTIES ) ) { |
|
| 61 | 61 | return $this->$property; |
| 62 | 62 | } |
| 63 | - $constant = 'static::'.strtoupper(Str::snakeCase($property)); |
|
| 64 | - if (defined($constant)) { |
|
| 65 | - return constant($constant); |
|
| 63 | + $constant = 'static::'.strtoupper( Str::snakeCase( $property ) ); |
|
| 64 | + if( defined( $constant ) ) { |
|
| 65 | + return constant( $constant ); |
|
| 66 | 66 | } |
| 67 | - return Arr::get($this->storage, $property, null); |
|
| 67 | + return Arr::get( $this->storage, $property, null ); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
@@ -72,14 +72,14 @@ discard block |
||
| 72 | 72 | * @param string $value |
| 73 | 73 | * @return void |
| 74 | 74 | */ |
| 75 | - public function __set($property, $value) |
|
| 75 | + public function __set( $property, $value ) |
|
| 76 | 76 | { |
| 77 | - if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) { |
|
| 77 | + if( !property_exists( $this, $property ) || in_array( $property, static::PROTECTED_PROPERTIES ) ) { |
|
| 78 | 78 | $this->storage[$property] = $value; |
| 79 | - } elseif (!isset($this->$property)) { |
|
| 79 | + } elseif( !isset($this->$property) ) { |
|
| 80 | 80 | $this->$property = $value; |
| 81 | 81 | } else { |
| 82 | - throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property)); |
|
| 82 | + throw new Exception( sprintf( 'The "%s" property cannot be changed once set.', $property ) ); |
|
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | * @param mixed $concrete |
| 90 | 90 | * @return mixed |
| 91 | 91 | */ |
| 92 | - public function bind($alias, $concrete) |
|
| 92 | + public function bind( $alias, $concrete ) |
|
| 93 | 93 | { |
| 94 | 94 | $this->services[$alias] = $concrete; |
| 95 | 95 | } |
@@ -99,21 +99,21 @@ discard block |
||
| 99 | 99 | * @param mixed $abstract |
| 100 | 100 | * @return mixed |
| 101 | 101 | */ |
| 102 | - public function make($abstract) |
|
| 102 | + public function make( $abstract ) |
|
| 103 | 103 | { |
| 104 | - if (!isset($this->services[$abstract])) { |
|
| 105 | - $abstract = $this->addNamespace($abstract); |
|
| 104 | + if( !isset($this->services[$abstract]) ) { |
|
| 105 | + $abstract = $this->addNamespace( $abstract ); |
|
| 106 | 106 | } |
| 107 | - if (isset($this->services[$abstract])) { |
|
| 107 | + if( isset($this->services[$abstract]) ) { |
|
| 108 | 108 | $abstract = $this->services[$abstract]; |
| 109 | 109 | } |
| 110 | - if (is_callable($abstract)) { |
|
| 111 | - return call_user_func_array($abstract, [$this]); |
|
| 110 | + if( is_callable( $abstract ) ) { |
|
| 111 | + return call_user_func_array( $abstract, [$this] ); |
|
| 112 | 112 | } |
| 113 | - if (is_object($abstract)) { |
|
| 113 | + if( is_object( $abstract ) ) { |
|
| 114 | 114 | return $abstract; |
| 115 | 115 | } |
| 116 | - return $this->resolve($abstract); |
|
| 116 | + return $this->resolve( $abstract ); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | /** |
@@ -127,9 +127,9 @@ discard block |
||
| 127 | 127 | /** |
| 128 | 128 | * @return mixed |
| 129 | 129 | */ |
| 130 | - public function sessionGet($key, $fallback = '') |
|
| 130 | + public function sessionGet( $key, $fallback = '' ) |
|
| 131 | 131 | { |
| 132 | - $value = Arr::get($this->session, $key, $fallback); |
|
| 132 | + $value = Arr::get( $this->session, $key, $fallback ); |
|
| 133 | 133 | unset($this->session[$key]); |
| 134 | 134 | return $value; |
| 135 | 135 | } |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | /** |
| 138 | 138 | * @return void |
| 139 | 139 | */ |
| 140 | - public function sessionSet($key, $value) |
|
| 140 | + public function sessionSet( $key, $value ) |
|
| 141 | 141 | { |
| 142 | 142 | $this->session[$key] = $value; |
| 143 | 143 | } |
@@ -148,9 +148,9 @@ discard block |
||
| 148 | 148 | * @param callable|string|null $binding |
| 149 | 149 | * @return void |
| 150 | 150 | */ |
| 151 | - public function singleton($alias, $binding) |
|
| 151 | + public function singleton( $alias, $binding ) |
|
| 152 | 152 | { |
| 153 | - $this->bind($alias, $this->make($binding)); |
|
| 153 | + $this->bind( $alias, $this->make( $binding ) ); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | /** |
@@ -158,9 +158,9 @@ discard block |
||
| 158 | 158 | * @param string $abstract |
| 159 | 159 | * @return string |
| 160 | 160 | */ |
| 161 | - protected function addNamespace($abstract) |
|
| 161 | + protected function addNamespace( $abstract ) |
|
| 162 | 162 | { |
| 163 | - if (!Str::contains($abstract, __NAMESPACE__) && !class_exists($abstract)) { |
|
| 163 | + if( !Str::contains( $abstract, __NAMESPACE__ ) && !class_exists( $abstract ) ) { |
|
| 164 | 164 | $abstract = __NAMESPACE__.'\\'.$abstract; |
| 165 | 165 | } |
| 166 | 166 | return $abstract; |
@@ -172,21 +172,21 @@ discard block |
||
| 172 | 172 | * @return mixed |
| 173 | 173 | * @throws Exception |
| 174 | 174 | */ |
| 175 | - protected function resolve($concrete) |
|
| 175 | + protected function resolve( $concrete ) |
|
| 176 | 176 | { |
| 177 | - if ($concrete instanceof Closure) { |
|
| 178 | - return $concrete($this); |
|
| 177 | + if( $concrete instanceof Closure ) { |
|
| 178 | + return $concrete( $this ); |
|
| 179 | 179 | } |
| 180 | - $reflector = new ReflectionClass($concrete); |
|
| 181 | - if (!$reflector->isInstantiable()) { |
|
| 182 | - throw new Exception('Target ['.$concrete.'] is not instantiable.'); |
|
| 180 | + $reflector = new ReflectionClass( $concrete ); |
|
| 181 | + if( !$reflector->isInstantiable() ) { |
|
| 182 | + throw new Exception( 'Target ['.$concrete.'] is not instantiable.' ); |
|
| 183 | 183 | } |
| 184 | 184 | $constructor = $reflector->getConstructor(); |
| 185 | - if (empty($constructor)) { |
|
| 185 | + if( empty($constructor) ) { |
|
| 186 | 186 | return new $concrete(); |
| 187 | 187 | } |
| 188 | 188 | return $reflector->newInstanceArgs( |
| 189 | - $this->resolveDependencies($constructor->getParameters()) |
|
| 189 | + $this->resolveDependencies( $constructor->getParameters() ) |
|
| 190 | 190 | ); |
| 191 | 191 | } |
| 192 | 192 | |
@@ -195,12 +195,12 @@ discard block |
||
| 195 | 195 | * @return mixed |
| 196 | 196 | * @throws Exception |
| 197 | 197 | */ |
| 198 | - protected function resolveClass(ReflectionParameter $parameter) |
|
| 198 | + protected function resolveClass( ReflectionParameter $parameter ) |
|
| 199 | 199 | { |
| 200 | 200 | try { |
| 201 | - return $this->make($parameter->getClass()->name); |
|
| 202 | - } catch (Exception $error) { |
|
| 203 | - if ($parameter->isOptional()) { |
|
| 201 | + return $this->make( $parameter->getClass()->name ); |
|
| 202 | + } catch( Exception $error ) { |
|
| 203 | + if( $parameter->isOptional() ) { |
|
| 204 | 204 | return $parameter->getDefaultValue(); |
| 205 | 205 | } |
| 206 | 206 | throw $error; |
@@ -211,13 +211,13 @@ discard block |
||
| 211 | 211 | * Resolve all of the dependencies from the ReflectionParameters. |
| 212 | 212 | * @return array |
| 213 | 213 | */ |
| 214 | - protected function resolveDependencies(array $dependencies) |
|
| 214 | + protected function resolveDependencies( array $dependencies ) |
|
| 215 | 215 | { |
| 216 | 216 | $results = []; |
| 217 | - foreach ($dependencies as $dependency) { |
|
| 218 | - $results[] = !is_null($class = $dependency->getClass()) |
|
| 219 | - ? $this->resolveClass($dependency) |
|
| 220 | - : $this->resolveDependency($dependency); |
|
| 217 | + foreach( $dependencies as $dependency ) { |
|
| 218 | + $results[] = !is_null( $class = $dependency->getClass() ) |
|
| 219 | + ? $this->resolveClass( $dependency ) |
|
| 220 | + : $this->resolveDependency( $dependency ); |
|
| 221 | 221 | } |
| 222 | 222 | return $results; |
| 223 | 223 | } |
@@ -226,9 +226,9 @@ discard block |
||
| 226 | 226 | * Resolve a single ReflectionParameter dependency. |
| 227 | 227 | * @return array|null |
| 228 | 228 | */ |
| 229 | - protected function resolveDependency(ReflectionParameter $parameter) |
|
| 229 | + protected function resolveDependency( ReflectionParameter $parameter ) |
|
| 230 | 230 | { |
| 231 | - if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) { |
|
| 231 | + if( $parameter->isArray() && $parameter->isDefaultValueAvailable() ) { |
|
| 232 | 232 | return $parameter->getDefaultValue(); |
| 233 | 233 | } |
| 234 | 234 | return null; |
