pryley / site-reviews

plugin/Controllers/Controller.php

Spacing +17 added lines, -17 removed lines

@@ -13,15 +13,15 @@ 
     /**
      * @return void
      */
-    public function download($filename, $content)
+    public function download( $filename, $content )
     {
-        if (!glsr()->can('edit_others_posts')) {
+        if( !glsr()->can( 'edit_others_posts' ) ) {
             return;
         }
         nocache_headers();
-        header('Content-Type: text/plain');
-        header('Content-Disposition: attachment; filename="'.$filename.'"');
-        echo html_entity_decode($content);
+        header( 'Content-Type: text/plain' );
+        header( 'Content-Disposition: attachment; filename="'.$filename.'"' );
+        echo html_entity_decode( $content );
         exit;
     }
 
@@ -30,18 +30,18 @@ 
      * @return mixed
      * @throws InvalidArgumentException
      */
-    public function execute($command)
+    public function execute( $command )
     {
-        $handlerClass = str_replace('Commands', 'Handlers', get_class($command));
-        if (!class_exists($handlerClass)) {
-            throw new InvalidArgumentException('Handler '.$handlerClass.' not found.');
+        $handlerClass = str_replace( 'Commands', 'Handlers', get_class( $command ) );
+        if( !class_exists( $handlerClass ) ) {
+            throw new InvalidArgumentException( 'Handler '.$handlerClass.' not found.' );
         }
         try {
-            return glsr($handlerClass)->handle($command);
-        } catch (Exception $e) {
-            status_header(400);
-            glsr(Notice::class)->addError(new WP_Error('site_reviews_error', $e->getMessage()));
-            glsr_log()->error($e->getMessage());
+            return glsr( $handlerClass )->handle( $command );
+        } catch( Exception $e ) {
+            status_header( 400 );
+            glsr( Notice::class )->addError( new WP_Error( 'site_reviews_error', $e->getMessage() ) );
+            glsr_log()->error( $e->getMessage() );
         }
     }
 
@@ -50,15 +50,15 @@ 
      */
     protected function getPostId()
     {
-        return intval(filter_input(INPUT_GET, 'post'));
+        return intval( filter_input( INPUT_GET, 'post' ) );
     }
 
     /**
      * @param int $postId
      * @return bool
      */
-    protected function isReviewPostId($postId)
+    protected function isReviewPostId( $postId )
     {
-        return Application::POST_TYPE == get_post_field('post_type', $postId);
+        return Application::POST_TYPE == get_post_field( 'post_type', $postId );
     }
 }

plugin/Controllers/AdminController.php

Spacing +75 added lines, -75 removed lines

@@ -24,9 +24,9 @@ 
      */
     public function enqueueAssets()
     {
-        $command = new EnqueueAdminAssets([
+        $command = new EnqueueAdminAssets( [
             'pointers' => [[
-                'content' => __('You can pin exceptional reviews so that they are always shown first.', 'site-reviews'),
+                'content' => __( 'You can pin exceptional reviews so that they are always shown first.', 'site-reviews' ),
                 'id' => 'glsr-pointer-pinned',
                 'position' => [
                     'edge' => 'right',
@@ -34,24 +34,24 @@ 
                 ],
                 'screen' => Application::POST_TYPE,
                 'target' => '#misc-pub-pinned',
-                'title' => __('Pin Your Reviews', 'site-reviews'),
+                'title' => __( 'Pin Your Reviews', 'site-reviews' ),
             ]],
-        ]);
-        $this->execute($command);
+        ] );
+        $this->execute( $command );
     }
 
     /**
      * @return array
      * @filter plugin_action_links_site-reviews/site-reviews.php
      */
-    public function filterActionLinks(array $links)
+    public function filterActionLinks( array $links )
     {
-        $links['documentation'] = glsr(Builder::class)->a(__('Help', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=documentation'),
-        ]);
-        $links['settings'] = glsr(Builder::class)->a(__('Settings', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=settings'),
-        ]);
+        $links['documentation'] = glsr( Builder::class )->a( __( 'Help', 'site-reviews' ), [
+            'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=documentation' ),
+        ] );
+        $links['settings'] = glsr( Builder::class )->a( __( 'Settings', 'site-reviews' ), [
+            'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=settings' ),
+        ] );
         return $links;
     }
 
@@ -61,9 +61,9 @@ 
      * @return array
      * @filter map_meta_cap
      */
-    public function filterCreateCapability($capabilities, $capability)
+    public function filterCreateCapability( $capabilities, $capability )
     {
-        if ($capability == 'create_'.Application::POST_TYPE) {
+        if( $capability == 'create_'.Application::POST_TYPE ) {
             $capabilities[] = 'do_not_allow';
         }
         return $capabilities;
@@ -74,23 +74,23 @@ 
      * @return array
      * @filter dashboard_glance_items
      */
-    public function filterDashboardGlanceItems($items)
+    public function filterDashboardGlanceItems( $items )
     {
-        $postCount = wp_count_posts(Application::POST_TYPE);
-        if (empty($postCount->publish)) {
+        $postCount = wp_count_posts( Application::POST_TYPE );
+        if( empty($postCount->publish) ) {
             return $items;
         }
-        $text = _n('%s Review', '%s Reviews', $postCount->publish, 'site-reviews');
-        $text = sprintf($text, number_format_i18n($postCount->publish));
-        $items = Arr::consolidateArray($items);
-        $items[] = glsr()->can('edit_posts')
-            ? glsr(Builder::class)->a($text, [
+        $text = _n( '%s Review', '%s Reviews', $postCount->publish, 'site-reviews' );
+        $text = sprintf( $text, number_format_i18n( $postCount->publish ) );
+        $items = Arr::consolidateArray( $items );
+        $items[] = glsr()->can( 'edit_posts' )
+            ? glsr( Builder::class )->a( $text, [
                 'class' => 'glsr-review-count',
                 'href' => 'edit.php?post_type='.Application::POST_TYPE,
-            ])
-            : glsr(Builder::class)->span($text, [
+            ] )
+            : glsr( Builder::class )->span( $text, [
                 'class' => 'glsr-review-count',
-            ]);
+            ] );
         return $items;
     }
 
@@ -99,11 +99,11 @@ 
      * @return array
      * @filter mce_external_plugins
      */
-    public function filterTinymcePlugins($plugins)
+    public function filterTinymcePlugins( $plugins )
     {
-        if (glsr()->can('edit_posts')) {
-            $plugins = Arr::consolidateArray($plugins);
-            $plugins['glsr_shortcode'] = glsr()->url('assets/scripts/mce-plugin.js');
+        if( glsr()->can( 'edit_posts' ) ) {
+            $plugins = Arr::consolidateArray( $plugins );
+            $plugins['glsr_shortcode'] = glsr()->url( 'assets/scripts/mce-plugin.js' );
         }
         return $plugins;
     }
@@ -114,12 +114,12 @@ 
      */
     public function registerTinymcePopups()
     {
-        $command = new RegisterTinymcePopups([
-            'site_reviews' => esc_html__('Recent Reviews', 'site-reviews'),
-            'site_reviews_form' => esc_html__('Submit a Review', 'site-reviews'),
-            'site_reviews_summary' => esc_html__('Summary of Reviews', 'site-reviews'),
-        ]);
-        $this->execute($command);
+        $command = new RegisterTinymcePopups( [
+            'site_reviews' => esc_html__( 'Recent Reviews', 'site-reviews' ),
+            'site_reviews_form' => esc_html__( 'Submit a Review', 'site-reviews' ),
+            'site_reviews_summary' => esc_html__( 'Summary of Reviews', 'site-reviews' ),
+        ] );
+        $this->execute( $command );
     }
 
     /**
@@ -127,22 +127,22 @@ 
      * @return void|null
      * @action media_buttons
      */
-    public function renderTinymceButton($editorId)
+    public function renderTinymceButton( $editorId )
     {
-        $allowedEditors = apply_filters('site-reviews/tinymce/editor-ids', ['content'], $editorId);
-        if ('post' != glsr_current_screen()->base || !in_array($editorId, $allowedEditors)) {
+        $allowedEditors = apply_filters( 'site-reviews/tinymce/editor-ids', ['content'], $editorId );
+        if( 'post' != glsr_current_screen()->base || !in_array( $editorId, $allowedEditors ) ) {
             return;
         }
         $shortcodes = [];
-        foreach (glsr()->mceShortcodes as $shortcode => $values) {
+        foreach( glsr()->mceShortcodes as $shortcode => $values ) {
             $shortcodes[$shortcode] = $values;
         }
-        if (empty($shortcodes)) {
+        if( empty($shortcodes) ) {
             return;
         }
-        glsr()->render('partials/editor/tinymce', [
+        glsr()->render( 'partials/editor/tinymce', [
             'shortcodes' => $shortcodes,
-        ]);
+        ] );
     }
 
     /**
@@ -150,8 +150,8 @@ 
      */
     public function routerClearConsole()
     {
-        glsr(Console::class)->clear();
-        glsr(Notice::class)->addSuccess(__('Console cleared.', 'site-reviews'));
+        glsr( Console::class )->clear();
+        glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ) );
     }
 
     /**
@@ -159,8 +159,8 @@ 
      */
     public function routerCountReviews()
     {
-        glsr(CountsManager::class)->updateAll();
-        glsr(Notice::class)->clear()->addSuccess(__('Recalculated rating counts.', 'site-reviews'));
+        glsr( CountsManager::class )->updateAll();
+        glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ) );
     }
 
     /**
@@ -168,7 +168,7 @@ 
      */
     public function routerDownloadConsole()
     {
-        $this->download(Application::ID.'-console.txt', glsr(Console::class)->get());
+        $this->download( Application::ID.'-console.txt', glsr( Console::class )->get() );
     }
 
     /**
@@ -176,7 +176,7 @@ 
      */
     public function routerDownloadSystemInfo()
     {
-        $this->download(Application::ID.'-system-info.txt', glsr(System::class)->get());
+        $this->download( Application::ID.'-system-info.txt', glsr( System::class )->get() );
     }
 
     /**
@@ -184,7 +184,7 @@ 
      */
     public function routerExportSettings()
     {
-        $this->download(Application::ID.'-settings.json', glsr(OptionManager::class)->json());
+        $this->download( Application::ID.'-settings.json', glsr( OptionManager::class )->json() );
     }
 
     /**
@@ -192,7 +192,7 @@ 
      */
     public function routerFetchConsole()
     {
-        glsr(Notice::class)->addSuccess(__('Console reloaded.', 'site-reviews'));
+        glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' ) );
     }
 
     /**
@@ -201,18 +201,18 @@ 
     public function routerImportSettings()
     {
         $file = $_FILES['import-file'];
-        if (UPLOAD_ERR_OK !== $file['error']) {
-            return glsr(Notice::class)->addError($this->getUploadError($file['error']));
+        if( UPLOAD_ERR_OK !== $file['error'] ) {
+            return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ) );
         }
-        if ('application/json' !== $file['type'] || !Str::endsWith('.json', $file['name'])) {
-            return glsr(Notice::class)->addError(__('Please use a valid Site Reviews settings file.', 'site-reviews'));
+        if( 'application/json' !== $file['type'] || !Str::endsWith( '.json', $file['name'] ) ) {
+            return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ) );
         }
-        $settings = json_decode(file_get_contents($file['tmp_name']), true);
-        if (empty($settings)) {
-            return glsr(Notice::class)->addWarning(__('There were no settings found to import.', 'site-reviews'));
+        $settings = json_decode( file_get_contents( $file['tmp_name'] ), true );
+        if( empty($settings) ) {
+            return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ) );
         }
-        glsr(OptionManager::class)->set(glsr(OptionManager::class)->normalize($settings));
-        glsr(Notice::class)->addSuccess(__('Settings imported.', 'site-reviews'));
+        glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ) );
+        glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ) );
     }
 
     /**
@@ -220,8 +220,8 @@ 
      */
     public function routerMigrateReviews()
     {
-        glsr(Migrate::class)->runAll();
-        glsr(Notice::class)->clear()->addSuccess(__('The plugin has been migrated to the latest version.', 'site-reviews'));
+        glsr( Migrate::class )->runAll();
+        glsr( Notice::class )->clear()->addSuccess( __( 'The plugin has been migrated to the latest version.', 'site-reviews' ) );
     }
 
     /**
@@ -229,8 +229,8 @@ 
      */
     public function routerResetPermissions()
     {
-        glsr(Role::class)->resetAll();
-        glsr(Notice::class)->clear()->addSuccess(__('The permissions have been reset.', 'site-reviews'));
+        glsr( Role::class )->resetAll();
+        glsr( Notice::class )->clear()->addSuccess( __( 'The permissions have been reset.', 'site-reviews' ) );
     }
 
     /**
@@ -239,9 +239,9 @@ 
      */
     public function runMigrations()
     {
-        if (glsr(Migrate::class)->isMigrationNeeded()) {
-            glsr(Migrate::class)->run();
-            glsr(CountsManager::class)->updateAll();
+        if( glsr( Migrate::class )->isMigrationNeeded() ) {
+            glsr( Migrate::class )->run();
+            glsr( CountsManager::class )->updateAll();
         }
     }
 
@@ -249,17 +249,17 @@ 
      * @param int $errorCode
      * @return string
      */
-    protected function getUploadError($errorCode)
+    protected function getUploadError( $errorCode )
     {
         $errors = [
-            UPLOAD_ERR_INI_SIZE => __('The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews'),
-            UPLOAD_ERR_FORM_SIZE => __('The uploaded file is too big.', 'site-reviews'),
-            UPLOAD_ERR_PARTIAL => __('The uploaded file was only partially uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_FILE => __('No file was uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_TMP_DIR => __('Missing a temporary folder.', 'site-reviews'),
-            UPLOAD_ERR_CANT_WRITE => __('Failed to write file to disk.', 'site-reviews'),
-            UPLOAD_ERR_EXTENSION => __('A PHP extension stopped the file upload.', 'site-reviews'),
+            UPLOAD_ERR_INI_SIZE => __( 'The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews' ),
+            UPLOAD_ERR_FORM_SIZE => __( 'The uploaded file is too big.', 'site-reviews' ),
+            UPLOAD_ERR_PARTIAL => __( 'The uploaded file was only partially uploaded.', 'site-reviews' ),
+            UPLOAD_ERR_NO_FILE => __( 'No file was uploaded.', 'site-reviews' ),
+            UPLOAD_ERR_NO_TMP_DIR => __( 'Missing a temporary folder.', 'site-reviews' ),
+            UPLOAD_ERR_CANT_WRITE => __( 'Failed to write file to disk.', 'site-reviews' ),
+            UPLOAD_ERR_EXTENSION => __( 'A PHP extension stopped the file upload.', 'site-reviews' ),
         ];
-        return Arr::get($errors, $errorCode, __('Unknown upload error.', 'site-reviews'));
+        return Arr::get( $errors, $errorCode, __( 'Unknown upload error.', 'site-reviews' ) );
     }
 }

plugin/Controllers/AjaxController.php

Spacing +72 added lines, -72 removed lines

@@ -18,9 +18,9 @@ 
     /**
      * @return void
      */
-    public function routerChangeStatus(array $request)
+    public function routerChangeStatus( array $request )
     {
-        wp_send_json_success($this->execute(new ChangeStatus($request)));
+        wp_send_json_success( $this->execute( new ChangeStatus( $request ) ) );
     }
 
     /**
@@ -28,11 +28,11 @@ 
      */
     public function routerClearConsole()
     {
-        glsr(AdminController::class)->routerClearConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerClearConsole();
+        wp_send_json_success( [
+            'console' => glsr( Console::class )->get(),
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
@@ -40,10 +40,10 @@ 
      */
     public function routerCountReviews()
     {
-        glsr(AdminController::class)->routerCountReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerCountReviews();
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
@@ -51,32 +51,32 @@ 
      */
     public function routerMigrateReviews()
     {
-        glsr(AdminController::class)->routerMigrateReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerMigrateReviews();
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerDismissNotice(array $request)
+    public function routerDismissNotice( array $request )
     {
-        glsr(NoticeController::class)->routerDismissNotice($request);
+        glsr( NoticeController::class )->routerDismissNotice( $request );
         wp_send_json_success();
     }
 
     /**
      * @return void
      */
-    public function routerMceShortcode(array $request)
+    public function routerMceShortcode( array $request )
     {
         $shortcode = $request['shortcode'];
         $response = false;
-        if (array_key_exists($shortcode, glsr()->mceShortcodes)) {
+        if( array_key_exists( $shortcode, glsr()->mceShortcodes ) ) {
             $data = glsr()->mceShortcodes[$shortcode];
-            if (!empty($data['errors'])) {
-                $data['btn_okay'] = [esc_html__('Okay', 'site-reviews')];
+            if( !empty($data['errors']) ) {
+                $data['btn_okay'] = [esc_html__( 'Okay', 'site-reviews' )];
             }
             $response = [
                 'body' => $data['fields'],
@@ -86,7 +86,7 @@ 
                 'title' => $data['title'],
             ];
         }
-        wp_send_json_success($response);
+        wp_send_json_success( $response );
     }
 
     /**
@@ -94,11 +94,11 @@ 
      */
     public function routerFetchConsole()
     {
-        glsr(AdminController::class)->routerFetchConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerFetchConsole();
+        wp_send_json_success( [
+            'console' => glsr( Console::class )->get(),
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
@@ -106,101 +106,101 @@ 
      */
     public function routerResetPermissions()
     {
-        glsr(Role::class)->resetAll();
-        glsr(Notice::class)->clear()->addSuccess(__('The permissions have been reset, please reload the page for them to take effect.', 'site-reviews'));
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( Role::class )->resetAll();
+        glsr( Notice::class )->clear()->addSuccess( __( 'The permissions have been reset, please reload the page for them to take effect.', 'site-reviews' ) );
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSearchPosts(array $request)
+    public function routerSearchPosts( array $request )
     {
-        $results = glsr(Database::class)->searchPosts($request['search']);
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+        $results = glsr( Database::class )->searchPosts( $request['search'] );
+        wp_send_json_success( [
+            'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
             'items' => $results,
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSearchTranslations(array $request)
+    public function routerSearchTranslations( array $request )
     {
-        if (empty($request['exclude'])) {
+        if( empty($request['exclude']) ) {
             $request['exclude'] = [];
         }
-        $results = glsr(Translation::class)
-            ->search($request['search'])
+        $results = glsr( Translation::class )
+            ->search( $request['search'] )
             ->exclude()
-            ->exclude($request['exclude'])
+            ->exclude( $request['exclude'] )
             ->renderResults();
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+        wp_send_json_success( [
+            'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
             'items' => $results,
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSubmitReview(array $request)
+    public function routerSubmitReview( array $request )
     {
-        $command = glsr(PublicController::class)->routerSubmitReview($request);
-        $redirect = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
-        $redirect = apply_filters('site-reviews/review/redirect', $redirect, $command);
+        $command = glsr( PublicController::class )->routerSubmitReview( $request );
+        $redirect = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true ) ) );
+        $redirect = apply_filters( 'site-reviews/review/redirect', $redirect, $command );
         $data = [
-            'errors' => glsr()->sessionGet($command->form_id.'errors', false),
-            'message' => glsr()->sessionGet($command->form_id.'message', ''),
-            'recaptcha' => glsr()->sessionGet($command->form_id.'recaptcha', false),
+            'errors' => glsr()->sessionGet( $command->form_id.'errors', false ),
+            'message' => glsr()->sessionGet( $command->form_id.'message', '' ),
+            'recaptcha' => glsr()->sessionGet( $command->form_id.'recaptcha', false ),
             'redirect' => $redirect,
         ];
-        if (false === $data['errors']) {
+        if( false === $data['errors'] ) {
             glsr()->sessionClear();
-            wp_send_json_success($data);
+            wp_send_json_success( $data );
         }
-        wp_send_json_error($data);
+        wp_send_json_error( $data );
     }
 
     /**
      * @return void
      */
-    public function routerFetchPagedReviews(array $request)
+    public function routerFetchPagedReviews( array $request )
     {
-        $homePath = untrailingslashit(parse_url(home_url(), PHP_URL_PATH));
-        $urlPath = untrailingslashit(parse_url(Arr::get($request, 'url'), PHP_URL_PATH));
+        $homePath = untrailingslashit( parse_url( home_url(), PHP_URL_PATH ) );
+        $urlPath = untrailingslashit( parse_url( Arr::get( $request, 'url' ), PHP_URL_PATH ) );
         $urlQuery = [];
-        parse_str(parse_url(Arr::get($request, 'url'), PHP_URL_QUERY), $urlQuery);
+        parse_str( parse_url( Arr::get( $request, 'url' ), PHP_URL_QUERY ), $urlQuery );
         $pagedUrl = $homePath === $urlPath
             ? home_url()
-            : home_url($urlPath);
+            : home_url( $urlPath );
         $args = [
-            'paged' => (int) Arr::get($urlQuery, glsr()->constant('PAGED_QUERY_VAR'), 1),
-            'pagedUrl' => trailingslashit($pagedUrl),
+            'paged' => (int)Arr::get( $urlQuery, glsr()->constant( 'PAGED_QUERY_VAR' ), 1 ),
+            'pagedUrl' => trailingslashit( $pagedUrl ),
             'pagination' => 'ajax',
             'schema' => false,
         ];
-        $atts = (array) json_decode(Arr::get($request, 'atts'));
-        $atts = glsr(SiteReviewsShortcode::class)->normalizeAtts($atts);
-        $html = glsr(SiteReviewsPartial::class)->build(wp_parse_args($args, $atts));
-        return wp_send_json_success([
+        $atts = (array)json_decode( Arr::get( $request, 'atts' ) );
+        $atts = glsr( SiteReviewsShortcode::class )->normalizeAtts( $atts );
+        $html = glsr( SiteReviewsPartial::class )->build( wp_parse_args( $args, $atts ) );
+        return wp_send_json_success( [
             'pagination' => $html->getPagination(),
             'reviews' => $html->getReviews(),
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerTogglePinned(array $request)
+    public function routerTogglePinned( array $request )
     {
-        $isPinned = $this->execute(new TogglePinned($request));
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
+        $isPinned = $this->execute( new TogglePinned( $request ) );
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
             'pinned' => $isPinned,
-        ]);
+        ] );
     }
 }

plugin/Controllers/MainController.php

Spacing +24 added lines, -24 removed lines

@@ -16,35 +16,35 @@ 
      */
     public function registerPostType()
     {
-        if (!glsr()->hasPermission()) {
+        if( !glsr()->hasPermission() ) {
             return;
         }
-        $command = new RegisterPostType([
+        $command = new RegisterPostType( [
             'capabilities' => ['create_posts' => 'create_'.Application::POST_TYPE],
             'capability_type' => Application::POST_TYPE,
             'columns' => [
                 'title' => '',
                 'category' => '',
-                'assigned_to' => __('Assigned To', 'site-reviews'),
-                'reviewer' => __('Author', 'site-reviews'),
-                'email' => __('Email', 'site-reviews'),
-                'ip_address' => __('IP Address', 'site-reviews'),
-                'response' => __('Response', 'site-reviews'),
-                'review_type' => __('Type', 'site-reviews'),
-                'rating' => __('Rating', 'site-reviews'),
-                'pinned' => __('Pinned', 'site-reviews'),
+                'assigned_to' => __( 'Assigned To', 'site-reviews' ),
+                'reviewer' => __( 'Author', 'site-reviews' ),
+                'email' => __( 'Email', 'site-reviews' ),
+                'ip_address' => __( 'IP Address', 'site-reviews' ),
+                'response' => __( 'Response', 'site-reviews' ),
+                'review_type' => __( 'Type', 'site-reviews' ),
+                'rating' => __( 'Rating', 'site-reviews' ),
+                'pinned' => __( 'Pinned', 'site-reviews' ),
                 'date' => '',
             ],
             'menu_icon' => 'dashicons-star-half',
             'menu_name' => glsr()->name,
             'map_meta_cap' => true,
-            'plural' => __('Reviews', 'site-reviews'),
+            'plural' => __( 'Reviews', 'site-reviews' ),
             'post_type' => Application::POST_TYPE,
             'rest_controller_class' => RestReviewController::class,
             'show_in_rest' => true,
-            'single' => __('Review', 'site-reviews'),
-        ]);
-        $this->execute($command);
+            'single' => __( 'Review', 'site-reviews' ),
+        ] );
+        $this->execute( $command );
     }
 
     /**
@@ -53,12 +53,12 @@ 
      */
     public function registerShortcodes()
     {
-        $command = new RegisterShortcodes([
+        $command = new RegisterShortcodes( [
             'site_reviews',
             'site_reviews_form',
             'site_reviews_summary',
-        ]);
-        $this->execute($command);
+        ] );
+        $this->execute( $command );
     }
 
     /**
@@ -67,16 +67,16 @@ 
      */
     public function registerTaxonomy()
     {
-        $command = new RegisterTaxonomy([
+        $command = new RegisterTaxonomy( [
             'hierarchical' => true,
-            'meta_box_cb' => [glsr(EditorController::class), 'renderTaxonomyMetabox'],
+            'meta_box_cb' => [glsr( EditorController::class ), 'renderTaxonomyMetabox'],
             'public' => false,
             'rest_controller_class' => RestCategoryController::class,
             'show_admin_column' => true,
             'show_in_rest' => true,
             'show_ui' => true,
-        ]);
-        $this->execute($command);
+        ] );
+        $this->execute( $command );
     }
 
     /**
@@ -85,11 +85,11 @@ 
      */
     public function registerWidgets()
     {
-        $command = new RegisterWidgets([
+        $command = new RegisterWidgets( [
             'site-reviews',
             'site-reviews-form',
             'site-reviews-summary',
-        ]);
-        $this->execute($command);
+        ] );
+        $this->execute( $command );
     }
 }

plugin/Modules/Migrations/Migrate_4_4_0.php

Spacing +1 added lines, -1 removed lines

@@ -11,6 +11,6 @@
      */
     public function run()
     {
-        glsr(Role::class)->resetAll();
+        glsr( Role::class )->resetAll();
     }
 }

site-reviews.php

Spacing +7 added lines, -7 removed lines

@@ -17,20 +17,20 @@
  * Text Domain:       site-reviews
  * Domain Path:       languages
  */
-defined('WPINC') || die;
+defined( 'WPINC' ) || die;
 
-if (!class_exists('GL_Plugin_Check_v4')) {
+if( !class_exists( 'GL_Plugin_Check_v4' ) ) {
     require_once __DIR__.'/activate.php';
 }
-if ((new GL_Plugin_Check_v4(__FILE__))->canProceed()) {
+if( (new GL_Plugin_Check_v4( __FILE__ ))->canProceed() ) {
     require_once __DIR__.'/autoload.php';
     require_once __DIR__.'/compatibility.php';
     require_once __DIR__.'/deprecated.php';
     require_once __DIR__.'/helpers.php';
     $app = new GeminiLabs\SiteReviews\Application();
-    $app->make('Provider')->register($app);
-    register_activation_hook(__FILE__, array($app, 'activate'));
-    register_deactivation_hook(__FILE__, array($app, 'deactivate'));
-    register_shutdown_function(array($app, 'catchFatalError'));
+    $app->make( 'Provider' )->register( $app );
+    register_activation_hook( __FILE__, array( $app, 'activate' ) );
+    register_deactivation_hook( __FILE__, array( $app, 'deactivate' ) );
+    register_shutdown_function( array( $app, 'catchFatalError' ) );
     $app->init();
 }

views/pages/addons/index.php

Spacing +6 added lines, -6 removed lines

@@ -1,21 +1,21 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <div class="wrap">
-    <h1 class="wp-heading-inline"><?= esc_html(get_admin_page_title()); ?></h1>
+    <h1 class="wp-heading-inline"><?= esc_html( get_admin_page_title() ); ?></h1>
     <?= $notices; ?>
-    <p><?= __('Add-ons extend the functionality of Site Reviews.', 'site-reviews'); ?></p>
+    <p><?= __( 'Add-ons extend the functionality of Site Reviews.', 'site-reviews' ); ?></p>
     <div class="glsr-addons wp-clearfix">
     <?php
-        $template->render('partials/addons/addon', [
+        $template->render( 'partials/addons/addon', [
             'beta' => true,
             'context' => [
-                'description' => __('This add-on allows your site visitors to submit images with their reviews. Apply now to test the unreleased beta version.', 'site-reviews'),
+                'description' => __( 'This add-on allows your site visitors to submit images with their reviews. Apply now to test the unreleased beta version.', 'site-reviews' ),
                 'link' => 'https://niftyplugins.com/plugins/images/',
                 'slug' => 'images',
                 'title' => 'Images',
             ],
             'plugin' => 'site-reviews-images/site-reviews-images.php',
-        ]);
+        ] );
     ?>
     </div>
 </div>

views/partials/addons/addon.php

Spacing +9 added lines, -9 removed lines

@@ -1,4 +1,4 @@ 
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <div class="glsr-addon-wrap">
     <div class="glsr-addon">
@@ -10,23 +10,23 @@ 
             <p>{{ description }}</p>
         </div>
         <div class="glsr-addon-footer">
-        <?php if (!is_wp_error(validate_plugin($plugin))) : ?>
-            <?php if (is_plugin_active($plugin)) : ?>
+        <?php if( !is_wp_error( validate_plugin( $plugin ) ) ) : ?>
+            <?php if( is_plugin_active( $plugin ) ) : ?>
             <span class="glsr-addon-link button button-secondary" disabled>
-                <?= __('Installed', 'site-reviews'); ?>
+                <?= __( 'Installed', 'site-reviews' ); ?>
             </span>
             <?php else: ?>
-            <a href="<?= wp_nonce_url(self_admin_url('plugins.php?action=activate&plugin='.$plugin), 'activate-plugin_'.$plugin); ?>" class="glsr-addon-link button button-secondary">
-                <?= __('Activate', 'site-reviews'); ?>
+            <a href="<?= wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin='.$plugin ), 'activate-plugin_'.$plugin ); ?>" class="glsr-addon-link button button-secondary">
+                <?= __( 'Activate', 'site-reviews' ); ?>
             </a>
             <?php endif; ?>
-        <?php elseif (!empty($beta)): ?>
+        <?php elseif( !empty($beta) ): ?>
             <a href="mailto:site-reviews@geminilabs.io?subject=I%20would%20like%20to%20become%20a%20beta%20tester%20({{ slug }})" class="glsr-addon-link glsr-external button button-secondary">
-                <?= __('Try the beta', 'site-reviews'); ?>
+                <?= __( 'Try the beta', 'site-reviews' ); ?>
             </a>
         <?php else: ?>
             <a href="{{ link }}" class="glsr-addon-link glsr-external button button-secondary">
-                <?= __('More Info', 'site-reviews'); ?>
+                <?= __( 'More Info', 'site-reviews' ); ?>
             </a>
         <?php endif; ?>
         </div>

plugin/Actions.php

Spacing +79 added lines, -79 removed lines

@@ -40,24 +40,24 @@ 
     protected $trustalyze;
     protected $welcome;
 
-    public function __construct(Application $app ) {
+    public function __construct( Application $app ) {
         $this->app = $app;
-        $this->admin = $app->make(AdminController::class);
-        $this->blocks = $app->make(BlocksController::class);
-        $this->console = $app->make(Console::class);
-        $this->editor = $app->make(EditorController::class);
-        $this->listtable = $app->make(ListTableController::class);
-        $this->main = $app->make(MainController::class);
-        $this->menu = $app->make(MenuController::class);
-        $this->notices = $app->make(NoticeController::class);
-        $this->public = $app->make(PublicController::class);
-        $this->review = $app->make(ReviewController::class);
-        $this->router = $app->make(Router::class);
-        $this->settings = $app->make(SettingsController::class);
-        $this->taxonomy = $app->make(TaxonomyController::class);
-        $this->translator = $app->make(TranslationController::class);
-        $this->trustalyze = $app->make(TrustalyzeController::class);
-        $this->welcome = $app->make(WelcomeController::class);
+        $this->admin = $app->make( AdminController::class );
+        $this->blocks = $app->make( BlocksController::class );
+        $this->console = $app->make( Console::class );
+        $this->editor = $app->make( EditorController::class );
+        $this->listtable = $app->make( ListTableController::class );
+        $this->main = $app->make( MainController::class );
+        $this->menu = $app->make( MenuController::class );
+        $this->notices = $app->make( NoticeController::class );
+        $this->public = $app->make( PublicController::class );
+        $this->review = $app->make( ReviewController::class );
+        $this->router = $app->make( Router::class );
+        $this->settings = $app->make( SettingsController::class );
+        $this->taxonomy = $app->make( TaxonomyController::class );
+        $this->translator = $app->make( TranslationController::class );
+        $this->trustalyze = $app->make( TrustalyzeController::class );
+        $this->welcome = $app->make( WelcomeController::class );
     }
 
     /**
@@ -65,67 +65,67 @@ 
      */
     public function run()
     {
-        add_action('admin_enqueue_scripts',                                 [$this->admin, 'enqueueAssets']);
-        add_action('admin_init',                                            [$this->admin, 'registerTinymcePopups']);
-        add_action('media_buttons',                                         [$this->admin, 'renderTinymceButton'], 11);
-        add_action('admin_init',                                            [$this->admin, 'runMigrations']);
-        add_action('plugins_loaded',                                        [$this->app, 'getDefaults'], 11);
-        add_action('plugins_loaded',                                        [$this->app, 'registerAddons']);
-        add_action('plugins_loaded',                                        [$this->app, 'registerLanguages']);
-        add_action('plugins_loaded',                                        [$this->app, 'registerReviewTypes']);
-        add_action('admin_init',                                            [$this->app, 'setDefaults']);
-        add_action('init',                                                  [$this->blocks, 'registerAssets'], 9);
-        add_action('init',                                                  [$this->blocks, 'registerBlocks']);
-        add_action('admin_footer',                                          [$this->console, 'logOnce']);
-        add_action('wp_footer',                                             [$this->console, 'logOnce']);
-        add_action('add_meta_boxes_'.Application::POST_TYPE,                [$this->editor, 'registerMetaBoxes']);
-        add_action('admin_print_scripts',                                   [$this->editor, 'removeAutosave'], 999);
-        add_action('admin_menu',                                            [$this->editor, 'removeMetaBoxes']);
-        add_action('current_screen',                                        [$this->editor, 'removePostTypeSupport']);
-        add_action('post_submitbox_misc_actions',                           [$this->editor, 'renderPinnedInPublishMetaBox']);
-        add_action('admin_head',                                            [$this->editor, 'renderReviewFields']);
-        add_action('admin_action_revert',                                   [$this->editor, 'revertReview']);
-        add_action('save_post_'.Application::POST_TYPE,                     [$this->editor, 'saveMetaboxes'], 10, 3);
-        add_action('admin_action_approve',                                  [$this->listtable, 'approve']);
-        add_action('bulk_edit_custom_box',                                  [$this->listtable, 'renderBulkEditFields'], 10, 2);
-        add_action('restrict_manage_posts',                                 [$this->listtable, 'renderColumnFilters']);
-        add_action('manage_'.Application::POST_TYPE.'_posts_custom_column', [$this->listtable, 'renderColumnValues'], 10, 2);
-        add_action('save_post_'.Application::POST_TYPE,                     [$this->listtable, 'saveBulkEditFields']);
-        add_action('pre_get_posts',                                         [$this->listtable, 'setQueryForColumn']);
-        add_action('admin_action_unapprove',                                [$this->listtable, 'unapprove']);
-        add_action('init',                                                  [$this->main, 'registerPostType'], 8);
-        add_action('init',                                                  [$this->main, 'registerShortcodes']);
-        add_action('init',                                                  [$this->main, 'registerTaxonomy']);
-        add_action('widgets_init',                                          [$this->main, 'registerWidgets']);
-        add_action('admin_menu',                                            [$this->menu, 'registerMenuCount']);
-        add_action('admin_menu',                                            [$this->menu, 'registerSubMenus']);
-        add_action('admin_init',                                            [$this->menu, 'setCustomPermissions'], 999);
-        add_action('admin_notices',                                         [$this->notices, 'filterAdminNotices']);
-        add_action('wp_enqueue_scripts',                                    [$this->public, 'enqueueAssets'], 999);
-        add_filter('site-reviews/builder',                                  [$this->public, 'modifyBuilder']);
-        add_action('wp_footer',                                             [$this->public, 'renderSchema']);
-        add_action('set_object_terms',                                      [$this->review, 'onAfterChangeCategory'], 10, 6);
-        add_action('transition_post_status',                                [$this->review, 'onAfterChangeStatus'], 10, 3);
-        add_action('site-reviews/review/created',                           [$this->review, 'onAfterCreate']);
-        add_action('before_delete_post',                                    [$this->review, 'onBeforeDelete']);
-        add_action('update_postmeta',                                       [$this->review, 'onBeforeUpdate'], 10, 4);
-        add_action('admin_init',                                            [$this->router, 'routeAdminPostRequest']);
-        add_action('wp_ajax_'.Application::PREFIX.'action',                 [$this->router, 'routeAjaxRequest']);
-        add_action('wp_ajax_nopriv_'.Application::PREFIX.'action',          [$this->router, 'routeAjaxRequest']);
-        add_action('init',                                                  [$this->router, 'routePublicPostRequest']);
-        add_action('admin_init',                                            [$this->settings, 'registerSettings']);
-        add_action(Application::TAXONOMY.'_term_edit_form_top',             [$this->taxonomy, 'disableParents']);
-        add_action(Application::TAXONOMY.'_term_new_form_tag',              [$this->taxonomy, 'disableParents']);
-        add_action(Application::TAXONOMY.'_add_form_fields',                [$this->taxonomy, 'enableParents']);
-        add_action(Application::TAXONOMY.'_edit_form',                      [$this->taxonomy, 'enableParents']);
-        add_action('restrict_manage_posts',                                 [$this->taxonomy, 'renderTaxonomyFilter'], 9);
-        add_action('set_object_terms',                                      [$this->taxonomy, 'restrictTermSelection'], 9, 6);
-        add_action('admin_enqueue_scripts',                                 [$this->translator, 'translatePostStatusLabels']);
-        add_action('site-reviews/review/created',                           [$this->trustalyze, 'onCreated']);
-        add_action('site-reviews/review/reverted',                          [$this->trustalyze, 'onReverted']);
-        add_action('site-reviews/review/saved',                             [$this->trustalyze, 'onSaved']);
-        add_action('updated_postmeta',                                      [$this->trustalyze, 'onUpdatedMeta'], 10, 3);
-        add_action('activated_plugin',                                      [$this->welcome, 'redirectOnActivation'], 10, 2);
-        add_action('admin_menu',                                            [$this->welcome, 'registerPage']);
+        add_action( 'admin_enqueue_scripts', [$this->admin, 'enqueueAssets'] );
+        add_action( 'admin_init', [$this->admin, 'registerTinymcePopups'] );
+        add_action( 'media_buttons', [$this->admin, 'renderTinymceButton'], 11 );
+        add_action( 'admin_init', [$this->admin, 'runMigrations'] );
+        add_action( 'plugins_loaded', [$this->app, 'getDefaults'], 11 );
+        add_action( 'plugins_loaded', [$this->app, 'registerAddons'] );
+        add_action( 'plugins_loaded', [$this->app, 'registerLanguages'] );
+        add_action( 'plugins_loaded', [$this->app, 'registerReviewTypes'] );
+        add_action( 'admin_init', [$this->app, 'setDefaults'] );
+        add_action( 'init', [$this->blocks, 'registerAssets'], 9 );
+        add_action( 'init', [$this->blocks, 'registerBlocks'] );
+        add_action( 'admin_footer', [$this->console, 'logOnce'] );
+        add_action( 'wp_footer', [$this->console, 'logOnce'] );
+        add_action( 'add_meta_boxes_'.Application::POST_TYPE, [$this->editor, 'registerMetaBoxes'] );
+        add_action( 'admin_print_scripts', [$this->editor, 'removeAutosave'], 999 );
+        add_action( 'admin_menu', [$this->editor, 'removeMetaBoxes'] );
+        add_action( 'current_screen', [$this->editor, 'removePostTypeSupport'] );
+        add_action( 'post_submitbox_misc_actions', [$this->editor, 'renderPinnedInPublishMetaBox'] );
+        add_action( 'admin_head', [$this->editor, 'renderReviewFields'] );
+        add_action( 'admin_action_revert', [$this->editor, 'revertReview'] );
+        add_action( 'save_post_'.Application::POST_TYPE, [$this->editor, 'saveMetaboxes'], 10, 3 );
+        add_action( 'admin_action_approve', [$this->listtable, 'approve'] );
+        add_action( 'bulk_edit_custom_box', [$this->listtable, 'renderBulkEditFields'], 10, 2 );
+        add_action( 'restrict_manage_posts', [$this->listtable, 'renderColumnFilters'] );
+        add_action( 'manage_'.Application::POST_TYPE.'_posts_custom_column', [$this->listtable, 'renderColumnValues'], 10, 2 );
+        add_action( 'save_post_'.Application::POST_TYPE, [$this->listtable, 'saveBulkEditFields'] );
+        add_action( 'pre_get_posts', [$this->listtable, 'setQueryForColumn'] );
+        add_action( 'admin_action_unapprove', [$this->listtable, 'unapprove'] );
+        add_action( 'init', [$this->main, 'registerPostType'], 8 );
+        add_action( 'init', [$this->main, 'registerShortcodes'] );
+        add_action( 'init', [$this->main, 'registerTaxonomy'] );
+        add_action( 'widgets_init', [$this->main, 'registerWidgets'] );
+        add_action( 'admin_menu', [$this->menu, 'registerMenuCount'] );
+        add_action( 'admin_menu', [$this->menu, 'registerSubMenus'] );
+        add_action( 'admin_init', [$this->menu, 'setCustomPermissions'], 999 );
+        add_action( 'admin_notices', [$this->notices, 'filterAdminNotices'] );
+        add_action( 'wp_enqueue_scripts', [$this->public, 'enqueueAssets'], 999 );
+        add_filter( 'site-reviews/builder', [$this->public, 'modifyBuilder'] );
+        add_action( 'wp_footer', [$this->public, 'renderSchema'] );
+        add_action( 'set_object_terms', [$this->review, 'onAfterChangeCategory'], 10, 6 );
+        add_action( 'transition_post_status', [$this->review, 'onAfterChangeStatus'], 10, 3 );
+        add_action( 'site-reviews/review/created', [$this->review, 'onAfterCreate'] );
+        add_action( 'before_delete_post', [$this->review, 'onBeforeDelete'] );
+        add_action( 'update_postmeta', [$this->review, 'onBeforeUpdate'], 10, 4 );
+        add_action( 'admin_init', [$this->router, 'routeAdminPostRequest'] );
+        add_action( 'wp_ajax_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest'] );
+        add_action( 'wp_ajax_nopriv_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest'] );
+        add_action( 'init', [$this->router, 'routePublicPostRequest'] );
+        add_action( 'admin_init', [$this->settings, 'registerSettings'] );
+        add_action( Application::TAXONOMY.'_term_edit_form_top', [$this->taxonomy, 'disableParents'] );
+        add_action( Application::TAXONOMY.'_term_new_form_tag', [$this->taxonomy, 'disableParents'] );
+        add_action( Application::TAXONOMY.'_add_form_fields', [$this->taxonomy, 'enableParents'] );
+        add_action( Application::TAXONOMY.'_edit_form', [$this->taxonomy, 'enableParents'] );
+        add_action( 'restrict_manage_posts', [$this->taxonomy, 'renderTaxonomyFilter'], 9 );
+        add_action( 'set_object_terms', [$this->taxonomy, 'restrictTermSelection'], 9, 6 );
+        add_action( 'admin_enqueue_scripts', [$this->translator, 'translatePostStatusLabels'] );
+        add_action( 'site-reviews/review/created', [$this->trustalyze, 'onCreated'] );
+        add_action( 'site-reviews/review/reverted', [$this->trustalyze, 'onReverted'] );
+        add_action( 'site-reviews/review/saved', [$this->trustalyze, 'onSaved'] );
+        add_action( 'updated_postmeta', [$this->trustalyze, 'onUpdatedMeta'], 10, 3 );
+        add_action( 'activated_plugin', [$this->welcome, 'redirectOnActivation'], 10, 2 );
+        add_action( 'admin_menu', [$this->welcome, 'registerPage'] );
     }
 }