pryley /
site-reviews
@@ -7,106 +7,106 @@ |
||
| 7 | 7 | |
| 8 | 8 | class Labels |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * @param string $translation |
|
| 12 | - * @param string $test |
|
| 13 | - * @return string |
|
| 14 | - */ |
|
| 15 | - public function filterPostStatusLabels($translation, $text) |
|
| 16 | - { |
|
| 17 | - $replacements = $this->getStatusLabels(); |
|
| 18 | - return array_key_exists($text, $replacements) |
|
| 19 | - ? $replacements[$text] |
|
| 20 | - : $translation; |
|
| 21 | - } |
|
| 10 | + /** |
|
| 11 | + * @param string $translation |
|
| 12 | + * @param string $test |
|
| 13 | + * @return string |
|
| 14 | + */ |
|
| 15 | + public function filterPostStatusLabels($translation, $text) |
|
| 16 | + { |
|
| 17 | + $replacements = $this->getStatusLabels(); |
|
| 18 | + return array_key_exists($text, $replacements) |
|
| 19 | + ? $replacements[$text] |
|
| 20 | + : $translation; |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * @return array |
|
| 25 | - */ |
|
| 26 | - public function filterUpdateMessages(array $messages) |
|
| 27 | - { |
|
| 28 | - $post = get_post(); |
|
| 29 | - if (!($post instanceof WP_Post)) { |
|
| 30 | - return; |
|
| 31 | - } |
|
| 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); |
|
| 36 | - } |
|
| 37 | - $scheduled_date = date_i18n('M j, Y @ H:i', strtotime($post->post_date)); |
|
| 38 | - $messages[Application::POST_TYPE] = [ |
|
| 39 | - 1 => $strings['updated'], |
|
| 40 | - 4 => $strings['updated'], |
|
| 41 | - 5 => $restored, |
|
| 42 | - 6 => $strings['published'], |
|
| 43 | - 7 => $strings['saved'], |
|
| 44 | - 8 => $strings['submitted'], |
|
| 45 | - 9 => sprintf($strings['scheduled'], '<strong>'.$scheduled_date.'</strong>'), |
|
| 46 | - 10 => $strings['draft_updated'], |
|
| 47 | - 50 => $strings['approved'], |
|
| 48 | - 51 => $strings['unapproved'], |
|
| 49 | - 52 => $strings['reverted'], |
|
| 50 | - ]; |
|
| 51 | - return $messages; |
|
| 52 | - } |
|
| 23 | + /** |
|
| 24 | + * @return array |
|
| 25 | + */ |
|
| 26 | + public function filterUpdateMessages(array $messages) |
|
| 27 | + { |
|
| 28 | + $post = get_post(); |
|
| 29 | + if (!($post instanceof WP_Post)) { |
|
| 30 | + return; |
|
| 31 | + } |
|
| 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); |
|
| 36 | + } |
|
| 37 | + $scheduled_date = date_i18n('M j, Y @ H:i', strtotime($post->post_date)); |
|
| 38 | + $messages[Application::POST_TYPE] = [ |
|
| 39 | + 1 => $strings['updated'], |
|
| 40 | + 4 => $strings['updated'], |
|
| 41 | + 5 => $restored, |
|
| 42 | + 6 => $strings['published'], |
|
| 43 | + 7 => $strings['saved'], |
|
| 44 | + 8 => $strings['submitted'], |
|
| 45 | + 9 => sprintf($strings['scheduled'], '<strong>'.$scheduled_date.'</strong>'), |
|
| 46 | + 10 => $strings['draft_updated'], |
|
| 47 | + 50 => $strings['approved'], |
|
| 48 | + 51 => $strings['unapproved'], |
|
| 49 | + 52 => $strings['reverted'], |
|
| 50 | + ]; |
|
| 51 | + return $messages; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * @return void |
|
| 56 | - */ |
|
| 57 | - public function translatePostStatusLabels() |
|
| 58 | - { |
|
| 59 | - global $wp_scripts; |
|
| 60 | - $strings = [ |
|
| 61 | - 'savePending' => __('Save as Unapproved', 'site-reviews'), |
|
| 62 | - 'published' => __('Approved', 'site-reviews'), |
|
| 63 | - ]; |
|
| 64 | - if (isset($wp_scripts->registered['post']->extra['data'])) { |
|
| 65 | - $l10n = &$wp_scripts->registered['post']->extra['data']; |
|
| 66 | - foreach ($strings as $search => $replace) { |
|
| 67 | - $l10n = preg_replace('/("'.$search.'":")([^"]+)/', '$1'.$replace, $l10n); |
|
| 68 | - } |
|
| 69 | - } |
|
| 70 | - } |
|
| 54 | + /** |
|
| 55 | + * @return void |
|
| 56 | + */ |
|
| 57 | + public function translatePostStatusLabels() |
|
| 58 | + { |
|
| 59 | + global $wp_scripts; |
|
| 60 | + $strings = [ |
|
| 61 | + 'savePending' => __('Save as Unapproved', 'site-reviews'), |
|
| 62 | + 'published' => __('Approved', 'site-reviews'), |
|
| 63 | + ]; |
|
| 64 | + if (isset($wp_scripts->registered['post']->extra['data'])) { |
|
| 65 | + $l10n = &$wp_scripts->registered['post']->extra['data']; |
|
| 66 | + foreach ($strings as $search => $replace) { |
|
| 67 | + $l10n = preg_replace('/("'.$search.'":")([^"]+)/', '$1'.$replace, $l10n); |
|
| 68 | + } |
|
| 69 | + } |
|
| 70 | + } |
|
| 71 | 71 | |
| 72 | - /** |
|
| 73 | - * @return array |
|
| 74 | - */ |
|
| 75 | - protected function getReviewLabels() |
|
| 76 | - { |
|
| 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'), |
|
| 90 | - ]; |
|
| 91 | - } |
|
| 72 | + /** |
|
| 73 | + * @return array |
|
| 74 | + */ |
|
| 75 | + protected function getReviewLabels() |
|
| 76 | + { |
|
| 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'), |
|
| 90 | + ]; |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - /** |
|
| 94 | - * Store the labels to avoid unnecessary loops. |
|
| 95 | - * @return array |
|
| 96 | - */ |
|
| 97 | - protected function getStatusLabels() |
|
| 98 | - { |
|
| 99 | - static $labels; |
|
| 100 | - if (empty($labels)) { |
|
| 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'), |
|
| 108 | - ]; |
|
| 109 | - } |
|
| 110 | - return $labels; |
|
| 111 | - } |
|
| 93 | + /** |
|
| 94 | + * Store the labels to avoid unnecessary loops. |
|
| 95 | + * @return array |
|
| 96 | + */ |
|
| 97 | + protected function getStatusLabels() |
|
| 98 | + { |
|
| 99 | + static $labels; |
|
| 100 | + if (empty($labels)) { |
|
| 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'), |
|
| 108 | + ]; |
|
| 109 | + } |
|
| 110 | + return $labels; |
|
| 111 | + } |
|
| 112 | 112 | } |
@@ -20,401 +20,401 @@ |
||
| 20 | 20 | |
| 21 | 21 | class EditorController extends Controller |
| 22 | 22 | { |
| 23 | - /** |
|
| 24 | - * @param array $settings |
|
| 25 | - * @return array |
|
| 26 | - * @filter wp_editor_settings |
|
| 27 | - */ |
|
| 28 | - public function filterEditorSettings($settings) |
|
| 29 | - { |
|
| 30 | - return glsr(Customization::class)->filterEditorSettings( |
|
| 31 | - Arr::consolidateArray($settings) |
|
| 32 | - ); |
|
| 33 | - } |
|
| 23 | + /** |
|
| 24 | + * @param array $settings |
|
| 25 | + * @return array |
|
| 26 | + * @filter wp_editor_settings |
|
| 27 | + */ |
|
| 28 | + public function filterEditorSettings($settings) |
|
| 29 | + { |
|
| 30 | + return glsr(Customization::class)->filterEditorSettings( |
|
| 31 | + Arr::consolidateArray($settings) |
|
| 32 | + ); |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * Modify the WP_Editor html to allow autosizing without breaking the `editor-expand` script. |
|
| 37 | - * @param string $html |
|
| 38 | - * @return string |
|
| 39 | - * @filter the_editor |
|
| 40 | - */ |
|
| 41 | - public function filterEditorTextarea($html) |
|
| 42 | - { |
|
| 43 | - return glsr(Customization::class)->filterEditorTextarea($html); |
|
| 44 | - } |
|
| 35 | + /** |
|
| 36 | + * Modify the WP_Editor html to allow autosizing without breaking the `editor-expand` script. |
|
| 37 | + * @param string $html |
|
| 38 | + * @return string |
|
| 39 | + * @filter the_editor |
|
| 40 | + */ |
|
| 41 | + public function filterEditorTextarea($html) |
|
| 42 | + { |
|
| 43 | + return glsr(Customization::class)->filterEditorTextarea($html); |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - /** |
|
| 47 | - * @param bool $protected |
|
| 48 | - * @param string $metaKey |
|
| 49 | - * @param string $metaType |
|
| 50 | - * @return bool |
|
| 51 | - * @filter is_protected_meta |
|
| 52 | - */ |
|
| 53 | - public function filterIsProtectedMeta($protected, $metaKey, $metaType) |
|
| 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)) { |
|
| 59 | - $protected = false; |
|
| 60 | - } |
|
| 61 | - } |
|
| 62 | - return $protected; |
|
| 63 | - } |
|
| 46 | + /** |
|
| 47 | + * @param bool $protected |
|
| 48 | + * @param string $metaKey |
|
| 49 | + * @param string $metaType |
|
| 50 | + * @return bool |
|
| 51 | + * @filter is_protected_meta |
|
| 52 | + */ |
|
| 53 | + public function filterIsProtectedMeta($protected, $metaKey, $metaType) |
|
| 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)) { |
|
| 59 | + $protected = false; |
|
| 60 | + } |
|
| 61 | + } |
|
| 62 | + return $protected; |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * @param array $messages |
|
| 67 | - * @return array |
|
| 68 | - * @filter post_updated_messages |
|
| 69 | - */ |
|
| 70 | - public function filterUpdateMessages($messages) |
|
| 71 | - { |
|
| 72 | - return glsr(Labels::class)->filterUpdateMessages( |
|
| 73 | - Arr::consolidateArray($messages) |
|
| 74 | - ); |
|
| 75 | - } |
|
| 65 | + /** |
|
| 66 | + * @param array $messages |
|
| 67 | + * @return array |
|
| 68 | + * @filter post_updated_messages |
|
| 69 | + */ |
|
| 70 | + public function filterUpdateMessages($messages) |
|
| 71 | + { |
|
| 72 | + return glsr(Labels::class)->filterUpdateMessages( |
|
| 73 | + Arr::consolidateArray($messages) |
|
| 74 | + ); |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | - /** |
|
| 78 | - * @return void |
|
| 79 | - * @action add_meta_boxes_{Application::POST_TYPE} |
|
| 80 | - */ |
|
| 81 | - public function registerMetaBoxes($post) |
|
| 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')) { |
|
| 86 | - return; |
|
| 87 | - } |
|
| 88 | - add_meta_box(Application::ID.'_response', __('Respond Publicly', 'site-reviews'), [$this, 'renderResponseMetaBox'], null, 'normal'); |
|
| 89 | - } |
|
| 77 | + /** |
|
| 78 | + * @return void |
|
| 79 | + * @action add_meta_boxes_{Application::POST_TYPE} |
|
| 80 | + */ |
|
| 81 | + public function registerMetaBoxes($post) |
|
| 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')) { |
|
| 86 | + return; |
|
| 87 | + } |
|
| 88 | + add_meta_box(Application::ID.'_response', __('Respond Publicly', 'site-reviews'), [$this, 'renderResponseMetaBox'], null, 'normal'); |
|
| 89 | + } |
|
| 90 | 90 | |
| 91 | - /** |
|
| 92 | - * @return void |
|
| 93 | - * @action admin_print_scripts |
|
| 94 | - */ |
|
| 95 | - public function removeAutosave() |
|
| 96 | - { |
|
| 97 | - glsr(Customization::class)->removeAutosave(); |
|
| 98 | - } |
|
| 91 | + /** |
|
| 92 | + * @return void |
|
| 93 | + * @action admin_print_scripts |
|
| 94 | + */ |
|
| 95 | + public function removeAutosave() |
|
| 96 | + { |
|
| 97 | + glsr(Customization::class)->removeAutosave(); |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | - /** |
|
| 101 | - * @return void |
|
| 102 | - * @action admin_menu |
|
| 103 | - */ |
|
| 104 | - public function removeMetaBoxes() |
|
| 105 | - { |
|
| 106 | - glsr(Customization::class)->removeMetaBoxes(); |
|
| 107 | - } |
|
| 100 | + /** |
|
| 101 | + * @return void |
|
| 102 | + * @action admin_menu |
|
| 103 | + */ |
|
| 104 | + public function removeMetaBoxes() |
|
| 105 | + { |
|
| 106 | + glsr(Customization::class)->removeMetaBoxes(); |
|
| 107 | + } |
|
| 108 | 108 | |
| 109 | - /** |
|
| 110 | - * @return void |
|
| 111 | - */ |
|
| 112 | - public function removePostTypeSupport() |
|
| 113 | - { |
|
| 114 | - glsr(Customization::class)->removePostTypeSupport(); |
|
| 115 | - } |
|
| 109 | + /** |
|
| 110 | + * @return void |
|
| 111 | + */ |
|
| 112 | + public function removePostTypeSupport() |
|
| 113 | + { |
|
| 114 | + glsr(Customization::class)->removePostTypeSupport(); |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - /** |
|
| 118 | - * @param WP_Post $post |
|
| 119 | - * @return void |
|
| 120 | - * @callback add_meta_box |
|
| 121 | - */ |
|
| 122 | - public function renderAssignedToMetabox($post) |
|
| 123 | - { |
|
| 124 | - if (!$this->isReviewPostType($post)) { |
|
| 125 | - return; |
|
| 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', [ |
|
| 130 | - 'id' => $assignedTo, |
|
| 131 | - 'template' => $this->buildAssignedToTemplate($assignedTo, $post), |
|
| 132 | - ]); |
|
| 133 | - } |
|
| 117 | + /** |
|
| 118 | + * @param WP_Post $post |
|
| 119 | + * @return void |
|
| 120 | + * @callback add_meta_box |
|
| 121 | + */ |
|
| 122 | + public function renderAssignedToMetabox($post) |
|
| 123 | + { |
|
| 124 | + if (!$this->isReviewPostType($post)) { |
|
| 125 | + return; |
|
| 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', [ |
|
| 130 | + 'id' => $assignedTo, |
|
| 131 | + 'template' => $this->buildAssignedToTemplate($assignedTo, $post), |
|
| 132 | + ]); |
|
| 133 | + } |
|
| 134 | 134 | |
| 135 | - /** |
|
| 136 | - * @param WP_Post $post |
|
| 137 | - * @return void |
|
| 138 | - * @callback add_meta_box |
|
| 139 | - */ |
|
| 140 | - public function renderDetailsMetaBox($post) |
|
| 141 | - { |
|
| 142 | - if (!$this->isReviewPostType($post)) { |
|
| 143 | - return; |
|
| 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 | - ]); |
|
| 150 | - } |
|
| 135 | + /** |
|
| 136 | + * @param WP_Post $post |
|
| 137 | + * @return void |
|
| 138 | + * @callback add_meta_box |
|
| 139 | + */ |
|
| 140 | + public function renderDetailsMetaBox($post) |
|
| 141 | + { |
|
| 142 | + if (!$this->isReviewPostType($post)) { |
|
| 143 | + return; |
|
| 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 | + ]); |
|
| 150 | + } |
|
| 151 | 151 | |
| 152 | - /** |
|
| 153 | - * @return void |
|
| 154 | - * @action post_submitbox_misc_actions |
|
| 155 | - */ |
|
| 156 | - public function renderPinnedInPublishMetaBox() |
|
| 157 | - { |
|
| 158 | - if (!$this->isReviewPostType(get_post())) { |
|
| 159 | - return; |
|
| 160 | - } |
|
| 161 | - glsr(Template::class)->render('partials/editor/pinned', [ |
|
| 162 | - 'context' => [ |
|
| 163 | - 'no' => __('No', 'site-reviews'), |
|
| 164 | - 'yes' => __('Yes', 'site-reviews'), |
|
| 165 | - ], |
|
| 166 | - 'pinned' => wp_validate_boolean(glsr(Database::class)->get(get_the_ID(), 'pinned')), |
|
| 167 | - ]); |
|
| 168 | - } |
|
| 152 | + /** |
|
| 153 | + * @return void |
|
| 154 | + * @action post_submitbox_misc_actions |
|
| 155 | + */ |
|
| 156 | + public function renderPinnedInPublishMetaBox() |
|
| 157 | + { |
|
| 158 | + if (!$this->isReviewPostType(get_post())) { |
|
| 159 | + return; |
|
| 160 | + } |
|
| 161 | + glsr(Template::class)->render('partials/editor/pinned', [ |
|
| 162 | + 'context' => [ |
|
| 163 | + 'no' => __('No', 'site-reviews'), |
|
| 164 | + 'yes' => __('Yes', 'site-reviews'), |
|
| 165 | + ], |
|
| 166 | + 'pinned' => wp_validate_boolean(glsr(Database::class)->get(get_the_ID(), 'pinned')), |
|
| 167 | + ]); |
|
| 168 | + } |
|
| 169 | 169 | |
| 170 | - /** |
|
| 171 | - * @param WP_Post $post |
|
| 172 | - * @return void |
|
| 173 | - * @callback add_meta_box |
|
| 174 | - */ |
|
| 175 | - public function renderResponseMetaBox($post) |
|
| 176 | - { |
|
| 177 | - if (!$this->isReviewPostType($post)) { |
|
| 178 | - return; |
|
| 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 | - ]); |
|
| 184 | - } |
|
| 170 | + /** |
|
| 171 | + * @param WP_Post $post |
|
| 172 | + * @return void |
|
| 173 | + * @callback add_meta_box |
|
| 174 | + */ |
|
| 175 | + public function renderResponseMetaBox($post) |
|
| 176 | + { |
|
| 177 | + if (!$this->isReviewPostType($post)) { |
|
| 178 | + return; |
|
| 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 | + ]); |
|
| 184 | + } |
|
| 185 | 185 | |
| 186 | - /** |
|
| 187 | - * @param WP_Post $post |
|
| 188 | - * @return void |
|
| 189 | - * @action edit_form_after_title |
|
| 190 | - */ |
|
| 191 | - public function renderReviewEditor($post) |
|
| 192 | - { |
|
| 193 | - if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) { |
|
| 194 | - return; |
|
| 195 | - } |
|
| 196 | - glsr()->render('partials/editor/review', [ |
|
| 197 | - 'post' => $post, |
|
| 198 | - 'response' => glsr(Database::class)->get($post->ID, 'response'), |
|
| 199 | - ]); |
|
| 200 | - } |
|
| 186 | + /** |
|
| 187 | + * @param WP_Post $post |
|
| 188 | + * @return void |
|
| 189 | + * @action edit_form_after_title |
|
| 190 | + */ |
|
| 191 | + public function renderReviewEditor($post) |
|
| 192 | + { |
|
| 193 | + if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) { |
|
| 194 | + return; |
|
| 195 | + } |
|
| 196 | + glsr()->render('partials/editor/review', [ |
|
| 197 | + 'post' => $post, |
|
| 198 | + 'response' => glsr(Database::class)->get($post->ID, 'response'), |
|
| 199 | + ]); |
|
| 200 | + } |
|
| 201 | 201 | |
| 202 | - /** |
|
| 203 | - * @return void |
|
| 204 | - * @action admin_head |
|
| 205 | - */ |
|
| 206 | - public function renderReviewFields() |
|
| 207 | - { |
|
| 208 | - $screen = glsr_current_screen(); |
|
| 209 | - if ('post' != $screen->base || Application::POST_TYPE != $screen->post_type) { |
|
| 210 | - return; |
|
| 211 | - } |
|
| 212 | - add_action('edit_form_after_title', [$this, 'renderReviewEditor']); |
|
| 213 | - add_action('edit_form_top', [$this, 'renderReviewNotice']); |
|
| 214 | - } |
|
| 202 | + /** |
|
| 203 | + * @return void |
|
| 204 | + * @action admin_head |
|
| 205 | + */ |
|
| 206 | + public function renderReviewFields() |
|
| 207 | + { |
|
| 208 | + $screen = glsr_current_screen(); |
|
| 209 | + if ('post' != $screen->base || Application::POST_TYPE != $screen->post_type) { |
|
| 210 | + return; |
|
| 211 | + } |
|
| 212 | + add_action('edit_form_after_title', [$this, 'renderReviewEditor']); |
|
| 213 | + add_action('edit_form_top', [$this, 'renderReviewNotice']); |
|
| 214 | + } |
|
| 215 | 215 | |
| 216 | - /** |
|
| 217 | - * @param WP_Post $post |
|
| 218 | - * @return void |
|
| 219 | - * @action edit_form_top |
|
| 220 | - */ |
|
| 221 | - public function renderReviewNotice($post) |
|
| 222 | - { |
|
| 223 | - if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) { |
|
| 224 | - return; |
|
| 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', [ |
|
| 231 | - 'context' => [ |
|
| 232 | - 'notices' => glsr(Notice::class)->get(), |
|
| 233 | - ], |
|
| 234 | - ]); |
|
| 235 | - } |
|
| 216 | + /** |
|
| 217 | + * @param WP_Post $post |
|
| 218 | + * @return void |
|
| 219 | + * @action edit_form_top |
|
| 220 | + */ |
|
| 221 | + public function renderReviewNotice($post) |
|
| 222 | + { |
|
| 223 | + if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) { |
|
| 224 | + return; |
|
| 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', [ |
|
| 231 | + 'context' => [ |
|
| 232 | + 'notices' => glsr(Notice::class)->get(), |
|
| 233 | + ], |
|
| 234 | + ]); |
|
| 235 | + } |
|
| 236 | 236 | |
| 237 | - /** |
|
| 238 | - * @param WP_Post $post |
|
| 239 | - * @return void |
|
| 240 | - * @see glsr_categories_meta_box() |
|
| 241 | - * @callback register_taxonomy |
|
| 242 | - */ |
|
| 243 | - public function renderTaxonomyMetabox($post) |
|
| 244 | - { |
|
| 245 | - if (!$this->isReviewPostType($post)) { |
|
| 246 | - return; |
|
| 247 | - } |
|
| 248 | - glsr()->render('partials/editor/metabox-categories', [ |
|
| 249 | - 'post' => $post, |
|
| 250 | - 'tax_name' => Application::TAXONOMY, |
|
| 251 | - 'taxonomy' => get_taxonomy(Application::TAXONOMY), |
|
| 252 | - ]); |
|
| 253 | - } |
|
| 237 | + /** |
|
| 238 | + * @param WP_Post $post |
|
| 239 | + * @return void |
|
| 240 | + * @see glsr_categories_meta_box() |
|
| 241 | + * @callback register_taxonomy |
|
| 242 | + */ |
|
| 243 | + public function renderTaxonomyMetabox($post) |
|
| 244 | + { |
|
| 245 | + if (!$this->isReviewPostType($post)) { |
|
| 246 | + return; |
|
| 247 | + } |
|
| 248 | + glsr()->render('partials/editor/metabox-categories', [ |
|
| 249 | + 'post' => $post, |
|
| 250 | + 'tax_name' => Application::TAXONOMY, |
|
| 251 | + 'taxonomy' => get_taxonomy(Application::TAXONOMY), |
|
| 252 | + ]); |
|
| 253 | + } |
|
| 254 | 254 | |
| 255 | - /** |
|
| 256 | - * @return void |
|
| 257 | - * @see $this->filterUpdateMessages() |
|
| 258 | - * @action admin_action_revert |
|
| 259 | - */ |
|
| 260 | - public function revertReview() |
|
| 261 | - { |
|
| 262 | - if (Application::ID != filter_input(INPUT_GET, 'plugin')) { |
|
| 263 | - return; |
|
| 264 | - } |
|
| 265 | - check_admin_referer('revert-review_'.($postId = $this->getPostId())); |
|
| 266 | - glsr(ReviewManager::class)->revert($postId); |
|
| 267 | - $this->redirect($postId, 52); |
|
| 268 | - } |
|
| 255 | + /** |
|
| 256 | + * @return void |
|
| 257 | + * @see $this->filterUpdateMessages() |
|
| 258 | + * @action admin_action_revert |
|
| 259 | + */ |
|
| 260 | + public function revertReview() |
|
| 261 | + { |
|
| 262 | + if (Application::ID != filter_input(INPUT_GET, 'plugin')) { |
|
| 263 | + return; |
|
| 264 | + } |
|
| 265 | + check_admin_referer('revert-review_'.($postId = $this->getPostId())); |
|
| 266 | + glsr(ReviewManager::class)->revert($postId); |
|
| 267 | + $this->redirect($postId, 52); |
|
| 268 | + } |
|
| 269 | 269 | |
| 270 | - /** |
|
| 271 | - * @param int $postId |
|
| 272 | - * @param \WP_Post $post |
|
| 273 | - * @param bool $isUpdate |
|
| 274 | - * @return void |
|
| 275 | - * @action save_post_.Application::POST_TYPE |
|
| 276 | - */ |
|
| 277 | - public function saveMetaboxes($postId, $post, $isUpdating) |
|
| 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)); |
|
| 283 | - } |
|
| 284 | - } |
|
| 270 | + /** |
|
| 271 | + * @param int $postId |
|
| 272 | + * @param \WP_Post $post |
|
| 273 | + * @param bool $isUpdate |
|
| 274 | + * @return void |
|
| 275 | + * @action save_post_.Application::POST_TYPE |
|
| 276 | + */ |
|
| 277 | + public function saveMetaboxes($postId, $post, $isUpdating) |
|
| 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)); |
|
| 283 | + } |
|
| 284 | + } |
|
| 285 | 285 | |
| 286 | - /** |
|
| 287 | - * @param string $assignedTo |
|
| 288 | - * @return string |
|
| 289 | - */ |
|
| 290 | - protected function buildAssignedToTemplate($assignedTo, WP_Post $post) |
|
| 291 | - { |
|
| 292 | - $assignedPost = glsr(Database::class)->getAssignedToPost($post->ID, $assignedTo); |
|
| 293 | - if (!($assignedPost instanceof WP_Post)) { |
|
| 294 | - return; |
|
| 295 | - } |
|
| 296 | - return glsr(Template::class)->build('partials/editor/assigned-post', [ |
|
| 297 | - 'context' => [ |
|
| 298 | - 'data.url' => (string) get_permalink($assignedPost), |
|
| 299 | - 'data.title' => get_the_title($assignedPost), |
|
| 300 | - ], |
|
| 301 | - ]); |
|
| 302 | - } |
|
| 286 | + /** |
|
| 287 | + * @param string $assignedTo |
|
| 288 | + * @return string |
|
| 289 | + */ |
|
| 290 | + protected function buildAssignedToTemplate($assignedTo, WP_Post $post) |
|
| 291 | + { |
|
| 292 | + $assignedPost = glsr(Database::class)->getAssignedToPost($post->ID, $assignedTo); |
|
| 293 | + if (!($assignedPost instanceof WP_Post)) { |
|
| 294 | + return; |
|
| 295 | + } |
|
| 296 | + return glsr(Template::class)->build('partials/editor/assigned-post', [ |
|
| 297 | + 'context' => [ |
|
| 298 | + 'data.url' => (string) get_permalink($assignedPost), |
|
| 299 | + 'data.title' => get_the_title($assignedPost), |
|
| 300 | + ], |
|
| 301 | + ]); |
|
| 302 | + } |
|
| 303 | 303 | |
| 304 | - /** |
|
| 305 | - * @return string |
|
| 306 | - */ |
|
| 307 | - protected function buildDetailsMetaBoxRevertButton(Review $review, WP_Post $post) |
|
| 308 | - { |
|
| 309 | - $isModified = !Arr::compareArrays( |
|
| 310 | - [$review->title, $review->content, $review->date], |
|
| 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'), |
|
| 315 | - ] |
|
| 316 | - ); |
|
| 317 | - if ($isModified) { |
|
| 318 | - $revertUrl = wp_nonce_url( |
|
| 319 | - admin_url('post.php?post='.$post->ID.'&action=revert&plugin='.Application::ID), |
|
| 320 | - 'revert-review_'.$post->ID |
|
| 321 | - ); |
|
| 322 | - return glsr(Builder::class)->a(__('Revert Changes', 'site-reviews'), [ |
|
| 323 | - 'class' => 'button button-large', |
|
| 324 | - 'href' => $revertUrl, |
|
| 325 | - 'id' => 'revert', |
|
| 326 | - ]); |
|
| 327 | - } |
|
| 328 | - return glsr(Builder::class)->button(__('Nothing to Revert', 'site-reviews'), [ |
|
| 329 | - 'class' => 'button-large', |
|
| 330 | - 'disabled' => true, |
|
| 331 | - 'id' => 'revert', |
|
| 332 | - ]); |
|
| 333 | - } |
|
| 304 | + /** |
|
| 305 | + * @return string |
|
| 306 | + */ |
|
| 307 | + protected function buildDetailsMetaBoxRevertButton(Review $review, WP_Post $post) |
|
| 308 | + { |
|
| 309 | + $isModified = !Arr::compareArrays( |
|
| 310 | + [$review->title, $review->content, $review->date], |
|
| 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'), |
|
| 315 | + ] |
|
| 316 | + ); |
|
| 317 | + if ($isModified) { |
|
| 318 | + $revertUrl = wp_nonce_url( |
|
| 319 | + admin_url('post.php?post='.$post->ID.'&action=revert&plugin='.Application::ID), |
|
| 320 | + 'revert-review_'.$post->ID |
|
| 321 | + ); |
|
| 322 | + return glsr(Builder::class)->a(__('Revert Changes', 'site-reviews'), [ |
|
| 323 | + 'class' => 'button button-large', |
|
| 324 | + 'href' => $revertUrl, |
|
| 325 | + 'id' => 'revert', |
|
| 326 | + ]); |
|
| 327 | + } |
|
| 328 | + return glsr(Builder::class)->button(__('Nothing to Revert', 'site-reviews'), [ |
|
| 329 | + 'class' => 'button-large', |
|
| 330 | + 'disabled' => true, |
|
| 331 | + 'id' => 'revert', |
|
| 332 | + ]); |
|
| 333 | + } |
|
| 334 | 334 | |
| 335 | - /** |
|
| 336 | - * @param object $review |
|
| 337 | - * @return string|void |
|
| 338 | - */ |
|
| 339 | - protected function getReviewType($review) |
|
| 340 | - { |
|
| 341 | - if (count(glsr()->reviewTypes) < 2) { |
|
| 342 | - return; |
|
| 343 | - } |
|
| 344 | - $reviewType = array_key_exists($review->review_type, glsr()->reviewTypes) |
|
| 345 | - ? glsr()->reviewTypes[$review->review_type] |
|
| 346 | - : __('Unknown', 'site-reviews'); |
|
| 347 | - if (!empty($review->url)) { |
|
| 348 | - $reviewType = glsr(Builder::class)->a($reviewType, [ |
|
| 349 | - 'href' => $review->url, |
|
| 350 | - 'target' => '_blank', |
|
| 351 | - ]); |
|
| 352 | - } |
|
| 353 | - return $reviewType; |
|
| 354 | - } |
|
| 335 | + /** |
|
| 336 | + * @param object $review |
|
| 337 | + * @return string|void |
|
| 338 | + */ |
|
| 339 | + protected function getReviewType($review) |
|
| 340 | + { |
|
| 341 | + if (count(glsr()->reviewTypes) < 2) { |
|
| 342 | + return; |
|
| 343 | + } |
|
| 344 | + $reviewType = array_key_exists($review->review_type, glsr()->reviewTypes) |
|
| 345 | + ? glsr()->reviewTypes[$review->review_type] |
|
| 346 | + : __('Unknown', 'site-reviews'); |
|
| 347 | + if (!empty($review->url)) { |
|
| 348 | + $reviewType = glsr(Builder::class)->a($reviewType, [ |
|
| 349 | + 'href' => $review->url, |
|
| 350 | + 'target' => '_blank', |
|
| 351 | + ]); |
|
| 352 | + } |
|
| 353 | + return $reviewType; |
|
| 354 | + } |
|
| 355 | 355 | |
| 356 | - /** |
|
| 357 | - * @return bool |
|
| 358 | - */ |
|
| 359 | - protected function isReviewEditable($post) |
|
| 360 | - { |
|
| 361 | - return $this->isReviewPostType($post) |
|
| 362 | - && post_type_supports(Application::POST_TYPE, 'title') |
|
| 363 | - && 'local' == glsr(Database::class)->get($post->ID, 'review_type'); |
|
| 364 | - } |
|
| 356 | + /** |
|
| 357 | + * @return bool |
|
| 358 | + */ |
|
| 359 | + protected function isReviewEditable($post) |
|
| 360 | + { |
|
| 361 | + return $this->isReviewPostType($post) |
|
| 362 | + && post_type_supports(Application::POST_TYPE, 'title') |
|
| 363 | + && 'local' == glsr(Database::class)->get($post->ID, 'review_type'); |
|
| 364 | + } |
|
| 365 | 365 | |
| 366 | - /** |
|
| 367 | - * @param mixed $post |
|
| 368 | - * @return bool |
|
| 369 | - */ |
|
| 370 | - protected function isReviewPostType($post) |
|
| 371 | - { |
|
| 372 | - return $post instanceof WP_Post && Application::POST_TYPE == $post->post_type; |
|
| 373 | - } |
|
| 366 | + /** |
|
| 367 | + * @param mixed $post |
|
| 368 | + * @return bool |
|
| 369 | + */ |
|
| 370 | + protected function isReviewPostType($post) |
|
| 371 | + { |
|
| 372 | + return $post instanceof WP_Post && Application::POST_TYPE == $post->post_type; |
|
| 373 | + } |
|
| 374 | 374 | |
| 375 | - /** |
|
| 376 | - * @return array |
|
| 377 | - */ |
|
| 378 | - protected function normalizeDetailsMetaBox(Review $review) |
|
| 379 | - { |
|
| 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 | - ]); |
|
| 385 | - $email = empty($review->email) |
|
| 386 | - ? '—' |
|
| 387 | - : glsr(Builder::class)->a($review->email, [ |
|
| 388 | - 'href' => 'mailto:'.$review->email.'?subject='.esc_attr(__('RE:', 'site-reviews').' '.$review->title), |
|
| 389 | - ]); |
|
| 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), |
|
| 399 | - ]; |
|
| 400 | - return array_filter(apply_filters('site-reviews/metabox/details', $metabox, $review)); |
|
| 401 | - } |
|
| 375 | + /** |
|
| 376 | + * @return array |
|
| 377 | + */ |
|
| 378 | + protected function normalizeDetailsMetaBox(Review $review) |
|
| 379 | + { |
|
| 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 | + ]); |
|
| 385 | + $email = empty($review->email) |
|
| 386 | + ? '—' |
|
| 387 | + : glsr(Builder::class)->a($review->email, [ |
|
| 388 | + 'href' => 'mailto:'.$review->email.'?subject='.esc_attr(__('RE:', 'site-reviews').' '.$review->title), |
|
| 389 | + ]); |
|
| 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), |
|
| 399 | + ]; |
|
| 400 | + return array_filter(apply_filters('site-reviews/metabox/details', $metabox, $review)); |
|
| 401 | + } |
|
| 402 | 402 | |
| 403 | - /** |
|
| 404 | - * @param int $postId |
|
| 405 | - * @param int $messageIndex |
|
| 406 | - * @return void |
|
| 407 | - */ |
|
| 408 | - protected function redirect($postId, $messageIndex) |
|
| 409 | - { |
|
| 410 | - $referer = wp_get_referer(); |
|
| 411 | - $hasReferer = !$referer |
|
| 412 | - || Str::contains($referer, 'post.php') |
|
| 413 | - || Str::contains($referer, 'post-new.php'); |
|
| 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)); |
|
| 418 | - exit; |
|
| 419 | - } |
|
| 403 | + /** |
|
| 404 | + * @param int $postId |
|
| 405 | + * @param int $messageIndex |
|
| 406 | + * @return void |
|
| 407 | + */ |
|
| 408 | + protected function redirect($postId, $messageIndex) |
|
| 409 | + { |
|
| 410 | + $referer = wp_get_referer(); |
|
| 411 | + $hasReferer = !$referer |
|
| 412 | + || Str::contains($referer, 'post.php') |
|
| 413 | + || Str::contains($referer, 'post-new.php'); |
|
| 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)); |
|
| 418 | + exit; |
|
| 419 | + } |
|
| 420 | 420 | } |
@@ -11,226 +11,226 @@ |
||
| 11 | 11 | |
| 12 | 12 | abstract class Container |
| 13 | 13 | { |
| 14 | - const PROTECTED_PROPERTIES = [ |
|
| 15 | - 'instance', |
|
| 16 | - 'services', |
|
| 17 | - 'session', |
|
| 18 | - 'storage', |
|
| 19 | - ]; |
|
| 20 | - |
|
| 21 | - /** |
|
| 22 | - * @var static |
|
| 23 | - */ |
|
| 24 | - protected static $instance; |
|
| 25 | - |
|
| 26 | - /** |
|
| 27 | - * The container's bound services. |
|
| 28 | - * @var array |
|
| 29 | - */ |
|
| 30 | - protected $services = []; |
|
| 31 | - |
|
| 32 | - /** |
|
| 33 | - * @var array |
|
| 34 | - */ |
|
| 35 | - protected $session = []; |
|
| 36 | - |
|
| 37 | - /** |
|
| 38 | - * The container's storage items. |
|
| 39 | - * @var array |
|
| 40 | - */ |
|
| 41 | - protected $storage = []; |
|
| 42 | - |
|
| 43 | - /** |
|
| 44 | - * @return static |
|
| 45 | - */ |
|
| 46 | - public static function load() |
|
| 47 | - { |
|
| 48 | - if (empty(static::$instance)) { |
|
| 49 | - static::$instance = new static(); |
|
| 50 | - } |
|
| 51 | - return static::$instance; |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - /** |
|
| 55 | - * @param string $property |
|
| 56 | - * @return mixed |
|
| 57 | - */ |
|
| 58 | - public function __get($property) |
|
| 59 | - { |
|
| 60 | - if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) { |
|
| 61 | - return $this->$property; |
|
| 62 | - } |
|
| 63 | - $constant = 'static::'.strtoupper(Str::snakeCase($property)); |
|
| 64 | - if (defined($constant)) { |
|
| 65 | - return constant($constant); |
|
| 66 | - } |
|
| 67 | - return Arr::get($this->storage, $property, null); |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - /** |
|
| 71 | - * @param string $property |
|
| 72 | - * @param string $value |
|
| 73 | - * @return void |
|
| 74 | - */ |
|
| 75 | - public function __set($property, $value) |
|
| 76 | - { |
|
| 77 | - if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) { |
|
| 78 | - $this->storage[$property] = $value; |
|
| 79 | - } elseif (!isset($this->$property)) { |
|
| 80 | - $this->$property = $value; |
|
| 81 | - } else { |
|
| 82 | - throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property)); |
|
| 83 | - } |
|
| 84 | - } |
|
| 85 | - |
|
| 86 | - /** |
|
| 87 | - * Bind a service to the container. |
|
| 88 | - * @param string $alias |
|
| 89 | - * @param mixed $concrete |
|
| 90 | - * @return mixed |
|
| 91 | - */ |
|
| 92 | - public function bind($alias, $concrete) |
|
| 93 | - { |
|
| 94 | - $this->services[$alias] = $concrete; |
|
| 95 | - } |
|
| 96 | - |
|
| 97 | - /** |
|
| 98 | - * Request a service from the container. |
|
| 99 | - * @param mixed $abstract |
|
| 100 | - * @return mixed |
|
| 101 | - */ |
|
| 102 | - public function make($abstract) |
|
| 103 | - { |
|
| 104 | - if (!isset($this->services[$abstract])) { |
|
| 105 | - $abstract = $this->addNamespace($abstract); |
|
| 106 | - } |
|
| 107 | - if (isset($this->services[$abstract])) { |
|
| 108 | - $abstract = $this->services[$abstract]; |
|
| 109 | - } |
|
| 110 | - if (is_callable($abstract)) { |
|
| 111 | - return call_user_func_array($abstract, [$this]); |
|
| 112 | - } |
|
| 113 | - if (is_object($abstract)) { |
|
| 114 | - return $abstract; |
|
| 115 | - } |
|
| 116 | - return $this->resolve($abstract); |
|
| 117 | - } |
|
| 118 | - |
|
| 119 | - /** |
|
| 120 | - * @return void |
|
| 121 | - */ |
|
| 122 | - public function sessionClear() |
|
| 123 | - { |
|
| 124 | - $this->session = []; |
|
| 125 | - } |
|
| 126 | - |
|
| 127 | - /** |
|
| 128 | - * @return mixed |
|
| 129 | - */ |
|
| 130 | - public function sessionGet($key, $fallback = '') |
|
| 131 | - { |
|
| 132 | - $value = Arr::get($this->session, $key, $fallback); |
|
| 133 | - unset($this->session[$key]); |
|
| 134 | - return $value; |
|
| 135 | - } |
|
| 136 | - |
|
| 137 | - /** |
|
| 138 | - * @return void |
|
| 139 | - */ |
|
| 140 | - public function sessionSet($key, $value) |
|
| 141 | - { |
|
| 142 | - $this->session[$key] = $value; |
|
| 143 | - } |
|
| 144 | - |
|
| 145 | - /** |
|
| 146 | - * Bind a singleton instance to the container. |
|
| 147 | - * @param string $alias |
|
| 148 | - * @param callable|string|null $binding |
|
| 149 | - * @return void |
|
| 150 | - */ |
|
| 151 | - public function singleton($alias, $binding) |
|
| 152 | - { |
|
| 153 | - $this->bind($alias, $this->make($binding)); |
|
| 154 | - } |
|
| 155 | - |
|
| 156 | - /** |
|
| 157 | - * Prefix the current namespace to the abstract if absent. |
|
| 158 | - * @param string $abstract |
|
| 159 | - * @return string |
|
| 160 | - */ |
|
| 161 | - protected function addNamespace($abstract) |
|
| 162 | - { |
|
| 163 | - if (!Str::contains($abstract, __NAMESPACE__) && !class_exists($abstract)) { |
|
| 164 | - $abstract = __NAMESPACE__.'\\'.$abstract; |
|
| 165 | - } |
|
| 166 | - return $abstract; |
|
| 167 | - } |
|
| 168 | - |
|
| 169 | - /** |
|
| 170 | - * Resolve a service from the container. |
|
| 171 | - * @param mixed $concrete |
|
| 172 | - * @return mixed |
|
| 173 | - * @throws Exception |
|
| 174 | - */ |
|
| 175 | - protected function resolve($concrete) |
|
| 176 | - { |
|
| 177 | - if ($concrete instanceof Closure) { |
|
| 178 | - return $concrete($this); |
|
| 179 | - } |
|
| 180 | - $reflector = new ReflectionClass($concrete); |
|
| 181 | - if (!$reflector->isInstantiable()) { |
|
| 182 | - throw new Exception('Target ['.$concrete.'] is not instantiable.'); |
|
| 183 | - } |
|
| 184 | - $constructor = $reflector->getConstructor(); |
|
| 185 | - if (empty($constructor)) { |
|
| 186 | - return new $concrete(); |
|
| 187 | - } |
|
| 188 | - return $reflector->newInstanceArgs( |
|
| 189 | - $this->resolveDependencies($constructor->getParameters()) |
|
| 190 | - ); |
|
| 191 | - } |
|
| 192 | - |
|
| 193 | - /** |
|
| 194 | - * Resolve a class based dependency from the container. |
|
| 195 | - * @return mixed |
|
| 196 | - * @throws Exception |
|
| 197 | - */ |
|
| 198 | - protected function resolveClass(ReflectionParameter $parameter) |
|
| 199 | - { |
|
| 200 | - try { |
|
| 201 | - return $this->make($parameter->getClass()->name); |
|
| 202 | - } catch (Exception $error) { |
|
| 203 | - if ($parameter->isOptional()) { |
|
| 204 | - return $parameter->getDefaultValue(); |
|
| 205 | - } |
|
| 206 | - throw $error; |
|
| 207 | - } |
|
| 208 | - } |
|
| 209 | - |
|
| 210 | - /** |
|
| 211 | - * Resolve all of the dependencies from the ReflectionParameters. |
|
| 212 | - * @return array |
|
| 213 | - */ |
|
| 214 | - protected function resolveDependencies(array $dependencies) |
|
| 215 | - { |
|
| 216 | - $results = []; |
|
| 217 | - foreach ($dependencies as $dependency) { |
|
| 218 | - $results[] = !is_null($class = $dependency->getClass()) |
|
| 219 | - ? $this->resolveClass($dependency) |
|
| 220 | - : $this->resolveDependency($dependency); |
|
| 221 | - } |
|
| 222 | - return $results; |
|
| 223 | - } |
|
| 224 | - |
|
| 225 | - /** |
|
| 226 | - * Resolve a single ReflectionParameter dependency. |
|
| 227 | - * @return array|null |
|
| 228 | - */ |
|
| 229 | - protected function resolveDependency(ReflectionParameter $parameter) |
|
| 230 | - { |
|
| 231 | - if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) { |
|
| 232 | - return $parameter->getDefaultValue(); |
|
| 233 | - } |
|
| 234 | - return null; |
|
| 235 | - } |
|
| 14 | + const PROTECTED_PROPERTIES = [ |
|
| 15 | + 'instance', |
|
| 16 | + 'services', |
|
| 17 | + 'session', |
|
| 18 | + 'storage', |
|
| 19 | + ]; |
|
| 20 | + |
|
| 21 | + /** |
|
| 22 | + * @var static |
|
| 23 | + */ |
|
| 24 | + protected static $instance; |
|
| 25 | + |
|
| 26 | + /** |
|
| 27 | + * The container's bound services. |
|
| 28 | + * @var array |
|
| 29 | + */ |
|
| 30 | + protected $services = []; |
|
| 31 | + |
|
| 32 | + /** |
|
| 33 | + * @var array |
|
| 34 | + */ |
|
| 35 | + protected $session = []; |
|
| 36 | + |
|
| 37 | + /** |
|
| 38 | + * The container's storage items. |
|
| 39 | + * @var array |
|
| 40 | + */ |
|
| 41 | + protected $storage = []; |
|
| 42 | + |
|
| 43 | + /** |
|
| 44 | + * @return static |
|
| 45 | + */ |
|
| 46 | + public static function load() |
|
| 47 | + { |
|
| 48 | + if (empty(static::$instance)) { |
|
| 49 | + static::$instance = new static(); |
|
| 50 | + } |
|
| 51 | + return static::$instance; |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + /** |
|
| 55 | + * @param string $property |
|
| 56 | + * @return mixed |
|
| 57 | + */ |
|
| 58 | + public function __get($property) |
|
| 59 | + { |
|
| 60 | + if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) { |
|
| 61 | + return $this->$property; |
|
| 62 | + } |
|
| 63 | + $constant = 'static::'.strtoupper(Str::snakeCase($property)); |
|
| 64 | + if (defined($constant)) { |
|
| 65 | + return constant($constant); |
|
| 66 | + } |
|
| 67 | + return Arr::get($this->storage, $property, null); |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + /** |
|
| 71 | + * @param string $property |
|
| 72 | + * @param string $value |
|
| 73 | + * @return void |
|
| 74 | + */ |
|
| 75 | + public function __set($property, $value) |
|
| 76 | + { |
|
| 77 | + if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) { |
|
| 78 | + $this->storage[$property] = $value; |
|
| 79 | + } elseif (!isset($this->$property)) { |
|
| 80 | + $this->$property = $value; |
|
| 81 | + } else { |
|
| 82 | + throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property)); |
|
| 83 | + } |
|
| 84 | + } |
|
| 85 | + |
|
| 86 | + /** |
|
| 87 | + * Bind a service to the container. |
|
| 88 | + * @param string $alias |
|
| 89 | + * @param mixed $concrete |
|
| 90 | + * @return mixed |
|
| 91 | + */ |
|
| 92 | + public function bind($alias, $concrete) |
|
| 93 | + { |
|
| 94 | + $this->services[$alias] = $concrete; |
|
| 95 | + } |
|
| 96 | + |
|
| 97 | + /** |
|
| 98 | + * Request a service from the container. |
|
| 99 | + * @param mixed $abstract |
|
| 100 | + * @return mixed |
|
| 101 | + */ |
|
| 102 | + public function make($abstract) |
|
| 103 | + { |
|
| 104 | + if (!isset($this->services[$abstract])) { |
|
| 105 | + $abstract = $this->addNamespace($abstract); |
|
| 106 | + } |
|
| 107 | + if (isset($this->services[$abstract])) { |
|
| 108 | + $abstract = $this->services[$abstract]; |
|
| 109 | + } |
|
| 110 | + if (is_callable($abstract)) { |
|
| 111 | + return call_user_func_array($abstract, [$this]); |
|
| 112 | + } |
|
| 113 | + if (is_object($abstract)) { |
|
| 114 | + return $abstract; |
|
| 115 | + } |
|
| 116 | + return $this->resolve($abstract); |
|
| 117 | + } |
|
| 118 | + |
|
| 119 | + /** |
|
| 120 | + * @return void |
|
| 121 | + */ |
|
| 122 | + public function sessionClear() |
|
| 123 | + { |
|
| 124 | + $this->session = []; |
|
| 125 | + } |
|
| 126 | + |
|
| 127 | + /** |
|
| 128 | + * @return mixed |
|
| 129 | + */ |
|
| 130 | + public function sessionGet($key, $fallback = '') |
|
| 131 | + { |
|
| 132 | + $value = Arr::get($this->session, $key, $fallback); |
|
| 133 | + unset($this->session[$key]); |
|
| 134 | + return $value; |
|
| 135 | + } |
|
| 136 | + |
|
| 137 | + /** |
|
| 138 | + * @return void |
|
| 139 | + */ |
|
| 140 | + public function sessionSet($key, $value) |
|
| 141 | + { |
|
| 142 | + $this->session[$key] = $value; |
|
| 143 | + } |
|
| 144 | + |
|
| 145 | + /** |
|
| 146 | + * Bind a singleton instance to the container. |
|
| 147 | + * @param string $alias |
|
| 148 | + * @param callable|string|null $binding |
|
| 149 | + * @return void |
|
| 150 | + */ |
|
| 151 | + public function singleton($alias, $binding) |
|
| 152 | + { |
|
| 153 | + $this->bind($alias, $this->make($binding)); |
|
| 154 | + } |
|
| 155 | + |
|
| 156 | + /** |
|
| 157 | + * Prefix the current namespace to the abstract if absent. |
|
| 158 | + * @param string $abstract |
|
| 159 | + * @return string |
|
| 160 | + */ |
|
| 161 | + protected function addNamespace($abstract) |
|
| 162 | + { |
|
| 163 | + if (!Str::contains($abstract, __NAMESPACE__) && !class_exists($abstract)) { |
|
| 164 | + $abstract = __NAMESPACE__.'\\'.$abstract; |
|
| 165 | + } |
|
| 166 | + return $abstract; |
|
| 167 | + } |
|
| 168 | + |
|
| 169 | + /** |
|
| 170 | + * Resolve a service from the container. |
|
| 171 | + * @param mixed $concrete |
|
| 172 | + * @return mixed |
|
| 173 | + * @throws Exception |
|
| 174 | + */ |
|
| 175 | + protected function resolve($concrete) |
|
| 176 | + { |
|
| 177 | + if ($concrete instanceof Closure) { |
|
| 178 | + return $concrete($this); |
|
| 179 | + } |
|
| 180 | + $reflector = new ReflectionClass($concrete); |
|
| 181 | + if (!$reflector->isInstantiable()) { |
|
| 182 | + throw new Exception('Target ['.$concrete.'] is not instantiable.'); |
|
| 183 | + } |
|
| 184 | + $constructor = $reflector->getConstructor(); |
|
| 185 | + if (empty($constructor)) { |
|
| 186 | + return new $concrete(); |
|
| 187 | + } |
|
| 188 | + return $reflector->newInstanceArgs( |
|
| 189 | + $this->resolveDependencies($constructor->getParameters()) |
|
| 190 | + ); |
|
| 191 | + } |
|
| 192 | + |
|
| 193 | + /** |
|
| 194 | + * Resolve a class based dependency from the container. |
|
| 195 | + * @return mixed |
|
| 196 | + * @throws Exception |
|
| 197 | + */ |
|
| 198 | + protected function resolveClass(ReflectionParameter $parameter) |
|
| 199 | + { |
|
| 200 | + try { |
|
| 201 | + return $this->make($parameter->getClass()->name); |
|
| 202 | + } catch (Exception $error) { |
|
| 203 | + if ($parameter->isOptional()) { |
|
| 204 | + return $parameter->getDefaultValue(); |
|
| 205 | + } |
|
| 206 | + throw $error; |
|
| 207 | + } |
|
| 208 | + } |
|
| 209 | + |
|
| 210 | + /** |
|
| 211 | + * Resolve all of the dependencies from the ReflectionParameters. |
|
| 212 | + * @return array |
|
| 213 | + */ |
|
| 214 | + protected function resolveDependencies(array $dependencies) |
|
| 215 | + { |
|
| 216 | + $results = []; |
|
| 217 | + foreach ($dependencies as $dependency) { |
|
| 218 | + $results[] = !is_null($class = $dependency->getClass()) |
|
| 219 | + ? $this->resolveClass($dependency) |
|
| 220 | + : $this->resolveDependency($dependency); |
|
| 221 | + } |
|
| 222 | + return $results; |
|
| 223 | + } |
|
| 224 | + |
|
| 225 | + /** |
|
| 226 | + * Resolve a single ReflectionParameter dependency. |
|
| 227 | + * @return array|null |
|
| 228 | + */ |
|
| 229 | + protected function resolveDependency(ReflectionParameter $parameter) |
|
| 230 | + { |
|
| 231 | + if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) { |
|
| 232 | + return $parameter->getDefaultValue(); |
|
| 233 | + } |
|
| 234 | + return null; |
|
| 235 | + } |
|
| 236 | 236 | } |
@@ -21,110 +21,110 @@ |
||
| 21 | 21 | |
| 22 | 22 | class Actions implements HooksContract |
| 23 | 23 | { |
| 24 | - protected $about; |
|
| 25 | - protected $admin; |
|
| 26 | - protected $app; |
|
| 27 | - protected $blocks; |
|
| 28 | - protected $console; |
|
| 29 | - protected $editor; |
|
| 30 | - protected $listtable; |
|
| 31 | - protected $menu; |
|
| 32 | - protected $main; |
|
| 33 | - protected $notices; |
|
| 34 | - protected $public; |
|
| 35 | - protected $rebusify; |
|
| 36 | - protected $review; |
|
| 37 | - protected $router; |
|
| 38 | - protected $settings; |
|
| 39 | - protected $taxonomy; |
|
| 40 | - protected $translator; |
|
| 41 | - protected $welcome; |
|
| 24 | + protected $about; |
|
| 25 | + protected $admin; |
|
| 26 | + protected $app; |
|
| 27 | + protected $blocks; |
|
| 28 | + protected $console; |
|
| 29 | + protected $editor; |
|
| 30 | + protected $listtable; |
|
| 31 | + protected $menu; |
|
| 32 | + protected $main; |
|
| 33 | + protected $notices; |
|
| 34 | + protected $public; |
|
| 35 | + protected $rebusify; |
|
| 36 | + protected $review; |
|
| 37 | + protected $router; |
|
| 38 | + protected $settings; |
|
| 39 | + protected $taxonomy; |
|
| 40 | + protected $translator; |
|
| 41 | + protected $welcome; |
|
| 42 | 42 | |
| 43 | - public function __construct(Application $app ) { |
|
| 44 | - $this->app = $app; |
|
| 45 | - $this->admin = $app->make(AdminController::class); |
|
| 46 | - $this->blocks = $app->make(BlocksController::class); |
|
| 47 | - $this->console = $app->make(Console::class); |
|
| 48 | - $this->editor = $app->make(EditorController::class); |
|
| 49 | - $this->listtable = $app->make(ListTableController::class); |
|
| 50 | - $this->main = $app->make(MainController::class); |
|
| 51 | - $this->menu = $app->make(MenuController::class); |
|
| 52 | - $this->notices = $app->make(NoticeController::class); |
|
| 53 | - $this->public = $app->make(PublicController::class); |
|
| 54 | - $this->rebusify = $app->make(RebusifyController::class); |
|
| 55 | - $this->review = $app->make(ReviewController::class); |
|
| 56 | - $this->router = $app->make(Router::class); |
|
| 57 | - $this->settings = $app->make(SettingsController::class); |
|
| 58 | - $this->taxonomy = $app->make(TaxonomyController::class); |
|
| 59 | - $this->translator = $app->make(TranslationController::class); |
|
| 60 | - $this->welcome = $app->make(WelcomeController::class); |
|
| 61 | - } |
|
| 43 | + public function __construct(Application $app ) { |
|
| 44 | + $this->app = $app; |
|
| 45 | + $this->admin = $app->make(AdminController::class); |
|
| 46 | + $this->blocks = $app->make(BlocksController::class); |
|
| 47 | + $this->console = $app->make(Console::class); |
|
| 48 | + $this->editor = $app->make(EditorController::class); |
|
| 49 | + $this->listtable = $app->make(ListTableController::class); |
|
| 50 | + $this->main = $app->make(MainController::class); |
|
| 51 | + $this->menu = $app->make(MenuController::class); |
|
| 52 | + $this->notices = $app->make(NoticeController::class); |
|
| 53 | + $this->public = $app->make(PublicController::class); |
|
| 54 | + $this->rebusify = $app->make(RebusifyController::class); |
|
| 55 | + $this->review = $app->make(ReviewController::class); |
|
| 56 | + $this->router = $app->make(Router::class); |
|
| 57 | + $this->settings = $app->make(SettingsController::class); |
|
| 58 | + $this->taxonomy = $app->make(TaxonomyController::class); |
|
| 59 | + $this->translator = $app->make(TranslationController::class); |
|
| 60 | + $this->welcome = $app->make(WelcomeController::class); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - /** |
|
| 64 | - * @return void |
|
| 65 | - */ |
|
| 66 | - public function run() |
|
| 67 | - { |
|
| 68 | - add_action('admin_enqueue_scripts', [$this->admin, 'enqueueAssets']); |
|
| 69 | - add_action('admin_init', [$this->admin, 'registerTinymcePopups']); |
|
| 70 | - add_action('media_buttons', [$this->admin, 'renderTinymceButton'], 11); |
|
| 71 | - add_action('plugins_loaded', [$this->app, 'getDefaults'], 11); |
|
| 72 | - add_action('plugins_loaded', [$this->app, 'registerAddons']); |
|
| 73 | - add_action('plugins_loaded', [$this->app, 'registerLanguages']); |
|
| 74 | - add_action('plugins_loaded', [$this->app, 'registerReviewTypes']); |
|
| 75 | - add_action('upgrader_process_complete', [$this->app, 'upgraded'], 10, 2); |
|
| 76 | - add_action('init', [$this->blocks, 'registerAssets'], 9); |
|
| 77 | - add_action('init', [$this->blocks, 'registerBlocks']); |
|
| 78 | - add_action('admin_footer', [$this->console, 'logOnce']); |
|
| 79 | - add_action('wp_footer', [$this->console, 'logOnce']); |
|
| 80 | - add_action('add_meta_boxes_'.Application::POST_TYPE, [$this->editor, 'registerMetaBoxes']); |
|
| 81 | - add_action('admin_print_scripts', [$this->editor, 'removeAutosave'], 999); |
|
| 82 | - add_action('admin_menu', [$this->editor, 'removeMetaBoxes']); |
|
| 83 | - add_action('current_screen', [$this->editor, 'removePostTypeSupport']); |
|
| 84 | - add_action('post_submitbox_misc_actions', [$this->editor, 'renderPinnedInPublishMetaBox']); |
|
| 85 | - add_action('admin_head', [$this->editor, 'renderReviewFields']); |
|
| 86 | - add_action('admin_action_revert', [$this->editor, 'revertReview']); |
|
| 87 | - add_action('save_post_'.Application::POST_TYPE, [$this->editor, 'saveMetaboxes'], 10, 3); |
|
| 88 | - add_action('admin_action_approve', [$this->listtable, 'approve']); |
|
| 89 | - add_action('bulk_edit_custom_box', [$this->listtable, 'renderBulkEditFields'], 10, 2); |
|
| 90 | - add_action('restrict_manage_posts', [$this->listtable, 'renderColumnFilters']); |
|
| 91 | - add_action('manage_'.Application::POST_TYPE.'_posts_custom_column', [$this->listtable, 'renderColumnValues'], 10, 2); |
|
| 92 | - add_action('save_post_'.Application::POST_TYPE, [$this->listtable, 'saveBulkEditFields']); |
|
| 93 | - add_action('pre_get_posts', [$this->listtable, 'setQueryForColumn']); |
|
| 94 | - add_action('admin_action_unapprove', [$this->listtable, 'unapprove']); |
|
| 95 | - add_action('init', [$this->main, 'registerPostType'], 8); |
|
| 96 | - add_action('init', [$this->main, 'registerShortcodes']); |
|
| 97 | - add_action('init', [$this->main, 'registerTaxonomy']); |
|
| 98 | - add_action('widgets_init', [$this->main, 'registerWidgets']); |
|
| 99 | - add_action('admin_menu', [$this->menu, 'registerMenuCount']); |
|
| 100 | - add_action('admin_menu', [$this->menu, 'registerSubMenus']); |
|
| 101 | - add_action('admin_init', [$this->menu, 'setCustomPermissions'], 999); |
|
| 102 | - add_action('admin_notices', [$this->notices, 'filterAdminNotices']); |
|
| 103 | - add_action('wp_enqueue_scripts', [$this->public, 'enqueueAssets'], 999); |
|
| 104 | - add_filter('site-reviews/builder', [$this->public, 'modifyBuilder']); |
|
| 105 | - add_action('wp_footer', [$this->public, 'renderSchema']); |
|
| 106 | - add_action('site-reviews/review/created', [$this->rebusify, 'onCreated']); |
|
| 107 | - add_action('site-reviews/review/reverted', [$this->rebusify, 'onReverted']); |
|
| 108 | - add_action('site-reviews/review/saved', [$this->rebusify, 'onSaved']); |
|
| 109 | - add_action('updated_postmeta', [$this->rebusify, 'onUpdatedMeta'], 10, 3); |
|
| 110 | - add_action('set_object_terms', [$this->review, 'onAfterChangeCategory'], 10, 6); |
|
| 111 | - add_action('transition_post_status', [$this->review, 'onAfterChangeStatus'], 10, 3); |
|
| 112 | - add_action('site-reviews/review/created', [$this->review, 'onAfterCreate']); |
|
| 113 | - add_action('before_delete_post', [$this->review, 'onBeforeDelete']); |
|
| 114 | - add_action('update_postmeta', [$this->review, 'onBeforeUpdate'], 10, 4); |
|
| 115 | - add_action('admin_init', [$this->router, 'routeAdminPostRequest']); |
|
| 116 | - add_action('wp_ajax_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest']); |
|
| 117 | - add_action('wp_ajax_nopriv_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest']); |
|
| 118 | - add_action('init', [$this->router, 'routePublicPostRequest']); |
|
| 119 | - add_action('admin_init', [$this->settings, 'registerSettings']); |
|
| 120 | - add_action(Application::TAXONOMY.'_term_edit_form_top', [$this->taxonomy, 'disableParents']); |
|
| 121 | - add_action(Application::TAXONOMY.'_term_new_form_tag', [$this->taxonomy, 'disableParents']); |
|
| 122 | - add_action(Application::TAXONOMY.'_add_form_fields', [$this->taxonomy, 'enableParents']); |
|
| 123 | - add_action(Application::TAXONOMY.'_edit_form', [$this->taxonomy, 'enableParents']); |
|
| 124 | - add_action('restrict_manage_posts', [$this->taxonomy, 'renderTaxonomyFilter'], 9); |
|
| 125 | - add_action('set_object_terms', [$this->taxonomy, 'restrictTermSelection'], 9, 6); |
|
| 126 | - add_action('admin_enqueue_scripts', [$this->translator, 'translatePostStatusLabels']); |
|
| 127 | - add_action('activated_plugin', [$this->welcome, 'redirectOnActivation'], 10, 2); |
|
| 128 | - add_action('admin_menu', [$this->welcome, 'registerPage']); |
|
| 129 | - } |
|
| 63 | + /** |
|
| 64 | + * @return void |
|
| 65 | + */ |
|
| 66 | + public function run() |
|
| 67 | + { |
|
| 68 | + add_action('admin_enqueue_scripts', [$this->admin, 'enqueueAssets']); |
|
| 69 | + add_action('admin_init', [$this->admin, 'registerTinymcePopups']); |
|
| 70 | + add_action('media_buttons', [$this->admin, 'renderTinymceButton'], 11); |
|
| 71 | + add_action('plugins_loaded', [$this->app, 'getDefaults'], 11); |
|
| 72 | + add_action('plugins_loaded', [$this->app, 'registerAddons']); |
|
| 73 | + add_action('plugins_loaded', [$this->app, 'registerLanguages']); |
|
| 74 | + add_action('plugins_loaded', [$this->app, 'registerReviewTypes']); |
|
| 75 | + add_action('upgrader_process_complete', [$this->app, 'upgraded'], 10, 2); |
|
| 76 | + add_action('init', [$this->blocks, 'registerAssets'], 9); |
|
| 77 | + add_action('init', [$this->blocks, 'registerBlocks']); |
|
| 78 | + add_action('admin_footer', [$this->console, 'logOnce']); |
|
| 79 | + add_action('wp_footer', [$this->console, 'logOnce']); |
|
| 80 | + add_action('add_meta_boxes_'.Application::POST_TYPE, [$this->editor, 'registerMetaBoxes']); |
|
| 81 | + add_action('admin_print_scripts', [$this->editor, 'removeAutosave'], 999); |
|
| 82 | + add_action('admin_menu', [$this->editor, 'removeMetaBoxes']); |
|
| 83 | + add_action('current_screen', [$this->editor, 'removePostTypeSupport']); |
|
| 84 | + add_action('post_submitbox_misc_actions', [$this->editor, 'renderPinnedInPublishMetaBox']); |
|
| 85 | + add_action('admin_head', [$this->editor, 'renderReviewFields']); |
|
| 86 | + add_action('admin_action_revert', [$this->editor, 'revertReview']); |
|
| 87 | + add_action('save_post_'.Application::POST_TYPE, [$this->editor, 'saveMetaboxes'], 10, 3); |
|
| 88 | + add_action('admin_action_approve', [$this->listtable, 'approve']); |
|
| 89 | + add_action('bulk_edit_custom_box', [$this->listtable, 'renderBulkEditFields'], 10, 2); |
|
| 90 | + add_action('restrict_manage_posts', [$this->listtable, 'renderColumnFilters']); |
|
| 91 | + add_action('manage_'.Application::POST_TYPE.'_posts_custom_column', [$this->listtable, 'renderColumnValues'], 10, 2); |
|
| 92 | + add_action('save_post_'.Application::POST_TYPE, [$this->listtable, 'saveBulkEditFields']); |
|
| 93 | + add_action('pre_get_posts', [$this->listtable, 'setQueryForColumn']); |
|
| 94 | + add_action('admin_action_unapprove', [$this->listtable, 'unapprove']); |
|
| 95 | + add_action('init', [$this->main, 'registerPostType'], 8); |
|
| 96 | + add_action('init', [$this->main, 'registerShortcodes']); |
|
| 97 | + add_action('init', [$this->main, 'registerTaxonomy']); |
|
| 98 | + add_action('widgets_init', [$this->main, 'registerWidgets']); |
|
| 99 | + add_action('admin_menu', [$this->menu, 'registerMenuCount']); |
|
| 100 | + add_action('admin_menu', [$this->menu, 'registerSubMenus']); |
|
| 101 | + add_action('admin_init', [$this->menu, 'setCustomPermissions'], 999); |
|
| 102 | + add_action('admin_notices', [$this->notices, 'filterAdminNotices']); |
|
| 103 | + add_action('wp_enqueue_scripts', [$this->public, 'enqueueAssets'], 999); |
|
| 104 | + add_filter('site-reviews/builder', [$this->public, 'modifyBuilder']); |
|
| 105 | + add_action('wp_footer', [$this->public, 'renderSchema']); |
|
| 106 | + add_action('site-reviews/review/created', [$this->rebusify, 'onCreated']); |
|
| 107 | + add_action('site-reviews/review/reverted', [$this->rebusify, 'onReverted']); |
|
| 108 | + add_action('site-reviews/review/saved', [$this->rebusify, 'onSaved']); |
|
| 109 | + add_action('updated_postmeta', [$this->rebusify, 'onUpdatedMeta'], 10, 3); |
|
| 110 | + add_action('set_object_terms', [$this->review, 'onAfterChangeCategory'], 10, 6); |
|
| 111 | + add_action('transition_post_status', [$this->review, 'onAfterChangeStatus'], 10, 3); |
|
| 112 | + add_action('site-reviews/review/created', [$this->review, 'onAfterCreate']); |
|
| 113 | + add_action('before_delete_post', [$this->review, 'onBeforeDelete']); |
|
| 114 | + add_action('update_postmeta', [$this->review, 'onBeforeUpdate'], 10, 4); |
|
| 115 | + add_action('admin_init', [$this->router, 'routeAdminPostRequest']); |
|
| 116 | + add_action('wp_ajax_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest']); |
|
| 117 | + add_action('wp_ajax_nopriv_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest']); |
|
| 118 | + add_action('init', [$this->router, 'routePublicPostRequest']); |
|
| 119 | + add_action('admin_init', [$this->settings, 'registerSettings']); |
|
| 120 | + add_action(Application::TAXONOMY.'_term_edit_form_top', [$this->taxonomy, 'disableParents']); |
|
| 121 | + add_action(Application::TAXONOMY.'_term_new_form_tag', [$this->taxonomy, 'disableParents']); |
|
| 122 | + add_action(Application::TAXONOMY.'_add_form_fields', [$this->taxonomy, 'enableParents']); |
|
| 123 | + add_action(Application::TAXONOMY.'_edit_form', [$this->taxonomy, 'enableParents']); |
|
| 124 | + add_action('restrict_manage_posts', [$this->taxonomy, 'renderTaxonomyFilter'], 9); |
|
| 125 | + add_action('set_object_terms', [$this->taxonomy, 'restrictTermSelection'], 9, 6); |
|
| 126 | + add_action('admin_enqueue_scripts', [$this->translator, 'translatePostStatusLabels']); |
|
| 127 | + add_action('activated_plugin', [$this->welcome, 'redirectOnActivation'], 10, 2); |
|
| 128 | + add_action('admin_menu', [$this->welcome, 'registerPage']); |
|
| 129 | + } |
|
| 130 | 130 | } |
@@ -11,272 +11,272 @@ |
||
| 11 | 11 | |
| 12 | 12 | class Translation |
| 13 | 13 | { |
| 14 | - const SEARCH_THRESHOLD = 3; |
|
| 14 | + const SEARCH_THRESHOLD = 3; |
|
| 15 | 15 | |
| 16 | - /** |
|
| 17 | - * @var array |
|
| 18 | - */ |
|
| 19 | - protected $entries; |
|
| 16 | + /** |
|
| 17 | + * @var array |
|
| 18 | + */ |
|
| 19 | + protected $entries; |
|
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * @var array |
|
| 23 | - */ |
|
| 24 | - protected $results; |
|
| 21 | + /** |
|
| 22 | + * @var array |
|
| 23 | + */ |
|
| 24 | + protected $results; |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * Returns all saved custom translations with translation context. |
|
| 28 | - * @return array |
|
| 29 | - */ |
|
| 30 | - public function all() |
|
| 31 | - { |
|
| 32 | - $translations = $this->translations(); |
|
| 33 | - $entries = $this->filter($translations, $this->entries())->results(); |
|
| 34 | - array_walk($translations, function (&$entry) use ($entries) { |
|
| 35 | - $entry['desc'] = array_key_exists($entry['id'], $entries) |
|
| 36 | - ? $this->getEntryString($entries[$entry['id']], 'msgctxt') |
|
| 37 | - : ''; |
|
| 38 | - }); |
|
| 39 | - return $translations; |
|
| 40 | - } |
|
| 26 | + /** |
|
| 27 | + * Returns all saved custom translations with translation context. |
|
| 28 | + * @return array |
|
| 29 | + */ |
|
| 30 | + public function all() |
|
| 31 | + { |
|
| 32 | + $translations = $this->translations(); |
|
| 33 | + $entries = $this->filter($translations, $this->entries())->results(); |
|
| 34 | + array_walk($translations, function (&$entry) use ($entries) { |
|
| 35 | + $entry['desc'] = array_key_exists($entry['id'], $entries) |
|
| 36 | + ? $this->getEntryString($entries[$entry['id']], 'msgctxt') |
|
| 37 | + : ''; |
|
| 38 | + }); |
|
| 39 | + return $translations; |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @return array |
|
| 44 | - */ |
|
| 45 | - public function entries() |
|
| 46 | - { |
|
| 47 | - if (!isset($this->entries)) { |
|
| 48 | - $potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot'); |
|
| 49 | - $entries = $this->extractEntriesFromPotFile($potFile); |
|
| 50 | - $entries = apply_filters('site-reviews/translation/entries', $entries); |
|
| 51 | - $this->entries = $entries; |
|
| 52 | - } |
|
| 53 | - return $this->entries; |
|
| 54 | - } |
|
| 42 | + /** |
|
| 43 | + * @return array |
|
| 44 | + */ |
|
| 45 | + public function entries() |
|
| 46 | + { |
|
| 47 | + if (!isset($this->entries)) { |
|
| 48 | + $potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot'); |
|
| 49 | + $entries = $this->extractEntriesFromPotFile($potFile); |
|
| 50 | + $entries = apply_filters('site-reviews/translation/entries', $entries); |
|
| 51 | + $this->entries = $entries; |
|
| 52 | + } |
|
| 53 | + return $this->entries; |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - /** |
|
| 57 | - * @param array|null $entriesToExclude |
|
| 58 | - * @param array|null $entries |
|
| 59 | - * @return static |
|
| 60 | - */ |
|
| 61 | - public function exclude($entriesToExclude = null, $entries = null) |
|
| 62 | - { |
|
| 63 | - return $this->filter($entriesToExclude, $entries, false); |
|
| 64 | - } |
|
| 56 | + /** |
|
| 57 | + * @param array|null $entriesToExclude |
|
| 58 | + * @param array|null $entries |
|
| 59 | + * @return static |
|
| 60 | + */ |
|
| 61 | + public function exclude($entriesToExclude = null, $entries = null) |
|
| 62 | + { |
|
| 63 | + return $this->filter($entriesToExclude, $entries, false); |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - /** |
|
| 67 | - * @param string $potFile |
|
| 68 | - * @return array |
|
| 69 | - */ |
|
| 70 | - public function extractEntriesFromPotFile($potFile, array $entries = []) |
|
| 71 | - { |
|
| 72 | - try { |
|
| 73 | - $potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries()); |
|
| 74 | - foreach ($potEntries as $key => $entry) { |
|
| 75 | - $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry; |
|
| 76 | - } |
|
| 77 | - } catch (Exception $e) { |
|
| 78 | - glsr_log()->error($e->getMessage()); |
|
| 79 | - } |
|
| 80 | - return $entries; |
|
| 81 | - } |
|
| 66 | + /** |
|
| 67 | + * @param string $potFile |
|
| 68 | + * @return array |
|
| 69 | + */ |
|
| 70 | + public function extractEntriesFromPotFile($potFile, array $entries = []) |
|
| 71 | + { |
|
| 72 | + try { |
|
| 73 | + $potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries()); |
|
| 74 | + foreach ($potEntries as $key => $entry) { |
|
| 75 | + $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry; |
|
| 76 | + } |
|
| 77 | + } catch (Exception $e) { |
|
| 78 | + glsr_log()->error($e->getMessage()); |
|
| 79 | + } |
|
| 80 | + return $entries; |
|
| 81 | + } |
|
| 82 | 82 | |
| 83 | - /** |
|
| 84 | - * @param array|null $filterWith |
|
| 85 | - * @param array|null $entries |
|
| 86 | - * @param bool $intersect |
|
| 87 | - * @return static |
|
| 88 | - */ |
|
| 89 | - public function filter($filterWith = null, $entries = null, $intersect = true) |
|
| 90 | - { |
|
| 91 | - if (!is_array($entries)) { |
|
| 92 | - $entries = $this->results; |
|
| 93 | - } |
|
| 94 | - if (!is_array($filterWith)) { |
|
| 95 | - $filterWith = $this->translations(); |
|
| 96 | - } |
|
| 97 | - $keys = array_flip(glsr_array_column($filterWith, 'id')); |
|
| 98 | - $this->results = $intersect |
|
| 99 | - ? array_intersect_key($entries, $keys) |
|
| 100 | - : array_diff_key($entries, $keys); |
|
| 101 | - return $this; |
|
| 102 | - } |
|
| 83 | + /** |
|
| 84 | + * @param array|null $filterWith |
|
| 85 | + * @param array|null $entries |
|
| 86 | + * @param bool $intersect |
|
| 87 | + * @return static |
|
| 88 | + */ |
|
| 89 | + public function filter($filterWith = null, $entries = null, $intersect = true) |
|
| 90 | + { |
|
| 91 | + if (!is_array($entries)) { |
|
| 92 | + $entries = $this->results; |
|
| 93 | + } |
|
| 94 | + if (!is_array($filterWith)) { |
|
| 95 | + $filterWith = $this->translations(); |
|
| 96 | + } |
|
| 97 | + $keys = array_flip(glsr_array_column($filterWith, 'id')); |
|
| 98 | + $this->results = $intersect |
|
| 99 | + ? array_intersect_key($entries, $keys) |
|
| 100 | + : array_diff_key($entries, $keys); |
|
| 101 | + return $this; |
|
| 102 | + } |
|
| 103 | 103 | |
| 104 | - /** |
|
| 105 | - * @param string $template |
|
| 106 | - * @return string |
|
| 107 | - */ |
|
| 108 | - public function render($template, array $entry) |
|
| 109 | - { |
|
| 110 | - $data = array_combine( |
|
| 111 | - array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)), |
|
| 112 | - $entry |
|
| 113 | - ); |
|
| 114 | - $data['data.class'] = $data['data.error'] = ''; |
|
| 115 | - if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) { |
|
| 116 | - $data['data.class'] = 'is-invalid'; |
|
| 117 | - $data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews'); |
|
| 118 | - } |
|
| 119 | - return glsr(Template::class)->build('partials/translations/'.$template, [ |
|
| 120 | - 'context' => array_map('esc_html', $data), |
|
| 121 | - ]); |
|
| 122 | - } |
|
| 104 | + /** |
|
| 105 | + * @param string $template |
|
| 106 | + * @return string |
|
| 107 | + */ |
|
| 108 | + public function render($template, array $entry) |
|
| 109 | + { |
|
| 110 | + $data = array_combine( |
|
| 111 | + array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)), |
|
| 112 | + $entry |
|
| 113 | + ); |
|
| 114 | + $data['data.class'] = $data['data.error'] = ''; |
|
| 115 | + if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) { |
|
| 116 | + $data['data.class'] = 'is-invalid'; |
|
| 117 | + $data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews'); |
|
| 118 | + } |
|
| 119 | + return glsr(Template::class)->build('partials/translations/'.$template, [ |
|
| 120 | + 'context' => array_map('esc_html', $data), |
|
| 121 | + ]); |
|
| 122 | + } |
|
| 123 | 123 | |
| 124 | - /** |
|
| 125 | - * Returns a rendered string of all saved custom translations with translation context. |
|
| 126 | - * @return string |
|
| 127 | - */ |
|
| 128 | - public function renderAll() |
|
| 129 | - { |
|
| 130 | - $rendered = ''; |
|
| 131 | - foreach ($this->all() as $index => $entry) { |
|
| 132 | - $entry['index'] = $index; |
|
| 133 | - $entry['prefix'] = OptionManager::databaseKey(); |
|
| 134 | - $rendered.= $this->render($entry['type'], $entry); |
|
| 135 | - } |
|
| 136 | - return $rendered; |
|
| 137 | - } |
|
| 124 | + /** |
|
| 125 | + * Returns a rendered string of all saved custom translations with translation context. |
|
| 126 | + * @return string |
|
| 127 | + */ |
|
| 128 | + public function renderAll() |
|
| 129 | + { |
|
| 130 | + $rendered = ''; |
|
| 131 | + foreach ($this->all() as $index => $entry) { |
|
| 132 | + $entry['index'] = $index; |
|
| 133 | + $entry['prefix'] = OptionManager::databaseKey(); |
|
| 134 | + $rendered.= $this->render($entry['type'], $entry); |
|
| 135 | + } |
|
| 136 | + return $rendered; |
|
| 137 | + } |
|
| 138 | 138 | |
| 139 | - /** |
|
| 140 | - * @param bool $resetAfterRender |
|
| 141 | - * @return string |
|
| 142 | - */ |
|
| 143 | - public function renderResults($resetAfterRender = true) |
|
| 144 | - { |
|
| 145 | - $rendered = ''; |
|
| 146 | - foreach ($this->results as $id => $entry) { |
|
| 147 | - $data = [ |
|
| 148 | - 'desc' => $this->getEntryString($entry, 'msgctxt'), |
|
| 149 | - 'id' => $id, |
|
| 150 | - 'p1' => $this->getEntryString($entry, 'msgid_plural'), |
|
| 151 | - 's1' => $this->getEntryString($entry, 'msgid'), |
|
| 152 | - ]; |
|
| 153 | - $text = !empty($data['p1']) |
|
| 154 | - ? sprintf('%s | %s', $data['s1'], $data['p1']) |
|
| 155 | - : $data['s1']; |
|
| 156 | - $rendered.= $this->render('result', [ |
|
| 157 | - 'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), |
|
| 158 | - 'text' => wp_strip_all_tags($text), |
|
| 159 | - ]); |
|
| 160 | - } |
|
| 161 | - if ($resetAfterRender) { |
|
| 162 | - $this->reset(); |
|
| 163 | - } |
|
| 164 | - return $rendered; |
|
| 165 | - } |
|
| 139 | + /** |
|
| 140 | + * @param bool $resetAfterRender |
|
| 141 | + * @return string |
|
| 142 | + */ |
|
| 143 | + public function renderResults($resetAfterRender = true) |
|
| 144 | + { |
|
| 145 | + $rendered = ''; |
|
| 146 | + foreach ($this->results as $id => $entry) { |
|
| 147 | + $data = [ |
|
| 148 | + 'desc' => $this->getEntryString($entry, 'msgctxt'), |
|
| 149 | + 'id' => $id, |
|
| 150 | + 'p1' => $this->getEntryString($entry, 'msgid_plural'), |
|
| 151 | + 's1' => $this->getEntryString($entry, 'msgid'), |
|
| 152 | + ]; |
|
| 153 | + $text = !empty($data['p1']) |
|
| 154 | + ? sprintf('%s | %s', $data['s1'], $data['p1']) |
|
| 155 | + : $data['s1']; |
|
| 156 | + $rendered.= $this->render('result', [ |
|
| 157 | + 'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), |
|
| 158 | + 'text' => wp_strip_all_tags($text), |
|
| 159 | + ]); |
|
| 160 | + } |
|
| 161 | + if ($resetAfterRender) { |
|
| 162 | + $this->reset(); |
|
| 163 | + } |
|
| 164 | + return $rendered; |
|
| 165 | + } |
|
| 166 | 166 | |
| 167 | - /** |
|
| 168 | - * @return void |
|
| 169 | - */ |
|
| 170 | - public function reset() |
|
| 171 | - { |
|
| 172 | - $this->results = []; |
|
| 173 | - } |
|
| 167 | + /** |
|
| 168 | + * @return void |
|
| 169 | + */ |
|
| 170 | + public function reset() |
|
| 171 | + { |
|
| 172 | + $this->results = []; |
|
| 173 | + } |
|
| 174 | 174 | |
| 175 | - /** |
|
| 176 | - * @return array |
|
| 177 | - */ |
|
| 178 | - public function results() |
|
| 179 | - { |
|
| 180 | - $results = $this->results; |
|
| 181 | - $this->reset(); |
|
| 182 | - return $results; |
|
| 183 | - } |
|
| 175 | + /** |
|
| 176 | + * @return array |
|
| 177 | + */ |
|
| 178 | + public function results() |
|
| 179 | + { |
|
| 180 | + $results = $this->results; |
|
| 181 | + $this->reset(); |
|
| 182 | + return $results; |
|
| 183 | + } |
|
| 184 | 184 | |
| 185 | - /** |
|
| 186 | - * @param string $needle |
|
| 187 | - * @return static |
|
| 188 | - */ |
|
| 189 | - public function search($needle = '') |
|
| 190 | - { |
|
| 191 | - $this->reset(); |
|
| 192 | - $needle = trim(strtolower($needle)); |
|
| 193 | - foreach ($this->entries() as $key => $entry) { |
|
| 194 | - $single = strtolower($this->getEntryString($entry, 'msgid')); |
|
| 195 | - $plural = strtolower($this->getEntryString($entry, 'msgid_plural')); |
|
| 196 | - if (strlen($needle) < static::SEARCH_THRESHOLD) { |
|
| 197 | - if (in_array($needle, [$single, $plural])) { |
|
| 198 | - $this->results[$key] = $entry; |
|
| 199 | - } |
|
| 200 | - } elseif (Str::contains(sprintf('%s %s', $single, $plural), $needle)) { |
|
| 201 | - $this->results[$key] = $entry; |
|
| 202 | - } |
|
| 203 | - } |
|
| 204 | - return $this; |
|
| 205 | - } |
|
| 185 | + /** |
|
| 186 | + * @param string $needle |
|
| 187 | + * @return static |
|
| 188 | + */ |
|
| 189 | + public function search($needle = '') |
|
| 190 | + { |
|
| 191 | + $this->reset(); |
|
| 192 | + $needle = trim(strtolower($needle)); |
|
| 193 | + foreach ($this->entries() as $key => $entry) { |
|
| 194 | + $single = strtolower($this->getEntryString($entry, 'msgid')); |
|
| 195 | + $plural = strtolower($this->getEntryString($entry, 'msgid_plural')); |
|
| 196 | + if (strlen($needle) < static::SEARCH_THRESHOLD) { |
|
| 197 | + if (in_array($needle, [$single, $plural])) { |
|
| 198 | + $this->results[$key] = $entry; |
|
| 199 | + } |
|
| 200 | + } elseif (Str::contains(sprintf('%s %s', $single, $plural), $needle)) { |
|
| 201 | + $this->results[$key] = $entry; |
|
| 202 | + } |
|
| 203 | + } |
|
| 204 | + return $this; |
|
| 205 | + } |
|
| 206 | 206 | |
| 207 | - /** |
|
| 208 | - * Store the translations to avoid unnecessary loops. |
|
| 209 | - * @return array |
|
| 210 | - */ |
|
| 211 | - public function translations() |
|
| 212 | - { |
|
| 213 | - static $translations; |
|
| 214 | - if (empty($translations)) { |
|
| 215 | - $settings = glsr(OptionManager::class)->get('settings'); |
|
| 216 | - $translations = isset($settings['strings']) |
|
| 217 | - ? $this->normalizeSettings((array) $settings['strings']) |
|
| 218 | - : []; |
|
| 219 | - } |
|
| 220 | - return $translations; |
|
| 221 | - } |
|
| 207 | + /** |
|
| 208 | + * Store the translations to avoid unnecessary loops. |
|
| 209 | + * @return array |
|
| 210 | + */ |
|
| 211 | + public function translations() |
|
| 212 | + { |
|
| 213 | + static $translations; |
|
| 214 | + if (empty($translations)) { |
|
| 215 | + $settings = glsr(OptionManager::class)->get('settings'); |
|
| 216 | + $translations = isset($settings['strings']) |
|
| 217 | + ? $this->normalizeSettings((array) $settings['strings']) |
|
| 218 | + : []; |
|
| 219 | + } |
|
| 220 | + return $translations; |
|
| 221 | + } |
|
| 222 | 222 | |
| 223 | - /** |
|
| 224 | - * @param string $key |
|
| 225 | - * @return string |
|
| 226 | - */ |
|
| 227 | - protected function getEntryString(array $entry, $key) |
|
| 228 | - { |
|
| 229 | - return isset($entry[$key]) |
|
| 230 | - ? implode('', (array) $entry[$key]) |
|
| 231 | - : ''; |
|
| 232 | - } |
|
| 223 | + /** |
|
| 224 | + * @param string $key |
|
| 225 | + * @return string |
|
| 226 | + */ |
|
| 227 | + protected function getEntryString(array $entry, $key) |
|
| 228 | + { |
|
| 229 | + return isset($entry[$key]) |
|
| 230 | + ? implode('', (array) $entry[$key]) |
|
| 231 | + : ''; |
|
| 232 | + } |
|
| 233 | 233 | |
| 234 | - /** |
|
| 235 | - * @return array |
|
| 236 | - */ |
|
| 237 | - protected function normalize(array $entries) |
|
| 238 | - { |
|
| 239 | - $keys = [ |
|
| 240 | - 'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]', |
|
| 241 | - ]; |
|
| 242 | - array_walk($entries, function (&$entry) use ($keys) { |
|
| 243 | - foreach ($keys as $key) { |
|
| 244 | - try { |
|
| 245 | - $entry = $this->normalizeEntryString($entry, $key); |
|
| 246 | - } catch (\TypeError $error) { |
|
| 247 | - glsr_log()->once('error', 'Translation/normalize', $error); |
|
| 248 | - glsr_log()->once('debug', 'Translation/normalize', $entry); |
|
| 249 | - } |
|
| 250 | - } |
|
| 251 | - }); |
|
| 252 | - return $entries; |
|
| 253 | - } |
|
| 234 | + /** |
|
| 235 | + * @return array |
|
| 236 | + */ |
|
| 237 | + protected function normalize(array $entries) |
|
| 238 | + { |
|
| 239 | + $keys = [ |
|
| 240 | + 'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]', |
|
| 241 | + ]; |
|
| 242 | + array_walk($entries, function (&$entry) use ($keys) { |
|
| 243 | + foreach ($keys as $key) { |
|
| 244 | + try { |
|
| 245 | + $entry = $this->normalizeEntryString($entry, $key); |
|
| 246 | + } catch (\TypeError $error) { |
|
| 247 | + glsr_log()->once('error', 'Translation/normalize', $error); |
|
| 248 | + glsr_log()->once('debug', 'Translation/normalize', $entry); |
|
| 249 | + } |
|
| 250 | + } |
|
| 251 | + }); |
|
| 252 | + return $entries; |
|
| 253 | + } |
|
| 254 | 254 | |
| 255 | - /** |
|
| 256 | - * @param string $key |
|
| 257 | - * @return array |
|
| 258 | - */ |
|
| 259 | - protected function normalizeEntryString(array $entry, $key) |
|
| 260 | - { |
|
| 261 | - if (isset($entry[$key])) { |
|
| 262 | - $entry[$key] = $this->getEntryString($entry, $key); |
|
| 263 | - } |
|
| 264 | - return $entry; |
|
| 265 | - } |
|
| 255 | + /** |
|
| 256 | + * @param string $key |
|
| 257 | + * @return array |
|
| 258 | + */ |
|
| 259 | + protected function normalizeEntryString(array $entry, $key) |
|
| 260 | + { |
|
| 261 | + if (isset($entry[$key])) { |
|
| 262 | + $entry[$key] = $this->getEntryString($entry, $key); |
|
| 263 | + } |
|
| 264 | + return $entry; |
|
| 265 | + } |
|
| 266 | 266 | |
| 267 | - /** |
|
| 268 | - * @return array |
|
| 269 | - */ |
|
| 270 | - protected function normalizeSettings(array $strings) |
|
| 271 | - { |
|
| 272 | - $defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], ''); |
|
| 273 | - $strings = array_filter($strings, 'is_array'); |
|
| 274 | - foreach ($strings as &$string) { |
|
| 275 | - $string['type'] = isset($string['p1']) ? 'plural' : 'single'; |
|
| 276 | - $string = wp_parse_args($string, $defaultString); |
|
| 277 | - } |
|
| 278 | - return array_filter($strings, function ($string) { |
|
| 279 | - return !empty($string['id']); |
|
| 280 | - }); |
|
| 281 | - } |
|
| 267 | + /** |
|
| 268 | + * @return array |
|
| 269 | + */ |
|
| 270 | + protected function normalizeSettings(array $strings) |
|
| 271 | + { |
|
| 272 | + $defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], ''); |
|
| 273 | + $strings = array_filter($strings, 'is_array'); |
|
| 274 | + foreach ($strings as &$string) { |
|
| 275 | + $string['type'] = isset($string['p1']) ? 'plural' : 'single'; |
|
| 276 | + $string = wp_parse_args($string, $defaultString); |
|
| 277 | + } |
|
| 278 | + return array_filter($strings, function ($string) { |
|
| 279 | + return !empty($string['id']); |
|
| 280 | + }); |
|
| 281 | + } |
|
| 282 | 282 | } |
@@ -6,49 +6,49 @@ |
||
| 6 | 6 | |
| 7 | 7 | class Date |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * [60, 1], |
|
| 11 | - * [60 * 100, 60], |
|
| 12 | - * [3600 * 70, 3600], |
|
| 13 | - * [3600 * 24 * 10, 3600 * 24], |
|
| 14 | - * [3600 * 24 * 30, 3600 * 24 * 7], |
|
| 15 | - * [3600 * 24 * 30 * 30, 3600 * 24 * 30], |
|
| 16 | - * [INF, 3600 * 24 * 265],. |
|
| 17 | - */ |
|
| 18 | - protected static $TIME_PERIODS = [ |
|
| 19 | - [60, 1], |
|
| 20 | - [6000, 60], |
|
| 21 | - [252000, 3600], |
|
| 22 | - [864000, 86400], |
|
| 23 | - [2592000, 604800], |
|
| 24 | - [77760000, 2592000], |
|
| 25 | - [INF, 22896000], |
|
| 26 | - ]; |
|
| 9 | + /** |
|
| 10 | + * [60, 1], |
|
| 11 | + * [60 * 100, 60], |
|
| 12 | + * [3600 * 70, 3600], |
|
| 13 | + * [3600 * 24 * 10, 3600 * 24], |
|
| 14 | + * [3600 * 24 * 30, 3600 * 24 * 7], |
|
| 15 | + * [3600 * 24 * 30 * 30, 3600 * 24 * 30], |
|
| 16 | + * [INF, 3600 * 24 * 265],. |
|
| 17 | + */ |
|
| 18 | + protected static $TIME_PERIODS = [ |
|
| 19 | + [60, 1], |
|
| 20 | + [6000, 60], |
|
| 21 | + [252000, 3600], |
|
| 22 | + [864000, 86400], |
|
| 23 | + [2592000, 604800], |
|
| 24 | + [77760000, 2592000], |
|
| 25 | + [INF, 22896000], |
|
| 26 | + ]; |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * @return string |
|
| 30 | - */ |
|
| 31 | - public function relative($date) |
|
| 32 | - { |
|
| 33 | - $diff = time() - strtotime($date); |
|
| 34 | - foreach (static::$TIME_PERIODS as $i => $timePeriod) { |
|
| 35 | - if ($diff > $timePeriod[0]) { |
|
| 36 | - continue; |
|
| 37 | - } |
|
| 38 | - $unit = intval(floor($diff / $timePeriod[1])); |
|
| 39 | - $relativeDates = [ |
|
| 40 | - _n('%s second ago', '%s seconds ago', $unit, 'site-reviews'), |
|
| 41 | - _n('%s minute ago', '%s minutes ago', $unit, 'site-reviews'), |
|
| 42 | - _n('an hour ago', '%s hours ago', $unit, 'site-reviews'), |
|
| 43 | - _n('yesterday', '%s days ago', $unit, 'site-reviews'), |
|
| 44 | - _n('a week ago', '%s weeks ago', $unit, 'site-reviews'), |
|
| 45 | - _n('%s month ago', '%s months ago', $unit, 'site-reviews'), |
|
| 46 | - _n('%s year ago', '%s years ago', $unit, 'site-reviews'), |
|
| 47 | - ]; |
|
| 48 | - $relativeDate = $relativeDates[$i]; |
|
| 49 | - return Str::contains($relativeDate, '%s') |
|
| 50 | - ? sprintf($relativeDate, $unit) |
|
| 51 | - : $relativeDate; |
|
| 52 | - } |
|
| 53 | - } |
|
| 28 | + /** |
|
| 29 | + * @return string |
|
| 30 | + */ |
|
| 31 | + public function relative($date) |
|
| 32 | + { |
|
| 33 | + $diff = time() - strtotime($date); |
|
| 34 | + foreach (static::$TIME_PERIODS as $i => $timePeriod) { |
|
| 35 | + if ($diff > $timePeriod[0]) { |
|
| 36 | + continue; |
|
| 37 | + } |
|
| 38 | + $unit = intval(floor($diff / $timePeriod[1])); |
|
| 39 | + $relativeDates = [ |
|
| 40 | + _n('%s second ago', '%s seconds ago', $unit, 'site-reviews'), |
|
| 41 | + _n('%s minute ago', '%s minutes ago', $unit, 'site-reviews'), |
|
| 42 | + _n('an hour ago', '%s hours ago', $unit, 'site-reviews'), |
|
| 43 | + _n('yesterday', '%s days ago', $unit, 'site-reviews'), |
|
| 44 | + _n('a week ago', '%s weeks ago', $unit, 'site-reviews'), |
|
| 45 | + _n('%s month ago', '%s months ago', $unit, 'site-reviews'), |
|
| 46 | + _n('%s year ago', '%s years ago', $unit, 'site-reviews'), |
|
| 47 | + ]; |
|
| 48 | + $relativeDate = $relativeDates[$i]; |
|
| 49 | + return Str::contains($relativeDate, '%s') |
|
| 50 | + ? sprintf($relativeDate, $unit) |
|
| 51 | + : $relativeDate; |
|
| 52 | + } |
|
| 53 | + } |
|
| 54 | 54 | } |
@@ -12,302 +12,302 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | class Validator |
| 14 | 14 | { |
| 15 | - use ValidationRules; |
|
| 15 | + use ValidationRules; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * @var array |
|
| 19 | - */ |
|
| 20 | - public $errors = []; |
|
| 17 | + /** |
|
| 18 | + * @var array |
|
| 19 | + */ |
|
| 20 | + public $errors = []; |
|
| 21 | 21 | |
| 22 | - /** |
|
| 23 | - * The data under validation. |
|
| 24 | - * @var array |
|
| 25 | - */ |
|
| 26 | - protected $data = []; |
|
| 22 | + /** |
|
| 23 | + * The data under validation. |
|
| 24 | + * @var array |
|
| 25 | + */ |
|
| 26 | + protected $data = []; |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * The failed validation rules. |
|
| 30 | - * @var array |
|
| 31 | - */ |
|
| 32 | - protected $failedRules = []; |
|
| 28 | + /** |
|
| 29 | + * The failed validation rules. |
|
| 30 | + * @var array |
|
| 31 | + */ |
|
| 32 | + protected $failedRules = []; |
|
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * The rules to be applied to the data. |
|
| 36 | - * @var array |
|
| 37 | - */ |
|
| 38 | - protected $rules = []; |
|
| 34 | + /** |
|
| 35 | + * The rules to be applied to the data. |
|
| 36 | + * @var array |
|
| 37 | + */ |
|
| 38 | + protected $rules = []; |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * The size related validation rules. |
|
| 42 | - * @var array |
|
| 43 | - */ |
|
| 44 | - protected $sizeRules = [ |
|
| 45 | - 'Between', 'Max', 'Min', |
|
| 46 | - ]; |
|
| 40 | + /** |
|
| 41 | + * The size related validation rules. |
|
| 42 | + * @var array |
|
| 43 | + */ |
|
| 44 | + protected $sizeRules = [ |
|
| 45 | + 'Between', 'Max', 'Min', |
|
| 46 | + ]; |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * The validation rules that imply the field is required. |
|
| 50 | - * @var array |
|
| 51 | - */ |
|
| 52 | - protected $implicitRules = [ |
|
| 53 | - 'Required', |
|
| 54 | - ]; |
|
| 48 | + /** |
|
| 49 | + * The validation rules that imply the field is required. |
|
| 50 | + * @var array |
|
| 51 | + */ |
|
| 52 | + protected $implicitRules = [ |
|
| 53 | + 'Required', |
|
| 54 | + ]; |
|
| 55 | 55 | |
| 56 | - /** |
|
| 57 | - * The numeric related validation rules. |
|
| 58 | - * @var array |
|
| 59 | - */ |
|
| 60 | - protected $numericRules = [ |
|
| 61 | - 'Number', |
|
| 62 | - ]; |
|
| 56 | + /** |
|
| 57 | + * The numeric related validation rules. |
|
| 58 | + * @var array |
|
| 59 | + */ |
|
| 60 | + protected $numericRules = [ |
|
| 61 | + 'Number', |
|
| 62 | + ]; |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * Run the validator's rules against its data. |
|
| 66 | - * @param mixed $data |
|
| 67 | - * @return array |
|
| 68 | - */ |
|
| 69 | - public function validate($data, array $rules = []) |
|
| 70 | - { |
|
| 71 | - $this->normalizeData($data); |
|
| 72 | - $this->setRules($rules); |
|
| 73 | - foreach ($this->rules as $attribute => $rules) { |
|
| 74 | - foreach ($rules as $rule) { |
|
| 75 | - $this->validateAttribute($attribute, $rule); |
|
| 76 | - if ($this->shouldStopValidating($attribute)) { |
|
| 77 | - break; |
|
| 78 | - } |
|
| 79 | - } |
|
| 80 | - } |
|
| 81 | - return $this->errors; |
|
| 82 | - } |
|
| 64 | + /** |
|
| 65 | + * Run the validator's rules against its data. |
|
| 66 | + * @param mixed $data |
|
| 67 | + * @return array |
|
| 68 | + */ |
|
| 69 | + public function validate($data, array $rules = []) |
|
| 70 | + { |
|
| 71 | + $this->normalizeData($data); |
|
| 72 | + $this->setRules($rules); |
|
| 73 | + foreach ($this->rules as $attribute => $rules) { |
|
| 74 | + foreach ($rules as $rule) { |
|
| 75 | + $this->validateAttribute($attribute, $rule); |
|
| 76 | + if ($this->shouldStopValidating($attribute)) { |
|
| 77 | + break; |
|
| 78 | + } |
|
| 79 | + } |
|
| 80 | + } |
|
| 81 | + return $this->errors; |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - /** |
|
| 85 | - * Validate a given attribute against a rule. |
|
| 86 | - * @param string $attribute |
|
| 87 | - * @param string $rule |
|
| 88 | - * @return void |
|
| 89 | - * @throws BadMethodCallException |
|
| 90 | - */ |
|
| 91 | - public function validateAttribute($attribute, $rule) |
|
| 92 | - { |
|
| 93 | - list($rule, $parameters) = $this->parseRule($rule); |
|
| 94 | - if ('' == $rule) { |
|
| 95 | - return; |
|
| 96 | - } |
|
| 97 | - $value = $this->getValue($attribute); |
|
| 98 | - if (!method_exists($this, $method = 'validate'.$rule)) { |
|
| 99 | - throw new BadMethodCallException("Method [$method] does not exist."); |
|
| 100 | - } |
|
| 101 | - if (!$this->$method($value, $attribute, $parameters)) { |
|
| 102 | - $this->addFailure($attribute, $rule, $parameters); |
|
| 103 | - } |
|
| 104 | - } |
|
| 84 | + /** |
|
| 85 | + * Validate a given attribute against a rule. |
|
| 86 | + * @param string $attribute |
|
| 87 | + * @param string $rule |
|
| 88 | + * @return void |
|
| 89 | + * @throws BadMethodCallException |
|
| 90 | + */ |
|
| 91 | + public function validateAttribute($attribute, $rule) |
|
| 92 | + { |
|
| 93 | + list($rule, $parameters) = $this->parseRule($rule); |
|
| 94 | + if ('' == $rule) { |
|
| 95 | + return; |
|
| 96 | + } |
|
| 97 | + $value = $this->getValue($attribute); |
|
| 98 | + if (!method_exists($this, $method = 'validate'.$rule)) { |
|
| 99 | + throw new BadMethodCallException("Method [$method] does not exist."); |
|
| 100 | + } |
|
| 101 | + if (!$this->$method($value, $attribute, $parameters)) { |
|
| 102 | + $this->addFailure($attribute, $rule, $parameters); |
|
| 103 | + } |
|
| 104 | + } |
|
| 105 | 105 | |
| 106 | - /** |
|
| 107 | - * Add an error message to the validator's collection of errors. |
|
| 108 | - * @param string $attribute |
|
| 109 | - * @param string $rule |
|
| 110 | - * @return void |
|
| 111 | - */ |
|
| 112 | - protected function addError($attribute, $rule, array $parameters) |
|
| 113 | - { |
|
| 114 | - $message = $this->getMessage($attribute, $rule, $parameters); |
|
| 115 | - $this->errors[$attribute][] = $message; |
|
| 116 | - } |
|
| 106 | + /** |
|
| 107 | + * Add an error message to the validator's collection of errors. |
|
| 108 | + * @param string $attribute |
|
| 109 | + * @param string $rule |
|
| 110 | + * @return void |
|
| 111 | + */ |
|
| 112 | + protected function addError($attribute, $rule, array $parameters) |
|
| 113 | + { |
|
| 114 | + $message = $this->getMessage($attribute, $rule, $parameters); |
|
| 115 | + $this->errors[$attribute][] = $message; |
|
| 116 | + } |
|
| 117 | 117 | |
| 118 | - /** |
|
| 119 | - * Add a failed rule and error message to the collection. |
|
| 120 | - * @param string $attribute |
|
| 121 | - * @param string $rule |
|
| 122 | - * @return void |
|
| 123 | - */ |
|
| 124 | - protected function addFailure($attribute, $rule, array $parameters) |
|
| 125 | - { |
|
| 126 | - $this->addError($attribute, $rule, $parameters); |
|
| 127 | - $this->failedRules[$attribute][$rule] = $parameters; |
|
| 128 | - } |
|
| 118 | + /** |
|
| 119 | + * Add a failed rule and error message to the collection. |
|
| 120 | + * @param string $attribute |
|
| 121 | + * @param string $rule |
|
| 122 | + * @return void |
|
| 123 | + */ |
|
| 124 | + protected function addFailure($attribute, $rule, array $parameters) |
|
| 125 | + { |
|
| 126 | + $this->addError($attribute, $rule, $parameters); |
|
| 127 | + $this->failedRules[$attribute][$rule] = $parameters; |
|
| 128 | + } |
|
| 129 | 129 | |
| 130 | - /** |
|
| 131 | - * Get the data type of the given attribute. |
|
| 132 | - * @param string $attribute |
|
| 133 | - * @return string |
|
| 134 | - */ |
|
| 135 | - protected function getAttributeType($attribute) |
|
| 136 | - { |
|
| 137 | - return !$this->hasRule($attribute, $this->numericRules) |
|
| 138 | - ? 'length' |
|
| 139 | - : ''; |
|
| 140 | - } |
|
| 130 | + /** |
|
| 131 | + * Get the data type of the given attribute. |
|
| 132 | + * @param string $attribute |
|
| 133 | + * @return string |
|
| 134 | + */ |
|
| 135 | + protected function getAttributeType($attribute) |
|
| 136 | + { |
|
| 137 | + return !$this->hasRule($attribute, $this->numericRules) |
|
| 138 | + ? 'length' |
|
| 139 | + : ''; |
|
| 140 | + } |
|
| 141 | 141 | |
| 142 | - /** |
|
| 143 | - * Get the validation message for an attribute and rule. |
|
| 144 | - * @param string $attribute |
|
| 145 | - * @param string $rule |
|
| 146 | - * @return string|null |
|
| 147 | - */ |
|
| 148 | - protected function getMessage($attribute, $rule, array $parameters) |
|
| 149 | - { |
|
| 150 | - if (in_array($rule, $this->sizeRules)) { |
|
| 151 | - return $this->getSizeMessage($attribute, $rule, $parameters); |
|
| 152 | - } |
|
| 153 | - $lowerRule = Str::snakeCase($rule); |
|
| 154 | - return $this->translator($lowerRule, $parameters); |
|
| 155 | - } |
|
| 142 | + /** |
|
| 143 | + * Get the validation message for an attribute and rule. |
|
| 144 | + * @param string $attribute |
|
| 145 | + * @param string $rule |
|
| 146 | + * @return string|null |
|
| 147 | + */ |
|
| 148 | + protected function getMessage($attribute, $rule, array $parameters) |
|
| 149 | + { |
|
| 150 | + if (in_array($rule, $this->sizeRules)) { |
|
| 151 | + return $this->getSizeMessage($attribute, $rule, $parameters); |
|
| 152 | + } |
|
| 153 | + $lowerRule = Str::snakeCase($rule); |
|
| 154 | + return $this->translator($lowerRule, $parameters); |
|
| 155 | + } |
|
| 156 | 156 | |
| 157 | - /** |
|
| 158 | - * Get a rule and its parameters for a given attribute. |
|
| 159 | - * @param string $attribute |
|
| 160 | - * @param string|array $rules |
|
| 161 | - * @return array|null |
|
| 162 | - */ |
|
| 163 | - protected function getRule($attribute, $rules) |
|
| 164 | - { |
|
| 165 | - if (!array_key_exists($attribute, $this->rules)) { |
|
| 166 | - return; |
|
| 167 | - } |
|
| 168 | - $rules = (array) $rules; |
|
| 169 | - foreach ($this->rules[$attribute] as $rule) { |
|
| 170 | - list($rule, $parameters) = $this->parseRule($rule); |
|
| 171 | - if (in_array($rule, $rules)) { |
|
| 172 | - return [$rule, $parameters]; |
|
| 173 | - } |
|
| 174 | - } |
|
| 175 | - } |
|
| 157 | + /** |
|
| 158 | + * Get a rule and its parameters for a given attribute. |
|
| 159 | + * @param string $attribute |
|
| 160 | + * @param string|array $rules |
|
| 161 | + * @return array|null |
|
| 162 | + */ |
|
| 163 | + protected function getRule($attribute, $rules) |
|
| 164 | + { |
|
| 165 | + if (!array_key_exists($attribute, $this->rules)) { |
|
| 166 | + return; |
|
| 167 | + } |
|
| 168 | + $rules = (array) $rules; |
|
| 169 | + foreach ($this->rules[$attribute] as $rule) { |
|
| 170 | + list($rule, $parameters) = $this->parseRule($rule); |
|
| 171 | + if (in_array($rule, $rules)) { |
|
| 172 | + return [$rule, $parameters]; |
|
| 173 | + } |
|
| 174 | + } |
|
| 175 | + } |
|
| 176 | 176 | |
| 177 | - /** |
|
| 178 | - * Get the size of an attribute. |
|
| 179 | - * @param string $attribute |
|
| 180 | - * @param mixed $value |
|
| 181 | - * @return mixed |
|
| 182 | - */ |
|
| 183 | - protected function getSize($attribute, $value) |
|
| 184 | - { |
|
| 185 | - $hasNumeric = $this->hasRule($attribute, $this->numericRules); |
|
| 186 | - if (is_numeric($value) && $hasNumeric) { |
|
| 187 | - return $value; |
|
| 188 | - } elseif (is_array($value)) { |
|
| 189 | - return count($value); |
|
| 190 | - } |
|
| 191 | - return function_exists('mb_strlen') |
|
| 192 | - ? mb_strlen($value) |
|
| 193 | - : strlen($value); |
|
| 194 | - } |
|
| 177 | + /** |
|
| 178 | + * Get the size of an attribute. |
|
| 179 | + * @param string $attribute |
|
| 180 | + * @param mixed $value |
|
| 181 | + * @return mixed |
|
| 182 | + */ |
|
| 183 | + protected function getSize($attribute, $value) |
|
| 184 | + { |
|
| 185 | + $hasNumeric = $this->hasRule($attribute, $this->numericRules); |
|
| 186 | + if (is_numeric($value) && $hasNumeric) { |
|
| 187 | + return $value; |
|
| 188 | + } elseif (is_array($value)) { |
|
| 189 | + return count($value); |
|
| 190 | + } |
|
| 191 | + return function_exists('mb_strlen') |
|
| 192 | + ? mb_strlen($value) |
|
| 193 | + : strlen($value); |
|
| 194 | + } |
|
| 195 | 195 | |
| 196 | - /** |
|
| 197 | - * Get the proper error message for an attribute and size rule. |
|
| 198 | - * @param string $attribute |
|
| 199 | - * @param string $rule |
|
| 200 | - * @return string|null |
|
| 201 | - */ |
|
| 202 | - protected function getSizeMessage($attribute, $rule, array $parameters) |
|
| 203 | - { |
|
| 204 | - $type = $this->getAttributeType($attribute); |
|
| 205 | - $lowerRule = Str::snakeCase($rule.$type); |
|
| 206 | - return $this->translator($lowerRule, $parameters); |
|
| 207 | - } |
|
| 196 | + /** |
|
| 197 | + * Get the proper error message for an attribute and size rule. |
|
| 198 | + * @param string $attribute |
|
| 199 | + * @param string $rule |
|
| 200 | + * @return string|null |
|
| 201 | + */ |
|
| 202 | + protected function getSizeMessage($attribute, $rule, array $parameters) |
|
| 203 | + { |
|
| 204 | + $type = $this->getAttributeType($attribute); |
|
| 205 | + $lowerRule = Str::snakeCase($rule.$type); |
|
| 206 | + return $this->translator($lowerRule, $parameters); |
|
| 207 | + } |
|
| 208 | 208 | |
| 209 | - /** |
|
| 210 | - * Get the value of a given attribute. |
|
| 211 | - * @param string $attribute |
|
| 212 | - * @return mixed |
|
| 213 | - */ |
|
| 214 | - protected function getValue($attribute) |
|
| 215 | - { |
|
| 216 | - if (isset($this->data[$attribute])) { |
|
| 217 | - return $this->data[$attribute]; |
|
| 218 | - } |
|
| 219 | - } |
|
| 209 | + /** |
|
| 210 | + * Get the value of a given attribute. |
|
| 211 | + * @param string $attribute |
|
| 212 | + * @return mixed |
|
| 213 | + */ |
|
| 214 | + protected function getValue($attribute) |
|
| 215 | + { |
|
| 216 | + if (isset($this->data[$attribute])) { |
|
| 217 | + return $this->data[$attribute]; |
|
| 218 | + } |
|
| 219 | + } |
|
| 220 | 220 | |
| 221 | - /** |
|
| 222 | - * Determine if the given attribute has a rule in the given set. |
|
| 223 | - * @param string $attribute |
|
| 224 | - * @param string|array $rules |
|
| 225 | - * @return bool |
|
| 226 | - */ |
|
| 227 | - protected function hasRule($attribute, $rules) |
|
| 228 | - { |
|
| 229 | - return !is_null($this->getRule($attribute, $rules)); |
|
| 230 | - } |
|
| 221 | + /** |
|
| 222 | + * Determine if the given attribute has a rule in the given set. |
|
| 223 | + * @param string $attribute |
|
| 224 | + * @param string|array $rules |
|
| 225 | + * @return bool |
|
| 226 | + */ |
|
| 227 | + protected function hasRule($attribute, $rules) |
|
| 228 | + { |
|
| 229 | + return !is_null($this->getRule($attribute, $rules)); |
|
| 230 | + } |
|
| 231 | 231 | |
| 232 | - /** |
|
| 233 | - * Normalize the provided data to an array. |
|
| 234 | - * @param mixed $data |
|
| 235 | - * @return void |
|
| 236 | - */ |
|
| 237 | - protected function normalizeData($data) |
|
| 238 | - { |
|
| 239 | - $this->data = is_object($data) |
|
| 240 | - ? get_object_vars($data) |
|
| 241 | - : $data; |
|
| 242 | - } |
|
| 232 | + /** |
|
| 233 | + * Normalize the provided data to an array. |
|
| 234 | + * @param mixed $data |
|
| 235 | + * @return void |
|
| 236 | + */ |
|
| 237 | + protected function normalizeData($data) |
|
| 238 | + { |
|
| 239 | + $this->data = is_object($data) |
|
| 240 | + ? get_object_vars($data) |
|
| 241 | + : $data; |
|
| 242 | + } |
|
| 243 | 243 | |
| 244 | - /** |
|
| 245 | - * Parse a parameter list. |
|
| 246 | - * @param string $rule |
|
| 247 | - * @param string $parameter |
|
| 248 | - * @return array |
|
| 249 | - */ |
|
| 250 | - protected function parseParameters($rule, $parameter) |
|
| 251 | - { |
|
| 252 | - return 'regex' == strtolower($rule) |
|
| 253 | - ? [$parameter] |
|
| 254 | - : str_getcsv($parameter); |
|
| 255 | - } |
|
| 244 | + /** |
|
| 245 | + * Parse a parameter list. |
|
| 246 | + * @param string $rule |
|
| 247 | + * @param string $parameter |
|
| 248 | + * @return array |
|
| 249 | + */ |
|
| 250 | + protected function parseParameters($rule, $parameter) |
|
| 251 | + { |
|
| 252 | + return 'regex' == strtolower($rule) |
|
| 253 | + ? [$parameter] |
|
| 254 | + : str_getcsv($parameter); |
|
| 255 | + } |
|
| 256 | 256 | |
| 257 | - /** |
|
| 258 | - * Extract the rule name and parameters from a rule. |
|
| 259 | - * @param string $rule |
|
| 260 | - * @return array |
|
| 261 | - */ |
|
| 262 | - protected function parseRule($rule) |
|
| 263 | - { |
|
| 264 | - $parameters = []; |
|
| 265 | - if (Str::contains($rule, ':')) { |
|
| 266 | - list($rule, $parameter) = explode(':', $rule, 2); |
|
| 267 | - $parameters = $this->parseParameters($rule, $parameter); |
|
| 268 | - } |
|
| 269 | - $rule = Str::camelCase($rule); |
|
| 270 | - return [$rule, $parameters]; |
|
| 271 | - } |
|
| 257 | + /** |
|
| 258 | + * Extract the rule name and parameters from a rule. |
|
| 259 | + * @param string $rule |
|
| 260 | + * @return array |
|
| 261 | + */ |
|
| 262 | + protected function parseRule($rule) |
|
| 263 | + { |
|
| 264 | + $parameters = []; |
|
| 265 | + if (Str::contains($rule, ':')) { |
|
| 266 | + list($rule, $parameter) = explode(':', $rule, 2); |
|
| 267 | + $parameters = $this->parseParameters($rule, $parameter); |
|
| 268 | + } |
|
| 269 | + $rule = Str::camelCase($rule); |
|
| 270 | + return [$rule, $parameters]; |
|
| 271 | + } |
|
| 272 | 272 | |
| 273 | - /** |
|
| 274 | - * Set the validation rules. |
|
| 275 | - * @return void |
|
| 276 | - */ |
|
| 277 | - protected function setRules(array $rules) |
|
| 278 | - { |
|
| 279 | - foreach ($rules as $key => $rule) { |
|
| 280 | - $rules[$key] = is_string($rule) |
|
| 281 | - ? explode('|', $rule) |
|
| 282 | - : $rule; |
|
| 283 | - } |
|
| 284 | - $this->rules = $rules; |
|
| 285 | - } |
|
| 273 | + /** |
|
| 274 | + * Set the validation rules. |
|
| 275 | + * @return void |
|
| 276 | + */ |
|
| 277 | + protected function setRules(array $rules) |
|
| 278 | + { |
|
| 279 | + foreach ($rules as $key => $rule) { |
|
| 280 | + $rules[$key] = is_string($rule) |
|
| 281 | + ? explode('|', $rule) |
|
| 282 | + : $rule; |
|
| 283 | + } |
|
| 284 | + $this->rules = $rules; |
|
| 285 | + } |
|
| 286 | 286 | |
| 287 | - /** |
|
| 288 | - * Check if we should stop further validations on a given attribute. |
|
| 289 | - * @param string $attribute |
|
| 290 | - * @return bool |
|
| 291 | - */ |
|
| 292 | - protected function shouldStopValidating($attribute) |
|
| 293 | - { |
|
| 294 | - return $this->hasRule($attribute, $this->implicitRules) |
|
| 295 | - && isset($this->failedRules[$attribute]) |
|
| 296 | - && array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules); |
|
| 297 | - } |
|
| 287 | + /** |
|
| 288 | + * Check if we should stop further validations on a given attribute. |
|
| 289 | + * @param string $attribute |
|
| 290 | + * @return bool |
|
| 291 | + */ |
|
| 292 | + protected function shouldStopValidating($attribute) |
|
| 293 | + { |
|
| 294 | + return $this->hasRule($attribute, $this->implicitRules) |
|
| 295 | + && isset($this->failedRules[$attribute]) |
|
| 296 | + && array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules); |
|
| 297 | + } |
|
| 298 | 298 | |
| 299 | - /** |
|
| 300 | - * Returns a translated message for the attribute. |
|
| 301 | - * @param string $key |
|
| 302 | - * @param string $attribute |
|
| 303 | - * @return void|string |
|
| 304 | - */ |
|
| 305 | - protected function translator($key, array $parameters) |
|
| 306 | - { |
|
| 307 | - $strings = glsr(ValidationStringsDefaults::class)->defaults(); |
|
| 308 | - if (isset($strings[$key])) { |
|
| 309 | - return $this->replace($strings[$key], $parameters); |
|
| 310 | - } |
|
| 311 | - return 'error'; |
|
| 312 | - } |
|
| 299 | + /** |
|
| 300 | + * Returns a translated message for the attribute. |
|
| 301 | + * @param string $key |
|
| 302 | + * @param string $attribute |
|
| 303 | + * @return void|string |
|
| 304 | + */ |
|
| 305 | + protected function translator($key, array $parameters) |
|
| 306 | + { |
|
| 307 | + $strings = glsr(ValidationStringsDefaults::class)->defaults(); |
|
| 308 | + if (isset($strings[$key])) { |
|
| 309 | + return $this->replace($strings[$key], $parameters); |
|
| 310 | + } |
|
| 311 | + return 'error'; |
|
| 312 | + } |
|
| 313 | 313 | } |
@@ -10,126 +10,126 @@ |
||
| 10 | 10 | */ |
| 11 | 11 | trait ValidationRules |
| 12 | 12 | { |
| 13 | - /** |
|
| 14 | - * Get the size of an attribute. |
|
| 15 | - * @param string $attribute |
|
| 16 | - * @param mixed $value |
|
| 17 | - * @return mixed |
|
| 18 | - */ |
|
| 19 | - abstract protected function getSize($attribute, $value); |
|
| 13 | + /** |
|
| 14 | + * Get the size of an attribute. |
|
| 15 | + * @param string $attribute |
|
| 16 | + * @param mixed $value |
|
| 17 | + * @return mixed |
|
| 18 | + */ |
|
| 19 | + abstract protected function getSize($attribute, $value); |
|
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * Replace all placeholders. |
|
| 23 | - * @param string $message |
|
| 24 | - * @return string |
|
| 25 | - */ |
|
| 26 | - protected function replace($message, array $parameters) |
|
| 27 | - { |
|
| 28 | - if (!Str::contains($message, '%s')) { |
|
| 29 | - return $message; |
|
| 30 | - } |
|
| 31 | - return preg_replace_callback('/(%s)/', function () use (&$parameters) { |
|
| 32 | - foreach ($parameters as $key => $value) { |
|
| 33 | - return array_shift($parameters); |
|
| 34 | - } |
|
| 35 | - }, $message); |
|
| 36 | - } |
|
| 21 | + /** |
|
| 22 | + * Replace all placeholders. |
|
| 23 | + * @param string $message |
|
| 24 | + * @return string |
|
| 25 | + */ |
|
| 26 | + protected function replace($message, array $parameters) |
|
| 27 | + { |
|
| 28 | + if (!Str::contains($message, '%s')) { |
|
| 29 | + return $message; |
|
| 30 | + } |
|
| 31 | + return preg_replace_callback('/(%s)/', function () use (&$parameters) { |
|
| 32 | + foreach ($parameters as $key => $value) { |
|
| 33 | + return array_shift($parameters); |
|
| 34 | + } |
|
| 35 | + }, $message); |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * Validate that an attribute was "accepted". |
|
| 40 | - * This validation rule implies the attribute is "required". |
|
| 41 | - * @param string $attribute |
|
| 42 | - * @param mixed $value |
|
| 43 | - * @return bool |
|
| 44 | - */ |
|
| 45 | - public function validateAccepted($value) |
|
| 46 | - { |
|
| 47 | - $acceptable = ['yes', 'on', '1', 1, true, 'true']; |
|
| 48 | - return $this->validateRequired($value) && in_array($value, $acceptable, true); |
|
| 49 | - } |
|
| 38 | + /** |
|
| 39 | + * Validate that an attribute was "accepted". |
|
| 40 | + * This validation rule implies the attribute is "required". |
|
| 41 | + * @param string $attribute |
|
| 42 | + * @param mixed $value |
|
| 43 | + * @return bool |
|
| 44 | + */ |
|
| 45 | + public function validateAccepted($value) |
|
| 46 | + { |
|
| 47 | + $acceptable = ['yes', 'on', '1', 1, true, 'true']; |
|
| 48 | + return $this->validateRequired($value) && in_array($value, $acceptable, true); |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * Validate the size of an attribute is between a set of values. |
|
| 53 | - * @param string $attribute |
|
| 54 | - * @param mixed $value |
|
| 55 | - * @return bool |
|
| 56 | - */ |
|
| 57 | - public function validateBetween($value, $attribute, array $parameters) |
|
| 58 | - { |
|
| 59 | - $this->requireParameterCount(2, $parameters, 'between'); |
|
| 60 | - $size = $this->getSize($attribute, $value); |
|
| 61 | - return $size >= $parameters[0] && $size <= $parameters[1]; |
|
| 62 | - } |
|
| 51 | + /** |
|
| 52 | + * Validate the size of an attribute is between a set of values. |
|
| 53 | + * @param string $attribute |
|
| 54 | + * @param mixed $value |
|
| 55 | + * @return bool |
|
| 56 | + */ |
|
| 57 | + public function validateBetween($value, $attribute, array $parameters) |
|
| 58 | + { |
|
| 59 | + $this->requireParameterCount(2, $parameters, 'between'); |
|
| 60 | + $size = $this->getSize($attribute, $value); |
|
| 61 | + return $size >= $parameters[0] && $size <= $parameters[1]; |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * Validate that an attribute is a valid e-mail address. |
|
| 66 | - * @param mixed $value |
|
| 67 | - * @return bool |
|
| 68 | - */ |
|
| 69 | - public function validateEmail($value) |
|
| 70 | - { |
|
| 71 | - return false !== filter_var($value, FILTER_VALIDATE_EMAIL); |
|
| 72 | - } |
|
| 64 | + /** |
|
| 65 | + * Validate that an attribute is a valid e-mail address. |
|
| 66 | + * @param mixed $value |
|
| 67 | + * @return bool |
|
| 68 | + */ |
|
| 69 | + public function validateEmail($value) |
|
| 70 | + { |
|
| 71 | + return false !== filter_var($value, FILTER_VALIDATE_EMAIL); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * Validate the size of an attribute is less than a maximum value. |
|
| 76 | - * @param string $attribute |
|
| 77 | - * @param mixed $value |
|
| 78 | - * @return bool |
|
| 79 | - */ |
|
| 80 | - public function validateMax($value, $attribute, array $parameters) |
|
| 81 | - { |
|
| 82 | - $this->requireParameterCount(1, $parameters, 'max'); |
|
| 83 | - return $this->getSize($attribute, $value) <= $parameters[0]; |
|
| 84 | - } |
|
| 74 | + /** |
|
| 75 | + * Validate the size of an attribute is less than a maximum value. |
|
| 76 | + * @param string $attribute |
|
| 77 | + * @param mixed $value |
|
| 78 | + * @return bool |
|
| 79 | + */ |
|
| 80 | + public function validateMax($value, $attribute, array $parameters) |
|
| 81 | + { |
|
| 82 | + $this->requireParameterCount(1, $parameters, 'max'); |
|
| 83 | + return $this->getSize($attribute, $value) <= $parameters[0]; |
|
| 84 | + } |
|
| 85 | 85 | |
| 86 | - /** |
|
| 87 | - * Validate the size of an attribute is greater than a minimum value. |
|
| 88 | - * @param string $attribute |
|
| 89 | - * @param mixed $value |
|
| 90 | - * @return bool |
|
| 91 | - */ |
|
| 92 | - public function validateMin($value, $attribute, array $parameters) |
|
| 93 | - { |
|
| 94 | - $this->requireParameterCount(1, $parameters, 'min'); |
|
| 95 | - return $this->getSize($attribute, $value) >= $parameters[0]; |
|
| 96 | - } |
|
| 86 | + /** |
|
| 87 | + * Validate the size of an attribute is greater than a minimum value. |
|
| 88 | + * @param string $attribute |
|
| 89 | + * @param mixed $value |
|
| 90 | + * @return bool |
|
| 91 | + */ |
|
| 92 | + public function validateMin($value, $attribute, array $parameters) |
|
| 93 | + { |
|
| 94 | + $this->requireParameterCount(1, $parameters, 'min'); |
|
| 95 | + return $this->getSize($attribute, $value) >= $parameters[0]; |
|
| 96 | + } |
|
| 97 | 97 | |
| 98 | - /** |
|
| 99 | - * Validate that an attribute is numeric. |
|
| 100 | - * @param mixed $value |
|
| 101 | - * @return bool |
|
| 102 | - */ |
|
| 103 | - public function validateNumber($value) |
|
| 104 | - { |
|
| 105 | - return is_numeric($value); |
|
| 106 | - } |
|
| 98 | + /** |
|
| 99 | + * Validate that an attribute is numeric. |
|
| 100 | + * @param mixed $value |
|
| 101 | + * @return bool |
|
| 102 | + */ |
|
| 103 | + public function validateNumber($value) |
|
| 104 | + { |
|
| 105 | + return is_numeric($value); |
|
| 106 | + } |
|
| 107 | 107 | |
| 108 | - /** |
|
| 109 | - * Validate that a required attribute exists. |
|
| 110 | - * @param mixed $value |
|
| 111 | - * @return bool |
|
| 112 | - */ |
|
| 113 | - public function validateRequired($value) |
|
| 114 | - { |
|
| 115 | - return is_null($value) |
|
| 116 | - || (is_string($value) && '' === trim($value)) |
|
| 117 | - || (is_array($value) && count($value) < 1) |
|
| 118 | - ? false |
|
| 119 | - : true; |
|
| 120 | - } |
|
| 108 | + /** |
|
| 109 | + * Validate that a required attribute exists. |
|
| 110 | + * @param mixed $value |
|
| 111 | + * @return bool |
|
| 112 | + */ |
|
| 113 | + public function validateRequired($value) |
|
| 114 | + { |
|
| 115 | + return is_null($value) |
|
| 116 | + || (is_string($value) && '' === trim($value)) |
|
| 117 | + || (is_array($value) && count($value) < 1) |
|
| 118 | + ? false |
|
| 119 | + : true; |
|
| 120 | + } |
|
| 121 | 121 | |
| 122 | - /** |
|
| 123 | - * Require a certain number of parameters to be present. |
|
| 124 | - * @param int $count |
|
| 125 | - * @param string $rule |
|
| 126 | - * @return void |
|
| 127 | - * @throws InvalidArgumentException |
|
| 128 | - */ |
|
| 129 | - protected function requireParameterCount($count, array $parameters, $rule) |
|
| 130 | - { |
|
| 131 | - if (count($parameters) < $count) { |
|
| 132 | - throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters."); |
|
| 133 | - } |
|
| 134 | - } |
|
| 122 | + /** |
|
| 123 | + * Require a certain number of parameters to be present. |
|
| 124 | + * @param int $count |
|
| 125 | + * @param string $rule |
|
| 126 | + * @return void |
|
| 127 | + * @throws InvalidArgumentException |
|
| 128 | + */ |
|
| 129 | + protected function requireParameterCount($count, array $parameters, $rule) |
|
| 130 | + { |
|
| 131 | + if (count($parameters) < $count) { |
|
| 132 | + throw new InvalidArgumentException("Validation rule $rule requires at least $count parameters."); |
|
| 133 | + } |
|
| 134 | + } |
|
| 135 | 135 | } |
@@ -6,97 +6,97 @@ |
||
| 6 | 6 | |
| 7 | 7 | class Translator |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * @param string $original |
|
| 11 | - * @param string $domain |
|
| 12 | - * @return string |
|
| 13 | - */ |
|
| 14 | - public function translate($original, $domain, array $args) |
|
| 15 | - { |
|
| 16 | - $domains = apply_filters('site-reviews/translator/domains', [Application::ID]); |
|
| 17 | - if (!in_array($domain, $domains)) { |
|
| 18 | - return $original; |
|
| 19 | - } |
|
| 20 | - $args = $this->normalizeTranslationArgs($args); |
|
| 21 | - $strings = $this->getTranslationStrings($args['single'], $args['plural']); |
|
| 22 | - if (empty($strings)) { |
|
| 23 | - return $original; |
|
| 24 | - } |
|
| 25 | - $string = current($strings); |
|
| 26 | - return 'plural' == $string['type'] |
|
| 27 | - ? $this->translatePlural($domain, $string, $args) |
|
| 28 | - : $this->translateSingle($domain, $string, $args); |
|
| 29 | - } |
|
| 9 | + /** |
|
| 10 | + * @param string $original |
|
| 11 | + * @param string $domain |
|
| 12 | + * @return string |
|
| 13 | + */ |
|
| 14 | + public function translate($original, $domain, array $args) |
|
| 15 | + { |
|
| 16 | + $domains = apply_filters('site-reviews/translator/domains', [Application::ID]); |
|
| 17 | + if (!in_array($domain, $domains)) { |
|
| 18 | + return $original; |
|
| 19 | + } |
|
| 20 | + $args = $this->normalizeTranslationArgs($args); |
|
| 21 | + $strings = $this->getTranslationStrings($args['single'], $args['plural']); |
|
| 22 | + if (empty($strings)) { |
|
| 23 | + return $original; |
|
| 24 | + } |
|
| 25 | + $string = current($strings); |
|
| 26 | + return 'plural' == $string['type'] |
|
| 27 | + ? $this->translatePlural($domain, $string, $args) |
|
| 28 | + : $this->translateSingle($domain, $string, $args); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * Used when search/replacing a default text-domain translation |
|
| 33 | - * @return string |
|
| 34 | - */ |
|
| 35 | - public function getTranslation(array $args) |
|
| 36 | - { |
|
| 37 | - $args = $this->normalizeTranslationArgs($args); |
|
| 38 | - return get_translations_for_domain(Application::ID)->translate_plural($args['single'], $args['plural'], $args['number']); |
|
| 39 | - } |
|
| 31 | + /** |
|
| 32 | + * Used when search/replacing a default text-domain translation |
|
| 33 | + * @return string |
|
| 34 | + */ |
|
| 35 | + public function getTranslation(array $args) |
|
| 36 | + { |
|
| 37 | + $args = $this->normalizeTranslationArgs($args); |
|
| 38 | + return get_translations_for_domain(Application::ID)->translate_plural($args['single'], $args['plural'], $args['number']); |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * @param string $single |
|
| 43 | - * @param string $plural |
|
| 44 | - * @return array |
|
| 45 | - */ |
|
| 46 | - protected function getTranslationStrings($single, $plural) |
|
| 47 | - { |
|
| 48 | - return array_filter(glsr(Translation::class)->translations(), function ($string) use ($single, $plural) { |
|
| 49 | - return $string['s1'] == html_entity_decode($single, ENT_COMPAT, 'UTF-8') |
|
| 50 | - && $string['p1'] == html_entity_decode($plural, ENT_COMPAT, 'UTF-8'); |
|
| 51 | - }); |
|
| 52 | - } |
|
| 41 | + /** |
|
| 42 | + * @param string $single |
|
| 43 | + * @param string $plural |
|
| 44 | + * @return array |
|
| 45 | + */ |
|
| 46 | + protected function getTranslationStrings($single, $plural) |
|
| 47 | + { |
|
| 48 | + return array_filter(glsr(Translation::class)->translations(), function ($string) use ($single, $plural) { |
|
| 49 | + return $string['s1'] == html_entity_decode($single, ENT_COMPAT, 'UTF-8') |
|
| 50 | + && $string['p1'] == html_entity_decode($plural, ENT_COMPAT, 'UTF-8'); |
|
| 51 | + }); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * @return array |
|
| 56 | - */ |
|
| 57 | - protected function normalizeTranslationArgs(array $args) |
|
| 58 | - { |
|
| 59 | - $defaults = [ |
|
| 60 | - 'context' => '', |
|
| 61 | - 'number' => 1, |
|
| 62 | - 'plural' => '', |
|
| 63 | - 'single' => '', |
|
| 64 | - ]; |
|
| 65 | - return shortcode_atts($defaults, $args); |
|
| 66 | - } |
|
| 54 | + /** |
|
| 55 | + * @return array |
|
| 56 | + */ |
|
| 57 | + protected function normalizeTranslationArgs(array $args) |
|
| 58 | + { |
|
| 59 | + $defaults = [ |
|
| 60 | + 'context' => '', |
|
| 61 | + 'number' => 1, |
|
| 62 | + 'plural' => '', |
|
| 63 | + 'single' => '', |
|
| 64 | + ]; |
|
| 65 | + return shortcode_atts($defaults, $args); |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - /** |
|
| 69 | - * @param string $domain |
|
| 70 | - * @return string |
|
| 71 | - */ |
|
| 72 | - protected function translatePlural($domain, array $string, array $args) |
|
| 73 | - { |
|
| 74 | - if (!empty($string['s2'])) { |
|
| 75 | - $args['single'] = $string['s2']; |
|
| 76 | - } |
|
| 77 | - if (!empty($string['p2'])) { |
|
| 78 | - $args['plural'] = $string['p2']; |
|
| 79 | - } |
|
| 80 | - return get_translations_for_domain($domain)->translate_plural( |
|
| 81 | - $args['single'], |
|
| 82 | - $args['plural'], |
|
| 83 | - $args['number'], |
|
| 84 | - $args['context'] |
|
| 85 | - ); |
|
| 86 | - } |
|
| 68 | + /** |
|
| 69 | + * @param string $domain |
|
| 70 | + * @return string |
|
| 71 | + */ |
|
| 72 | + protected function translatePlural($domain, array $string, array $args) |
|
| 73 | + { |
|
| 74 | + if (!empty($string['s2'])) { |
|
| 75 | + $args['single'] = $string['s2']; |
|
| 76 | + } |
|
| 77 | + if (!empty($string['p2'])) { |
|
| 78 | + $args['plural'] = $string['p2']; |
|
| 79 | + } |
|
| 80 | + return get_translations_for_domain($domain)->translate_plural( |
|
| 81 | + $args['single'], |
|
| 82 | + $args['plural'], |
|
| 83 | + $args['number'], |
|
| 84 | + $args['context'] |
|
| 85 | + ); |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - /** |
|
| 89 | - * @param string $domain |
|
| 90 | - * @return string |
|
| 91 | - */ |
|
| 92 | - protected function translateSingle($domain, array $string, array $args) |
|
| 93 | - { |
|
| 94 | - if (!empty($string['s2'])) { |
|
| 95 | - $args['single'] = $string['s2']; |
|
| 96 | - } |
|
| 97 | - return get_translations_for_domain($domain)->translate( |
|
| 98 | - $args['single'], |
|
| 99 | - $args['context'] |
|
| 100 | - ); |
|
| 101 | - } |
|
| 88 | + /** |
|
| 89 | + * @param string $domain |
|
| 90 | + * @return string |
|
| 91 | + */ |
|
| 92 | + protected function translateSingle($domain, array $string, array $args) |
|
| 93 | + { |
|
| 94 | + if (!empty($string['s2'])) { |
|
| 95 | + $args['single'] = $string['s2']; |
|
| 96 | + } |
|
| 97 | + return get_translations_for_domain($domain)->translate( |
|
| 98 | + $args['single'], |
|
| 99 | + $args['context'] |
|
| 100 | + ); |
|
| 101 | + } |
|
| 102 | 102 | } |
